diff --git a/SConstruct b/SConstruct
index 4cf009bf1..fba95508f 100644
--- a/SConstruct
+++ b/SConstruct
@@ -189,7 +189,7 @@ common.add_sources([
     'header.cc',
     'trailer.cc',
     'packet-printer.cc',
-    'packet-history.cc',
+    'packet-metadata.cc',
     'packet.cc',
     'tags.cc',
     'pcap-writer.cc',
@@ -212,7 +212,7 @@ common.add_inst_headers([
     'tags.h',
     'packet.h',
     'packet-printer.h',
-    'packet-history.h',
+    'packet-metadata.h',
     'uv-trace-source.h',
     'sv-trace-source.h',
     'fv-trace-source.h',
diff --git a/src/common/packet-history.cc b/src/common/packet-metadata.cc
similarity index 99%
rename from src/common/packet-history.cc
rename to src/common/packet-metadata.cc
index f845fd678..3b7d2eaab 100644
--- a/src/common/packet-history.cc
+++ b/src/common/packet-metadata.cc
@@ -23,7 +23,7 @@
 #include "ns3/assert.h"
 #include "ns3/fatal-error.h"
 #include "ns3/debug.h"
-#include "packet-history.h"
+#include "packet-metadata.h"
 #include "chunk.h"
 #include "buffer.h"
 
diff --git a/src/common/packet-history.h b/src/common/packet-metadata.h
similarity index 100%
rename from src/common/packet-history.h
rename to src/common/packet-metadata.h
diff --git a/src/common/packet.h b/src/common/packet.h
index 184ac6756..fa7bea8ff 100644
--- a/src/common/packet.h
+++ b/src/common/packet.h
@@ -26,7 +26,7 @@
 #include "header.h"
 #include "trailer.h"
 #include "tags.h"
-#include "packet-history.h"
+#include "packet-metadata.h"
 #include "ns3/callback.h"
 #include "ns3/assert.h"
 
diff --git a/utils/bench-packets.cc b/utils/bench-packets.cc
index 64f0a44df..4b8ba7adf 100644
--- a/utils/bench-packets.cc
+++ b/utils/bench-packets.cc
@@ -20,7 +20,7 @@
  */
 #include "ns3/system-wall-clock-ms.h"
 #include "ns3/packet.h"
-#include "ns3/packet-history.h"
+#include "ns3/packet-metadata.h"
 #include <iostream>
 #include <sstream>