diff --git a/apps/ndn-app.cc b/apps/ndn-app.cc
index 8a4a2b8..3f982b6 100644
--- a/apps/ndn-app.cc
+++ b/apps/ndn-app.cc
@@ -23,8 +23,8 @@
 #include "ns3/assert.h"
 #include "ns3/packet.h"
 
-#include "ns3/ndn-interest-header.h"
-#include "ns3/ndn-content-object-header.h"
+#include "ns3/ndn-interest.h"
+#include "ns3/ndn-content-object.h"
 #include "ns3/ndn-l3-protocol.h"
 #include "ns3/ndn-fib.h"
 #include "ns3/ndn-app-face.h"
diff --git a/apps/ndn-consumer-cbr.cc b/apps/ndn-consumer-cbr.cc
index 70866bb..b384063 100644
--- a/apps/ndn-consumer-cbr.cc
+++ b/apps/ndn-consumer-cbr.cc
@@ -30,8 +30,8 @@
 #include "ns3/double.h"
 
 #include "ns3/ndn-app-face.h"
-#include "ns3/ndn-interest-header.h"
-#include "ns3/ndn-content-object-header.h"
+#include "ns3/ndn-interest.h"
+#include "ns3/ndn-content-object.h"
 
 NS_LOG_COMPONENT_DEFINE ("ndn.ConsumerCbr");
 
diff --git a/apps/ndn-consumer.cc b/apps/ndn-consumer.cc
index 671dbff..c889b6d 100644
--- a/apps/ndn-consumer.cc
+++ b/apps/ndn-consumer.cc
@@ -30,8 +30,8 @@
 #include "ns3/double.h"
 
 #include "ns3/ndn-app-face.h"
-#include "ns3/ndn-interest-header.h"
-#include "ns3/ndn-content-object-header.h"
+#include "ns3/ndn-interest.h"
+#include "ns3/ndn-content-object.h"
 // #include "ns3/weights-path-stretch-tag.h"
 
 #include <boost/ref.hpp>
diff --git a/apps/ndn-producer.cc b/apps/ndn-producer.cc
index 8392419..28c9551 100644
--- a/apps/ndn-producer.cc
+++ b/apps/ndn-producer.cc
@@ -21,8 +21,8 @@
 
 #include "ndn-producer.h"
 #include "ns3/log.h"
-#include "ns3/ndn-interest-header.h"
-#include "ns3/ndn-content-object-header.h"
+#include "ns3/ndn-interest.h"
+#include "ns3/ndn-content-object.h"
 #include "ns3/string.h"
 #include "ns3/uinteger.h"
 #include "ns3/packet.h"
diff --git a/apps/ndn-producer.h b/apps/ndn-producer.h
index eecd2ef..dc50ea7 100644
--- a/apps/ndn-producer.h
+++ b/apps/ndn-producer.h
@@ -26,7 +26,7 @@
 
 #include "ns3/ptr.h"
 #include "ns3/ndn-name-components.h"
-#include "ns3/ndn-content-object-header.h"
+#include "ns3/ndn-content-object.h"
 
 namespace ns3 {
 namespace ndn {