--- a/src/internet-node/udp-impl.cc	Mon Jun 04 18:01:09 2007 +0200
+++ b/src/internet-node/udp-impl.cc	Mon Jun 04 18:03:26 2007 +0200
@@ -43,7 +43,7 @@
 UdpImpl::DoDispose (void)
 {
   m_udp = 0;
-  IUdp::DoDispose ();
+  Udp::DoDispose ();
 }
 
 } // namespace ns3

--- a/src/internet-node/udp-impl.h	Mon Jun 04 18:01:09 2007 +0200
+++ b/src/internet-node/udp-impl.h	Mon Jun 04 18:03:26 2007 +0200
@@ -28,7 +28,7 @@
 
 class UdpL4Protocol;
 
-class UdpImpl : public IUdp
+class UdpImpl : public Udp
 {
 public:
   UdpImpl (Ptr<UdpL4Protocol> udp);

--- a/src/node/udp.cc	Mon Jun 04 18:01:09 2007 +0200
+++ b/src/node/udp.cc	Mon Jun 04 18:03:26 2007 +0200
@@ -22,11 +22,11 @@
 
 namespace ns3 {
 
-const InterfaceId IUdp::iid = MakeInterfaceId ("IUdp", SocketFactory::iid);
+const InterfaceId Udp::iid = MakeInterfaceId ("Udp", SocketFactory::iid);
 
-IUdp::IUdp ()
+Udp::Udp ()
 {
-  SetInterfaceId (IUdp::iid);
+  SetInterfaceId (Udp::iid);
 }
 
 } // namespace ns3

--- a/src/node/udp.h	Mon Jun 04 18:01:09 2007 +0200
+++ b/src/node/udp.h	Mon Jun 04 18:03:26 2007 +0200
@@ -18,8 +18,8 @@
  *
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
-#ifndef I_UDP_H
-#define I_UDP_H
+#ifndef UDP_H
+#define UDP_H
 
 #include "socket-factory.h"
 
@@ -27,16 +27,16 @@
 
 class Socket;
 
-class IUdp : public SocketFactory
+class Udp : public SocketFactory
 {
 public:
   static const InterfaceId iid;
 
-  IUdp ();
+  Udp ();
 
   virtual Ptr<Socket> CreateSocket (void) = 0;
 };
 
 } // namespace ns3
 
-#endif /* I_UDP_H */
+#endif /* UDP_H */