--- a/examples/wifi-adhoc.cc	Mon Apr 28 21:54:48 2008 -0700
+++ b/examples/wifi-adhoc.cc	Fri May 02 09:21:01 2008 -0700
@@ -108,7 +108,7 @@
   Ptr<SocketFactory> socketFactory = node->GetObject<SocketFactory> (tid);
   Ptr<Socket> sink = socketFactory->CreateSocket ();
   sink->Bind ();
-  sink->SetRecv_Callback (MakeCallback (&Experiment::ReceivePacket, this));
+  sink->SetRecvCallback (MakeCallback (&Experiment::ReceivePacket, this));
   return sink;
 }
 

--- a/samples/main-simple.cc	Mon Apr 28 21:54:48 2008 -0700
+++ b/samples/main-simple.cc	Fri May 02 09:21:01 2008 -0700
@@ -37,7 +37,7 @@
 static void
 PrintTraffic (Ptr<Socket> socket)
 {
-  socket->SetRecv_Callback (MakeCallback (&SocketPrinter));
+  socket->SetRecvCallback (MakeCallback (&SocketPrinter));
 }
 
 void

--- a/src/applications/packet-sink/packet-sink.cc	Mon Apr 28 21:54:48 2008 -0700
+++ b/src/applications/packet-sink/packet-sink.cc	Fri May 02 09:21:01 2008 -0700
@@ -87,7 +87,7 @@
       m_socket->Listen (0);
     }
 
-  m_socket->SetRecv_Callback (MakeCallback(&PacketSink::HandleRead, this));
+  m_socket->SetRecvCallback (MakeCallback(&PacketSink::HandleRead, this));
   m_socket->SetAcceptCallback (
             MakeNullCallback<bool, Ptr<Socket>, const Address &> (),
             MakeNullCallback<void, Ptr<Socket>, const Address&> (),
@@ -98,7 +98,7 @@
 {
   if (m_socket) 
     {
-      m_socket->SetRecv_Callback (MakeNullCallback<void, Ptr<Socket> > ());
+      m_socket->SetRecvCallback (MakeNullCallback<void, Ptr<Socket> > ());
     }
 }
 

--- a/src/applications/udp-echo/udp-echo-client.cc	Mon Apr 28 21:54:48 2008 -0700
+++ b/src/applications/udp-echo/udp-echo-client.cc	Fri May 02 09:21:01 2008 -0700
@@ -103,7 +103,7 @@
       m_socket->Connect (InetSocketAddress (m_peerAddress, m_peerPort));
     }
 
-  m_socket->SetRecv_Callback(MakeCallback(&UdpEchoClient::HandleRead, this));
+  m_socket->SetRecvCallback(MakeCallback(&UdpEchoClient::HandleRead, this));
 
   ScheduleTransmit (Seconds(0.));
 }
@@ -115,7 +115,7 @@
 
   if (!m_socket) 
     {
-      m_socket->SetRecv_Callback(MakeNullCallback<void, Ptr<Socket> > ());
+      m_socket->SetRecvCallback(MakeNullCallback<void, Ptr<Socket> > ());
     }
 
   Simulator::Cancel(m_sendEvent);

--- a/src/applications/udp-echo/udp-echo-server.cc	Mon Apr 28 21:54:48 2008 -0700
+++ b/src/applications/udp-echo/udp-echo-server.cc	Fri May 02 09:21:01 2008 -0700
@@ -79,7 +79,7 @@
       m_socket->Bind (local);
     }
 
-  m_socket->SetRecv_Callback(MakeCallback(&UdpEchoServer::HandleRead, this));
+  m_socket->SetRecvCallback(MakeCallback(&UdpEchoServer::HandleRead, this));
 }
 
 void 
@@ -89,7 +89,7 @@
 
   if (!m_socket) 
     {
-      m_socket->SetRecv_Callback(MakeNullCallback<void, Ptr<Socket> > ());
+      m_socket->SetRecvCallback(MakeNullCallback<void, Ptr<Socket> > ());
     }
 }
 

--- a/src/internet-node/udp-socket.cc	Mon Apr 28 21:54:48 2008 -0700
+++ b/src/internet-node/udp-socket.cc	Fri May 02 09:21:01 2008 -0700
@@ -491,18 +491,10 @@
   Ptr<SocketFactory> rxSocketFactory = rxNode->GetObject<Udp> ();
   Ptr<Socket> rxSocket = rxSocketFactory->CreateSocket ();
   NS_TEST_ASSERT_EQUAL (rxSocket->Bind (InetSocketAddress (Ipv4Address ("10.0.0.1"), 1234)), 0);
-#ifdef OLDSEMANTICS
-  rxSocket->SetRecvCallback (MakeCallback (&UdpSocketTest::ReceivePacket, this));
-#else
-  rxSocket->SetRecv_Callback (MakeCallback (&UdpSocketTest::ReceivePkt, this));
-#endif
+  rxSocket->SetRecvCallback (MakeCallback (&UdpSocketTest::ReceivePkt, this));
 
   Ptr<Socket> rxSocket2 = rxSocketFactory->CreateSocket ();
-#ifdef OLDSEMANTICS
-  rxSocket2->SetRecvCallback (MakeCallback (&UdpSocketTest::ReceivePacket2, this));
-#else
-  rxSocket2->SetRecv_Callback (MakeCallback (&UdpSocketTest::ReceivePkt2, this));
-#endif
+  rxSocket2->SetRecvCallback (MakeCallback (&UdpSocketTest::ReceivePkt2, this));
   NS_TEST_ASSERT_EQUAL (rxSocket2->Bind (InetSocketAddress (Ipv4Address ("10.0.1.1"), 1234)), 0);
 
   Ptr<SocketFactory> txSocketFactory = txNode->GetObject<Udp> ();
@@ -543,11 +535,7 @@
   // the socket address matches.
   rxSocket2->Dispose ();
   rxSocket2 = rxSocketFactory->CreateSocket ();
-#ifdef OLDSEMANTICS
-  rxSocket2->SetRecvCallback (MakeCallback (&UdpSocketTest::ReceivePacket2, this));
-#else
-  rxSocket2->SetRecv_Callback (MakeCallback (&UdpSocketTest::ReceivePkt2, this));
-#endif
+  rxSocket2->SetRecvCallback (MakeCallback (&UdpSocketTest::ReceivePkt2, this));
   NS_TEST_ASSERT_EQUAL (rxSocket2->Bind (InetSocketAddress (Ipv4Address ("0.0.0.0"), 1234)), 0);
 
   m_receivedPacket = Create<Packet> ();

--- a/src/node/socket.cc	Mon Apr 28 21:54:48 2008 -0700
+++ b/src/node/socket.cc	Fri May 02 09:21:01 2008 -0700
@@ -80,10 +80,10 @@
 }
 
 void 
-Socket::SetRecv_Callback (Callback<void, Ptr<Socket> > receivedData)
+Socket::SetRecvCallback (Callback<void, Ptr<Socket> > receivedData)
 {
   NS_LOG_FUNCTION_NOARGS ();
-  m_receivedData_ = receivedData;
+  m_receivedData = receivedData;
 }
 
 int Socket::Listen (uint32_t queueLimit)
@@ -224,9 +224,9 @@
 Socket::NotifyDataRecv (void)
 {
   NS_LOG_FUNCTION_NOARGS ();
-  if (!m_receivedData_.IsNull ())
+  if (!m_receivedData.IsNull ())
     {
-      m_receivedData_ (this);
+      m_receivedData (this);
     }
 }
 

--- a/src/node/socket.h	Mon Apr 28 21:54:48 2008 -0700
+++ b/src/node/socket.h	Fri May 02 09:21:01 2008 -0700
@@ -153,11 +153,13 @@
    */
   void SetSendCallback (Callback<void, Ptr<Socket>, uint32_t> sendCb);
   /**
-   * \brief Receive data
-   * \param receivedData Invoked whenever new data is received.
+   * \brief Notify application when new data is available to be read.
    *
+   *        This callback is intended to notify a socket that would
+   *        have been blocked in a blocking socket model that data
+   *        is available to be read.
    */
-  void SetRecv_Callback (Callback<void, Ptr<Socket> >);
+  void SetRecvCallback (Callback<void, Ptr<Socket> >);
   /** 
    * \param address the address to try to allocate
    * \returns 0 on success, -1 on failure.
@@ -283,7 +285,7 @@
   Callback<void, Ptr<Socket>, const Address&>    m_newConnectionCreated;
   Callback<void, Ptr<Socket>, uint32_t>          m_dataSent;
   Callback<void, Ptr<Socket>, uint32_t >         m_sendCb;
-  Callback<void, Ptr<Socket> > m_receivedData_;
+  Callback<void, Ptr<Socket> > m_receivedData;
 };
 
 /**

--- a/src/routing/olsr/olsr-agent-impl.cc	Mon Apr 28 21:54:48 2008 -0700
+++ b/src/routing/olsr/olsr-agent-impl.cc	Fri May 02 09:21:01 2008 -0700
@@ -282,7 +282,7 @@
 
       // Create a socket to listen only on this interface
       Ptr<Socket> socket = socketFactory->CreateSocket ();
-      socket->SetRecv_Callback (MakeCallback (&AgentImpl::RecvOlsr,  this));
+      socket->SetRecvCallback (MakeCallback (&AgentImpl::RecvOlsr,  this));
       if (socket->Bind (InetSocketAddress (addr, OLSR_PORT_NUMBER)))
         {
           NS_FATAL_ERROR ("Failed to bind() OLSR receive socket");