diff --git a/src/common/error-model.cc b/src/common/error-model.cc
index dbe1289a7..c512aefb2 100644
--- a/src/common/error-model.cc
+++ b/src/common/error-model.cc
@@ -28,7 +28,7 @@
 #include "ns3/log.h"
 #include "ns3/random-variable.h"
 #include "ns3/default-value.h"
-#include "ns3/interface-id-default-value.h"
+#include "ns3/type-id-default-value.h"
 
 NS_LOG_COMPONENT_DEFINE ("ErrorModel");
 
diff --git a/src/core/interface-id-default-value.cc b/src/core/type-id-default-value.cc
similarity index 98%
rename from src/core/interface-id-default-value.cc
rename to src/core/type-id-default-value.cc
index f4baf550a..ec0878776 100644
--- a/src/core/interface-id-default-value.cc
+++ b/src/core/type-id-default-value.cc
@@ -1,4 +1,4 @@
-#include "interface-id-default-value.h"
+#include "type-id-default-value.h"
 
 namespace ns3 {
 
diff --git a/src/core/interface-id-default-value.h b/src/core/type-id-default-value.h
similarity index 100%
rename from src/core/interface-id-default-value.h
rename to src/core/type-id-default-value.h
diff --git a/src/core/wscript b/src/core/wscript
index fa8a23a16..1c69ee1db 100644
--- a/src/core/wscript
+++ b/src/core/wscript
@@ -51,7 +51,7 @@ def build(bld):
         'trace-source.cc',
         'type-traits-test.cc',
         'array-trace-resolver.cc',
-        'interface-id-default-value.cc',
+        'type-id-default-value.cc',
         ]
 
     if sys.platform == 'win32':
@@ -94,6 +94,6 @@ def build(bld):
         'array-trace-resolver.h',
         'trace-doc.h',
         'int-to-type.h',
-        'interface-id-default-value.h',
+        'type-id-default-value.h',
         ]
 
diff --git a/src/mobility/random-topology.cc b/src/mobility/random-topology.cc
index 6808216d4..7547b9886 100644
--- a/src/mobility/random-topology.cc
+++ b/src/mobility/random-topology.cc
@@ -22,7 +22,7 @@
 #include "random-topology.h"
 #include "random-position.h"
 #include "mobility-model.h"
-#include "ns3/interface-id-default-value.h"
+#include "ns3/type-id-default-value.h"
 
 namespace ns3 {
 
diff --git a/src/mobility/random-waypoint-mobility-model.cc b/src/mobility/random-waypoint-mobility-model.cc
index c9faa0744..408a6f38d 100644
--- a/src/mobility/random-waypoint-mobility-model.cc
+++ b/src/mobility/random-waypoint-mobility-model.cc
@@ -21,7 +21,7 @@
 #include "ns3/simulator.h"
 #include "ns3/random-variable.h"
 #include "ns3/random-variable-default-value.h"
-#include "ns3/interface-id-default-value.h"
+#include "ns3/type-id-default-value.h"
 #include "random-waypoint-mobility-model.h"
 #include "random-position.h"
 
diff --git a/src/node/queue.cc b/src/node/queue.cc
index c6a43341a..fb157b0a0 100644
--- a/src/node/queue.cc
+++ b/src/node/queue.cc
@@ -20,7 +20,7 @@
 #include "ns3/log.h"
 #include "ns3/composite-trace-resolver.h"
 #include "ns3/default-value.h"
-#include "ns3/interface-id-default-value.h"
+#include "ns3/type-id-default-value.h"
 #include "queue.h"
 
 NS_LOG_COMPONENT_DEFINE ("Queue");
diff --git a/src/routing/olsr/olsr-agent.cc b/src/routing/olsr/olsr-agent.cc
index 9dbf61678..a02d96607 100644
--- a/src/routing/olsr/olsr-agent.cc
+++ b/src/routing/olsr/olsr-agent.cc
@@ -19,7 +19,7 @@
  */
 
 #include "olsr-agent.h"
-#include "ns3/interface-id-default-value.h"
+#include "ns3/type-id-default-value.h"
 
 namespace ns3 {
 namespace olsr {