diff --git a/test/input/org/matsim/freight/logistics/io/lsps.xml b/test/input/org/matsim/freight/logistics/io/lsps.xml
index 959a594a..556ef25c 100644
--- a/test/input/org/matsim/freight/logistics/io/lsps.xml
+++ b/test/input/org/matsim/freight/logistics/io/lsps.xml
@@ -20,16 +20,16 @@
 					</logisticChain>
 				</logisticChains>
 				<shipmentPlans>
-					<lspShipmentPlan shipmentId="shipmentSouth" chainId="singleChain">
+					<shipmentPlan shipmentId="shipmentSouth" chainId="singleChain">
 						<element id="singleCarriersingleCarrierElementLOAD" type="LOAD" startTime="0.0" endTime="120.0" resourceId="singleCarrier"/>
 						<element id="singleCarriersingleCarrierElementTRANSPORT" type="TRANSPORT" startTime="120.0" endTime="3540.0" resourceId="singleCarrier"/>
 						<element id="singleCarriersingleCarrierElementUNLOAD" type="UNLOAD" startTime="3540.0" endTime="3600.0" resourceId="singleCarrier"/>
-					</lspShipmentPlan>
-					<lspShipmentPlan shipmentId="shipmentNorth" chainId="singleChain">
+					</shipmentPlan>
+					<shipmentPlan shipmentId="shipmentNorth" chainId="singleChain">
 						<element id="singleCarriersingleCarrierElementLOAD" type="LOAD" startTime="0.0" endTime="120.0" resourceId="singleCarrier"/>
 						<element id="singleCarriersingleCarrierElementTRANSPORT" type="TRANSPORT" startTime="120.0" endTime="2040.0" resourceId="singleCarrier"/>
 						<element id="singleCarriersingleCarrierElementUNLOAD" type="UNLOAD" startTime="2040.0" endTime="2100.0" resourceId="singleCarrier"/>
-					</lspShipmentPlan>
+					</shipmentPlan>
 				</shipmentPlans>
 			</LspPlan>
 			<LspPlan score="-649.2" selected="false">
@@ -42,16 +42,16 @@
 					</logisticChain>
 				</logisticChains>
 				<shipmentPlans>
-					<lspShipmentPlan shipmentId="shipmentSouth" chainId="southChain">
+					<shipmentPlan shipmentId="shipmentSouth" chainId="southChain">
 						<element id="carrierSouthsouthCarrierElementLOAD" type="LOAD" startTime="0.0" endTime="60.0" resourceId="carrierSouth"/>
 						<element id="carrierSouthsouthCarrierElementTRANSPORT" type="TRANSPORT" startTime="60.0" endTime="1020.0" resourceId="carrierSouth"/>
 						<element id="carrierSouthsouthCarrierElementUNLOAD" type="UNLOAD" startTime="1020.0" endTime="1080.0" resourceId="carrierSouth"/>
-					</lspShipmentPlan>
-					<lspShipmentPlan shipmentId="shipmentNorth" chainId="northChain">
+					</shipmentPlan>
+					<shipmentPlan shipmentId="shipmentNorth" chainId="northChain">
 						<element id="CarrierNorthnorthCarrierElementLOAD" type="LOAD" startTime="0.0" endTime="60.0" resourceId="CarrierNorth"/>
 						<element id="CarrierNorthnorthCarrierElementTRANSPORT" type="TRANSPORT" startTime="60.0" endTime="1020.0" resourceId="CarrierNorth"/>
 						<element id="CarrierNorthnorthCarrierElementUNLOAD" type="UNLOAD" startTime="1020.0" endTime="1080.0" resourceId="CarrierNorth"/>
-					</lspShipmentPlan>
+					</shipmentPlan>
 				</shipmentPlans>
 			</LspPlan>
 		</LspPlans>
@@ -87,7 +87,7 @@
 					</logisticChain>
 				</logisticChains>
 				<shipmentPlans>
-					<lspShipmentPlan shipmentId="Shipment_1" chainId="hubChain">
+					<shipmentPlan shipmentId="Shipment_1" chainId="hubChain">
 						<element id="mainCarriermainCarrierElementLOAD" type="LOAD" startTime="0.0" endTime="600.0" resourceId="mainCarrier"/>
 						<element id="mainCarriermainCarrierElementTRANSPORT" type="TRANSPORT" startTime="600.0" endTime="2040.0" resourceId="mainCarrier"/>
 						<element id="mainCarriermainCarrierElementUNLOAD" type="UNLOAD" startTime="2040.0" endTime="2640.0" resourceId="mainCarrier"/>
@@ -95,8 +95,8 @@
 						<element id="distributionCarrierdistributionCarrierElementLOAD" type="LOAD" startTime="2651.0" endTime="2951.0" resourceId="distributionCarrier"/>
 						<element id="distributionCarrierdistributionCarrierElementTRANSPORT" type="TRANSPORT" startTime="2951.0" endTime="3791.0" resourceId="distributionCarrier"/>
 						<element id="distributionCarrierdistributionCarrierElementUNLOAD" type="UNLOAD" startTime="3791.0" endTime="3851.0" resourceId="distributionCarrier"/>
-					</lspShipmentPlan>
-					<lspShipmentPlan shipmentId="Shipment_2" chainId="hubChain">
+					</shipmentPlan>
+					<shipmentPlan shipmentId="Shipment_2" chainId="hubChain">
 						<element id="mainCarriermainCarrierElementLOAD" type="LOAD" startTime="0.0" endTime="600.0" resourceId="mainCarrier"/>
 						<element id="mainCarriermainCarrierElementTRANSPORT" type="TRANSPORT" startTime="600.0" endTime="2040.0" resourceId="mainCarrier"/>
 						<element id="mainCarriermainCarrierElementUNLOAD" type="UNLOAD" startTime="2040.0" endTime="2640.0" resourceId="mainCarrier"/>
@@ -104,8 +104,8 @@
 						<element id="distributionCarrierdistributionCarrierElementLOAD" type="LOAD" startTime="2651.0" endTime="2951.0" resourceId="distributionCarrier"/>
 						<element id="distributionCarrierdistributionCarrierElementTRANSPORT" type="TRANSPORT" startTime="2951.0" endTime="3431.0" resourceId="distributionCarrier"/>
 						<element id="distributionCarrierdistributionCarrierElementUNLOAD" type="UNLOAD" startTime="3431.0" endTime="3491.0" resourceId="distributionCarrier"/>
-					</lspShipmentPlan>
-					<lspShipmentPlan shipmentId="Shipment_3" chainId="hubChain">
+					</shipmentPlan>
+					<shipmentPlan shipmentId="Shipment_3" chainId="hubChain">
 						<element id="mainCarriermainCarrierElementLOAD" type="LOAD" startTime="0.0" endTime="600.0" resourceId="mainCarrier"/>
 						<element id="mainCarriermainCarrierElementTRANSPORT" type="TRANSPORT" startTime="600.0" endTime="2040.0" resourceId="mainCarrier"/>
 						<element id="mainCarriermainCarrierElementUNLOAD" type="UNLOAD" startTime="2040.0" endTime="2640.0" resourceId="mainCarrier"/>
@@ -113,8 +113,8 @@
 						<element id="distributionCarrierdistributionCarrierElementLOAD" type="LOAD" startTime="2651.0" endTime="2951.0" resourceId="distributionCarrier"/>
 						<element id="distributionCarrierdistributionCarrierElementTRANSPORT" type="TRANSPORT" startTime="2951.0" endTime="4691.0" resourceId="distributionCarrier"/>
 						<element id="distributionCarrierdistributionCarrierElementUNLOAD" type="UNLOAD" startTime="4691.0" endTime="4751.0" resourceId="distributionCarrier"/>
-					</lspShipmentPlan>
-					<lspShipmentPlan shipmentId="Shipment_4" chainId="hubChain">
+					</shipmentPlan>
+					<shipmentPlan shipmentId="Shipment_4" chainId="hubChain">
 						<element id="mainCarriermainCarrierElementLOAD" type="LOAD" startTime="0.0" endTime="600.0" resourceId="mainCarrier"/>
 						<element id="mainCarriermainCarrierElementTRANSPORT" type="TRANSPORT" startTime="600.0" endTime="2040.0" resourceId="mainCarrier"/>
 						<element id="mainCarriermainCarrierElementUNLOAD" type="UNLOAD" startTime="2040.0" endTime="2640.0" resourceId="mainCarrier"/>
@@ -122,8 +122,8 @@
 						<element id="distributionCarrierdistributionCarrierElementLOAD" type="LOAD" startTime="2651.0" endTime="2951.0" resourceId="distributionCarrier"/>
 						<element id="distributionCarrierdistributionCarrierElementTRANSPORT" type="TRANSPORT" startTime="2951.0" endTime="5231.0" resourceId="distributionCarrier"/>
 						<element id="distributionCarrierdistributionCarrierElementUNLOAD" type="UNLOAD" startTime="5231.0" endTime="5291.0" resourceId="distributionCarrier"/>
-					</lspShipmentPlan>
-					<lspShipmentPlan shipmentId="Shipment_5" chainId="hubChain">
+					</shipmentPlan>
+					<shipmentPlan shipmentId="Shipment_5" chainId="hubChain">
 						<element id="mainCarriermainCarrierElementLOAD" type="LOAD" startTime="0.0" endTime="600.0" resourceId="mainCarrier"/>
 						<element id="mainCarriermainCarrierElementTRANSPORT" type="TRANSPORT" startTime="600.0" endTime="2040.0" resourceId="mainCarrier"/>
 						<element id="mainCarriermainCarrierElementUNLOAD" type="UNLOAD" startTime="2040.0" endTime="2640.0" resourceId="mainCarrier"/>
@@ -131,8 +131,8 @@
 						<element id="distributionCarrierdistributionCarrierElementLOAD" type="LOAD" startTime="2651.0" endTime="2951.0" resourceId="distributionCarrier"/>
 						<element id="distributionCarrierdistributionCarrierElementTRANSPORT" type="TRANSPORT" startTime="2951.0" endTime="3611.0" resourceId="distributionCarrier"/>
 						<element id="distributionCarrierdistributionCarrierElementUNLOAD" type="UNLOAD" startTime="3611.0" endTime="3671.0" resourceId="distributionCarrier"/>
-					</lspShipmentPlan>
-					<lspShipmentPlan shipmentId="Shipment_6" chainId="hubChain">
+					</shipmentPlan>
+					<shipmentPlan shipmentId="Shipment_6" chainId="hubChain">
 						<element id="mainCarriermainCarrierElementLOAD" type="LOAD" startTime="0.0" endTime="600.0" resourceId="mainCarrier"/>
 						<element id="mainCarriermainCarrierElementTRANSPORT" type="TRANSPORT" startTime="600.0" endTime="2040.0" resourceId="mainCarrier"/>
 						<element id="mainCarriermainCarrierElementUNLOAD" type="UNLOAD" startTime="2040.0" endTime="2640.0" resourceId="mainCarrier"/>
@@ -140,8 +140,8 @@
 						<element id="distributionCarrierdistributionCarrierElementLOAD" type="LOAD" startTime="2651.0" endTime="2951.0" resourceId="distributionCarrier"/>
 						<element id="distributionCarrierdistributionCarrierElementTRANSPORT" type="TRANSPORT" startTime="2951.0" endTime="3791.0" resourceId="distributionCarrier"/>
 						<element id="distributionCarrierdistributionCarrierElementUNLOAD" type="UNLOAD" startTime="3791.0" endTime="3851.0" resourceId="distributionCarrier"/>
-					</lspShipmentPlan>
-					<lspShipmentPlan shipmentId="Shipment_7" chainId="hubChain">
+					</shipmentPlan>
+					<shipmentPlan shipmentId="Shipment_7" chainId="hubChain">
 						<element id="mainCarriermainCarrierElementLOAD" type="LOAD" startTime="0.0" endTime="600.0" resourceId="mainCarrier"/>
 						<element id="mainCarriermainCarrierElementTRANSPORT" type="TRANSPORT" startTime="600.0" endTime="2040.0" resourceId="mainCarrier"/>
 						<element id="mainCarriermainCarrierElementUNLOAD" type="UNLOAD" startTime="2040.0" endTime="2640.0" resourceId="mainCarrier"/>
@@ -149,8 +149,8 @@
 						<element id="distributionCarrierdistributionCarrierElementLOAD" type="LOAD" startTime="2651.0" endTime="2951.0" resourceId="distributionCarrier"/>
 						<element id="distributionCarrierdistributionCarrierElementTRANSPORT" type="TRANSPORT" startTime="2951.0" endTime="5171.0" resourceId="distributionCarrier"/>
 						<element id="distributionCarrierdistributionCarrierElementUNLOAD" type="UNLOAD" startTime="5171.0" endTime="5231.0" resourceId="distributionCarrier"/>
-					</lspShipmentPlan>
-					<lspShipmentPlan shipmentId="Shipment_8" chainId="hubChain">
+					</shipmentPlan>
+					<shipmentPlan shipmentId="Shipment_8" chainId="hubChain">
 						<element id="mainCarriermainCarrierElementLOAD" type="LOAD" startTime="0.0" endTime="600.0" resourceId="mainCarrier"/>
 						<element id="mainCarriermainCarrierElementTRANSPORT" type="TRANSPORT" startTime="600.0" endTime="2040.0" resourceId="mainCarrier"/>
 						<element id="mainCarriermainCarrierElementUNLOAD" type="UNLOAD" startTime="2040.0" endTime="2640.0" resourceId="mainCarrier"/>
@@ -158,8 +158,8 @@
 						<element id="distributionCarrierdistributionCarrierElementLOAD" type="LOAD" startTime="2651.0" endTime="2951.0" resourceId="distributionCarrier"/>
 						<element id="distributionCarrierdistributionCarrierElementTRANSPORT" type="TRANSPORT" startTime="2951.0" endTime="4391.0" resourceId="distributionCarrier"/>
 						<element id="distributionCarrierdistributionCarrierElementUNLOAD" type="UNLOAD" startTime="4391.0" endTime="4451.0" resourceId="distributionCarrier"/>
-					</lspShipmentPlan>
-					<lspShipmentPlan shipmentId="Shipment_9" chainId="hubChain">
+					</shipmentPlan>
+					<shipmentPlan shipmentId="Shipment_9" chainId="hubChain">
 						<element id="mainCarriermainCarrierElementLOAD" type="LOAD" startTime="0.0" endTime="600.0" resourceId="mainCarrier"/>
 						<element id="mainCarriermainCarrierElementTRANSPORT" type="TRANSPORT" startTime="600.0" endTime="2040.0" resourceId="mainCarrier"/>
 						<element id="mainCarriermainCarrierElementUNLOAD" type="UNLOAD" startTime="2040.0" endTime="2640.0" resourceId="mainCarrier"/>
@@ -167,8 +167,8 @@
 						<element id="distributionCarrierdistributionCarrierElementLOAD" type="LOAD" startTime="2651.0" endTime="2951.0" resourceId="distributionCarrier"/>
 						<element id="distributionCarrierdistributionCarrierElementTRANSPORT" type="TRANSPORT" startTime="2951.0" endTime="3971.0" resourceId="distributionCarrier"/>
 						<element id="distributionCarrierdistributionCarrierElementUNLOAD" type="UNLOAD" startTime="3971.0" endTime="4031.0" resourceId="distributionCarrier"/>
-					</lspShipmentPlan>
-					<lspShipmentPlan shipmentId="Shipment_10" chainId="hubChain">
+					</shipmentPlan>
+					<shipmentPlan shipmentId="Shipment_10" chainId="hubChain">
 						<element id="mainCarriermainCarrierElementLOAD" type="LOAD" startTime="0.0" endTime="600.0" resourceId="mainCarrier"/>
 						<element id="mainCarriermainCarrierElementTRANSPORT" type="TRANSPORT" startTime="600.0" endTime="2040.0" resourceId="mainCarrier"/>
 						<element id="mainCarriermainCarrierElementUNLOAD" type="UNLOAD" startTime="2040.0" endTime="2640.0" resourceId="mainCarrier"/>
@@ -176,7 +176,7 @@
 						<element id="distributionCarrierdistributionCarrierElementLOAD" type="LOAD" startTime="2651.0" endTime="2951.0" resourceId="distributionCarrier"/>
 						<element id="distributionCarrierdistributionCarrierElementTRANSPORT" type="TRANSPORT" startTime="2951.0" endTime="5711.0" resourceId="distributionCarrier"/>
 						<element id="distributionCarrierdistributionCarrierElementUNLOAD" type="UNLOAD" startTime="5711.0" endTime="5771.0" resourceId="distributionCarrier"/>
-					</lspShipmentPlan>
+					</shipmentPlan>
 				</shipmentPlans>
 			</LspPlan>
 			<LspPlan score="-509.2" selected="true">
@@ -186,56 +186,56 @@
 					</logisticChain>
 				</logisticChains>
 				<shipmentPlans>
-					<lspShipmentPlan shipmentId="Shipment_1" chainId="directChain">
+					<shipmentPlan shipmentId="Shipment_1" chainId="directChain">
 						<element id="directCarriersingleCarrierElementLOAD" type="LOAD" startTime="0.0" endTime="600.0" resourceId="directCarrier"/>
 						<element id="directCarriersingleCarrierElementTRANSPORT" type="TRANSPORT" startTime="600.0" endTime="3060.0" resourceId="directCarrier"/>
 						<element id="directCarriersingleCarrierElementUNLOAD" type="UNLOAD" startTime="3060.0" endTime="3120.0" resourceId="directCarrier"/>
-					</lspShipmentPlan>
-					<lspShipmentPlan shipmentId="Shipment_2" chainId="directChain">
+					</shipmentPlan>
+					<shipmentPlan shipmentId="Shipment_2" chainId="directChain">
 						<element id="directCarriersingleCarrierElementLOAD" type="LOAD" startTime="0.0" endTime="600.0" resourceId="directCarrier"/>
 						<element id="directCarriersingleCarrierElementTRANSPORT" type="TRANSPORT" startTime="600.0" endTime="4020.0" resourceId="directCarrier"/>
 						<element id="directCarriersingleCarrierElementUNLOAD" type="UNLOAD" startTime="4020.0" endTime="4080.0" resourceId="directCarrier"/>
-					</lspShipmentPlan>
-					<lspShipmentPlan shipmentId="Shipment_3" chainId="directChain">
+					</shipmentPlan>
+					<shipmentPlan shipmentId="Shipment_3" chainId="directChain">
 						<element id="directCarriersingleCarrierElementLOAD" type="LOAD" startTime="0.0" endTime="600.0" resourceId="directCarrier"/>
 						<element id="directCarriersingleCarrierElementTRANSPORT" type="TRANSPORT" startTime="600.0" endTime="2340.0" resourceId="directCarrier"/>
 						<element id="directCarriersingleCarrierElementUNLOAD" type="UNLOAD" startTime="2340.0" endTime="2400.0" resourceId="directCarrier"/>
-					</lspShipmentPlan>
-					<lspShipmentPlan shipmentId="Shipment_4" chainId="directChain">
+					</shipmentPlan>
+					<shipmentPlan shipmentId="Shipment_4" chainId="directChain">
 						<element id="directCarriersingleCarrierElementLOAD" type="LOAD" startTime="0.0" endTime="600.0" resourceId="directCarrier"/>
 						<element id="directCarriersingleCarrierElementTRANSPORT" type="TRANSPORT" startTime="600.0" endTime="1680.0" resourceId="directCarrier"/>
 						<element id="directCarriersingleCarrierElementUNLOAD" type="UNLOAD" startTime="1680.0" endTime="1740.0" resourceId="directCarrier"/>
-					</lspShipmentPlan>
-					<lspShipmentPlan shipmentId="Shipment_5" chainId="directChain">
+					</shipmentPlan>
+					<shipmentPlan shipmentId="Shipment_5" chainId="directChain">
 						<element id="directCarriersingleCarrierElementLOAD" type="LOAD" startTime="0.0" endTime="600.0" resourceId="directCarrier"/>
 						<element id="directCarriersingleCarrierElementTRANSPORT" type="TRANSPORT" startTime="600.0" endTime="2880.0" resourceId="directCarrier"/>
 						<element id="directCarriersingleCarrierElementUNLOAD" type="UNLOAD" startTime="2880.0" endTime="2940.0" resourceId="directCarrier"/>
-					</lspShipmentPlan>
-					<lspShipmentPlan shipmentId="Shipment_6" chainId="directChain">
+					</shipmentPlan>
+					<shipmentPlan shipmentId="Shipment_6" chainId="directChain">
 						<element id="directCarriersingleCarrierElementLOAD" type="LOAD" startTime="0.0" endTime="600.0" resourceId="directCarrier"/>
 						<element id="directCarriersingleCarrierElementTRANSPORT" type="TRANSPORT" startTime="600.0" endTime="3240.0" resourceId="directCarrier"/>
 						<element id="directCarriersingleCarrierElementUNLOAD" type="UNLOAD" startTime="3240.0" endTime="3300.0" resourceId="directCarrier"/>
-					</lspShipmentPlan>
-					<lspShipmentPlan shipmentId="Shipment_7" chainId="directChain">
+					</shipmentPlan>
+					<shipmentPlan shipmentId="Shipment_7" chainId="directChain">
 						<element id="directCarriersingleCarrierElementLOAD" type="LOAD" startTime="0.0" endTime="600.0" resourceId="directCarrier"/>
 						<element id="directCarriersingleCarrierElementTRANSPORT" type="TRANSPORT" startTime="600.0" endTime="2280.0" resourceId="directCarrier"/>
 						<element id="directCarriersingleCarrierElementUNLOAD" type="UNLOAD" startTime="2280.0" endTime="2340.0" resourceId="directCarrier"/>
-					</lspShipmentPlan>
-					<lspShipmentPlan shipmentId="Shipment_8" chainId="directChain">
+					</shipmentPlan>
+					<shipmentPlan shipmentId="Shipment_8" chainId="directChain">
 						<element id="directCarriersingleCarrierElementLOAD" type="LOAD" startTime="0.0" endTime="600.0" resourceId="directCarrier"/>
 						<element id="directCarriersingleCarrierElementTRANSPORT" type="TRANSPORT" startTime="600.0" endTime="3840.0" resourceId="directCarrier"/>
 						<element id="directCarriersingleCarrierElementUNLOAD" type="UNLOAD" startTime="3840.0" endTime="3900.0" resourceId="directCarrier"/>
-					</lspShipmentPlan>
-					<lspShipmentPlan shipmentId="Shipment_9" chainId="directChain">
+					</shipmentPlan>
+					<shipmentPlan shipmentId="Shipment_9" chainId="directChain">
 						<element id="directCarriersingleCarrierElementLOAD" type="LOAD" startTime="0.0" endTime="600.0" resourceId="directCarrier"/>
 						<element id="directCarriersingleCarrierElementTRANSPORT" type="TRANSPORT" startTime="600.0" endTime="3420.0" resourceId="directCarrier"/>
 						<element id="directCarriersingleCarrierElementUNLOAD" type="UNLOAD" startTime="3420.0" endTime="3480.0" resourceId="directCarrier"/>
-					</lspShipmentPlan>
-					<lspShipmentPlan shipmentId="Shipment_10" chainId="directChain">
+					</shipmentPlan>
+					<shipmentPlan shipmentId="Shipment_10" chainId="directChain">
 						<element id="directCarriersingleCarrierElementLOAD" type="LOAD" startTime="0.0" endTime="600.0" resourceId="directCarrier"/>
 						<element id="directCarriersingleCarrierElementTRANSPORT" type="TRANSPORT" startTime="600.0" endTime="1740.0" resourceId="directCarrier"/>
 						<element id="directCarriersingleCarrierElementUNLOAD" type="UNLOAD" startTime="1740.0" endTime="1800.0" resourceId="directCarrier"/>
-					</lspShipmentPlan>
+					</shipmentPlan>
 				</shipmentPlans>
 			</LspPlan>
 		</LspPlans>