--- a/tutorial/tutorial-linear-dumbbell.cc	Tue Mar 11 11:35:26 2008 -0700
+++ b/tutorial/tutorial-linear-dumbbell.cc	Tue Mar 11 13:30:12 2008 -0700
@@ -127,7 +127,7 @@
   uint16_t port = 7;
 
   Ptr<UdpEchoClient> client0 = 
-    CreateObjectWith<UdpEchoClient> (
+    CreateObject<UdpEchoClient> (
                                      "Node", n0, 
                                      "RemoteIpv4", Ipv4Address ("10.1.2.1"),
                                      "RemotePort", Uinteger (port),
@@ -136,7 +136,7 @@
                                      "PacketSize", Uinteger (1024));
   n0->AddApplication (client0);
   Ptr<UdpEchoClient> client1 = 
-    CreateObjectWith<UdpEchoClient> (
+    CreateObject<UdpEchoClient> (
                                      "Node", n1, 
                                      "RemoteIpv4", Ipv4Address ("10.1.2.2"),
                                      "RemotePort", Uinteger (port),
@@ -145,7 +145,7 @@
                                      "PacketSize", Uinteger (1024));
   n1->AddApplication (client1);
   Ptr<UdpEchoClient> client2 = 
-    CreateObjectWith<UdpEchoClient> (
+    CreateObject<UdpEchoClient> (
                                      "Node", n2, 
                                      "RemoteIpv4", Ipv4Address ("10.1.2.3"),
                                      "RemotePort", Uinteger (port),
@@ -154,7 +154,7 @@
                                      "PacketSize", Uinteger (1024));
   n2->AddApplication (client2);
   Ptr<UdpEchoClient> client3 = 
-    CreateObjectWith<UdpEchoClient> (
+    CreateObject<UdpEchoClient> (
                                      "Node", n3, 
                                      "RemoteIpv4", Ipv4Address ("10.1.2.4"),
                                      "RemotePort", Uinteger (port),
@@ -164,16 +164,16 @@
   n3->AddApplication (client3);
 
   Ptr<UdpEchoServer> server4 = 
-    CreateObjectWith<UdpEchoServer> ("Node", n4, "Port", Uinteger (port));
+    CreateObject<UdpEchoServer> ("Node", n4, "Port", Uinteger (port));
   n4->AddApplication (server4);
   Ptr<UdpEchoServer> server5 = 
-    CreateObjectWith<UdpEchoServer> ("Node", n5, "Port", Uinteger (port));
+    CreateObject<UdpEchoServer> ("Node", n5, "Port", Uinteger (port));
   n5->AddApplication (server5);
   Ptr<UdpEchoServer> server6 = 
-    CreateObjectWith<UdpEchoServer> ("Node", n6, "Port", Uinteger (port));
+    CreateObject<UdpEchoServer> ("Node", n6, "Port", Uinteger (port));
   n6->AddApplication (server6);
   Ptr<UdpEchoServer> server7 = 
-    CreateObjectWith<UdpEchoServer> ("Node", n7, "Port", Uinteger (port));
+    CreateObject<UdpEchoServer> ("Node", n7, "Port", Uinteger (port));
   n7->AddApplication (server7);
 
   server4->Start(Seconds(1.));