diff --git a/src/devices/p2p/p2p-channel.cc b/src/devices/point-to-point/p2p-channel.cc
similarity index 100%
rename from src/devices/p2p/p2p-channel.cc
rename to src/devices/point-to-point/p2p-channel.cc
diff --git a/src/devices/p2p/p2p-channel.h b/src/devices/point-to-point/p2p-channel.h
similarity index 100%
rename from src/devices/p2p/p2p-channel.h
rename to src/devices/point-to-point/p2p-channel.h
diff --git a/src/devices/p2p/p2p-net-device.cc b/src/devices/point-to-point/p2p-net-device.cc
similarity index 100%
rename from src/devices/p2p/p2p-net-device.cc
rename to src/devices/point-to-point/p2p-net-device.cc
diff --git a/src/devices/p2p/p2p-net-device.h b/src/devices/point-to-point/p2p-net-device.h
similarity index 100%
rename from src/devices/p2p/p2p-net-device.h
rename to src/devices/point-to-point/p2p-net-device.h
diff --git a/src/devices/p2p/p2p-topology.cc b/src/devices/point-to-point/p2p-topology.cc
similarity index 100%
rename from src/devices/p2p/p2p-topology.cc
rename to src/devices/point-to-point/p2p-topology.cc
diff --git a/src/devices/p2p/p2p-topology.h b/src/devices/point-to-point/p2p-topology.h
similarity index 100%
rename from src/devices/p2p/p2p-topology.h
rename to src/devices/point-to-point/p2p-topology.h
diff --git a/src/devices/p2p/wscript b/src/devices/point-to-point/wscript
similarity index 100%
rename from src/devices/p2p/wscript
rename to src/devices/point-to-point/wscript
diff --git a/src/wscript b/src/wscript
index 4b34a9156..1d20c24e4 100644
--- a/src/wscript
+++ b/src/wscript
@@ -15,7 +15,7 @@ all_modules = (
     'simulator',
     'node',
     'internet-node',
-    'devices/p2p',
+    'devices/point-to-point',
     'applications',
     'mobility',
     )