--- a/src/internet-stack/udp-socket-impl.cc	Fri Jun 05 09:46:08 2009 -0700
+++ b/src/internet-stack/udp-socket-impl.cc	Mon Jun 08 09:19:00 2009 +0200
@@ -325,17 +325,17 @@
     {
       SocketIpTtlTag tag;
       tag.SetTtl (m_ipMulticastTtl);
-      p->AddTag (tag);
+      p->AddPacketTag (tag);
     }
   else if (m_ipTtl != 0 && !dest.IsMulticast () && !dest.IsBroadcast ())
     {
       SocketIpTtlTag tag;
       tag.SetTtl (m_ipTtl);
-      p->AddTag (tag);
+      p->AddPacketTag (tag);
     }
   {
     SocketSetDontFragmentTag tag;
-    bool found = p->FindFirstMatchingTag (tag);
+    bool found = p->RemovePacketTag (tag);
     if (!found)
       {
         if (m_mtuDiscover)
@@ -346,7 +346,7 @@
           {
             tag.Disable ();
           }
-        p->AddTag (tag);
+        p->AddPacketTag (tag);
       }
   }
   //
@@ -490,7 +490,7 @@
     {
       SocketAddressTag tag;
       bool found;
-      found = packet->FindFirstMatchingTag (tag);
+      found = packet->PeekPacketTag (tag);
       NS_ASSERT (found);
       fromAddress = tag.GetAddress ();
     }
@@ -554,7 +554,7 @@
       Address address = InetSocketAddress (ipv4, port);
       SocketAddressTag tag;
       tag.SetAddress (address);
-      packet->AddTag (tag);
+      packet->AddPacketTag (tag);
       m_deliveryQueue.push (packet);
       m_rxAvailable += packet->GetSize ();
       NotifyDataRecv ();