--- a/src/lte/model/lte-rlc-tag.h	Fri Sep 16 11:01:39 2011 +0200
+++ b/src/lte/model/lte-rlc-tag.h	Fri Sep 16 11:25:36 2011 +0200
@@ -56,7 +56,7 @@
   /**
    * Get the instant when the RLC delivers the PDU to the MAC SAP provider
    */
-  Time  getSenderTimestamp (void) const
+  Time  GetSenderTimestamp (void) const
   {
     return m_senderTimestamp;
   }
@@ -65,7 +65,7 @@
    * Set the sender timestamp
    * @param senderTimestamp time stamp of the instant when the RLC delivers the PDU to the MAC SAP provider
    */
-  void  setSenderTimestamp (Time senderTimestamp)
+  void  SetSenderTimestamp (Time senderTimestamp)
   {
     this->m_senderTimestamp = senderTimestamp;
   }

--- a/src/lte/model/lte-rlc.cc	Fri Sep 16 11:01:39 2011 +0200
+++ b/src/lte/model/lte-rlc.cc	Fri Sep 16 11:25:36 2011 +0200
@@ -109,9 +109,9 @@
 }
 
 void
-LteRlc::SetRnti (uint8_t rnti)
+LteRlc::SetRnti (uint16_t rnti)
 {
-  NS_LOG_FUNCTION (this << (uint32_t)  rnti);
+  NS_LOG_FUNCTION (this << (uint32_t) rnti);
   m_rnti = rnti;
 }
 
@@ -199,7 +199,7 @@
   Time delay;
   if (p->FindFirstMatchingByteTag(rlcTag))
     {
-      delay = Simulator::Now() - rlcTag.getSenderTimestamp ();
+      delay = Simulator::Now() - rlcTag.GetSenderTimestamp ();
     }
   NS_LOG_FUNCTION (this << m_rnti << (uint32_t) m_lcid << p->GetSize () << delay.GetNanoSeconds ());
   m_rxPdu(m_rnti, m_lcid, p->GetSize (), delay.GetNanoSeconds () );

--- a/src/lte/model/lte-rlc.h	Fri Sep 16 11:01:39 2011 +0200
+++ b/src/lte/model/lte-rlc.h	Fri Sep 16 11:25:36 2011 +0200
@@ -61,7 +61,7 @@
    *
    * \param rnti
    */
-  void SetRnti (uint8_t rnti);
+  void SetRnti (uint16_t rnti);
 
   /**
    *