Index: source/ariba/communication/BaseCommunication.cpp
===================================================================
--- source/ariba/communication/BaseCommunication.cpp	(revision 3067)
+++ source/ariba/communication/BaseCommunication.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 "BaseCommunication.h"
@@ -160,8 +160,13 @@
 
 const LinkID BaseCommunication::establishLink(
-			const EndpointDescriptor& descriptor,
-			const QoSParameterSet& qos,
-			const SecurityParameterSet& sec){
-
+	const EndpointDescriptor& descriptor,
+	const LinkID& link_id,
+	const QoSParameterSet& qos,
+	const SecurityParameterSet& sec) {
+
+	// copy link id
+	LinkID linkid = link_id;
+
+	// debug
 	logging_debug( "request to establish link" );
 
@@ -169,5 +174,4 @@
 	// just use the first locator in the endp descriptors
 	//
-
 	if( descriptor.locator == NULL ){
 		logging_error( "invalid destination endpoint" );
@@ -183,10 +187,6 @@
 	const NetworkLocator* local =  localDescriptor.locator;
 
-	//
-	// create link and link descriptor
-	//
-
-	LinkID linkid = LinkID::create();
-
+	// create link identifier and link descriptor
+	if (linkid.isUnspecified()) linkid = LinkID::create();
 	logging_debug( "creating new local descriptor entry with local link id " << linkid.toString() );
 	LinkDescriptor linkDescriptor( linkid, local, LinkID::UNSPECIFIED, remote, descriptor, false );
Index: source/ariba/communication/BaseCommunication.h
===================================================================
--- source/ariba/communication/BaseCommunication.h	(revision 3067)
+++ source/ariba/communication/BaseCommunication.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 BASECOMMUNICATION_H_
@@ -147,14 +147,15 @@
 
 	/**
-	 * Establishes a link to another end-point
+	 * Establishes a link to another end-point.
 	 */
 	const LinkID establishLink(
-			const EndpointDescriptor& descriptor,
-			const QoSParameterSet& qos = QoSParameterSet::DEFAULT,
-			const SecurityParameterSet& sec = SecurityParameterSet::DEFAULT
+		const EndpointDescriptor& descriptor,
+		const LinkID& linkid = LinkID::UNSPECIFIED,
+		const QoSParameterSet& qos = QoSParameterSet::DEFAULT,
+		const SecurityParameterSet& sec = SecurityParameterSet::DEFAULT
 	);
 
 	/**
-	 * Drops a link
+	 * Drops a link.
 	 *
 	 * @param The link id of the link that should be dropped
Index: source/ariba/communication/CommunicationEvents.cpp
===================================================================
--- source/ariba/communication/CommunicationEvents.cpp	(revision 3067)
+++ source/ariba/communication/CommunicationEvents.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 "CommunicationEvents.h"
Index: source/ariba/communication/CommunicationEvents.h
===================================================================
--- source/ariba/communication/CommunicationEvents.h	(revision 3067)
+++ source/ariba/communication/CommunicationEvents.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 __COMMUNICATION_EVENTS_H
Index: source/ariba/communication/EndpointDescriptor.cpp
===================================================================
--- source/ariba/communication/EndpointDescriptor.cpp	(revision 3067)
+++ source/ariba/communication/EndpointDescriptor.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 "EndpointDescriptor.h"
Index: source/ariba/communication/EndpointDescriptor.h
===================================================================
--- source/ariba/communication/EndpointDescriptor.h	(revision 3067)
+++ source/ariba/communication/EndpointDescriptor.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 ENDPOINTDESCRIPTOR_H_
@@ -56,5 +56,5 @@
 using_serialization;
 
-class EndpointDescriptor : VSerializeable {
+class EndpointDescriptor : public VSerializeable {
 	VSERIALIZEABLE;
 
Index: source/ariba/communication/messages/AribaBaseMsg.cpp
===================================================================
--- source/ariba/communication/messages/AribaBaseMsg.cpp	(revision 3067)
+++ source/ariba/communication/messages/AribaBaseMsg.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 "AribaBaseMsg.h"
Index: source/ariba/communication/messages/AribaBaseMsg.h
===================================================================
--- source/ariba/communication/messages/AribaBaseMsg.h	(revision 3067)
+++ source/ariba/communication/messages/AribaBaseMsg.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 ARIBA_BASE_MSG_H__
Index: source/ariba/communication/modules/_namespace.h
===================================================================
--- source/ariba/communication/modules/_namespace.h	(revision 3067)
+++ source/ariba/communication/modules/_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/communication/modules/modules.h
===================================================================
--- source/ariba/communication/modules/modules.h	(revision 3067)
+++ source/ariba/communication/modules/modules.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 MODULES_H_
Index: source/ariba/communication/modules/network/NetworkLocator.cpp
===================================================================
--- source/ariba/communication/modules/network/NetworkLocator.cpp	(revision 3067)
+++ source/ariba/communication/modules/network/NetworkLocator.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 "NetworkLocator.h"
Index: source/ariba/communication/modules/network/NetworkLocator.h
===================================================================
--- source/ariba/communication/modules/network/NetworkLocator.h	(revision 3067)
+++ source/ariba/communication/modules/network/NetworkLocator.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 NETWORKLOCATOR_H_
Index: source/ariba/communication/modules/network/NetworkProtocol.cpp
===================================================================
--- source/ariba/communication/modules/network/NetworkProtocol.cpp	(revision 3067)
+++ source/ariba/communication/modules/network/NetworkProtocol.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 "NetworkProtocol.h"
Index: source/ariba/communication/modules/network/NetworkProtocol.h
===================================================================
--- source/ariba/communication/modules/network/NetworkProtocol.h	(revision 3067)
+++ source/ariba/communication/modules/network/NetworkProtocol.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 NETWORKPROTOCOL_H_
Index: source/ariba/communication/modules/network/ip/IPv4Locator.cpp
===================================================================
--- source/ariba/communication/modules/network/ip/IPv4Locator.cpp	(revision 3067)
+++ source/ariba/communication/modules/network/ip/IPv4Locator.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 "IPv4Locator.h"
Index: source/ariba/communication/modules/network/ip/IPv4Locator.h
===================================================================
--- source/ariba/communication/modules/network/ip/IPv4Locator.h	(revision 3067)
+++ source/ariba/communication/modules/network/ip/IPv4Locator.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 IPV4LOCATOR_H_
Index: source/ariba/communication/modules/network/ip/IPv4NetworkProtocol.cpp
===================================================================
--- source/ariba/communication/modules/network/ip/IPv4NetworkProtocol.cpp	(revision 3067)
+++ source/ariba/communication/modules/network/ip/IPv4NetworkProtocol.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 "IPv4NetworkProtocol.h"
Index: source/ariba/communication/modules/network/ip/IPv4NetworkProtocol.h
===================================================================
--- source/ariba/communication/modules/network/ip/IPv4NetworkProtocol.h	(revision 3067)
+++ source/ariba/communication/modules/network/ip/IPv4NetworkProtocol.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 IPV4_NETWORK_PROTOCOL_H__
Index: source/ariba/communication/modules/network/omnet/OmnetNetworkProtocol.cpp
===================================================================
--- source/ariba/communication/modules/network/omnet/OmnetNetworkProtocol.cpp	(revision 3067)
+++ source/ariba/communication/modules/network/omnet/OmnetNetworkProtocol.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 "OmnetNetworkProtocol.h"
Index: source/ariba/communication/modules/network/omnet/OmnetNetworkProtocol.h
===================================================================
--- source/ariba/communication/modules/network/omnet/OmnetNetworkProtocol.h	(revision 3067)
+++ source/ariba/communication/modules/network/omnet/OmnetNetworkProtocol.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 __OMNET_NETWORK_PROTOCOL_H
Index: source/ariba/communication/modules/transport/TransportLocator.cpp
===================================================================
--- source/ariba/communication/modules/transport/TransportLocator.cpp	(revision 3067)
+++ source/ariba/communication/modules/transport/TransportLocator.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 "TransportLocator.h"
Index: source/ariba/communication/modules/transport/TransportLocator.h
===================================================================
--- source/ariba/communication/modules/transport/TransportLocator.h	(revision 3067)
+++ source/ariba/communication/modules/transport/TransportLocator.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 TRANSPORTLOCATOR_H_
Index: source/ariba/communication/modules/transport/TransportProtocol.cpp
===================================================================
--- source/ariba/communication/modules/transport/TransportProtocol.cpp	(revision 3067)
+++ source/ariba/communication/modules/transport/TransportProtocol.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 "TransportProtocol.h"
Index: source/ariba/communication/modules/transport/TransportProtocol.h
===================================================================
--- source/ariba/communication/modules/transport/TransportProtocol.h	(revision 3067)
+++ source/ariba/communication/modules/transport/TransportProtocol.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 TRANSPORTPROTOCOL_H_
Index: source/ariba/communication/modules/transport/omnet/AribaOmnetMessage.msg
===================================================================
--- source/ariba/communication/modules/transport/omnet/AribaOmnetMessage.msg	(revision 3067)
+++ source/ariba/communication/modules/transport/omnet/AribaOmnetMessage.msg	(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]
 
 message AribaOmnetMessage
Index: source/ariba/communication/modules/transport/omnet/AribaOmnetModule.cpp
===================================================================
--- source/ariba/communication/modules/transport/omnet/AribaOmnetModule.cpp	(revision 3067)
+++ source/ariba/communication/modules/transport/omnet/AribaOmnetModule.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 "AribaOmnetModule.h"
Index: source/ariba/communication/modules/transport/omnet/AribaOmnetModule.h
===================================================================
--- source/ariba/communication/modules/transport/omnet/AribaOmnetModule.h	(revision 3067)
+++ source/ariba/communication/modules/transport/omnet/AribaOmnetModule.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 ARIBA_OMNET_MODULE_H__
Index: source/ariba/communication/modules/transport/tcp/TCPTransport.cpp
===================================================================
--- source/ariba/communication/modules/transport/tcp/TCPTransport.cpp	(revision 3067)
+++ source/ariba/communication/modules/transport/tcp/TCPTransport.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 "TCPTransport.h"
Index: source/ariba/communication/modules/transport/tcp/TCPTransport.h
===================================================================
--- source/ariba/communication/modules/transport/tcp/TCPTransport.h	(revision 3067)
+++ source/ariba/communication/modules/transport/tcp/TCPTransport.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 TCPTRANSPORT_H_
Index: source/ariba/communication/modules/transport/tcp/TCPTransportLocator.cpp
===================================================================
--- source/ariba/communication/modules/transport/tcp/TCPTransportLocator.cpp	(revision 3067)
+++ source/ariba/communication/modules/transport/tcp/TCPTransportLocator.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 "TCPTransportLocator.h"
Index: source/ariba/communication/modules/transport/tcp/TCPTransportLocator.h
===================================================================
--- source/ariba/communication/modules/transport/tcp/TCPTransportLocator.h	(revision 3067)
+++ source/ariba/communication/modules/transport/tcp/TCPTransportLocator.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 TCPTRANSPORTLOCATOR_H_
Index: source/ariba/communication/networkinfo/AddressInformation.cpp
===================================================================
--- source/ariba/communication/networkinfo/AddressInformation.cpp	(revision 3067)
+++ source/ariba/communication/networkinfo/AddressInformation.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 "AddressInformation.h"
Index: source/ariba/communication/networkinfo/AddressInformation.h
===================================================================
--- source/ariba/communication/networkinfo/AddressInformation.h	(revision 3067)
+++ source/ariba/communication/networkinfo/AddressInformation.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_INFORMATION_H
Index: source/ariba/communication/networkinfo/NetworkChangeDetection.cpp
===================================================================
--- source/ariba/communication/networkinfo/NetworkChangeDetection.cpp	(revision 3067)
+++ source/ariba/communication/networkinfo/NetworkChangeDetection.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 "NetworkChangeDetection.h"
Index: source/ariba/communication/networkinfo/NetworkChangeDetection.h
===================================================================
--- source/ariba/communication/networkinfo/NetworkChangeDetection.h	(revision 3067)
+++ source/ariba/communication/networkinfo/NetworkChangeDetection.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 __NETWORK_CHANGE_DETECTION_H
Index: source/ariba/communication/networkinfo/NetworkChangeInterface.h
===================================================================
--- source/ariba/communication/networkinfo/NetworkChangeInterface.h	(revision 3067)
+++ source/ariba/communication/networkinfo/NetworkChangeInterface.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 __NETWORK_CHANGE_INTERFACE_H
Index: source/ariba/communication/networkinfo/NetworkInformation.cpp
===================================================================
--- source/ariba/communication/networkinfo/NetworkInformation.cpp	(revision 3067)
+++ source/ariba/communication/networkinfo/NetworkInformation.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 "NetworkInformation.h"
Index: source/ariba/communication/networkinfo/NetworkInformation.h
===================================================================
--- source/ariba/communication/networkinfo/NetworkInformation.h	(revision 3067)
+++ source/ariba/communication/networkinfo/NetworkInformation.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 __NETWORK_INFORMATION_H
Index: source/ariba/communication/networkinfo/NetworkInterface.cpp
===================================================================
--- source/ariba/communication/networkinfo/NetworkInterface.cpp	(revision 3067)
+++ source/ariba/communication/networkinfo/NetworkInterface.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 "NetworkInterface.h"
Index: source/ariba/communication/networkinfo/NetworkInterface.h
===================================================================
--- source/ariba/communication/networkinfo/NetworkInterface.h	(revision 3067)
+++ source/ariba/communication/networkinfo/NetworkInterface.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 __NETWORK_INTERFACE_H