--- a/src/devices/mesh/mesh-wifi-peer-manager.h	Thu Mar 19 14:31:47 2009 +0300
+++ b/src/devices/mesh/mesh-wifi-peer-manager.h	Thu Mar 19 17:28:37 2009 +0300
@@ -36,10 +36,10 @@
 /**
  * \ingroup mesh
  */
-class WifiPeerLinkDescriptor : public RefCountBase
+class WifiPeerLinkDescriptorDUP : public RefCountBase
 {
 public:
-  WifiPeerLinkDescriptor ();
+  WifiPeerLinkDescriptorDUP ();
   /**
    * Beacon loss processing:
    */
@@ -64,7 +64,7 @@
   void  SetLocalAid     (uint16_t aid);
   void  SetPeerAid      (uint16_t aid);
   void  SetBeaconTimingElement (IeDot11sBeaconTiming beaconTiming);
-  void  SetPeerLinkDescriptorElement (IeDot11sPeerManagement peerLinkElement);
+  void  SetPeerLinkDescriptorDUPElement (IeDot11sPeerManagement peerLinkElement);
   Mac48Address GetPeerAddress () const;
   /**
    * Debug purpose
@@ -74,7 +74,7 @@
   Time  GetLastBeacon () const;
   Time  GetBeaconInterval () const;
   IeDot11sBeaconTiming    GetBeaconTimingElement () const;
-  IeDot11sPeerManagement  GetPeerLinkDescriptorElement () const;
+  IeDot11sPeerManagement  GetPeerLinkDescriptorDUPElement () const;
   void  ClearTimingElement ();
   /* MLME */
   void  MLMECancelPeerLink (dot11sReasonCode reason);
@@ -253,7 +253,7 @@
     Time referenceTbtt; //When one of my station's beacons was put into a beacon queue;
     Time beaconInterval; //Beacon interval of my station;
   };
-  typedef std::map<Mac48Address, std::vector<Ptr<WifiPeerLinkDescriptor> >, std::less<Mac48Address> >  PeerDescriptorsMap;
+  typedef std::map<Mac48Address, std::vector<Ptr<WifiPeerLinkDescriptorDUP> >, std::less<Mac48Address> >  PeerDescriptorsMap;
   typedef std::map<Mac48Address, Ptr<MeshWifiMac>,std::less<Mac48Address> > MeshMacMap;
   typedef std::map<Mac48Address, BeaconInfo, std::less<Mac48Address> > BeaconInfoMap;
 
@@ -282,7 +282,7 @@
   //and check if the too many  beacons were lost:
   Time  m_peerLinkCleanupPeriod;
   EventId  m_cleanupEvent;
-  Ptr<WifiPeerLinkDescriptor> AddDescriptor (
+  Ptr<WifiPeerLinkDescriptorDUP> AddDescriptor (
     Mac48Address portAddress,
     Mac48Address peerAddress,
     Time lastBeacon,