--- a/src/common/mtag-buffer.cc	Thu Apr 24 16:01:53 2008 -0700
+++ b/src/common/mtag-buffer.cc	Thu Apr 24 16:03:13 2008 -0700
@@ -4,20 +4,20 @@
 namespace ns3 {
 
 void 
-MtagBuffer::WriteU8 (uint8_t v)
+TagBuffer::WriteU8 (uint8_t v)
 {
   NS_ASSERT (m_current + 1 <= m_end);
   *m_current = v;
   m_current++;
 }
 void 
-MtagBuffer::WriteU16 (uint16_t data)
+TagBuffer::WriteU16 (uint16_t data)
 {
   WriteU8 ((data >> 0) & 0xff);
   WriteU8 ((data >> 8) & 0xff);
 }
 void 
-MtagBuffer::WriteU32 (uint32_t data)
+TagBuffer::WriteU32 (uint32_t data)
 {
   WriteU8 ((data >> 0) & 0xff);
   WriteU8 ((data >> 8) & 0xff);
@@ -25,7 +25,7 @@
   WriteU8 ((data >> 24) & 0xff);
 }
 void 
-MtagBuffer::WriteU64 (uint64_t data)
+TagBuffer::WriteU64 (uint64_t data)
 {
   WriteU8 ((data >> 0) & 0xff);
   WriteU8 ((data >> 8) & 0xff);
@@ -37,7 +37,7 @@
   WriteU8 ((data >> 54) & 0xff);
 }
 void
-MtagBuffer::WriteDouble (double v)
+TagBuffer::WriteDouble (double v)
 {
   uint8_t *buf = (uint8_t *)&v;
   for (uint32_t i = 0; i < sizeof (double); ++i, ++buf)
@@ -46,7 +46,7 @@
     }
 }
 void 
-MtagBuffer::Write (const uint8_t *buffer, uint32_t size)
+TagBuffer::Write (const uint8_t *buffer, uint32_t size)
 {
   for (uint32_t i = 0; i < size; ++i, ++buffer)
     {
@@ -54,7 +54,7 @@
     }
 }
 uint8_t  
-MtagBuffer::ReadU8 (void)
+TagBuffer::ReadU8 (void)
 {
   NS_ASSERT (m_current + 1 <= m_end);
   uint8_t v;
@@ -63,7 +63,7 @@
   return v;
 }
 uint16_t 
-MtagBuffer::ReadU16 (void)
+TagBuffer::ReadU16 (void)
 {
   uint8_t byte0 = ReadU8 ();
   uint8_t byte1 = ReadU8 ();
@@ -73,7 +73,7 @@
   return data;
 }
 uint32_t 
-MtagBuffer::ReadU32 (void)
+TagBuffer::ReadU32 (void)
 {
   uint8_t byte0 = ReadU8 ();
   uint8_t byte1 = ReadU8 ();
@@ -89,7 +89,7 @@
   return data;
 }
 uint64_t 
-MtagBuffer::ReadU64 (void)
+TagBuffer::ReadU64 (void)
 {
   uint8_t byte0 = ReadU8 ();
   uint8_t byte1 = ReadU8 ();
@@ -118,7 +118,7 @@
   return data;
 }
 double
-MtagBuffer::ReadDouble (void)
+TagBuffer::ReadDouble (void)
 {
   double v;
   uint8_t *buf = (uint8_t *)&v;
@@ -129,27 +129,27 @@
   return v;
 }
 void 
-MtagBuffer::Read (uint8_t *buffer, uint32_t size)
+TagBuffer::Read (uint8_t *buffer, uint32_t size)
 {
   for (uint32_t i = 0; i < size; ++i, ++buffer)
     {
       *buffer = ReadU8 ();
     }
 }
-MtagBuffer::MtagBuffer (uint8_t *start, uint8_t *end)
+TagBuffer::TagBuffer (uint8_t *start, uint8_t *end)
   : m_current (start),
     m_end (end)
 {}
 
 void 
-MtagBuffer::TrimAtEnd (uint32_t trim)
+TagBuffer::TrimAtEnd (uint32_t trim)
 {
   NS_ASSERT (m_current <= (m_end - trim));
   m_end -= trim;
 }
 
 void 
-MtagBuffer::CopyFrom (MtagBuffer o)
+TagBuffer::CopyFrom (TagBuffer o)
 {
   uint32_t size = o.m_end - o.m_current;
   NS_ASSERT (size <= m_end - m_current);