diff --git a/model/cs/content-store-impl.h b/model/cs/content-store-impl.h
index 66ce27c..1281495 100644
--- a/model/cs/content-store-impl.h
+++ b/model/cs/content-store-impl.h
@@ -23,8 +23,8 @@
 
 #include "ndn-content-store.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 <boost/foreach.hpp>
 
 #include "../../utils/trie/trie-with-policy.h"
diff --git a/model/cs/ndn-content-store.cc b/model/cs/ndn-content-store.cc
index bfd4926..90a5699 100644
--- a/model/cs/ndn-content-store.cc
+++ b/model/cs/ndn-content-store.cc
@@ -24,8 +24,8 @@
 #include "ns3/log.h"
 #include "ns3/packet.h"
 #include "ns3/ndn-name-components.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.cs.ContentStore");