file and header renaming
diff --git a/helper/ccnb-parser/visitors/ccnb-parser-content-object-visitor.cc b/helper/ccnb-parser/visitors/ccnb-parser-content-object-visitor.cc
index d252cd5..8548598 100644
--- a/helper/ccnb-parser/visitors/ccnb-parser-content-object-visitor.cc
+++ b/helper/ccnb-parser/visitors/ccnb-parser-content-object-visitor.cc
@@ -23,7 +23,7 @@
#include "ns3/ccnb-parser-block.h"
#include "ns3/ccnb-parser-dtag.h"
-#include "ns3/name-components.h"
+#include "ns3/ccnx-name-components.h"
#include "ns3/assert.h"
#include "ns3/ccnx-content-object-header.h"
diff --git a/helper/ccnb-parser/visitors/ccnb-parser-interest-visitor.cc b/helper/ccnb-parser/visitors/ccnb-parser-interest-visitor.cc
index 05c6beb..052cb8c 100644
--- a/helper/ccnb-parser/visitors/ccnb-parser-interest-visitor.cc
+++ b/helper/ccnb-parser/visitors/ccnb-parser-interest-visitor.cc
@@ -22,7 +22,7 @@
#include "ns3/ccnb-parser-block.h"
#include "ns3/ccnb-parser-dtag.h"
-#include "ns3/name-components.h"
+#include "ns3/ccnx-name-components.h"
#include "ns3/assert.h"
#include "ns3/nstime.h"
diff --git a/helper/ccnb-parser/visitors/ccnb-parser-name-components-visitor.cc b/helper/ccnb-parser/visitors/ccnb-parser-name-components-visitor.cc
index 49b2fc5..08bfe2e 100644
--- a/helper/ccnb-parser/visitors/ccnb-parser-name-components-visitor.cc
+++ b/helper/ccnb-parser/visitors/ccnb-parser-name-components-visitor.cc
@@ -22,7 +22,7 @@
#include "ccnb-parser-string-visitor.h"
#include "ns3/ccnb-parser-dtag.h"
-#include "ns3/name-components.h"
+#include "ns3/ccnx-name-components.h"
namespace ns3 {
namespace CcnbParser {
diff --git a/helper/ccnx-encoding-helper.cc b/helper/ccnx-encoding-helper.cc
index 6a4d889..3dd7ad6 100644
--- a/helper/ccnx-encoding-helper.cc
+++ b/helper/ccnx-encoding-helper.cc
@@ -20,7 +20,7 @@
#include "ccnx-encoding-helper.h"
-#include "ns3/name-components.h"
+#include "ns3/ccnx-name-components.h"
#include "ns3/ccnx-interest-header.h"
#include "ns3/ccnx-content-object-header.h"
diff --git a/helper/ccnx-interest-sender-helper.h b/helper/ccnx-interest-sender-helper.h
index 2ff46cc..b58b41f 100644
--- a/helper/ccnx-interest-sender-helper.h
+++ b/helper/ccnx-interest-sender-helper.h
@@ -29,7 +29,7 @@
#include "ns3/net-device.h"
#include "ns3/node-container.h"
#include "ns3/application-container.h"
-#include "ns3/name-components.h"
+#include "ns3/ccnx-name-components.h"
#include "ns3/pointer.h"
#include "ns3/ccnx-local-face.h"