Index: /sample/pingpong/PingPongMessage.h
===================================================================
--- /sample/pingpong/PingPongMessage.h	(revision 4622)
+++ /sample/pingpong/PingPongMessage.h	(revision 4625)
@@ -18,11 +18,11 @@
 public:
 	PingPongMessage();
-	PingPongMessage( uint16_t _id );
+	PingPongMessage( uint8_t _id );
 	virtual ~PingPongMessage();
 
 	string info();
-	uint16_t getid();
+	uint8_t getid();
 private:
-	uint16_t id; //TODO: was uint8_t
+	uint8_t id;
 };
 
Index: /source/ariba/communication/EndpointDescriptor.h
===================================================================
--- /source/ariba/communication/EndpointDescriptor.h	(revision 4622)
+++ /source/ariba/communication/EndpointDescriptor.h	(revision 4625)
@@ -100,5 +100,5 @@
 
 sznBeginDefault( ariba::communication::EndpointDescriptor, X ) {
-	uint16_t unspec = isUnspec; //TODO: was uint8_t
+	uint8_t unspec = isUnspec;
 
 	X && unspec && VO(locator);
Index: /source/ariba/communication/messages/AribaBaseMsg.h
===================================================================
--- /source/ariba/communication/messages/AribaBaseMsg.h	(revision 4622)
+++ /source/ariba/communication/messages/AribaBaseMsg.h	(revision 4625)
@@ -85,5 +85,5 @@
 
 private:
-	uint8_t state;		// the link message type //TODO: was uint8_t
+	uint8_t state;		// the link message type
 	LinkID localLink;	// the local link id
 	LinkID remoteLink;	// the remote link id
Index: /source/ariba/overlay/messages/LinkRequest.h
===================================================================
--- /source/ariba/overlay/messages/LinkRequest.h	(revision 4622)
+++ /source/ariba/overlay/messages/LinkRequest.h	(revision 4625)
@@ -24,5 +24,5 @@
 private:
 	bool free_endpoint_;
-	uint16_t flags; //TODO: was uint8_t
+	uint8_t flags;
 	uint32_t nonce;
 	const EndpointDescriptor* endpoint;
Index: /source/ariba/overlay/messages/OverlayMsg.h
===================================================================
--- /source/ariba/overlay/messages/OverlayMsg.h	(revision 4622)
+++ /source/ariba/overlay/messages/OverlayMsg.h	(revision 4625)
@@ -90,5 +90,5 @@
 
 private:
-	uint16_t type; //TODO: was uint8_t
+	uint8_t type;
 	ServiceID service;
 	NodeID sourceNode;
Index: /source/ariba/overlay/modules/chord/messages/ChordMessage.h
===================================================================
--- /source/ariba/overlay/modules/chord/messages/ChordMessage.h	(revision 4622)
+++ /source/ariba/overlay/modules/chord/messages/ChordMessage.h	(revision 4625)
@@ -97,6 +97,6 @@
 
 private:
-	uint16_t type; //TODO: was uint8_t
-	uint16_t hop_count; //TODO: was uint8_t
+	uint8_t type;
+	uint8_t hop_count;
 	NodeID source, destination;
 };
Index: /source/ariba/overlay/modules/chord/messages/Discovery.h
===================================================================
--- /source/ariba/overlay/modules/chord/messages/Discovery.h	(revision 4622)
+++ /source/ariba/overlay/modules/chord/messages/Discovery.h	(revision 4625)
@@ -108,6 +108,6 @@
 
 private:
-	uint16_t follow_type; //TODO: was uint8_t
-	uint16_t ttl; //TODO: was uint8_t
+	uint8_t follow_type;
+	uint8_t ttl;
 	EndpointDescriptor* source_endpoint;
 //	NodeEndpointList descriptors;
Index: /source/ariba/overlay/modules/onehop/messages/OneHopMessage.h
===================================================================
--- /source/ariba/overlay/modules/onehop/messages/OneHopMessage.h	(revision 4622)
+++ /source/ariba/overlay/modules/onehop/messages/OneHopMessage.h	(revision 4625)
@@ -68,5 +68,5 @@
 
 private:
-	uint16_t type; // TODO: was uint8_t
+	uint8_t type;
 };
 
Index: /source/ariba/utility/types/Identifier.h
===================================================================
--- /source/ariba/utility/types/Identifier.h	(revision 4622)
+++ /source/ariba/utility/types/Identifier.h	(revision 4625)
@@ -572,5 +572,5 @@
 	// calculate length of key
 	uint16_t len = array_size*sizeof(mp_limb_t);
-	uint16_t unspec = isUnspec; //TODO: was uint8_t
+	uint8_t unspec = isUnspec;
 
 	// only serialize the lower 16 bits of keyLength
Index: /source/ariba/utility/types/OverlayParameterSet.h
===================================================================
--- /source/ariba/utility/types/OverlayParameterSet.h	(revision 4622)
+++ /source/ariba/utility/types/OverlayParameterSet.h	(revision 4625)
@@ -64,5 +64,5 @@
 
 private:
-	uint16_t structure; //TODO: was uint8_t
+	uint8_t structure;
 
 };