diff --git a/examples/functions/fares/Netex_101.21_TfL_GeographicFares_UnitZone_MultipleProduct.xml b/examples/functions/fares/Netex_101.21_TfL_GeographicFares_UnitZone_MultipleProduct.xml
index f66731ad3..6f9bb1540 100644
--- a/examples/functions/fares/Netex_101.21_TfL_GeographicFares_UnitZone_MultipleProduct.xml
+++ b/examples/functions/fares/Netex_101.21_TfL_GeographicFares_UnitZone_MultipleProduct.xml
@@ -643,11 +643,13 @@ Special peak and off-peak times apply on journeys that start at stations north o
 					<!--- ====LINES===== -->
 					<lines>
 						<Line version="002" created="2011-01-17T09:30:47.0Z" changed="2011-02-08T09:30:47.0Z" id="lul:BAK">
+							<privateCodes>
+								<PrivateCode>B</PrivateCode>
+							</privateCodes>
 							<Name>Bakerloo Line</Name>
 							<ShortName>Bakerloo</ShortName>
 							<TransportMode>metro</TransportMode>
 							<PublicCode>BAK</PublicCode>
-							<PrivateCode>B</PrivateCode>
 							<Presentation>
 								<ColourName>brown</ColourName>
 							</Presentation>
@@ -667,11 +669,14 @@ Special peak and off-peak times apply on journeys that start at stations north o
 							</allowedDirections>
 						</Line>
 						<Line version="002" created="2011-01-17T09:30:47.0Z" changed="2011-02-08T09:30:47.0Z" id="lul:CEN">
+							<privateCodes>
+								<PrivateCode>C</PrivateCode>
+								<PrivateCode>C__</PrivateCode>
+							</privateCodes>
 							<Name>Central Line</Name>
 							<ShortName>Central</ShortName>
 							<TransportMode>metro</TransportMode>
 							<PublicCode>CEN</PublicCode>
-							<PrivateCode>C</PrivateCode>
 							<Presentation>
 								<ColourName>red</ColourName>
 							</Presentation>
diff --git a/examples/functions/fares/rail/Netex_era_crossborder_de.xml b/examples/functions/fares/rail/Netex_era_crossborder_de.xml
index b427ea36b..4a4eb2c71 100644
--- a/examples/functions/fares/rail/Netex_era_crossborder_de.xml
+++ b/examples/functions/fares/rail/Netex_era_crossborder_de.xml
@@ -3607,8 +3607,10 @@ An overview of the validity of EURO-NEISSE tickets can be found here. Further in
 					<PricingParameterSet id="eura:Common_Resources" version="any">
 						<priceUnits>
 							<PriceUnit id="eura:EUR" version="any">
+								<privateCodes>
+									<PrivateCode>€</PrivateCode>
+								</privateCodes>
 								<Name>Euro</Name>
-								<PrivateCode>€</PrivateCode>
 								<Precision>2</Precision>
 							</PriceUnit>
 							<PriceUnit id="eura:GBP" version="any">
diff --git a/examples/functions/fares/rail/Netex_era_distance_ro.xml b/examples/functions/fares/rail/Netex_era_distance_ro.xml
index 735d20e8e..56147e356 100644
--- a/examples/functions/fares/rail/Netex_era_distance_ro.xml
+++ b/examples/functions/fares/rail/Netex_era_distance_ro.xml
@@ -7677,10 +7677,12 @@ State Secretariat for Revolutionary Issues in December 1989: : 12 free roun
 							<values>
 								<!--- ====PurposeOfGrouping method========= -->
 								<Branding version="any" id="tfc:TFC@brand">
+									<privateCodes>
+										<PrivateCode>TFC</PrivateCode>
+									</privateCodes>
 									<Name>Transferoviar Călători</Name>
 									<Image>TODO-BITMAPVALUE</Image>
 									<Url>https://www.transferoviarcalatori.ro/logo.png</Url>
-									<PrivateCode>TFC</PrivateCode>
 								</Branding>
 							</values>
 						</ValueSet>
diff --git a/examples/functions/fares/rail/Netex_era_toc_uk.xml b/examples/functions/fares/rail/Netex_era_toc_uk.xml
index e38efa569..e9e057839 100644
--- a/examples/functions/fares/rail/Netex_era_toc_uk.xml
+++ b/examples/functions/fares/rail/Netex_era_toc_uk.xml
@@ -8968,8 +8968,10 @@ Short Term (1/4/18-1/6/18): £135.00	Short term (1/4-1/6): £230.00d with this g
 					<tariffZones>
 						<!--==== Fare regions ===     -->
 						<TariffZone version="01" id="nptg:PlusBus:All_Zones">
+							<privateCodes>
+								<PrivateCode>PlusBus</PrivateCode>
+							</privateCodes>
 							<Name lang="en">All Zones</Name>
-							<PrivateCode>PlusBus</PrivateCode>
 							<types>
 								<TypeOfZoneRef ref="nptg:PlusBus_region" version="any"/>
 							</types>
diff --git a/examples/functions/simpleNetwork/Netex_uk_underground_1.xml b/examples/functions/simpleNetwork/Netex_uk_underground_1.xml
index 423de27e2..d30fcdcd0 100644
--- a/examples/functions/simpleNetwork/Netex_uk_underground_1.xml
+++ b/examples/functions/simpleNetwork/Netex_uk_underground_1.xml
@@ -230,11 +230,13 @@ A COMPOSITE FRAME Is used to group the above frames as a cohernet version.
 					<!--- ====LINES===== -->
 					<lines>
 						<Line version="002" created="2011-01-17T09:30:47.0Z" changed="2011-02-08T09:30:47.0Z" id="lul:BAK">
+							<privateCodes>
+								<PrivateCode>B</PrivateCode>
+							</privateCodes>
 							<Name>Bakerloo Line</Name>
 							<ShortName>BaKerloo</ShortName>
 							<TransportMode>metro</TransportMode>
 							<PublicCode>BAK</PublicCode>
-							<PrivateCode>B</PrivateCode>
 							<Presentation>
 								<ColourName>brown</ColourName>
 							</Presentation>
diff --git a/examples/functions/site/Netex_11_Sites_OlympicPark_1.xml b/examples/functions/site/Netex_11_Sites_OlympicPark_1.xml
index b961979a7..ea238a0b2 100644
--- a/examples/functions/site/Netex_11_Sites_OlympicPark_1.xml
+++ b/examples/functions/site/Netex_11_Sites_OlympicPark_1.xml
@@ -724,11 +724,13 @@ Updated to give exampel of group of SItes
 						</StopPlace>
 						<!-- ========== DLR========= -->
 						<StopPlace version="any" created="2006-09-11T15:42:00" modification="revise" changed="2009-02-26T15:47:00" responsibilitySetRef="napt:RS_147" id="naptStop:940GZZCRSTD">
+							<privateCodes>
+								<PrivateCode>20026</PrivateCode>
+							</privateCodes>
 							<!-- 		<StopAreaCode>940GZZLUWIM</StopAreaCode>   /> -->
 							<!-- 	<AdministrativeAreaRef> -->
 							<Name>Stratford DLRStation </Name>
 							<ShortName>Stratford DLR</ShortName>
-							<PrivateCode>20026</PrivateCode>
 							<types>
 								<TypeOfZoneRef version="any" ref="napt:type_of_zone@GTMU"/>
 							</types>
diff --git a/examples/functions/stopPlace/FX-PI-01_UK_TBD_STOP-OFFER_910GWIMBLDN-accessibility_20140601.xml b/examples/functions/stopPlace/FX-PI-01_UK_TBD_STOP-OFFER_910GWIMBLDN-accessibility_20140601.xml
index 4d1d63c1a..20ca2ace7 100644
--- a/examples/functions/stopPlace/FX-PI-01_UK_TBD_STOP-OFFER_910GWIMBLDN-accessibility_20140601.xml
+++ b/examples/functions/stopPlace/FX-PI-01_UK_TBD_STOP-OFFER_910GWIMBLDN-accessibility_20140601.xml
@@ -647,9 +647,11 @@ Changes
 						<!-- ========== RAIL========= -->
 						<StopPlace version="001" created="2006-09-11T15:42:00" modification="revise" dataSourceRef="nptg:NaPTAN" changed="2009-02-26T15:47:00" responsibilitySetRef="nptgAdminArea:110" id="naptStop:910GWIMBLDN">
 							<!-- 		<StopAreaCode>910GWIMBLDN</StopAreaCode> -->
+							<privateCodes>
+								<PrivateCode>86738</PrivateCode>
+							</privateCodes>
 							<Name>Wimbledon Rail Station</Name>
 							<ShortName>Wimbledon Station</ShortName>
-							<PrivateCode>86738</PrivateCode>
 							<types>
 								<TypeOfZoneRef version="napt:v2.1" ref="napt:StopAreaType@GRLS"/>
 							</types>
diff --git a/examples/functions/stopPlace/Netex_01_Stops_SingleStopOnStreet_1.xml b/examples/functions/stopPlace/Netex_01_Stops_SingleStopOnStreet_1.xml
index 07df31188..35a77e3ba 100644
--- a/examples/functions/stopPlace/Netex_01_Stops_SingleStopOnStreet_1.xml
+++ b/examples/functions/stopPlace/Netex_01_Stops_SingleStopOnStreet_1.xml
@@ -213,8 +213,10 @@ B. Frames and grouping
 					<scheduledStopPoints>
 						<!--- =====SCHEDULED STOP POINT ====== -->
 						<ScheduledStopPoint version="032" created="2000-12-17T09:30:47.0Z" changed="2002-12-17T09:30:47.0Z" id="frtop:SSP0042A">
+							<privateCodes>
+								<PrivateCode>legacy3452</PrivateCode>
+							</privateCodes>
 							<Name>Poste, St Jean</Name>
-							<PrivateCode>legacy3452</PrivateCode>
 							<VehicleModes>bus</VehicleModes>
 							<ForAlighting>true</ForAlighting>
 							<ForBoarding>true</ForBoarding>
diff --git a/examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml b/examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml
index 561efec03..c5ea5d579 100644
--- a/examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml
+++ b/examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml
@@ -782,10 +782,12 @@ Changes
 					<stopPlaces>
 						<!-- ========== RAIL========= -->
 						<StopPlace version="001" created="2006-09-11T15:42:00" modification="revise" dataSourceRef="nptg:NaPTAN" changed="2009-02-26T15:47:00" responsibilitySetRef="napt:RS_110" id="naptStop:910GWIMBLDN">
+							<privateCodes>
+								<PrivateCode>86738</PrivateCode>
+							</privateCodes>
 							<!-- 		<StopAreaCode>910GWIMBLDN</StopAreaCode> -->
 							<Name>Wimbledon Rail Station</Name>
 							<ShortName>Wimbledon Station</ShortName>
-							<PrivateCode>86738</PrivateCode>
 							<types>
 								<TypeOfZoneRef version="any" ref="napt:Type_of_zone@GRLS"/>
 							</types>
@@ -6660,9 +6662,11 @@ Changes
 					<scheduledStopPoints>
 						<!-- Scheduled stop ponts -->
 						<ScheduledStopPoint version="any" id="naptStop:9100WIMBLDN">
+							<privateCodes>
+								<PrivateCode>INT123</PrivateCode>
+							</privateCodes>
 							<Name>Wimbledon  Rail Station</Name>
 							<Description>SWt trains </Description>
-							<PrivateCode>INT123</PrivateCode>
 							<VehicleModes>rail</VehicleModes>
 							<ForAlighting>true</ForAlighting>
 							<ForBoarding>true</ForBoarding>
diff --git a/examples/functions/timetable/Netex_01.6_Bus_SimpleTimetable_RouteProjection.xml b/examples/functions/timetable/Netex_01.6_Bus_SimpleTimetable_RouteProjection.xml
index 2c5b3dc84..1c9176234 100644
--- a/examples/functions/timetable/Netex_01.6_Bus_SimpleTimetable_RouteProjection.xml
+++ b/examples/functions/timetable/Netex_01.6_Bus_SimpleTimetable_RouteProjection.xml
@@ -1419,6 +1419,9 @@ The Calendar is shown coded in two differnt ways
 
 -->
 						<ActivationPoint version="any" id="hde:ap_01">
+							<privateCodes>
+								<PrivateCode>MyPoint23</PrivateCode>
+							</privateCodes>
 							<Name>AP 1   before Bravo  start of activation link al1</Name>
 							<Location>
 								<Longitude>0.3</Longitude>
@@ -1445,7 +1448,6 @@ The Calendar is shown coded in two differnt ways
 									<Distance>80</Distance>
 								</PointProjection>
 							</projections>
-							<PrivateCode>MyPoint23</PrivateCode>
 						</ActivationPoint>
 						<ActivationPoint version="any" id="hde:ap_02">
 							<Name>AP2 at  Bravo  end of activation link</Name>
diff --git a/examples/functions/versioning/Netex_VersioningExample_Step_02.xml b/examples/functions/versioning/Netex_VersioningExample_Step_02.xml
index 8ef2a0ff7..1e2a80906 100644
--- a/examples/functions/versioning/Netex_VersioningExample_Step_02.xml
+++ b/examples/functions/versioning/Netex_VersioningExample_Step_02.xml
@@ -84,9 +84,11 @@ This is part 2 of a multistep example on versioning
 					<scheduledStopPoints>
 						<!--- =====Data owners ========= -->
 						<ScheduledStopPoint version="002" created="2010-05-17T09:30:47.0Z" changed="2010-05-18T09:30:47.0Z" modification="revise" derivedFromVersionRef="001" id="mybus:SSP0001A">
+							<privateCodes>
+								<PrivateCode>mycodeA</PrivateCode>
+							</privateCodes>
 							<Name>Haltstelle A - Museum</Name>
 							<Description>Version two of stop A. Name is Changed</Description>
-							<PrivateCode>mycodeA</PrivateCode>
 						</ScheduledStopPoint>
 						<ScheduledStopPoint version="001" created="2010-05-18T09:30:47.0Z" id="mybus:SSP0002B">
 							<Name>Haltstelle B</Name>
diff --git a/examples/functions/versioning/Netex_VersioningExample_Step_03.xml b/examples/functions/versioning/Netex_VersioningExample_Step_03.xml
index 652391380..dc807a43e 100644
--- a/examples/functions/versioning/Netex_VersioningExample_Step_03.xml
+++ b/examples/functions/versioning/Netex_VersioningExample_Step_03.xml
@@ -105,14 +105,18 @@ This is part 3 of a multistep example on versioning
 					<scheduledStopPoints>
 						<!-- == Frame contents == -->
 						<ScheduledStopPoint version="002" created="2010-05-17T09:30:47.0Z" changed="2010-05-18T10:30:47.0Z" modification="revise" derivedFromVersionRef="001" id="mybus:SSP0001A">
+							<privateCodes>
+								<PrivateCode>mycodeA</PrivateCode>
+							</privateCodes>
 							<Name>Haltstelle A - Museum</Name>
 							<Description>Version two of stop A. Name is Changed</Description>
-							<PrivateCode>mycodeA</PrivateCode>
 						</ScheduledStopPoint>
 						<ScheduledStopPoint version="002" created="2010-05-18T09:30:47.0Z" changed="2010-05-19T10:30:47.0Z" modification="revise" derivedFromVersionRef="001" id="mybus:SSP0002B">
+							<privateCodes>
+								<PrivateCode>mycodeB</PrivateCode>
+							</privateCodes>
 							<Name>Haltstelle B</Name>
 							<Description>Version two of stop B</Description>
-							<PrivateCode>mycodeB</PrivateCode>
 						</ScheduledStopPoint>
 					</scheduledStopPoints>
 					<serviceLinks>
diff --git a/examples/functions/versioning/Netex_VersioningExample_Step_04.xml b/examples/functions/versioning/Netex_VersioningExample_Step_04.xml
index 5603f8753..9dac93ae8 100644
--- a/examples/functions/versioning/Netex_VersioningExample_Step_04.xml
+++ b/examples/functions/versioning/Netex_VersioningExample_Step_04.xml
@@ -108,14 +108,18 @@ This is part 4 of a multistep example on versioning.
 					<BaselineVersionFrameRef ref="mybus:003">EXTERNAL</BaselineVersionFrameRef>
 					<scheduledStopPoints>
 						<ScheduledStopPoint version="002" created="2010-05-17T09:30:47.0Z" changed="2010-05-18T09:30:47.0Z" modification="revise" id="mybus:SSP0001A">
+							<privateCodes>
+								<PrivateCode>mycodeA</PrivateCode>
+							</privateCodes>
 							<Name>Haltstelle A - Museum</Name>
 							<Description>Version two of stop A. Name is Changed</Description>
-							<PrivateCode>mycodeA</PrivateCode>
 						</ScheduledStopPoint>
 						<ScheduledStopPoint version="002" created="2010-05-18T09:30:47.0Z" changed="2010-06-18T09:30:47.0Z" modification="revise" id="mybus:SSP0002B">
+							<privateCodes>
+								<PrivateCode>mycodeB</PrivateCode>
+							</privateCodes>
 							<Name>Haltstelle B</Name>
 							<Description>Version two of stop B</Description>
-							<PrivateCode>mycodeB</PrivateCode>
 						</ScheduledStopPoint>
 						<ScheduledStopPoint version="001" created="2010-05-21T10:30:51.0Z" id="mybus:SSP0003C">
 							<Name>Haltstelle C</Name>
diff --git a/examples/functions/versioning/Netex_VersioningExample_Step_05.xml b/examples/functions/versioning/Netex_VersioningExample_Step_05.xml
index 3ec1bce88..2318a8c22 100644
--- a/examples/functions/versioning/Netex_VersioningExample_Step_05.xml
+++ b/examples/functions/versioning/Netex_VersioningExample_Step_05.xml
@@ -104,14 +104,18 @@ This is part 4 of a multistep example on versioning.
 					<scheduledStopPoints>
 						<!--- =====Data objects ========= -->
 						<ScheduledStopPoint version="002" created="2010-05-17T09:30:47.0Z" changed="2010-05-18T09:30:47.0Z" modification="revise" id="mybus:SSP0001A">
+							<privateCodes>
+								<PrivateCode>mycodeA</PrivateCode>
+							</privateCodes>
 							<Name>Haltstelle A - Museum</Name>
 							<Description>Version two of stop A. Name is Changed</Description>
-							<PrivateCode>mycodeA</PrivateCode>
 						</ScheduledStopPoint>
 						<ScheduledStopPoint version="002" created="2010-05-18T09:30:47.0Z" changed="2010-06-18T09:30:47.0Z" modification="revise" id="mybus:SSP0002B">
+							<privateCodes>
+								<PrivateCode>mycodeB</PrivateCode>
+							</privateCodes>
 							<Name>Haltstelle B</Name>
 							<Description>Version two of stop B</Description>
-							<PrivateCode>mycodeB</PrivateCode>
 						</ScheduledStopPoint>
 						<ScheduledStopPoint version="001" created="2010-05-21T10:30:51.0Z" id="mybus:SSP0003C">
 							<Name>Haltstelle C</Name>
diff --git a/examples/functions/versioning/Netex_VersioningExample_Step_05_GeneralFrame.xml b/examples/functions/versioning/Netex_VersioningExample_Step_05_GeneralFrame.xml
index d84be3ae4..2df64baf7 100644
--- a/examples/functions/versioning/Netex_VersioningExample_Step_05_GeneralFrame.xml
+++ b/examples/functions/versioning/Netex_VersioningExample_Step_05_GeneralFrame.xml
@@ -72,14 +72,18 @@ This is part 4 of a multistep example on versioning.
 			<members modificationSet="all">
 				<!--- =====Data objects ========= -->
 				<ScheduledStopPoint version="002" created="2010-05-17T09:30:47.0Z" changed="2010-05-18T09:30:47.0Z" modification="revise" id="mybus:SSP0001A">
+					<privateCodes>
+						<PrivateCode>mycodeA</PrivateCode>
+					</privateCodes>
 					<Name>Haltstelle A - Museum</Name>
 					<Description>Version two of stop A. Name is Changed</Description>
-					<PrivateCode>mycodeA</PrivateCode>
 				</ScheduledStopPoint>
 				<ScheduledStopPoint version="002" created="2010-05-18T09:30:47.0Z" changed="2010-06-18T09:30:47.0Z" modification="revise" id="mybus:SSP0002B">
+					<privateCodes>
+						<PrivateCode>mycodeB</PrivateCode>
+					</privateCodes>
 					<Name>Haltstelle B</Name>
 					<Description>Version two of stop B</Description>
-					<PrivateCode>mycodeB</PrivateCode>
 				</ScheduledStopPoint>
 				<ScheduledStopPoint version="001" created="2010-05-21T10:30:51.0Z" id="mybus:SSP0003C">
 					<Name>Haltstelle C</Name>
diff --git a/examples/functions/versioning/Netex_VersioningExample_VersionHistories_01.xml b/examples/functions/versioning/Netex_VersioningExample_VersionHistories_01.xml
index b2cb9c03e..6fafbc0a6 100644
--- a/examples/functions/versioning/Netex_VersioningExample_VersionHistories_01.xml
+++ b/examples/functions/versioning/Netex_VersioningExample_VersionHistories_01.xml
@@ -75,18 +75,22 @@ Version History
 							<Description>Version one of stop A</Description>
 						</ScheduledStopPoint>
 						<ScheduledStopPoint version="002" created="2010-05-17T09:30:47.0Z" changed="2010-05-18T09:30:47.0Z" modification="revise" derivedFromVersionRef="001" responsibilitySetRef="mybus:RS_10" id="mybus:SSP0001A">
+							<privateCodes>
+								<PrivateCode>mycodeA</PrivateCode>
+							</privateCodes>
 							<Name>Haltstelle A - Museum</Name>
 							<Description>Version two of stop A. Name is Changed and code addded</Description>
-							<PrivateCode>mycodeA</PrivateCode>
 						</ScheduledStopPoint>
 						<ScheduledStopPoint version="001" created="2010-05-18T09:30:47.0Z" modification="new" responsibilitySetRef="mybus:RS_10" id="mybus:SSP0002B">
 							<Name>Haltstelle B</Name>
 							<Description>Version one of stop B</Description>
 						</ScheduledStopPoint>
 						<ScheduledStopPoint version="002" created="2010-05-18T09:30:47.0Z" changed="2010-06-18T09:30:47.0Z" modification="revise" responsibilitySetRef="mybus:RS_10" id="mybus:SSP0002B">
+							<privateCodes>
+								<PrivateCode>mycodeB</PrivateCode>
+							</privateCodes>
 							<Name>Haltstelle B</Name>
 							<Description>Version two of stop B</Description>
-							<PrivateCode>mycodeB</PrivateCode>
 						</ScheduledStopPoint>
 						<!-- ====="mybus:SSP0003c" -->
 						<ScheduledStopPoint version="001" created="2010-05-21T10:30:51.0Z" responsibilitySetRef="mybus:RS_10" id="mybus:SSP0003C">
diff --git a/examples/functions/versioning/Netex_VersioningExample_VersionHistories_02.xml b/examples/functions/versioning/Netex_VersioningExample_VersionHistories_02.xml
index afb7b9f50..4dcd3d77f 100644
--- a/examples/functions/versioning/Netex_VersioningExample_VersionHistories_02.xml
+++ b/examples/functions/versioning/Netex_VersioningExample_VersionHistories_02.xml
@@ -74,9 +74,11 @@ Version History
 							<Description>Version one of stop A</Description>
 						</ScheduledStopPoint>
 						<ScheduledStopPoint version="002" created="2010-05-17T09:30:47.0Z" changed="2010-05-18T09:30:47.0Z" modification="revise" derivedFromVersionRef="001" responsibilitySetRef="mybus:RS_10" id="mybus:SSP0001A">
+							<privateCodes>
+								<PrivateCode>mycodeA</PrivateCode>
+							</privateCodes>
 							<Name>Haltstelle A - Museum</Name>
 							<Description>Version two of stop A. Name is Changed and code addded</Description>
-							<PrivateCode>mycodeA</PrivateCode>
 						</ScheduledStopPoint>
 					</versions>
 				</Entity_Entity>
@@ -87,9 +89,11 @@ Version History
 							<Description>Version one of stop B</Description>
 						</ScheduledStopPoint>
 						<ScheduledStopPoint version="002" created="2010-05-18T09:30:47.0Z" changed="2010-06-18T09:30:47.0Z" modification="revise" responsibilitySetRef="mybus:RS_10" id="mybus:SSP0002B">
+							<privateCodes>
+								<PrivateCode>mycodeB</PrivateCode>
+							</privateCodes>
 							<Name>Haltstelle B</Name>
 							<Description>Version two of stop B</Description>
-							<PrivateCode>mycodeB</PrivateCode>
 						</ScheduledStopPoint>
 						<!-- ====="mybus:SSP0003c" -->
 						<ScheduledStopPoint version="001" created="2010-05-21T10:30:51.0Z" responsibilitySetRef="mybus:RS_10" id="mybus:SSP0003C">
diff --git a/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml b/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml
index 7e6895c1c..ec3c40258 100644
--- a/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml
+++ b/examples/standards/epiap/EPIAP_Accessibility_Chur_V08_vehicletypes.xml
@@ -605,9 +605,11 @@
 									<Value>8581044</Value>
 								</KeyValue>
 							</keyList>
+							<privateCodes>
+								<PrivateCode>8581044</PrivateCode>
+							</privateCodes>
 							<Name lang="de">Chur, Bahnhofplatz</Name>
 							<ShortName lang="de">CHBA</ShortName>
-							<PrivateCode>8581044</PrivateCode>
 							<TopographicPlaceRef ref="ch:1:TopographicPlace:8b930b7b-059b-4d0e-8db1-6512f12bc1b9:" version="any"/>
 							<ParentSiteRef ref="ch:1:StopPlace:8581044:" version="any"/>
 							<levels>
@@ -618,9 +620,11 @@
 							</levels>
 							<quays>
 								<Quay id="ch:1:Quay:8581044:1:" version="any">
+									<privateCodes>
+										<PrivateCode>1</PrivateCode>
+									</privateCodes>
 									<Name lang="de">Bahnsteig 1</Name>
 									<ShortName lang="de">BS1</ShortName>
-									<PrivateCode>1</PrivateCode>
 									<LevelRef ref="ch:1:Level:8581044:0" version="any"/>
 									<PublicCode>BS1</PublicCode>
 									<QuayType>other</QuayType>
diff --git a/examples/standards/epiap/eiap_test1_ramp.xml b/examples/standards/epiap/eiap_test1_ramp.xml
index 9e5f3b1da..3b32c5b84 100644
--- a/examples/standards/epiap/eiap_test1_ramp.xml
+++ b/examples/standards/epiap/eiap_test1_ramp.xml
@@ -109,10 +109,12 @@
 							</values>
 						</ValueSet>
 						<ValueSet id="ch:1:ValueSet:notices" version="any" nameOfClass="TypeOfNotice">
+							<privateCodes>
+								<PrivateCode>11</PrivateCode>
+							</privateCodes>
 							<values>
 								<TypeOfNotice id="ch:1:TypeOfNotice:11" version="any">
 									<Name>Region</Name>
-									<PrivateCode>11</PrivateCode>
 								</TypeOfNotice>
 								<TypeOfNotice id="ch:1:TypeOfNotice:10" version="any">
 									<Name>Angebot</Name>
diff --git a/examples/standards/fxc/FX-PI-01_UK_AMSY_NETWORK_FARE_Arriva-pass_20200417.xml b/examples/standards/fxc/FX-PI-01_UK_AMSY_NETWORK_FARE_Arriva-pass_20200417.xml
index 4b93ed67f..fbde1e4b2 100644
--- a/examples/standards/fxc/FX-PI-01_UK_AMSY_NETWORK_FARE_Arriva-pass_20200417.xml
+++ b/examples/standards/fxc/FX-PI-01_UK_AMSY_NETWORK_FARE_Arriva-pass_20200417.xml
@@ -2468,8 +2468,10 @@ Summer Term				10 April 2020		22 July 2020		£80		£85			3 February 2020
 					<PricingParameterSet id="fxc:Common_Resources" version="fxc:v1.0">
 						<priceUnits>
 							<PriceUnit id="fxc:GBP" version="fxc:v1.0">
+								<privateCodes>
+									<PrivateCode>£</PrivateCode>
+								</privateCodes>
 								<Name>Pound Sterling</Name>
-								<PrivateCode>£</PrivateCode>
 								<Precision>2</Precision>
 							</PriceUnit>
 							<PriceUnit id="fxc:EUR" version="fxc:v1.0">
diff --git a/examples/standards/fxc/FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z)_20170101.xml b/examples/standards/fxc/FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z)_20170101.xml
index 4070da9c0..1a995e26f 100644
--- a/examples/standards/fxc/FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z)_20170101.xml
+++ b/examples/standards/fxc/FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z)_20170101.xml
@@ -1460,9 +1460,11 @@ Bewbush West (loop)
 					</topographicPlaces>
 					<tariffZones>
 						<TariffZone created="2013-10-11T12:27:13" changed="2013-10-11T12:27:13" modification="new" version="0" id="nptgTariffZone:CRAWLEY">
+							<privateCodes>
+								<PrivateCode>CRAWLEY</PrivateCode>
+							</privateCodes>
 							<!-- Nptg PlusBusZone   -->
 							<Name lang="en">CRAWLEY</Name>
-							<PrivateCode>CRAWLEY</PrivateCode>
 							<!-- Nptg PlusBusZone.PlusBusZoneCode -->
 							<types>
 								<TypeOfZoneRef ref="nptg:PlusBusZone" versionRef="nptg:v2.1">PlusBus</TypeOfZoneRef>
diff --git a/examples/standards/fxc/FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z-basic)_20170101.xml b/examples/standards/fxc/FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z-basic)_20170101.xml
index dffb0b4f2..e3c476af6 100644
--- a/examples/standards/fxc/FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z-basic)_20170101.xml
+++ b/examples/standards/fxc/FX-PI-01_UK_MB_LINE_FARE_MB-Line-1-trip-(Z2Z-basic)_20170101.xml
@@ -1460,9 +1460,11 @@ Bewbush West (loop)
 					</topographicPlaces>
 					<tariffZones>
 						<TariffZone created="2013-10-11T12:27:13" changed="2013-10-11T12:27:13" modification="new" version="0" id="nptgTariffZone:CRAWLEY">
+							<privateCodes>
+								<PrivateCode>CRAWLEY</PrivateCode>
+							</privateCodes>
 							<!-- Nptg PlusBusZone   -->
 							<Name lang="en">CRAWLEY</Name>
-							<PrivateCode>CRAWLEY</PrivateCode>
 							<!-- Nptg PlusBusZone.PlusBusZoneCode -->
 							<types>
 								<TypeOfZoneRef ref="nptg:PlusBusZone" versionRef="nptg:v2.1">PlusBus</TypeOfZoneRef>
diff --git a/examples/standards/fxc/uk_fxc_addon_HSP_plusbus.xml b/examples/standards/fxc/uk_fxc_addon_HSP_plusbus.xml
index 3b8b76392..c70c592e2 100644
--- a/examples/standards/fxc/uk_fxc_addon_HSP_plusbus.xml
+++ b/examples/standards/fxc/uk_fxc_addon_HSP_plusbus.xml
@@ -912,6 +912,9 @@ Train companies prefer customers to buy their tickets before getting on a train
 							</salesOfferPackageElements>
 						</SalesOfferPackage>
 						<SalesOfferPackage id="jsp:JSP@Pass@PlusBus@Day-SOP@1D@smartcard" version="1.0">
+							<privateCodes>
+								<PrivateCode>PBD</PrivateCode>
+							</privateCodes>
 							<BrandingRef ref="jsp:PlusBus@brand" version="1.0"/>
 							<Name>PlusBus Day - Smartcard</Name>
 							<Description>Add On - bought separately rather than bundled with product
@@ -924,7 +927,6 @@ Day Return rail ticket = issue a PlusBus Day (PBD) ticket for origin and/or dest
 Period Return rail ticket = issue two PlusBus Day (PBD) tickets for origin and/or destination town, one for the outward date and a second for the return date. If the return date is not known, you can only issue a PlusBus Day ticket for the customers outward journey date.
 							</Description>
 							<Url>http://www.plusbus.info/how-issue</Url>
-							<PrivateCode>PBD</PrivateCode>
 							<validityParameterAssignments>
 								<GenericParameterAssignment order="1" id="jsp:JSP@Pass@PlusBus@Day-SOP@1D@smartcard@self_service_machine" version="1.0">
 									<Description>self service</Description>
diff --git a/examples/standards/fxc/uk_fxc_common_profile.xml b/examples/standards/fxc/uk_fxc_common_profile.xml
index b87a723af..ff4cd11f0 100644
--- a/examples/standards/fxc/uk_fxc_common_profile.xml
+++ b/examples/standards/fxc/uk_fxc_common_profile.xml
@@ -184,13 +184,17 @@
 					<PricingParameterSet id="fxc:Common_Resources" version="fxc:v1.0">
 						<priceUnits>
 							<PriceUnit id="fxc:GBP" version="fxc:v1.0">
+								<privateCodes>
+									<PrivateCode>£</PrivateCode>
+								</privateCodes>
 								<Name>Pound Sterling</Name>
-								<PrivateCode>£</PrivateCode>
 								<Precision>2</Precision>
 							</PriceUnit>
 							<PriceUnit id="fxc:EUR" version="fxc:v1.0">
+								<privateCodes>
+									<PrivateCode>€</PrivateCode>
+								</privateCodes>
 								<Name>Euro</Name>
-								<PrivateCode>€</PrivateCode>
 								<Precision>2</Precision>
 							</PriceUnit>
 						</priceUnits>
diff --git a/examples/standards/txc/uk_nptg_localities_extract1.xml b/examples/standards/txc/uk_nptg_localities_extract1.xml
index 8256763d5..432021601 100644
--- a/examples/standards/txc/uk_nptg_localities_extract1.xml
+++ b/examples/standards/txc/uk_nptg_localities_extract1.xml
@@ -589,9 +589,11 @@ NeTEx separates  organisational structure (ORGANISATION, ORGANISATION PART)  fro
 					<!-- ========= PLUS BUS Zones  ================ -->
 					<tariffZones>
 						<TariffZone created="2013-10-11T12:27:13" changed="2013-10-11T12:27:13" modification="new" version="0" id="nptgTariffZone:ABDARE">
+							<privateCodes>
+								<PrivateCode>ABDARE</PrivateCode>
+							</privateCodes>
 							<!-- Nptg PlusBusZone   -->
 							<Name lang="en">ABDARE</Name>
-							<PrivateCode>ABDARE</PrivateCode>
 							<!-- Nptg PlusBusZone.PlusBusZoneCode -->
 							<types>
 								<TypeOfZoneRef ref="nptg:PlusBusZone" version="nptg:v2.1"/>
diff --git a/examples/standards/txc/uk_txc_SCWW-86_extract1-with-sections.xml b/examples/standards/txc/uk_txc_SCWW-86_extract1-with-sections.xml
index 8dca14fd5..2b7da2805 100644
--- a/examples/standards/txc/uk_txc_SCWW-86_extract1-with-sections.xml
+++ b/examples/standards/txc/uk_txc_SCWW-86_extract1-with-sections.xml
@@ -190,12 +190,14 @@ This example  maps
 					</vehicleAndCrewPoints>
 					<vehicleTypes>
 						<VehicleType version="1" id="stg:VehicleType@B6">
+							<privateCodes>
+								<PrivateCode>B6</PrivateCode>
+							</privateCodes>
 							<!--	<VehicleType>
 									<VehicleTypeCode>B6</VehicleTypeCode>
 									<Description>B6</Description>
 								</VehicleType> -->
 							<Description>B6</Description>
-							<PrivateCode>B6</PrivateCode>
 						</VehicleType>
 					</vehicleTypes>
 				</InfrastructureFrame>
diff --git a/examples/standards/txc/uk_txc_SCWW-86_extract2-simplified.xml b/examples/standards/txc/uk_txc_SCWW-86_extract2-simplified.xml
index 52891ea04..5100f942d 100644
--- a/examples/standards/txc/uk_txc_SCWW-86_extract2-simplified.xml
+++ b/examples/standards/txc/uk_txc_SCWW-86_extract2-simplified.xml
@@ -2436,8 +2436,10 @@
 					<Name>TXC JPTL ==&gt; NeTEX Timing Pattern </Name>
 					<timingPatterns>
 						<TimingPattern version="any" id="stg:ServiceJourneyPattern@1@TP">
+							<privateCodes>
+								<PrivateCode>119993</PrivateCode>
+							</privateCodes>
 							<Name>Timing pattern part of TXC JourneyPattern</Name>
-							<PrivateCode>119993</PrivateCode>
 							<!--
 <JourneyPattern id="1">
 									<PrivateCode>119993</PrivateCode>