diff --git a/src/core/composite-trace-resolver.cc b/src/core/composite-trace-resolver.cc
index 8f8f31ed2..3b69b6da2 100644
--- a/src/core/composite-trace-resolver.cc
+++ b/src/core/composite-trace-resolver.cc
@@ -64,7 +64,7 @@ CompositeTraceResolver::Add (std::string name,
 }
 
 void 
-CompositeTraceResolver::Add (std::string name,
+CompositeTraceResolver::AddSource (std::string name,
                              TraceSource &trace)
 {
   DoAddSource (name, trace, TraceContext ());
@@ -351,8 +351,8 @@ Ptr<TraceResolver>
 CompositeTraceResolverTest::CreateSubResolver (void)
 {
   Ptr<CompositeTraceResolver> subresolver = Create<CompositeTraceResolver> ();
-  subresolver->Add ("trace-int", m_traceInt, 
-                    SubTraceSourceTest (SubTraceSourceTest::INT));
+  subresolver->AddSource ("trace-int", m_traceInt, 
+                          SubTraceSourceTest (SubTraceSourceTest::INT));
   return subresolver;
 }
 bool 
@@ -366,10 +366,10 @@ CompositeTraceResolverTest::RunTests (void)
 
   CompositeTraceResolver resolver;
 
-  resolver.Add ("trace-double-a", traceDoubleA, 
-                TraceSourceTest (TraceSourceTest::DOUBLEA));
-  resolver.Add ("trace-double-b", traceDoubleB, 
-                TraceSourceTest (TraceSourceTest::DOUBLEB));
+  resolver.AddSource ("trace-double-a", traceDoubleA, 
+                      TraceSourceTest (TraceSourceTest::DOUBLEA));
+  resolver.AddSource ("trace-double-b", traceDoubleB, 
+                      TraceSourceTest (TraceSourceTest::DOUBLEB));
 
   resolver.Connect ("/*", MakeCallback (&CompositeTraceResolverTest::TraceDouble, this), TraceContext ());
 
@@ -461,7 +461,7 @@ CompositeTraceResolverTest::RunTests (void)
     }
 
   resolver.Add ("subresolver", 
-		MakeCallback (&CompositeTraceResolverTest::CreateSubResolver, this));
+                MakeCallback (&CompositeTraceResolverTest::CreateSubResolver, this));
 
   resolver.Connect ("/subresolver/trace-int", 
 		    MakeCallback (&CompositeTraceResolverTest::TraceInt, this), TraceContext ());
@@ -501,7 +501,7 @@ CompositeTraceResolverTest::RunTests (void)
 
   SVTraceSource<uint16_t> source;
 
-  resolver.Add ("uint16_t", source, TraceSourceTest (TraceSourceTest::UINT16_T));
+  resolver.AddSource ("uint16_t", source, TraceSourceTest (TraceSourceTest::UINT16_T));
   
 
   return ok;
diff --git a/src/core/composite-trace-resolver.h b/src/core/composite-trace-resolver.h
index 8c43e8f98..b5579c14e 100644
--- a/src/core/composite-trace-resolver.h
+++ b/src/core/composite-trace-resolver.h
@@ -53,8 +53,8 @@ public:
    * be automatically extended to contain the input context.
    */
   template <typename T>
-  void Add (std::string name,
-            TraceSource &trace, T const &context);
+  void AddSource (std::string name,
+                  TraceSource &trace, T const &context);
   /**
    * \param name name of trace source
    * \param trace a callback trace source
@@ -63,8 +63,8 @@ public:
    * source will match the name specified during namespace 
    * resolution.
    */
-  void Add (std::string name,
-            TraceSource &trace);
+  void AddSource (std::string name,
+                  TraceSource &trace);
   /**
    * \param name name of child trace resolver
    * \param createResolver a trace resolver constructor
@@ -140,9 +140,9 @@ namespace ns3 {
 
 template <typename T>
 void 
-CompositeTraceResolver::Add (std::string name,
-                             TraceSource &trace, 
-                             T const &context)
+CompositeTraceResolver::AddSource (std::string name,
+                                   TraceSource &trace, 
+                                   T const &context)
 {
   TraceContext ctx;
   ctx.Add (context);
diff --git a/src/core/object.cc b/src/core/object.cc
index c16a7db63..b820a5b7c 100644
--- a/src/core/object.cc
+++ b/src/core/object.cc
@@ -310,7 +310,7 @@ public:
   {
     ns3::Ptr<ns3::CompositeTraceResolver> resolver = 
       ns3::Create<ns3::CompositeTraceResolver> ();
-    resolver->Add ("basea-x", m_source);
+    resolver->AddSource ("basea-x", m_source);
     resolver->SetParent (Object::GetTraceResolver ());
     return resolver;
   }
@@ -334,7 +334,7 @@ public:
   {
     ns3::Ptr<ns3::CompositeTraceResolver> resolver = 
       ns3::Create<ns3::CompositeTraceResolver> ();
-    resolver->Add ("deriveda-x", m_sourceDerived);
+    resolver->AddSource ("deriveda-x", m_sourceDerived);
     resolver->SetParent (BaseA::GetTraceResolver ());
     return resolver;
   }
@@ -361,7 +361,7 @@ public:
   {
     ns3::Ptr<ns3::CompositeTraceResolver> resolver = 
       ns3::Create<ns3::CompositeTraceResolver> ();
-    resolver->Add ("baseb-x", m_source);
+    resolver->AddSource ("baseb-x", m_source);
     resolver->SetParent (Object::GetTraceResolver ());
     return resolver;
   }
@@ -385,7 +385,7 @@ public:
   {
     ns3::Ptr<ns3::CompositeTraceResolver> resolver = 
       ns3::Create<ns3::CompositeTraceResolver> ();
-    resolver->Add ("derivedb-x", m_sourceDerived);
+    resolver->AddSource ("derivedb-x", m_sourceDerived);
     resolver->SetParent (BaseB::GetTraceResolver ());
     return resolver;
   }
diff --git a/src/devices/csma-cd/csma-cd-net-device.cc b/src/devices/csma-cd/csma-cd-net-device.cc
index fe5c0ba26..82b6b7db6 100644
--- a/src/devices/csma-cd/csma-cd-net-device.cc
+++ b/src/devices/csma-cd/csma-cd-net-device.cc
@@ -454,12 +454,12 @@ CsmaCdNetDevice::GetTraceResolver (void)
 {
   Ptr<CompositeTraceResolver> resolver = Create<CompositeTraceResolver> ();
   resolver->AddChild ("queue", m_queue);
-  resolver->Add ("rx",
-                 m_rxTrace,
-                 CsmaCdTraceType (CsmaCdTraceType::RX));
-  resolver->Add ("drop",
-                 m_dropTrace,
-                 CsmaCdTraceType (CsmaCdTraceType::DROP));
+  resolver->AddSource ("rx",
+                       m_rxTrace,
+                       CsmaCdTraceType (CsmaCdTraceType::RX));
+  resolver->AddSource ("drop",
+                       m_dropTrace,
+                       CsmaCdTraceType (CsmaCdTraceType::DROP));
   resolver->SetParent (NetDevice::GetTraceResolver ());
   return resolver;
 }
diff --git a/src/devices/point-to-point/point-to-point-net-device.cc b/src/devices/point-to-point/point-to-point-net-device.cc
index 633fbe5c6..3b94b5bcf 100644
--- a/src/devices/point-to-point/point-to-point-net-device.cc
+++ b/src/devices/point-to-point/point-to-point-net-device.cc
@@ -193,9 +193,9 @@ PointToPointNetDevice::GetTraceResolver (void)
 {
   Ptr<CompositeTraceResolver> resolver = Create<CompositeTraceResolver> ();
   resolver->AddChild ("queue", m_queue);
-  resolver->Add ("rx",
-                 m_rxTrace,
-                 PointToPointTraceType ());
+  resolver->AddSource ("rx",
+                       m_rxTrace,
+                       PointToPointTraceType ());
   resolver->SetParent (NetDevice::GetTraceResolver ());
   return resolver;
 }
diff --git a/src/internet-node/ipv4-l3-protocol.cc b/src/internet-node/ipv4-l3-protocol.cc
index 75320e886..2e3f4a421 100644
--- a/src/internet-node/ipv4-l3-protocol.cc
+++ b/src/internet-node/ipv4-l3-protocol.cc
@@ -152,9 +152,9 @@ Ptr<TraceResolver>
 Ipv4L3Protocol::GetTraceResolver (void)
 {
   Ptr<CompositeTraceResolver> resolver = Create<CompositeTraceResolver> ();
-  resolver->Add ("tx", m_txTrace, Ipv4L3ProtocolTraceContextElement(Ipv4L3ProtocolTraceContextElement::TX));
-  resolver->Add ("rx", m_rxTrace, Ipv4L3ProtocolTraceContextElement(Ipv4L3ProtocolTraceContextElement::RX));
-  resolver->Add ("drop", m_dropTrace, Ipv4L3ProtocolTraceContextElement (Ipv4L3ProtocolTraceContextElement::DROP));
+  resolver->AddSource ("tx", m_txTrace, Ipv4L3ProtocolTraceContextElement(Ipv4L3ProtocolTraceContextElement::TX));
+  resolver->AddSource ("rx", m_rxTrace, Ipv4L3ProtocolTraceContextElement(Ipv4L3ProtocolTraceContextElement::RX));
+  resolver->AddSource ("drop", m_dropTrace, Ipv4L3ProtocolTraceContextElement (Ipv4L3ProtocolTraceContextElement::DROP));
   resolver->AddArray ("interfaces", 
                       m_interfaces.begin (), m_interfaces.end (), 
                       Ipv4L3ProtocolInterfaceIndex ());
diff --git a/src/mobility/mobility-model-notifier.cc b/src/mobility/mobility-model-notifier.cc
index adea6d771..ffab72953 100644
--- a/src/mobility/mobility-model-notifier.cc
+++ b/src/mobility/mobility-model-notifier.cc
@@ -44,7 +44,7 @@ MobilityModelNotifier::GetTraceResolver (void)
 {
   Ptr<CompositeTraceResolver> resolver = 
     Create<CompositeTraceResolver> ();
-  resolver->Add ("course-change", m_trace);
+  resolver->AddSource ("course-change", m_trace);
   return resolver;
 }
 
diff --git a/src/node/queue.cc b/src/node/queue.cc
index 78ad9369c..00b6f5387 100644
--- a/src/node/queue.cc
+++ b/src/node/queue.cc
@@ -98,9 +98,9 @@ Ptr<TraceResolver>
 Queue::GetTraceResolver (void)
 {
   Ptr<CompositeTraceResolver> resolver = Create<CompositeTraceResolver> ();
-  resolver->Add ("enqueue", m_traceEnqueue, QueueTraceType (QueueTraceType::ENQUEUE));
-  resolver->Add ("dequeue", m_traceDequeue, QueueTraceType (QueueTraceType::DEQUEUE));
-  resolver->Add ("drop", m_traceDrop, QueueTraceType (QueueTraceType::DROP));
+  resolver->AddSource ("enqueue", m_traceEnqueue, QueueTraceType (QueueTraceType::ENQUEUE));
+  resolver->AddSource ("dequeue", m_traceDequeue, QueueTraceType (QueueTraceType::DEQUEUE));
+  resolver->AddSource ("drop", m_traceDrop, QueueTraceType (QueueTraceType::DROP));
   resolver->SetParent (Object::GetTraceResolver ());
   return resolver;
 }