--- a/src/contrib/packetbb.cc	Thu Sep 10 15:33:23 2009 -0400
+++ b/src/contrib/packetbb.cc	Thu Sep 10 15:35:16 2009 -0400
@@ -932,7 +932,7 @@
   return m_type;
 }
 
-AddressLength
+PbbAddressLength
 PbbMessage::GetAddressLength (void) const
 {
   return m_addrSize;
@@ -1559,7 +1559,7 @@
 
 /* End PbbMessage Class */
 
-AddressLength
+PbbAddressLength
 PbbMessageIpv4::GetAddressLength (void) const
 {
   return IPV4;
@@ -1597,7 +1597,7 @@
 
 /* End PbbMessageIpv4 Class */
 
-AddressLength
+PbbAddressLength
 PbbMessageIpv6::GetAddressLength (void) const
 {
   return IPV6;

--- a/src/contrib/packetbb.h	Thu Sep 10 15:33:23 2009 -0400
+++ b/src/contrib/packetbb.h	Thu Sep 10 15:35:16 2009 -0400
@@ -43,7 +43,7 @@
 class PbbTlv;
 class PbbAddressTlv;
 
-enum AddressLength {
+enum PbbAddressLength {
   IPV4 = 3,
   IPV6 = 15,
 };
@@ -382,7 +382,7 @@
    *
    * IPv4 = 4 - 1 = 3, IPv6 = 16 - 1 = 15
    */
-  virtual AddressLength GetAddressLength (void) const = 0;
+  virtual PbbAddressLength GetAddressLength (void) const = 0;
 
   virtual void SerializeOriginatorAddress (Buffer::Iterator &start) const = 0;
   virtual Address DeserializeOriginatorAddress (Buffer::Iterator &start) const = 0;
@@ -395,7 +395,7 @@
   std::list< Ptr<PbbAddressBlock> > m_addressBlockList;
 
   uint8_t m_type;
-  AddressLength m_addrSize;
+  PbbAddressLength m_addrSize;
 
   bool m_hasOriginatorAddress;
   Address m_originatorAddress;
@@ -419,7 +419,7 @@
  */
 class PbbMessageIpv4 : public PbbMessage {
 protected:
-  virtual AddressLength GetAddressLength (void) const;
+  virtual PbbAddressLength GetAddressLength (void) const;
 
   virtual void SerializeOriginatorAddress (Buffer::Iterator &start) const;
   virtual Address DeserializeOriginatorAddress (Buffer::Iterator &start) const;
@@ -435,7 +435,7 @@
  */
 class PbbMessageIpv6 : public PbbMessage {
 protected:
-  virtual AddressLength GetAddressLength (void) const;
+  virtual PbbAddressLength GetAddressLength (void) const;
 
   virtual void SerializeOriginatorAddress (Buffer::Iterator &start) const;
   virtual Address DeserializeOriginatorAddress (Buffer::Iterator &start) const;