--- a/examples/csma-broadcast.cc	Mon Sep 10 15:50:07 2007 -0700
+++ b/examples/csma-broadcast.cc	Mon Sep 10 15:57:33 2007 -0700
@@ -103,13 +103,13 @@
     CsmaTopology::CreateCsmaChannel(
       DataRate(5000000), MilliSeconds(2));
 
-  uint32_t n0ifIndex0 = CsmaIpv4Topology::AddIpv4CsmaNode (n0, channel0, 
+  uint32_t n0ifIndex0 = CsmaIpv4Topology::AddIpv4CsmaNetDevice (n0, channel0, 
                                          Eui48Address("10:54:23:54:0:50"));
-  uint32_t n0ifIndex1 = CsmaIpv4Topology::AddIpv4CsmaNode (n0, channel1, 
+  uint32_t n0ifIndex1 = CsmaIpv4Topology::AddIpv4CsmaNetDevice (n0, channel1, 
                                          Eui48Address("10:54:23:54:0:51"));
-  uint32_t n1ifIndex = CsmaIpv4Topology::AddIpv4CsmaNode (n1, channel0,
+  uint32_t n1ifIndex = CsmaIpv4Topology::AddIpv4CsmaNetDevice (n1, channel0,
                                          Eui48Address("10:54:23:54:23:51"));
-  uint32_t n2ifIndex = CsmaIpv4Topology::AddIpv4CsmaNode (n2, channel1,
+  uint32_t n2ifIndex = CsmaIpv4Topology::AddIpv4CsmaNetDevice (n2, channel1,
                                          Eui48Address("10:54:23:54:23:52"));
 
   // Later, we add IP addresses.  

--- a/src/internet-node/udp-socket.cc	Mon Sep 10 15:50:07 2007 -0700
+++ b/src/internet-node/udp-socket.cc	Mon Sep 10 15:57:33 2007 -0700
@@ -255,7 +255,7 @@
 int
 UdpSocket::DoSendTo (const Packet &p, Ipv4Address dest, uint16_t port)
 {
-  NS_DEBUG("UdpSocket::DoSendTo (" << &p << ", " << addr << ", " <<
+  NS_DEBUG("UdpSocket::DoSendTo (" << &p << ", " << dest << ", " <<
     port << ")");
 
   Ipv4Route routeToDest;