--- a/samples/main-attribute-value.cc	Thu May 08 11:16:12 2008 -0700
+++ b/samples/main-attribute-value.cc	Thu May 08 12:43:36 2008 -0700
@@ -68,7 +68,7 @@
   n0->AddDevice (net0);
 
   Ptr<Queue> q = CreateObject<DropTailQueue> ();
-  net0->AddQueue(q);
+  net0->SetQueue(q);
 
   // At this point, we have created a single node (Node 0) and a 
   // single PointToPointNetDevice (NetDevice 0) and added a 

--- a/src/devices/point-to-point/point-to-point-net-device.cc	Thu May 08 11:16:12 2008 -0700
+++ b/src/devices/point-to-point/point-to-point-net-device.cc	Thu May 08 12:43:36 2008 -0700
@@ -207,14 +207,14 @@
   return true;
 }
 
-void PointToPointNetDevice::AddQueue (Ptr<Queue> q)
+void PointToPointNetDevice::SetQueue (Ptr<Queue> q)
 {
   NS_LOG_FUNCTION (this << q);
 
   m_queue = q;
 }
 
-void PointToPointNetDevice::AddReceiveErrorModel (Ptr<ErrorModel> em)
+void PointToPointNetDevice::SetReceiveErrorModel (Ptr<ErrorModel> em)
 {
   NS_LOG_FUNCTION ("(" << em << ")");
 

--- a/src/devices/point-to-point/point-to-point-net-device.h	Thu May 08 11:16:12 2008 -0700
+++ b/src/devices/point-to-point/point-to-point-net-device.h	Thu May 08 12:43:36 2008 -0700
@@ -121,7 +121,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 PointToPointNetDevice.
    *
@@ -131,7 +131,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 PointToPointChannel.
    *

--- a/src/devices/point-to-point/point-to-point-test.cc	Thu May 08 11:16:12 2008 -0700
+++ b/src/devices/point-to-point/point-to-point-test.cc	Thu May 08 12:43:36 2008 -0700
@@ -44,10 +44,10 @@
 
   devA->Attach (channel);
   devA->SetAddress (Mac48Address::Allocate ());
-  devA->AddQueue (CreateObject<DropTailQueue> ());
+  devA->SetQueue (CreateObject<DropTailQueue> ());
   devB->Attach (channel);
   devB->SetAddress (Mac48Address::Allocate ());
-  devB->AddQueue (CreateObject<DropTailQueue> ());
+  devB->SetQueue (CreateObject<DropTailQueue> ());
 
   a->AddDevice (devA);
   b->AddDevice (devB);

--- a/src/helper/point-to-point-helper.cc	Thu May 08 11:16:12 2008 -0700
+++ b/src/helper/point-to-point-helper.cc	Thu May 08 12:43:36 2008 -0700
@@ -170,12 +170,12 @@
   devA->SetAddress (Mac48Address::Allocate ());
   a->AddDevice (devA);
   Ptr<Queue> queueA = m_queueFactory.Create<Queue> ();
-  devA->AddQueue (queueA);
+  devA->SetQueue (queueA);
   Ptr<PointToPointNetDevice> devB = m_deviceFactory.Create<PointToPointNetDevice> ();
   devB->SetAddress (Mac48Address::Allocate ());
   b->AddDevice (devB);
   Ptr<Queue> queueB = m_queueFactory.Create<Queue> ();
-  devB->AddQueue (queueB);
+  devB->SetQueue (queueB);
   Ptr<PointToPointChannel> channel = m_channelFactory.Create<PointToPointChannel> ();
   devA->Attach (channel);
   devB->Attach (channel);