diff --git a/src/devices/csma/csma-net-device.cc b/src/devices/csma/csma-net-device.cc
index dc2c4c720..db43ff2f0 100644
--- a/src/devices/csma/csma-net-device.cc
+++ b/src/devices/csma/csma-net-device.cc
@@ -404,14 +404,14 @@ CsmaNetDevice::Attach (Ptr<CsmaChannel> ch)
 }
 
 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);
   
diff --git a/src/devices/csma/csma-net-device.h b/src/devices/csma/csma-net-device.h
index df1787757..107873f7c 100644
--- a/src/devices/csma/csma-net-device.h
+++ b/src/devices/csma/csma-net-device.h
@@ -150,7 +150,7 @@ enum CsmaEncapsulationMode {
    * \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 @@ enum CsmaEncapsulationMode {
    * @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.
    *
diff --git a/src/helper/csma-helper.cc b/src/helper/csma-helper.cc
index d0c210090..391e529c7 100644
--- a/src/helper/csma-helper.cc
+++ b/src/helper/csma-helper.cc
@@ -174,7 +174,7 @@ CsmaHelper::Install (const NodeContainer &c, Ptr<CsmaChannel> channel)
       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);
     }