Index: trunk/autoquest-plugin-uml-test/src/test/resources/ita_v2_servicenamemap.txt
===================================================================
--- trunk/autoquest-plugin-uml-test/src/test/resources/ita_v2_servicenamemap.txt	(revision 1908)
+++ trunk/autoquest-plugin-uml-test/src/test/resources/ita_v2_servicenamemap.txt	(revision 1913)
@@ -1,4 +1,18 @@
-/ws/BusinessUnitReferenceImplementationService = materialSupplierService
-/ws/WarehouseReferenceImplementationService = warehouseService
-/ws/PointOfSaleReferenceImplementationService = pointOfSaleService
-/ws/TransportReferenceImplementationService = TransportService
+serviceName.path./ws/BusinessUnitReferenceImplementationService = materialSupplierService
+serviceName.path./ws/WarehouseReferenceImplementationService = warehouseService
+serviceName.path./ws/PointOfSaleReferenceImplementationService = pointOfSaleService
+serviceName.path./ws/TransportReferenceImplementationService = TransportService
+clientName.receiver.port.8086 = warehouseService
+clientName.receiver.port.8087 = TransportService
+clientName.receiver.port.8088 = pointOfSaleService
+clientName.receiver.port.8089 = materialSupplierService
+clientName.receiver.port.8090 = TransportService
+clientName.receiver.port.8091 = pointOfSaleService
+clientName.receiver.port.8092 = materialSupplierService
+clientName.receiver.port.8093 = warehouseService
+clientName.receiver.port.8094 = pointOfSaleService
+clientName.receiver.port.8095 = materialSupplierService
+clientName.receiver.port.8096 = warehouseService
+clientName.receiver.port.8097 = TransportService
+clientName.default = Logistics_Environment
+
Index: trunk/autoquest-plugin-uml-test/src/test/resources/testCalculateUsageScore_1_properties.txt
===================================================================
--- trunk/autoquest-plugin-uml-test/src/test/resources/testCalculateUsageScore_1_properties.txt	(revision 1908)
+++ trunk/autoquest-plugin-uml-test/src/test/resources/testCalculateUsageScore_1_properties.txt	(revision 1913)
@@ -1,5 +1,6 @@
-/midas/rlus/query/xdw = rlus_property
-/midas/rlus/update/xdw = rlus_property
-/midas/rlus/update/cda2report = rlus_property
-/midas/ixsmq/update/pocdpatient = ixsmq_property
-/midas/ixsmq/query/pocdpatient = ixsmq_property
+serviceName.path./midas/rlus/query/xdw = rlus_property
+serviceName.path./midas/rlus/update/xdw = rlus_property
+serviceName.path./midas/rlus/update/cda2report = rlus_property
+serviceName.path./midas/ixsmq/update/pocdpatient = ixsmq_property
+serviceName.path./midas/ixsmq/query/pocdpatient = ixsmq_property
+clientName.receiver.port.6000 = user
Index: trunk/autoquest-plugin-uml-test/src/test/resources/testCreateInteractionFromEventSequence_1_properties.txt
===================================================================
--- trunk/autoquest-plugin-uml-test/src/test/resources/testCreateInteractionFromEventSequence_1_properties.txt	(revision 1908)
+++ trunk/autoquest-plugin-uml-test/src/test/resources/testCreateInteractionFromEventSequence_1_properties.txt	(revision 1913)
@@ -1,5 +1,6 @@
-/midas/rlus/query/xdw = rlus_property
-/midas/rlus/update/xdw = rlus_property
-/midas/rlus/update/cda2report = rlus_property
-/midas/ixsmq/update/pocdpatient = ixsmq_property
-/midas/ixsmq/query/pocdpatient = ixsmq_property
+serviceName.path./midas/rlus/query/xdw = rlus_property
+serviceName.path./midas/rlus/update/xdw = rlus_property
+serviceName.path./midas/rlus/update/cda2report = rlus_property
+serviceName.path./midas/ixsmq/update/pocdpatient = ixsmq_property
+serviceName.path./midas/ixsmq/query/pocdpatient = ixsmq_property
+clientName.receiver.port.6000 = user
Index: trunk/autoquest-plugin-uml-test/src/test/resources/testCreateInteractionFromEventSequence_2_properties.txt
===================================================================
--- trunk/autoquest-plugin-uml-test/src/test/resources/testCreateInteractionFromEventSequence_2_properties.txt	(revision 1908)
+++ trunk/autoquest-plugin-uml-test/src/test/resources/testCreateInteractionFromEventSequence_2_properties.txt	(revision 1913)
@@ -1,10 +1,14 @@
-/ws/BusinessUnitBusinessService = materialSupplier
-/ws/BusinessUnitWarehouseService = warehouse
-/ws/BusinessUnitTransportService = transport
-/ws/WarehouseWarehouseService = warehouse
-/ws/WarehouseBusinessService = materialSupplier
-/ws/WarehouseTransportService = transport
-/ws/TransportTransportService = transport
-/ws/PointOfSaleBusinessService = pointOfSale
-/ws/PointOfSaleWarehouseService = pointOfSale
-/ws/PointOfSaleTransportService = pointOfSale
+serviceName.path./ws/BusinessUnitBusinessService = materialSupplier
+serviceName.path./ws/BusinessUnitWarehouseService = warehouse
+serviceName.path./ws/BusinessUnitTransportService = transport
+serviceName.path./ws/WarehouseWarehouseService = warehouse
+serviceName.path./ws/WarehouseBusinessService = materialSupplier
+serviceName.path./ws/WarehouseTransportService = transport
+serviceName.path./ws/TransportTransportService = transport
+serviceName.path./ws/PointOfSaleBusinessService = pointOfSale
+serviceName.path./ws/PointOfSaleWarehouseService = pointOfSale
+serviceName.path./ws/PointOfSaleTransportService = pointOfSale
+clientName.receiver.port.9081 = warehouse
+clientName.receiver.port.9082 = transport
+clientName.receiver.port.9083 = warehouse
+clientName.receiver.port.9084 = warehouse