--- a/samples/main-adhoc-wifi.cc	Thu Oct 11 13:20:55 2007 +0200
+++ b/samples/main-adhoc-wifi.cc	Thu Oct 11 13:23:33 2007 +0200
@@ -42,7 +42,7 @@
                  Position position, const char *address)
 {
   Ptr<Node> node = Create<InternetNode> ();  
-  Ptr<WifiAdhocNetDevice> device = factory->CreateAdhoc (node);
+  Ptr<AdhocWifiNetDevice> device = factory->CreateAdhoc (node);
   device->ConnectTo (channel);
   Ptr<MobilityModel> mobility = Create<StaticMobilityModel> ();
   mobility->Set (position);

--- a/src/devices/wifi/wifi-net-device-factory.h	Thu Oct 11 13:20:55 2007 +0200
+++ b/src/devices/wifi/wifi-net-device-factory.h	Thu Oct 11 13:23:33 2007 +0200
@@ -29,9 +29,9 @@
 namespace ns3 {
 
 class WifiNetDevice;
-class WifiAdhocNetDevice;
-class WifiNqstaNetDevice;
-class WifiNqapNetDevice;
+class AdhocWifiNetDevice;
+class NqstaWifiNetDevice;
+class NqapWifiNetDevice;
 class DcaTxop;
 class Position;
 
@@ -68,9 +68,9 @@
 
   void SetSsid (Ssid ssid);
 
-  Ptr<WifiAdhocNetDevice> CreateAdhoc (Ptr<Node> node);
-  Ptr<WifiNqstaNetDevice> CreateNqsta (Ptr<Node> node);
-  Ptr<WifiNqapNetDevice> CreateNqap (Ptr<Node> node);
+  Ptr<AdhocWifiNetDevice> CreateAdhoc (Ptr<Node> node);
+  Ptr<NqstaWifiNetDevice> CreateNqsta (Ptr<Node> node);
+  Ptr<NqapWifiNetDevice> CreateNqap (Ptr<Node> node);
 private:
   void InitializeInterface (Ptr<WifiNetDevice> interface, Position *position) const;
   DcaTxop *CreateDca (Ptr<const WifiNetDevice> interface) const;