diff --git a/xsd/netex_framework/netex_genericFramework/netex_alternativeName_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_alternativeName_version.xsd
index 0cd2ac0f6..1b9aad03f 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_alternativeName_version.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_alternativeName_version.xsd
@@ -89,37 +89,37 @@ Rail transport, Roads and Road transport
 							</xsd:element>
 							<xsd:element name="Lang" type="xsd:language" minOccurs="0">
 								<xsd:annotation>
-									<xsd:documentation>Language of the names.</xsd:documentation>
+									<xsd:documentation>Language of the ALTERNATIVE NAME.</xsd:documentation>
 								</xsd:annotation>
 							</xsd:element>
 							<xsd:element name="NameType" type="NameTypeEnumeration" default="alias" minOccurs="0">
 								<xsd:annotation>
-									<xsd:documentation>Type of Name - fixed value. Default is Alias.</xsd:documentation>
+									<xsd:documentation>Type of Name - fixed value. Default is alias.</xsd:documentation>
 								</xsd:annotation>
 							</xsd:element>
 							<xsd:element name="TypeOfName" type="xsd:normalizedString" minOccurs="0">
 								<xsd:annotation>
-									<xsd:documentation>Type of Nam - open.</xsd:documentation>
+									<xsd:documentation>Type of Name - open value.</xsd:documentation>
 								</xsd:annotation>
 							</xsd:element>
 							<xsd:element name="Name" type="MultilingualString">
 								<xsd:annotation>
-									<xsd:documentation>Name of the entity.</xsd:documentation>
+									<xsd:documentation>ALTERNATIVE NAME of the ENTITY.</xsd:documentation>
 								</xsd:annotation>
 							</xsd:element>
 							<xsd:element name="ShortName" type="MultilingualString" minOccurs="0">
 								<xsd:annotation>
-									<xsd:documentation>Short Name of the entity.</xsd:documentation>
+									<xsd:documentation>Short Name of the ENTITY.</xsd:documentation>
 								</xsd:annotation>
 							</xsd:element>
 							<xsd:element name="Abbreviation" type="MultilingualString" minOccurs="0">
 								<xsd:annotation>
-									<xsd:documentation>Abbreviation of the entity.</xsd:documentation>
+									<xsd:documentation>Abbreviation of the ENTITY.</xsd:documentation>
 								</xsd:annotation>
 							</xsd:element>
 							<xsd:element name="QualifierName" type="MultilingualString" minOccurs="0">
 								<xsd:annotation>
-									<xsd:documentation>Additional Qualifier of the ENTITY name.</xsd:documentation>
+									<xsd:documentation>Additional Qualifier of the ENTITY.</xsd:documentation>
 								</xsd:annotation>
 							</xsd:element>
 						</xsd:sequence>
@@ -158,37 +158,37 @@ Rail transport, Roads and Road transport
 					</xsd:element>
 					<xsd:element name="Lang" type="xsd:language" minOccurs="0">
 						<xsd:annotation>
-							<xsd:documentation>Language of the names.</xsd:documentation>
+							<xsd:documentation>Language of the ALTERNATIVE NAME.</xsd:documentation>
 						</xsd:annotation>
 					</xsd:element>
 					<xsd:element name="NameType" type="NameTypeEnumeration" default="alias" minOccurs="0">
 						<xsd:annotation>
-							<xsd:documentation>Type of Name - fixed value. Default is Alias.</xsd:documentation>
+							<xsd:documentation>Type of Name - fixed value. Default is alias.</xsd:documentation>
 						</xsd:annotation>
 					</xsd:element>
 					<xsd:element name="TypeOfName" type="xsd:normalizedString" minOccurs="0">
 						<xsd:annotation>
-							<xsd:documentation>Type of Nam - open.</xsd:documentation>
+							<xsd:documentation>Type of Name - open value.</xsd:documentation>
 						</xsd:annotation>
 					</xsd:element>
 					<xsd:element name="Name" type="MultilingualString">
 						<xsd:annotation>
-							<xsd:documentation>Name of the entity.</xsd:documentation>
+							<xsd:documentation>ALTERNATIVE NAME of the ENTITY.</xsd:documentation>
 						</xsd:annotation>
 					</xsd:element>
 					<xsd:element name="ShortName" type="MultilingualString" minOccurs="0">
 						<xsd:annotation>
-							<xsd:documentation>Short Name of the entity.</xsd:documentation>
+							<xsd:documentation>Short Name of the ENTITY.</xsd:documentation>
 						</xsd:annotation>
 					</xsd:element>
 					<xsd:element name="Abbreviation" type="MultilingualString" minOccurs="0">
 						<xsd:annotation>
-							<xsd:documentation>Abbreviation of the entity.</xsd:documentation>
+							<xsd:documentation>Abbreviation of the ENTITY.</xsd:documentation>
 						</xsd:annotation>
 					</xsd:element>
 					<xsd:element name="QualifierName" type="MultilingualString" minOccurs="0">
 						<xsd:annotation>
-							<xsd:documentation>Additional Qualifier of the ENTITY name.</xsd:documentation>
+							<xsd:documentation>Additional Qualifier of the ENTITY.</xsd:documentation>
 						</xsd:annotation>
 					</xsd:element>
 				</xsd:sequence>
diff --git a/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd
index 762a21846..7f6e6cbd5 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd
@@ -387,22 +387,22 @@ Rail transport, Roads and Road transport
 		<xsd:sequence>
 			<xsd:element name="Name" type="MultilingualString" minOccurs="0">
 				<xsd:annotation>
-					<xsd:documentation>Name of ORGANISATION PART.</xsd:documentation>
+					<xsd:documentation>NAME of ORGANISATION PART.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element name="ShortName" type="MultilingualString" minOccurs="0">
 				<xsd:annotation>
-					<xsd:documentation>Name of DEPARTMENT.</xsd:documentation>
+					<xsd:documentation>SHORT NAME of ORGANISATION PART.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element name="Description" type="MultilingualString" minOccurs="0">
 				<xsd:annotation>
-					<xsd:documentation>Description of ORGANISATIONAL UNIT.</xsd:documentation>
+					<xsd:documentation>Description of ORGANISATION PART.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element name="PublicCode" type="PublicCodeStructure" minOccurs="0">
 				<xsd:annotation>
-					<xsd:documentation>Additional public code used for department.</xsd:documentation>
+					<xsd:documentation>Additional public code used for ORGANISATION PART.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element ref="PrivateCode" minOccurs="0">
@@ -412,12 +412,12 @@ Rail transport, Roads and Road transport
 			</xsd:element>
 			<xsd:element name="ContactDetails" type="ContactStructure" minOccurs="0">
 				<xsd:annotation>
-					<xsd:documentation>Contact details for ORGANISATION PART for Public use.</xsd:documentation>
+					<xsd:documentation>Contact details for ORGANISATION PART for public use.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element name="Location" type="LocationStructure" minOccurs="0">
 				<xsd:annotation>
-					<xsd:documentation>Coordinates of ORGANISATIONAL UNIT.</xsd:documentation>
+					<xsd:documentation>Coordinates of ORGANISATION PART.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element ref="OrganisationRef_" minOccurs="0"/>
@@ -490,7 +490,7 @@ Rail transport, Roads and Road transport
 			<xsd:element ref="TypeOfOperationRef" minOccurs="0"/>
 			<xsd:element name="units" type="organisationalUnitRefs_RelStructure" minOccurs="0">
 				<xsd:annotation>
-					<xsd:documentation>Name of DEPARTMENT.</xsd:documentation>
+					<xsd:documentation>ORGANISATIONAL UNITs.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 		</xsd:sequence>
@@ -697,7 +697,7 @@ Rail transport, Roads and Road transport
 		<xsd:sequence>
 			<xsd:element name="PublicCode" type="PublicCodeStructure" minOccurs="0">
 				<xsd:annotation>
-					<xsd:documentation>Public Code assosociated with Zone</xsd:documentation>
+					<xsd:documentation>Public Code assosociated with ADMINISTRATIVE ZONE.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element ref="OrganisationRef_" minOccurs="0"/>
@@ -814,7 +814,11 @@ Rail transport, Roads and Road transport
 					<xsd:documentation>Description of CODESPACE ASSIGNMENT.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
-			<xsd:element ref="TypeOfCodespaceAssignmentRef" minOccurs="0"/>
+			<xsd:element ref="TypeOfCodespaceAssignmentRef" minOccurs="0">
+				<xsd:annotation>
+					<xsd:documentation>Reference to a TYPE OF CODESPACE ASSIGNMENT. +v1.1</xsd:documentation>
+				</xsd:annotation>
+			</xsd:element>
 		</xsd:sequence>
 	</xsd:group>
 	<xsd:group name="CodeRangeGroup">
diff --git a/xsd/netex_framework/netex_genericFramework/netex_projection_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_projection_version.xsd
index 9ba54a310..e80c15012 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_projection_version.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_projection_version.xsd
@@ -170,7 +170,7 @@ Rail transport, Roads and Road transport
 							</xsd:element>
 							<xsd:element name="Distance" type="LengthType" minOccurs="0">
 								<xsd:annotation>
-									<xsd:documentation>Distance along link to which point p[projects.</xsd:documentation>
+									<xsd:documentation>Distance along link to which point projects.</xsd:documentation>
 								</xsd:annotation>
 							</xsd:element>
 						</xsd:sequence>
@@ -325,7 +325,7 @@ Rail transport, Roads and Road transport
 							</xsd:element>
 							<xsd:element name="Distance" type="DistanceType" minOccurs="0">
 								<xsd:annotation>
-									<xsd:documentation>Distance Travelled.</xsd:documentation>
+									<xsd:documentation>Length of line along LINKs in LINK SEQUENCE.</xsd:documentation>
 								</xsd:annotation>
 							</xsd:element>
 							<xsd:group ref="LinkSequenceProjectionGroup" minOccurs="0"/>
@@ -421,7 +421,7 @@ Rail transport, Roads and Road transport
 		<xsd:sequence>
 			<xsd:element name="ProjectedFeartureRef" type="ComplexFeatureRefStructure">
 				<xsd:annotation>
-					<xsd:documentation>COMPLEX FEATURE which is being projetced.</xsd:documentation>
+					<xsd:documentation>COMPLEX FEATURE which is being projected.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element name="OntoFeatureRef" type="ComplexFeatureRefStructure" minOccurs="0">
diff --git a/xsd/netex_framework/netex_genericFramework/netex_zoneProjection_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_zoneProjection_version.xsd
index f09ea9cca..c3c3fa0ec 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_zoneProjection_version.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_zoneProjection_version.xsd
@@ -79,12 +79,12 @@ Rail transport, Roads and Road transport
 						<xsd:sequence>
 							<xsd:element name="ProjectedZoneRef" type="ZoneRefStructure">
 								<xsd:annotation>
-									<xsd:documentation>Reference to ZONE to which ZONE projects.</xsd:documentation>
+									<xsd:documentation>Reference to ZONE being projected.</xsd:documentation>
 								</xsd:annotation>
 							</xsd:element>
 							<xsd:element name="ProjectToZoneRef" type="ZoneRefStructure" minOccurs="0">
 								<xsd:annotation>
-									<xsd:documentation>Reference to ZONE onto to which ZONE projects.</xsd:documentation>
+									<xsd:documentation>Reference to ZONE onto which the ZONE projects.</xsd:documentation>
 								</xsd:annotation>
 							</xsd:element>
 							<xsd:element name="ProjectToPointRef" type="PointRefStructure" minOccurs="0">
diff --git a/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd b/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd
index ed4e4fc97..8a4cc4bac 100644
--- a/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd
@@ -225,12 +225,12 @@ Rail transport, Roads and Road transport
 		<xsd:sequence>
 			<xsd:element name="Name" type="MultilingualString" minOccurs="0">
 				<xsd:annotation>
-					<xsd:documentation>Explanation of RESPONSIBILITY ROLE.</xsd:documentation>
+					<xsd:documentation>Name of RESPONSIBILITY ROLE.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element name="Description" type="MultilingualString" minOccurs="0">
 				<xsd:annotation>
-					<xsd:documentation>Explanation of REsponsibility RoleSET.</xsd:documentation>
+					<xsd:documentation>Description of RESPONSIBILITY ROLE.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element ref="TypeOfResponsibilityRoleRef" minOccurs="0"/>
@@ -301,7 +301,7 @@ Rail transport, Roads and Road transport
 					<xsd:documentation>Responsible ORGANISATION PART.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
-			<xsd:element name="ResponsibleAreaRef" type="VersionOfObjectRefStructure" minOccurs="0">
+			<xsd:element name="ResponsibleAreaRef" type="AdministrativeZoneRefStructure" minOccurs="0">
 				<xsd:annotation>
 					<xsd:documentation>Administrative area to which this RESPONSIBILITY SET is assigned.</xsd:documentation>
 				</xsd:annotation>
diff --git a/xsd/netex_framework/netex_responsibility/netex_typeOfValue_version.xsd b/xsd/netex_framework/netex_responsibility/netex_typeOfValue_version.xsd
index 1e8907973..b6d3662b2 100644
--- a/xsd/netex_framework/netex_responsibility/netex_typeOfValue_version.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_typeOfValue_version.xsd
@@ -86,7 +86,7 @@ Rail transport, Roads and Road transport
 		</xsd:complexContent>
 	</xsd:complexType>
 	<!-- ======================================================================= -->
-	<xsd:complexType name="typesOfValueStructure">
+	<xsd:complexType name="typesOfValue_RelStructure">
 		<xsd:annotation>
 			<xsd:documentation>Type for a list of  TYPEs OF VALUE.</xsd:documentation>
 		</xsd:annotation>
@@ -211,7 +211,7 @@ Rail transport, Roads and Road transport
 					<xsd:documentation>Name of Value.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
-			<xsd:element name="values" type="typesOfValueStructure" minOccurs="0">
+			<xsd:element name="values" type="typesOfValue_RelStructure" minOccurs="0">
 				<xsd:annotation>
 					<xsd:documentation>Values in Set.</xsd:documentation>
 				</xsd:annotation>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_address_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_address_version.xsd
index 6eb9f300f..275935eb7 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_address_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_address_version.xsd
@@ -110,7 +110,7 @@ Rail transport, Roads and Road transport
 			<xsd:element ref="CountryRef" minOccurs="0"/>
 			<xsd:element name="CountryName" type="MultilingualString" minOccurs="0">
 				<xsd:annotation>
-					<xsd:documentation>Name of Counntry, derivedable from Country Ref.</xsd:documentation>
+					<xsd:documentation>Name of Counntry, deriveable from CountryRef.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 		</xsd:sequence>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd
index e131100ab..b50c3269c 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd
@@ -383,7 +383,7 @@ Rail transport, Roads and Road transport
 		<xsd:sequence>
 			<xsd:element name="authorityTypes" type="typeOfOrganisationRefs_RelStructure" minOccurs="0">
 				<xsd:annotation>
-					<xsd:documentation>Classification of Zone. Used for arbitrary documentation -.</xsd:documentation>
+					<xsd:documentation>Classification of AUTHORITY.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 		</xsd:sequence>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicle_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicle_version.xsd
index 35561d7d8..dc289283d 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_vehicle_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicle_version.xsd
@@ -229,7 +229,7 @@ Rail transport, Roads and Road transport
 			</xsd:element>
 			<xsd:element name="RegistrationNumber" type="xsd:normalizedString" minOccurs="0">
 				<xsd:annotation>
-					<xsd:documentation>Licence plate of VEHICLE.</xsd:documentation>
+					<xsd:documentation>Registration number of VEHICLE.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element name="RegistrationDate" type="xsd:date" minOccurs="0">
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd
index e02bf44d1..1d38efee1 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd
@@ -610,17 +610,22 @@ contained within its parent QUAY.</xsd:documentation>
 							</xsd:element>
 							<xsd:element name="Lang" type="xsd:language" minOccurs="0">
 								<xsd:annotation>
-									<xsd:documentation>Language of the names.</xsd:documentation>
+									<xsd:documentation>Language of the ALTERNATIVE NAME.</xsd:documentation>
 								</xsd:annotation>
 							</xsd:element>
-							<xsd:element name="TypeOfName" type="xsd:normalizedString">
+							<xsd:element name="NameType" type="NameTypeEnumeration" default="alias" minOccurs="0">
 								<xsd:annotation>
-									<xsd:documentation>Type of Name.</xsd:documentation>
+									<xsd:documentation>Type of Name - fixed value. Default is alias.</xsd:documentation>
+								</xsd:annotation>
+							</xsd:element>
+							<xsd:element name="TypeOfName" type="xsd:normalizedString" minOccurs="0">
+								<xsd:annotation>
+									<xsd:documentation>Type of Name - open value.</xsd:documentation>
 								</xsd:annotation>
 							</xsd:element>
 							<xsd:element name="Name" type="MultilingualString">
 								<xsd:annotation>
-									<xsd:documentation>Name of the entity.</xsd:documentation>
+									<xsd:documentation>ALTERNATIVE NAME of the entity.</xsd:documentation>
 								</xsd:annotation>
 							</xsd:element>
 							<xsd:element name="ShortName" type="MultilingualString" minOccurs="0">
@@ -635,7 +640,7 @@ contained within its parent QUAY.</xsd:documentation>
 							</xsd:element>
 							<xsd:element name="QualifierName" type="MultilingualString" minOccurs="0">
 								<xsd:annotation>
-									<xsd:documentation>Additional Qualifier of the ENTITY name.</xsd:documentation>
+									<xsd:documentation>Additional Qualifier of the ENTITY.</xsd:documentation>
 								</xsd:annotation>
 							</xsd:element>
 						</xsd:sequence>