--- a/examples/simple-p2p.cc	Mon Jun 04 18:05:36 2007 +0200
+++ b/examples/simple-p2p.cc	Mon Jun 04 18:25:43 2007 +0200
@@ -58,7 +58,7 @@
 #include "ns3/p2p-net-device.h"
 #include "ns3/mac-address.h"
 #include "ns3/ipv4-address.h"
-#include "ns3/i-ipv4.h"
+#include "ns3/ipv4.h"
 #include "ns3/socket.h"
 #include "ns3/ipv4-route.h"
 #include "ns3/drop-tail.h"
@@ -170,10 +170,10 @@
 
   // Here, finish off packet routing configuration
   // This will likely set by some global StaticRouting object in the future
-  Ptr<IIpv4> ipv4;
-  ipv4 = n0->QueryInterface<IIpv4> (IIpv4::iid);
+  Ptr<Ipv4> ipv4;
+  ipv4 = n0->QueryInterface<Ipv4> (Ipv4::iid);
   ipv4->SetDefaultRoute (Ipv4Address ("10.1.1.2"), 1);
-  ipv4 = n3->QueryInterface<IIpv4> (IIpv4::iid);
+  ipv4 = n3->QueryInterface<Ipv4> (Ipv4::iid);
   ipv4->SetDefaultRoute (Ipv4Address ("10.1.3.1"), 1);
   
   // Configure tracing of all enqueue, dequeue, and NetDevice receive events

--- a/src/devices/p2p/p2p-topology.cc	Mon Jun 04 18:05:36 2007 +0200
+++ b/src/devices/p2p/p2p-topology.cc	Mon Jun 04 18:25:43 2007 +0200
@@ -29,7 +29,7 @@
 #include "ns3/nstime.h"
 #include "ns3/internet-node.h"
 #include "ns3/ipv4-address.h"
-#include "ns3/i-ipv4.h"
+#include "ns3/ipv4.h"
 #include "ns3/queue.h"
 
 #include "p2p-channel.h"
@@ -87,14 +87,14 @@
   NS_ASSERT (nd1->GetNode ()->GetId () == n1->GetId ());
   NS_ASSERT (nd2->GetNode ()->GetId () == n2->GetId ());
   
-  Ptr<IIpv4> ip1 = n1->QueryInterface<IIpv4> (IIpv4::iid);
+  Ptr<Ipv4> ip1 = n1->QueryInterface<Ipv4> (Ipv4::iid);
   uint32_t index1 = ip1->AddInterface (nd1);
 
   ip1->SetAddress (index1, addr1);
   ip1->SetNetworkMask (index1, netmask);
   ip1->SetUp (index1);
 
-  Ptr<IIpv4> ip2 = n2->QueryInterface<IIpv4> (IIpv4::iid);
+  Ptr<Ipv4> ip2 = n2->QueryInterface<Ipv4> (Ipv4::iid);
   uint32_t index2 = ip2->AddInterface (nd2);
 
   ip2->SetAddress (index2, addr2);
@@ -135,8 +135,8 @@
     }
 
   // Assert that both are Ipv4 nodes
-  Ptr<IIpv4> ip1 = nd1->GetNode ()->QueryInterface<IIpv4> (IIpv4::iid);
-  Ptr<IIpv4> ip2 = nd2->GetNode ()->QueryInterface<IIpv4> (IIpv4::iid);
+  Ptr<Ipv4> ip1 = nd1->GetNode ()->QueryInterface<Ipv4> (Ipv4::iid);
+  Ptr<Ipv4> ip2 = nd2->GetNode ()->QueryInterface<Ipv4> (Ipv4::iid);
   NS_ASSERT(ip1 != 0 && ip2 != 0);
 
   // Get interface indexes for both nodes corresponding to the right channel

--- a/src/internet-node/arp-l3-protocol.h	Mon Jun 04 18:05:36 2007 +0200
+++ b/src/internet-node/arp-l3-protocol.h	Mon Jun 04 18:25:43 2007 +0200
@@ -18,8 +18,8 @@
  *
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
-#ifndef ARP_H
-#define ARP_H
+#ifndef ARP_L3_PROTOCOL_H
+#define ARP_L3_PROTOCOL_H
 
 #include <list>
 #include "ns3/ipv4-address.h"
@@ -79,4 +79,4 @@
 }//namespace ns3
 
 
-#endif /* ARP_H */
+#endif /* ARP_L3_PROTOCOL_H */

--- a/src/internet-node/ipv4-impl.h	Mon Jun 04 18:05:36 2007 +0200
+++ b/src/internet-node/ipv4-impl.h	Mon Jun 04 18:25:43 2007 +0200
@@ -28,7 +28,7 @@
 
 class Ipv4L3Protocol;
 
-class Ipv4Impl : public IIpv4
+class Ipv4Impl : public Ipv4
 {
 public:
   Ipv4Impl (Ptr<Ipv4L3Protocol> ipv4);

--- a/src/internet-node/ipv4-l3-protocol.h	Mon Jun 04 18:05:36 2007 +0200
+++ b/src/internet-node/ipv4-l3-protocol.h	Mon Jun 04 18:25:43 2007 +0200
@@ -19,8 +19,8 @@
 // Author: George F. Riley<riley@ece.gatech.edu>
 //
 
-#ifndef IPV4_H
-#define IPV4_H
+#ifndef IPV4_L3_PROTOCOL_H
+#define IPV4_L3_PROTOCOL_H
 
 #include <list>
 #include <stdint.h>
@@ -177,4 +177,4 @@
 
 } // Namespace ns3
 
-#endif
+#endif /* IPV$_L3_PROTOCOL_H */

--- a/src/node/ipv4.cc	Mon Jun 04 18:05:36 2007 +0200
+++ b/src/node/ipv4.cc	Mon Jun 04 18:25:43 2007 +0200
@@ -22,14 +22,14 @@
 
 namespace ns3 {
 
-const InterfaceId IIpv4::iid = MakeInterfaceId ("IIpv4", Object::iid);
+const InterfaceId Ipv4::iid = MakeInterfaceId ("Ipv4", Object::iid);
 
-IIpv4::IIpv4 ()
+Ipv4::Ipv4 ()
 {
-  SetInterfaceId (IIpv4::iid);
+  SetInterfaceId (Ipv4::iid);
 }
 
-IIpv4::~IIpv4 ()
+Ipv4::~Ipv4 ()
 {}
 
 } // namespace ns3

--- a/src/node/ipv4.h	Mon Jun 04 18:05:36 2007 +0200
+++ b/src/node/ipv4.h	Mon Jun 04 18:25:43 2007 +0200
@@ -18,8 +18,8 @@
  *
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
-#ifndef I_IPV4_H
-#define I_IPV4_H
+#ifndef IPV4_H
+#define IPV4_H
 
 #include <stdint.h>
 #include "ns3/ipv4-address.h"
@@ -40,12 +40,12 @@
  * This class also allows you to control the content of the ipv4 
  * forwarding table.
  */
-class IIpv4 : public Object
+class Ipv4 : public Object
 {
 public:
   static const InterfaceId iid;
-  IIpv4 ();
-  virtual ~IIpv4 ();
+  Ipv4 ();
+  virtual ~Ipv4 ();
     
   /**
    * \param dest destination address
@@ -188,4 +188,4 @@
 
 } // namespace ns3 
 
-#endif /* I_IPV4_H */
+#endif /* IPV4_H */