diff --git a/examples/functions/fares/rail/Netex_era_crossborder_de.xml b/examples/functions/fares/rail/Netex_era_crossborder_de.xml
index 0e4ff6483..b427ea36b 100644
--- a/examples/functions/fares/rail/Netex_era_crossborder_de.xml
+++ b/examples/functions/fares/rail/Netex_era_crossborder_de.xml
@@ -1573,7 +1573,7 @@ issued to DB ticket vending machines.</Description>
 							<Name>Trilex Rail Products</Name>
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="tlx:products@TLX">
-									<StakeholderRoleType>Other</StakeholderRoleType>
+									<StakeholderRoleType>other</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="db:TLX" version="any"/>
 									<ResponsibleAreaRef ref="tlx:de" versionRef="TODO"/>
 								</ResponsibilityRoleAssignment>
@@ -1583,7 +1583,7 @@ issued to DB ticket vending machines.</Description>
 							<Name>Trilex Rail Products</Name>
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="tlx-t:sales@TLX">
-									<StakeholderRoleType>Operation</StakeholderRoleType>
+									<StakeholderRoleType>operation</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="db:TLX" version="any"/>
 								</ResponsibilityRoleAssignment>
 							</roles>
@@ -1796,7 +1796,7 @@ The ZVON bicycle day pass and monthly pass is valid in conjunction with the ZVON
 							<Name>Trilex Rail Products</Name>
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="vvo:products@VVO">
-									<StakeholderRoleType>Other</StakeholderRoleType>
+									<StakeholderRoleType>other</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="db:VVO" version="any"/>
 									<ResponsibleAreaRef ref="vvo:de" versionRef="TODO"/>
 								</ResponsibilityRoleAssignment>
@@ -1950,7 +1950,7 @@ Example: If you are traveling with the trilex from Hainewalde to Zittau and tran
 							<Name>Trilex Rail Products</Name>
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="zvo:products@ZVON">
-									<StakeholderRoleType>Other</StakeholderRoleType>
+									<StakeholderRoleType>other</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="db:ZVON" version="any"/>
 									<ResponsibleAreaRef ref="zvo:de" versionRef="TODO"/>
 								</ResponsibilityRoleAssignment>
@@ -3104,7 +3104,7 @@ An overview of the validity of EURO-NEISSE tickets can be found here. Further in
 							<Name>National Rail Products</Name>
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="db:products@DB">
-									<StakeholderRoleType>Operation</StakeholderRoleType>
+									<StakeholderRoleType>operation</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="uic:0080" version="any"/>
 									<ResponsibleAreaRef ref="dbn:de" versionRef="TODO"/>
 								</ResponsibilityRoleAssignment>
@@ -3114,7 +3114,7 @@ An overview of the validity of EURO-NEISSE tickets can be found here. Further in
 							<Name>National Rail Products</Name>
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="dbn:network@DB">
-									<StakeholderRoleType>Operation</StakeholderRoleType>
+									<StakeholderRoleType>operation</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="uic:0080" version="any"/>
 									<ResponsibleAreaRef ref="dbn:de" versionRef="TODO"/>
 								</ResponsibilityRoleAssignment>
@@ -3271,7 +3271,7 @@ An overview of the validity of EURO-NEISSE tickets can be found here. Further in
 							<Name>National Rail Stations</Name>
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="uic:Station_Management@0080">
-									<StakeholderRoleType>Operation</StakeholderRoleType>
+									<StakeholderRoleType>operation</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="uic:Station_Management@0080" version="any"/>
 									<ResponsibleAreaRef ref="dbn:uk">TODO</ResponsibleAreaRef>
 								</ResponsibilityRoleAssignment>
@@ -3282,7 +3282,7 @@ An overview of the validity of EURO-NEISSE tickets can be found here. Further in
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="eura:code_sets@EURA">
 									<DataRoleType>creates distributes</DataRoleType>
-									<StakeholderRoleType>DataRegistrar</StakeholderRoleType>
+									<StakeholderRoleType>dataRegistrar</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="eura:EURA" version="any"/>
 									<ResponsibleAreaRef ref="eura:Europe">TODO</ResponsibleAreaRef>
 								</ResponsibilityRoleAssignment>
diff --git a/examples/functions/fares/rail/Netex_era_distance_ro.xml b/examples/functions/fares/rail/Netex_era_distance_ro.xml
index 5228e602e..735d20e8e 100644
--- a/examples/functions/fares/rail/Netex_era_distance_ro.xml
+++ b/examples/functions/fares/rail/Netex_era_distance_ro.xml
@@ -7652,7 +7652,7 @@ State Secretariat for Revolutionary Issues in December 1989: : 12 free roun
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="tfc:tfc_products:TFC">
 									<DataRoleType>creates aggregates distributes</DataRoleType>
-									<StakeholderRoleType>FareManagement</StakeholderRoleType>
+									<StakeholderRoleType>fareManagement</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="uic:3181" version="any"/>
 									<ResponsibleAreaRef ref="tfc_region">TODO</ResponsibleAreaRef>
 								</ResponsibilityRoleAssignment>
@@ -7663,7 +7663,7 @@ State Secretariat for Revolutionary Issues in December 1989: : 12 free roun
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="tfc_t:tfc_sales">
 									<DataRoleType>creates aggregates distributes</DataRoleType>
-									<StakeholderRoleType>Operation</StakeholderRoleType>
+									<StakeholderRoleType>operation</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="uic:3181" version="any"/>
 									<ResponsibleAreaRef ref="tfc_region">TODO</ResponsibleAreaRef>
 								</ResponsibilityRoleAssignment>
@@ -8300,7 +8300,7 @@ c
 							<Name>National Rail Stations</Name>
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="uic_station_management:0070">
-									<StakeholderRoleType>Operation</StakeholderRoleType>
+									<StakeholderRoleType>operation</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="uic_station_management:0070" version="any"/>
 									<ResponsibleAreaRef ref="atoc:uk">TODO</ResponsibleAreaRef>
 								</ResponsibilityRoleAssignment>
@@ -8311,7 +8311,7 @@ c
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="eura:code_sets">
 									<DataRoleType>creates distributes</DataRoleType>
-									<StakeholderRoleType>DataRegistrar</StakeholderRoleType>
+									<StakeholderRoleType>dataRegistrar</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="eura:EURA" version="any"/>
 									<ResponsibleAreaRef ref="eura:Europe">TODO</ResponsibleAreaRef>
 								</ResponsibilityRoleAssignment>
diff --git a/examples/functions/fares/rail/Netex_era_toc_uk.xml b/examples/functions/fares/rail/Netex_era_toc_uk.xml
index c44c90626..e38efa569 100644
--- a/examples/functions/fares/rail/Netex_era_toc_uk.xml
+++ b/examples/functions/fares/rail/Netex_era_toc_uk.xml
@@ -7193,7 +7193,7 @@ A: Yes. You will, however, need to complete a new mature student application for
 							<Name>Greater Anglia products</Name>
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="abga:products:LT">
-									<StakeholderRoleType>FareManagement</StakeholderRoleType>
+									<StakeholderRoleType>fareManagement</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="atc:LT" version="any"/>
 									<ResponsibleAreaRef ref="atc:uk">TODO</ResponsibleAreaRef>
 								</ResponsibilityRoleAssignment>
@@ -7203,7 +7203,7 @@ A: Yes. You will, however, need to complete a new mature student application for
 							<Name>Greater Anglia sales data</Name>
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="abga:sales:LT">
-									<StakeholderRoleType>Operation</StakeholderRoleType>
+									<StakeholderRoleType>operation</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="atc:LT" version="any"/>
 									<ResponsibleAreaRef ref="atc:uk">TODO</ResponsibleAreaRef>
 								</ResponsibilityRoleAssignment>
@@ -8830,17 +8830,17 @@ Short Term (1/4/18-1/6/18): £135.00	Short term (1/4-1/6): £230.00d with this g
 							<Name>Plus Bus Products</Name>
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="jsp:products">
-									<StakeholderRoleType>FareManagement</StakeholderRoleType>
+									<StakeholderRoleType>fareManagement</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="jsp:JSP" version="any"/>
 									<ResponsibleAreaRef ref="atc:uk">TODO</ResponsibleAreaRef>
 								</ResponsibilityRoleAssignment>
 							</roles>
 						</ResponsibilitySet>
 						<ResponsibilitySet version="any" id="nptg:tariff_zones">
-							<Name>Plus Bus Tarff Zones</Name>
+							<Name>Plus Bus Tariff Zones</Name>
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="nptg:tariff_zones">
-									<StakeholderRoleType>FareManagement</StakeholderRoleType>
+									<StakeholderRoleType>fareManagement</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="nptg:DfT" version="any"/>
 									<ResponsibleAreaRef ref="atc:uk">TODO</ResponsibleAreaRef>
 								</ResponsibilityRoleAssignment>
@@ -11451,7 +11451,7 @@ http://www.nationalrail.co.uk/stations_destinations/44863.aspx
 							<Name>National Rail Products</Name>
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="atc:products:NRE">
-									<StakeholderRoleType>Other</StakeholderRoleType>
+									<StakeholderRoleType>other</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="atc:Consortium:NRE" version="any"/>
 									<ResponsibleAreaRef ref="atc:uk">TODO</ResponsibleAreaRef>
 								</ResponsibilityRoleAssignment>
@@ -11930,7 +11930,7 @@ West Midlands Railway
 							<Name>National Rail Stations</Name>
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="uic:Station_Management@0070">
-									<StakeholderRoleType>Operation</StakeholderRoleType>
+									<StakeholderRoleType>operation</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="uic:Station_Management@0070" version="any"/>
 									<ResponsibleAreaRef ref="atc:uk">TODO</ResponsibleAreaRef>
 								</ResponsibilityRoleAssignment>
@@ -11941,7 +11941,7 @@ West Midlands Railway
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="eura:code_sets:EURA">
 									<DataRoleType>creates distributes</DataRoleType>
-									<StakeholderRoleType>DataRegistrar</StakeholderRoleType>
+									<StakeholderRoleType>dataRegistrar</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="eura:EURA" version="any"/>
 									<ResponsibleAreaRef ref="eura:Europe">TODO</ResponsibleAreaRef>
 								</ResponsibilityRoleAssignment>
diff --git a/examples/standards/efp/VVS_Fares_V1-nk1.xml b/examples/standards/efp/VVS_Fares_V1-nk1.xml
index 9db8bf2cb..08118cfdb 100644
--- a/examples/standards/efp/VVS_Fares_V1-nk1.xml
+++ b/examples/standards/efp/VVS_Fares_V1-nk1.xml
@@ -865,11 +865,11 @@ Zones		Price	HandyTicket	Price	HandyTicket
 							<PrivateCode>SVE</PrivateCode>
 							<roles>
 								<ResponsibilityRoleAssignment id="de:vvs:ResponsibilityRoleAssignment:SVE_SVE:1" version="any">
-									<StakeholderRoleType>EntityLegalOwnership</StakeholderRoleType>
+									<StakeholderRoleType>entityLegalOwnership</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="de:vvs:Operator:69" version="any"/>
 								</ResponsibilityRoleAssignment>
 								<ResponsibilityRoleAssignment id="de:vvs:ResponsibilityRoleAssignment:SVE_SVE:2" version="any">
-									<StakeholderRoleType>Operation</StakeholderRoleType>
+									<StakeholderRoleType>operation</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="de:vvs:Operator:69" version="any"/>
 								</ResponsibilityRoleAssignment>
 							</roles>
diff --git a/examples/standards/efp/VVS_Fares_V1-nk2.xml b/examples/standards/efp/VVS_Fares_V1-nk2.xml
index cb1232628..c4b1fe158 100644
--- a/examples/standards/efp/VVS_Fares_V1-nk2.xml
+++ b/examples/standards/efp/VVS_Fares_V1-nk2.xml
@@ -534,11 +534,11 @@ tariff zone plan). The VVS conditions of carriage and tariff regulations apply.
 							<PrivateCode>SVE</PrivateCode>
 							<roles>
 								<ResponsibilityRoleAssignment id="de:vvs:ResponsibilityRoleAssignment:SVE_SVE:1" version="any">
-									<StakeholderRoleType>EntityLegalOwnership</StakeholderRoleType>
+									<StakeholderRoleType>entityLegalOwnership</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="de:vvs:Operator:69" version="any"/>
 								</ResponsibilityRoleAssignment>
 								<ResponsibilityRoleAssignment id="de:vvs:ResponsibilityRoleAssignment:SVE_SVE:2" version="any">
-									<StakeholderRoleType>Operation</StakeholderRoleType>
+									<StakeholderRoleType>operation</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="de:vvs:Operator:69" version="any"/>
 								</ResponsibilityRoleAssignment>
 							</roles>
diff --git a/examples/standards/efp/VVS_Fares_V1.xml b/examples/standards/efp/VVS_Fares_V1.xml
index ef03f61d1..3e1757e23 100644
--- a/examples/standards/efp/VVS_Fares_V1.xml
+++ b/examples/standards/efp/VVS_Fares_V1.xml
@@ -385,11 +385,11 @@ There are some other exceptions:
 							<PrivateCode>SVE</PrivateCode>
 							<roles>
 								<ResponsibilityRoleAssignment id="de:vvs:ResponsibilityRoleAssignment:SVE_SVE:1" version="any">
-									<StakeholderRoleType>EntityLegalOwnership</StakeholderRoleType>
+									<StakeholderRoleType>entityLegalOwnership</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="de:vvs:Operator:69" version="any"/>
 								</ResponsibilityRoleAssignment>
 								<ResponsibilityRoleAssignment id="de:vvs:ResponsibilityRoleAssignment:SVE_SVE:2" version="any">
-									<StakeholderRoleType>Operation</StakeholderRoleType>
+									<StakeholderRoleType>operation</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="de:vvs:Operator:69" version="any"/>
 								</ResponsibilityRoleAssignment>
 							</roles>
diff --git a/examples/standards/norway/network/FlexibleLine863-with-connection.xml b/examples/standards/norway/network/FlexibleLine863-with-connection.xml
index a5ccacdcc..7d26125ef 100644
--- a/examples/standards/norway/network/FlexibleLine863-with-connection.xml
+++ b/examples/standards/norway/network/FlexibleLine863-with-connection.xml
@@ -355,7 +355,7 @@ example/functions/timetable/Netex_07.2_Bus_FlexibleTimetable_WithPattern.xml
 						</Connection>
 					</connections>
 					<stopAssignments>
-						<FlexibleStopAssignment version="any" id="RUT:PassengerStopAssignment:ID-HANABORG">
+						<FlexibleStopAssignment version="any" id="RUT:PassengerStopAssignment:ID-HANABORG" order="1">
 							<ScheduledStopPointRef version="any" ref="RUT:ScheduledStopPoint:ID-HANABORG_ST-NORD"/>
 							<FlexibleStopPlaceRef version="any" ref="NHR:FlexibleStopPlace:ID-HANABORG-NORD"/>
 						</FlexibleStopAssignment>
@@ -508,19 +508,19 @@ example/functions/timetable/Netex_07.2_Bus_FlexibleTimetable_WithPattern.xml
 							<JourneyPatternRef ref="RUT:JourneyPattern:863-TilLorenskog"/>
 							<FlexibleLineRef ref="RUT:FlexibleLine:863"/>
 							<passingTimes>
-								<TimetabledPassingTime>
+								<TimetabledPassingTime version="any" id="RUT:ServiceJourney:0863-TilLorenskog_1">
 									<!-- Flexi-sone (sted og tid avtales ved bestilling) -->
 									<StopPointInJourneyPatternRef ref="RUT:StopPointInJourneyPattern:ID-HANABORG-NORD-tilLorenskog" version="any"/>
 								</TimetabledPassingTime>
-								<TimetabledPassingTime>
+								<TimetabledPassingTime version="any" id="RUT:ServiceJourney:0863-TilLorenskog_2">
 									<StopPointInJourneyPatternRef ref="RUT:StopPointInJourneyPattern:ID-HANABORG_ST-tilLorenskog" version="any"/>
 									<ArrivalTime>10:15:00</ArrivalTime>
 								</TimetabledPassingTime>
-								<TimetabledPassingTime>
+								<TimetabledPassingTime version="any" id="RUT:ServiceJourney:0863-TilLorenskog_3">
 									<StopPointInJourneyPatternRef ref="RUT:StopPointInJourneyPattern:ID-LORENSKOG-tilLorenskog" version="any"/>
 									<ArrivalTime>10:20:00</ArrivalTime>
 								</TimetabledPassingTime>
-								<TimetabledPassingTime>
+								<TimetabledPassingTime version="any" id="RUT:ServiceJourney:0863-TilLorenskog_4">
 									<StopPointInJourneyPatternRef ref="RUT:StopPointInJourneyPattern:ID-TRIADEN-tilLorenskog" version="any"/>
 									<ArrivalTime>10:25:00</ArrivalTime>
 								</TimetabledPassingTime>
@@ -533,19 +533,19 @@ example/functions/timetable/Netex_07.2_Bus_FlexibleTimetable_WithPattern.xml
 							<JourneyPatternRef ref="RUT:JourneyPattern:863-FraLorenskog"/>
 							<FlexibleLineRef ref="RUT:FlexibleLine:863"/>
 							<passingTimes>
-								<TimetabledPassingTime>
+								<TimetabledPassingTime version="any" id="RUT:ServiceJourney:0863-FraLorenskog_01">
 									<StopPointInJourneyPatternRef ref="RUT:StopPointInJourneyPattern:ID-TRIADEN-fraLorenskog" version="any"/>
 									<DepartureTime>12:25:00</DepartureTime>
 								</TimetabledPassingTime>
-								<TimetabledPassingTime>
+								<TimetabledPassingTime version="any" id="RUT:ServiceJourney:0863-FraLorenskog_02">
 									<StopPointInJourneyPatternRef ref="RUT:StopPointInJourneyPattern:ID-LORENSKOG-fraLorenskog" version="any"/>
 									<DepartureTime>12:30:00</DepartureTime>
 								</TimetabledPassingTime>
-								<TimetabledPassingTime>
+								<TimetabledPassingTime version="any" id="RUT:ServiceJourney:0863-FraLorenskog_03">
 									<StopPointInJourneyPatternRef ref="RUT:StopPointInJourneyPattern:ID-HANABORG_ST-fraLorenskog" version="any"/>
 									<DepartureTime>12:35:00</DepartureTime>
 								</TimetabledPassingTime>
-								<TimetabledPassingTime>
+								<TimetabledPassingTime version="any" id="RUT:ServiceJourney:0863-FraLorenskog_04">
 									<!-- Flexi-sone (leveringssted avtales ved bestilling) -->
 									<StopPointInJourneyPatternRef ref="RUT:StopPointInJourneyPattern:ID-HANABORG-NORD-fraLorenskog" version="any"/>
 								</TimetabledPassingTime>
diff --git a/examples/standards/nta/NTA-PI-01_EI_LUAS_LINE_OFFER_LUAS_Line93Calls_20200701.xml b/examples/standards/nta/NTA-PI-01_EI_LUAS_LINE_OFFER_LUAS_Line93Calls_20200701.xml
index a8aa56f76..4a190ae67 100644
--- a/examples/standards/nta/NTA-PI-01_EI_LUAS_LINE_OFFER_LUAS_Line93Calls_20200701.xml
+++ b/examples/standards/nta/NTA-PI-01_EI_LUAS_LINE_OFFER_LUAS_Line93Calls_20200701.xml
@@ -366,7 +366,7 @@ attribution002,0,1,Transdev,12345
 							<Name>Transport For Ireland</Name>
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="attribution001">
-									<StakeholderRoleType>Planning</StakeholderRoleType>
+									<StakeholderRoleType>planning</StakeholderRoleType>
 									<ResponsibleOrganisationRef version="any" ref="noc:10000"/>
 								</ResponsibilityRoleAssignment>
 							</roles>
@@ -375,7 +375,7 @@ attribution002,0,1,Transdev,12345
 							<Name>Transdev</Name>
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="attribution002">
-									<StakeholderRoleType>Operation</StakeholderRoleType>
+									<StakeholderRoleType>operation</StakeholderRoleType>
 									<ResponsibleOrganisationRef version="any" ref="noc:12345"/>
 								</ResponsibilityRoleAssignment>
 							</roles>
diff --git a/examples/standards/nta/NTA-PI-01_EI_LUAS_LINE_OFFER_LUAS_Line93_20200701.xml b/examples/standards/nta/NTA-PI-01_EI_LUAS_LINE_OFFER_LUAS_Line93_20200701.xml
index 03320e478..6c628053a 100644
--- a/examples/standards/nta/NTA-PI-01_EI_LUAS_LINE_OFFER_LUAS_Line93_20200701.xml
+++ b/examples/standards/nta/NTA-PI-01_EI_LUAS_LINE_OFFER_LUAS_Line93_20200701.xml
@@ -369,7 +369,7 @@ attribution002,0,1,Transdev,12345
 							<Name>Transport For Ireland</Name>
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="attribution001">
-									<StakeholderRoleType>Planning</StakeholderRoleType>
+									<StakeholderRoleType>planning</StakeholderRoleType>
 									<ResponsibleOrganisationRef version="any" ref="noc:10000"/>
 								</ResponsibilityRoleAssignment>
 							</roles>
@@ -378,7 +378,7 @@ attribution002,0,1,Transdev,12345
 							<Name>Transdev</Name>
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="attribution002">
-									<StakeholderRoleType>Operation</StakeholderRoleType>
+									<StakeholderRoleType>operation</StakeholderRoleType>
 									<ResponsibleOrganisationRef version="any" ref="noc:12345"/>
 								</ResponsibilityRoleAssignment>
 							</roles>
diff --git a/examples/standards/nta/NTA-PI-01_EI_NOC_Operator_20200601.xml b/examples/standards/nta/NTA-PI-01_EI_NOC_Operator_20200601.xml
index fd361211e..8ede5b50c 100644
--- a/examples/standards/nta/NTA-PI-01_EI_NOC_Operator_20200601.xml
+++ b/examples/standards/nta/NTA-PI-01_EI_NOC_Operator_20200601.xml
@@ -67,7 +67,7 @@
 							<roles>
 								<ResponsibilityRoleAssignment version="op:1.04" id="op:Operator_stop_data">
 									<DataRoleType>creates distributes</DataRoleType>
-									<StakeholderRoleType>Other</StakeholderRoleType>
+									<StakeholderRoleType>other</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="noc:01" version="any"/>
 								</ResponsibilityRoleAssignment>
 							</roles>
diff --git a/examples/standards/nta/NTA-PI-01_EI_NOC_Operator_LUAS_20200601.xml b/examples/standards/nta/NTA-PI-01_EI_NOC_Operator_LUAS_20200601.xml
index 8aecf9ba1..b06d4b8bd 100644
--- a/examples/standards/nta/NTA-PI-01_EI_NOC_Operator_LUAS_20200601.xml
+++ b/examples/standards/nta/NTA-PI-01_EI_NOC_Operator_LUAS_20200601.xml
@@ -74,7 +74,7 @@ This Example shows an extract of  encoding a single  Operator  data     encoded
 							<roles>
 								<ResponsibilityRoleAssignment version="op:1.04" id="op:Operator_stop_data">
 									<DataRoleType>creates distributes</DataRoleType>
-									<StakeholderRoleType>Other</StakeholderRoleType>
+									<StakeholderRoleType>other</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="noc:01" version="any"/>
 								</ResponsibilityRoleAssignment>
 							</roles>
diff --git a/examples/standards/nta/NTA-PI-01_EI_NTA_NptgLocalitiesMinimal_20200730.xml b/examples/standards/nta/NTA-PI-01_EI_NTA_NptgLocalitiesMinimal_20200730.xml
index 5fe0d7190..e58f25d9f 100644
--- a/examples/standards/nta/NTA-PI-01_EI_NTA_NptgLocalitiesMinimal_20200730.xml
+++ b/examples/standards/nta/NTA-PI-01_EI_NTA_NptgLocalitiesMinimal_20200730.xml
@@ -70,7 +70,21 @@ NeTEx separates  organisational structure (ORGANISATION, ORGANISATION PART)  fro
 			<TypeOfFrameRef ref="eix:EI:NTA:TypeOfFrame_EI_PI_STOP_OFFER:EIRE_NP" versionRef="eix:v1.0"/>
 			<!-- ==== CODESPACES == -->
 			<frames>
-				<SiteFrame id="epd:EI:NTA:CompositeFrame_EI_PI_STOP:NPTG-sample:nptg" version="nptg:NPTG_data_1.0" responsibilitySetRef="nptg:NPTG_data" dataSourceRef="nptg:nta">
+				<ResourceFrame id="epd:IE:NTA:ResourceFrame_IE_PI_STOP:NAPTAN:napt" version="9.6" dataSourceRef="napt:NTA">
+					<Name>Sample Stop and Stop Area data encoded NeTEx - Area 700</Name>
+					<TypeOfFrameRef ref="eix:IE:NTA:TypeOfFrame_IE_PI_STOP:EIRE_NP" versionRef="eix:v1.0"/>
+					<FrameDefaults>
+						<DefaultDataSourceRef ref="napt:NTA" version="napt:v2.4"/>
+						<DefaultResponsibilitySetRef ref="nptgAdminArea:700" versionRef="nptg:v2.1"/>
+					</FrameDefaults>
+					<dataSources>
+						<DataSource id="napt:NTA" version="napt:v2.4">
+						</DataSource>
+						<DataSource id="nptg:NTA" version="napt:v2.4">
+						</DataSource>
+					</dataSources>
+				</ResourceFrame>
+				<SiteFrame id="epd:EI:NTA:CompositeFrame_EI_PI_STOP:NPTG-sample:nptg" version="nptg:NPTG_data_1.0" responsibilitySetRef="nptg:NPTG_data" dataSourceRef="nptg:NTA">
 					<Name>NPTG content data - Localities and Plusbus zones </Name>
 					<Description>This is an example showing an encoding  in NeTEx of  actual NPTG  data for NPTG localities and PlusBus tariff zones  </Description>
 					<TypeOfFrameRef ref="eix:EI:NTA:TypeOfFrame_EI_PI_NPTG" versionRef="eix:v1.0"/>
diff --git a/examples/standards/nta/NTA-PI-01_EI_NTA_NptgLocalities_20200730.xml b/examples/standards/nta/NTA-PI-01_EI_NTA_NptgLocalities_20200730.xml
index bc38d63d8..38ec52140 100644
--- a/examples/standards/nta/NTA-PI-01_EI_NTA_NptgLocalities_20200730.xml
+++ b/examples/standards/nta/NTA-PI-01_EI_NTA_NptgLocalities_20200730.xml
@@ -76,7 +76,7 @@ NeTEx separates  organisational structure (ORGANISATION, ORGANISATION PART)  fro
 				<CodespaceRef ref="nptg_metadata"/>
 			</codespaces>
 			<frames>
-				<SiteFrame id="epd:EI:NTA:CompositeFrame_EI_PI_STOP:NPTG-sample:nptg" version="nptg:NPTG_data_1.0" responsibilitySetRef="nptg:NPTG_data" dataSourceRef="nptg:nta">
+				<SiteFrame id="epd:EI:NTA:CompositeFrame_EI_PI_STOP:NPTG-sample:nptg" version="nptg:NPTG_data_1.0" responsibilitySetRef="nptg:NPTG_data">
 					<Name>NPTG content data - Localities and Plusbus zones </Name>
 					<Description>This is an example showing an encoding  in NeTEx of  actual NPTG  data for NPTG localities and PlusBus tariff zones  </Description>
 					<TypeOfFrameRef ref="eix:EI:NTA:TypeOfFrame_EI_PI_NPTG" versionRef="eix:v1.0"/>
@@ -4282,7 +4282,7 @@ NeTEx separates  organisational structure (ORGANISATION, ORGANISATION PART)  fro
 							<roles>
 								<ResponsibilityRoleAssignment version="nptg:v2.1" id="nptg:NPTG_metadata">
 									<DataRoleType>creates distributes</DataRoleType>
-									<StakeholderRoleType>DataRegistrar</StakeholderRoleType>
+									<StakeholderRoleType>dataRegistrar</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="nptg:NTA" version="nptg:v2.1"/>
 									<ResponsibleAreaRef ref="nptgRegion:ie" nameOfRefClass="TransportAdministrativeZone" versionRef="0" xsi:type="TransportAdministrativeZoneRefStructure">Eire</ResponsibleAreaRef>
 								</ResponsibilityRoleAssignment>
@@ -4293,7 +4293,7 @@ NeTEx separates  organisational structure (ORGANISATION, ORGANISATION PART)  fro
 							<roles>
 								<ResponsibilityRoleAssignment version="nptg:v2.1" id="nptg:NPTG_data">
 									<DataRoleType>creates distributes</DataRoleType>
-									<StakeholderRoleType>EntityLegalOwnership</StakeholderRoleType>
+									<StakeholderRoleType>entityLegalOwnership</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="nptg:NTA" version="nptg:v2.1"/>
 									<ResponsibleAreaRef ref="nptg:EI">TODO</ResponsibleAreaRef>
 								</ResponsibilityRoleAssignment>
diff --git a/examples/standards/nta/NTA-PI-01_EI_NTA_Operators_COMMON_20200601.xml b/examples/standards/nta/NTA-PI-01_EI_NTA_Operators_COMMON_20200601.xml
index 89570a8fd..362f2163d 100644
--- a/examples/standards/nta/NTA-PI-01_EI_NTA_Operators_COMMON_20200601.xml
+++ b/examples/standards/nta/NTA-PI-01_EI_NTA_Operators_COMMON_20200601.xml
@@ -72,6 +72,9 @@ This Example shows an extract of  real  Irish Operator  data     encoded  in NeT
 						<DataSource id="noc:NTA" version="noc:1.0">
 							<Email>data@http://www.nta.ie/</Email>
 						</DataSource>
+						<DataSource id="noc:Transdev" version="noc:1.0">
+							<Email>data@http://www.transdev.ie/</Email>
+						</DataSource>
 					</dataSources>
 					<!-- ========Responsibility Sets========== -->
 					<responsibilitySets>
@@ -80,7 +83,7 @@ This Example shows an extract of  real  Irish Operator  data     encoded  in NeT
 							<roles>
 								<ResponsibilityRoleAssignment version="noc:1.04" id="noc:Operator_stop_data">
 									<DataRoleType>creates distributes</DataRoleType>
-									<StakeholderRoleType>Other</StakeholderRoleType>
+									<StakeholderRoleType>other</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="noc:NTA" version="any"/>
 								</ResponsibilityRoleAssignment>
 							</roles>
diff --git a/examples/standards/nta/NTA-PI-01_EI_NTA_STOP_NaPTAN-XXMinimal_2020801.xml b/examples/standards/nta/NTA-PI-01_EI_NTA_STOP_NaPTAN-XXMinimal_2020801.xml
index 24c1aac0d..b93921485 100644
--- a/examples/standards/nta/NTA-PI-01_EI_NTA_STOP_NaPTAN-XXMinimal_2020801.xml
+++ b/examples/standards/nta/NTA-PI-01_EI_NTA_STOP_NaPTAN-XXMinimal_2020801.xml
@@ -49,6 +49,18 @@ The example includes:
 			<TypeOfFrameRef ref="eix:IE:NTA:TypeOfFrame_IE_PI_STOP_OFFER:EIRE_NP" versionRef="eix:v1.0"/>
 			<frames>
 				<!--   ======= PAYLOAD= ========================================================= -->
+				<ResourceFrame id="epd:IE:NTA:ResourceFrame_IE_PI_STOP:NAPTAN:napt" version="9.6" dataSourceRef="napt:NTA">
+					<Name>Sample Stop and Stop Area data encoded NeTEx - Area 700</Name>
+					<TypeOfFrameRef ref="eix:IE:NTA:TypeOfFrame_IE_PI_STOP:EIRE_NP" versionRef="eix:v1.0"/>
+					<FrameDefaults>
+						<DefaultDataSourceRef ref="napt:NTA" version="napt:v2.4"/>
+						<DefaultResponsibilitySetRef ref="nptgAdminArea:700" versionRef="nptg:v2.1"/>
+					</FrameDefaults>
+					<dataSources>
+						<DataSource id="napt:NTA" version="napt:v2.4">
+						</DataSource>
+					</dataSources>
+				</ResourceFrame>
 				<!---   USING SEPARATE FRAMEs FOR EACH ADMIN   AREA   -->
 				<!--  ==== example STOPS FOR AdminArea 700  ========== -->
 				<SiteFrame id="epd:IE:NTA:SiteFrame_IE_PI_STOP:NAPTAN-700:napt" version="9.6" responsibilitySetRef="nptgAdminArea:700" dataSourceRef="napt:NTA">
diff --git a/examples/standards/nta/NTA-PI-01_EI_NTA_STOP_NaPTAN-XX_2020801.xml b/examples/standards/nta/NTA-PI-01_EI_NTA_STOP_NaPTAN-XX_2020801.xml
index 923607591..58c016203 100644
--- a/examples/standards/nta/NTA-PI-01_EI_NTA_STOP_NaPTAN-XX_2020801.xml
+++ b/examples/standards/nta/NTA-PI-01_EI_NTA_STOP_NaPTAN-XX_2020801.xml
@@ -808,7 +808,7 @@ The NaPTAN StopClassification and StopType can be used to determine how each typ
 							<roles>
 								<ResponsibilityRoleAssignment version="eix:v1.0" id="eix:EIX_metadata:NTA">
 									<DataRoleType>creates distributes</DataRoleType>
-									<StakeholderRoleType>DataRegistrar</StakeholderRoleType>
+									<StakeholderRoleType>dataRegistrar</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="nptg:NTA" versionRef="nptg:v2.1"/>
 									<ResponsibleAreaRef ref="nptgRegion:EIRE" versionRef="nptg:v2.1"/>
 								</ResponsibilityRoleAssignment>
@@ -961,7 +961,7 @@ The NaPTAN StopClassification and StopType can be used to determine how each typ
 							<roles>
 								<ResponsibilityRoleAssignment version="napt:v2.4" id="napt:NaPTAN_metadata">
 									<DataRoleType>creates distributes</DataRoleType>
-									<StakeholderRoleType>DataRegistrar</StakeholderRoleType>
+									<StakeholderRoleType>dataRegistrar</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="nptg:NTA" version="nptg:v2.1"/>
 									<ResponsibleAreaRef ref="nptgRegion:EIRE" nameOfRefClass="TransportAdministrativeZone" versionRef="0" xsi:type="TransportAdministrativeZoneRefStructure">Irish </ResponsibleAreaRef>
 								</ResponsibilityRoleAssignment>
@@ -972,7 +972,7 @@ The NaPTAN StopClassification and StopType can be used to determine how each typ
 							<roles>
 								<ResponsibilityRoleAssignment version="napt:v2.4" id="napt:naptan_data">
 									<DataRoleType>creates distributes</DataRoleType>
-									<StakeholderRoleType>Other</StakeholderRoleType>
+									<StakeholderRoleType>other</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="nptg:NTA" version="nptg:v2.1"/>
 									<ResponsibleAreaRef ref="nptgRegion:EIRE" nameOfRefClass="TransportAdministrativeZone" versionRef="0" xsi:type="TransportAdministrativeZoneRefStructure">Irish </ResponsibleAreaRef>
 								</ResponsibilityRoleAssignment>
@@ -1166,7 +1166,7 @@ The NaPTAN StopClassification and StopType can be used to determine how each typ
 							<roles>
 								<ResponsibilityRoleAssignment version="nptg:v2.1" id="nptg:NPTG_metadata">
 									<DataRoleType>creates distributes</DataRoleType>
-									<StakeholderRoleType>DataRegistrar</StakeholderRoleType>
+									<StakeholderRoleType>dataRegistrar</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="nptg:NTA" version="nptg:v2.1"/>
 									<ResponsibleAreaRef ref="nptgRegion:IE" nameOfRefClass="TransportAdministrativeZone" versionRef="0" xsi:type="TransportAdministrativeZoneRefStructure">Irish </ResponsibleAreaRef>
 								</ResponsibilityRoleAssignment>
@@ -1177,7 +1177,7 @@ The NaPTAN StopClassification and StopType can be used to determine how each typ
 							<roles>
 								<ResponsibilityRoleAssignment version="nptg:v2.1" id="nptg:NPTG_data">
 									<DataRoleType>creates distributes</DataRoleType>
-									<StakeholderRoleType>EntityLegalOwnership</StakeholderRoleType>
+									<StakeholderRoleType>entityLegalOwnership</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="nptg:NTA" version="nptg:v2.1"/>
 									<ResponsibleAreaRef ref="nptg:IE">TODO</ResponsibleAreaRef>
 								</ResponsibilityRoleAssignment>
diff --git a/examples/standards/tap_tsi/B1_NRT/Netex_tap_tsi_B1-1080-full.xml b/examples/standards/tap_tsi/B1_NRT/Netex_tap_tsi_B1-1080-full.xml
index 25571d16e..533b0772a 100644
--- a/examples/standards/tap_tsi/B1_NRT/Netex_tap_tsi_B1-1080-full.xml
+++ b/examples/standards/tap_tsi/B1_NRT/Netex_tap_tsi_B1-1080-full.xml
@@ -58,7 +58,7 @@ This example provides an example of encodeing TAP TSI  NRT  fares in NeTEx XML
 									<roles>
 										<ResponsibilityRoleAssignment version="any" id="uic:RS@1080">
 											<DataRoleType>collects distributes</DataRoleType>
-											<StakeholderRoleType>Operation Reservation</StakeholderRoleType>
+											<StakeholderRoleType>operation reservation</StakeholderRoleType>
 											<ResponsibleOrganisationRef version="01" ref="uic:1080" nameOfRefClass="OperatorRef" xsi:type="OperatorRefStructure"/>
 										</ResponsibilityRoleAssignment>
 									</roles>
diff --git a/examples/standards/tap_tsi/B1_NRT/Netex_tap_tsi_B1-1080.xml b/examples/standards/tap_tsi/B1_NRT/Netex_tap_tsi_B1-1080.xml
index 3512aea8b..c63fada4a 100644
--- a/examples/standards/tap_tsi/B1_NRT/Netex_tap_tsi_B1-1080.xml
+++ b/examples/standards/tap_tsi/B1_NRT/Netex_tap_tsi_B1-1080.xml
@@ -54,7 +54,7 @@ This example provides an example of encodeing TAP TSI  NRT  fares in NeTEx XML
 									<roles>
 										<ResponsibilityRoleAssignment version="any" id="1080">
 											<DataRoleType>collects distributes</DataRoleType>
-											<StakeholderRoleType>Operation Reservation</StakeholderRoleType>
+											<StakeholderRoleType>operation reservation</StakeholderRoleType>
 											<ResponsibleOrganisationRef version="01" ref="1080" nameOfRefClass="OperatorRef" xsi:type="OperatorRefStructure"/>
 										</ResponsibilityRoleAssignment>
 									</roles>
diff --git a/examples/standards/tap_tsi/B1_NRT/Netex_tap_tsi_B1.xml b/examples/standards/tap_tsi/B1_NRT/Netex_tap_tsi_B1.xml
index ddea8dd99..e6bfd2532 100644
--- a/examples/standards/tap_tsi/B1_NRT/Netex_tap_tsi_B1.xml
+++ b/examples/standards/tap_tsi/B1_NRT/Netex_tap_tsi_B1.xml
@@ -310,16 +310,16 @@ V1.1 Extensively revised with improved ids and use of tarifffs.
 							</ValidBetween>
 							<Name>B.1.1:01 Standard NRT Tarifff</Name>
 							<alternativeNames>
-								<AlternativeName order="1" id="tap:Tariff01@of" version="1.0">
+								<AlternativeName order="1" id="tap:NRT_Standard@of" version="1.0">
 									<Name lang="en">My Standard  Fare table    description in the Offical Language</Name>
 								</AlternativeName>
-								<AlternativeName order="2" id="tap:Tariff01@fr" version="1.0">
+								<AlternativeName order="2" id="tap:NRT_Standard@fr" version="1.0">
 									<Name lang="fr">My  Standard Fare tabledescription in the French</Name>
 								</AlternativeName>
-								<AlternativeName order="3" id="tap:Tariff01@de" version="1.0">
+								<AlternativeName order="3" id="tap:NRT_Standard@de" version="1.0">
 									<Name lang="de">My Standard Fare table description in German</Name>
 								</AlternativeName>
-								<AlternativeName order="4" id="tap:Tariff01@en" version="1.0">
+								<AlternativeName order="4" id="tap:NRT_Standard@en" version="1.0">
 									<Name lang="de">My Standard Fare table description in English</Name>
 								</AlternativeName>
 							</alternativeNames>
diff --git a/examples/standards/tap_tsi/B1_NRT/Netex_tap_tsi_tcvc_carrier_1.xml b/examples/standards/tap_tsi/B1_NRT/Netex_tap_tsi_tcvc_carrier_1.xml
index aae983e05..d6239b96f 100644
--- a/examples/standards/tap_tsi/B1_NRT/Netex_tap_tsi_tcvc_carrier_1.xml
+++ b/examples/standards/tap_tsi/B1_NRT/Netex_tap_tsi_tcvc_carrier_1.xml
@@ -151,7 +151,7 @@ The example is taken from ERA/TD/2009-04/INT: Annex B,1 of Tap TSI
 								<ResponsibilitySet id="tap:0010" version="any">
 									<roles>
 										<ResponsibilityRoleAssignment id="tap:0010" version="any">
-											<StakeholderRoleType>Operation</StakeholderRoleType>
+											<StakeholderRoleType>operation</StakeholderRoleType>
 											<ResponsibleOrganisationRef ref="tap:0020"/>
 										</ResponsibilityRoleAssignment>
 									</roles>
diff --git a/examples/standards/tap_tsi/B2_IRT/Netex_tap_tsi_B2-1180.xml b/examples/standards/tap_tsi/B2_IRT/Netex_tap_tsi_B2-1180.xml
index ea65adb0e..f61f143e2 100644
--- a/examples/standards/tap_tsi/B2_IRT/Netex_tap_tsi_B2-1180.xml
+++ b/examples/standards/tap_tsi/B2_IRT/Netex_tap_tsi_B2-1180.xml
@@ -19779,7 +19779,7 @@ PCGO1080XXX0003
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="1080">
 									<DataRoleType>collects distributes</DataRoleType>
-									<StakeholderRoleType>Operation Reservation</StakeholderRoleType>
+									<StakeholderRoleType>operation reservation</StakeholderRoleType>
 									<ResponsibleOrganisationRef version="any" ref="1080" nameOfRefClass="OperatorRef" xsi:type="OperatorRefStructure"/>
 								</ResponsibilityRoleAssignment>
 							</roles>
diff --git a/examples/standards/tap_tsi/B2_IRT/Netex_tap_tsi_B2-1181.xml b/examples/standards/tap_tsi/B2_IRT/Netex_tap_tsi_B2-1181.xml
index 9daf14edf..b15b4a7e6 100644
--- a/examples/standards/tap_tsi/B2_IRT/Netex_tap_tsi_B2-1181.xml
+++ b/examples/standards/tap_tsi/B2_IRT/Netex_tap_tsi_B2-1181.xml
@@ -18139,7 +18139,7 @@ PCZO1181XXX0143
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="1181">
 									<DataRoleType>collects distributes</DataRoleType>
-									<StakeholderRoleType>Operation Reservation</StakeholderRoleType>
+									<StakeholderRoleType>operation reservation</StakeholderRoleType>
 									<ResponsibleOrganisationRef version="any" ref="1181" nameOfRefClass="OperatorRef" xsi:type="OperatorRefStructure"/>
 								</ResponsibilityRoleAssignment>
 							</roles>
diff --git a/examples/standards/tap_tsi/B2_IRT/Netex_tap_tsi_B2-71.xml b/examples/standards/tap_tsi/B2_IRT/Netex_tap_tsi_B2-71.xml
index c692ca371..28a84aa19 100644
--- a/examples/standards/tap_tsi/B2_IRT/Netex_tap_tsi_B2-71.xml
+++ b/examples/standards/tap_tsi/B2_IRT/Netex_tap_tsi_B2-71.xml
@@ -29670,7 +29670,7 @@ PCZO0071XXX0143
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="0071">
 									<DataRoleType>collects distributes</DataRoleType>
-									<StakeholderRoleType>Operation Reservation</StakeholderRoleType>
+									<StakeholderRoleType>operation reservation</StakeholderRoleType>
 									<ResponsibleOrganisationRef version="any" ref="0071" nameOfRefClass="OperatorRef" xsi:type="OperatorRefStructure"/>
 								</ResponsibilityRoleAssignment>
 							</roles>
@@ -29693,7 +29693,6 @@ PCZO0071XXX0143
 									<Name>Lusitania</Name>
 								</Branding>
 								<Branding version="any" id="REG">
-							 
 								</Branding>
 								<Branding version="any" id="TAJ">
 									<Name>TAJ</Name>
@@ -29704,9 +29703,8 @@ PCZO0071XXX0143
 							<Name>Types of concession for 0071</Name>
 							<values>
 								<TypeOfConcession version="any" id="0011">
- 
 								</TypeOfConcession>
-								<TypeOfConcession version="any" id="0010"> 
+								<TypeOfConcession version="any" id="0010">
 								</TypeOfConcession>
 							</values>
 						</ValueSet>
diff --git a/examples/standards/tap_tsi/B3_Special/Netex_tap_tsi_B3+more.xml b/examples/standards/tap_tsi/B3_Special/Netex_tap_tsi_B3+more.xml
index 6ba928333..9a869d409 100644
--- a/examples/standards/tap_tsi/B3_Special/Netex_tap_tsi_B3+more.xml
+++ b/examples/standards/tap_tsi/B3_Special/Netex_tap_tsi_B3+more.xml
@@ -613,12 +613,12 @@ The example shows the usage of special fares for
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="tap:res01@transferor_RU">
 									<Description>Company code of transferor RU</Description>
-									<StakeholderRoleType>Planning</StakeholderRoleType>
+									<StakeholderRoleType>planning</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="tap:0087" version="any"/>
 								</ResponsibilityRoleAssignment>
 								<ResponsibilityRoleAssignment version="any" id="tap:res01@participating_RU">
 									<Description>Company code of participating RU</Description>
-									<StakeholderRoleType>Operation</StakeholderRoleType>
+									<StakeholderRoleType>operation</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="tap:0087" version="any"/>
 								</ResponsibilityRoleAssignment>
 							</roles>
diff --git a/examples/standards/tap_tsi/B3_Special/Netex_tap_tsi_B3.xml b/examples/standards/tap_tsi/B3_Special/Netex_tap_tsi_B3.xml
index 7a0e8a170..d7cbb10a2 100644
--- a/examples/standards/tap_tsi/B3_Special/Netex_tap_tsi_B3.xml
+++ b/examples/standards/tap_tsi/B3_Special/Netex_tap_tsi_B3.xml
@@ -510,12 +510,12 @@ The example shows the usage of special fares for
 							<roles>
 								<ResponsibilityRoleAssignment version="any" id="tap:res01@transferor_RU">
 									<Description>Company code of transferor RU</Description>
-									<StakeholderRoleType>Planning</StakeholderRoleType>
+									<StakeholderRoleType>planning</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="tap:0087" version="any"/>
 								</ResponsibilityRoleAssignment>
 								<ResponsibilityRoleAssignment version="any" id="tap:res01@participating_RU">
 									<Description>Company code of participating RU</Description>
-									<StakeholderRoleType>Operation</StakeholderRoleType>
+									<StakeholderRoleType>operation</StakeholderRoleType>
 									<ResponsibleOrganisationRef ref="tap:0087" version="any"/>
 								</ResponsibilityRoleAssignment>
 							</roles>
diff --git a/xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd b/xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd
index 1ba358bb0..b7c9e6aec 100644
--- a/xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd
@@ -106,9 +106,8 @@ Rail transport, Roads and Road transport
 			<xsd:enumeration value="tenant"/>
 			<xsd:enumeration value="facilityManagement"/>
 			<xsd:enumeration value="lessor"/>
-			<xsd:enumeration value="dataRegistrar"/>
 			<xsd:enumeration value="other"/>
-			<!--			DEPRECATED VALUES from v2.0 -->
+			<!-- DEPRECATED Upper case values kept for the time being. -v.2.0  -->
 			<xsd:enumeration value="Planning"/>
 			<xsd:enumeration value="Operation"/>
 			<xsd:enumeration value="Control"/>