diff -r 5091e3a14b26 bindings/python/ns3_module_internet_stack.py
--- a/bindings/python/ns3_module_internet_stack.py	Wed Nov 19 16:41:17 2008 -0800
+++ b/bindings/python/ns3_module_internet_stack.py	Thu Nov 20 04:07:42 2008 -0800
@@ -12,7 +12,7 @@ def register_types(module):
     ## icmpv4.h: ns3::Icmpv4Header [class]
     module.add_class('Icmpv4Header', parent=root_module['ns3::Header'])
     ## icmpv4.h: ns3::Icmpv4Header [enumeration]
-    module.add_enum('', ['ECHO_REPLY', 'DEST_UNREACH', 'ECHO', 'TIME_EXCEEDED'], outer_class=root_module['ns3::Icmpv4Header'])
+    module.add_enum('', ['ICMP_ECHO_REPLY', 'ICMP_DEST_UNREACH', 'ICMP_ECHO', 'ICMP_TIME_EXCEEDED'], outer_class=root_module['ns3::Icmpv4Header'])
     ## icmpv4.h: ns3::Icmpv4TimeExceeded [class]
     module.add_class('Icmpv4TimeExceeded', parent=root_module['ns3::Header'])
     ## icmpv4.h: ns3::Icmpv4TimeExceeded [enumeration]
diff -r 5091e3a14b26 bindings/python/ns3modulegen.py
--- a/bindings/python/ns3modulegen.py	Wed Nov 19 16:41:17 2008 -0800
+++ b/bindings/python/ns3modulegen.py	Thu Nov 20 04:07:43 2008 -0800
@@ -131,6 +131,11 @@ def main():
         for clsname in ['SystemThread', 'SystemMutex', 'SystemCondition', 'CriticalSection']:
             root_module.classes.remove(root_module['ns3::%s' % clsname])
 
+
+    if 'EmuNetDevice' not in enabled_features:
+        for clsname in ['EmuNetDevice', 'EmuHelper']:
+            root_module.classes.remove(root_module['ns3::%s' % clsname])
+
     if 'RealTime' not in enabled_features:
         for clsname in ['WallClockSynchronizer', 'RealtimeSimulatorImpl', 'RealtimeEventLock']:
             root_module.classes.remove(root_module['ns3::%s' % clsname])
diff -r 5091e3a14b26 src/applications/v4ping/v4ping.cc
--- a/src/applications/v4ping/v4ping.cc	Wed Nov 19 16:41:17 2008 -0800
+++ b/src/applications/v4ping/v4ping.cc	Thu Nov 20 04:07:43 2008 -0800
@@ -80,7 +80,7 @@ V4Ping::Receive (Ptr<Socket> socket)
       NS_ASSERT (ipv4.GetProtocol () == 1); // protocol should be icmp.
       Icmpv4Header icmp;
       p->RemoveHeader (icmp);
-      if (icmp.GetType () == Icmpv4Header::ECHO_REPLY)
+      if (icmp.GetType () == Icmpv4Header::ICMP_ECHO_REPLY)
 	{
 	  Icmpv4Echo echo;
 	  p->RemoveHeader (echo);
@@ -139,7 +139,7 @@ V4Ping::StartApplication (void)
   echo.SetData (dataPacket);
   p->AddHeader (echo);
   Icmpv4Header header;
-  header.SetType (Icmpv4Header::ECHO);
+  header.SetType (Icmpv4Header::ICMP_ECHO);
   header.SetCode (0);
   p->AddHeader (header);
   m_socket->Send (p, 0);
diff -r 5091e3a14b26 src/devices/emu/wscript
--- a/src/devices/emu/wscript	Wed Nov 19 16:41:17 2008 -0800
+++ b/src/devices/emu/wscript	Thu Nov 20 04:07:43 2008 -0800
@@ -6,7 +6,7 @@ def configure(conf):
     e.name = 'linux/if_ether.h'
     e.define = 'HAVE_IF_ETHER_H'
     conf.env['ENABLE_EMU'] = e.run()
-    conf.report_optional_feature("Low Level Ethernet Defintions", "Emulated Net Device",
+    conf.report_optional_feature("EmuNetDevice", "Emulated Net Device",
                                  conf.env['ENABLE_EMU'],
                                  "<linux/if_ether.h> include not detected")
 
diff -r 5091e3a14b26 src/internet-stack/icmpv4-l4-protocol.cc
--- a/src/internet-stack/icmpv4-l4-protocol.cc	Wed Nov 19 16:41:17 2008 -0800
+++ b/src/internet-stack/icmpv4-l4-protocol.cc	Thu Nov 20 04:07:43 2008 -0800
@@ -112,7 +112,7 @@ Icmpv4L4Protocol::SendDestUnreach (Ipv4H
   unreach.SetHeader (header);
   unreach.SetData (orgData);
   p->AddHeader (unreach);
-  SendMessage (p, header.GetSource (), Icmpv4Header::DEST_UNREACH, code);
+  SendMessage (p, header.GetSource (), Icmpv4Header::ICMP_DEST_UNREACH, code);
 }
 
 void 
@@ -124,7 +124,7 @@ Icmpv4L4Protocol::SendTimeExceededTtl (I
   time.SetHeader (header);
   time.SetData (orgData);
   p->AddHeader (time);
-  SendMessage (p, header.GetSource (), Icmpv4Header::TIME_EXCEEDED, Icmpv4TimeExceeded::TIME_TO_LIVE);
+  SendMessage (p, header.GetSource (), Icmpv4Header::ICMP_TIME_EXCEEDED, Icmpv4TimeExceeded::TIME_TO_LIVE);
 }
 
 void
@@ -139,7 +139,7 @@ Icmpv4L4Protocol::HandleEcho (Ptr<Packet
   Icmpv4Echo echo;
   p->RemoveHeader (echo);
   reply->AddHeader (echo);
-  SendMessage (reply, destination, source, Icmpv4Header::ECHO_REPLY, 0);
+  SendMessage (reply, destination, source, Icmpv4Header::ICMP_ECHO_REPLY, 0);
 }
 void
 Icmpv4L4Protocol::Forward (Ipv4Address source, Icmpv4Header icmp,
@@ -197,13 +197,13 @@ Icmpv4L4Protocol::Receive(Ptr<Packet> p,
   Icmpv4Header icmp;
   p->RemoveHeader (icmp);
   switch (icmp.GetType ()) {
-  case Icmpv4Header::ECHO:
+  case Icmpv4Header::ICMP_ECHO:
     HandleEcho (p, icmp, source, destination);
     break;
-  case Icmpv4Header::DEST_UNREACH:
+  case Icmpv4Header::ICMP_DEST_UNREACH:
     HandleDestUnreach (p, icmp, source, destination);
     break;
-  case Icmpv4Header::TIME_EXCEEDED:
+  case Icmpv4Header::ICMP_TIME_EXCEEDED:
     HandleTimeExceeded (p, icmp, source, destination);
     break;
   default:
diff -r 5091e3a14b26 src/internet-stack/icmpv4.h
--- a/src/internet-stack/icmpv4.h	Wed Nov 19 16:41:17 2008 -0800
+++ b/src/internet-stack/icmpv4.h	Thu Nov 20 04:07:43 2008 -0800
@@ -14,10 +14,10 @@ class Icmpv4Header : public Header
 {
 public:
   enum {
-    ECHO_REPLY = 0,
-    DEST_UNREACH = 3,
-    ECHO = 8,
-    TIME_EXCEEDED = 11
+    ICMP_ECHO_REPLY = 0,
+    ICMP_DEST_UNREACH = 3,
+    ICMP_ECHO = 8,
+    ICMP_TIME_EXCEEDED = 11
   };
 
   void EnableChecksum (void);