diff --git a/examples/matrix-topology/wscript b/examples/matrix-topology/wscript
index 2c4ade36c..a063499aa 100644
--- a/examples/matrix-topology/wscript
+++ b/examples/matrix-topology/wscript
@@ -2,5 +2,5 @@
 
 def build(bld):
     obj = bld.create_ns3_program('matrix-topology',
-                                 ['simulator', 'common', 'node', 'internet'])
+                                 ['network', 'internet', 'netanim', 'mobility', 'applications'])
     obj.source = 'matrix-topology.cc'
diff --git a/examples/socket/wscript b/examples/socket/wscript
index a1e03d837..c029aea84 100644
--- a/examples/socket/wscript
+++ b/examples/socket/wscript
@@ -1,8 +1,8 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    obj = bld.create_ns3_program('socket-bound-static-routing', ['node', 'csma', 'internet'])
+    obj = bld.create_ns3_program('socket-bound-static-routing', ['network', 'csma', 'internet'])
     obj.source = 'socket-bound-static-routing.cc'
 
-    obj = bld.create_ns3_program('socket-bound-tcp-static-routing', ['node', 'csma', 'internet'])
+    obj = bld.create_ns3_program('socket-bound-tcp-static-routing', ['network', 'csma', 'internet'])
     obj.source = 'socket-bound-tcp-static-routing.cc'
diff --git a/src/internet/examples/wscript b/src/internet/examples/wscript
index f52758523..e759fa5fc 100644
--- a/src/internet/examples/wscript
+++ b/src/internet/examples/wscript
@@ -5,5 +5,5 @@ def build(bld):
         return;
 
     obj = bld.create_ns3_program('main-simple',
-                                 ['node', 'internet', 'applications'])
+                                 ['network', 'internet', 'applications'])
     obj.source = 'main-simple.cc'
diff --git a/src/olsr/examples/wscript b/src/olsr/examples/wscript
index 7dbf0a68b..35a0d90e4 100644
--- a/src/olsr/examples/wscript
+++ b/src/olsr/examples/wscript
@@ -6,5 +6,5 @@ def build(bld):
     obj.source = 'simple-point-to-point-olsr.cc'
 
     obj = bld.create_ns3_program('olsr-hna',
-                                 ['core', 'simulator', 'mobility', 'wifi'])
+                                 ['core', 'mobility', 'wifi', 'csma', 'olsr'])
     obj.source = 'olsr-hna.cc'
diff --git a/src/wifi/wscript b/src/wifi/wscript
index cc3557f4d..cfc7953fa 100644
--- a/src/wifi/wscript
+++ b/src/wifi/wscript
@@ -143,7 +143,7 @@ def build(bld):
         obj_test.uselib = 'GSL GSLCBLAS M'
 
     obj = bld.create_ns3_program('wifi-phy-test',
-        ['core', 'simulator', 'mobility', 'node', 'wifi'])
+        ['core', 'mobility', 'network', 'wifi'])
     obj.source = 'test/wifi-phy-test.cc'
 
     bld.ns3_python_bindings()