--- a/src/devices/mesh/dot11s/peer-link-frame.cc	Mon Jun 28 11:29:22 2010 +0400
+++ b/src/devices/mesh/dot11s/peer-link-frame.cc	Mon Jun 28 09:19:21 2010 +0100
@@ -140,7 +140,7 @@
 {
   Buffer::Iterator i = start;
   NS_ASSERT (m_subtype < 3);
-  i = m_protocol.SerializeIE (i);
+  i = m_protocol.Serialize (i);
   if ((uint8_t) (WifiActionHeader::PEER_LINK_CLOSE) != m_subtype)
     {
       i.WriteHtolsbU16 (m_capability);
@@ -151,15 +151,15 @@
     }
   if ((uint8_t) (WifiActionHeader::PEER_LINK_CLOSE) != m_subtype)
     {
-      i = m_rates.SerializeIE (i);
+      i = m_rates.Serialize (i);
     }
   if ((uint8_t) (WifiActionHeader::PEER_LINK_CONFIRM) != m_subtype)
     {
-      i = m_meshId.SerializeIE (i);
+      i = m_meshId.Serialize (i);
     }
   if ((uint8_t) (WifiActionHeader::PEER_LINK_CLOSE) != m_subtype)
     {
-      i = m_config.SerializeIE (i);
+      i = m_config.Serialize (i);
     }
   else
     {

--- a/src/devices/wifi/mgt-headers.cc	Mon Jun 28 11:29:22 2010 +0400
+++ b/src/devices/wifi/mgt-headers.cc	Mon Jun 28 09:19:21 2010 +0100
@@ -87,8 +87,8 @@
 MgtProbeRequestHeader::Serialize (Buffer::Iterator start) const
 {  
   Buffer::Iterator i = start;
-  i = m_ssid.SerializeIE (i);
-  i = m_rates.SerializeIE (i);
+  i = m_ssid.Serialize (i);
+  i = m_rates.Serialize (i);
 }
 uint32_t
 MgtProbeRequestHeader::Deserialize (Buffer::Iterator start)
@@ -196,8 +196,8 @@
   i.WriteHtonU64 (Simulator::Now ().GetMicroSeconds ());
   i.WriteHtonU16 (m_beaconInterval / 1024);
   i = m_capability.Serialize (i);
-  i = m_ssid.SerializeIE (i);
-  i = m_rates.SerializeIE (i);
+  i = m_ssid.Serialize (i);
+  i = m_rates.Serialize (i);
   //i.WriteU8 (0, 3); // ds parameter set.
 }
 uint32_t
@@ -293,8 +293,8 @@
   Buffer::Iterator i = start;
   i = m_capability.Serialize (i);
   i.WriteHtonU16 (m_listenInterval);
-  i = m_ssid.SerializeIE (i);
-  i = m_rates.SerializeIE (i);
+  i = m_ssid.Serialize (i);
+  i = m_rates.Serialize (i);
 }
 uint32_t
 MgtAssocRequestHeader::Deserialize (Buffer::Iterator start)
@@ -378,7 +378,7 @@
   i = m_capability.Serialize (i);
   i = m_code.Serialize (i);
   i.WriteHtonU16 (m_aid);
-  i = m_rates.SerializeIE (i);
+  i = m_rates.Serialize (i);
 }
 uint32_t
 MgtAssocResponseHeader::Deserialize (Buffer::Iterator start)

--- a/src/devices/wifi/wifi-information-element-vector.cc	Mon Jun 28 11:29:22 2010 +0400
+++ b/src/devices/wifi/wifi-information-element-vector.cc	Mon Jun 28 09:19:21 2010 +0100
@@ -59,7 +59,7 @@
 {
   for(IE_VECTOR::const_iterator i = m_elements.begin (); i != m_elements.end (); i ++)
     {
-      start = (*i)->SerializeIE (start);
+      start = (*i)->Serialize (start);
     }
 }
 uint32_t

--- a/src/devices/wifi/wifi-information-element.cc	Mon Jun 28 11:29:22 2010 +0400
+++ b/src/devices/wifi/wifi-information-element.cc	Mon Jun 28 09:19:21 2010 +0100
@@ -36,7 +36,7 @@
 }
   
 Buffer::Iterator
-WifiInformationElement::SerializeIE (Buffer::Iterator i) const
+WifiInformationElement::Serialize (Buffer::Iterator i) const
 {
   i.WriteU8 (ElementId ());
   i.WriteU8 (GetInformationFieldSize ());

--- a/src/devices/wifi/wifi-information-element.h	Mon Jun 28 11:29:22 2010 +0400
+++ b/src/devices/wifi/wifi-information-element.h	Mon Jun 28 09:19:21 2010 +0100
@@ -137,7 +137,7 @@
 public:
   virtual ~WifiInformationElement ();
   /// Serialize entire IE including Element ID and length fields
-  Buffer::Iterator SerializeIE (Buffer::Iterator i) const;
+  Buffer::Iterator Serialize (Buffer::Iterator i) const;
   /// Deserialize entire IE, which must be present. The iterator
   /// passed in must be pointing at the Element ID (i.e., the very
   /// first octet) of the correct type of information element,