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 d694f11..d252cd5 100644
--- a/helper/ccnb-parser/visitors/ccnb-parser-content-object-visitor.cc
+++ b/helper/ccnb-parser/visitors/ccnb-parser-content-object-visitor.cc
@@ -55,7 +55,7 @@
     case CCN_DTAG_Name:
       {
         // process name components
-        Ptr<Name::Components> name = Create<Name::Components> ();
+        Ptr<CcnxNameComponents> name = Create<CcnxNameComponents> ();
         
         BOOST_FOREACH (Ptr<Block> block, n.m_nestedTags)
           {
diff --git a/helper/ccnb-parser/visitors/ccnb-parser-interest-visitor.cc b/helper/ccnb-parser/visitors/ccnb-parser-interest-visitor.cc
index 70578e7..05c6beb 100644
--- a/helper/ccnb-parser/visitors/ccnb-parser-interest-visitor.cc
+++ b/helper/ccnb-parser/visitors/ccnb-parser-interest-visitor.cc
@@ -63,7 +63,7 @@
     case CCN_DTAG_Name:
       {
         // process name components
-        Ptr<Name::Components> name = Create<Name::Components> ();
+        Ptr<CcnxNameComponents> name = Create<CcnxNameComponents> ();
         
         BOOST_FOREACH (Ptr<Block> block, n.m_nestedTags)
           {
@@ -93,7 +93,7 @@
     case CCN_DTAG_Exclude:
       {
         // process exclude components
-        Ptr<Name::Components> exclude = Create<Name::Components> ();
+        Ptr<CcnxNameComponents> exclude = Create<CcnxNameComponents> ();
         
         BOOST_FOREACH (Ptr<Block> block, n.m_nestedTags)
           {
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 3138be1..49b2fc5 100644
--- a/helper/ccnb-parser/visitors/ccnb-parser-name-components-visitor.cc
+++ b/helper/ccnb-parser/visitors/ccnb-parser-name-components-visitor.cc
@@ -28,13 +28,13 @@
 namespace CcnbParser {
 
 void
-NameComponentsVisitor::visit (Dtag &n, boost::any param/*should be Name::Components&*/)
+NameComponentsVisitor::visit (Dtag &n, boost::any param/*should be CcnxNameComponents&*/)
 {
   // uint32_t n.m_dtag;
   // std::list<Ptr<Block> > n.m_nestedBlocks;
   static StringVisitor stringVisitor; 
  
-  Name::Components &components = boost::any_cast<Name::Components&> (param);
+  CcnxNameComponents &components = boost::any_cast<CcnxNameComponents&> (param);
 
   switch (n.m_dtag)
     {
diff --git a/helper/ccnb-parser/visitors/ccnb-parser-name-components-visitor.h b/helper/ccnb-parser/visitors/ccnb-parser-name-components-visitor.h
index c68eb56..e4b92cf 100644
--- a/helper/ccnb-parser/visitors/ccnb-parser-name-components-visitor.h
+++ b/helper/ccnb-parser/visitors/ccnb-parser-name-components-visitor.h
@@ -28,12 +28,12 @@
 
 /**
  * \ingroup ccnx-ccnb
- * \brief Visitor to obtain fill Name::Components object with name components
+ * \brief Visitor to obtain fill CcnxNameComponents object with name components
  */
 class NameComponentsVisitor : public VoidDepthFirstVisitor
 {
 public:
-  virtual void visit (Dtag &n, boost::any param/*should be Name::Components&*/);
+  virtual void visit (Dtag &n, boost::any param/*should be CcnxNameComponents&*/);
 };
 
 }