diff --git a/helper/ndn-global-routing-helper.cc b/helper/ndn-global-routing-helper.cc
index 122bffb..a6f4601 100644
--- a/helper/ndn-global-routing-helper.cc
+++ b/helper/ndn-global-routing-helper.cc
@@ -23,7 +23,7 @@
 #include "ns3/ndn-l3-protocol.h"
 #include "../model/ndn-net-device-face.h"
 #include "../model/ndn-global-router.h"
-#include "ns3/ndn-name-components.h"
+#include "ns3/ndn-name.h"
 #include "ns3/ndn-fib.h"
 
 #include "ns3/node.h"
@@ -188,7 +188,7 @@
   NS_ASSERT_MSG (gr != 0,
 		 "GlobalRouter is not installed on the node");
 
-  Ptr<NameComponents> name = Create<NameComponents> (boost::lexical_cast<NameComponents> (prefix));
+  Ptr<Name> name = Create<Name> (boost::lexical_cast<Name> (prefix));
   gr->AddLocalPrefix (name);
 }
 
@@ -291,7 +291,7 @@
 		}
 	      else
 		{
-                  BOOST_FOREACH (const Ptr<const NameComponents> &prefix, i->first->GetLocalPrefixes ())
+                  BOOST_FOREACH (const Ptr<const Name> &prefix, i->first->GetLocalPrefixes ())
                     {
                       NS_LOG_DEBUG (" prefix " << prefix << " reachable via face " << *i->second.get<0> ()
                                     << " with distance " << i->second.get<1> ()
@@ -404,7 +404,7 @@
                     }
                   else
                     {
-                      BOOST_FOREACH (const Ptr<const NameComponents> &prefix, i->first->GetLocalPrefixes ())
+                      BOOST_FOREACH (const Ptr<const Name> &prefix, i->first->GetLocalPrefixes ())
                         {
                           NS_LOG_DEBUG (" prefix " << *prefix << " reachable via face " << *i->second.get<0> ()
                                         << " with distance " << i->second.get<1> ()
diff --git a/helper/ndn-stack-helper.cc b/helper/ndn-stack-helper.cc
index 3f284cf..c6cf1c3 100644
--- a/helper/ndn-stack-helper.cc
+++ b/helper/ndn-stack-helper.cc
@@ -42,7 +42,7 @@
 #include "ns3/ndn-forwarding-strategy.h"
 #include "ns3/ndn-fib.h"
 #include "ns3/ndn-pit.h"
-#include "ns3/ndn-name-components.h"
+#include "ns3/ndn-name.h"
 #include "ns3/ndn-content-store.h"
 
 #include "ns3/node-list.h"
@@ -360,8 +360,8 @@
 
   Ptr<Fib>  fib  = node->GetObject<Fib> ();
 
-  NameComponentsValue prefixValue;
-  prefixValue.DeserializeFromString (prefix, MakeNameComponentsChecker ());
+  NameValue prefixValue;
+  prefixValue.DeserializeFromString (prefix, MakeNameChecker ());
   fib->Add (prefixValue.Get (), face, metric);
 }