diff --git a/examples/simple-p2p.cc b/examples/simple-p2p.cc
index c5b0e61ce..9aaff28f3 100644
--- a/examples/simple-p2p.cc
+++ b/examples/simple-p2p.cc
@@ -57,7 +57,7 @@
 #include "ns3/p2p-channel.h"
 #include "ns3/p2p-net-device.h"
 #include "ns3/ipv4-address.h"
-#include "ns3/ipv4-transport-address.h"
+#include "ns3/inet-address.h"
 #include "ns3/ipv4.h"
 #include "ns3/socket.h"
 #include "ns3/ipv4-route.h"
diff --git a/samples/main-simple.cc b/samples/main-simple.cc
index 80128d7d5..bdfd9e6f8 100644
--- a/samples/main-simple.cc
+++ b/samples/main-simple.cc
@@ -4,7 +4,7 @@
 #include "ns3/simulator.h"
 #include "ns3/socket-factory.h"
 #include "ns3/socket.h"
-#include "ns3/ipv4-transport-address.h"
+#include "ns3/inet-address.h"
 #include "ns3/nstime.h"
 
 using namespace ns3;
diff --git a/src/internet-node/udp-socket.cc b/src/internet-node/udp-socket.cc
index 97b6a3564..d92cde129 100644
--- a/src/internet-node/udp-socket.cc
+++ b/src/internet-node/udp-socket.cc
@@ -19,7 +19,7 @@
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
 #include "ns3/node.h"
-#include "ns3/ipv4-transport-address.h"
+#include "ns3/inet-address.h"
 #include "udp-socket.h"
 #include "udp-l4-protocol.h"
 #include "ipv4-end-point.h"
diff --git a/src/node/ipv4-transport-address.cc b/src/node/inet-address.cc
similarity index 97%
rename from src/node/ipv4-transport-address.cc
rename to src/node/inet-address.cc
index 9330737c8..2f7fff7c6 100644
--- a/src/node/ipv4-transport-address.cc
+++ b/src/node/inet-address.cc
@@ -1,4 +1,4 @@
-#include "ipv4-transport-address.h"
+#include "inet-address.h"
 #include "ns3/assert.h"
 
 namespace ns3 {
diff --git a/src/node/ipv4-transport-address.h b/src/node/inet-address.h
similarity index 100%
rename from src/node/ipv4-transport-address.h
rename to src/node/inet-address.h
diff --git a/src/node/wscript b/src/node/wscript
index 738402fd3..d02aea513 100644
--- a/src/node/wscript
+++ b/src/node/wscript
@@ -8,7 +8,7 @@ def build(bld):
     node.source = [
         'address.cc',
         'eui48-address.cc',
-        'ipv4-transport-address.cc',
+        'inet-address.cc',
         'node.cc',
         'ipv4-address.cc',
         'net-device.cc',
@@ -30,7 +30,7 @@ def build(bld):
     headers.source = [
         'address.h',
         'eui48-address.h',
-        'ipv4-transport-address.h',
+        'inet-address.h',
         'node.h',
         'ipv4-address.h',
         'net-device.h',