--- a/src/devices/csma/csma-ipv4-topology.cc	Tue Mar 11 11:35:26 2008 -0700
+++ b/src/devices/csma/csma-ipv4-topology.cc	Tue Mar 11 13:30:12 2008 -0700
@@ -41,10 +41,10 @@
   Ptr<CsmaChannel> channel,
   Mac48Address addr)
 {
-  Ptr<Queue> q = CreateObjectWith<DropTailQueue> ();
+  Ptr<Queue> q = CreateObject<DropTailQueue> ();
 
   // assume full-duplex
-  Ptr<CsmaNetDevice> nd = CreateObjectWith<CsmaNetDevice> ("Node", node, 
+  Ptr<CsmaNetDevice> nd = CreateObject<CsmaNetDevice> ("Node", node, 
                                                            "Address", addr, 
                                                            "EncapsulationMode", String ("IpArp"));
   node->AddDevice (nd);
@@ -60,9 +60,9 @@
                                      Ptr<CsmaChannel> ch,
                                      Mac48Address addr)
 {
-  Ptr<Queue> q = CreateObjectWith<DropTailQueue> ();
+  Ptr<Queue> q = CreateObject<DropTailQueue> ();
 
-  Ptr<CsmaNetDevice> nd0 = CreateObjectWith<CsmaNetDevice> ("Node", n1, 
+  Ptr<CsmaNetDevice> nd0 = CreateObject<CsmaNetDevice> ("Node", n1, 
                                                             "Address", addr,
                                                             "EncapsulationMode", String ("Llc"));
   n1->AddDevice (nd0);
@@ -71,7 +71,7 @@
   nd0->AddQueue(q);
   nd0->Attach (ch);
 
-  Ptr<CsmaNetDevice> nd1 = CreateObjectWith<CsmaNetDevice> ("Node", n1, 
+  Ptr<CsmaNetDevice> nd1 = CreateObject<CsmaNetDevice> ("Node", n1, 
                                                             "Address", addr,
                                                             "EncapsulationMode", String ("Llc"));
   n1->AddDevice (nd1);
@@ -86,9 +86,9 @@
                                      Ptr<CsmaChannel> ch,
                                      Mac48Address addr)
 {
-  Ptr<Queue> q = CreateObjectWith<DropTailQueue> ();
+  Ptr<Queue> q = CreateObject<DropTailQueue> ();
 
-  Ptr<CsmaNetDevice> nd0 = CreateObjectWith<CsmaNetDevice> ("Node", n1, 
+  Ptr<CsmaNetDevice> nd0 = CreateObject<CsmaNetDevice> ("Node", n1, 
                                                             "Address", addr,
                                                             "EncapsulationMode", String ("Raw"));
   n1->AddDevice (nd0);
@@ -97,7 +97,7 @@
   nd0->AddQueue(q);
   nd0->Attach (ch);
 
-  Ptr<CsmaNetDevice> nd1 = CreateObjectWith<CsmaNetDevice> ("Node", n1, 
+  Ptr<CsmaNetDevice> nd1 = CreateObject<CsmaNetDevice> ("Node", n1, 
                                                             "Address", addr,
                                                             "EncapsulationMode", String ("Raw"));
   n1->AddDevice (nd1);