--- a/src/common/packet.cc	Tue Jun 12 13:21:06 2007 +0200
+++ b/src/common/packet.cc	Tue Jun 12 22:52:56 2007 +0200
@@ -28,20 +28,20 @@
 
 Packet::Packet ()
   : m_buffer (),
-    m_history (m_globalUid, 0)
+    m_metadata (m_globalUid, 0)
 {
   m_globalUid++;
 }
 
 Packet::Packet (uint32_t size)
   : m_buffer (size),
-    m_history (m_globalUid, size)
+    m_metadata (m_globalUid, size)
 {
   m_globalUid++;
 }
 Packet::Packet (uint8_t const*buffer, uint32_t size)
   : m_buffer (),
-    m_history (m_globalUid, size)
+    m_metadata (m_globalUid, size)
 {
   m_globalUid++;
   m_buffer.AddAtStart (size);
@@ -49,10 +49,10 @@
   i.Write (buffer, size);
 }
 
-Packet::Packet (Buffer buffer, Tags tags, PacketMetadata history)
+Packet::Packet (Buffer buffer, Tags tags, PacketMetadata metadata)
   : m_buffer (buffer),
     m_tags (tags),
-    m_history (history)
+    m_metadata (metadata)
 {}
 
 Packet 
@@ -61,8 +61,8 @@
   Buffer buffer = m_buffer.CreateFragment (start, length);
   NS_ASSERT (m_buffer.GetSize () >= start + length);
   uint32_t end = m_buffer.GetSize () - (start + length);
-  PacketMetadata history = m_history.CreateFragment (start, end);
-  return Packet (buffer, m_tags, history);
+  PacketMetadata metadata = m_metadata.CreateFragment (start, end);
+  return Packet (buffer, m_tags, metadata);
 }
 
 uint32_t 
@@ -86,25 +86,25 @@
    * XXX: we might need to merge the tag list of the
    * other packet into the current packet.
    */
-  m_history.AddAtEnd (packet.m_history);
+  m_metadata.AddAtEnd (packet.m_metadata);
 }
 void
 Packet::AddPaddingAtEnd (uint32_t size)
 {
   m_buffer.AddAtEnd (size);
-  m_history.AddPaddingAtEnd (size);
+  m_metadata.AddPaddingAtEnd (size);
 }
 void 
 Packet::RemoveAtEnd (uint32_t size)
 {
   m_buffer.RemoveAtEnd (size);
-  m_history.RemoveAtEnd (size);
+  m_metadata.RemoveAtEnd (size);
 }
 void 
 Packet::RemoveAtStart (uint32_t size)
 {
   m_buffer.RemoveAtStart (size);
-  m_history.RemoveAtStart (size);
+  m_metadata.RemoveAtStart (size);
 }
 
 void 
@@ -122,19 +122,19 @@
 uint32_t 
 Packet::GetUid (void) const
 {
-  return m_history.GetUid ();
+  return m_metadata.GetUid ();
 }
 
 void 
 Packet::Print (std::ostream &os) const
 {
-  m_history.PrintDefault (os, m_buffer);
+  m_metadata.PrintDefault (os, m_buffer);
 }
 
 void 
 Packet::Print (std::ostream &os, const PacketPrinter &printer) const
 {
-  m_history.Print (os, m_buffer, printer);
+  m_metadata.Print (os, m_buffer, printer);
 }
 
 void