Index: source/ariba/utility/configuration/ConfigFile.cpp
===================================================================
--- source/ariba/utility/configuration/ConfigFile.cpp	(revision 3683)
+++ source/ariba/utility/configuration/ConfigFile.cpp	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // ConfigFile.h
 // Class for reading named values from configuration files
@@ -23,5 +23,5 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
-// [Licence]
+// [License]
 
 #include "ConfigFile.h"
Index: source/ariba/utility/configuration/ConfigFile.h
===================================================================
--- source/ariba/utility/configuration/ConfigFile.h	(revision 3683)
+++ source/ariba/utility/configuration/ConfigFile.h	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // ConfigFile.h
 // Class for reading named values from configuration files
@@ -23,5 +23,5 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 // IN THE SOFTWARE.
-// [Licence]
+// [License]
 
 
Index: source/ariba/utility/configuration/Configuration.cpp
===================================================================
--- source/ariba/utility/configuration/Configuration.cpp	(revision 3683)
+++ source/ariba/utility/configuration/Configuration.cpp	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #include "Configuration.h"
Index: source/ariba/utility/configuration/Configuration.h
===================================================================
--- source/ariba/utility/configuration/Configuration.h	(revision 3683)
+++ source/ariba/utility/configuration/Configuration.h	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #ifndef __CONFIGURATION_H
Index: source/ariba/utility/internal/Utilities.hpp
===================================================================
--- source/ariba/utility/internal/Utilities.hpp	(revision 3683)
+++ source/ariba/utility/internal/Utilities.hpp	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #ifndef UTILITIES_HPP_
@@ -60,6 +60,6 @@
 /* check whether X is a signed integer */
 #define if_int(X) \
-	typename boost::enable_if<boost::is_integral<X>,int>::type __i##X = 0,\
-	typename boost::enable_if<boost::is_signed<X>,int>::type __s##X = 0
+	typename boost::enable_if<boost::is_integral<X>,void*>::type __i##X = NULL,\
+	typename boost::enable_if<boost::is_signed<X>,void*>::type __s##X = NULL
 
 /* signature conversion */
@@ -74,3 +74,4 @@
 CONVERT_SIGN( uint32_t, int32_t );
 CONVERT_SIGN( uint64_t, int64_t );
+
 #endif /* UTILITIES_HPP_ */
Index: source/ariba/utility/logging/Logging.h
===================================================================
--- source/ariba/utility/logging/Logging.h	(revision 3683)
+++ source/ariba/utility/logging/Logging.h	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #ifndef LOGGING_H__
Index: source/ariba/utility/measurement/PathloadMeasurement.cpp
===================================================================
--- source/ariba/utility/measurement/PathloadMeasurement.cpp	(revision 3683)
+++ source/ariba/utility/measurement/PathloadMeasurement.cpp	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #include "PathloadMeasurement.h"
Index: source/ariba/utility/measurement/PathloadMeasurement.h
===================================================================
--- source/ariba/utility/measurement/PathloadMeasurement.h	(revision 3683)
+++ source/ariba/utility/measurement/PathloadMeasurement.h	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #ifndef __PATHLOAD_MEASUREMENT_H
Index: source/ariba/utility/messages.h
===================================================================
--- source/ariba/utility/messages.h	(revision 3683)
+++ source/ariba/utility/messages.h	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #ifndef MESSAGES_H_
Index: source/ariba/utility/messages/Message.cpp
===================================================================
--- source/ariba/utility/messages/Message.cpp	(revision 3683)
+++ source/ariba/utility/messages/Message.cpp	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #include "Message.h"
Index: source/ariba/utility/messages/Message.h
===================================================================
--- source/ariba/utility/messages/Message.h	(revision 3683)
+++ source/ariba/utility/messages/Message.h	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #ifndef MESSAGE_H_
@@ -236,15 +236,15 @@
 		return NULL;
 	}
-	
+
 	/**
 	 * The same as decapsulate, but this function
 	 * is used in the samples to make the semantics easier
-	 * to understand. The semantics is shown to be: you get 
-	 * a message and convert it to your type. Not as: you 
+	 * to understand. The semantics is shown to be: you get
+	 * a message and convert it to your type. Not as: you
 	 * get a message and have to extract your message from it.
-	 */  
+	 */
 	template<class T>
 	inline T* convert() {
-		return decapsulate<T>();	
+		return decapsulate<T>();
 	}
 
Index: source/ariba/utility/messages/MessageControlInfo.cpp
===================================================================
--- source/ariba/utility/messages/MessageControlInfo.cpp	(revision 3683)
+++ source/ariba/utility/messages/MessageControlInfo.cpp	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #include "MessageControlInfo.h"
Index: source/ariba/utility/messages/MessageControlInfo.h
===================================================================
--- source/ariba/utility/messages/MessageControlInfo.h	(revision 3683)
+++ source/ariba/utility/messages/MessageControlInfo.h	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #ifndef MESSAGECONTROLINFO_H_
Index: source/ariba/utility/messages/MessageProvider.cpp
===================================================================
--- source/ariba/utility/messages/MessageProvider.cpp	(revision 3683)
+++ source/ariba/utility/messages/MessageProvider.cpp	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #include "MessageProvider.h"
Index: source/ariba/utility/messages/MessageProvider.h
===================================================================
--- source/ariba/utility/messages/MessageProvider.h	(revision 3683)
+++ source/ariba/utility/messages/MessageProvider.h	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #ifndef MESSAGEPROVIDER_H_
Index: source/ariba/utility/messages/MessageReceiver.cpp
===================================================================
--- source/ariba/utility/messages/MessageReceiver.cpp	(revision 3683)
+++ source/ariba/utility/messages/MessageReceiver.cpp	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #include "MessageReceiver.h"
Index: source/ariba/utility/messages/MessageReceiver.h
===================================================================
--- source/ariba/utility/messages/MessageReceiver.h	(revision 3683)
+++ source/ariba/utility/messages/MessageReceiver.h	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #ifndef MESSAGERECEIVER_H__
Index: source/ariba/utility/messages/MessageSender.cpp
===================================================================
--- source/ariba/utility/messages/MessageSender.cpp	(revision 3683)
+++ source/ariba/utility/messages/MessageSender.cpp	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #include "MessageSender.h"
Index: source/ariba/utility/messages/MessageSender.h
===================================================================
--- source/ariba/utility/messages/MessageSender.h	(revision 3683)
+++ source/ariba/utility/messages/MessageSender.h	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #ifndef MESSAGESENDER_H_
Index: source/ariba/utility/messages/MessageUtilities.h
===================================================================
--- source/ariba/utility/messages/MessageUtilities.h	(revision 3683)
+++ source/ariba/utility/messages/MessageUtilities.h	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #ifndef MESSAGEUTILITIES_H_
Index: source/ariba/utility/messages/TextMessage.cpp
===================================================================
--- source/ariba/utility/messages/TextMessage.cpp	(revision 3683)
+++ source/ariba/utility/messages/TextMessage.cpp	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #include "TextMessage.h"
Index: source/ariba/utility/messages/TextMessage.h
===================================================================
--- source/ariba/utility/messages/TextMessage.h	(revision 3683)
+++ source/ariba/utility/messages/TextMessage.h	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #ifndef TEXTMESSAGE_H_
Index: source/ariba/utility/messages/_namespace.h
===================================================================
--- source/ariba/utility/messages/_namespace.h	(revision 3683)
+++ source/ariba/utility/messages/_namespace.h	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #undef NAMESPACE_BEGIN
Index: source/ariba/utility/misc/Demultiplexer.hpp
===================================================================
--- source/ariba/utility/misc/Demultiplexer.hpp	(revision 3683)
+++ source/ariba/utility/misc/Demultiplexer.hpp	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #ifndef DEMULTIPLEXER_H__
Index: source/ariba/utility/misc/Helper.cpp
===================================================================
--- source/ariba/utility/misc/Helper.cpp	(revision 3683)
+++ source/ariba/utility/misc/Helper.cpp	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #include "Helper.h"
Index: source/ariba/utility/misc/Helper.h
===================================================================
--- source/ariba/utility/misc/Helper.h	(revision 3683)
+++ source/ariba/utility/misc/Helper.h	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #ifndef __HELPER_H
Index: source/ariba/utility/misc/KeyMapping.hpp
===================================================================
--- source/ariba/utility/misc/KeyMapping.hpp	(revision 3683)
+++ source/ariba/utility/misc/KeyMapping.hpp	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #ifndef KEY_MAPPING_H__
Index: source/ariba/utility/misc/OvlVis.cpp
===================================================================
--- source/ariba/utility/misc/OvlVis.cpp	(revision 3683)
+++ source/ariba/utility/misc/OvlVis.cpp	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #include "OvlVis.h"
Index: source/ariba/utility/misc/OvlVis.h
===================================================================
--- source/ariba/utility/misc/OvlVis.h	(revision 3683)
+++ source/ariba/utility/misc/OvlVis.h	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #ifndef OVLVIS_H__
Index: source/ariba/utility/misc/sha1.cpp
===================================================================
--- source/ariba/utility/misc/sha1.cpp	(revision 3683)
+++ source/ariba/utility/misc/sha1.cpp	(revision 3690)
@@ -1,6 +1,6 @@
-// [licence]
+// [License]
 // 100% free public domain implementation of the SHA-1 algorithm
 // by Dominik Reichl <dominik.reichl@t-online.de>
-// [licence]
+// [License]
 /*
       Version 1.5 - 2005-01-01
Index: source/ariba/utility/misc/sha1.h
===================================================================
--- source/ariba/utility/misc/sha1.h	(revision 3683)
+++ source/ariba/utility/misc/sha1.h	(revision 3690)
@@ -1,6 +1,6 @@
-// [licence]
+// [License]
 // 100% free public domain implementation of the SHA-1 algorithm
 // by Dominik Reichl <dominik.reichl@t-online.de>
-// [licence]
+// [License]
 /*
         Version 1.5 - 2005-01-01
Index: source/ariba/utility/serialization.h
===================================================================
--- source/ariba/utility/serialization.h	(revision 3683)
+++ source/ariba/utility/serialization.h	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #ifndef SERIALIZATION_H_
Index: source/ariba/utility/serialization/Data.hpp
===================================================================
--- source/ariba/utility/serialization/Data.hpp	(revision 3683)
+++ source/ariba/utility/serialization/Data.hpp	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #ifndef DATA_HPP_
Index: source/ariba/utility/serialization/DataStream.hpp
===================================================================
--- source/ariba/utility/serialization/DataStream.hpp	(revision 3683)
+++ source/ariba/utility/serialization/DataStream.hpp	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #ifndef DATASTREAM_HPP_
@@ -42,4 +42,6 @@
 //== Library includes ==
 #include <boost/cstdint.hpp>
+#include <boost/type_traits/make_unsigned.hpp>
+
 #include <iostream>
 #include <vector>
@@ -153,4 +155,22 @@
 	template<typename X>
 	finline void remove(X& obj, if_uint(X)) {
+		if (!isMeasure()) bits[index].get(obj);
+		index += sizeof(X) * 8;
+	}
+
+	/* support signed ints */
+	template<typename X>
+	finline void add(X& sobj, if_int(X)) {
+		typedef typename boost::make_unsigned<X>::type UX;
+		UX& obj = *((UX*)&sobj);
+		if (!isMeasure())
+		bitcpy( sobj, 0, bits.getBuffer(), index);
+		index += sizeof(X) * 8;
+	}
+
+	template<typename X>
+	finline void remove(X& sobj, if_int(X)) {
+		typedef typename boost::make_unsigned<X>::type UX;
+		UX& obj = *((UX*)&sobj);
 		if (!isMeasure()) bits[index].get(obj);
 		index += sizeof(X) * 8;
Index: source/ariba/utility/serialization/DataUtilities.hpp
===================================================================
--- source/ariba/utility/serialization/DataUtilities.hpp	(revision 3683)
+++ source/ariba/utility/serialization/DataUtilities.hpp	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 /* This file implements some common bit operations for unsigned integer types
Index: source/ariba/utility/serialization/Serialization.cpp
===================================================================
--- source/ariba/utility/serialization/Serialization.cpp	(revision 3683)
+++ source/ariba/utility/serialization/Serialization.cpp	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #include "Serialization.hpp"
Index: source/ariba/utility/serialization/Serialization.hpp
===================================================================
--- source/ariba/utility/serialization/Serialization.hpp	(revision 3683)
+++ source/ariba/utility/serialization/Serialization.hpp	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #ifndef SERIALIZATION_HPP_
Index: source/ariba/utility/serialization/TestSerialization.cpp
===================================================================
--- source/ariba/utility/serialization/TestSerialization.cpp	(revision 3683)
+++ source/ariba/utility/serialization/TestSerialization.cpp	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #include "Data.hpp"
Index: source/ariba/utility/system/BlockingMethod.cpp
===================================================================
--- source/ariba/utility/system/BlockingMethod.cpp	(revision 3683)
+++ source/ariba/utility/system/BlockingMethod.cpp	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #include "BlockingMethod.h"
Index: source/ariba/utility/system/BlockingMethod.h
===================================================================
--- source/ariba/utility/system/BlockingMethod.h	(revision 3683)
+++ source/ariba/utility/system/BlockingMethod.h	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #ifndef BLOCKING_METHOD_H__
Index: source/ariba/utility/system/StartupInterface.h
===================================================================
--- source/ariba/utility/system/StartupInterface.h	(revision 3683)
+++ source/ariba/utility/system/StartupInterface.h	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #ifndef __STARTUP_INTERFACE_H
Index: source/ariba/utility/system/StartupWrapper.cpp
===================================================================
--- source/ariba/utility/system/StartupWrapper.cpp	(revision 3683)
+++ source/ariba/utility/system/StartupWrapper.cpp	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #include "StartupWrapper.h"
Index: source/ariba/utility/system/StartupWrapper.h
===================================================================
--- source/ariba/utility/system/StartupWrapper.h	(revision 3683)
+++ source/ariba/utility/system/StartupWrapper.h	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #ifndef __STARTUP_WRAPPER_H
Index: source/ariba/utility/system/SystemEvent.cpp
===================================================================
--- source/ariba/utility/system/SystemEvent.cpp	(revision 3683)
+++ source/ariba/utility/system/SystemEvent.cpp	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #include "SystemEvent.h"
Index: source/ariba/utility/system/SystemEvent.h
===================================================================
--- source/ariba/utility/system/SystemEvent.h	(revision 3683)
+++ source/ariba/utility/system/SystemEvent.h	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #ifndef SYSTEMEVENT_H_
Index: source/ariba/utility/system/SystemEventListener.cpp
===================================================================
--- source/ariba/utility/system/SystemEventListener.cpp	(revision 3683)
+++ source/ariba/utility/system/SystemEventListener.cpp	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #include "SystemEventListener.h"
Index: source/ariba/utility/system/SystemEventListener.h
===================================================================
--- source/ariba/utility/system/SystemEventListener.h	(revision 3683)
+++ source/ariba/utility/system/SystemEventListener.h	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #ifndef SYSTEMEVENTLISTENER_H_
Index: source/ariba/utility/system/SystemEventType.cpp
===================================================================
--- source/ariba/utility/system/SystemEventType.cpp	(revision 3683)
+++ source/ariba/utility/system/SystemEventType.cpp	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #include "SystemEventType.h"
Index: source/ariba/utility/system/SystemEventType.h
===================================================================
--- source/ariba/utility/system/SystemEventType.h	(revision 3683)
+++ source/ariba/utility/system/SystemEventType.h	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #ifndef SYSTEMEVENTTYPE_H_
Index: source/ariba/utility/system/SystemQueue.cpp
===================================================================
--- source/ariba/utility/system/SystemQueue.cpp	(revision 3683)
+++ source/ariba/utility/system/SystemQueue.cpp	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
Index: source/ariba/utility/system/SystemQueue.h
===================================================================
--- source/ariba/utility/system/SystemQueue.h	(revision 3683)
+++ source/ariba/utility/system/SystemQueue.h	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #ifndef SYSTEMQUEUE_H_
Index: source/ariba/utility/system/Timer.cpp
===================================================================
--- source/ariba/utility/system/Timer.cpp	(revision 3683)
+++ source/ariba/utility/system/Timer.cpp	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #include "Timer.h"
Index: source/ariba/utility/system/Timer.h
===================================================================
--- source/ariba/utility/system/Timer.h	(revision 3683)
+++ source/ariba/utility/system/Timer.h	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #ifndef __TIMER_H
Index: source/ariba/utility/types.h
===================================================================
--- source/ariba/utility/types.h	(revision 3683)
+++ source/ariba/utility/types.h	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #ifndef TYPES_H_
Index: source/ariba/utility/types/Address.cpp
===================================================================
--- source/ariba/utility/types/Address.cpp	(revision 3683)
+++ source/ariba/utility/types/Address.cpp	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #include "Address.h"
Index: source/ariba/utility/types/Address.h
===================================================================
--- source/ariba/utility/types/Address.h	(revision 3683)
+++ source/ariba/utility/types/Address.h	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #ifndef ADDRESS_H_
Index: source/ariba/utility/types/Data.hpp
===================================================================
--- source/ariba/utility/types/Data.hpp	(revision 3683)
+++ source/ariba/utility/types/Data.hpp	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #include "../serialization/Data.hpp"
Index: source/ariba/utility/types/Identifier.cpp
===================================================================
--- source/ariba/utility/types/Identifier.cpp	(revision 3683)
+++ source/ariba/utility/types/Identifier.cpp	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #include "Identifier.h"
Index: source/ariba/utility/types/Identifier.h
===================================================================
--- source/ariba/utility/types/Identifier.h	(revision 3683)
+++ source/ariba/utility/types/Identifier.h	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #ifndef IDENTIFIER_H_
Index: source/ariba/utility/types/LinkID.cpp
===================================================================
--- source/ariba/utility/types/LinkID.cpp	(revision 3683)
+++ source/ariba/utility/types/LinkID.cpp	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #include "LinkID.h"
Index: source/ariba/utility/types/LinkID.h
===================================================================
--- source/ariba/utility/types/LinkID.h	(revision 3683)
+++ source/ariba/utility/types/LinkID.h	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #ifndef LINKID_H_
Index: source/ariba/utility/types/Locator.cpp
===================================================================
--- source/ariba/utility/types/Locator.cpp	(revision 3683)
+++ source/ariba/utility/types/Locator.cpp	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #include "Locator.h"
Index: source/ariba/utility/types/Locator.h
===================================================================
--- source/ariba/utility/types/Locator.h	(revision 3683)
+++ source/ariba/utility/types/Locator.h	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #ifndef LOCATOR_H_
Index: source/ariba/utility/types/NodeID.cpp
===================================================================
--- source/ariba/utility/types/NodeID.cpp	(revision 3683)
+++ source/ariba/utility/types/NodeID.cpp	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #include "NodeID.h"
Index: source/ariba/utility/types/NodeID.h
===================================================================
--- source/ariba/utility/types/NodeID.h	(revision 3683)
+++ source/ariba/utility/types/NodeID.h	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #ifndef __NODEID_H
Index: source/ariba/utility/types/OverlayParameterSet.cpp
===================================================================
--- source/ariba/utility/types/OverlayParameterSet.cpp	(revision 3683)
+++ source/ariba/utility/types/OverlayParameterSet.cpp	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #include "OverlayParameterSet.h"
Index: source/ariba/utility/types/OverlayParameterSet.h
===================================================================
--- source/ariba/utility/types/OverlayParameterSet.h	(revision 3683)
+++ source/ariba/utility/types/OverlayParameterSet.h	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #ifndef OVERLAYPARAMETERSET_H_
@@ -53,10 +53,10 @@
 
 	typedef enum _OverlayStructure {
-		OverlayStructureOneHop   = 1,
-		OverlayStructureChord    = 2,
-		OverlayStructureKademlia = 3,
+		OverlayStructureOneHop   = 0,
+		OverlayStructureChord    = 1,
+		OverlayStructureKademlia = 2,
 	} OverlayStructure;
 
-	OverlayParameterSet(OverlayStructure _structure = OverlayStructureOneHop);
+	OverlayParameterSet(OverlayStructure _structure = OverlayStructureChord);
 	virtual ~OverlayParameterSet();
 
Index: source/ariba/utility/types/QoSParameterSet.cpp
===================================================================
--- source/ariba/utility/types/QoSParameterSet.cpp	(revision 3683)
+++ source/ariba/utility/types/QoSParameterSet.cpp	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #include "QoSParameterSet.h"
Index: source/ariba/utility/types/QoSParameterSet.h
===================================================================
--- source/ariba/utility/types/QoSParameterSet.h	(revision 3683)
+++ source/ariba/utility/types/QoSParameterSet.h	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #ifndef QOS_PARAMETER_SET_H__
Index: source/ariba/utility/types/SecurityParameterSet.cpp
===================================================================
--- source/ariba/utility/types/SecurityParameterSet.cpp	(revision 3683)
+++ source/ariba/utility/types/SecurityParameterSet.cpp	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #include "SecurityParameterSet.h"
Index: source/ariba/utility/types/SecurityParameterSet.h
===================================================================
--- source/ariba/utility/types/SecurityParameterSet.h	(revision 3683)
+++ source/ariba/utility/types/SecurityParameterSet.h	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #ifndef SECURITY_PARAMETER_SET_H
Index: source/ariba/utility/types/ServiceID.cpp
===================================================================
--- source/ariba/utility/types/ServiceID.cpp	(revision 3683)
+++ source/ariba/utility/types/ServiceID.cpp	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #include "ServiceID.h"
Index: source/ariba/utility/types/ServiceID.h
===================================================================
--- source/ariba/utility/types/ServiceID.h	(revision 3683)
+++ source/ariba/utility/types/ServiceID.h	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #ifndef SERVICEID_H_
Index: source/ariba/utility/types/SpoVNetID.cpp
===================================================================
--- source/ariba/utility/types/SpoVNetID.cpp	(revision 3683)
+++ source/ariba/utility/types/SpoVNetID.cpp	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #include "SpoVNetID.h"
Index: source/ariba/utility/types/SpoVNetID.h
===================================================================
--- source/ariba/utility/types/SpoVNetID.h	(revision 3683)
+++ source/ariba/utility/types/SpoVNetID.h	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #ifndef SPOVNETID_H_
Index: source/ariba/utility/types/_namespace.h
===================================================================
--- source/ariba/utility/types/_namespace.h	(revision 3683)
+++ source/ariba/utility/types/_namespace.h	(revision 3690)
@@ -1,3 +1,3 @@
-// [Licence]
+// [License]
 // The Ariba-Underlay Copyright
 //
@@ -35,5 +35,5 @@
 // official policies, either expressed or implied, of the Institute of
 // Telematics.
-// [Licence]
+// [License]
 
 #undef NAMESPACE_BEGIN