diff --git a/examples/simple-p2p.cc b/examples/simple-p2p.cc
index 9ad235b5e..412edcaa1 100644
--- a/examples/simple-p2p.cc
+++ b/examples/simple-p2p.cc
@@ -54,14 +54,14 @@
 #include "ns3/ascii-trace.h"
 #include "ns3/pcap-trace.h"
 #include "ns3/internet-node.h"
-#include "ns3/p2p-channel.h"
-#include "ns3/p2p-net-device.h"
+#include "ns3/point-to-point-channel.h"
+#include "ns3/point-to-point-net-device.h"
 #include "ns3/mac-address.h"
 #include "ns3/ipv4-address.h"
 #include "ns3/ipv4.h"
 #include "ns3/socket.h"
 #include "ns3/ipv4-route.h"
-#include "ns3/p2p-topology.h"
+#include "ns3/point-to-point-topology.h"
 #include "ns3/onoff-application.h"
 
 using namespace ns3;
diff --git a/src/devices/point-to-point/p2p-channel.cc b/src/devices/point-to-point/point-to-point-channel.cc
similarity index 98%
rename from src/devices/point-to-point/p2p-channel.cc
rename to src/devices/point-to-point/point-to-point-channel.cc
index adceda3f4..ae78010cf 100644
--- a/src/devices/point-to-point/p2p-channel.cc
+++ b/src/devices/point-to-point/point-to-point-channel.cc
@@ -19,8 +19,8 @@
  * Author: Craig Dowell <craigdo@ee.washington.edu>
  */
 
-#include "p2p-channel.h"
-#include "p2p-net-device.h"
+#include "point-to-point-channel.h"
+#include "point-to-point-net-device.h"
 #include "ns3/packet.h"
 #include "ns3/simulator.h"
 #include "ns3/debug.h"
diff --git a/src/devices/point-to-point/p2p-channel.h b/src/devices/point-to-point/point-to-point-channel.h
similarity index 100%
rename from src/devices/point-to-point/p2p-channel.h
rename to src/devices/point-to-point/point-to-point-channel.h
diff --git a/src/devices/point-to-point/p2p-net-device.cc b/src/devices/point-to-point/point-to-point-net-device.cc
similarity index 98%
rename from src/devices/point-to-point/p2p-net-device.cc
rename to src/devices/point-to-point/point-to-point-net-device.cc
index 13d352889..8f474edde 100644
--- a/src/devices/point-to-point/p2p-net-device.cc
+++ b/src/devices/point-to-point/point-to-point-net-device.cc
@@ -26,8 +26,8 @@
 #include "ns3/queue.h"
 #include "ns3/simulator.h"
 #include "ns3/composite-trace-resolver.h"
-#include "p2p-net-device.h"
-#include "p2p-channel.h"
+#include "point-to-point-net-device.h"
+#include "point-to-point-channel.h"
 
 NS_DEBUG_COMPONENT_DEFINE ("PointToPointNetDevice");
 
diff --git a/src/devices/point-to-point/p2p-net-device.h b/src/devices/point-to-point/point-to-point-net-device.h
similarity index 100%
rename from src/devices/point-to-point/p2p-net-device.h
rename to src/devices/point-to-point/point-to-point-net-device.h
diff --git a/src/devices/point-to-point/p2p-topology.cc b/src/devices/point-to-point/point-to-point-topology.cc
similarity index 97%
rename from src/devices/point-to-point/p2p-topology.cc
rename to src/devices/point-to-point/point-to-point-topology.cc
index 0b0ee003b..5a9558419 100644
--- a/src/devices/point-to-point/p2p-topology.cc
+++ b/src/devices/point-to-point/point-to-point-topology.cc
@@ -32,9 +32,9 @@
 #include "ns3/ipv4.h"
 #include "ns3/queue.h"
 
-#include "p2p-channel.h"
-#include "p2p-net-device.h"
-#include "p2p-topology.h"
+#include "point-to-point-channel.h"
+#include "point-to-point-net-device.h"
+#include "point-to-point-topology.h"
 
 namespace ns3 {
 
diff --git a/src/devices/point-to-point/p2p-topology.h b/src/devices/point-to-point/point-to-point-topology.h
similarity index 100%
rename from src/devices/point-to-point/p2p-topology.h
rename to src/devices/point-to-point/point-to-point-topology.h
diff --git a/src/devices/point-to-point/wscript b/src/devices/point-to-point/wscript
index 639420dc7..e09cb71b4 100644
--- a/src/devices/point-to-point/wscript
+++ b/src/devices/point-to-point/wscript
@@ -7,16 +7,16 @@ def build(bld):
     p2p.target = p2p.name
     p2p.uselib_local = ['ns3-node']
     p2p.source = [
-        'p2p-net-device.cc',
-        'p2p-channel.cc',
-        'p2p-topology.cc',
+        'point-to-point-net-device.cc',
+        'point-to-point-channel.cc',
+        'point-to-point-topology.cc',
         ]
     p2p.includes = '.'
 
     headers = bld.create_obj('ns3header')
     headers.source = [
-        'p2p-net-device.h',
-        'p2p-channel.h',
-        'p2p-topology.h',
+        'point-to-point-net-device.h',
+        'point-to-point-channel.h',
+        'point-to-point-topology.h',
         ]