diff -r 2848352b1757 -r c1443bb11fbb src/lte/model/lte-pdcp.cc
--- a/src/lte/model/lte-pdcp.cc	Wed May 11 07:47:16 2016 -0700
+++ b/src/lte/model/lte-pdcp.cc	Thu May 12 11:09:04 2016 -0700
@@ -188,7 +188,7 @@
 
   // Sender timestamp
   PdcpTag pdcpTag (Simulator::Now ());
-  p->AddByteTag (pdcpTag);
+  p->AddPacketTag (pdcpTag);
   m_txPdu (m_rnti, m_lcid, p->GetSize ());
 
   LteRlcSapProvider::TransmitPdcpPduParameters params;
@@ -207,9 +207,10 @@
   // Receiver timestamp
   PdcpTag pdcpTag;
   Time delay;
-  if (p->FindFirstMatchingByteTag (pdcpTag))
+  if (p->PeekPacketTag (pdcpTag))
     {
       delay = Simulator::Now() - pdcpTag.GetSenderTimestamp ();
+      p->RemovePacketTag (pdcpTag);
     }
   m_rxPdu(m_rnti, m_lcid, p->GetSize (), delay.GetNanoSeconds ());
 
diff -r 2848352b1757 -r c1443bb11fbb src/lte/model/lte-rlc-am.cc
--- a/src/lte/model/lte-rlc-am.cc	Wed May 11 07:47:16 2016 -0700
+++ b/src/lte/model/lte-rlc-am.cc	Thu May 12 11:09:04 2016 -0700
@@ -707,7 +707,7 @@
 
   // Sender timestamp
   RlcTag rlcTag (Simulator::Now ());
-  packet->AddByteTag (rlcTag);
+  packet->AddPacketTag (rlcTag);
   m_txPdu (m_rnti, m_lcid, packet->GetSize ());
 
   // Send RLC PDU to MAC layer
@@ -736,9 +736,10 @@
   // Receiver timestamp
   RlcTag rlcTag;
   Time delay;
-  if (p->FindFirstMatchingByteTag (rlcTag))
+  if (p->PeekPacketTag (rlcTag))
     {
       delay = Simulator::Now() - rlcTag.GetSenderTimestamp ();
+      p->RemovePacketTag (rlcTag);
     }
   m_rxPdu (m_rnti, m_lcid, p->GetSize (), delay.GetNanoSeconds ());
 
diff -r 2848352b1757 -r c1443bb11fbb src/lte/model/lte-rlc-tm.cc
--- a/src/lte/model/lte-rlc-tm.cc	Wed May 11 07:47:16 2016 -0700
+++ b/src/lte/model/lte-rlc-tm.cc	Thu May 12 11:09:04 2016 -0700
@@ -139,8 +139,10 @@
   m_txBuffer.erase (m_txBuffer.begin ());
  
   // Sender timestamp
-  RlcTag rlcTag (Simulator::Now ());
-  packet->AddByteTag (rlcTag);
+  RlcTag rlcTag;
+  packet->RemovePacketTag (rlcTag);
+  rlcTag.SetSenderTimestamp (Simulator::Now ());
+  packet->AddPacketTag (rlcTag);
   m_txPdu (m_rnti, m_lcid, packet->GetSize ());
 
   // Send RLC PDU to MAC layer
@@ -174,9 +176,10 @@
   // Receiver timestamp
   RlcTag rlcTag;
   Time delay;
-  if (p->FindFirstMatchingByteTag (rlcTag))
+  if (p->PeekPacketTag (rlcTag))
     {
       delay = Simulator::Now() - rlcTag.GetSenderTimestamp ();
+      p->RemovePacketTag (rlcTag);
     }
   m_rxPdu (m_rnti, m_lcid, p->GetSize (), delay.GetNanoSeconds ());
 
diff -r 2848352b1757 -r c1443bb11fbb src/lte/model/lte-rlc-um.cc
--- a/src/lte/model/lte-rlc-um.cc	Wed May 11 07:47:16 2016 -0700
+++ b/src/lte/model/lte-rlc-um.cc	Thu May 12 11:09:04 2016 -0700
@@ -372,7 +372,7 @@
 
   // Sender timestamp
   RlcTag rlcTag (Simulator::Now ());
-  packet->AddByteTag (rlcTag);
+  packet->AddPacketTag (rlcTag);
   m_txPdu (m_rnti, m_lcid, packet->GetSize ());
 
   // Send RLC PDU to MAC layer
@@ -406,9 +406,10 @@
   // Receiver timestamp
   RlcTag rlcTag;
   Time delay;
-  if (p->FindFirstMatchingByteTag (rlcTag))
+  if (p->PeekPacketTag (rlcTag))
     {
       delay = Simulator::Now() - rlcTag.GetSenderTimestamp ();
+      p->RemovePacketTag (rlcTag);
     }
   m_rxPdu (m_rnti, m_lcid, p->GetSize (), delay.GetNanoSeconds ());
 
diff -r 2848352b1757 -r c1443bb11fbb src/lte/model/lte-rlc.cc
--- a/src/lte/model/lte-rlc.cc	Wed May 11 07:47:16 2016 -0700
+++ b/src/lte/model/lte-rlc.cc	Thu May 12 11:09:04 2016 -0700
@@ -219,9 +219,10 @@
   // RLC Performance evaluation
   RlcTag rlcTag;
   Time delay;
-  if (p->FindFirstMatchingByteTag(rlcTag))
+  if (p->PeekPacketTag (rlcTag))
     {
       delay = Simulator::Now() - rlcTag.GetSenderTimestamp ();
+      p->RemovePacketTag (rlcTag);
     }
   NS_LOG_LOGIC (" RNTI=" << m_rnti 
                 << " LCID=" << (uint32_t) m_lcid 
@@ -243,7 +244,7 @@
 
   // RLC Performance evaluation
   RlcTag tag (Simulator::Now());
-  params.pdu->AddByteTag (tag);
+  params.pdu->AddPacketTag (tag);
   NS_LOG_LOGIC (" RNTI=" << m_rnti 
                 << " LCID=" << (uint32_t) m_lcid 
                 << " size=" << bytes);