diff --git a/examples/custom-apps/custom-app.cc b/examples/custom-apps/custom-app.cc
index 14c564e..86108ac 100644
--- a/examples/custom-apps/custom-app.cc
+++ b/examples/custom-apps/custom-app.cc
@@ -58,7 +58,7 @@
   ndn::App::StartApplication ();
 
   // Create a name components object for name ``/prefix/sub``
-  Ptr<ndn::NameComponents> prefix = Create<ndn::NameComponents> (); // now prefix contains ``/``
+  Ptr<ndn::Name> prefix = Create<ndn::Name> (); // now prefix contains ``/``
   prefix->Add ("prefix"); // now prefix contains ``/prefix``
   prefix->Add ("sub"); // now prefix contains ``/prefix/sub``
 
@@ -91,7 +91,7 @@
   // Sending one Interest packet out //
   /////////////////////////////////////
   
-  Ptr<ndn::NameComponents> prefix = Create<ndn::NameComponents> ("/prefix/sub"); // another way to create name
+  Ptr<ndn::Name> prefix = Create<ndn::Name> ("/prefix/sub"); // another way to create name
 
   // Create and configure ndn::InterestHeader
   ndn::InterestHeader interestHeader;
@@ -125,7 +125,7 @@
   // Note that Interests send out by the app will not be sent back to the app !
   
   ndn::ContentObjectHeader data;
-  data.SetName (Create<ndn::NameComponents> (interest->GetName ())); // data will have the same name as Interests
+  data.SetName (Create<ndn::Name> (interest->GetName ())); // data will have the same name as Interests
 
   ndn::ContentObjectTail trailer; // doesn't require any configuration
 
diff --git a/examples/custom-apps/dumb-requester.cc b/examples/custom-apps/dumb-requester.cc
index 1d068c4..3dbcadf 100644
--- a/examples/custom-apps/dumb-requester.cc
+++ b/examples/custom-apps/dumb-requester.cc
@@ -48,8 +48,8 @@
 
     .AddAttribute ("Prefix", "Requested name",
                    StringValue ("/dumb-interest"),
-                   ndn::MakeNameComponentsAccessor (&DumbRequester::m_name),
-                   ndn::MakeNameComponentsChecker ())
+                   ndn::MakeNameAccessor (&DumbRequester::m_name),
+                   ndn::MakeNameChecker ())
     ;
   return tid;
 }
@@ -88,7 +88,7 @@
   // Sending one Interest packet out //
   /////////////////////////////////////
   
-  Ptr<ndn::NameComponents> prefix = Create<ndn::NameComponents> (m_name); // another way to create name
+  Ptr<ndn::Name> prefix = Create<ndn::Name> (m_name); // another way to create name
 
   // Create and configure ndn::InterestHeader
   ndn::InterestHeader interestHeader;
diff --git a/examples/custom-apps/dumb-requester.h b/examples/custom-apps/dumb-requester.h
index 050630d..2b28c77 100644
--- a/examples/custom-apps/dumb-requester.h
+++ b/examples/custom-apps/dumb-requester.h
@@ -24,7 +24,7 @@
 #define DUMB_REQUESTER_H_
 
 #include "ns3/ndn-app.h"
-#include "ns3/ndn-name-components.h"
+#include "ns3/ndn-name.h"
 
 namespace ns3 {
 
@@ -61,7 +61,7 @@
 
 private:
   bool m_isRunning;
-  ndn::NameComponents m_name;
+  ndn::Name m_name;
 };
 
 } // namespace ns3