--- a/src/internet-node/arp-l3-protocol.cc	Mon Jun 04 17:40:09 2007 +0200
+++ b/src/internet-node/arp-l3-protocol.cc	Mon Jun 04 17:42:37 2007 +0200
@@ -72,7 +72,7 @@
 	  return *i;
 	}
     }
-  Ptr<IIpv4Private> ipv4 = m_node->QueryInterface<IIpv4Private> (IIpv4Private::iid);
+  Ptr<Ipv4Private> ipv4 = m_node->QueryInterface<Ipv4Private> (Ipv4Private::iid);
   Ipv4Interface *interface = ipv4->FindInterfaceForDevice (device);
   ArpCache * cache = new ArpCache (device, interface);
   NS_ASSERT (device->IsBroadcast ());

--- a/src/internet-node/internet-node.cc	Mon Jun 04 17:40:09 2007 +0200
+++ b/src/internet-node/internet-node.cc	Mon Jun 04 17:42:37 2007 +0200
@@ -68,7 +68,7 @@
   Ptr<UdpImpl> udpImpl = Create<UdpImpl> (udp);
   Ptr<ArpPrivate> arpPrivate = Create<ArpPrivate> (arp);
   Ptr<Ipv4Impl> ipv4Impl = Create<Ipv4Impl> (ipv4);
-  Ptr<IIpv4Private> ipv4Private = Create<IIpv4Private> (ipv4);
+  Ptr<Ipv4Private> ipv4Private = Create<Ipv4Private> (ipv4);
 
   Object::AddInterface (ipv4Private);
   Object::AddInterface (ipv4Impl);
@@ -83,9 +83,9 @@
 InternetNode::DoCreateTraceResolver (TraceContext const &context)
 {
   CompositeTraceResolver *resolver = new CompositeTraceResolver (context);
-  Ptr<IIpv4Private> ipv4 = QueryInterface<IIpv4Private> (IIpv4Private::iid);
+  Ptr<Ipv4Private> ipv4 = QueryInterface<Ipv4Private> (Ipv4Private::iid);
   resolver->Add ("ipv4",
-                 MakeCallback (&IIpv4Private::CreateTraceResolver, PeekPointer (ipv4)),
+                 MakeCallback (&Ipv4Private::CreateTraceResolver, PeekPointer (ipv4)),
                  InternetNode::IPV4);
 
   return resolver;

--- a/src/internet-node/ipv4-loopback-interface.cc	Mon Jun 04 17:40:09 2007 +0200
+++ b/src/internet-node/ipv4-loopback-interface.cc	Mon Jun 04 17:42:37 2007 +0200
@@ -43,7 +43,7 @@
 void 
 Ipv4LoopbackInterface::SendTo (Packet packet, Ipv4Address dest)
 {
-  Ptr<IIpv4Private> ipv4 = m_node->QueryInterface<IIpv4Private> (IIpv4Private::iid);
+  Ptr<Ipv4Private> ipv4 = m_node->QueryInterface<Ipv4Private> (Ipv4Private::iid);
   ipv4->Receive (packet, GetDevice ());
 }
 

--- a/src/internet-node/ipv4-private.cc	Mon Jun 04 17:40:09 2007 +0200
+++ b/src/internet-node/ipv4-private.cc	Mon Jun 04 17:42:37 2007 +0200
@@ -25,40 +25,40 @@
 
 namespace ns3 {
 
-const InterfaceId IIpv4Private::iid = MakeInterfaceId ("IIpv4Private", Object::iid);
+const InterfaceId Ipv4Private::iid = MakeInterfaceId ("Ipv4Private", Object::iid);
 
-IIpv4Private::IIpv4Private (Ptr<Ipv4L3Protocol> ipv4)
+Ipv4Private::Ipv4Private (Ptr<Ipv4L3Protocol> ipv4)
   : m_ipv4 (ipv4)
 {
-  SetInterfaceId (IIpv4Private::iid);
+  SetInterfaceId (Ipv4Private::iid);
 }
-IIpv4Private::~IIpv4Private ()
+Ipv4Private::~Ipv4Private ()
 {
   NS_ASSERT (m_ipv4 == 0);
 }
 TraceResolver *
-IIpv4Private::CreateTraceResolver (TraceContext const &context)
+Ipv4Private::CreateTraceResolver (TraceContext const &context)
 {
   return m_ipv4->CreateTraceResolver (context);
 }
 void 
-IIpv4Private::Send (Packet const &packet, Ipv4Address source, 
+Ipv4Private::Send (Packet const &packet, Ipv4Address source, 
 		    Ipv4Address destination, uint8_t protocol)
 {
   m_ipv4->Send (packet, source, destination, protocol);
 }
 Ipv4Interface *
-IIpv4Private::FindInterfaceForDevice (Ptr<const NetDevice>device)
+Ipv4Private::FindInterfaceForDevice (Ptr<const NetDevice>device)
 {
   return m_ipv4->FindInterfaceForDevice (device);
 }
 void 
-IIpv4Private::Receive(Packet& p, Ptr<NetDevice> device)
+Ipv4Private::Receive(Packet& p, Ptr<NetDevice> device)
 {
   m_ipv4->Receive (p, device);
 }
 void 
-IIpv4Private::DoDispose (void)
+Ipv4Private::DoDispose (void)
 {
   m_ipv4 = 0;
   Object::DoDispose ();

--- a/src/internet-node/ipv4-private.h	Mon Jun 04 17:40:09 2007 +0200
+++ b/src/internet-node/ipv4-private.h	Mon Jun 04 17:42:37 2007 +0200
@@ -18,8 +18,8 @@
  *
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
-#ifndef I_IPV4_PRIVATE_H
-#define I_IPV4_PRIVATE_H
+#ifndef IPV4_PRIVATE_H
+#define IPV4_PRIVATE_H
 
 #include "ns3/object.h"
 #include "ns3/ipv4-address.h"
@@ -35,12 +35,12 @@
 class Ipv4Interface;
 class NetDevice;
 
-class IIpv4Private : public Object
+class Ipv4Private : public Object
 {
 public:
   static const InterfaceId iid;
-  IIpv4Private (Ptr<Ipv4L3Protocol> ipv4);
-  virtual ~IIpv4Private ();
+  Ipv4Private (Ptr<Ipv4L3Protocol> ipv4);
+  virtual ~Ipv4Private ();
 
   TraceResolver *CreateTraceResolver (TraceContext const &context);
   void Send (Packet const &packet, Ipv4Address source, 
@@ -55,4 +55,4 @@
 
 } // namespace ns3
 
-#endif /* I_IPV4_PRIVATE_H */
+#endif /* IPV4_PRIVATE_H */

--- a/src/internet-node/udp-l4-protocol.cc	Mon Jun 04 17:40:09 2007 +0200
+++ b/src/internet-node/udp-l4-protocol.cc	Mon Jun 04 17:42:37 2007 +0200
@@ -137,7 +137,7 @@
 
   packet.AddHeader (udpHeader);
 
-  Ptr<IIpv4Private> ipv4 = m_node->QueryInterface<IIpv4Private> (IIpv4Private::iid);
+  Ptr<Ipv4Private> ipv4 = m_node->QueryInterface<Ipv4Private> (Ipv4Private::iid);
   if (ipv4 != 0)
     {
       ipv4->Send (packet, saddr, daddr, PROT_NUMBER);