diff --git a/.github/scripts/validate-examples.sh b/.github/scripts/validate-examples.sh
index 32a3a0bc4..e4297d371 100755
--- a/.github/scripts/validate-examples.sh
+++ b/.github/scripts/validate-examples.sh
@@ -9,7 +9,7 @@ set -e
 
 echo "Validating NeTEx XML examples ..."
 
-if xmllint --noout --schema xsd/NeTEx_publication.xsd examples/standards/epiap/*xml && xmllint --noout --schema xsd/NeTEx_publication.xsd examples/functions/deprecation/*.xml examples/functions/calendar/*xml examples/functions/fares/*xml examples/functions/grouping/*xml examples/functions/newModes/*xml examples/functions/patterns/*xml examples/functions/pointOfInterest/*xml examples/functions/simpleNetwork/*xml examples/functions/site/*xml examples/functions/stopPlace/*xml examples/functions/timetable/*xml examples/functions/validityCondition/*xml examples/functions/variant/*xml examples/functions/vehicleSchedule/*xml examples/functions/versioning/*xml examples/standards/epip/*xml examples/standards/era_uic/*xml examples/standards/fxc/*xml examples/standards/gbfs/*xml examples/standards/gtfs/*xml examples/standards/neptune/*xml  examples/standards/noptis/*xml examples/standards/tap_tsi/*xml examples/standards/txc/*xml examples/standards/vdv452/*/*xml examples/standards/vdv452/*/*/*xml; then
+if xmllint --noout --schema xsd/NeTEx_publication.xsd examples/standards/tap_tsi/*xml examples/standards/tap_tsi/*/*xml && xmllint --noout --schema xsd/NeTEx_publication.xsd examples/standards/epiap/*xml && xmllint --noout --schema xsd/NeTEx_publication.xsd examples/functions/deprecation/*.xml examples/functions/calendar/*xml examples/functions/fares/*xml examples/functions/grouping/*xml examples/functions/newModes/*xml examples/functions/patterns/*xml examples/functions/pointOfInterest/*xml examples/functions/simpleNetwork/*xml examples/functions/site/*xml examples/functions/stopPlace/*xml examples/functions/timetable/*xml examples/functions/validityCondition/*xml examples/functions/variant/*xml examples/functions/vehicleSchedule/*xml examples/functions/versioning/*xml examples/standards/epip/*xml examples/standards/era_uic/*xml examples/standards/fxc/*xml examples/standards/gbfs/*xml examples/standards/gtfs/*xml examples/standards/neptune/*xml  examples/standards/noptis/*xml examples/standards/tap_tsi/*xml examples/standards/txc/*xml examples/standards/vdv452/*/*xml examples/standards/vdv452/*/*/*xml; then
   echo -e '\033[0;32mValidating NeTEx XML examples succeeded\033[0m'
 else
   echo -e '\033[0;31mValidating NeTEx XML examples failed\033[0m'
diff --git a/examples/standards/tap_tsi/B1_NRT/Netex_tap_tsi_B1-1080-TCVP.xml b/examples/standards/tap_tsi/B1_NRT/Netex_tap_tsi_B1-1080-TCVP.xml
index a7184d72f..61e5bfddb 100644
--- a/examples/standards/tap_tsi/B1_NRT/Netex_tap_tsi_B1-1080-TCVP.xml
+++ b/examples/standards/tap_tsi/B1_NRT/Netex_tap_tsi_B1-1080-TCVP.xml
@@ -20,8 +20,8 @@ This example provides an example of encodeing TAP TSI  NRT  fares in NeTEx XML
 				<FareFrame id="B1:TCVP:1080" version="any">
 					<Name>B.1 NRT fare based  example  for RU 1080 - Fare table description </Name>
 					<!-- TCVP 1080 Price Definitions : NeTex TARIFF-->
-					<salesPackages>
-						<SalesPackage id="2000" version="01" derivedFromVersionRef="0000" responsibilitySetRef="1080">
+					<salesOfferPackages>
+						<SalesOfferPackage id="2000" version="01" derivedFromVersionRef="0000" responsibilitySetRef="1080">
 							<validityConditions>
 								<ValidBetween>
 									<FromDate>2012-12-09T00:00:00Z</FromDate>
@@ -43,12 +43,12 @@ This example provides an example of encodeing TAP TSI  NRT  fares in NeTEx XML
 									<Name lang="ru">Flexpreis</Name>
 								</AlternativeName>
 							</alternativeNames>
-							<TypeOfSalesPackageRef version="any" ref="01"/>
+							<TypeOfSalesOfferPackageRef version="any" ref="01"/>
 							<ConditionSummary>
 								<TariffBasis>route</TariffBasis>
 							</ConditionSummary>
 							<validityParameterAssignments>
-								<GenericParameterAssignment version="any" id="2000">
+								<GenericParameterAssignment version="any" id="2000" order="1">
 									<limitations>
 										<GroupTicket id="2000" version="01">
 											<prices>
@@ -68,8 +68,8 @@ This example provides an example of encodeing TAP TSI  NRT  fares in NeTEx XML
 									</limitations>
 								</GenericParameterAssignment>
 							</validityParameterAssignments>
-						</SalesPackage>
-						<SalesPackage id="2002" version="01" derivedFromVersionRef="0000" responsibilitySetRef="1080">
+						</SalesOfferPackage>
+						<SalesOfferPackage id="2002" version="01" derivedFromVersionRef="0000" responsibilitySetRef="1080">
 							<validityConditions>
 								<ValidBetween>
 									<FromDate>2012-12-09T00:00:00Z</FromDate>
@@ -91,12 +91,12 @@ This example provides an example of encodeing TAP TSI  NRT  fares in NeTEx XML
 									<Name lang="ru">Private Railways</Name>
 								</AlternativeName>
 							</alternativeNames>
-							<TypeOfSalesPackageRef version="any" ref="01"/>
+							<TypeOfSalesOfferPackageRef version="any" ref="01"/>
 							<ConditionSummary>
 								<TariffBasis>route</TariffBasis>
 							</ConditionSummary>
 							<validityParameterAssignments>
-								<GenericParameterAssignment version="any" id="2002">
+								<GenericParameterAssignment version="any" id="2002" order="1">
 									<limitations>
 										<GroupTicket id="2002" version="01">
 											<prices>
@@ -116,8 +116,8 @@ This example provides an example of encodeing TAP TSI  NRT  fares in NeTEx XML
 									</limitations>
 								</GenericParameterAssignment>
 							</validityParameterAssignments>
-						</SalesPackage>
-						<SalesPackage id="8888" version="01" derivedFromVersionRef="0000" responsibilitySetRef="1080">
+						</SalesOfferPackage>
+						<SalesOfferPackage id="8888" version="01" derivedFromVersionRef="0000" responsibilitySetRef="1080">
 							<validityConditions>
 								<ValidBetween>
 									<FromDate>2012-12-09T00:00:00Z</FromDate>
@@ -139,12 +139,12 @@ This example provides an example of encodeing TAP TSI  NRT  fares in NeTEx XML
 									<Name lang="ru">Made up group</Name>
 								</AlternativeName>
 							</alternativeNames>
-							<TypeOfSalesPackageRef version="any" ref="01"/>
+							<TypeOfSalesOfferPackageRef version="any" ref="01"/>
 							<ConditionSummary>
 								<TariffBasis>route</TariffBasis>
 							</ConditionSummary>
 							<validityParameterAssignments>
-								<GenericParameterAssignment version="any" id="8888">
+								<GenericParameterAssignment version="any" id="8888" order="1">
 									<limitations>
 										<GroupTicket id="8888" version="01">
 											<prices>
@@ -164,8 +164,8 @@ This example provides an example of encodeing TAP TSI  NRT  fares in NeTEx XML
 									</limitations>
 								</GenericParameterAssignment>
 							</validityParameterAssignments>
-						</SalesPackage>
-					</salesPackages>
+						</SalesOfferPackage>
+					</salesOfferPackages>
 				</FareFrame>
 				<!-- ====RESOURCE FRAME======== -->
 				<ResourceFrame version="any" id="B1:Common:Resources">
@@ -188,29 +188,29 @@ This example provides an example of encodeing TAP TSI  NRT  fares in NeTEx XML
 								</PurposeOfGrouping>
 							</values>
 						</ValueSet>
-						<ValueSet version="any" id="tapB1:TypeOfSalesPackage" nameOfClass="TypeOfSalesPackage">
+						<ValueSet version="any" id="tapB1:TypeOfSalesOfferPackage" nameOfClass="TypeOfSalesOfferPackage">
 							<!-- UIC      Common codes -->
-							<Name>Allowed values for TypeOfSalesPackagef  code list B.1.1
+							<Name>Allowed values for TypeOfSalesOfferPackagef  code list B.1.1
 Fare type </Name>
 							<values>
-								<TypeOfSalesPackage version="any" id="01">
+								<TypeOfSalesOfferPackage version="any" id="01">
 									<Name>TCV Full Fare</Name>
-								</TypeOfSalesPackage>
-								<TypeOfSalesPackage version="any" id="02">
+								</TypeOfSalesOfferPackage>
+								<TypeOfSalesOfferPackage version="any" id="02">
 									<Name>Distance Based Fare</Name>
-								</TypeOfSalesPackage>
-								<TypeOfSalesPackage version="any" id="03">
+								</TypeOfSalesOfferPackage>
+								<TypeOfSalesOfferPackage version="any" id="03">
 									<Name>Market Fare</Name>
-								</TypeOfSalesPackage>
-								<TypeOfSalesPackage version="any" id="04">
+								</TypeOfSalesOfferPackage>
+								<TypeOfSalesOfferPackage version="any" id="04">
 									<Name>Group Fare</Name>
-								</TypeOfSalesPackage>
-								<TypeOfSalesPackage version="any" id="05">
+								</TypeOfSalesOfferPackage>
+								<TypeOfSalesOfferPackage version="any" id="05">
 									<Name>Supplement</Name>
-								</TypeOfSalesPackage>
-								<TypeOfSalesPackage version="any" id="06">
+								</TypeOfSalesOfferPackage>
+								<TypeOfSalesOfferPackage version="any" id="06">
 									<Name>Surcharge</Name>
-								</TypeOfSalesPackage>
+								</TypeOfSalesOfferPackage>
 							</values>
 						</ValueSet>
 					</typesOfValue>
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 dfe70ccc2..19d9833c1 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
@@ -44,6 +44,9 @@ This example provides an example of encodeing TAP TSI  NRT  fares in NeTEx XML
 						</Codespace>
 					</codespaces>
 					<!-- TCVC 1080 Carriers  : NeTex Operators -->
+					<typesOfValue>
+						<TypeOfNotice id="TCVM" version="any"/>
+					</typesOfValue>
 					<organisations>
 						<Operator id="uic:1080" version="01">
 							<ValidBetween>
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 aff01f3b4..36248c2c5 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
@@ -38,6 +38,9 @@ This example provides an example of encodeing TAP TSI  NRT  fares in NeTEx XML
 				<ResourceFrame id="B1:TCVC@1080" version="any">
 					<Name>B.1 NRT fare based  example  for RU 1080 - Carriers</Name>
 					<!-- TCVC 1080 Carriers  : NeTex Operators -->
+					<typesOfValue>
+						<TypeOfNotice id="TCVM" version="any"/>
+					</typesOfValue>
 					<organisations>
 						<Operator id="1080" version="01" responsibilitySetRef="1080">
 							<validityConditions>
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 cb51f015a..28ca09ff9 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
@@ -303,7 +303,7 @@ V1.1 Extensively revised with improved ids and use of tarifffs.
 					<!--  === TARIFFS  ===  -->
 					<tariffs>
 						<Tariff id="tap:NRT_Standard" version="1.0">
-							<ValidBetween id="tap:Tariff01" version="1.0">
+							<ValidBetween id="tap:Tariff01a" version="1.0">
 								<FromDate>2011-01-01T00:00:00Z</FromDate>
 								<ToDate>2014-01-01T00:00:00Z</ToDate>
 							</ValidBetween>
diff --git a/examples/standards/tap_tsi/B2_IRT/Netex_tap_tsi_B2-71-optimised.xml b/examples/standards/tap_tsi/B2_IRT/Netex_tap_tsi_B2-71-optimised.deprec
similarity index 100%
rename from examples/standards/tap_tsi/B2_IRT/Netex_tap_tsi_B2-71-optimised.xml
rename to examples/standards/tap_tsi/B2_IRT/Netex_tap_tsi_B2-71-optimised.deprec
diff --git a/examples/standards/tap_tsi/Other/Netex_tap_trainhotel_1.xml b/examples/standards/tap_tsi/Other/Netex_tap_trainhotel_1.deprec
similarity index 100%
rename from examples/standards/tap_tsi/Other/Netex_tap_trainhotel_1.xml
rename to examples/standards/tap_tsi/Other/Netex_tap_trainhotel_1.deprec