--- a/src/devices/csma/csma-net-device.cc	Thu May 08 12:43:36 2008 -0700
+++ b/src/devices/csma/csma-net-device.cc	Thu May 08 13:26:49 2008 -0700
@@ -404,14 +404,14 @@
 }
 
 void
-CsmaNetDevice::AddQueue (Ptr<Queue> q)
+CsmaNetDevice::SetQueue (Ptr<Queue> q)
 {
   NS_LOG_FUNCTION (this << q);
 
   m_queue = q;
 }
 
-void CsmaNetDevice::AddReceiveErrorModel (Ptr<ErrorModel> em)
+void CsmaNetDevice::SetReceiveErrorModel (Ptr<ErrorModel> em)
 {
   NS_LOG_FUNCTION (em);
   

--- a/src/devices/csma/csma-net-device.h	Thu May 08 12:43:36 2008 -0700
+++ b/src/devices/csma/csma-net-device.h	Thu May 08 13:26:49 2008 -0700
@@ -150,7 +150,7 @@
    * \param queue a pointer to the queue for which object is assuming
    *        ownership.
    */
-  void AddQueue (Ptr<Queue> queue);
+  void SetQueue (Ptr<Queue> queue);
   /**
    * Attach a receive ErrorModel to the CsmaNetDevice.
    *
@@ -160,7 +160,7 @@
    * @see ErrorModel
    * @param em a pointer to the ErrorModel 
    */
-  void AddReceiveErrorModel(Ptr<ErrorModel> em);
+  void SetReceiveErrorModel(Ptr<ErrorModel> em);
   /**
    * Receive a packet from a connected CsmaChannel.
    *

--- a/src/helper/csma-helper.cc	Thu May 08 12:43:36 2008 -0700
+++ b/src/helper/csma-helper.cc	Thu May 08 13:26:49 2008 -0700
@@ -174,7 +174,7 @@
       device->SetAddress (Mac48Address::Allocate ());
       node->AddDevice (device);
       Ptr<Queue> queue = m_queueFactory.Create<Queue> ();
-      device->AddQueue (queue);
+      device->SetQueue (queue);
       device->Attach (channel);
       container.Add (device);
     }