--- a/samples/main-header.cc	Wed Aug 08 09:49:56 2007 +0200
+++ b/samples/main-header.cc	Wed Aug 08 10:01:19 2007 +0200
@@ -42,7 +42,7 @@
   // code to keep track of the packet metadata.
   // You need to make sure that this string is absolutely
   // unique. The code will detect any duplicate string.
-  static uint32_t uid = Header::Register<MyHeader> ("MyHeader.test.nsnam.org");
+  static uint32_t uid = AllocateUid<MyHeader> ("MyHeader.test.nsnam.org");
   return uid;
 }
 

--- a/src/common/header.h	Wed Aug 08 09:49:56 2007 +0200
+++ b/src/common/header.h	Wed Aug 08 10:01:19 2007 +0200
@@ -91,7 +91,7 @@
 public:
 protected:
   template <typename T>
-  static uint32_t Register (std::string uuid);
+  static uint32_t AllocateUid (std::string uuid);
 #if 0
 private:
   /**
@@ -152,7 +152,7 @@
 
 template <typename T>
 uint32_t 
-Header::Register (std::string uuid)
+Header::AllocateUid (std::string uuid)
 {
   return ChunkRegistry::RegisterHeader<T> (uuid);
 }

--- a/src/common/packet-metadata-test.cc	Wed Aug 08 09:49:56 2007 +0200
+++ b/src/common/packet-metadata-test.cc	Wed Aug 08 10:01:19 2007 +0200
@@ -53,7 +53,7 @@
 {
   std::ostringstream oss;
   oss << N << "HistoryHeader.ns3";
-  static uint32_t uid = Header::Register<HistoryHeader<N> > (oss.str());
+  static uint32_t uid = AllocateUid<HistoryHeader<N> > (oss.str());
   return uid;
 }
 
@@ -133,7 +133,7 @@
 {
   std::ostringstream oss;
   oss << N << "HistoryTrailer.ns3";
-  static uint32_t uid = Trailer::Register<HistoryTrailer<N> > (oss.str ());
+  static uint32_t uid = AllocateUid<HistoryTrailer<N> > (oss.str ());
   return uid;
 }
 

--- a/src/common/trailer.h	Wed Aug 08 09:49:56 2007 +0200
+++ b/src/common/trailer.h	Wed Aug 08 10:01:19 2007 +0200
@@ -114,7 +114,7 @@
 public:
 protected:
   template <typename T>
-  static uint32_t Register (std::string uidString);
+  static uint32_t AllocateUid (std::string uidString);
 #if 0
 private:
   /**
@@ -179,7 +179,7 @@
 
 template <typename T>
 uint32_t 
-Trailer::Register (std::string uidString)
+Trailer::AllocateUid (std::string uidString)
 {
   return ChunkRegistry::RegisterTrailer<T> (uidString);
 }

--- a/src/internet-node/arp-header.cc	Wed Aug 08 09:49:56 2007 +0200
+++ b/src/internet-node/arp-header.cc	Wed Aug 08 10:01:19 2007 +0200
@@ -30,7 +30,7 @@
 uint32_t
 ArpHeader::GetUid (void)
 {
-  static uint32_t uid = Header::Register<ArpHeader> ("ArpHeader.ns3");
+  static uint32_t uid = AllocateUid<ArpHeader> ("ArpHeader.ns3");
   return uid;
 }
 

--- a/src/internet-node/ipv4-header.cc	Wed Aug 08 09:49:56 2007 +0200
+++ b/src/internet-node/ipv4-header.cc	Wed Aug 08 10:01:19 2007 +0200
@@ -35,7 +35,7 @@
 uint32_t
 Ipv4Header::GetUid (void)
 {
-  static uint32_t uid = Header::Register<Ipv4Header> ("Ipv4Header.ns3");
+  static uint32_t uid = AllocateUid<Ipv4Header> ("Ipv4Header.ns3");
   return uid;
 }
 

--- a/src/internet-node/udp-header.cc	Wed Aug 08 09:49:56 2007 +0200
+++ b/src/internet-node/udp-header.cc	Wed Aug 08 10:01:19 2007 +0200
@@ -31,7 +31,7 @@
 uint32_t
 UdpHeader::GetUid (void)
 {
-  static uint32_t uid = Header::Register<UdpHeader> ("UdpHeader.ns3");
+  static uint32_t uid = AllocateUid<UdpHeader> ("UdpHeader.ns3");
   return uid;
 }
 

--- a/src/node/ethernet-header.cc	Wed Aug 08 09:49:56 2007 +0200
+++ b/src/node/ethernet-header.cc	Wed Aug 08 10:01:19 2007 +0200
@@ -34,7 +34,7 @@
 uint32_t
 EthernetHeader::GetUid (void)
 {
-  static uint32_t uid = Header::Register<EthernetHeader> ("EthernetHeader.ns3");
+  static uint32_t uid = AllocateUid<EthernetHeader> ("EthernetHeader.ns3");
   return uid;
 }
 

--- a/src/node/ethernet-trailer.cc	Wed Aug 08 09:49:56 2007 +0200
+++ b/src/node/ethernet-trailer.cc	Wed Aug 08 10:01:19 2007 +0200
@@ -35,7 +35,7 @@
 uint32_t
 EthernetTrailer::GetUid (void)
 {
-  static uint32_t uid = Trailer::Register<EthernetTrailer> ("EthernetTrailer.ns3");
+  static uint32_t uid = AllocateUid<EthernetTrailer> ("EthernetTrailer.ns3");
   return uid;
 }
 

--- a/src/node/llc-snap-header.cc	Wed Aug 08 09:49:56 2007 +0200
+++ b/src/node/llc-snap-header.cc	Wed Aug 08 10:01:19 2007 +0200
@@ -31,7 +31,7 @@
 uint32_t
 LlcSnapHeader::GetUid (void)
 {
-  static uint32_t uid = Header::Register<LlcSnapHeader> ("LlcSnapHeader.ns3");
+  static uint32_t uid = AllocateUid<LlcSnapHeader> ("LlcSnapHeader.ns3");
   return uid;
 }