--- a/examples/wscript	Fri Jul 27 20:26:36 2007 +0200
+++ b/examples/wscript	Fri Jul 27 20:45:07 2007 +0200
@@ -9,5 +9,5 @@
         obj.source = source
         return obj
         
-    obj = create_ns_prog('simple-p2p', 'simple-p2p.cc', deps=['p2p', 'internet-node'])
+    obj = create_ns_prog('simple-p2p', 'simple-p2p.cc', deps=['point-to-point', 'internet-node'])
 

--- a/samples/wscript	Fri Jul 27 20:26:36 2007 +0200
+++ b/samples/wscript	Fri Jul 27 20:45:07 2007 +0200
@@ -18,9 +18,9 @@
     obj = create_ns_prog('main-test', 'main-test.cc')
     obj = create_ns_prog('main-simple', 'main-simple.cc',
                          deps=['node', 'internet-node', 'applications'])
-    #obj = create_ns_prog('main-simple-p2p', 'main-simple-p2p.cc', deps=['node', 'p2p'])
+    #obj = create_ns_prog('main-simple-p2p', 'main-simple-p2p.cc', deps=['node', 'point-to-point'])
     obj = create_ns_prog('main-default-value', 'main-default-value.cc',
-                         deps=['core', 'simulator', 'node', 'p2p'])
+                         deps=['core', 'simulator', 'node', 'point-to-point'])
     obj = create_ns_prog('main-grid-topology', 'main-grid-topology.cc',
                          deps=['core', 'simulator', 'mobility', 'internet-node'])
     obj = create_ns_prog('main-random-topology', 'main-random-topology.cc',

--- a/src/devices/point-to-point/wscript	Fri Jul 27 20:26:36 2007 +0200
+++ b/src/devices/point-to-point/wscript	Fri Jul 27 20:45:07 2007 +0200
@@ -2,21 +2,20 @@
 
 
 def build(bld):
-    p2p = bld.create_obj('cpp', 'shlib')
-    p2p.name = 'ns3-p2p'
-    p2p.target = p2p.name
-    p2p.uselib_local = ['ns3-node']
-    p2p.source = [
+    module = bld.create_obj('cpp', 'shlib')
+    module.name = 'ns3-point-to-point'
+    module.target = module.name
+    module.uselib_local = ['ns3-node']
+    module.source = [
         '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 = [
         'point-to-point-net-device.h',
         'point-to-point-channel.h',
         'point-to-point-topology.h',
         ]
+    module.includes = '.'