diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd
index bda7b1766..16aa75c06 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd
@@ -334,9 +334,9 @@ Rail transport, Roads and Road transport
 			<xsd:documentation>Elements for properties of a SCHEDULED STOP POINT.</xsd:documentation>
 		</xsd:annotation>
 		<xsd:sequence>
-			<xsd:element name="VehicleModes" type="AllVehicleModesOfTransportListOfEnumerations" minOccurs="0">
+			<xsd:element name="VehicleModes" type="AllPublicTransportModesListOfEnumerations" minOccurs="0">
 				<xsd:annotation>
-					<xsd:documentation>TRANSPORT MODE or TRANPORT MODEs of STOP POINT.</xsd:documentation>
+					<xsd:documentation>PUBLIC TRANSPORT MODEs of STOP POINT.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element name="ForAlighting" type="xsd:boolean" minOccurs="0">
@@ -588,7 +588,7 @@ Rail transport, Roads and Road transport
 			<xsd:documentation>Type for a CONNECTION END.</xsd:documentation>
 		</xsd:annotation>
 		<xsd:sequence>
-			<xsd:element name="TransportMode" type="AllModesOfTransportEnumeration" minOccurs="0">
+			<xsd:element name="TransportMode" type="AllModesEnumeration" minOccurs="0">
 				<xsd:annotation>
 					<xsd:documentation>MODE of end Point of CONNECTION. Default is all modes, MODE of SCHEDULED STOP POINT can be derived.</xsd:documentation>
 				</xsd:annotation>
diff --git a/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd b/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd
index aa8750e3a..8266190ea 100644
--- a/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd
+++ b/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd
@@ -134,9 +134,9 @@ Rail transport, Roads and Road transport
 			<xsd:element ref="LineView" minOccurs="0"/>
 			<xsd:element ref="OperatorView" minOccurs="0"/>
 			<xsd:element ref="ServiceCalendarFrameRef" minOccurs="0"/>
-			<xsd:element name="DefaultMode" type="AllVehicleModesOfTransportEnumeration" minOccurs="0">
+			<xsd:element name="DefaultMode" type="AllPublicTransportModesEnumeration" minOccurs="0">
 				<xsd:annotation>
-					<xsd:documentation>Default VEHICLE MODE of TRANSPORT to use on JOURNEYs in TIMETABLE.</xsd:documentation>
+					<xsd:documentation>Default PT MODE to use on JOURNEYs in TIMETABLE.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element ref="JourneyAccountingRef" minOccurs="0"/>
@@ -154,9 +154,9 @@ Rail transport, Roads and Road transport
 			<xsd:documentation>Additional descriptive properties of TIMETABLE FRAME.</xsd:documentation>
 		</xsd:annotation>
 		<xsd:sequence>
-			<xsd:element name="VehicleModes" type="AllVehicleModesOfTransportListOfEnumerations" minOccurs="0">
+			<xsd:element name="VehicleModes" type="AllPublicTransportModesListOfEnumerations" minOccurs="0">
 				<xsd:annotation>
-					<xsd:documentation>Modes of VEHICLE JOURNEYs in timetable.</xsd:documentation>
+					<xsd:documentation>PT MODEs of VEHICLE JOURNEYs in timetable.</xsd:documentation>
 				</xsd:annotation>
 			</xsd:element>
 			<xsd:element name="HeadwayService" type="xsd:boolean" minOccurs="0">