diff --git a/examples/csma-broadcast.cc b/examples/csma-broadcast.cc
index 0ba6690b5..46d60d28c 100644
--- a/examples/csma-broadcast.cc
+++ b/examples/csma-broadcast.cc
@@ -106,7 +106,7 @@ main (int argc, char *argv[])
   
   // Create an optional packet sink to receive these packets
   PacketSinkHelper sink;
-  sink.SetupUdp (Ipv4Address::GetAny (), port);
+  sink.SetUdpLocal (Ipv4Address::GetAny (), port);
   sink.Install (c0.Get (1));
   sink.Install (c1.Get (1));
 
diff --git a/examples/csma-multicast.cc b/examples/csma-multicast.cc
index cffdd2584..2bd0587bc 100644
--- a/examples/csma-multicast.cc
+++ b/examples/csma-multicast.cc
@@ -157,7 +157,7 @@ main (int argc, char *argv[])
 
   // Create an optional packet sink to receive these packets
   PacketSinkHelper sink;
-  sink.SetupUdp (Ipv4Address::GetAny(), multicastPort);
+  sink.SetUdpLocal (Ipv4Address::GetAny(), multicastPort);
   ApplicationContainer sinkC = sink.Install (c1.Get (2)); // Node n4 
   // Start the sink
   sinkC.Start (Seconds (1.0));
diff --git a/examples/csma-one-subnet.cc b/examples/csma-one-subnet.cc
index 069d0cebd..285a4f57e 100644
--- a/examples/csma-one-subnet.cc
+++ b/examples/csma-one-subnet.cc
@@ -106,7 +106,7 @@ main (int argc, char *argv[])
 
   // Create an optional packet sink to receive these packets
   PacketSinkHelper sink;
-  sink.SetupUdp (Ipv4Address::GetAny (), port);
+  sink.SetUdpLocal (Ipv4Address::GetAny (), port);
   sink.Install (c.Get (1));
 
 // 
diff --git a/examples/simple-alternate-routing.cc b/examples/simple-alternate-routing.cc
index 8f6018e1e..4ed438b99 100644
--- a/examples/simple-alternate-routing.cc
+++ b/examples/simple-alternate-routing.cc
@@ -150,7 +150,7 @@ main (int argc, char *argv[])
 
   // Create a packet sink to receive these packets
   PacketSinkHelper sink;
-  sink.SetupUdp (Ipv4Address::GetAny (), port);
+  sink.SetUdpLocal (Ipv4Address::GetAny (), port);
   apps = sink.Install (c.Get (1));
   apps.Start (Seconds (1.1));
   apps.Stop (Seconds (10.0));
diff --git a/examples/simple-error-model.cc b/examples/simple-error-model.cc
index 500b88ad1..9ce93bfc6 100644
--- a/examples/simple-error-model.cc
+++ b/examples/simple-error-model.cc
@@ -130,7 +130,7 @@ main (int argc, char *argv[])
 
   // Create an optional packet sink to receive these packets
   PacketSinkHelper sink;
-  sink.SetupUdp (Ipv4Address::GetAny (), port);
+  sink.SetUdpLocal (Ipv4Address::GetAny (), port);
   apps = sink.Install (c.Get (3));
   apps.Start (Seconds (1.0));
   apps.Stop (Seconds (10.0));
@@ -142,7 +142,7 @@ main (int argc, char *argv[])
   apps.Stop (Seconds(10.0));
 
   // Create a packet sink to receive these packets
-  sink.SetupUdp (Ipv4Address::GetAny (), port);
+  sink.SetUdpLocal (Ipv4Address::GetAny (), port);
   apps = sink.Install (c.Get (1));
   apps.Start (Seconds (1.1));
   apps.Stop (Seconds (10.0));
diff --git a/examples/simple-global-routing.cc b/examples/simple-global-routing.cc
index 1f4b4b906..21be471b2 100644
--- a/examples/simple-global-routing.cc
+++ b/examples/simple-global-routing.cc
@@ -131,7 +131,7 @@ main (int argc, char *argv[])
 
   // Create a packet sink to receive these packets
   PacketSinkHelper sink;
-  sink.SetupUdp (Ipv4Address::GetAny (), port);
+  sink.SetUdpLocal (Ipv4Address::GetAny (), port);
   apps = sink.Install (c.Get (3));
   apps.Start (Seconds (1.0));
   apps.Stop (Seconds (10.0));
diff --git a/examples/simple-point-to-point-olsr.cc b/examples/simple-point-to-point-olsr.cc
index 63d6f3653..cfa603121 100644
--- a/examples/simple-point-to-point-olsr.cc
+++ b/examples/simple-point-to-point-olsr.cc
@@ -135,7 +135,7 @@ main (int argc, char *argv[])
 
   // Create a packet sink to receive these packets
   PacketSinkHelper sink;
-  sink.SetupUdp (Ipv4Address::GetAny (), port);
+  sink.SetUdpLocal (Ipv4Address::GetAny (), port);
   apps = sink.Install (c.Get (3));
   apps.Start (Seconds (1.0));
   apps.Stop (Seconds (10.0));
diff --git a/examples/tcp-large-transfer.cc b/examples/tcp-large-transfer.cc
index d931b4ae5..1a844578d 100644
--- a/examples/tcp-large-transfer.cc
+++ b/examples/tcp-large-transfer.cc
@@ -170,7 +170,7 @@ int main (int argc, char *argv[])
 
   // Create a packet sink to receive these packets
   PacketSinkHelper sink;
-  sink.SetupTcp (Ipv4Address::GetAny (), servPort);
+  sink.SetTcpLocal (Ipv4Address::GetAny (), servPort);
   ApplicationContainer apps = sink.Install (c1.Get (1));
   apps.Start (Seconds (0.0));
 
diff --git a/src/helper/packet-sink-helper.cc b/src/helper/packet-sink-helper.cc
index bab7178e9..d4501ccb6 100644
--- a/src/helper/packet-sink-helper.cc
+++ b/src/helper/packet-sink-helper.cc
@@ -29,13 +29,13 @@ PacketSinkHelper::PacketSinkHelper ()
 }
 
 void 
-PacketSinkHelper::SetupUdp (Ipv4Address ip, uint16_t port)
+PacketSinkHelper::SetUdpLocal (Ipv4Address ip, uint16_t port)
 {
   m_factory.Set ("Protocol", String ("ns3::Udp"));
   m_factory.Set ("Local", Address (InetSocketAddress (ip, port)));
 }
 void 
-PacketSinkHelper::SetupTcp (Ipv4Address ip, uint16_t port)
+PacketSinkHelper::SetTcpLocal (Ipv4Address ip, uint16_t port)
 {
   m_factory.Set ("Protocol", String ("ns3::Tcp"));
   m_factory.Set ("Local", Address (InetSocketAddress (ip, port)));
diff --git a/src/helper/packet-sink-helper.h b/src/helper/packet-sink-helper.h
index 6e39c6140..5254064d3 100644
--- a/src/helper/packet-sink-helper.h
+++ b/src/helper/packet-sink-helper.h
@@ -32,8 +32,8 @@ class PacketSinkHelper
 public:
   PacketSinkHelper ();
 
-  void SetupUdp (Ipv4Address ip, uint16_t port);
-  void SetupTcp (Ipv4Address ip, uint16_t port);
+  void SetUdpLocal (Ipv4Address ip, uint16_t port);
+  void SetTcpLocal (Ipv4Address ip, uint16_t port);
 
   ApplicationContainer Install (NodeContainer c);
 private: