diff --git a/model/pit/ndn-pit-entry.cc b/model/pit/ndn-pit-entry.cc
index accfcf1..6d16048 100644
--- a/model/pit/ndn-pit-entry.cc
+++ b/model/pit/ndn-pit-entry.cc
@@ -21,7 +21,7 @@
 #include "ndn-pit-entry.h"
 
 #include "ns3/ndn-fib.h"
-#include "ns3/ndn-name-components.h"
+#include "ns3/ndn-name.h"
 #include "ns3/ndn-interest.h"
 
 #include "ns3/simulator.h"
@@ -82,7 +82,7 @@
 }
 
 
-const NameComponents &
+const Name &
 Entry::GetPrefix () const
 {
   return m_interest->GetName ();
diff --git a/model/pit/ndn-pit-entry.h b/model/pit/ndn-pit-entry.h
index 9680ac2..694fd9f 100644
--- a/model/pit/ndn-pit-entry.h
+++ b/model/pit/ndn-pit-entry.h
@@ -137,7 +137,7 @@
   /**
    * @brief Get prefix of the PIT entry
    */
-  const NameComponents &
+  const Name &
   GetPrefix () const;
 
   /**
diff --git a/model/pit/ndn-pit-impl.h b/model/pit/ndn-pit-impl.h
index 7a346d2..bd86838 100644
--- a/model/pit/ndn-pit-impl.h
+++ b/model/pit/ndn-pit-impl.h
@@ -27,7 +27,7 @@
 
 #include "ndn-pit-entry-impl.h"
 
-#include "ns3/ndn-name-components.h"
+#include "ns3/ndn-name.h"
 
 namespace ns3 {
 namespace ndn {
@@ -42,14 +42,14 @@
  */
 template<class Policy>
 class PitImpl : public Pit
-              , protected ndnSIM::trie_with_policy<NameComponents,
+              , protected ndnSIM::trie_with_policy<Name,
                                                    ndnSIM::smart_pointer_payload_traits< EntryImpl< PitImpl< Policy > > >,
                                                    // ndnSIM::persistent_policy_traits
                                                    Policy
                                                    >
 {
 public:
-  typedef ndnSIM::trie_with_policy<NameComponents,
+  typedef ndnSIM::trie_with_policy<Name,
                                    ndnSIM::smart_pointer_payload_traits< EntryImpl< PitImpl< Policy > > >,
                                    // ndnSIM::persistent_policy_traits
                                    Policy