--- a/src/devices/wifi/onoe-mac-stations.h	Mon Mar 03 02:07:40 2008 +0100
+++ b/src/devices/wifi/onoe-mac-stations.h	Mon Mar 03 04:03:39 2008 +0100
@@ -20,19 +20,19 @@
 #ifndef ONOE_MAC_STATIONS_H
 #define ONOE_MAC_STATIONS_H
 
-#include "mac-stations.h"
+#include "wifi-remote-station-manager.h"
 #include "ns3/nstime.h"
 
 namespace ns3 {
 
-class OnoeMacStations : public MacStations
+class OnoeWifiManager : public WifiRemoteStationManager
 {
 public:
-  OnoeMacStations (WifiMode defaultTxMode);
+  OnoeWifiManager ();
 
 private:
-  friend class OnoeMacStation;
-  virtual MacStation *CreateStation (void);
+  friend class OnoeWifiRemoteStation;
+  virtual WifiRemoteStation *CreateStation (void);
 
   Time m_updatePeriod;
   uint32_t m_addCreditThreshold;
@@ -48,12 +48,12 @@
  * any publication or reference about this algorithm beyond the madwifi
  * source code.
  */
-class OnoeMacStation : public MacStation
+class OnoeWifiRemoteStation : public WifiRemoteStation
 {
 public:
-  OnoeMacStation (OnoeMacStations *stations);
+  OnoeWifiRemoteStation (OnoeWifiManager *stations);
 
-  virtual ~OnoeMacStation ();
+  virtual ~OnoeWifiRemoteStation ();
 
   virtual void ReportRxOk (double rxSnr, WifiMode txMode);
   virtual void ReportRtsFailed (void);
@@ -64,14 +64,14 @@
   virtual void ReportFinalDataFailed (void);
 
 private:
-  virtual OnoeMacStations *GetStations (void) const;
+  virtual OnoeWifiManager *GetStations (void) const;
   virtual WifiMode DoGetDataMode (uint32_t size);
   virtual WifiMode DoGetRtsMode (void);
 
   void UpdateRetry (void);
   void UpdateMode (void);
 
-  OnoeMacStations *m_stations;
+  OnoeWifiManager *m_stations;
   Time m_nextModeUpdate;
   uint32_t m_shortRetry;
   uint32_t m_longRetry;