diff --git a/apps/ndn-app.cc b/apps/ndn-app.cc
index ec4377e..4a32734 100644
--- a/apps/ndn-app.cc
+++ b/apps/ndn-app.cc
@@ -24,7 +24,7 @@
 #include "ns3/packet.h"
 
 #include "ns3/ndn-interest.h"
-#include "ns3/ndn-content-object.h"
+#include "ns3/ndn-data.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 77fe130..b0b5137 100644
--- a/apps/ndn-consumer-cbr.cc
+++ b/apps/ndn-consumer-cbr.cc
@@ -32,7 +32,7 @@
 
 #include "ns3/ndn-app-face.h"
 #include "ns3/ndn-interest.h"
-#include "ns3/ndn-content-object.h"
+#include "ns3/ndn-data.h"
 
 NS_LOG_COMPONENT_DEFINE ("ndn.ConsumerCbr");
 
diff --git a/apps/ndn-consumer-window.cc b/apps/ndn-consumer-window.cc
index 2a87ef6..7de4784 100644
--- a/apps/ndn-consumer-window.cc
+++ b/apps/ndn-consumer-window.cc
@@ -27,7 +27,7 @@
 #include "ns3/string.h"
 #include "ns3/uinteger.h"
 #include "ns3/double.h"
-#include "ns3/ndn-content-object.h"
+#include "ns3/ndn-data.h"
 #include "ns3/ndn-interest.h"
 
 NS_LOG_COMPONENT_DEFINE ("ndn.ConsumerWindow");
diff --git a/apps/ndn-consumer-zipf-mandelbrot.cc b/apps/ndn-consumer-zipf-mandelbrot.cc
index 3f863f5..ba5a828 100644
--- a/apps/ndn-consumer-zipf-mandelbrot.cc
+++ b/apps/ndn-consumer-zipf-mandelbrot.cc
@@ -22,7 +22,7 @@
 
 #include "ns3/ndn-app-face.h"
 #include "ns3/ndn-interest.h"
-#include "ns3/ndn-content-object.h"
+#include "ns3/ndn-data.h"
 
 #include "ns3/ndnSIM/utils/ndn-fw-hop-count-tag.h"
 
diff --git a/apps/ndn-consumer.cc b/apps/ndn-consumer.cc
index d6eb389..188c531 100644
--- a/apps/ndn-consumer.cc
+++ b/apps/ndn-consumer.cc
@@ -32,7 +32,7 @@
 
 #include "ns3/ndn-app-face.h"
 #include "ns3/ndn-interest.h"
-#include "ns3/ndn-content-object.h"
+#include "ns3/ndn-data.h"
 #include "ns3/ndnSIM/utils/ndn-fw-hop-count-tag.h"
 #include "ns3/ndnSIM/utils/ndn-rtt-mean-deviation.h"
 
diff --git a/apps/ndn-producer.cc b/apps/ndn-producer.cc
index e8bf98c..8d1f052 100644
--- a/apps/ndn-producer.cc
+++ b/apps/ndn-producer.cc
@@ -22,7 +22,7 @@
 #include "ndn-producer.h"
 #include "ns3/log.h"
 #include "ns3/ndn-interest.h"
-#include "ns3/ndn-content-object.h"
+#include "ns3/ndn-data.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 1cf21fe..d705a2a 100644
--- a/apps/ndn-producer.h
+++ b/apps/ndn-producer.h
@@ -26,7 +26,7 @@
 
 #include "ns3/ptr.h"
 #include "ns3/ndn-name.h"
-#include "ns3/ndn-content-object.h"
+#include "ns3/ndn-data.h"
 
 namespace ns3 {
 namespace ndn {