From 25da9ef57f7725f15cee54304c16cbeb9db01869 Mon Sep 17 00:00:00 2001
From: Cristoffer Solem <cristoffer.solem@gmail.com>
Date: Tue, 3 Apr 2018 14:28:21 +0200
Subject: [PATCH 1/4] See #13 Rename all xsd files (and references to them) to
 not have version suffixes

---
 xsd/NX.xsd                                    |   4 +-
 xsd/NeTEx_publication-NoConstraint.xsd        |   4 +-
 xsd/NeTEx_publication.xsd                     |   4 +-
 xsd/NeTEx_publication_timetable.xsd           |  18 ++--
 xsd/NeTEx_siri.xsd                            |   4 +-
 xsd/ifopt.xsd                                 |   2 +-
 ....0.xsd => netex_all_objects_framework.xsd} |   6 +-
 ...v1.0.xsd => netex_all_objects_generic.xsd} | 100 +++++++++---------
 ...1.0.xsd => netex_all_frames_framework.xsd} |  12 +--
 ...v1.0.xsd => netex_commonFrame_version.xsd} |   4 +-
 ...0.xsd => netex_compositeFrame_version.xsd} |   4 +-
 ...1.0.xsd => netex_generalFrame_version.xsd} |   8 +-
 ....0.xsd => netex_resourceFrame_support.xsd} |   4 +-
 ....1.xsd => netex_resourceFrame_version.xsd} |   8 +-
 ...=> netex_serviceCalendarFrame_support.xsd} |   4 +-
 ...=> netex_serviceCalendarFrame_version.xsd} |   6 +-
 ...-v1.1.xsd => netex_acsb_accessibility.xsd} |   6 +-
 ...x_acsb_all-v1.0.xsd => netex_acsb_all.xsd} |   8 +-
 ...ns-v1.0.xsd => netex_acsb_limitations.xsd} |   0
 ...0.xsd => netex_acsb_passengerMobility.xsd} |   6 +-
 ...upport-v1.0.xsd => netex_acsb_support.xsd} |   4 +-
 ....xsd => netex_alternativeName_support.xsd} |   4 +-
 ....xsd => netex_alternativeName_version.xsd} |   6 +-
 ...-v1.0.xsd => netex_assignment_support.xsd} |   4 +-
 ...-v1.0.xsd => netex_assignment_version.xsd} |   6 +-
 ...rt-v1.0.xsd => netex_grouping_support.xsd} |   4 +-
 ...on-v1.1.xsd => netex_grouping_version.xsd} |   8 +-
 ...pport-v1.0.xsd => netex_layer_support.xsd} |   4 +-
 ...rsion-v1.0.xsd => netex_layer_version.xsd} |  10 +-
 ...rt-v1.1.xsd => netex_loggable_support.xsd} |   4 +-
 ...on-v1.1.xsd => netex_loggable_version.xsd} |   6 +-
 ...1.1.xsd => netex_organisation_support.xsd} |   8 +-
 ...1.1.xsd => netex_organisation_version.xsd} |  12 +--
 ...pport-v1.0.xsd => netex_place_support.xsd} |   4 +-
 ...rsion-v1.1.xsd => netex_place_version.xsd} |   8 +-
 ...=> netex_pointAndLinkSequence_support.xsd} |   6 +-
 ...=> netex_pointAndLinkSequence_version.xsd} |   8 +-
 ...1.1.xsd => netex_pointAndLink_support.xsd} |   6 +-
 ...1.1.xsd => netex_pointAndLink_version.xsd} |  12 +--
 ...-v1.0.xsd => netex_projection_support.xsd} |   4 +-
 ...-v1.0.xsd => netex_projection_version.xsd} |  10 +-
 ...ort-v1.1.xsd => netex_section_support.xsd} |   4 +-
 ...ion-v1.1.xsd => netex_section_version.xsd} |   8 +-
 ...0.xsd => netex_spatialFeature_support.xsd} |   4 +-
 ...0.xsd => netex_spatialFeature_version.xsd} |   6 +-
 ...0.xsd => netex_zoneProjection_version.xsd} |   4 +-
 ...upport-v1.0.xsd => netex_zone_support.xsd} |   4 +-
 ...ersion-v1.1.xsd => netex_zone_version.xsd} |   6 +-
 ...k-v1.0.xsd => netex_payload_framework.xsd} |   2 +-
 ....xsd => netex_alternativeText_support.xsd} |   4 +-
 ....xsd => netex_alternativeText_version.xsd} |   6 +-
 ...-v1.0.xsd => netex_dataSource_version.xsd} |   4 +-
 ...ntity-v1.0.xsd => netex_entity_entity.xsd} |   6 +-
 ...port-v1.0.xsd => netex_entity_support.xsd} |   2 +-
 ...sion-v1.0.xsd => netex_entity_version.xsd} |   4 +-
 ...onship-v1.0.xsd => netex_relationship.xsd} |   4 +-
 ...1.1.xsd => netex_relationship_support.xsd} |   4 +-
 ...sd => netex_responsibilitySet_version.xsd} |   4 +-
 ...1.xsd => netex_responsibility_support.xsd} |   4 +-
 ...1.xsd => netex_responsibility_version.xsd} |  10 +-
 ...v1.0.xsd => netex_typeOfValue_version.xsd} |   4 +-
 ...sd => netex_validityCondition_support.xsd} |   4 +-
 ...sd => netex_validityCondition_version.xsd} |   6 +-
 ...1.0.xsd => netex_versionDelta_version.xsd} |   4 +-
 ...1.0.xsd => netex_versionFrame_support.xsd} |   4 +-
 ...1.0.xsd => netex_versionFrame_version.xsd} |  12 +--
 ...ort-v1.1.xsd => netex_version_support.xsd} |   4 +-
 ...ion-v1.1.xsd => netex_version_version.xsd} |  10 +-
 ...sion-v1.0.xsd => netex_access_version.xsd} |   6 +-
 ...-v1.0.xsd => netex_accounting_version.xsd} |   0
 ...ort-v1.0.xsd => netex_address_support.xsd} |   4 +-
 ...ion-v1.1.xsd => netex_address_version.xsd} |  10 +-
 ...ex_all_objects_reusableComponents-v1.0.xsd |  45 --------
 .../netex_all_objects_reusableComponents.xsd  |  45 ++++++++
 ...> netex_availabilityCondition_support.xsd} |   4 +-
 ...> netex_availabilityCondition_version.xsd} |   6 +-
 ...ort-v1.1.xsd => netex_country_support.xsd} |   4 +-
 ...ion-v1.1.xsd => netex_country_version.xsd} |   8 +-
 ....xsd => netex_dayType_propertiesOfDay.xsd} |   8 +-
 ...ort-v1.0.xsd => netex_dayType_support.xsd} |   6 +-
 ...ion-v1.0.xsd => netex_dayType_version.xsd} |  10 +-
 ...0.xsd => netex_equipmentPlace_version.xsd} |   6 +-
 ...tex_equipmentVehiclePassenger_support.xsd} |   4 +-
 ...tex_equipmentVehiclePassenger_version.xsd} |  14 +--
 ...t-v1.0.xsd => netex_equipment_support.xsd} |   4 +-
 ...n-v1.0.xsd => netex_equipment_version.xsd} |   8 +-
 ...v1.0.xsd => netex_facilityUic_support.xsd} |   4 +-
 ...v1.0.xsd => netex_facilityUic_version.xsd} |   4 +-
 ...rt-v1.1.xsd => netex_facility_support.xsd} |   4 +-
 ...on-v1.0.xsd => netex_facility_version.xsd} |  10 +-
 ...v1.0.xsd => netex_linkByValue_support.xsd} |   6 +-
 ...upport-v1.0.xsd => netex_mode_support.xsd} |   4 +-
 ...ersion-v1.0.xsd => netex_mode_version.xsd} |   8 +-
 ...xsd => netex_noticeAssignment_version.xsd} |  12 +--
 ...port-v1.0.xsd => netex_notice_support.xsd} |   4 +-
 ...sion-v1.1.xsd => netex_notice_version.xsd} |   6 +-
 ...sd => netex_otherOrganisation_support.xsd} |   4 +-
 ...sd => netex_otherOrganisation_version.xsd} |  10 +-
 ...1.0.xsd => netex_schematicMap_support.xsd} |   4 +-
 ...1.0.xsd => netex_schematicMap_version.xsd} |  10 +-
 ...1.1.xsd => netex_securityList_support.xsd} |   6 +-
 ...1.1.xsd => netex_securityList_version.xsd} |   8 +-
 ....xsd => netex_serviceCalendar_support.xsd} |   4 +-
 ....xsd => netex_serviceCalendar_version.xsd} |   8 +-
 ...ion-v1.1.xsd => netex_submode_version.xsd} |   4 +-
 ...xsd => netex_topographicPlace_support.xsd} |   6 +-
 ...xsd => netex_topographicPlace_version.xsd} |   8 +-
 ...1.0.xsd => netex_trainElement_support.xsd} |   4 +-
 ...1.1.xsd => netex_trainElement_version.xsd} |   8 +-
 ...> netex_transportOrganisation_support.xsd} |   4 +-
 ...> netex_transportOrganisation_version.xsd} |  10 +-
 ...1.0.xsd => netex_travelRights_support.xsd} |   4 +-
 ...1.1.xsd => netex_travelRights_version.xsd} |   8 +-
 ...v1.0.xsd => netex_vehicleType_support.xsd} |   4 +-
 ...v1.1.xsd => netex_vehicleType_version.xsd} |   8 +-
 ...ypes-v1.0.xsd => netex_location_types.xsd} |   4 +-
 .../{netex_units-v1.0.xsd => netex_units.xsd} |   2 +-
 ...act-v1.0.xsd => netex_utility_contact.xsd} |   6 +-
 ...y_time-v1.0.xsd => netex_utility_time.xsd} |   2 +-
 ...types-v1.1.xsd => netex_utility_types.xsd} |   2 +-
 ...ity_xml-v1.0.xsd => netex_utility_xml.xsd} |   2 +-
 ...t1-v1.0.xsd => netex_all_frames_part1.xsd} |   6 +-
 ...netex_all_objects_infrastructureFrame.xsd} |   0
 ...1-v1.0.xsd => netex_all_objects_part1.xsd} |   8 +-
 ... => netex_infrastructureFrame_version.xsd} |  10 +-
 ...n-v1.1.xsd => netex_siteFrame_version.xsd} |  12 +--
 ...sd => netex_assistanceBooking_support.xsd} |   4 +-
 ...sd => netex_assistanceBooking_version.xsd} |  14 +--
 ...s-v1.0.xsd => netex_ifopt_all_objects.xsd} |  40 +++----
 ...> netex_ifopt_checkConstraint_support.xsd} |   4 +-
 ...> netex_ifopt_checkConstraint_version.xsd} |  12 +--
 ...> netex_ifopt_equipmentAccess_support.xsd} |   4 +-
 ...> netex_ifopt_equipmentAccess_version.xsd} |   8 +-
 ...-v1.0.xsd => netex_ifopt_equipmentAll.xsd} |  40 +++----
 ... netex_ifopt_equipmentParking_support.xsd} |   4 +-
 ... netex_ifopt_equipmentParking_version.xsd} |   6 +-
 ...etex_ifopt_equipmentPassenger_support.xsd} |   4 +-
 ...etex_ifopt_equipmentPassenger_version.xsd} |  10 +-
 ...=> netex_ifopt_equipmentSigns_support.xsd} |   4 +-
 ...=> netex_ifopt_equipmentSigns_version.xsd} |   8 +-
 ...etex_ifopt_equipmentTicketing_support.xsd} |   4 +-
 ...etex_ifopt_equipmentTicketing_version.xsd} |  10 +-
 ... netex_ifopt_equipmentWaiting_support.xsd} |   4 +-
 ... netex_ifopt_equipmentWaiting_version.xsd} |   8 +-
 ...netex_ifopt_flexibleStopPlace_support.xsd} |   4 +-
 ...netex_ifopt_flexibleStopPlace_version.xsd} |   8 +-
 ..._ifopt_localServiceCommercial_support.xsd} |   4 +-
 ..._ifopt_localServiceCommercial_version.xsd} |   6 +-
 ...d => netex_ifopt_localService_support.xsd} |   4 +-
 ...d => netex_ifopt_localService_version.xsd} |  18 ++--
 ...=> netex_ifopt_navigationPath_version.xsd} |  14 +--
 ....1.xsd => netex_ifopt_parking_support.xsd} |   4 +-
 ....1.xsd => netex_ifopt_parking_version.xsd} |   8 +-
 ...-v1.0.xsd => netex_ifopt_path_support.xsd} |   6 +-
 ...-v1.0.xsd => netex_ifopt_path_version.xsd} |   8 +-
 ...> netex_ifopt_pointOfInterest_support.xsd} |   4 +-
 ...> netex_ifopt_pointOfInterest_version.xsd} |   6 +-
 ...=> netex_ifopt_serviceFeature_support.xsd} |   4 +-
 ...=> netex_ifopt_serviceFeature_version.xsd} |   6 +-
 ...-v1.0.xsd => netex_ifopt_site_support.xsd} |   6 +-
 ...-v1.0.xsd => netex_ifopt_site_version.xsd} |  24 ++---
 ....xsd => netex_ifopt_stopPlace_support.xsd} |   8 +-
 ....xsd => netex_ifopt_stopPlace_version.xsd} |  24 ++---
 ...> netex_ifopt_vehicleStopping_support.xsd} |   4 +-
 ...-v1.0.xsd => netex_activation_support.xsd} |   8 +-
 ...-v1.0.xsd => netex_activation_version.xsd} |  12 +--
 ...ts_part1_infrastructureFrame_contents.xsd} |  18 ++--
 ...netex_all_objects_part1_lineRoute-v1.0.xsd |  18 ----
 .../netex_all_objects_part1_lineRoute.xsd     |  18 ++++
 ..._all_objects_part1_networkDescription.xsd} |   6 +-
 ....xsd => netex_flexibleNetwork_support.xsd} |   8 +-
 ....xsd => netex_flexibleNetwork_version.xsd} |  14 +--
 ...v1.1.xsd => netex_lineNetwork_support.xsd} |   8 +-
 ...v1.1.xsd => netex_lineNetwork_version.xsd} |  10 +-
 ...upport-v1.1.xsd => netex_line_support.xsd} |   6 +-
 ...ersion-v1.1.xsd => netex_line_version.xsd} |  26 ++---
 ...> netex_networkInfrastructure_support.xsd} |   6 +-
 ...> netex_networkInfrastructure_version.xsd} |   8 +-
 ...d => netex_networkRestriction_support.xsd} |   8 +-
 ...d => netex_networkRestriction_version.xsd} |  10 +-
 ...xsd => netex_routeInstruction_support.xsd} |   6 +-
 ...xsd => netex_routeInstruction_version.xsd} |  10 +-
 ...pport-v1.1.xsd => netex_route_support.xsd} |   8 +-
 ...rsion-v1.1.xsd => netex_route_version.xsd} |  12 +--
 ....1.xsd => netex_timingPattern_support.xsd} |   8 +-
 ... => netex_vehicleAndCrewPoint_support.xsd} |   8 +-
 ... => netex_vehicleAndCrewPoint_version.xsd} |  12 +--
 ...ll_objects_part1_tacticalPlanning-v1.0.xsd |  33 ------
 ...tex_all_objects_part1_tacticalPlanning.xsd |  33 ++++++
 ....1.xsd => netex_commonSection_support.xsd} |   4 +-
 ....1.xsd => netex_commonSection_version.xsd} |   6 +-
 ...rt-v1.1.xsd => netex_fareZone_support.xsd} |   6 +-
 ...on-v1.1.xsd => netex_fareZone_version.xsd} |  10 +-
 ...> netex_journeyPatternTimings_support.xsd} |   6 +-
 ...> netex_journeyPatternTimings_version.xsd} |  10 +-
 ...0.xsd => netex_journeyPattern_support.xsd} |   6 +-
 ...1.xsd => netex_journeyPattern_version.xsd} |  10 +-
 ....0.xsd => netex_journeyTiming_support.xsd} |   6 +-
 ....0.xsd => netex_journeyTiming_version.xsd} |  18 ++--
 ...passengerInformationEquipment_support.xsd} |   6 +-
 ...passengerInformationEquipment_version.xsd} |  20 ++--
 ...0.xsd => netex_pathAssignment_version.xsd} |   4 +-
 ...sd => netex_routingConstraint_support.xsd} |   8 +-
 ...sd => netex_routingConstraint_version.xsd} |   8 +-
 ...1.xsd => netex_servicePattern_support.xsd} |  10 +-
 ...1.xsd => netex_servicePattern_version.xsd} |  16 +--
 ...0.xsd => netex_siteConnection_support.xsd} |   6 +-
 ...0.xsd => netex_siteConnection_version.xsd} |  14 +--
 ...0.xsd => netex_stopAssignment_support.xsd} |   4 +-
 ...1.xsd => netex_stopAssignment_version.xsd} |  12 +--
 ...0.xsd => netex_timeDemandType_support.xsd} |   8 +-
 ...0.xsd => netex_timeDemandType_version.xsd} |  14 +--
 ....1.xsd => netex_timingPattern_version.xsd} |  12 +--
 ...t2-v1.0.xsd => netex_all_frames_part2.xsd} |  18 ++--
 ...2-v1.0.xsd => netex_all_objects_part2.xsd} |  16 +--
 ... => netex_driverScheduleFrame_version.xsd} |   6 +-
 ...1.1.xsd => netex_serviceFrame_version.xsd} |   8 +-
 ...0.xsd => netex_timetableFrame_support.xsd} |   6 +-
 ...0.xsd => netex_timetableFrame_version.xsd} |  10 +-
 ...=> netex_vehicleScheduleFrame_version.xsd} |   8 +-
 ...ex_all_objects_part2_journeyTimes-v1.0.xsd |  27 -----
 .../netex_all_objects_part2_journeyTimes.xsd  |  27 +++++
 ...upport-v1.0.xsd => netex_call_support.xsd} |   6 +-
 ...ersion-v1.1.xsd => netex_call_version.xsd} |  22 ++--
 ...1.xsd => netex_coupledJourney_support.xsd} |   6 +-
 ...1.xsd => netex_coupledJourney_version.xsd} |  10 +-
 ...sd => netex_datedPassingTimes_version.xsd} |   6 +-
 ... => netex_datedVehicleJourney_support.xsd} |   4 +-
 ... => netex_datedVehicleJourney_version.xsd} |  12 +--
 ....xsd => netex_flexibleService_support.xsd} |   6 +-
 ....xsd => netex_flexibleService_version.xsd} |  12 +--
 ....xsd => netex_interchangeRule_version.xsd} |  10 +-
 ...v1.0.xsd => netex_interchange_support.xsd} |   8 +-
 ...v1.1.xsd => netex_interchange_version.xsd} |  16 +--
 ...sd => netex_journeyAccounting_support.xsd} |   8 +-
 ...sd => netex_journeyAccounting_version.xsd} |  10 +-
 ...sd => netex_journeyDesignator_support.xsd} |  12 +--
 ...ion-v1.1.xsd => netex_journey_version.xsd} |  16 +--
 ...1.0.xsd => netex_passingTimes_support.xsd} |   6 +-
 ...1.1.xsd => netex_passingTimes_version.xsd} |  12 +--
 ...0.xsd => netex_serviceJourney_support.xsd} |   4 +-
 ...1.xsd => netex_serviceJourney_version.xsd} |  16 +--
 ...v1.0.xsd => netex_serviceView_version.xsd} |   2 +-
 ...sd => netex_timeDemandProfile_version.xsd} |  10 +-
 ....xsd => netex_timeDemandTimes_version.xsd} |   8 +-
 ...netex_vehicleJourneyFrequency_support.xsd} |   4 +-
 ...netex_vehicleJourneyFrequency_version.xsd} |  12 +--
 ... => netex_vehicleJourneyTimes_support.xsd} |   4 +-
 ... => netex_vehicleJourneyTimes_version.xsd} |  12 +--
 ...0.xsd => netex_vehicleJourney_support.xsd} |   8 +-
 ...1.xsd => netex_vehicleJourney_version.xsd} |  24 ++---
 ...0.xsd => netex_vehicleService_support.xsd} |   6 +-
 ...etex_all_objects_part2_vehicleService.xsd} |  16 +--
 ...upport-v1.0.xsd => netex_duty_support.xsd} |   6 +-
 ...ersion-v1.0.xsd => netex_duty_version.xsd} |  14 +--
 ...1.xsd => netex_vehicleService_version.xsd} |  16 +--
 ...sd => netex_all_objects_part3_piQuery.xsd} |   2 +-
 ...ort-v1.0.xsd => netex_piQuery_support.xsd} |   6 +-
 ...t-v1.1.xsd => netex_piRequest_support.xsd} |   6 +-
 ...=> netex_accessRightParameter_support.xsd} |   8 +-
 ...=> netex_accessRightParameter_version.xsd} |  58 +++++-----
 ....xsd => netex_all_objects_part3_fares.xsd} |   8 +-
 ...d => netex_all_objects_part3_fares_AR.xsd} |  46 ++++----
 ...d => netex_all_objects_part3_fares_FP.xsd} |  12 +--
 ...d => netex_all_objects_part3_fares_FS.xsd} |  32 +++---
 ...d => netex_all_objects_part3_fares_SD.xsd} |  12 +--
 ...> netex_calculationParameters_support.xsd} |   8 +-
 ...> netex_calculationParameters_version.xsd} |   8 +-
 ...> netex_distanceMatrixElement_support.xsd} |   8 +-
 ...> netex_distanceMatrixElement_version.xsd} |  10 +-
 ...=> netex_fareConditionSummary_support.xsd} |   4 +-
 ...=> netex_fareConditionSummary_version.xsd} |   8 +-
 ...t-v1.0.xsd => netex_farePrice_support.xsd} |   6 +-
 ...n-v1.1.xsd => netex_farePrice_version.xsd} |  16 +--
 ...v1.0.xsd => netex_fareProduct_support.xsd} |   6 +-
 ...v1.1.xsd => netex_fareProduct_version.xsd} |  14 +--
 ...-v1.0.xsd => netex_fareSeries_support.xsd} |   6 +-
 ...-v1.0.xsd => netex_fareSeries_version.xsd} |  10 +-
 ...=> netex_fareStructureElement_support.xsd} |   6 +-
 ...=> netex_fareStructureElement_version.xsd} |  12 +--
 ....0.xsd => netex_fareStructure_support.xsd} |   6 +-
 ....0.xsd => netex_fareStructure_version.xsd} |   8 +-
 ...t-v1.0.xsd => netex_fareTable_support.xsd} |   8 +-
 ...n-v1.1.xsd => netex_fareTable_version.xsd} |  44 ++++----
 ...tex_geographicStructureFactor_support.xsd} |   6 +-
 ...tex_geographicStructureFactor_version.xsd} |  14 +--
 ... netex_qualityStructureFactor_support.xsd} |   6 +-
 ... netex_qualityStructureFactor_version.xsd} |  18 ++--
 ...sd => netex_salesDistribution_support.xsd} |   6 +-
 ...sd => netex_salesDistribution_version.xsd} |  16 +--
 ...1.0.xsd => netex_salesPackage_support.xsd} |   8 +-
 ...1.0.xsd => netex_salesPackage_version.xsd} |  12 +--
 ... => netex_timeStructureFactor_support.xsd} |   6 +-
 ... => netex_timeStructureFactor_version.xsd} |  12 +--
 ...1.xsd => netex_travelDocument_support.xsd} |   8 +-
 ...1.xsd => netex_travelDocument_version.xsd} |  10 +-
 ...etex_usageParameterAfterSales_support.xsd} |   6 +-
 ...etex_usageParameterAfterSales_version.xsd} |  12 +--
 ...> netex_usageParameterBooking_support.xsd} |   6 +-
 ...> netex_usageParameterBooking_version.xsd} |  12 +--
 ... netex_usageParameterCharging_support.xsd} |   4 +-
 ... netex_usageParameterCharging_version.xsd} |   6 +-
 ...tex_usageParameterEligibility_support.xsd} |   4 +-
 ...tex_usageParameterEligibility_version.xsd} |   8 +-
 ...tex_usageParameterEntitlement_support.xsd} |   4 +-
 ...tex_usageParameterEntitlement_version.xsd} |   8 +-
 ...> netex_usageParameterLuggage_support.xsd} |   4 +-
 ...> netex_usageParameterLuggage_version.xsd} |   6 +-
 ...=> netex_usageParameterTravel_support.xsd} |   4 +-
 ...=> netex_usageParameterTravel_version.xsd} |   8 +-
 ...0.xsd => netex_usageParameter_support.xsd} |   6 +-
 ...0.xsd => netex_usageParameter_version.xsd} |  12 +--
 ...d => netex_usageParametersAll_support.xsd} |  14 +--
 ...xsd => netex_validableElement_support.xsd} |   6 +-
 ...xsd => netex_validableElement_version.xsd} |  10 +-
 ...t3-v1.0.xsd => netex_all_frames_part3.xsd} |   4 +-
 ...n-v1.0.xsd => netex_fareFrame_version.xsd} |  14 +--
 ...> netex_salesTransactionFrame_version.xsd} |  10 +-
 ...=> netex_all_objects_part3_monitoring.xsd} |   6 +-
 ....0.xsd => netex_monitoredCall_version.xsd} |  10 +-
 ...> netex_monitoredPassingTimes_version.xsd} |   6 +-
 ...netex_monitoredVehicleJourney_support.xsd} |   6 +-
 ...sd => netex_all_objects_part3_parking.xsd} |   4 +-
 ....1.xsd => netex_parkingTariff_support.xsd} |   6 +-
 ....1.xsd => netex_parkingTariff_version.xsd} |  10 +-
 ...x_all_objects_part3_salesTransactions.xsd} |  20 ++--
 ... => netex_customerEligibility_support.xsd} |   6 +-
 ... => netex_customerEligibility_version.xsd} |  12 +--
 ...netex_customerPurchasePackage_support.xsd} |   8 +-
 ...netex_customerPurchasePackage_version.xsd} |  18 ++--
 ...xsd => netex_retailConsortium_support.xsd} |  10 +-
 ...xsd => netex_retailConsortium_version.xsd} |  16 +--
 ....1.xsd => netex_salesContract_support.xsd} |   8 +-
 ....1.xsd => netex_salesContract_version.xsd} |  18 ++--
 ...xsd => netex_salesTransaction_support.xsd} |   8 +-
 ...xsd => netex_salesTransaction_version.xsd} |  14 +--
 .../{netex_all-v1.0.xsd => netex_all.xsd}     |  18 ++--
 ...filters-v1.0.xsd => netex_all_filters.xsd} |  14 +--
 ...sd => netex_dataObjectRequest_service.xsd} |   8 +-
 ..._frame-v1.0.xsd => netex_filter_frame.xsd} |  10 +-
 ...bject-v1.0.xsd => netex_filter_object.xsd} |  18 ++--
 xsd/siri/siri_base-v2.0.xsd                   |   2 +-
 xsd/siri/siri_requests-v2.0.xsd               |   2 +-
 xsd/siri_utility/siri_all_utility-v2.0.xsd    |   2 +-
 xsd/siri_utility/siri_permissions-v2.0.xsd    |   2 +-
 ...siri_utility-v1.1.xsd => siri_utility.xsd} |   2 +-
 xsd/wsdl/siri_all_functionalServices.xsd      |   4 +-
 347 files changed, 1610 insertions(+), 1610 deletions(-)
 rename xsd/netex_framework/{netex_all_objects_framework-v1.0.xsd => netex_all_objects_framework.xsd} (78%)
 rename xsd/netex_framework/{netex_all_objects_generic-v1.0.xsd => netex_all_objects_generic.xsd} (63%)
 rename xsd/netex_framework/netex_frames/{netex_all_frames_framework-v1.0.xsd => netex_all_frames_framework.xsd} (70%)
 rename xsd/netex_framework/netex_frames/{netex_commonFrame_version-v1.0.xsd => netex_commonFrame_version.xsd} (97%)
 rename xsd/netex_framework/netex_frames/{netex_compositeFrame_version-v1.0.xsd => netex_compositeFrame_version.xsd} (98%)
 rename xsd/netex_framework/netex_frames/{netex_generalFrame_version-v1.0.xsd => netex_generalFrame_version.xsd} (98%)
 rename xsd/netex_framework/netex_frames/{netex_resourceFrame_support-v1.0.xsd => netex_resourceFrame_support.xsd} (97%)
 rename xsd/netex_framework/netex_frames/{netex_resourceFrame_version-v1.1.xsd => netex_resourceFrame_version.xsd} (96%)
 rename xsd/netex_framework/netex_frames/{netex_serviceCalendarFrame_support-v1.0.xsd => netex_serviceCalendarFrame_support.xsd} (97%)
 rename xsd/netex_framework/netex_frames/{netex_serviceCalendarFrame_version-v1.0.xsd => netex_serviceCalendarFrame_version.xsd} (97%)
 rename xsd/netex_framework/netex_genericFramework/netex_accessibility/{netex_acsb_accessibility-v1.1.xsd => netex_acsb_accessibility.xsd} (97%)
 rename xsd/netex_framework/netex_genericFramework/netex_accessibility/{netex_acsb_all-v1.0.xsd => netex_acsb_all.xsd} (85%)
 rename xsd/netex_framework/netex_genericFramework/netex_accessibility/{netex_acsb_limitations-v1.0.xsd => netex_acsb_limitations.xsd} (100%)
 rename xsd/netex_framework/netex_genericFramework/netex_accessibility/{netex_acsb_passengerMobility-v1.0.xsd => netex_acsb_passengerMobility.xsd} (99%)
 rename xsd/netex_framework/netex_genericFramework/netex_accessibility/{netex_acsb_support-v1.0.xsd => netex_acsb_support.xsd} (99%)
 rename xsd/netex_framework/netex_genericFramework/{netex_alternativeName_support-v1.0.xsd => netex_alternativeName_support.xsd} (97%)
 rename xsd/netex_framework/netex_genericFramework/{netex_alternativeName_version-v1.0.xsd => netex_alternativeName_version.xsd} (97%)
 rename xsd/netex_framework/netex_genericFramework/{netex_assignment_support-v1.0.xsd => netex_assignment_support.xsd} (97%)
 rename xsd/netex_framework/netex_genericFramework/{netex_assignment_version-v1.0.xsd => netex_assignment_version.xsd} (97%)
 rename xsd/netex_framework/netex_genericFramework/{netex_grouping_support-v1.0.xsd => netex_grouping_support.xsd} (98%)
 rename xsd/netex_framework/netex_genericFramework/{netex_grouping_version-v1.1.xsd => netex_grouping_version.xsd} (98%)
 rename xsd/netex_framework/netex_genericFramework/{netex_layer_support-v1.0.xsd => netex_layer_support.xsd} (97%)
 rename xsd/netex_framework/netex_genericFramework/{netex_layer_version-v1.0.xsd => netex_layer_version.xsd} (95%)
 rename xsd/netex_framework/netex_genericFramework/{netex_loggable_support-v1.1.xsd => netex_loggable_support.xsd} (97%)
 rename xsd/netex_framework/netex_genericFramework/{netex_loggable_version-v1.1.xsd => netex_loggable_version.xsd} (97%)
 rename xsd/netex_framework/netex_genericFramework/{netex_organisation_support-v1.1.xsd => netex_organisation_support.xsd} (98%)
 rename xsd/netex_framework/netex_genericFramework/{netex_organisation_version-v1.1.xsd => netex_organisation_version.xsd} (99%)
 rename xsd/netex_framework/netex_genericFramework/{netex_place_support-v1.0.xsd => netex_place_support.xsd} (99%)
 rename xsd/netex_framework/netex_genericFramework/{netex_place_version-v1.1.xsd => netex_place_version.xsd} (98%)
 rename xsd/netex_framework/netex_genericFramework/{netex_pointAndLinkSequence_support-v1.1.xsd => netex_pointAndLinkSequence_support.xsd} (98%)
 rename xsd/netex_framework/netex_genericFramework/{netex_pointAndLinkSequence_version-v1.1.xsd => netex_pointAndLinkSequence_version.xsd} (98%)
 rename xsd/netex_framework/netex_genericFramework/{netex_pointAndLink_support-v1.1.xsd => netex_pointAndLink_support.xsd} (98%)
 rename xsd/netex_framework/netex_genericFramework/{netex_pointAndLink_version-v1.1.xsd => netex_pointAndLink_version.xsd} (98%)
 rename xsd/netex_framework/netex_genericFramework/{netex_projection_support-v1.0.xsd => netex_projection_support.xsd} (98%)
 rename xsd/netex_framework/netex_genericFramework/{netex_projection_version-v1.0.xsd => netex_projection_version.xsd} (99%)
 rename xsd/netex_framework/netex_genericFramework/{netex_section_support-v1.1.xsd => netex_section_support.xsd} (98%)
 rename xsd/netex_framework/netex_genericFramework/{netex_section_version-v1.1.xsd => netex_section_version.xsd} (98%)
 rename xsd/netex_framework/netex_genericFramework/{netex_spatialFeature_support-v1.0.xsd => netex_spatialFeature_support.xsd} (97%)
 rename xsd/netex_framework/netex_genericFramework/{netex_spatialFeature_version-v1.0.xsd => netex_spatialFeature_version.xsd} (97%)
 rename xsd/netex_framework/netex_genericFramework/{netex_zoneProjection_version-v1.0.xsd => netex_zoneProjection_version.xsd} (97%)
 rename xsd/netex_framework/netex_genericFramework/{netex_zone_support-v1.0.xsd => netex_zone_support.xsd} (97%)
 rename xsd/netex_framework/netex_genericFramework/{netex_zone_version-v1.1.xsd => netex_zone_version.xsd} (98%)
 rename xsd/netex_framework/{netex_payload_framework-v1.0.xsd => netex_payload_framework.xsd} (98%)
 rename xsd/netex_framework/netex_responsibility/{netex_alternativeText_support-v1.1.xsd => netex_alternativeText_support.xsd} (96%)
 rename xsd/netex_framework/netex_responsibility/{netex_alternativeText_version-v1.1.xsd => netex_alternativeText_version.xsd} (96%)
 rename xsd/netex_framework/netex_responsibility/{netex_dataSource_version-v1.0.xsd => netex_dataSource_version.xsd} (97%)
 rename xsd/netex_framework/netex_responsibility/{netex_entity_entity-v1.0.xsd => netex_entity_entity.xsd} (95%)
 rename xsd/netex_framework/netex_responsibility/{netex_entity_support-v1.0.xsd => netex_entity_support.xsd} (99%)
 rename xsd/netex_framework/netex_responsibility/{netex_entity_version-v1.0.xsd => netex_entity_version.xsd} (98%)
 rename xsd/netex_framework/netex_responsibility/{netex_relationship-v1.0.xsd => netex_relationship.xsd} (98%)
 rename xsd/netex_framework/netex_responsibility/{netex_relationship_support-v1.1.xsd => netex_relationship_support.xsd} (98%)
 rename xsd/netex_framework/netex_responsibility/{netex_responsibilitySet_version-v1.1.xsd => netex_responsibilitySet_version.xsd} (98%)
 rename xsd/netex_framework/netex_responsibility/{netex_responsibility_support-v1.1.xsd => netex_responsibility_support.xsd} (98%)
 rename xsd/netex_framework/netex_responsibility/{netex_responsibility_version-v1.1.xsd => netex_responsibility_version.xsd} (96%)
 rename xsd/netex_framework/netex_responsibility/{netex_typeOfValue_version-v1.0.xsd => netex_typeOfValue_version.xsd} (98%)
 rename xsd/netex_framework/netex_responsibility/{netex_validityCondition_support-v1.0.xsd => netex_validityCondition_support.xsd} (98%)
 rename xsd/netex_framework/netex_responsibility/{netex_validityCondition_version-v1.0.xsd => netex_validityCondition_version.xsd} (98%)
 rename xsd/netex_framework/netex_responsibility/{netex_versionDelta_version-v1.0.xsd => netex_versionDelta_version.xsd} (98%)
 rename xsd/netex_framework/netex_responsibility/{netex_versionFrame_support-v1.0.xsd => netex_versionFrame_support.xsd} (98%)
 rename xsd/netex_framework/netex_responsibility/{netex_versionFrame_version-v1.0.xsd => netex_versionFrame_version.xsd} (98%)
 rename xsd/netex_framework/netex_responsibility/{netex_version_support-v1.1.xsd => netex_version_support.xsd} (98%)
 rename xsd/netex_framework/netex_responsibility/{netex_version_version-v1.1.xsd => netex_version_version.xsd} (97%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_access_version-v1.0.xsd => netex_access_version.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_accounting_version-v1.0.xsd => netex_accounting_version.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_address_support-v1.0.xsd => netex_address_support.xsd} (99%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_address_version-v1.1.xsd => netex_address_version.xsd} (98%)
 delete mode 100644 xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents-v1.0.xsd
 create mode 100644 xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd
 rename xsd/netex_framework/netex_reusableComponents/{netex_availabilityCondition_support-v1.0.xsd => netex_availabilityCondition_support.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_availabilityCondition_version-v1.0.xsd => netex_availabilityCondition_version.xsd} (99%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_country_support-v1.1.xsd => netex_country_support.xsd} (99%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_country_version-v1.1.xsd => netex_country_version.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_dayType_propertiesOfDay-v1.0.xsd => netex_dayType_propertiesOfDay.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_dayType_support-v1.0.xsd => netex_dayType_support.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_dayType_version-v1.0.xsd => netex_dayType_version.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_equipmentPlace_version-v1.0.xsd => netex_equipmentPlace_version.xsd} (97%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_equipmentVehiclePassenger_support-v1.0.xsd => netex_equipmentVehiclePassenger_support.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_equipmentVehiclePassenger_version-v1.0.xsd => netex_equipmentVehiclePassenger_version.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_equipment_support-v1.0.xsd => netex_equipment_support.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_equipment_version-v1.0.xsd => netex_equipment_version.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_facilityUic_support-v1.0.xsd => netex_facilityUic_support.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_facilityUic_version-v1.0.xsd => netex_facilityUic_version.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_facility_support-v1.1.xsd => netex_facility_support.xsd} (99%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_facility_version-v1.0.xsd => netex_facility_version.xsd} (99%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_linkByValue_support-v1.0.xsd => netex_linkByValue_support.xsd} (97%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_mode_support-v1.0.xsd => netex_mode_support.xsd} (99%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_mode_version-v1.0.xsd => netex_mode_version.xsd} (96%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_noticeAssignment_version-v1.1.xsd => netex_noticeAssignment_version.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_notice_support-v1.0.xsd => netex_notice_support.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_notice_version-v1.1.xsd => netex_notice_version.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_otherOrganisation_support-v1.0.xsd => netex_otherOrganisation_support.xsd} (99%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_otherOrganisation_version-v1.0.xsd => netex_otherOrganisation_version.xsd} (97%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_schematicMap_support-v1.0.xsd => netex_schematicMap_support.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_schematicMap_version-v1.0.xsd => netex_schematicMap_version.xsd} (97%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_securityList_support-v1.1.xsd => netex_securityList_support.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_securityList_version-v1.1.xsd => netex_securityList_version.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_serviceCalendar_support-v1.0.xsd => netex_serviceCalendar_support.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_serviceCalendar_version-v1.0.xsd => netex_serviceCalendar_version.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_submode_version-v1.1.xsd => netex_submode_version.xsd} (99%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_topographicPlace_support-v1.1.xsd => netex_topographicPlace_support.xsd} (99%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_topographicPlace_version-v1.1.xsd => netex_topographicPlace_version.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_trainElement_support-v1.0.xsd => netex_trainElement_support.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_trainElement_version-v1.1.xsd => netex_trainElement_version.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_transportOrganisation_support-v1.0.xsd => netex_transportOrganisation_support.xsd} (99%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_transportOrganisation_version-v1.0.xsd => netex_transportOrganisation_version.xsd} (99%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_travelRights_support-v1.0.xsd => netex_travelRights_support.xsd} (99%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_travelRights_version-v1.1.xsd => netex_travelRights_version.xsd} (97%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_vehicleType_support-v1.0.xsd => netex_vehicleType_support.xsd} (99%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_vehicleType_version-v1.1.xsd => netex_vehicleType_version.xsd} (99%)
 rename xsd/netex_framework/netex_utility/{netex_location_types-v1.0.xsd => netex_location_types.xsd} (98%)
 rename xsd/netex_framework/netex_utility/{netex_units-v1.0.xsd => netex_units.xsd} (98%)
 rename xsd/netex_framework/netex_utility/{netex_utility_contact-v1.0.xsd => netex_utility_contact.xsd} (96%)
 rename xsd/netex_framework/netex_utility/{netex_utility_time-v1.0.xsd => netex_utility_time.xsd} (99%)
 rename xsd/netex_framework/netex_utility/{netex_utility_types-v1.1.xsd => netex_utility_types.xsd} (99%)
 rename xsd/netex_framework/netex_utility/{netex_utility_xml-v1.0.xsd => netex_utility_xml.xsd} (98%)
 rename xsd/netex_part_1/{netex_all_frames_part1-v1.0.xsd => netex_all_frames_part1.xsd} (88%)
 rename xsd/netex_part_1/{netex_all_objects_infrastructureFrame-v1.0.xsd => netex_all_objects_infrastructureFrame.xsd} (100%)
 rename xsd/netex_part_1/{netex_all_objects_part1-v1.0.xsd => netex_all_objects_part1.xsd} (89%)
 rename xsd/netex_part_1/part1_frames/{netex_infrastructureFrame_version-v1.0.xsd => netex_infrastructureFrame_version.xsd} (96%)
 rename xsd/netex_part_1/part1_frames/{netex_siteFrame_version-v1.1.xsd => netex_siteFrame_version.xsd} (97%)
 rename xsd/netex_part_1/part1_ifopt/{netex_assistanceBooking_support-v1.0.xsd => netex_assistanceBooking_support.xsd} (97%)
 rename xsd/netex_part_1/part1_ifopt/{netex_assistanceBooking_version-v1.0.xsd => netex_assistanceBooking_version.xsd} (94%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_all_objects-v1.0.xsd => netex_ifopt_all_objects.xsd} (72%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_checkConstraint_support-v1.1.xsd => netex_ifopt_checkConstraint_support.xsd} (98%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_checkConstraint_version-v1.1.xsd => netex_ifopt_checkConstraint_version.xsd} (98%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_equipmentAccess_support-v1.0.xsd => netex_ifopt_equipmentAccess_support.xsd} (99%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_equipmentAccess_version-v1.0.xsd => netex_ifopt_equipmentAccess_version.xsd} (99%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_equipmentAll-v1.0.xsd => netex_ifopt_equipmentAll.xsd} (91%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_equipmentParking_support-v1.0.xsd => netex_ifopt_equipmentParking_support.xsd} (97%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_equipmentParking_version-v1.0.xsd => netex_ifopt_equipmentParking_version.xsd} (98%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_equipmentPassenger_support-v1.0.xsd => netex_ifopt_equipmentPassenger_support.xsd} (98%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_equipmentPassenger_version-v1.1.xsd => netex_ifopt_equipmentPassenger_version.xsd} (98%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_equipmentSigns_support-v1.0.xsd => netex_ifopt_equipmentSigns_support.xsd} (98%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_equipmentSigns_version-v1.0.xsd => netex_ifopt_equipmentSigns_version.xsd} (98%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_equipmentTicketing_support-v1.0.xsd => netex_ifopt_equipmentTicketing_support.xsd} (97%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_equipmentTicketing_version-v1.0.xsd => netex_ifopt_equipmentTicketing_version.xsd} (97%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_equipmentWaiting_support-v1.0.xsd => netex_ifopt_equipmentWaiting_support.xsd} (98%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_equipmentWaiting_version-v1.0.xsd => netex_ifopt_equipmentWaiting_version.xsd} (99%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_flexibleStopPlace_support-v1.0.xsd => netex_ifopt_flexibleStopPlace_support.xsd} (98%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_flexibleStopPlace_version-v1.0.xsd => netex_ifopt_flexibleStopPlace_version.xsd} (98%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_localServiceCommercial_support-v1.0.xsd => netex_ifopt_localServiceCommercial_support.xsd} (98%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_localServiceCommercial_version-v1.0.xsd => netex_ifopt_localServiceCommercial_version.xsd} (98%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_localService_support-v1.0.xsd => netex_ifopt_localService_support.xsd} (99%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_localService_version-v1.1.xsd => netex_ifopt_localService_version.xsd} (98%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_navigationPath_version-v1.1.xsd => netex_ifopt_navigationPath_version.xsd} (98%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_parking_support-v1.1.xsd => netex_ifopt_parking_support.xsd} (99%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_parking_version-v1.1.xsd => netex_ifopt_parking_version.xsd} (99%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_path_support-v1.0.xsd => netex_ifopt_path_support.xsd} (98%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_path_version-v1.0.xsd => netex_ifopt_path_version.xsd} (98%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_pointOfInterest_support-v1.0.xsd => netex_ifopt_pointOfInterest_support.xsd} (98%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_pointOfInterest_version-v1.0.xsd => netex_ifopt_pointOfInterest_version.xsd} (99%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_serviceFeature_support-v1.0.xsd => netex_ifopt_serviceFeature_support.xsd} (97%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_serviceFeature_version-v1.0.xsd => netex_ifopt_serviceFeature_version.xsd} (96%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_site_support-v1.0.xsd => netex_ifopt_site_support.xsd} (99%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_site_version-v1.0.xsd => netex_ifopt_site_version.xsd} (97%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_stopPlace_support-v1.1.xsd => netex_ifopt_stopPlace_support.xsd} (98%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_stopPlace_version-v1.1.xsd => netex_ifopt_stopPlace_version.xsd} (99%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_vehicleStopping_support-v1.0.xsd => netex_ifopt_vehicleStopping_support.xsd} (98%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_activation_support-v1.0.xsd => netex_activation_support.xsd} (98%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_activation_version-v1.0.xsd => netex_activation_version.xsd} (98%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_all_objects_part1_infrastructureFrame_contents-v1.0.xsd => netex_all_objects_part1_infrastructureFrame_contents.xsd} (62%)
 delete mode 100644 xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_lineRoute-v1.0.xsd
 create mode 100644 xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_lineRoute.xsd
 rename xsd/netex_part_1/part1_networkDescription/{netex_all_objects_part1_networkDescription-v1.0.xsd => netex_all_objects_part1_networkDescription.xsd} (86%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_flexibleNetwork_support-v1.0.xsd => netex_flexibleNetwork_support.xsd} (97%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_flexibleNetwork_version-v1.1.xsd => netex_flexibleNetwork_version.xsd} (97%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_lineNetwork_support-v1.1.xsd => netex_lineNetwork_support.xsd} (97%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_lineNetwork_version-v1.1.xsd => netex_lineNetwork_version.xsd} (98%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_line_support-v1.1.xsd => netex_line_support.xsd} (98%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_line_version-v1.1.xsd => netex_line_version.xsd} (98%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_networkInfrastructure_support-v1.0.xsd => netex_networkInfrastructure_support.xsd} (99%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_networkInfrastructure_version-v1.0.xsd => netex_networkInfrastructure_version.xsd} (99%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_networkRestriction_support-v1.0.xsd => netex_networkRestriction_support.xsd} (97%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_networkRestriction_version-v1.0.xsd => netex_networkRestriction_version.xsd} (98%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_routeInstruction_support-v1.1.xsd => netex_routeInstruction_support.xsd} (96%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_routeInstruction_version-v1.1.xsd => netex_routeInstruction_version.xsd} (97%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_route_support-v1.1.xsd => netex_route_support.xsd} (98%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_route_version-v1.1.xsd => netex_route_version.xsd} (98%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_timingPattern_support-v1.1.xsd => netex_timingPattern_support.xsd} (97%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_vehicleAndCrewPoint_support-v1.0.xsd => netex_vehicleAndCrewPoint_support.xsd} (98%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_vehicleAndCrewPoint_version-v1.1.xsd => netex_vehicleAndCrewPoint_version.xsd} (98%)
 delete mode 100644 xsd/netex_part_1/part1_tacticalPlanning/netex_all_objects_part1_tacticalPlanning-v1.0.xsd
 create mode 100644 xsd/netex_part_1/part1_tacticalPlanning/netex_all_objects_part1_tacticalPlanning.xsd
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_commonSection_support-v1.1.xsd => netex_commonSection_support.xsd} (96%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_commonSection_version-v1.1.xsd => netex_commonSection_version.xsd} (97%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_fareZone_support-v1.1.xsd => netex_fareZone_support.xsd} (98%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_fareZone_version-v1.1.xsd => netex_fareZone_version.xsd} (98%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_journeyPatternTimings_support-v1.0.xsd => netex_journeyPatternTimings_support.xsd} (98%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_journeyPatternTimings_version-v1.0.xsd => netex_journeyPatternTimings_version.xsd} (98%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_journeyPattern_support-v1.0.xsd => netex_journeyPattern_support.xsd} (98%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_journeyPattern_version-v1.1.xsd => netex_journeyPattern_version.xsd} (98%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_journeyTiming_support-v1.0.xsd => netex_journeyTiming_support.xsd} (98%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_journeyTiming_version-v1.0.xsd => netex_journeyTiming_version.xsd} (97%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_passengerInformationEquipment_support-v1.0.xsd => netex_passengerInformationEquipment_support.xsd} (98%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_passengerInformationEquipment_version-v1.0.xsd => netex_passengerInformationEquipment_version.xsd} (98%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_pathAssignment_version-v1.0.xsd => netex_pathAssignment_version.xsd} (96%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_routingConstraint_support-v1.0.xsd => netex_routingConstraint_support.xsd} (97%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_routingConstraint_version-v1.0.xsd => netex_routingConstraint_version.xsd} (98%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_servicePattern_support-v1.1.xsd => netex_servicePattern_support.xsd} (98%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_servicePattern_version-v1.1.xsd => netex_servicePattern_version.xsd} (99%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_siteConnection_support-v1.0.xsd => netex_siteConnection_support.xsd} (96%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_siteConnection_version-v1.0.xsd => netex_siteConnection_version.xsd} (97%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_stopAssignment_support-v1.0.xsd => netex_stopAssignment_support.xsd} (98%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_stopAssignment_version-v1.1.xsd => netex_stopAssignment_version.xsd} (98%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_timeDemandType_support-v1.0.xsd => netex_timeDemandType_support.xsd} (97%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_timeDemandType_version-v1.0.xsd => netex_timeDemandType_version.xsd} (97%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_timingPattern_version-v1.1.xsd => netex_timingPattern_version.xsd} (98%)
 rename xsd/netex_part_2/{netex_all_frames_part2-v1.0.xsd => netex_all_frames_part2.xsd} (89%)
 rename xsd/netex_part_2/{netex_all_objects_part2-v1.0.xsd => netex_all_objects_part2.xsd} (92%)
 rename xsd/netex_part_2/part2_frames/{netex_driverScheduleFrame_version-v1.0.xsd => netex_driverScheduleFrame_version.xsd} (96%)
 rename xsd/netex_part_2/part2_frames/{netex_serviceFrame_version-v1.1.xsd => netex_serviceFrame_version.xsd} (96%)
 rename xsd/netex_part_2/part2_frames/{netex_timetableFrame_support-v1.0.xsd => netex_timetableFrame_support.xsd} (97%)
 rename xsd/netex_part_2/part2_frames/{netex_timetableFrame_version-v1.0.xsd => netex_timetableFrame_version.xsd} (97%)
 rename xsd/netex_part_2/part2_frames/{netex_vehicleScheduleFrame_version-v1.0.xsd => netex_vehicleScheduleFrame_version.xsd} (94%)
 delete mode 100644 xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyTimes-v1.0.xsd
 create mode 100644 xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyTimes.xsd
 rename xsd/netex_part_2/part2_journeyTimes/{netex_call_support-v1.0.xsd => netex_call_support.xsd} (96%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_call_version-v1.1.xsd => netex_call_version.xsd} (97%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_coupledJourney_support-v1.1.xsd => netex_coupledJourney_support.xsd} (98%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_coupledJourney_version-v1.1.xsd => netex_coupledJourney_version.xsd} (98%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_datedPassingTimes_version-v1.1.xsd => netex_datedPassingTimes_version.xsd} (98%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_datedVehicleJourney_support-v1.0.xsd => netex_datedVehicleJourney_support.xsd} (98%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_datedVehicleJourney_version-v1.0.xsd => netex_datedVehicleJourney_version.xsd} (97%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_flexibleService_support-v1.0.xsd => netex_flexibleService_support.xsd} (97%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_flexibleService_version-v1.0.xsd => netex_flexibleService_version.xsd} (96%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_interchangeRule_version-v1.1.xsd => netex_interchangeRule_version.xsd} (98%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_interchange_support-v1.0.xsd => netex_interchange_support.xsd} (98%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_interchange_version-v1.1.xsd => netex_interchange_version.xsd} (98%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_journeyAccounting_support-v1.0.xsd => netex_journeyAccounting_support.xsd} (96%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_journeyAccounting_version-v1.0.xsd => netex_journeyAccounting_version.xsd} (96%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_journeyDesignator_support-v1.0.xsd => netex_journeyDesignator_support.xsd} (95%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_journey_version-v1.1.xsd => netex_journey_version.xsd} (95%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_passingTimes_support-v1.0.xsd => netex_passingTimes_support.xsd} (98%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_passingTimes_version-v1.1.xsd => netex_passingTimes_version.xsd} (96%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_serviceJourney_support-v1.0.xsd => netex_serviceJourney_support.xsd} (98%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_serviceJourney_version-v1.1.xsd => netex_serviceJourney_version.xsd} (98%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_serviceView_version-v1.0.xsd => netex_serviceView_version.xsd} (87%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_timeDemandProfile_version-v1.0.xsd => netex_timeDemandProfile_version.xsd} (96%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_timeDemandTimes_version-v1.0.xsd => netex_timeDemandTimes_version.xsd} (97%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_vehicleJourneyFrequency_support-v1.0.xsd => netex_vehicleJourneyFrequency_support.xsd} (98%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_vehicleJourneyFrequency_version-v1.1.xsd => netex_vehicleJourneyFrequency_version.xsd} (98%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_vehicleJourneyTimes_support-v1.0.xsd => netex_vehicleJourneyTimes_support.xsd} (98%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_vehicleJourneyTimes_version-v1.0.xsd => netex_vehicleJourneyTimes_version.xsd} (96%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_vehicleJourney_support-v1.0.xsd => netex_vehicleJourney_support.xsd} (98%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_vehicleJourney_version-v1.1.xsd => netex_vehicleJourney_version.xsd} (97%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_vehicleService_support-v1.0.xsd => netex_vehicleService_support.xsd} (98%)
 rename xsd/netex_part_2/part2_vehicleService/{netex_all_objects_part2_vehicleService-v1.0.xsd => netex_all_objects_part2_vehicleService.xsd} (87%)
 rename xsd/netex_part_2/part2_vehicleService/{netex_duty_support-v1.0.xsd => netex_duty_support.xsd} (98%)
 rename xsd/netex_part_2/part2_vehicleService/{netex_duty_version-v1.0.xsd => netex_duty_version.xsd} (98%)
 rename xsd/netex_part_2/part2_vehicleService/{netex_vehicleService_version-v1.1.xsd => netex_vehicleService_version.xsd} (99%)
 rename xsd/netex_part_3/part3_PiQuery/{netex_all_objects_part3_piQuery-v1.0.xsd => netex_all_objects_part3_piQuery.xsd} (87%)
 rename xsd/netex_part_3/part3_PiQuery/{netex_piQuery_support-v1.0.xsd => netex_piQuery_support.xsd} (98%)
 rename xsd/netex_part_3/part3_PiQuery/{netex_piRequest_support-v1.1.xsd => netex_piRequest_support.xsd} (98%)
 rename xsd/netex_part_3/part3_fares/{netex_accessRightParameter_support-v1.0.xsd => netex_accessRightParameter_support.xsd} (97%)
 rename xsd/netex_part_3/part3_fares/{netex_accessRightParameter_version-v1.1.xsd => netex_accessRightParameter_version.xsd} (95%)
 rename xsd/netex_part_3/part3_fares/{netex_all_objects_part3_fares-v1.1.xsd => netex_all_objects_part3_fares.xsd} (65%)
 rename xsd/netex_part_3/part3_fares/{netex_all_objects_part3_fares_AR-v1.1.xsd => netex_all_objects_part3_fares_AR.xsd} (73%)
 rename xsd/netex_part_3/part3_fares/{netex_all_objects_part3_fares_FP-v1.1.xsd => netex_all_objects_part3_fares_FP.xsd} (67%)
 rename xsd/netex_part_3/part3_fares/{netex_all_objects_part3_fares_FS-v1.1.xsd => netex_all_objects_part3_fares_FS.xsd} (61%)
 rename xsd/netex_part_3/part3_fares/{netex_all_objects_part3_fares_SD-v1.1.xsd => netex_all_objects_part3_fares_SD.xsd} (58%)
 rename xsd/netex_part_3/part3_fares/{netex_calculationParameters_support-v1.0.xsd => netex_calculationParameters_support.xsd} (98%)
 rename xsd/netex_part_3/part3_fares/{netex_calculationParameters_version-v1.0.xsd => netex_calculationParameters_version.xsd} (99%)
 rename xsd/netex_part_3/part3_fares/{netex_distanceMatrixElement_support-v1.0.xsd => netex_distanceMatrixElement_support.xsd} (97%)
 rename xsd/netex_part_3/part3_fares/{netex_distanceMatrixElement_version-v1.1.xsd => netex_distanceMatrixElement_version.xsd} (98%)
 rename xsd/netex_part_3/part3_fares/{netex_fareConditionSummary_support-v1.0.xsd => netex_fareConditionSummary_support.xsd} (97%)
 rename xsd/netex_part_3/part3_fares/{netex_fareConditionSummary_version-v1.0.xsd => netex_fareConditionSummary_version.xsd} (99%)
 rename xsd/netex_part_3/part3_fares/{netex_farePrice_support-v1.0.xsd => netex_farePrice_support.xsd} (98%)
 rename xsd/netex_part_3/part3_fares/{netex_farePrice_version-v1.1.xsd => netex_farePrice_version.xsd} (98%)
 rename xsd/netex_part_3/part3_fares/{netex_fareProduct_support-v1.0.xsd => netex_fareProduct_support.xsd} (99%)
 rename xsd/netex_part_3/part3_fares/{netex_fareProduct_version-v1.1.xsd => netex_fareProduct_version.xsd} (99%)
 rename xsd/netex_part_3/part3_fares/{netex_fareSeries_support-v1.0.xsd => netex_fareSeries_support.xsd} (97%)
 rename xsd/netex_part_3/part3_fares/{netex_fareSeries_version-v1.0.xsd => netex_fareSeries_version.xsd} (98%)
 rename xsd/netex_part_3/part3_fares/{netex_fareStructureElement_support-v1.0.xsd => netex_fareStructureElement_support.xsd} (98%)
 rename xsd/netex_part_3/part3_fares/{netex_fareStructureElement_version-v1.1.xsd => netex_fareStructureElement_version.xsd} (98%)
 rename xsd/netex_part_3/part3_fares/{netex_fareStructure_support-v1.0.xsd => netex_fareStructure_support.xsd} (97%)
 rename xsd/netex_part_3/part3_fares/{netex_fareStructure_version-v1.0.xsd => netex_fareStructure_version.xsd} (98%)
 rename xsd/netex_part_3/part3_fares/{netex_fareTable_support-v1.0.xsd => netex_fareTable_support.xsd} (97%)
 rename xsd/netex_part_3/part3_fares/{netex_fareTable_version-v1.1.xsd => netex_fareTable_version.xsd} (96%)
 rename xsd/netex_part_3/part3_fares/{netex_geographicStructureFactor_support-v1.0.xsd => netex_geographicStructureFactor_support.xsd} (98%)
 rename xsd/netex_part_3/part3_fares/{netex_geographicStructureFactor_version-v1.0.xsd => netex_geographicStructureFactor_version.xsd} (98%)
 rename xsd/netex_part_3/part3_fares/{netex_qualityStructureFactor_support-v1.0.xsd => netex_qualityStructureFactor_support.xsd} (98%)
 rename xsd/netex_part_3/part3_fares/{netex_qualityStructureFactor_version-v1.0.xsd => netex_qualityStructureFactor_version.xsd} (97%)
 rename xsd/netex_part_3/part3_fares/{netex_salesDistribution_support-v1.0.xsd => netex_salesDistribution_support.xsd} (98%)
 rename xsd/netex_part_3/part3_fares/{netex_salesDistribution_version-v1.0.xsd => netex_salesDistribution_version.xsd} (97%)
 rename xsd/netex_part_3/part3_fares/{netex_salesPackage_support-v1.0.xsd => netex_salesPackage_support.xsd} (98%)
 rename xsd/netex_part_3/part3_fares/{netex_salesPackage_version-v1.0.xsd => netex_salesPackage_version.xsd} (98%)
 rename xsd/netex_part_3/part3_fares/{netex_timeStructureFactor_support-v1.0.xsd => netex_timeStructureFactor_support.xsd} (97%)
 rename xsd/netex_part_3/part3_fares/{netex_timeStructureFactor_version-v1.0.xsd => netex_timeStructureFactor_version.xsd} (98%)
 rename xsd/netex_part_3/part3_fares/{netex_travelDocument_support-v1.1.xsd => netex_travelDocument_support.xsd} (97%)
 rename xsd/netex_part_3/part3_fares/{netex_travelDocument_version-v1.1.xsd => netex_travelDocument_version.xsd} (98%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameterAfterSales_support-v1.0.xsd => netex_usageParameterAfterSales_support.xsd} (98%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameterAfterSales_version-v1.0.xsd => netex_usageParameterAfterSales_version.xsd} (98%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameterBooking_support-v1.0.xsd => netex_usageParameterBooking_support.xsd} (97%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameterBooking_version-v1.0.xsd => netex_usageParameterBooking_version.xsd} (97%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameterCharging_support-v1.0.xsd => netex_usageParameterCharging_support.xsd} (97%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameterCharging_version-v1.0.xsd => netex_usageParameterCharging_version.xsd} (97%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameterEligibility_support-v1.0.xsd => netex_usageParameterEligibility_support.xsd} (98%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameterEligibility_version-v1.0.xsd => netex_usageParameterEligibility_version.xsd} (99%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameterEntitlement_support-v1.0.xsd => netex_usageParameterEntitlement_support.xsd} (97%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameterEntitlement_version-v1.0.xsd => netex_usageParameterEntitlement_version.xsd} (97%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameterLuggage_support-v1.0.xsd => netex_usageParameterLuggage_support.xsd} (97%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameterLuggage_version-v1.0.xsd => netex_usageParameterLuggage_version.xsd} (97%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameterTravel_support-v1.1.xsd => netex_usageParameterTravel_support.xsd} (99%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameterTravel_version-v1.0.xsd => netex_usageParameterTravel_version.xsd} (99%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameter_support-v1.0.xsd => netex_usageParameter_support.xsd} (98%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameter_version-v1.0.xsd => netex_usageParameter_version.xsd} (97%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParametersAll_support-v1.0.xsd => netex_usageParametersAll_support.xsd} (89%)
 rename xsd/netex_part_3/part3_fares/{netex_validableElement_support-v1.0.xsd => netex_validableElement_support.xsd} (98%)
 rename xsd/netex_part_3/part3_fares/{netex_validableElement_version-v1.0.xsd => netex_validableElement_version.xsd} (98%)
 rename xsd/netex_part_3/part3_frames/{netex_all_frames_part3-v1.0.xsd => netex_all_frames_part3.xsd} (90%)
 rename xsd/netex_part_3/part3_frames/{netex_fareFrame_version-v1.0.xsd => netex_fareFrame_version.xsd} (96%)
 rename xsd/netex_part_3/part3_frames/{netex_salesTransactionFrame_version-v1.1.xsd => netex_salesTransactionFrame_version.xsd} (96%)
 rename xsd/netex_part_3/part3_monitoring/{netex_all_objects_part3_monitoring-v1.0.xsd => netex_all_objects_part3_monitoring.xsd} (85%)
 rename xsd/netex_part_3/part3_monitoring/{netex_monitoredCall_version-v1.0.xsd => netex_monitoredCall_version.xsd} (98%)
 rename xsd/netex_part_3/part3_monitoring/{netex_monitoredPassingTimes_version-v1.1.xsd => netex_monitoredPassingTimes_version.xsd} (98%)
 rename xsd/netex_part_3/part3_monitoring/{netex_monitoredVehicleJourney_support-v1.0.xsd => netex_monitoredVehicleJourney_support.xsd} (96%)
 rename xsd/netex_part_3/part3_parkingTariff/{netex_all_objects_part3_parking-v1.0.xsd => netex_all_objects_part3_parking.xsd} (76%)
 rename xsd/netex_part_3/part3_parkingTariff/{netex_parkingTariff_support-v1.1.xsd => netex_parkingTariff_support.xsd} (97%)
 rename xsd/netex_part_3/part3_parkingTariff/{netex_parkingTariff_version-v1.1.xsd => netex_parkingTariff_version.xsd} (98%)
 rename xsd/netex_part_3/part3_salesTransactions/{netex_all_objects_part3_salesTransactions-v1.0.xsd => netex_all_objects_part3_salesTransactions.xsd} (53%)
 rename xsd/netex_part_3/part3_salesTransactions/{netex_customerEligibility_support-v1.1.xsd => netex_customerEligibility_support.xsd} (98%)
 rename xsd/netex_part_3/part3_salesTransactions/{netex_customerEligibility_version-v1.1.xsd => netex_customerEligibility_version.xsd} (97%)
 rename xsd/netex_part_3/part3_salesTransactions/{netex_customerPurchasePackage_support-v1.1.xsd => netex_customerPurchasePackage_support.xsd} (99%)
 rename xsd/netex_part_3/part3_salesTransactions/{netex_customerPurchasePackage_version-v1.1.xsd => netex_customerPurchasePackage_version.xsd} (98%)
 rename xsd/netex_part_3/part3_salesTransactions/{netex_retailConsortium_support-v1.1.xsd => netex_retailConsortium_support.xsd} (97%)
 rename xsd/netex_part_3/part3_salesTransactions/{netex_retailConsortium_version-v1.1.xsd => netex_retailConsortium_version.xsd} (96%)
 rename xsd/netex_part_3/part3_salesTransactions/{netex_salesContract_support-v1.1.xsd => netex_salesContract_support.xsd} (99%)
 rename xsd/netex_part_3/part3_salesTransactions/{netex_salesContract_version-v1.1.xsd => netex_salesContract_version.xsd} (98%)
 rename xsd/netex_part_3/part3_salesTransactions/{netex_salesTransaction_support-v1.0.xsd => netex_salesTransaction_support.xsd} (96%)
 rename xsd/netex_part_3/part3_salesTransactions/{netex_salesTransaction_version-v1.1.xsd => netex_salesTransaction_version.xsd} (98%)
 rename xsd/netex_service/{netex_all-v1.0.xsd => netex_all.xsd} (77%)
 rename xsd/netex_service/{netex_all_filters-v1.0.xsd => netex_all_filters.xsd} (91%)
 rename xsd/netex_service/{netex_dataObjectRequest_service-v1.0.xsd => netex_dataObjectRequest_service.xsd} (98%)
 rename xsd/netex_service/{netex_filter_frame-v1.0.xsd => netex_filter_frame.xsd} (96%)
 rename xsd/netex_service/{netex_filter_object-v1.0.xsd => netex_filter_object.xsd} (95%)
 rename xsd/siri_utility/{siri_utility-v1.1.xsd => siri_utility.xsd} (98%)

diff --git a/xsd/NX.xsd b/xsd/NX.xsd
index 692bd3db2..8841cc4c5 100644
--- a/xsd/NX.xsd
+++ b/xsd/NX.xsd
@@ -5,8 +5,8 @@
 	<!-- ===  ONLY TO FACILITATE  STUDY OF SCHEMA ELEMENTS.  DO NOT USE IT FOR DOCUMENTS  =========== -->
 	<!-- === Use NeTEx_publication.xsd or NeTEx_publication_timetable  or NeTEx_siri.xsd=========== -->
 	<!-- (C) Copyright 2009-2012 CEN,Crown Copyright -->
-	<xsd:include schemaLocation="netex_service/netex_all-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_framework/netex_payload_framework-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_service/netex_all.xsd"/>
+	<xsd:include schemaLocation="netex_framework/netex_payload_framework.xsd"/>
 	<!-- ======================================================================= -->
 	<!-- ======================================================================= -->
 	<xsd:element name="Nx">
diff --git a/xsd/NeTEx_publication-NoConstraint.xsd b/xsd/NeTEx_publication-NoConstraint.xsd
index 1584b9858..70c0dce46 100644
--- a/xsd/NeTEx_publication-NoConstraint.xsd
+++ b/xsd/NeTEx_publication-NoConstraint.xsd
@@ -5,8 +5,8 @@
 	<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="siri_utility/siri_participant-v2.0.xsd"/>
 	<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="siri/siri_requests-v2.0.xsd"/>
 	<!-- ===Regular netex============================================================== -->
-	<xsd:include schemaLocation="netex_service/netex_dataObjectRequest_service-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_service/netex_all-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_service/netex_dataObjectRequest_service.xsd"/>
+	<xsd:include schemaLocation="netex_service/netex_all.xsd"/>
 	<!-- ===eGIF/GovTalk Documentation ======================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd
index d45fba403..6cc97ba5e 100644
--- a/xsd/NeTEx_publication.xsd
+++ b/xsd/NeTEx_publication.xsd
@@ -5,8 +5,8 @@
 	<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="siri_utility/siri_participant-v2.0.xsd"/>
 	<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="siri/siri_requests-v2.0.xsd"/>
 	<!-- ===Regular netex============================================================== -->
-	<xsd:include schemaLocation="netex_service/netex_dataObjectRequest_service-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_service/netex_all-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_service/netex_dataObjectRequest_service.xsd"/>
+	<xsd:include schemaLocation="netex_service/netex_all.xsd"/>
 	<!-- ===eGIF/GovTalk Documentation ======================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
diff --git a/xsd/NeTEx_publication_timetable.xsd b/xsd/NeTEx_publication_timetable.xsd
index 4244811d0..a789b6fa0 100644
--- a/xsd/NeTEx_publication_timetable.xsd
+++ b/xsd/NeTEx_publication_timetable.xsd
@@ -4,22 +4,22 @@
 	<!-- ==+ IT INCLUDES ELEMENTS RELEVANT FOR THE EXCHANGE OF TIMETABLES ===== -->
 	<!-- ==+ANY DOCUMENT COMPLIANT WITH THIS SCHEMA WILL ALSO BE COMPLIANT WITH NetEx_publication.xsd ===== -->
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="netex_framework/netex_frames/netex_all_frames_framework-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_framework/netex_frames/netex_resourceFrame_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_framework/netex_frames/netex_serviceCalendarFrame_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_framework/netex_frames/netex_compositeFrame_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_framework/netex_frames/netex_all_frames_framework.xsd"/>
+	<xsd:include schemaLocation="netex_framework/netex_frames/netex_resourceFrame_version.xsd"/>
+	<xsd:include schemaLocation="netex_framework/netex_frames/netex_serviceCalendarFrame_version.xsd"/>
+	<xsd:include schemaLocation="netex_framework/netex_frames/netex_compositeFrame_version.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_part_1/part1_frames/netex_siteFrame_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_part_1/part1_frames/netex_siteFrame_version.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_part_2/part2_frames/netex_timetableFrame_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_part_2/part2_frames/netex_serviceFrame_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_part_2/part2_frames/netex_timetableFrame_version.xsd"/>
+	<xsd:include schemaLocation="netex_part_2/part2_frames/netex_serviceFrame_version.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_part_3/part3_frames/netex_fareFrame_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_part_3/part3_frames/netex_fareFrame_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="siri/siri_base-v2.0.xsd"/>
 	<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="siri_utility/siri_participant-v2.0.xsd"/>
 	<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="siri/siri_requests-v2.0.xsd"/>
-	<xsd:include schemaLocation="netex_service/netex_dataObjectRequest_service-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_service/netex_dataObjectRequest_service.xsd"/>
 	<!-- ===eGIF/GovTalk Documentation ======================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
diff --git a/xsd/NeTEx_siri.xsd b/xsd/NeTEx_siri.xsd
index b44293305..908d0830d 100644
--- a/xsd/NeTEx_siri.xsd
+++ b/xsd/NeTEx_siri.xsd
@@ -3,8 +3,8 @@
 <xsd:schema xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.siri.org.uk/siri" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_siri">
 	<!-- ===Dependencies ======================================= -->
 	<!-- ====INCLUDE NETEX REQUESTS==================================================== -->
-	<xsd:import namespace="http://www.netex.org.uk/netex" schemaLocation="netex_service/netex_all-v1.0.xsd"/>
-	<xsd:import namespace="http://www.netex.org.uk/netex" schemaLocation="netex_service/netex_dataObjectRequest_service-v1.0.xsd"/>
+	<xsd:import namespace="http://www.netex.org.uk/netex" schemaLocation="netex_service/netex_all.xsd"/>
+	<xsd:import namespace="http://www.netex.org.uk/netex" schemaLocation="netex_service/netex_dataObjectRequest_service.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:include schemaLocation="siri/siri_base-v2.0.xsd"/>
 	<!-- ===eGIF/GovTalk Documentation ======================================= -->
diff --git a/xsd/ifopt.xsd b/xsd/ifopt.xsd
index 9fff45e9b..8d019c624 100644
--- a/xsd/ifopt.xsd
+++ b/xsd/ifopt.xsd
@@ -4,7 +4,7 @@
 	<!-- === THIS IS FOR DOCUMENTATION TO SHOW THE COVERAGE OF THE ORIGINAL  IFOPT ELEMENTS ===== -->
 	<!-- ===  USE THE NeTEX publication schema FOR ACTUAL DOCUMENTS============= -->
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_part_1/netex_all_objects_part1-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_part_1/netex_all_objects_part1.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:group name="IfoptPayloadGroup">
 		<xsd:sequence>
diff --git a/xsd/netex_framework/netex_all_objects_framework-v1.0.xsd b/xsd/netex_framework/netex_all_objects_framework.xsd
similarity index 78%
rename from xsd/netex_framework/netex_all_objects_framework-v1.0.xsd
rename to xsd/netex_framework/netex_all_objects_framework.xsd
index 72ceede69..3fc26f2be 100644
--- a/xsd/netex_framework/netex_all_objects_framework-v1.0.xsd
+++ b/xsd/netex_framework/netex_all_objects_framework.xsd
@@ -2,7 +2,7 @@
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_framework">
 	<!-- ===Types ======================================= -->
-	<xsd:include schemaLocation="netex_payload_framework-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_all_objects_generic-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_reusableComponents/netex_all_objects_reusableComponents-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_payload_framework.xsd"/>
+	<xsd:include schemaLocation="netex_all_objects_generic.xsd"/>
+	<xsd:include schemaLocation="netex_reusableComponents/netex_all_objects_reusableComponents.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_framework/netex_all_objects_generic-v1.0.xsd b/xsd/netex_framework/netex_all_objects_generic.xsd
similarity index 63%
rename from xsd/netex_framework/netex_all_objects_generic-v1.0.xsd
rename to xsd/netex_framework/netex_all_objects_generic.xsd
index 6f1ef93f6..76367f73f 100644
--- a/xsd/netex_framework/netex_all_objects_generic-v1.0.xsd
+++ b/xsd/netex_framework/netex_all_objects_generic.xsd
@@ -1,56 +1,56 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_generic">
 	<!-- ===Types =======================================  -->
-	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_utility_types-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_location_types-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_units-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_utility_contact-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_utility_time-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_utility_xml-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_utility_types.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_location_types.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_units.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_utility_contact.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_utility_time.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_utility_xml.xsd"/>
 	<!-- =====entity=========================================================== -->
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_alternativeText_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_alternativeText_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_entity_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_entity_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_relationship_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_relationship-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_typeOfValue_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_responsibility_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_responsibility_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_responsibilitySet_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_dataSource_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_validityCondition_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_versionDelta_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_versionFrame_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_versionFrame_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_version_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_version_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_alternativeText_support.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_alternativeText_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_entity_support.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_entity_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_relationship_support.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_relationship.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_typeOfValue_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_responsibility_support.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_responsibility_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_dataSource_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_validityCondition_support.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_versionDelta_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_versionFrame_support.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_versionFrame_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_version_support.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_version_version.xsd"/>
 	<!-- ======Framework========================================================= -->
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_alternativeName_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_alternativeName_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_all-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_assignment_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_assignment_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_grouping_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_grouping_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_layer_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_layer_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_loggable_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_loggable_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_organisation_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_organisation_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_place_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_place_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_pointAndLink_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_pointAndLink_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_projection_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_projection_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_section_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_section_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_spatialFeature_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_spatialFeature_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_zone_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_zone_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_zoneProjection_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_alternativeName_support.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_alternativeName_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_all.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_assignment_support.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_assignment_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_grouping_support.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_grouping_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_layer_support.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_layer_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_loggable_support.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_loggable_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_organisation_support.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_organisation_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_place_support.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_place_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_pointAndLink_support.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_projection_support.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_projection_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_section_support.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_section_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_spatialFeature_support.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_spatialFeature_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_zone_support.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_zone_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_zoneProjection_version.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_framework/netex_frames/netex_all_frames_framework-v1.0.xsd b/xsd/netex_framework/netex_frames/netex_all_frames_framework.xsd
similarity index 70%
rename from xsd/netex_framework/netex_frames/netex_all_frames_framework-v1.0.xsd
rename to xsd/netex_framework/netex_frames/netex_all_frames_framework.xsd
index 9db45449e..9588c56fd 100644
--- a/xsd/netex_framework/netex_frames/netex_all_frames_framework-v1.0.xsd
+++ b/xsd/netex_framework/netex_frames/netex_all_frames_framework.xsd
@@ -2,10 +2,10 @@
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://www.ifopt.org.uk/ifopt" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_frames_framework">
 	<!-- ===Types ======================================= -->
-	<xsd:include schemaLocation="netex_commonFrame_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_compositeFrame_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_serviceCalendarFrame_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_serviceCalendarFrame_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_resourceFrame_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_generalFrame_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_commonFrame_version.xsd"/>
+	<xsd:include schemaLocation="netex_compositeFrame_version.xsd"/>
+	<xsd:include schemaLocation="netex_serviceCalendarFrame_version.xsd"/>
+	<xsd:include schemaLocation="netex_serviceCalendarFrame_version.xsd"/>
+	<xsd:include schemaLocation="netex_resourceFrame_version.xsd"/>
+	<xsd:include schemaLocation="netex_generalFrame_version.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_framework/netex_frames/netex_commonFrame_version-v1.0.xsd b/xsd/netex_framework/netex_frames/netex_commonFrame_version.xsd
similarity index 97%
rename from xsd/netex_framework/netex_frames/netex_commonFrame_version-v1.0.xsd
rename to xsd/netex_framework/netex_frames/netex_commonFrame_version.xsd
index 379cb1041..79ef472b1 100644
--- a/xsd/netex_framework/netex_frames/netex_commonFrame_version-v1.0.xsd
+++ b/xsd/netex_framework/netex_frames/netex_commonFrame_version.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_commonFrame_version">
-	<xsd:include schemaLocation="../netex_responsibility/netex_versionFrame_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_reusableComponents/netex_availabilityCondition_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_versionFrame_version.xsd"/>
+	<xsd:include schemaLocation="../netex_reusableComponents/netex_availabilityCondition_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
diff --git a/xsd/netex_framework/netex_frames/netex_compositeFrame_version-v1.0.xsd b/xsd/netex_framework/netex_frames/netex_compositeFrame_version.xsd
similarity index 98%
rename from xsd/netex_framework/netex_frames/netex_compositeFrame_version-v1.0.xsd
rename to xsd/netex_framework/netex_frames/netex_compositeFrame_version.xsd
index b2dd83f03..62d6157fd 100644
--- a/xsd/netex_framework/netex_frames/netex_compositeFrame_version-v1.0.xsd
+++ b/xsd/netex_framework/netex_frames/netex_compositeFrame_version.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_compositeFrame_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_commonFrame_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_commonFrame_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -25,7 +25,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_frames}netex_compositeFrame_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_frames}netex_compositeFrame_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_frames/netex_generalFrame_version-v1.0.xsd b/xsd/netex_framework/netex_frames/netex_generalFrame_version.xsd
similarity index 98%
rename from xsd/netex_framework/netex_frames/netex_generalFrame_version-v1.0.xsd
rename to xsd/netex_framework/netex_frames/netex_generalFrame_version.xsd
index a5592ba05..d2f5b9121 100644
--- a/xsd/netex_framework/netex_frames/netex_generalFrame_version-v1.0.xsd
+++ b/xsd/netex_framework/netex_frames/netex_generalFrame_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_generalFrame_version">
-	<xsd:include schemaLocation="netex_commonFrame_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_responsibility/netex_entity_entity-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_reusableComponents/netex_linkByValue_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_commonFrame_version.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_entity_entity.xsd"/>
+	<xsd:include schemaLocation="../netex_reusableComponents/netex_linkByValue_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_frames}netex_generalFrame_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_frames}netex_generalFrame_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_frames/netex_resourceFrame_support-v1.0.xsd b/xsd/netex_framework/netex_frames/netex_resourceFrame_support.xsd
similarity index 97%
rename from xsd/netex_framework/netex_frames/netex_resourceFrame_support-v1.0.xsd
rename to xsd/netex_framework/netex_frames/netex_resourceFrame_support.xsd
index 110d916d0..109bfae27 100644
--- a/xsd/netex_framework/netex_frames/netex_resourceFrame_support-v1.0.xsd
+++ b/xsd/netex_framework/netex_frames/netex_resourceFrame_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_resourceFrame_support">
-	<xsd:include schemaLocation="../netex_responsibility/netex_versionFrame_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_versionFrame_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -25,7 +25,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_frames}netex_resourceFrame_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_frames}netex_resourceFrame_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_frames/netex_resourceFrame_version-v1.1.xsd b/xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd
similarity index 96%
rename from xsd/netex_framework/netex_frames/netex_resourceFrame_version-v1.1.xsd
rename to xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd
index e4a0de6af..40ae3a72e 100644
--- a/xsd/netex_framework/netex_frames/netex_resourceFrame_version-v1.1.xsd
+++ b/xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_resourceFrame_version">
-	<xsd:include schemaLocation="netex_commonFrame_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_reusableComponents/netex_transportOrganisation_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_all_objects_framework-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_resourceFrame_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_commonFrame_version.xsd"/>
+	<xsd:include schemaLocation="../netex_reusableComponents/netex_transportOrganisation_version.xsd"/>
+	<xsd:include schemaLocation="../netex_all_objects_framework.xsd"/>
+	<xsd:include schemaLocation="netex_resourceFrame_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
diff --git a/xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_support-v1.0.xsd b/xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_support.xsd
similarity index 97%
rename from xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_support-v1.0.xsd
rename to xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_support.xsd
index 82b168ac3..d50acd675 100644
--- a/xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_support-v1.0.xsd
+++ b/xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2006 sp2 U (http://www.altova.com) by christophe duquesne (Dryade SARL) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_serviceCalendar_support">
-	<xsd:include schemaLocation="../netex_responsibility/netex_versionFrame_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_versionFrame_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -26,7 +26,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_frames}netex_serviceCalendarFrame_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_frames}netex_serviceCalendarFrame_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_version-v1.0.xsd b/xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_version.xsd
similarity index 97%
rename from xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_version-v1.0.xsd
rename to xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_version.xsd
index c4cfdbbf8..8684a0f08 100644
--- a/xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_version-v1.0.xsd
+++ b/xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_serviceCalendarFrame_version">
-	<xsd:include schemaLocation="netex_serviceCalendarFrame_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_reusableComponents/netex_serviceCalendar_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_commonFrame_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_serviceCalendarFrame_support.xsd"/>
+	<xsd:include schemaLocation="../netex_reusableComponents/netex_serviceCalendar_version.xsd"/>
+	<xsd:include schemaLocation="netex_commonFrame_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
diff --git a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility-v1.1.xsd b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility.xsd
similarity index 97%
rename from xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility-v1.1.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility.xsd
index feab3b874..d7e07e75d 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility-v1.1.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility.xsd
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework/netex_accessibility}netex_acsb_accessibility-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework/netex_accessibility}netex_acsb_accessibility.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
@@ -56,8 +56,8 @@ Rail transport, Roads and Road transport
 		</xsd:appinfo>
 		<xsd:documentation>ACCESSIBILITY types for IFOPT Fixed Objects in Public Transport.</xsd:documentation>
 	</xsd:annotation>
-	<xsd:include schemaLocation="netex_acsb_limitations-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_acsb_passengerMobility-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_acsb_limitations.xsd"/>
+	<xsd:include schemaLocation="netex_acsb_passengerMobility.xsd"/>
 	<!--===========================================================================================-->
 	<xsd:complexType name="accessibilityLimitations_RelStructure">
 		<xsd:annotation>
diff --git a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_all-v1.0.xsd b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_all.xsd
similarity index 85%
rename from xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_all-v1.0.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_all.xsd
index fb0b16d65..f4c81528b 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_all-v1.0.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_all.xsd
@@ -14,8 +14,8 @@
  -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_acsb_all">
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_acsb_accessibility-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_acsb_limitations-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_acsb_passengerMobility-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_acsb_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_acsb_accessibility.xsd"/>
+	<xsd:include schemaLocation="netex_acsb_limitations.xsd"/>
+	<xsd:include schemaLocation="netex_acsb_passengerMobility.xsd"/>
+	<xsd:include schemaLocation="netex_acsb_support.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations-v1.0.xsd b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations.xsd
similarity index 100%
rename from xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations-v1.0.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations.xsd
diff --git a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_passengerMobility-v1.0.xsd b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_passengerMobility.xsd
similarity index 99%
rename from xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_passengerMobility-v1.0.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_passengerMobility.xsd
index 5d2854f10..cb2d52413 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_passengerMobility-v1.0.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_passengerMobility.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_acsb_passengerMobility">
-	<xsd:include schemaLocation="../../netex_responsibility/netex_responsibility_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_acsb_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_responsibility/netex_responsibility_version.xsd"/>
+	<xsd:include schemaLocation="netex_acsb_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework/netex_accessibility}netex_acsb_passengerMobility-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework/netex_accessibility}netex_acsb_passengerMobility.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_support-v1.0.xsd b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_support.xsd
similarity index 99%
rename from xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_support-v1.0.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_support.xsd
index 72d27c332..cd02996b2 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_support-v1.0.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_support.xsd
@@ -25,7 +25,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework/netex_accessibility}netex_acsb_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework/netex_accessibility}netex_acsb_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
@@ -54,7 +54,7 @@ Rail transport, Roads and Road transport
 		</xsd:appinfo>
 		<xsd:documentation>NeTEx ACCESSIBILITY identifier types for IFOPT Fixed Objects in Public Transport.</xsd:documentation>
 	</xsd:annotation>
-	<xsd:include schemaLocation="../../netex_responsibility/netex_relationship-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_responsibility/netex_relationship.xsd"/>
 	<!--===========================================================================================-->
 	<xsd:simpleType name="LimitationIdType">
 		<xsd:annotation>
diff --git a/xsd/netex_framework/netex_genericFramework/netex_alternativeName_support-v1.0.xsd b/xsd/netex_framework/netex_genericFramework/netex_alternativeName_support.xsd
similarity index 97%
rename from xsd/netex_framework/netex_genericFramework/netex_alternativeName_support-v1.0.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_alternativeName_support.xsd
index de776cf3a..67f147c7f 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_alternativeName_support-v1.0.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_alternativeName_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_alternativeName_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_relationship-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_relationship.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -26,7 +26,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_alternativeName_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_alternativeName_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_alternativeName_version-v1.0.xsd b/xsd/netex_framework/netex_genericFramework/netex_alternativeName_version.xsd
similarity index 97%
rename from xsd/netex_framework/netex_genericFramework/netex_alternativeName_version-v1.0.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_alternativeName_version.xsd
index 947ad77b1..a1acd96b8 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_alternativeName_version-v1.0.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_alternativeName_version.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_alternativeName_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_alternativeName_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_version.xsd"/>
+	<xsd:include schemaLocation="netex_alternativeName_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_alternativeName_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_alternativeName_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_assignment_support-v1.0.xsd b/xsd/netex_framework/netex_genericFramework/netex_assignment_support.xsd
similarity index 97%
rename from xsd/netex_framework/netex_genericFramework/netex_assignment_support-v1.0.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_assignment_support.xsd
index 71a18a6d1..720ea3f4b 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_assignment_support-v1.0.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_assignment_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_assigment_support">
-	<xsd:include schemaLocation="../netex_responsibility/netex_relationship-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_relationship.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -22,7 +22,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_assignment_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_assignment_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_assignment_version-v1.0.xsd b/xsd/netex_framework/netex_genericFramework/netex_assignment_version.xsd
similarity index 97%
rename from xsd/netex_framework/netex_genericFramework/netex_assignment_version-v1.0.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_assignment_version.xsd
index 4d64ca3d6..c725793d7 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_assignment_version-v1.0.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_assignment_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_assignment_version">
-	<xsd:include schemaLocation="netex_assignment_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_responsibility/netex_responsibility_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_assignment_support.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_responsibility_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_assignment_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_assignment_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_grouping_support-v1.0.xsd b/xsd/netex_framework/netex_genericFramework/netex_grouping_support.xsd
similarity index 98%
rename from xsd/netex_framework/netex_genericFramework/netex_grouping_support-v1.0.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_grouping_support.xsd
index 9c150238a..e4b78ae1b 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_grouping_support-v1.0.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_grouping_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_grouping_support">
-	<xsd:include schemaLocation="../netex_responsibility/netex_relationship-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_relationship.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -22,7 +22,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_grouping_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_grouping_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_grouping_version-v1.1.xsd b/xsd/netex_framework/netex_genericFramework/netex_grouping_version.xsd
similarity index 98%
rename from xsd/netex_framework/netex_genericFramework/netex_grouping_version-v1.1.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_grouping_version.xsd
index 5e025ecc3..bbaa62e63 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_grouping_version-v1.1.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_grouping_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_grouping_version">
-	<xsd:include schemaLocation="../netex_utility/netex_utility_types-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_grouping_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_responsibility/netex_typeOfValue_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_utility/netex_utility_types.xsd"/>
+	<xsd:include schemaLocation="netex_grouping_support.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_typeOfValue_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -32,7 +32,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_grouping_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_grouping_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_layer_support-v1.0.xsd b/xsd/netex_framework/netex_genericFramework/netex_layer_support.xsd
similarity index 97%
rename from xsd/netex_framework/netex_genericFramework/netex_layer_support-v1.0.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_layer_support.xsd
index 57f378e70..e5ffaf290 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_layer_support-v1.0.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_layer_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_layer_support">
-	<xsd:include schemaLocation="../netex_responsibility/netex_relationship-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_relationship.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -22,7 +22,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_layer_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_layer_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_layer_version-v1.0.xsd b/xsd/netex_framework/netex_genericFramework/netex_layer_version.xsd
similarity index 95%
rename from xsd/netex_framework/netex_genericFramework/netex_layer_version-v1.0.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_layer_version.xsd
index f73b33ccd..9db2d103f 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_layer_version-v1.0.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_layer_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_layer_version">
-	<xsd:include schemaLocation="netex_layer_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_utility/netex_location_types-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_responsibility/netex_versionFrame_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_grouping_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_layer_support.xsd"/>
+	<xsd:include schemaLocation="../netex_utility/netex_location_types.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_versionFrame_support.xsd"/>
+	<xsd:include schemaLocation="netex_grouping_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -25,7 +25,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_layer_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_layer_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_loggable_support-v1.1.xsd b/xsd/netex_framework/netex_genericFramework/netex_loggable_support.xsd
similarity index 97%
rename from xsd/netex_framework/netex_genericFramework/netex_loggable_support-v1.1.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_loggable_support.xsd
index 79dfbfe26..193daf925 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_loggable_support-v1.1.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_loggable_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_loggable_support">
-	<xsd:include schemaLocation="netex_grouping_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_grouping_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -20,7 +20,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_section_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_section_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Steam Intellect, London N1 1JS</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_loggable_version-v1.1.xsd b/xsd/netex_framework/netex_genericFramework/netex_loggable_version.xsd
similarity index 97%
rename from xsd/netex_framework/netex_genericFramework/netex_loggable_version-v1.1.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_loggable_version.xsd
index 61cad2762..232e2bac2 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_loggable_version-v1.1.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_loggable_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_loggable_version">
-	<xsd:include schemaLocation="netex_loggable_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_loggable_support.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_grouping_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_grouping_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,7 +28,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_section_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_section_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Steam Intellect, London N1 1JS</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_organisation_support-v1.1.xsd b/xsd/netex_framework/netex_genericFramework/netex_organisation_support.xsd
similarity index 98%
rename from xsd/netex_framework/netex_genericFramework/netex_organisation_support-v1.1.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_organisation_support.xsd
index 25a80944d..fa36af943 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_organisation_support-v1.1.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_organisation_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_organisation_support">
-	<xsd:include schemaLocation="../netex_responsibility/netex_responsibility_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_responsibility/netex_relationship_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_zone_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_responsibility_support.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_relationship_support.xsd"/>
+	<xsd:include schemaLocation="netex_zone_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -30,7 +30,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_organisation_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_organisation_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_organisation_version-v1.1.xsd b/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd
similarity index 99%
rename from xsd/netex_framework/netex_genericFramework/netex_organisation_version-v1.1.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd
index f6c7cdd43..f1479bd6e 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_organisation_version-v1.1.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_organisation_version">
-	<xsd:include schemaLocation="../netex_utility/netex_utility_contact-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_responsibility/netex_responsibilitySet_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_alternativeName_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_organisation_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_zone_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_utility/netex_utility_contact.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_responsibilitySet_version.xsd"/>
+	<xsd:include schemaLocation="netex_alternativeName_version.xsd"/>
+	<xsd:include schemaLocation="netex_organisation_support.xsd"/>
+	<xsd:include schemaLocation="netex_zone_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -32,7 +32,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_organisation_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_organisation_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_place_support-v1.0.xsd b/xsd/netex_framework/netex_genericFramework/netex_place_support.xsd
similarity index 99%
rename from xsd/netex_framework/netex_genericFramework/netex_place_support-v1.0.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_place_support.xsd
index f964ca8c8..757de21fe 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_place_support-v1.0.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_place_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_place_support">
-	<xsd:include schemaLocation="../netex_genericFramework/netex_zone_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_zone_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,7 +31,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_framework/netex_genericFramework/netex_place_version-v1.1.xsd b/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd
similarity index 98%
rename from xsd/netex_framework/netex_genericFramework/netex_place_version-v1.1.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_place_version.xsd
index 1ed19b7fe..bb533341b 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_place_version-v1.1.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_place_version">
-	<xsd:include schemaLocation="netex_place_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_genericFramework/netex_zoneProjection_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_place_support.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_zoneProjection_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,11 +31,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}place_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}place_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support-v1.1.xsd b/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd
similarity index 98%
rename from xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support-v1.1.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd
index eb75b407c..b7e521b20 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support-v1.1.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_pointAndLinkSequence_support">
-	<xsd:include schemaLocation="netex_grouping_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_responsibility/netex_responsibility_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_grouping_support.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_responsibility_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -25,7 +25,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_pointAndLinkSequence_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_pointAndLinkSequence_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version-v1.1.xsd b/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd
similarity index 98%
rename from xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version-v1.1.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd
index f4502bfe1..baf397ba6 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version-v1.1.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_pointAndLinkSequence_version">
-	<xsd:include schemaLocation="netex_pointAndLinkSequence_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_section_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_grouping_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_pointAndLinkSequence_support.xsd"/>
+	<xsd:include schemaLocation="netex_section_version.xsd"/>
+	<xsd:include schemaLocation="netex_grouping_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -29,7 +29,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_pointAndLinkSequence_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_pointAndLinkSequence_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_support-v1.1.xsd b/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_support.xsd
similarity index 98%
rename from xsd/netex_framework/netex_genericFramework/netex_pointAndLink_support-v1.1.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_pointAndLink_support.xsd
index ceed5a1cd..460d2a5ce 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_support-v1.1.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_pointAndLink_support">
-	<xsd:include schemaLocation="netex_grouping_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_utility/netex_units-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_grouping_support.xsd"/>
+	<xsd:include schemaLocation="../netex_utility/netex_units.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,7 +28,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_pointAndLink_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_pointAndLink_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version-v1.1.xsd b/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd
similarity index 98%
rename from xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version-v1.1.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd
index ecff0cc32..29b4301e2 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version-v1.1.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_pointAndLink_version">
-	<xsd:include schemaLocation="netex_pointAndLink_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_utility/netex_location_types-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_pointAndLinkSequence_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_pointAndLink_support.xsd"/>
+	<xsd:include schemaLocation="../netex_utility/netex_location_types.xsd"/>
+	<xsd:include schemaLocation="netex_pointAndLinkSequence_support.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_grouping_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_projection_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_grouping_version.xsd"/>
+	<xsd:include schemaLocation="netex_projection_version.xsd"/>
 	<!--fulll gml dependency-->
 	<xsd:import namespace="http://www.opengis.net/gml/3.2" schemaLocation="../../gml/gml_extract_all_objects_v_3_2_1.xsd"/>
 	<!--actual gml dependency-->
@@ -42,7 +42,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_pointAndLink_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_pointAndLink_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_projection_support-v1.0.xsd b/xsd/netex_framework/netex_genericFramework/netex_projection_support.xsd
similarity index 98%
rename from xsd/netex_framework/netex_genericFramework/netex_projection_support-v1.0.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_projection_support.xsd
index 182d90a4c..84de50d5e 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_projection_support-v1.0.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_projection_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="01." id="netex_projection_support">
-	<xsd:include schemaLocation="netex_spatialFeature_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_spatialFeature_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -25,7 +25,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_projection_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_projection_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_projection_version-v1.0.xsd b/xsd/netex_framework/netex_genericFramework/netex_projection_version.xsd
similarity index 99%
rename from xsd/netex_framework/netex_genericFramework/netex_projection_version-v1.0.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_projection_version.xsd
index 445e948db..ad140f491 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_projection_version-v1.0.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_projection_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="01." id="netex_projection_version">
-	<xsd:include schemaLocation="../netex_responsibility/netex_typeOfValue_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_pointAndLinkSequence_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_utility/netex_location_types-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_projection_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_typeOfValue_version.xsd"/>
+	<xsd:include schemaLocation="netex_pointAndLinkSequence_support.xsd"/>
+	<xsd:include schemaLocation="../netex_utility/netex_location_types.xsd"/>
+	<xsd:include schemaLocation="netex_projection_support.xsd"/>
 	<xsd:import namespace="http://www.opengis.net/gml/3.2" schemaLocation="../../gml/gml_extract_all_objects_v_3_2_1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,7 +29,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_projection_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_projection_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_section_support-v1.1.xsd b/xsd/netex_framework/netex_genericFramework/netex_section_support.xsd
similarity index 98%
rename from xsd/netex_framework/netex_genericFramework/netex_section_support-v1.1.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_section_support.xsd
index 6112bddd7..efd188c0f 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_section_support-v1.1.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_section_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_section_support">
-	<xsd:include schemaLocation="netex_pointAndLinkSequence_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_pointAndLinkSequence_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -22,7 +22,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_section_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_section_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Steam Intellect, London N1 1JS</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_section_version-v1.1.xsd b/xsd/netex_framework/netex_genericFramework/netex_section_version.xsd
similarity index 98%
rename from xsd/netex_framework/netex_genericFramework/netex_section_version-v1.1.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_section_version.xsd
index 406d4f95b..cbbd0c35d 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_section_version-v1.1.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_section_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_section_version">
-	<xsd:include schemaLocation="netex_section_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_section_support.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_pointAndLink_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_pointAndLinkSequence_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_pointAndLink_version.xsd"/>
+	<xsd:include schemaLocation="netex_pointAndLinkSequence_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -35,7 +35,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_section_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_section_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Steam Intellect, London N1 1JS</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_support-v1.0.xsd b/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_support.xsd
similarity index 97%
rename from xsd/netex_framework/netex_genericFramework/netex_spatialFeature_support-v1.0.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_spatialFeature_support.xsd
index 0f516b3ad..3a2106434 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_support-v1.0.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_spatialFeature_support">
-	<xsd:include schemaLocation="netex_zone_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_zone_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -25,7 +25,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_spatialFeature_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_spatialFeature_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_version-v1.0.xsd b/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_version.xsd
similarity index 97%
rename from xsd/netex_framework/netex_genericFramework/netex_spatialFeature_version-v1.0.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_spatialFeature_version.xsd
index 3affd2ae6..40b4b75af 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_version-v1.0.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_version.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_spatialFeature_version">
-	<xsd:include schemaLocation="netex_spatialFeature_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_zone_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_spatialFeature_support.xsd"/>
+	<xsd:include schemaLocation="netex_zone_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -26,7 +26,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_spatialFeature_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_spatialFeature_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_zoneProjection_version-v1.0.xsd b/xsd/netex_framework/netex_genericFramework/netex_zoneProjection_version.xsd
similarity index 97%
rename from xsd/netex_framework/netex_genericFramework/netex_zoneProjection_version-v1.0.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_zoneProjection_version.xsd
index f1c777feb..1c4cbf719 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_zoneProjection_version-v1.0.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_zoneProjection_version.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="01." id="netex_zoneProjection_version">
-	<xsd:include schemaLocation="netex_zone_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_zone_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -25,7 +25,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_zoneProjection_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_zoneProjection_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_zone_support-v1.0.xsd b/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd
similarity index 97%
rename from xsd/netex_framework/netex_genericFramework/netex_zone_support-v1.0.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd
index 693c20505..73211f37b 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_zone_support-v1.0.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_zone_version">
-	<xsd:include schemaLocation="netex_pointAndLink_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_pointAndLink_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -25,7 +25,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_zone_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_zone_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_zone_version-v1.1.xsd b/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd
similarity index 98%
rename from xsd/netex_framework/netex_genericFramework/netex_zone_version-v1.1.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd
index 550557ba1..c6566b290 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_zone_version-v1.1.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd
@@ -3,8 +3,8 @@
 	<xsd:import namespace="http://www.opengis.net/gml/3.2" schemaLocation="../../gml/gml_extract_all_objects_v_3_2_1.xsd"/>
 	<!--Actual dependency-->
 	<xsd:import namespace="http://www.opengis.net/gml/3.2" schemaLocation="../../gml/gmlBasic2d-extract-v3_2_1-.xsd"/>
-	<xsd:include schemaLocation="netex_pointAndLink_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_zone_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_pointAndLink_version.xsd"/>
+	<xsd:include schemaLocation="netex_zone_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -31,7 +31,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_zone_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_zone_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_payload_framework-v1.0.xsd b/xsd/netex_framework/netex_payload_framework.xsd
similarity index 98%
rename from xsd/netex_framework/netex_payload_framework-v1.0.xsd
rename to xsd/netex_framework/netex_payload_framework.xsd
index 0f506150e..5f83006f6 100644
--- a/xsd/netex_framework/netex_payload_framework-v1.0.xsd
+++ b/xsd/netex_framework/netex_payload_framework.xsd
@@ -2,7 +2,7 @@
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_payload_framework">
 	<!-- ===Payload ============================= -->
-	<xsd:include schemaLocation="netex_frames/netex_compositeFrame_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_frames/netex_compositeFrame_version.xsd"/>
 	<xsd:complexType name="dataObjects_RelStructure">
 		<xsd:annotation>
 			<xsd:documentation>Type for a list of objects.</xsd:documentation>
diff --git a/xsd/netex_framework/netex_responsibility/netex_alternativeText_support-v1.1.xsd b/xsd/netex_framework/netex_responsibility/netex_alternativeText_support.xsd
similarity index 96%
rename from xsd/netex_framework/netex_responsibility/netex_alternativeText_support-v1.1.xsd
rename to xsd/netex_framework/netex_responsibility/netex_alternativeText_support.xsd
index add326130..57cd90fb3 100644
--- a/xsd/netex_framework/netex_responsibility/netex_alternativeText_support-v1.1.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_alternativeText_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_AlternativeText_support">
-	<xsd:include schemaLocation="netex_relationship_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_relationship_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_AlternativeText_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_AlternativeText_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Steam Intellect, London N1 1JS</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_alternativeText_version-v1.1.xsd b/xsd/netex_framework/netex_responsibility/netex_alternativeText_version.xsd
similarity index 96%
rename from xsd/netex_framework/netex_responsibility/netex_alternativeText_version-v1.1.xsd
rename to xsd/netex_framework/netex_responsibility/netex_alternativeText_version.xsd
index 836099d48..c02a0560b 100644
--- a/xsd/netex_framework/netex_responsibility/netex_alternativeText_version-v1.1.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_alternativeText_version.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_alternativeName_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_alternativeText_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_version.xsd"/>
+	<xsd:include schemaLocation="netex_alternativeText_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -26,7 +26,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_alternativeText_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_alternativeText_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Steam Intellect, London N1 1JS</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_dataSource_version-v1.0.xsd b/xsd/netex_framework/netex_responsibility/netex_dataSource_version.xsd
similarity index 97%
rename from xsd/netex_framework/netex_responsibility/netex_dataSource_version-v1.0.xsd
rename to xsd/netex_framework/netex_responsibility/netex_dataSource_version.xsd
index 9b6cc1a90..76bf3054d 100644
--- a/xsd/netex_framework/netex_responsibility/netex_dataSource_version-v1.0.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_dataSource_version.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_dataSource_version">
-	<xsd:include schemaLocation="netex_typeOfValue_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_typeOfValue_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -22,7 +22,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_dataSource_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_dataSource_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_entity-v1.0.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_entity.xsd
similarity index 95%
rename from xsd/netex_framework/netex_responsibility/netex_entity_entity-v1.0.xsd
rename to xsd/netex_framework/netex_responsibility/netex_entity_entity.xsd
index 077058c76..a9e6dd34e 100644
--- a/xsd/netex_framework/netex_responsibility/netex_entity_entity-v1.0.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_entity_entity.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_entity_entity">
-	<xsd:include schemaLocation="netex_entity_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_version_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_entity_version.xsd"/>
+	<xsd:include schemaLocation="netex_version_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -26,7 +26,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_entity_entity-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_entity_entity.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_support-v1.0.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd
similarity index 99%
rename from xsd/netex_framework/netex_responsibility/netex_entity_support-v1.0.xsd
rename to xsd/netex_framework/netex_responsibility/netex_entity_support.xsd
index c7d75744a..653f089c0 100644
--- a/xsd/netex_framework/netex_responsibility/netex_entity_support-v1.0.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd
@@ -26,7 +26,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_entity_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_entity_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_version-v1.0.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_version.xsd
similarity index 98%
rename from xsd/netex_framework/netex_responsibility/netex_entity_version-v1.0.xsd
rename to xsd/netex_framework/netex_responsibility/netex_entity_version.xsd
index 525bb2cfa..55b5b31e6 100644
--- a/xsd/netex_framework/netex_responsibility/netex_entity_version-v1.0.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_entity_version.xsd
@@ -2,7 +2,7 @@
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <!-- 2207 04 11 recode x,llang to work arround spy bug -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_entity_version">
-	<xsd:include schemaLocation="netex_entity_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_entity_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -24,7 +24,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_entity_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_entity_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_relationship-v1.0.xsd b/xsd/netex_framework/netex_responsibility/netex_relationship.xsd
similarity index 98%
rename from xsd/netex_framework/netex_responsibility/netex_relationship-v1.0.xsd
rename to xsd/netex_framework/netex_responsibility/netex_relationship.xsd
index cb2a313ac..69455981a 100644
--- a/xsd/netex_framework/netex_responsibility/netex_relationship-v1.0.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_relationship.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2009 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_relationship">
-	<xsd:include schemaLocation="netex_relationship_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_relationship_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_relationship-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_relationship.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_relationship_support-v1.1.xsd b/xsd/netex_framework/netex_responsibility/netex_relationship_support.xsd
similarity index 98%
rename from xsd/netex_framework/netex_responsibility/netex_relationship_support-v1.1.xsd
rename to xsd/netex_framework/netex_responsibility/netex_relationship_support.xsd
index 91795b007..997b48a46 100644
--- a/xsd/netex_framework/netex_responsibility/netex_relationship_support-v1.1.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_relationship_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2009 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_relationship_support">
-	<xsd:include schemaLocation="netex_version_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_version_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -30,7 +30,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_relationship_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_relationship_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version-v1.1.xsd b/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd
similarity index 98%
rename from xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version-v1.1.xsd
rename to xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd
index 707abaf59..f693a1d36 100644
--- a/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version-v1.1.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_responsibilitySet">
-	<xsd:include schemaLocation="netex_typeOfValue_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_typeOfValue_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -30,7 +30,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_responsibilitySet_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_responsibilitySet_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_responsibility_support-v1.1.xsd b/xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd
similarity index 98%
rename from xsd/netex_framework/netex_responsibility/netex_responsibility_support-v1.1.xsd
rename to xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd
index f9c5e6dd6..0c15237b0 100644
--- a/xsd/netex_framework/netex_responsibility/netex_responsibility_support-v1.1.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_responsibility_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_responsibility_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
@@ -56,7 +56,7 @@ Rail transport, Roads and Road transport
 		</xsd:appinfo>
 		<xsd:documentation>RESPONSIBILITY i.e. Data administration identifier types for NeTEx.</xsd:documentation>
 	</xsd:annotation>
-	<xsd:include schemaLocation="netex_relationship-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_relationship.xsd"/>
 	<!-- =====Responsibility============================================ -->
 	<xsd:simpleType name="ResponsibilitySetIdType">
 		<xsd:annotation>
diff --git a/xsd/netex_framework/netex_responsibility/netex_responsibility_version-v1.1.xsd b/xsd/netex_framework/netex_responsibility/netex_responsibility_version.xsd
similarity index 96%
rename from xsd/netex_framework/netex_responsibility/netex_responsibility_version-v1.1.xsd
rename to xsd/netex_framework/netex_responsibility/netex_responsibility_version.xsd
index d720d7b90..587c276da 100644
--- a/xsd/netex_framework/netex_responsibility/netex_responsibility_version-v1.1.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_responsibility_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_responsibility">
-	<xsd:include schemaLocation="netex_version_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_responsibility_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_validityCondition_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_alternativeText_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_version_version.xsd"/>
+	<xsd:include schemaLocation="netex_responsibility_support.xsd"/>
+	<xsd:include schemaLocation="netex_validityCondition_version.xsd"/>
+	<xsd:include schemaLocation="netex_alternativeText_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -31,7 +31,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_responsibility_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_responsibility_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_typeOfValue_version-v1.0.xsd b/xsd/netex_framework/netex_responsibility/netex_typeOfValue_version.xsd
similarity index 98%
rename from xsd/netex_framework/netex_responsibility/netex_typeOfValue_version-v1.0.xsd
rename to xsd/netex_framework/netex_responsibility/netex_typeOfValue_version.xsd
index 9fefb77a5..cc1d69bc2 100644
--- a/xsd/netex_framework/netex_responsibility/netex_typeOfValue_version-v1.0.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_typeOfValue_version.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_typeOfValue_version">
-	<xsd:include schemaLocation="netex_responsibility_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_responsibility_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,7 +28,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_typeOfValue_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_typeOfValue_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_validityCondition_support-v1.0.xsd b/xsd/netex_framework/netex_responsibility/netex_validityCondition_support.xsd
similarity index 98%
rename from xsd/netex_framework/netex_responsibility/netex_validityCondition_support-v1.0.xsd
rename to xsd/netex_framework/netex_responsibility/netex_validityCondition_support.xsd
index 7b07dbec9..bdce1272f 100644
--- a/xsd/netex_framework/netex_responsibility/netex_validityCondition_support-v1.0.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_validityCondition_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_validityCondition_support">
-	<xsd:include schemaLocation="netex_relationship-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_relationship.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_validityCondition_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_validityCondition_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_validityCondition_version-v1.0.xsd b/xsd/netex_framework/netex_responsibility/netex_validityCondition_version.xsd
similarity index 98%
rename from xsd/netex_framework/netex_responsibility/netex_validityCondition_version-v1.0.xsd
rename to xsd/netex_framework/netex_responsibility/netex_validityCondition_version.xsd
index 84152bd29..2e10683b4 100644
--- a/xsd/netex_framework/netex_responsibility/netex_validityCondition_version-v1.0.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_validityCondition_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2006 sp2 U (http://www.altova.com) by christophe duquesne (Dryade SARL) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_validityCondition_version">
-	<xsd:include schemaLocation="netex_validityCondition_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_responsibility_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_validityCondition_support.xsd"/>
+	<xsd:include schemaLocation="netex_responsibility_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_validityCondition_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_validityCondition_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_versionDelta_version-v1.0.xsd b/xsd/netex_framework/netex_responsibility/netex_versionDelta_version.xsd
similarity index 98%
rename from xsd/netex_framework/netex_responsibility/netex_versionDelta_version-v1.0.xsd
rename to xsd/netex_framework/netex_responsibility/netex_versionDelta_version.xsd
index 212ec157b..25f492272 100644
--- a/xsd/netex_framework/netex_responsibility/netex_versionDelta_version-v1.0.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_versionDelta_version.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2006 sp2 U (http://www.altova.com) by christophe duquesne (Dryade SARL) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_versionDelta_version">
-	<xsd:include schemaLocation="netex_relationship_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_relationship_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_versionDelta_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_versionDelta_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_versionFrame_support-v1.0.xsd b/xsd/netex_framework/netex_responsibility/netex_versionFrame_support.xsd
similarity index 98%
rename from xsd/netex_framework/netex_responsibility/netex_versionFrame_support-v1.0.xsd
rename to xsd/netex_framework/netex_responsibility/netex_versionFrame_support.xsd
index 0ea32137f..476323641 100644
--- a/xsd/netex_framework/netex_responsibility/netex_versionFrame_support-v1.0.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_versionFrame_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2006 sp2 U (http://www.altova.com) by christophe duquesne (Dryade SARL) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_versionFrame_support">
-	<xsd:include schemaLocation="netex_relationship-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_relationship.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_versionFrame_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_versionFrame_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_versionFrame_version-v1.0.xsd b/xsd/netex_framework/netex_responsibility/netex_versionFrame_version.xsd
similarity index 98%
rename from xsd/netex_framework/netex_responsibility/netex_versionFrame_version-v1.0.xsd
rename to xsd/netex_framework/netex_responsibility/netex_versionFrame_version.xsd
index 42a38ba7b..6cedc8ec4 100644
--- a/xsd/netex_framework/netex_responsibility/netex_versionFrame_version-v1.0.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_versionFrame_version.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2006 sp2 U (http://www.altova.com) by christophe duquesne (Dryade SARL) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_versionFrame_version">
-	<xsd:include schemaLocation="netex_versionFrame_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_typeOfValue_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_utility/netex_location_types-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_responsibility/netex_versionDelta_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_utility/netex_units-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_versionFrame_support.xsd"/>
+	<xsd:include schemaLocation="netex_typeOfValue_version.xsd"/>
+	<xsd:include schemaLocation="../netex_utility/netex_location_types.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_versionDelta_version.xsd"/>
+	<xsd:include schemaLocation="../netex_utility/netex_units.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_versionFrame_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_versionFrame_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_version_support-v1.1.xsd b/xsd/netex_framework/netex_responsibility/netex_version_support.xsd
similarity index 98%
rename from xsd/netex_framework/netex_responsibility/netex_version_support-v1.1.xsd
rename to xsd/netex_framework/netex_responsibility/netex_version_support.xsd
index 227caee8f..b2a1966d8 100644
--- a/xsd/netex_framework/netex_responsibility/netex_version_support-v1.1.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_version_support.xsd
@@ -2,7 +2,7 @@
 <!-- edited with XMLSpy v2009 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <!-- 2207 04 11 recode x,llang to work arround spy bug -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_version_support">
-	<xsd:include schemaLocation="netex_entity_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_entity_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -30,7 +30,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_version_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_version_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_version_version-v1.1.xsd b/xsd/netex_framework/netex_responsibility/netex_version_version.xsd
similarity index 97%
rename from xsd/netex_framework/netex_responsibility/netex_version_version-v1.1.xsd
rename to xsd/netex_framework/netex_responsibility/netex_version_version.xsd
index 0acf29a0a..7254df085 100644
--- a/xsd/netex_framework/netex_responsibility/netex_version_version-v1.1.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_version_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_version_version">
-	<xsd:include schemaLocation="../netex_utility/netex_utility_contact-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_entity_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_responsibility_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_version_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_utility/netex_utility_contact.xsd"/>
+	<xsd:include schemaLocation="netex_entity_version.xsd"/>
+	<xsd:include schemaLocation="netex_responsibility_version.xsd"/>
+	<xsd:include schemaLocation="netex_version_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,7 +28,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_version_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_version_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_access_version-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_access_version.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_access_version-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_access_version.xsd
index 2c1e3696d..c97c81803 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_access_version-v1.0.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_access_version.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_access_version">
-	<xsd:include schemaLocation="../netex_genericFramework/netex_place_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_mode_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_place_version.xsd"/>
+	<xsd:include schemaLocation="netex_mode_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,7 +31,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_accounting_version-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_accounting_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_accounting_version-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_accounting_version.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_address_support-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_address_support.xsd
similarity index 99%
rename from xsd/netex_framework/netex_reusableComponents/netex_address_support-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_address_support.xsd
index 0d39c1ea2..1acf8dc4f 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_address_support-v1.0.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_address_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2006 sp2 U (http://www.altova.com) by christophe duquesne (Dryade SARL) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_address_support">
-	<xsd:include schemaLocation="../netex_genericFramework/netex_place_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_place_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -30,7 +30,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_address_version-v1.1.xsd b/xsd/netex_framework/netex_reusableComponents/netex_address_version.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_address_version-v1.1.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_address_version.xsd
index 84882d807..e25585329 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_address_version-v1.1.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_address_version.xsd
@@ -25,7 +25,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_address_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_address_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
@@ -54,10 +54,10 @@ Rail transport, Roads and Road transport
 		</xsd:appinfo>
 		<xsd:documentation>ADDRESS types for IFOPT Fixed Objects in Public Transport.</xsd:documentation>
 	</xsd:annotation>
-	<xsd:include schemaLocation="../netex_genericFramework/netex_place_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_genericFramework/netex_alternativeName_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_address_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_country_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_place_version.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_alternativeName_version.xsd"/>
+	<xsd:include schemaLocation="netex_address_support.xsd"/>
+	<xsd:include schemaLocation="netex_country_support.xsd"/>
 	<!--=============================================================================-->
 	<!-- ===ENTIITY IN VERSION IN FRAME====Used in SERVICE FRAME)=================================================== -->
 	<xsd:complexType name="addressesInFrame_RelStructure">
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents-v1.0.xsd
deleted file mode 100644
index 4baf10151..000000000
--- a/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents-v1.0.xsd
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
-<xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_reusableComponents">
-	<!-- ======General====================================================== -->
-	<xsd:include schemaLocation="netex_access_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_address_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_address_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_availabilityCondition_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_availabilityCondition_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_country_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_dayType_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_dayType_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_dayType_propertiesOfDay-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_equipment_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_equipmentPlace_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_equipment_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_equipmentVehiclePassenger_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_equipmentVehiclePassenger_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_facility_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_facility_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_linkByValue_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_mode_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_mode_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_notice_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_notice_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_noticeAssignment_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_otherOrganisation_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_otherOrganisation_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_schematicMap_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_securityList_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_securityList_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_serviceCalendar_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_serviceCalendar_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_submode_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_topographicPlace_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_topographicPlace_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_trainElement_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_trainElement_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_transportOrganisation_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_transportOrganisation_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_travelRights_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_travelRights_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleType_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleType_version-v1.1.xsd"/>
-</xsd:schema>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd b/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd
new file mode 100644
index 000000000..5194f3357
--- /dev/null
+++ b/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
+<xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_reusableComponents">
+	<!-- ======General====================================================== -->
+	<xsd:include schemaLocation="netex_access_version.xsd"/>
+	<xsd:include schemaLocation="netex_address_support.xsd"/>
+	<xsd:include schemaLocation="netex_address_version.xsd"/>
+	<xsd:include schemaLocation="netex_availabilityCondition_version.xsd"/>
+	<xsd:include schemaLocation="netex_availabilityCondition_support.xsd"/>
+	<xsd:include schemaLocation="netex_country_support.xsd"/>
+	<xsd:include schemaLocation="netex_dayType_support.xsd"/>
+	<xsd:include schemaLocation="netex_dayType_version.xsd"/>
+	<xsd:include schemaLocation="netex_dayType_propertiesOfDay.xsd"/>
+	<xsd:include schemaLocation="netex_equipment_support.xsd"/>
+	<xsd:include schemaLocation="netex_equipmentPlace_version.xsd"/>
+	<xsd:include schemaLocation="netex_equipment_version.xsd"/>
+	<xsd:include schemaLocation="netex_equipmentVehiclePassenger_support.xsd"/>
+	<xsd:include schemaLocation="netex_equipmentVehiclePassenger_version.xsd"/>
+	<xsd:include schemaLocation="netex_facility_support.xsd"/>
+	<xsd:include schemaLocation="netex_facility_version.xsd"/>
+	<xsd:include schemaLocation="netex_linkByValue_support.xsd"/>
+	<xsd:include schemaLocation="netex_mode_support.xsd"/>
+	<xsd:include schemaLocation="netex_mode_version.xsd"/>
+	<xsd:include schemaLocation="netex_notice_support.xsd"/>
+	<xsd:include schemaLocation="netex_notice_version.xsd"/>
+	<xsd:include schemaLocation="netex_noticeAssignment_version.xsd"/>
+	<xsd:include schemaLocation="netex_otherOrganisation_support.xsd"/>
+	<xsd:include schemaLocation="netex_otherOrganisation_version.xsd"/>
+	<xsd:include schemaLocation="netex_schematicMap_version.xsd"/>
+	<xsd:include schemaLocation="netex_securityList_support.xsd"/>
+	<xsd:include schemaLocation="netex_securityList_version.xsd"/>
+	<xsd:include schemaLocation="netex_serviceCalendar_support.xsd"/>
+	<xsd:include schemaLocation="netex_serviceCalendar_version.xsd"/>
+	<xsd:include schemaLocation="netex_submode_version.xsd"/>
+	<xsd:include schemaLocation="netex_topographicPlace_support.xsd"/>
+	<xsd:include schemaLocation="netex_topographicPlace_version.xsd"/>
+	<xsd:include schemaLocation="netex_trainElement_support.xsd"/>
+	<xsd:include schemaLocation="netex_trainElement_version.xsd"/>
+	<xsd:include schemaLocation="netex_transportOrganisation_support.xsd"/>
+	<xsd:include schemaLocation="netex_transportOrganisation_version.xsd"/>
+	<xsd:include schemaLocation="netex_travelRights_support.xsd"/>
+	<xsd:include schemaLocation="netex_travelRights_version.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleType_support.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleType_version.xsd"/>
+</xsd:schema>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_support-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_support.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_support-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_support.xsd
index 35651b97d..9c98d9733 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_support-v1.0.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2006 sp2 U (http://www.altova.com) by christophe duquesne (Dryade SARL) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_availabilityCondition_support">
-	<xsd:include schemaLocation="../netex_responsibility/netex_validityCondition_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_validityCondition_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_availabilityCondition_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_availabilityCondition_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_version-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_version.xsd
similarity index 99%
rename from xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_version-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_version.xsd
index d4ba10f21..4a832107f 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_version-v1.0.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_availabilityCondition_version">
-	<xsd:include schemaLocation="netex_availabilityCondition_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_serviceCalendar_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_availabilityCondition_support.xsd"/>
+	<xsd:include schemaLocation="netex_serviceCalendar_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -25,7 +25,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_availabilityCondition_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_availabilityCondition_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_country_support-v1.1.xsd b/xsd/netex_framework/netex_reusableComponents/netex_country_support.xsd
similarity index 99%
rename from xsd/netex_framework/netex_reusableComponents/netex_country_support-v1.1.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_country_support.xsd
index 5c5cd5c70..8cc8f8b77 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_country_support-v1.1.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_country_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_country_support">
-	<xsd:include schemaLocation="../netex_genericFramework/netex_place_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_place_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_country_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_country_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_country_version-v1.1.xsd b/xsd/netex_framework/netex_reusableComponents/netex_country_version.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_country_version-v1.1.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_country_version.xsd
index c1e65252a..3be005949 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_country_version-v1.1.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_country_version.xsd
@@ -25,7 +25,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_topographicPlace_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_topographicPlace_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
@@ -56,9 +56,9 @@ Rail transport, Roads and Road transport
 	</xsd:annotation>
 	<!-- ======================================================================= -->
 	<!-- ===IFOPT Name Space includes (Which also may Reference SIRI) ============================================================== -->
-	<xsd:include schemaLocation="netex_address_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_access_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_topographicPlace_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_address_version.xsd"/>
+	<xsd:include schemaLocation="netex_access_version.xsd"/>
+	<xsd:include schemaLocation="netex_topographicPlace_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:complexType name="topographicPlacesInFrame_RelStructure">
 		<xsd:annotation>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_dayType_propertiesOfDay-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_dayType_propertiesOfDay.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_dayType_propertiesOfDay-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_dayType_propertiesOfDay.xsd
index 88e895963..e9c7bf404 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_dayType_propertiesOfDay-v1.0.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_dayType_propertiesOfDay.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_dayType_propertiesOfDay">
-	<xsd:include schemaLocation="../netex_responsibility/netex_relationship-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_utility/netex_utility_xml-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_country_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_relationship.xsd"/>
+	<xsd:include schemaLocation="../netex_utility/netex_utility_xml.xsd"/>
+	<xsd:include schemaLocation="netex_country_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_dayType_propertiesOfDay-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_dayType_propertiesOfDay.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_dayType_support-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_dayType_support.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_dayType_support-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_dayType_support.xsd
index 731f92635..bb725802f 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_dayType_support-v1.0.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_dayType_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2006 sp2 U (http://www.altova.com) by christophe duquesne (Dryade SARL) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_dayType_support">
-	<xsd:include schemaLocation="../netex_responsibility/netex_relationship-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_genericFramework/netex_grouping_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_relationship.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_grouping_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_dayType_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_dayType_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_dayType_version-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_dayType_version.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_dayType_version-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_dayType_version.xsd
index 592f39e40..4b05ca9f2 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_dayType_version-v1.0.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_dayType_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2006 sp2 U (http://www.altova.com) by christophe duquesne (Dryade SARL) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_day_type_version">
-	<xsd:include schemaLocation="netex_dayType_propertiesOfDay-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_dayType_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_responsibility/netex_responsibility_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_genericFramework/netex_grouping_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_dayType_propertiesOfDay.xsd"/>
+	<xsd:include schemaLocation="netex_dayType_support.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_responsibility_version.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_grouping_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -29,7 +29,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_dayType_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_dayType_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipmentPlace_version-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipmentPlace_version.xsd
similarity index 97%
rename from xsd/netex_framework/netex_reusableComponents/netex_equipmentPlace_version-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_equipmentPlace_version.xsd
index 5710645c2..afe139712 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_equipmentPlace_version-v1.0.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_equipmentPlace_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_equipmentPlace_version">
-	<xsd:include schemaLocation="netex_equipment_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_place_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_equipment_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_place_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_equipmentPlace_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_equipmentPlace_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd
index b093b681b..3b20712b8 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support-v1.0.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_equipmentVehiclePassenger_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -22,7 +22,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_equipmentVehiclePassenger_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_equipmentVehiclePassenger_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd
index 3da9eeab4..0ad270766 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version-v1.0.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd
@@ -24,7 +24,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_equipmentVehiclePassenger_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_equipmentVehiclePassenger_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
@@ -53,12 +53,12 @@ Rail transport, Roads and Road transport
 		</xsd:appinfo>
 		<xsd:documentation>VEHICLE PASSENGER EQUIPMENT types for IFOPT Fixed Objects in Public Transport.</xsd:documentation>
 	</xsd:annotation>
-	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_units-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_genericFramework/netex_accessibility/netex_acsb_accessibility-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_equipmentVehiclePassenger_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleType_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_units.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_accessibility/netex_acsb_accessibility.xsd"/>
+	<xsd:include schemaLocation="netex_equipmentVehiclePassenger_support.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleType_support.xsd"/>
 	<xsd:group name="VehicleEquipmentChoice">
 		<xsd:annotation>
 			<xsd:documentation>Choice of VEHICLE EQUIPMENT.</xsd:documentation>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipment_support.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_equipment_support.xsd
index fa236b7ee..cd4a79bb6 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_equipment_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2006 sp2 U (http://www.altova.com) by christophe duquesne (Dryade SARL) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_equipment_support">
-	<xsd:include schemaLocation="../netex_genericFramework/netex_place_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_place_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -26,7 +26,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_equipmnet_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_equipmnet_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipment_version-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipment_version.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_equipment_version-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_equipment_version.xsd
index b1b840235..f831aff21 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_equipment_version-v1.0.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_equipment_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_equipment_version">
-	<xsd:include schemaLocation="../netex_utility/netex_utility_types-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_equipment_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_responsibility/netex_typeOfValue_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_utility/netex_utility_types.xsd"/>
+	<xsd:include schemaLocation="netex_equipment_support.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_typeOfValue_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,7 +29,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_equipment_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_equipment_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_facilityUic_support-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_facilityUic_support.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_facilityUic_support-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_facilityUic_support.xsd
index 89294a8f6..8026af0b7 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_facilityUic_support-v1.0.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_facilityUic_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ifopt="http://www.ifopt.org.uk/ifopt" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_facilityUic_support">
-	<xsd:include schemaLocation="../netex_responsibility/netex_relationship-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_relationship.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -31,7 +31,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2011</Copyright>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_facilityUic_version-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_facilityUic_version.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_facilityUic_version-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_facilityUic_version.xsd
index 53bc1fbac..700d667b2 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_facilityUic_version-v1.0.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_facilityUic_version.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ifopt="http://www.ifopt.org.uk/ifopt" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_facilityUic_version">
-	<xsd:include schemaLocation="../netex_responsibility/netex_relationship-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_relationship.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -31,7 +31,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_facility_support-v1.1.xsd b/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd
similarity index 99%
rename from xsd/netex_framework/netex_reusableComponents/netex_facility_support-v1.1.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd
index 6a8730314..f1ac4e928 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_facility_support-v1.1.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ifopt="http://www.ifopt.org.uk/ifopt" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_facility_support">
-	<xsd:include schemaLocation="../netex_responsibility/netex_relationship-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_relationship.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -40,7 +40,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_facility_version-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd
similarity index 99%
rename from xsd/netex_framework/netex_reusableComponents/netex_facility_version-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd
index 616c4cfa4..c0fe19936 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_facility_version-v1.0.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ifopt="http://www.ifopt.org.uk/ifopt" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_facility_version">
-	<xsd:include schemaLocation="netex_facility_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_travelRights_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_facilityUic_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_equipment_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_facility_support.xsd"/>
+	<xsd:include schemaLocation="netex_travelRights_version.xsd"/>
+	<xsd:include schemaLocation="netex_facilityUic_support.xsd"/>
+	<xsd:include schemaLocation="netex_equipment_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -34,7 +34,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_linkByValue_support-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_linkByValue_support.xsd
similarity index 97%
rename from xsd/netex_framework/netex_reusableComponents/netex_linkByValue_support-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_linkByValue_support.xsd
index b2c853111..824b89ab4 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_linkByValue_support-v1.0.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_linkByValue_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_linkByValue_support">
-	<xsd:include schemaLocation="../netex_genericFramework/netex_pointAndLink_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_mode_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_pointAndLink_version.xsd"/>
+	<xsd:include schemaLocation="netex_mode_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -32,7 +32,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_mode_support-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd
similarity index 99%
rename from xsd/netex_framework/netex_reusableComponents/netex_mode_support-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd
index 26cc8ce57..e42338f82 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_mode_support-v1.0.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_mode_support">
-	<xsd:include schemaLocation="../netex_responsibility/netex_relationship-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_relationship.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -22,7 +22,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_mode_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_mode_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_mode_version-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_mode_version.xsd
similarity index 96%
rename from xsd/netex_framework/netex_reusableComponents/netex_mode_version-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_mode_version.xsd
index aa7eca123..8e3d107ac 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_mode_version-v1.0.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_mode_version.xsd
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_mode_version">
-	<xsd:include schemaLocation="../netex_responsibility/netex_typeOfValue_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_mode_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_submode_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_typeOfValue_version.xsd"/>
+	<xsd:include schemaLocation="netex_mode_support.xsd"/>
+	<xsd:include schemaLocation="netex_submode_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs"><Aggregation>main schema</Aggregation><Audience>e-service developers</Audience><Coverage>Europe</Coverage><Creator>First drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles.  mailto:schemer@netex.org.uk</Creator><Date><Created>2010-09-04</Created></Date><Date><Modified>2011-02-05</Modified></Date><Description><p>NeTEx - Network Exchange. This subschema defines common MODE types.</p></Description><Format><MediaType>text/xml</MediaType><Syntax>http://www.w3.org/2001/XMLSchema</Syntax><Description>XML schema, W3C Recommendation 2001</Description></Format>m
-			<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_mode_version-v1.0.xsd</Identifier>
+			<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_mode_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_noticeAssignment_version-v1.1.xsd b/xsd/netex_framework/netex_reusableComponents/netex_noticeAssignment_version.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_noticeAssignment_version-v1.1.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_noticeAssignment_version.xsd
index bdd692bd3..052059e50 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_noticeAssignment_version-v1.1.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_noticeAssignment_version.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_noticeAssignment_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_genericFramework/netex_pointAndLink_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_genericFramework/netex_section_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_genericFramework/netex_assignment_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_notice_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_pointAndLink_support.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_section_support.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_assignment_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_notice_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -31,7 +31,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_noticeAssignment_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_noticeAssignment_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_notice_support-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_notice_support.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_notice_support-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_notice_support.xsd
index bcdf01f88..9fd1e03c8 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_notice_support-v1.0.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_notice_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_notice_support">
-	<xsd:include schemaLocation="../netex_genericFramework/netex_assignment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_assignment_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_notice_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_notice_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_notice_version-v1.1.xsd b/xsd/netex_framework/netex_reusableComponents/netex_notice_version.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_notice_version-v1.1.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_notice_version.xsd
index f36ab3299..ba300e1b4 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_notice_version-v1.1.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_notice_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_notice_version">
-	<xsd:include schemaLocation="netex_notice_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_responsibility/netex_typeOfValue_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_notice_support.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_typeOfValue_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_notice_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_notice_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_support-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_support.xsd
similarity index 99%
rename from xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_support-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_support.xsd
index adf662a85..312dab027 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_support-v1.0.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_otherOrganisation_support">
-	<xsd:include schemaLocation="../netex_genericFramework/netex_organisation_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_organisation_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_otherOrganisation_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_otherOrganisation_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_version-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_version.xsd
similarity index 97%
rename from xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_version-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_version.xsd
index 929946e00..ddc928af7 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_version-v1.0.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_otherOrganisation_version">
-	<xsd:include schemaLocation="netex_otherOrganisation_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_genericFramework/netex_organisation_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_serviceCalendar_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_address_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_otherOrganisation_support.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_organisation_version.xsd"/>
+	<xsd:include schemaLocation="netex_serviceCalendar_version.xsd"/>
+	<xsd:include schemaLocation="netex_address_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -26,7 +26,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_otherOrganisation_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_otherOrganisation_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_schematicMap_support-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_schematicMap_support.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_schematicMap_support-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_schematicMap_support.xsd
index dbbbdd130..781fab523 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_schematicMap_support-v1.0.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_schematicMap_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2006 sp2 U (http://www.altova.com) by christophe duquesne (Dryade SARL) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_schematicMap_support">
-	<xsd:include schemaLocation="../netex_responsibility/netex_relationship-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_relationship.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_schematicMap_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_schematicMap_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_schematicMap_version-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_schematicMap_version.xsd
similarity index 97%
rename from xsd/netex_framework/netex_reusableComponents/netex_schematicMap_version-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_schematicMap_version.xsd
index 086770ba9..8f9b43594 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_schematicMap_version-v1.0.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_schematicMap_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_schematicMap_version">
-	<xsd:include schemaLocation="../netex_responsibility/netex_responsibility_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_genericFramework/netex_projection_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_utility/netex_utility_types-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_schematicMap_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_responsibility_version.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_projection_version.xsd"/>
+	<xsd:include schemaLocation="../netex_utility/netex_utility_types.xsd"/>
+	<xsd:include schemaLocation="netex_schematicMap_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,7 +28,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_schematicMap_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_schematicMap_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_securityList_support-v1.1.xsd b/xsd/netex_framework/netex_reusableComponents/netex_securityList_support.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_securityList_support-v1.1.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_securityList_support.xsd
index 364e078e6..c21a85f8a 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_securityList_support-v1.1.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_securityList_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_securityList_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -25,11 +25,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_securityList_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_securityList_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Steam Intellect, London N1 1JS </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  ``````````````````````````<Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_securityList_version-v1.1.xsd b/xsd/netex_framework/netex_reusableComponents/netex_securityList_version.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_securityList_version-v1.1.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_securityList_version.xsd
index c14637845..f8e85205a 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_securityList_version-v1.1.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_securityList_version.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_securityList_version">
-	<xsd:include schemaLocation="netex_securityList_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_responsibility/netex_typeOfValue_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_securityList_support.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_typeOfValue_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -26,11 +26,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_securityList_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_securityList_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Steam Intellect, London N1 1JS </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_support-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_support.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_support-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_support.xsd
index 24916ec68..f64f5df32 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_support-v1.0.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2006 sp2 U (http://www.altova.com) by christophe duquesne (Dryade SARL) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_serviceCalendar_support">
-	<xsd:include schemaLocation="../netex_genericFramework/netex_assignment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_assignment_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_schematicMap_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_schematicMap_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_version-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_version.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_version-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_version.xsd
index 4b8915d28..fa352f728 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_version-v1.0.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2011 rel. 2 sp1 (x64) (http://www.altova.com) by Christophe Duquesne (Dryade) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_serviceCalendar_version">
-	<xsd:include schemaLocation="netex_serviceCalendar_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_dayType_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_genericFramework/netex_assignment_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_serviceCalendar_support.xsd"/>
+	<xsd:include schemaLocation="netex_dayType_version.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_assignment_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -25,7 +25,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_serviceCalendar_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_serviceCalendar_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_submode_version-v1.1.xsd b/xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd
similarity index 99%
rename from xsd/netex_framework/netex_reusableComponents/netex_submode_version-v1.1.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd
index c8f12183a..2842b1d05 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_submode_version-v1.1.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_submode_version">
-	<xsd:include schemaLocation="../netex_responsibility/netex_relationship-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_relationship.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,7 +28,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netx_reusableComponents}netex_submode_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netx_reusableComponents}netex_submode_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_support-v1.1.xsd b/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_support.xsd
similarity index 99%
rename from xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_support-v1.1.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_support.xsd
index 848502fb2..05efbfe8c 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_support-v1.1.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_topographicPlace_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_place_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_genericFramework/netex_projection_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_place_support.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_projection_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -30,7 +30,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_topographicPlace_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_topographicPlace_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_version-v1.1.xsd b/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_version.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_version-v1.1.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_version.xsd
index bd382502f..0ded0714f 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_version-v1.1.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_version.xsd
@@ -29,7 +29,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_topographicPlace_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_topographicPlace_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
@@ -60,9 +60,9 @@ Rail transport, Roads and Road transport
 	</xsd:annotation>
 	<!-- ======================================================================= -->
 	<!-- ===IFOPT Name Space includes (Which also may Reference SIRI) ============================================================== -->
-	<xsd:include schemaLocation="netex_address_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_access_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_topographicPlace_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_address_version.xsd"/>
+	<xsd:include schemaLocation="netex_access_version.xsd"/>
+	<xsd:include schemaLocation="netex_topographicPlace_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:complexType name="topographicPlacesInFrame_RelStructure">
 		<xsd:annotation>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_trainElement_support-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd
index 74baaa5f6..e679ab197 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support-v1.0.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_trainElement_support">
-	<xsd:include schemaLocation="netex_vehicleType_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleType_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -32,7 +32,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version-v1.1.xsd b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_trainElement_version-v1.1.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd
index f6f0d82ab..154470bf2 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version-v1.1.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_trainElement">
-	<xsd:include schemaLocation="netex_vehicleType_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_trainElement_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleType_version.xsd"/>
+	<xsd:include schemaLocation="netex_trainElement_support.xsd"/>
 	<xsd:group name="ServiceRequirementTypeGroup">
 		<xsd:annotation>
 			<xsd:documentation>SERVICE REQUIEMENTS for  SERVICE JOURNEY. These are the normal planned values, not necessarily the ACTUAL VEHICLE EQUIPMENT.</xsd:documentation>
@@ -52,11 +52,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_trainElement_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_trainElement_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd
similarity index 99%
rename from xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd
index f4dd874e9..1416d081d 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support-v1.0.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_transportOrganisation_version">
-	<xsd:include schemaLocation="../netex_genericFramework/netex_organisation_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_organisation_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_transportOrganisation_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_transportOrganisation_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd
similarity index 99%
rename from xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd
index 9ae893117..44c051091 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version-v1.0.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_transportOrganisation_version">
-	<xsd:include schemaLocation="netex_transportOrganisation_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_reusableComponents/netex_mode_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_genericFramework/netex_organisation_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_address_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_transportOrganisation_support.xsd"/>
+	<xsd:include schemaLocation="../netex_reusableComponents/netex_mode_version.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_organisation_version.xsd"/>
+	<xsd:include schemaLocation="netex_address_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -26,7 +26,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_transportOrganisation_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_transportOrganisation_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_travelRights_support-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_travelRights_support.xsd
similarity index 99%
rename from xsd/netex_framework/netex_reusableComponents/netex_travelRights_support-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_travelRights_support.xsd
index c5ab9dedd..fe608297c 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_travelRights_support-v1.0.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_travelRights_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_travelRights_support">
-	<xsd:include schemaLocation="../netex_responsibility/netex_responsibility_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_responsibility_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -21,7 +21,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_travelRights_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_travelRights_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_travelRights_version-v1.1.xsd b/xsd/netex_framework/netex_reusableComponents/netex_travelRights_version.xsd
similarity index 97%
rename from xsd/netex_framework/netex_reusableComponents/netex_travelRights_version-v1.1.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_travelRights_version.xsd
index 2cba1d489..c2588383f 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_travelRights_version-v1.1.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_travelRights_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_travelRights_version">
-	<xsd:include schemaLocation="../netex_responsibility/netex_typeOfValue_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_travelRights_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_typeOfValue_version.xsd"/>
+	<xsd:include schemaLocation="netex_travelRights_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -32,11 +32,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_travelRights_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_travelRights_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd
similarity index 99%
rename from xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd
index 771d78cbb..b076d2129 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support-v1.0.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_vehicleType_support">
-	<xsd:include schemaLocation="netex_equipment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_equipment_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -36,7 +36,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version-v1.1.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd
similarity index 99%
rename from xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version-v1.1.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd
index b3ca4b21a..f67e20a70 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version-v1.1.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_vehicleType_version">
-	<xsd:include schemaLocation="netex_vehicleType_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_transportOrganisation_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_equipmentVehiclePassenger_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleType_support.xsd"/>
+	<xsd:include schemaLocation="netex_transportOrganisation_support.xsd"/>
+	<xsd:include schemaLocation="netex_equipmentVehiclePassenger_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -37,7 +37,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_framework/netex_utility/netex_location_types-v1.0.xsd b/xsd/netex_framework/netex_utility/netex_location_types.xsd
similarity index 98%
rename from xsd/netex_framework/netex_utility/netex_location_types-v1.0.xsd
rename to xsd/netex_framework/netex_utility/netex_location_types.xsd
index 2fb3c5793..ed99b1d8d 100644
--- a/xsd/netex_framework/netex_utility/netex_location_types-v1.0.xsd
+++ b/xsd/netex_framework/netex_utility/netex_location_types.xsd
@@ -2,7 +2,7 @@
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <!-- 2007 03 23 Revise projections -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_location_types">
-	<xsd:include schemaLocation="netex_units-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_units.xsd"/>
 	<!--fulll gml dependency-->
 	<xsd:import namespace="http://www.opengis.net/gml/3.2" schemaLocation="../../gml/gml_extract_all_objects_v_3_2_1.xsd"/>
 	<xsd:import namespace="http://www.opengis.net/gml/3.2" schemaLocation="../../gml/geometryBasic0d1d-extract-v3_2_1.xsd"/>
@@ -33,7 +33,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_utility}netex_location_types-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_utility}netex_location_types.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_utility/netex_units-v1.0.xsd b/xsd/netex_framework/netex_utility/netex_units.xsd
similarity index 98%
rename from xsd/netex_framework/netex_utility/netex_units-v1.0.xsd
rename to xsd/netex_framework/netex_utility/netex_units.xsd
index a1b23b88e..4474d3596 100644
--- a/xsd/netex_framework/netex_utility/netex_units-v1.0.xsd
+++ b/xsd/netex_framework/netex_utility/netex_units.xsd
@@ -21,7 +21,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netext.org.uk/schemas/0.4/netex/netex_framework/netex_utility}netex_units-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netext.org.uk/schemas/0.4/netex/netex_framework/netex_utility}netex_units.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_utility/netex_utility_contact-v1.0.xsd b/xsd/netex_framework/netex_utility/netex_utility_contact.xsd
similarity index 96%
rename from xsd/netex_framework/netex_utility/netex_utility_contact-v1.0.xsd
rename to xsd/netex_framework/netex_utility/netex_utility_contact.xsd
index 9fd7e8ff6..d51ab295c 100644
--- a/xsd/netex_framework/netex_utility/netex_utility_contact-v1.0.xsd
+++ b/xsd/netex_framework/netex_utility/netex_utility_contact.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_utility_contact">
-	<xsd:include schemaLocation="netex_utility_types-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_utility_xml-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_utility_types.xsd"/>
+	<xsd:include schemaLocation="netex_utility_xml.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -26,7 +26,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_utility}utility_contact-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_utility}utility_contact.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_utility/netex_utility_time-v1.0.xsd b/xsd/netex_framework/netex_utility/netex_utility_time.xsd
similarity index 99%
rename from xsd/netex_framework/netex_utility/netex_utility_time-v1.0.xsd
rename to xsd/netex_framework/netex_utility/netex_utility_time.xsd
index 0d8625ab4..a0c89db71 100644
--- a/xsd/netex_framework/netex_utility/netex_utility_time-v1.0.xsd
+++ b/xsd/netex_framework/netex_utility/netex_utility_time.xsd
@@ -22,7 +22,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_utility}netex_utility_time-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_utility}netex_utility_time.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
diff --git a/xsd/netex_framework/netex_utility/netex_utility_types-v1.1.xsd b/xsd/netex_framework/netex_utility/netex_utility_types.xsd
similarity index 99%
rename from xsd/netex_framework/netex_utility/netex_utility_types-v1.1.xsd
rename to xsd/netex_framework/netex_utility/netex_utility_types.xsd
index b78fdd22f..b417ab2a4 100644
--- a/xsd/netex_framework/netex_utility/netex_utility_types-v1.1.xsd
+++ b/xsd/netex_framework/netex_utility/netex_utility_types.xsd
@@ -34,7 +34,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_utility}netex_utility_types-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_utility}netex_utility_types.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_utility/netex_utility_xml-v1.0.xsd b/xsd/netex_framework/netex_utility/netex_utility_xml.xsd
similarity index 98%
rename from xsd/netex_framework/netex_utility/netex_utility_xml-v1.0.xsd
rename to xsd/netex_framework/netex_utility/netex_utility_xml.xsd
index b743f3886..aaaa8e2bf 100644
--- a/xsd/netex_framework/netex_utility/netex_utility_xml-v1.0.xsd
+++ b/xsd/netex_framework/netex_utility/netex_utility_xml.xsd
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_utility}netex_utility_xml-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_utility}netex_utility_xml.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
diff --git a/xsd/netex_part_1/netex_all_frames_part1-v1.0.xsd b/xsd/netex_part_1/netex_all_frames_part1.xsd
similarity index 88%
rename from xsd/netex_part_1/netex_all_frames_part1-v1.0.xsd
rename to xsd/netex_part_1/netex_all_frames_part1.xsd
index 8ee6d08fc..ab69f08c1 100644
--- a/xsd/netex_part_1/netex_all_frames_part1-v1.0.xsd
+++ b/xsd/netex_part_1/netex_all_frames_part1.xsd
@@ -2,9 +2,9 @@
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_frames_part1">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="netex_all_objects_part1-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_all_objects_part1.xsd"/>
 	<!-- =====Frames================================================= -->
-	<xsd:include schemaLocation="part1_frames/netex_infrastructureFrame_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="part1_frames/netex_siteFrame_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="part1_frames/netex_infrastructureFrame_version.xsd"/>
+	<xsd:include schemaLocation="part1_frames/netex_siteFrame_version.xsd"/>
 	<!-- ============================================================ -->
 </xsd:schema>
diff --git a/xsd/netex_part_1/netex_all_objects_infrastructureFrame-v1.0.xsd b/xsd/netex_part_1/netex_all_objects_infrastructureFrame.xsd
similarity index 100%
rename from xsd/netex_part_1/netex_all_objects_infrastructureFrame-v1.0.xsd
rename to xsd/netex_part_1/netex_all_objects_infrastructureFrame.xsd
diff --git a/xsd/netex_part_1/netex_all_objects_part1-v1.0.xsd b/xsd/netex_part_1/netex_all_objects_part1.xsd
similarity index 89%
rename from xsd/netex_part_1/netex_all_objects_part1-v1.0.xsd
rename to xsd/netex_part_1/netex_all_objects_part1.xsd
index dd82b04f8..775cebf61 100644
--- a/xsd/netex_part_1/netex_all_objects_part1-v1.0.xsd
+++ b/xsd/netex_part_1/netex_all_objects_part1.xsd
@@ -2,12 +2,12 @@
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_part1">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="../netex_framework/netex_all_objects_framework-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_all_objects_framework.xsd"/>
 	<!-- ======================================================================= -->
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="part1_networkDescription/netex_all_objects_part1_networkDescription-v1.0.xsd"/>
+	<xsd:include schemaLocation="part1_networkDescription/netex_all_objects_part1_networkDescription.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="part1_ifopt/netex_ifopt_all_objects-v1.0.xsd"/>
+	<xsd:include schemaLocation="part1_ifopt/netex_ifopt_all_objects.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="part1_tacticalPlanning/netex_all_objects_part1_tacticalPlanning-v1.0.xsd"/>
+	<xsd:include schemaLocation="part1_tacticalPlanning/netex_all_objects_part1_tacticalPlanning.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_part_1/part1_frames/netex_infrastructureFrame_version-v1.0.xsd b/xsd/netex_part_1/part1_frames/netex_infrastructureFrame_version.xsd
similarity index 96%
rename from xsd/netex_part_1/part1_frames/netex_infrastructureFrame_version-v1.0.xsd
rename to xsd/netex_part_1/part1_frames/netex_infrastructureFrame_version.xsd
index 1e5739010..0a2e0dd80 100644
--- a/xsd/netex_part_1/part1_frames/netex_infrastructureFrame_version-v1.0.xsd
+++ b/xsd/netex_part_1/part1_frames/netex_infrastructureFrame_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_InfrastructureFrame_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_all_objects_generic-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_trainElement_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part1_networkDescription/netex_all_objects_part1_infrastructureFrame_contents-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_commonFrame_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_all_objects_generic.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_trainElement_version.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_all_objects_part1_infrastructureFrame_contents.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_commonFrame_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,7 +28,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_frames}netex_InfrastructureFrame_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_frames}netex_InfrastructureFrame_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_frames/netex_siteFrame_version-v1.1.xsd b/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd
similarity index 97%
rename from xsd/netex_part_1/part1_frames/netex_siteFrame_version-v1.1.xsd
rename to xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd
index 9f5e40a0e..8dd1871b6 100644
--- a/xsd/netex_part_1/part1_frames/netex_siteFrame_version-v1.1.xsd
+++ b/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_siteFrame_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_commonFrame_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_flexibleStopPlace_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_pointOfInterest_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_parking_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_commonFrame_version.xsd"/>
+	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_flexibleStopPlace_version.xsd"/>
+	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_pointOfInterest_version.xsd"/>
+	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_parking_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -35,11 +35,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_frames}netex_siteFrame_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_frames}netex_siteFrame_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>CEN TC278 SG6 and Department for Transport, Great Minster House, 76 Marsham Street, London SW1P 4DR</Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_xxxxx-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_xxxxx.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_support-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_support.xsd
similarity index 97%
rename from xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_support-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_support.xsd
index 8c2cb6ac4..f7eb2f787 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_support-v1.0.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_assistanceBooking_support">
-	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_localService_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_localService_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -30,7 +30,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/xsd//netex_framework/netex_responsibility/netex_relationship-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/xsd//netex_framework/netex_responsibility/netex_relationship.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_version-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_version.xsd
similarity index 94%
rename from xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_version-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_version.xsd
index 5f349a1c3..3586dd96d 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_version-v1.0.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_assistanceBooking_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part1_networkDescription/netex_line_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_assistanceBooking_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_noticeAssignment_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_localService_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_line_support.xsd"/>
+	<xsd:include schemaLocation="netex_assistanceBooking_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_noticeAssignment_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_localService_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,11 +31,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_assistanceBooking_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_assistanceBooking_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/xsd//netex_framework/netex_responsibility/netex_relationship-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/xsd//netex_framework/netex_responsibility/netex_relationship.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_all_objects-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_all_objects.xsd
similarity index 72%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_all_objects-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_all_objects.xsd
index 5889d9cfd..0ca389cee 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_all_objects-v1.0.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_all_objects.xsd
@@ -13,24 +13,24 @@ The Purpose of this file is to overcome a technical limitation in Xerces (and po
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:nx="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_all_objects">
 	<!-- ===Global include of all ACSB namespace elements neeeded to work around XERCES limitation=====-->
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_ifopt_checkConstraint_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentAll-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_flexibleStopPlace_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_flexibleStopPlace_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_path_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_path_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_navigationPath_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_parking_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_parking_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_pointOfInterest_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_pointOfInterest_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_serviceFeature_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_serviceFeature_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_site_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_site_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_stopPlace_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_vehicleStopping_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_stopPlace_version-v1.1.xsd"/>
-	<!--  For some reason OXygen doesnt like this <xsd:include schemaLocation="netex_assistanceBooking_support-v1.0.xsd"/> -->
-	<xsd:include schemaLocation="netex_assistanceBooking_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_checkConstraint_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentAll.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_flexibleStopPlace_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_flexibleStopPlace_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_path_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_path_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_navigationPath_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_parking_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_parking_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_pointOfInterest_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_pointOfInterest_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_serviceFeature_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_serviceFeature_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_site_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_site_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_stopPlace_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_vehicleStopping_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_stopPlace_version.xsd"/>
+	<!--  For some reason OXygen doesnt like this <xsd:include schemaLocation="netex_assistanceBooking_support.xsd"/> -->
+	<xsd:include schemaLocation="netex_assistanceBooking_version.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_support-v1.1.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_support.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_support-v1.1.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_support.xsd
index 8b2be7ce6..be5e59e5e 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_support-v1.1.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_checkConstraint_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -25,7 +25,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_checkConstraint_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_checkConstraint_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_version-v1.1.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_version.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_version-v1.1.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_version.xsd
index b45075a02..f1b9be880 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_version-v1.1.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_version.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_ifopt_checkConstraint_version">
-	<xsd:include schemaLocation="netex_ifopt_checkConstraint_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_checkConstraint_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version.xsd"/>
 	<!--============================================================================================-->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -33,7 +33,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_checkConstraint_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_checkConstraint_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd
similarity index 99%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd
index 06aeb9213..8be6d5b30 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support-v1.0.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_equipmentAccess_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifot_equipmentAccess_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifot_equipmentAccess_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd
similarity index 99%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd
index c6d76374f..8b9057c1c 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version-v1.0.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_equipmentAccess_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentAccess_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipmentPlace_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentAccess_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipmentPlace_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,7 +31,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifot_equipmentAccess_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifot_equipmentAccess_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAll-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAll.xsd
similarity index 91%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAll-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAll.xsd
index 06fb36c36..1cf0f60c3 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAll-v1.0.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAll.xsd
@@ -6,9 +6,9 @@
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs"><Aggregation>main schema</Aggregation><Audience>e-service developers</Audience><Contributor>V1.0 Nicholas Knowles</Contributor><Contributor>Roger Slevin [Roger.Slevin@dft.gsi.gov.uk]</Contributor><Coverage>Europe</Coverage><Creator>Created as W3C .xsd schema by Nicholas Knowles. as 1.0 XML schema </Creator><Date><Created>2007-06-10</Created></Date><Date><Modified>2007-06-22</Modified></Date><Description><p>Equipment types
 
- </p></Description><Format><MediaType>text/xml</MediaType><Syntax>http://www.w3.org/2001/XMLSchema</Syntax><Description>XML schema, W3C Recommendation 2001</Description></Format><Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_Ifopt_equipmentAll-v1.0.xsd</Identifier><Language>[ISO 639-2/B] ENG</Language>netex_Ifopt_equipmentAll-v1.0.xsd
+ </p></Description><Format><MediaType>text/xml</MediaType><Syntax>http://www.w3.org/2001/XMLSchema</Syntax><Description>XML schema, W3C Recommendation 2001</Description></Format><Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_Ifopt_equipmentAll.xsd</Identifier><Language>[ISO 639-2/B] ENG</Language>netex_Ifopt_equipmentAll.xsd
 				<Publisher>CEN TC278 SG6 and Department for Transport, Great Minster House, 76 Marsham Street, London SW1P 4DR</Publisher>
-				<Relation><Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_ifopt_xxxxx-v1.0.xsd</Requires></Relation>
+				<Relation><Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_ifopt_xxxxx.xsd</Requires></Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
 				</Rights>
@@ -30,24 +30,24 @@ Rail transport, Roads and road transport
 	</xsd:annotation>
 	<!-- ======================================================================= -->
 	<!--.....These are the actual dependencies...-->
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentSigns_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentSigns_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentAccess_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentAccess_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentWaiting_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentWaiting_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentTicketing_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentTicketing_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentParking_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentParking_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentPassenger_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentPassenger_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_localService_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_localService_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_localServiceCommercial_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_localServiceCommercial_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentSigns_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentSigns_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentAccess_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentAccess_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentWaiting_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentWaiting_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentTicketing_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentTicketing_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentParking_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentParking_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentPassenger_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentPassenger_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_localService_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_localService_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_localServiceCommercial_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_localServiceCommercial_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:group name="AllEquipmentGroup">
 		<xsd:annotation>
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_support-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_support.xsd
similarity index 97%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_support-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_support.xsd
index fb453c3c9..fae0f5b9c 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_support-v1.0.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_equipmentParking_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentParking_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentParking_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_version-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_version.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_version-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_version.xsd
index b97b22df5..d73d1035e 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_version-v1.0.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_equipmentParking_version">
-	<xsd:include schemaLocation="netex_ifopt_equipmentParking_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipmentPlace_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentParking_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipmentPlace_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -30,7 +30,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentParking_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentParking_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd
index 404465b99..88f7ef6c3 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support-v1.0.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_equipmentPassenger_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentPassenger_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentPassenger_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version-v1.1.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version-v1.1.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd
index ddd2786ef..50deea7b8 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version-v1.1.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_ifopt_equipmentPassenger_version">
-	<xsd:include schemaLocation="netex_ifopt_equipmentPassenger_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentAccess_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentPassenger_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentAccess_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,7 +31,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentPassenger_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentPassenger_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_support-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_support.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_support-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_support.xsd
index a438dbc42..a13e7847e 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_support-v1.0.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_equipmentSign_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentSign_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentSign_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_version-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_version.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_version-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_version.xsd
index 11fa928f8..923ce5ecb 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_version-v1.0.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_equipmentSigns_version">
-	<xsd:include schemaLocation="netex_ifopt_equipmentSigns_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part1_networkDescription/netex_line_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentSigns_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_line_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -26,7 +26,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentSigns_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentSigns_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_support-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_support.xsd
similarity index 97%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_support-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_support.xsd
index 3f224e57a..fe27cbf5b 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_support-v1.0.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_equipmentTicketing_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentTicketing_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentTicketing_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd
similarity index 97%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd
index 2025de18f..f3d3be695 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version-v1.0.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_equipmentTicketing_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentTicketing_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentTicketing_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -30,7 +30,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentTicketing_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentTicketing_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_support-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_support.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_support-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_support.xsd
index 8066b45ef..9efd036d1 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_support-v1.0.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_equipmentWaiting_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentTicketing_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentTicketing_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_version-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_version.xsd
similarity index 99%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_version-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_version.xsd
index 4f119ac8e..84eb81002 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_version-v1.0.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_equipmentWaiting_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentWaiting_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentWaiting_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,7 +29,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentWaiting-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentWaiting.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_support-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_support.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_support-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_support.xsd
index b5fea9ac3..73aee8a7e 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_support-v1.0.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="inetex_ifopt_flexibleStopPlace_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_place_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_place_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -26,7 +26,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_flexibleStopPlace_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_flexibleStopPlace_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_version-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_version.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_version-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_version.xsd
index 79240c324..909a60e24 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_version-v1.0.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_version.xsd
@@ -2,8 +2,8 @@
 <!-- edited with XMLSpy v2009 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <!-- 2007 03 23 Add repeating name -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_flexibleStopPlace_version">
-	<xsd:include schemaLocation="netex_ifopt_flexibleStopPlace_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_stopPlace_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_flexibleStopPlace_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_stopPlace_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_flexibleStopPlace_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_flexibleStopPlace_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>CEN TC278 SG6 and Department for Transport, Great Minster House, 76 Marsham Street, London SW1P 4DR</Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_ifopt_FlexibleStopPlaceModel-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_ifopt_FlexibleStopPlaceModel.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_support-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_support.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_support-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_support.xsd
index a28455752..cb7274ed3 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_support-v1.0.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_localServiceCommercial_support">
-	<xsd:include schemaLocation="netex_ifopt_localService_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_localService_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_localServiceCommecrial_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_localServiceCommecrial_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_version-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_version.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_version-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_version.xsd
index 84975b73c..f3bccd2b5 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_version-v1.0.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_version.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_localServiceCommercial_version">
-	<xsd:include schemaLocation="netex_ifopt_localServiceCommercial_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_localService_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_localServiceCommercial_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_localService_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -24,7 +24,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_localServiceCommercial_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_localServiceCommercial_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_support-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_support.xsd
similarity index 99%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_support-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_support.xsd
index 0529deb8f..e213d41a0 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_support-v1.0.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_localService_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_localService_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_localService_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version-v1.1.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version-v1.1.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version.xsd
index bdab45db8..1d0f56138 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version-v1.1.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version.xsd
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_ifopt_localService_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_utility_types-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_units-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_localService_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_serviceFeature_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_utility_types.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_units.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_localService_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_serviceFeature_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -32,7 +32,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_localService_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_localService_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version-v1.1.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version-v1.1.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version.xsd
index edcaadf6a..351fc378e 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version-v1.1.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version.xsd
@@ -4,12 +4,12 @@
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_ifopt_navigationPath_version">
 	<!-- ======================================================================= -->
 	<!-- ===Global import of all acsb namespace elements neeeded to work around XERCES limitation
-	<xsd:include schemaLocation="../acsb/netex_acsb_all-v1.0.xsd"/> =====-->
+	<xsd:include schemaLocation="../acsb/netex_acsb_all.xsd"/> =====-->
 	<!--.....These are the actual dependencies...-->
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_place_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_path_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_place_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_path_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -47,11 +47,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_navigationPath_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_navigationPath_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>CEN TC278 SG6 and Department for Transport, Great Minster House, 76 Marsham Street, London SW1P 4DR</Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_ifopt_xxxxx-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_ifopt_xxxxx.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_support-v1.1.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_support.xsd
similarity index 99%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_support-v1.1.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_support.xsd
index 17427207c..2b3bdd600 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_support-v1.1.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_ifopt_parking_support">
-	<xsd:include schemaLocation="netex_ifopt_site_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_site_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,7 +28,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_parking_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_parking_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_version-v1.1.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_version.xsd
similarity index 99%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_version-v1.1.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_version.xsd
index 5c36b214e..2e2934c72 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_version-v1.1.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_ifopt_parking_version">
-	<xsd:include schemaLocation="netex_ifopt_parking_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_navigationPath_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_parking_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_navigationPath_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -30,7 +30,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_parking-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_parking.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd
index 4f14bbaba..7cc657e9e 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support-v1.0.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_path_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_site_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_site_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -24,7 +24,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_path_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_path_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd
index fa914f240..b71dc2d4d 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version-v1.0.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd
@@ -2,8 +2,8 @@
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <!-- 2007 03 23 Add repeating name -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_path_version">
-	<xsd:include schemaLocation="netex_ifopt_path_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_site_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_path_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_site_version.xsd"/>
 	<!-- ============================================== -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -33,11 +33,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_Ifopt_path_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_Ifopt_path_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>CEN TC278 SG6 and Department for Transport, Great Minster House, 76 Marsham Street, London SW1P 4DR</Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_ifopt_xxxxx-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_ifopt_xxxxx.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_support-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_support.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_support-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_support.xsd
index 25dedd470..ca3b59673 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_support-v1.0.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_pointOfInterest_support">
-	<xsd:include schemaLocation="netex_ifopt_site_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_site_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,7 +28,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_pointOfInterest_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_pointOfInterest_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_version-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_version.xsd
similarity index 99%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_version-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_version.xsd
index 7d7c60c86..780955b80 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_version-v1.0.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_pointOfInterest_version">
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_ifopt_pointOfInterest_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_navigationPath_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_pointOfInterest_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_navigationPath_version.xsd"/>
 	<!-- ============================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -36,7 +36,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>CEN TC278 SG6 and Department for Transport, Great Minster House, 76 Marsham Street, London SW1P 4DR</Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_ifopt_PointOfInterestModel-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_ifopt_PointOfInterestModel.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
 
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_support-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_support.xsd
similarity index 97%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_support-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_support.xsd
index 3358754d6..fc0a7d612 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_support-v1.0.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_serviceFeature">
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_relationship-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_relationship.xsd"/>
 	<!--===== ========================================================-->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,7 +29,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_serviceFeature-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_serviceFeature.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_version-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_version.xsd
similarity index 96%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_version-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_version.xsd
index 6a5904931..2ec394d55 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_version-v1.0.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_version.xsd
@@ -2,8 +2,8 @@
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <!-- 2007 03 23 Revise projections -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_serviceFeature">
-	<xsd:include schemaLocation="netex_ifopt_serviceFeature_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_typeOfValue_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_serviceFeature_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_typeOfValue_version.xsd"/>
 	<!--===== =================================================================================-->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -32,7 +32,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_serviceFeature-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_serviceFeature.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd
similarity index 99%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd
index 4d8a61ed5..0c972462a 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support-v1.0.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_site_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_address_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_address_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -26,11 +26,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_site_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_site_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd
similarity index 97%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd
index 1c16f8937..fe45b341d 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version-v1.0.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_site_version">
-	<xsd:include schemaLocation="netex_ifopt_site_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipmentPlace_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_address_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_topographicPlace_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_checkConstraint_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentAll-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_site_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipmentPlace_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_address_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_topographicPlace_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_checkConstraint_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentAll.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -37,11 +37,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_site_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_site_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support-v1.1.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support-v1.1.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd
index 83daee07d..4ca14659c 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support-v1.1.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_ifopt_stopPlace_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_utility_types-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_site_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_path_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_utility_types.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_site_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_path_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -30,7 +30,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_stopPlace_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_stopPlace_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version-v1.1.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd
similarity index 99%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version-v1.1.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd
index 18806edaa..32a64af31 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version-v1.1.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd
@@ -39,11 +39,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_Ifopt_stopPlace_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_Ifopt_stopPlace_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>CEN TC278 SG6 and Department for Transport, Great Minster House, 76 Marsham Street, London SW1P 4DR</Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_ifopt_xxxxx-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_ifopt_xxxxx.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
@@ -72,17 +72,17 @@ Rail transport, Roads and Road transport
 		<xsd:documentation>IFOPT STOP PLACE Model.</xsd:documentation>
 	</xsd:annotation>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_topographicPlace_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part1_networkDescription/netex_networkInfrastructure_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_stopPlace_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_vehicleStopping_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_topographicPlace_support.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_networkInfrastructure_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_stopPlace_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_vehicleStopping_support.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_address_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part1_networkDescription/netex_line_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_navigationPath_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentAccess_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentSigns_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_address_version.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_line_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_navigationPath_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentAccess_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentSigns_version.xsd"/>
 	<!-- ======================================================================= -->
 	<!-- ===ENTIITY IN VERSION IN FRAME====(Used in SITE FRAME)=================================================== -->
 	<xsd:complexType name="stopPlacesInFrame_RelStructure">
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_vehicleStopping_support-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_vehicleStopping_support.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_vehicleStopping_support-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_vehicleStopping_support.xsd
index 3f3f7dcd6..76b3f044d 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_vehicleStopping_support-v1.0.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_vehicleStopping_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_vehicleStopping_support">
-	<xsd:include schemaLocation="netex_ifopt_stopPlace_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_stopPlace_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -26,7 +26,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_vehicleStopping_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_vehicleStopping_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_activation_support-v1.0.xsd b/xsd/netex_part_1/part1_networkDescription/netex_activation_support.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_networkDescription/netex_activation_support-v1.0.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_activation_support.xsd
index 4fd63fab5..afee08bbc 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_activation_support-v1.0.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_activation_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_activation_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,11 +29,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_activation_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_activation_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_activation_version-v1.0.xsd b/xsd/netex_part_1/part1_networkDescription/netex_activation_version.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_networkDescription/netex_activation_version-v1.0.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_activation_version.xsd
index 23943be58..15810af2e 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_activation_version-v1.0.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_activation_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_activation_version">
-	<xsd:include schemaLocation="netex_activation_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLink_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_activation_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -30,11 +30,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_activation_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_activation_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_infrastructureFrame_contents-v1.0.xsd b/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_infrastructureFrame_contents.xsd
similarity index 62%
rename from xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_infrastructureFrame_contents-v1.0.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_infrastructureFrame_contents.xsd
index cfebba627..5eedf6d7e 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_infrastructureFrame_contents-v1.0.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_infrastructureFrame_contents.xsd
@@ -3,14 +3,14 @@
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_infrastructureFrame_contents">
 	<!-- ===Dependencies ======================================= -->
 	<!-- ====================================================================== -->
-	<xsd:include schemaLocation="netex_activation_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_activation_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_networkInfrastructure_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_networkInfrastructure_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_networkRestriction_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_networkRestriction_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_timingPattern_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleAndCrewPoint_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleAndCrewPoint_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_activation_support.xsd"/>
+	<xsd:include schemaLocation="netex_activation_version.xsd"/>
+	<xsd:include schemaLocation="netex_networkInfrastructure_support.xsd"/>
+	<xsd:include schemaLocation="netex_networkInfrastructure_version.xsd"/>
+	<xsd:include schemaLocation="netex_networkRestriction_support.xsd"/>
+	<xsd:include schemaLocation="netex_networkRestriction_version.xsd"/>
+	<xsd:include schemaLocation="netex_timingPattern_support.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleAndCrewPoint_version.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleAndCrewPoint_support.xsd"/>
 	<!-- ======================================================================= -->
 </xsd:schema>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_lineRoute-v1.0.xsd b/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_lineRoute-v1.0.xsd
deleted file mode 100644
index 20f347b4c..000000000
--- a/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_lineRoute-v1.0.xsd
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
-<xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_lineRoute">
-	<!-- ===Dependencies ======================================= -->
-	<!-- ===================================================================== -->
-	<xsd:include schemaLocation="netex_flexibleNetwork_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_flexibleNetwork_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_line_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_line_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_lineNetwork_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_lineNetwork_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_route_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_route_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_routeInstruction_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_routeInstruction_version-v1.1.xsd"/>
-	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_timingPattern_support-v1.1.xsd"/>
-</xsd:schema>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_lineRoute.xsd b/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_lineRoute.xsd
new file mode 100644
index 000000000..b8c26f5ab
--- /dev/null
+++ b/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_lineRoute.xsd
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
+<xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_lineRoute">
+	<!-- ===Dependencies ======================================= -->
+	<!-- ===================================================================== -->
+	<xsd:include schemaLocation="netex_flexibleNetwork_support.xsd"/>
+	<xsd:include schemaLocation="netex_flexibleNetwork_version.xsd"/>
+	<xsd:include schemaLocation="netex_line_support.xsd"/>
+	<xsd:include schemaLocation="netex_line_version.xsd"/>
+	<xsd:include schemaLocation="netex_lineNetwork_support.xsd"/>
+	<xsd:include schemaLocation="netex_lineNetwork_version.xsd"/>
+	<xsd:include schemaLocation="netex_route_support.xsd"/>
+	<xsd:include schemaLocation="netex_route_version.xsd"/>
+	<xsd:include schemaLocation="netex_routeInstruction_support.xsd"/>
+	<xsd:include schemaLocation="netex_routeInstruction_version.xsd"/>
+	<!-- ======================================================================= -->
+	<xsd:include schemaLocation="netex_timingPattern_support.xsd"/>
+</xsd:schema>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_networkDescription-v1.0.xsd b/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_networkDescription.xsd
similarity index 86%
rename from xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_networkDescription-v1.0.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_networkDescription.xsd
index ea9408e7b..6cdb80aaf 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_networkDescription-v1.0.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_networkDescription.xsd
@@ -2,9 +2,9 @@
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_networkDescription">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="../../netex_framework/netex_all_objects_framework-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_all_objects_framework.xsd"/>
 	<!-- ====================================================================== -->
 	<!-- ====================================================================== -->
-	<xsd:include schemaLocation="netex_all_objects_part1_infrastructureFrame_contents-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_all_objects_part1_lineRoute-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_all_objects_part1_infrastructureFrame_contents.xsd"/>
+	<xsd:include schemaLocation="netex_all_objects_part1_lineRoute.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_support-v1.0.xsd b/xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_support.xsd
similarity index 97%
rename from xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_support-v1.0.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_support.xsd
index 1d2a5552b..7275d703b 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_support-v1.0.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_flexibleNetwork_support">
-	<xsd:include schemaLocation="netex_route_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_line_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_route_support.xsd"/>
+	<xsd:include schemaLocation="netex_line_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_flexibleNetwork_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_flexibleNetwork_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_version-v1.1.xsd b/xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_version.xsd
similarity index 97%
rename from xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_version-v1.1.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_version.xsd
index 51afcac8a..967937179 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_version-v1.1.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_version.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_flexibleNetwork_version">
-	<xsd:include schemaLocation="netex_flexibleNetwork_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_utility_contact-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_notice_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part1_networkDescription/netex_route_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_flexibleNetwork_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_utility_contact.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_notice_version.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_route_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -13,10 +13,10 @@
 				</Date><Date><Modified>2017-06-11</Modified> Move Booking COntact to shared grou. No functional changep 	
 					
 </Date><Description><p>NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.</p><p>This sub-schema describes the FLEXIBLE NETWORK types.</p></Description><Format><MediaType>text/xml</MediaType><Syntax>http://www.w3.org/2001/XMLSchema</Syntax><Description>XML schema, W3C Recommendation 2001</Description></Format>&gt;
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_flexibleNetwork_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_flexibleNetwork_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
-				<Relation><Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires></Relation>
+				<Relation><Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires></Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
 				</Rights>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_support-v1.1.xsd b/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_support.xsd
similarity index 97%
rename from xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_support-v1.1.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_support.xsd
index 413f10d35..433540edb 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_support-v1.1.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_lineNetwork_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLink_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_section_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLink_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_section_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -30,11 +30,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_lineNetwork_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_lineNetwork_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version-v1.1.xsd b/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version-v1.1.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version.xsd
index d46f40b1e..91547ea29 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version-v1.1.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_lineNetwork_version">
-	<xsd:include schemaLocation="netex_lineNetwork_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_section_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part1_networkDescription/netex_line_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_lineNetwork_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_section_version.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_line_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -32,11 +32,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_lineNetwork_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_lineNetwork_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_line_support-v1.1.xsd b/xsd/netex_part_1/part1_networkDescription/netex_line_support.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_networkDescription/netex_line_support-v1.1.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_line_support.xsd
index 1dc6355ae..4a1a32c1b 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_line_support-v1.1.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_line_support.xsd
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_line_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_grouping_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_grouping_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs"><Aggregation>main schema</Aggregation><Audience>e-service developers</Audience><Contributor>V1.0 Christophe Duquesne</Contributor><Contributor>Nicholas Knowles</Contributor><Coverage>Europe</Coverage><Creator>First drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles.  mailto:schemer@netex.org.uk</Creator><Date><Created>2010-09-04</Created></Date><Date><Modified>2011-02-05</Modified><!-- Name Space changes --></Date><Date><Modified>2017-07-03</Modified> CR025  add secodnary destination context enum
 														CR10 add type of Line 7 Type of Group Enums
 				</Date><Date><Modified>2017-06-28</Modified>CR014  Add GroupOfLinesType				</Date><Description><p>NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.</p><p>This sub-schema describes the LINE identifier  utility types.</p></Description><Format><MediaType>text/xml</MediaType><Syntax>http://www.w3.org/2001/XMLSchema</Syntax><Description>XML schema, W3C Recommendation 2001</Description></Format>&gt;
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_line_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_line_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
-				<Relation><Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires></Relation>
+				<Relation><Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires></Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
 				</Rights>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_line_version-v1.1.xsd b/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_networkDescription/netex_line_version-v1.1.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd
index 01e1fa93f..1435690f2 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_line_version-v1.1.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_line_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_utility_types-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_submode_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_grouping_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_noticeAssignment_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_line_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_route_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_utility_types.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_submode_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_grouping_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_noticeAssignment_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_version.xsd"/>
+	<xsd:include schemaLocation="netex_line_support.xsd"/>
+	<xsd:include schemaLocation="netex_route_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -48,11 +48,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_line_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_line_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_support-v1.0.xsd b/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_support.xsd
similarity index 99%
rename from xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_support-v1.0.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_support.xsd
index 26d6eb225..9ef9e92e0 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_support-v1.0.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_networkInfrastructure_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLink_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLink_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,11 +27,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_networkInfrastructure_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_networkInfrastructure_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_version-v1.0.xsd b/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_version.xsd
similarity index 99%
rename from xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_version-v1.0.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_version.xsd
index 88c0fb3ee..83d6582f4 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_version-v1.0.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_networkInfrastructure_version">
-	<xsd:include schemaLocation="netex_networkInfrastructure_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLink_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_networkInfrastructure_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_networkInfrastructure_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_networkInfrastructure_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_support-v1.0.xsd b/xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_support.xsd
similarity index 97%
rename from xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_support-v1.0.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_support.xsd
index 395cdf957..483cb4d8f 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_support-v1.0.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_networkRestriction_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_vehicleType_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_networkRestriction_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_networkRestriction_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_version-v1.0.xsd b/xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_version.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_version-v1.0.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_version.xsd
index da2d6c355..caef5f5e1 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_version-v1.0.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_networkRestriction_version">
-	<xsd:include schemaLocation="netex_networkInfrastructure_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_networkRestriction_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_networkInfrastructure_version.xsd"/>
+	<xsd:include schemaLocation="netex_networkRestriction_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,10 +27,10 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_networkRestriction_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_networkRestriction_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
-				<Relation><Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires> &gt;
+				<Relation><Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires> &gt;
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_support-v1.1.xsd b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_support.xsd
similarity index 96%
rename from xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_support-v1.1.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_support.xsd
index 9a3519218..7d6d1f0af 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_support-v1.1.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_route_support">
-	<xsd:include schemaLocation="netex_route_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_route_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -26,11 +26,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_route_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_route_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version-v1.1.xsd b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd
similarity index 97%
rename from xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version-v1.1.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd
index 1a05c5bef..cf911bfdd 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version-v1.1.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_route_version">
-	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_path_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_routeInstruction_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_spatialFeature_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_path_support.xsd"/>
+	<xsd:include schemaLocation="netex_routeInstruction_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_spatialFeature_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -32,11 +32,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_route_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_route_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_route_support-v1.1.xsd b/xsd/netex_part_1/part1_networkDescription/netex_route_support.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_networkDescription/netex_route_support-v1.1.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_route_support.xsd
index 396591fed..039c58a3c 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_route_support-v1.1.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_route_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_route_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLink_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLink_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_route_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_route_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_route_version-v1.1.xsd b/xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_networkDescription/netex_route_version-v1.1.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd
index 093446dbe..6fff2fbf6 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_route_version-v1.1.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_route_version">
-	<xsd:include schemaLocation="netex_line_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_routeInstruction_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_line_version.xsd"/>
+	<xsd:include schemaLocation="netex_routeInstruction_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -33,11 +33,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_route_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_route_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_timingPattern_support-v1.1.xsd b/xsd/netex_part_1/part1_networkDescription/netex_timingPattern_support.xsd
similarity index 97%
rename from xsd/netex_part_1/part1_networkDescription/netex_timingPattern_support-v1.1.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_timingPattern_support.xsd
index c37dcf354..5b2dd0ca4 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_timingPattern_support-v1.1.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_timingPattern_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_timingPattern_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_route_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd"/>
+	<xsd:include schemaLocation="netex_route_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -30,11 +30,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_timingPattern_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_timingPattern_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_support-v1.0.xsd b/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_support.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_support-v1.0.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_support.xsd
index c38843cc6..ee7582390 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_support-v1.0.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_vehicleAndCrewPoint_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_address_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_timingPattern_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_address_support.xsd"/>
+	<xsd:include schemaLocation="netex_timingPattern_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_vehicleAndCrewPoint_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_vehicleAndCrewPoint_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_version-v1.1.xsd b/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_version.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_version-v1.1.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_version.xsd
index 56e74fe45..9a278c1f2 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_version-v1.1.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_vehicleAndCrewPoint_version">
-	<xsd:include schemaLocation="netex_vehicleAndCrewPoint_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_address_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part1_tacticalPlanning/netex_timingPattern_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleAndCrewPoint_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_address_version.xsd"/>
+	<xsd:include schemaLocation="../part1_tacticalPlanning/netex_timingPattern_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -32,11 +32,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_vehicleAndCrewPoint_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_vehicleAndCrewPoint_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_all_objects_part1_tacticalPlanning-v1.0.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_all_objects_part1_tacticalPlanning-v1.0.xsd
deleted file mode 100644
index 2ddf087b0..000000000
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_all_objects_part1_tacticalPlanning-v1.0.xsd
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
-<xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_part1_tacticalPlanning">
-	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="../../netex_framework/netex_all_objects_framework-v1.0.xsd"/>
-	<!-- ======================================================================= -->
-	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="../part1_networkDescription/netex_all_objects_part1_networkDescription-v1.0.xsd"/>
-	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_commonSection_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_commonSection_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_fareZone_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_fareZone_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_journeyPattern_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_journeyPattern_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_journeyPatternTimings_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_journeyTiming_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_journeyTiming_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_passengerInformationEquipment_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_passengerInformationEquipment_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_pathAssignment_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_routingConstraint_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_routingConstraint_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_servicePattern_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_servicePattern_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_siteConnection_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_siteConnection_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_stopAssignment_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_stopAssignment_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_timeDemandType_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_timeDemandType_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_timingPattern_version-v1.1.xsd"/>
-</xsd:schema>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_all_objects_part1_tacticalPlanning.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_all_objects_part1_tacticalPlanning.xsd
new file mode 100644
index 000000000..0387d56bc
--- /dev/null
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_all_objects_part1_tacticalPlanning.xsd
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
+<xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_part1_tacticalPlanning">
+	<!-- ===Dependencies ======================================= -->
+	<xsd:include schemaLocation="../../netex_framework/netex_all_objects_framework.xsd"/>
+	<!-- ======================================================================= -->
+	<!-- ======================================================================= -->
+	<xsd:include schemaLocation="../part1_networkDescription/netex_all_objects_part1_networkDescription.xsd"/>
+	<!-- ======================================================================= -->
+	<xsd:include schemaLocation="netex_commonSection_support.xsd"/>
+	<xsd:include schemaLocation="netex_commonSection_version.xsd"/>
+	<xsd:include schemaLocation="netex_fareZone_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareZone_version.xsd"/>
+	<xsd:include schemaLocation="netex_journeyPattern_support.xsd"/>
+	<xsd:include schemaLocation="netex_journeyPattern_version.xsd"/>
+	<xsd:include schemaLocation="netex_journeyPatternTimings_version.xsd"/>
+	<xsd:include schemaLocation="netex_journeyTiming_support.xsd"/>
+	<xsd:include schemaLocation="netex_journeyTiming_version.xsd"/>
+	<xsd:include schemaLocation="netex_passengerInformationEquipment_version.xsd"/>
+	<xsd:include schemaLocation="netex_passengerInformationEquipment_support.xsd"/>
+	<xsd:include schemaLocation="netex_pathAssignment_version.xsd"/>
+	<xsd:include schemaLocation="netex_routingConstraint_support.xsd"/>
+	<xsd:include schemaLocation="netex_routingConstraint_version.xsd"/>
+	<xsd:include schemaLocation="netex_servicePattern_support.xsd"/>
+	<xsd:include schemaLocation="netex_servicePattern_version.xsd"/>
+	<xsd:include schemaLocation="netex_siteConnection_support.xsd"/>
+	<xsd:include schemaLocation="netex_siteConnection_version.xsd"/>
+	<xsd:include schemaLocation="netex_stopAssignment_support.xsd"/>
+	<xsd:include schemaLocation="netex_stopAssignment_version.xsd"/>
+	<xsd:include schemaLocation="netex_timeDemandType_support.xsd"/>
+	<xsd:include schemaLocation="netex_timeDemandType_version.xsd"/>
+	<xsd:include schemaLocation="netex_timingPattern_version.xsd"/>
+</xsd:schema>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_support-v1.1.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_support.xsd
similarity index 96%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_support-v1.1.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_support.xsd
index 0b1ce08dd..a85a21de0 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_support-v1.1.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_commonSection_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_section_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_section_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -20,7 +20,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_commonSection_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_commonSection_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Steam Intellect, London N1 1JS</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_version-v1.1.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_version.xsd
similarity index 97%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_version-v1.1.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_version.xsd
index a6e7987a1..1d3485223 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_version-v1.1.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_commonSection_version">
-	<xsd:include schemaLocation="netex_commonSection_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_commonSection_support.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_section_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_section_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -22,7 +22,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_commonSection_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_commonSection_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Steam Intellect, London N1 1JS</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_support-v1.1.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_support.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_support-v1.1.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_support.xsd
index 15c21f112..282141512 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_support-v1.1.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_fareZone_support">
-	<xsd:include schemaLocation="../part1_tacticalPlanning/netex_servicePattern_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_section_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../part1_tacticalPlanning/netex_servicePattern_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_section_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -36,7 +36,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareZone_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareZone_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_version-v1.1.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_version.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_version-v1.1.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_version.xsd
index 14c65d9ee..c5e494c10 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_version-v1.1.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_fareZone_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareZone_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part1_tacticalPlanning/netex_servicePattern_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part1_networkDescription/netex_route_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareZone_support.xsd"/>
+	<xsd:include schemaLocation="../part1_tacticalPlanning/netex_servicePattern_version.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_route_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareZone_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareZone_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>CEN SWG 9 , 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_support-v1.0.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_support.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_support-v1.0.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_support.xsd
index 28e9c4437..cc8118172 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_support-v1.0.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_journeyPatternTimings_support">
-	<xsd:include schemaLocation="netex_journeyTiming_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_journeyTiming_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyPatternTimings_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyPatternTimings_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_version-v1.0.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_version.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_version-v1.0.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_version.xsd
index e386f84a0..7c762f24a 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_version-v1.0.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_journeyPatternTimings_version">
-	<xsd:include schemaLocation="netex_journeyPattern_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_journeyPatternTimings_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_journeyTiming_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_journeyPattern_support.xsd"/>
+	<xsd:include schemaLocation="netex_journeyPatternTimings_support.xsd"/>
+	<xsd:include schemaLocation="netex_journeyTiming_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -30,11 +30,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyPatternTimings_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyPatternTimings_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support-v1.0.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support-v1.0.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support.xsd
index 365462186..68d490c34 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support-v1.0.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_journeyPattern_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyPattern_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyPattern_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_version-v1.1.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_version.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_version-v1.1.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_version.xsd
index 8f3c6e174..efafc68a0 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_version-v1.1.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_journeyPattern_version">
-	<xsd:include schemaLocation="../part1_networkDescription/netex_line_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_servicePattern_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_journeyPatternTimings_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_line_support.xsd"/>
+	<xsd:include schemaLocation="netex_servicePattern_version.xsd"/>
+	<xsd:include schemaLocation="netex_journeyPatternTimings_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -32,11 +32,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyPattern_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyPattern_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support-v1.0.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support-v1.0.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support.xsd
index c871ab0d4..fd8c3d68c 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support-v1.0.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_journeyTiming_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_relationship-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_relationship.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyTiming_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyTiming_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version-v1.0.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version.xsd
similarity index 97%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version-v1.0.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version.xsd
index 9a24bfb6f..8fc16d430 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version-v1.0.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version.xsd
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_journeyTiming_version">
-	<xsd:include schemaLocation="netex_journeyTiming_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_timeDemandType_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part1_networkDescription/netex_timingPattern_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_dayType_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_journeyTiming_support.xsd"/>
+	<xsd:include schemaLocation="netex_timeDemandType_support.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_timingPattern_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_dayType_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -33,11 +33,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyTiming_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyTiming_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_support-v1.0.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_support.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_support-v1.0.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_support.xsd
index b83a44309..1d95e1cea 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_support-v1.0.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_passengerInformationEquipment_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_passengerInformationEquipment_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_passengerInformationEquipment_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version-v1.0.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version-v1.0.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd
index 27463b573..961ed482d 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version-v1.0.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_passengerInformationEquipment_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part1_networkDescription/netex_line_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_stopPlace_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part1_networkDescription/netex_route_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_passengerInformationEquipment_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_servicePattern_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_support.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_line_support.xsd"/>
+	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_stopPlace_support.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_route_support.xsd"/>
+	<xsd:include schemaLocation="netex_passengerInformationEquipment_support.xsd"/>
+	<xsd:include schemaLocation="netex_servicePattern_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -35,7 +35,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_passengerInformationEquipment_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_passengerInformationEquipment_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_pathAssignment_version-v1.0.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_pathAssignment_version.xsd
similarity index 96%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_pathAssignment_version-v1.0.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_pathAssignment_version.xsd
index df96ba70b..b41c1e061 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_pathAssignment_version-v1.0.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_pathAssignment_version.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_pathAssignment_version">
-	<xsd:include schemaLocation="netex_stopAssignment_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_stopAssignment_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_pathAssignment_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_pathAssignment_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support-v1.0.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd
similarity index 97%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support-v1.0.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd
index 218e7062c..4de0754bc 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support-v1.0.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_routingConstraint_support_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_place_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_place_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_routingConstraint_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_routingConstraint_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_version-v1.0.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_version.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_version-v1.0.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_version.xsd
index 5e88520cd..49be1e6c1 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_version-v1.0.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_version.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_routingConstraint_version">
-	<xsd:include schemaLocation="netex_routingConstraint_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_servicePattern_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_routingConstraint_support.xsd"/>
+	<xsd:include schemaLocation="netex_servicePattern_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_routingConstraint_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_routingConstraint_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support-v1.1.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support-v1.1.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd
index 370325ee4..59c5d3466 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support-v1.1.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_servicePattern_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_place_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part1_networkDescription/netex_timingPattern_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_journeyPattern_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_place_support.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_timingPattern_support.xsd"/>
+	<xsd:include schemaLocation="netex_journeyPattern_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -35,11 +35,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_servicePattern_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_servicePattern_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version-v1.1.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd
similarity index 99%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version-v1.1.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd
index c7b23abe3..d2d060495 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version-v1.1.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd
@@ -2,12 +2,12 @@
 <!-- edited with XMLSpy v2011 rel. 2 sp1 (x64) (http://www.altova.com) by Christophe Duquesne (Dryade) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_servicePattern_version">
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_servicePattern_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part1_tacticalPlanning/netex_fareZone_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_journeyPattern_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_timingPattern_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_siteConnection_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part1_networkDescription/netex_flexibleNetwork_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_servicePattern_support.xsd"/>
+	<xsd:include schemaLocation="../part1_tacticalPlanning/netex_fareZone_support.xsd"/>
+	<xsd:include schemaLocation="netex_journeyPattern_version.xsd"/>
+	<xsd:include schemaLocation="netex_timingPattern_version.xsd"/>
+	<xsd:include schemaLocation="netex_siteConnection_version.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_flexibleNetwork_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -41,11 +41,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_servicePattern_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_servicePattern_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_support-v1.0.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_support.xsd
similarity index 96%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_support-v1.0.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_support.xsd
index 34de849fc..dc561445e 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_support-v1.0.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_siteConnection_support">
-	<xsd:include schemaLocation="netex_servicePattern_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_servicePattern_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -26,11 +26,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_siteConnection_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_siteConnection_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_version-v1.0.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_version.xsd
similarity index 97%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_version-v1.0.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_version.xsd
index d619db51e..53049a3bf 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_version-v1.0.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_siteConnection_version">
-	<xsd:include schemaLocation="netex_siteConnection_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_pointOfInterest_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_parking_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_stopPlace_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_navigationPath_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_siteConnection_support.xsd"/>
+	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_pointOfInterest_support.xsd"/>
+	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_parking_support.xsd"/>
+	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_stopPlace_support.xsd"/>
+	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_navigationPath_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,11 +31,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_siteConnection_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_siteConnection_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support-v1.0.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support-v1.0.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd
index b1d66d817..1854ec569 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support-v1.0.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_stopAssignment_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -26,7 +26,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_stopAssignment_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_stopAssignment_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version-v1.1.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version-v1.1.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd
index 685f12061..92b20b492 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version-v1.1.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_stopAssignment_version">
-	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_stopPlace_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_stopAssignment_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_servicePattern_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_trainElement_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_stopPlace_version.xsd"/>
+	<xsd:include schemaLocation="netex_stopAssignment_support.xsd"/>
+	<xsd:include schemaLocation="netex_servicePattern_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_trainElement_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -33,7 +33,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_stopAssignment_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_stopAssignment_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_support-v1.0.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_support.xsd
similarity index 97%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_support-v1.0.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_support.xsd
index 7363a762a..bca0f9454 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_support-v1.0.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_timeDemandType_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_journeyTiming_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support.xsd"/>
+	<xsd:include schemaLocation="netex_journeyTiming_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_timeDemandType_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_timeDemandType_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_version-v1.0.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_version.xsd
similarity index 97%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_version-v1.0.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_version.xsd
index b1c3fc16d..2ee348a50 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_version-v1.0.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_timeDemandType_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_vehicleType_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLink_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_journeyTiming_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version.xsd"/>
+	<xsd:include schemaLocation="netex_journeyTiming_version.xsd"/>
 	<!--CLOSE COUPLED WITH JOURNEY TIMINGS-->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,11 +31,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_timeDemandType_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_timeDemandType_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version-v1.1.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version-v1.1.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version.xsd
index 1335824cf..cd238c892 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version-v1.1.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_timingPattern_version">
-	<xsd:include schemaLocation="../part1_networkDescription/netex_route_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_noticeAssignment_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_journeyPatternTimings_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_route_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_noticeAssignment_version.xsd"/>
+	<xsd:include schemaLocation="netex_journeyPatternTimings_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -33,11 +33,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_timingPattern_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_timingPattern_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_2/netex_all_frames_part2-v1.0.xsd b/xsd/netex_part_2/netex_all_frames_part2.xsd
similarity index 89%
rename from xsd/netex_part_2/netex_all_frames_part2-v1.0.xsd
rename to xsd/netex_part_2/netex_all_frames_part2.xsd
index 868e1527b..67103dd77 100644
--- a/xsd/netex_part_2/netex_all_frames_part2-v1.0.xsd
+++ b/xsd/netex_part_2/netex_all_frames_part2.xsd
@@ -2,10 +2,10 @@
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_frames_part2">
 	<!-- ===Dependencies ======================================= -->
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="part2_frames/netex_timetableFrame_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="part2_frames/netex_serviceFrame_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="part2_frames/netex_vehicleScheduleFrame_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="part2_frames/netex_driverScheduleFrame_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="part2_frames/netex_timetableFrame_version.xsd"/>
+	<xsd:include schemaLocation="part2_frames/netex_serviceFrame_version.xsd"/>
+	<xsd:include schemaLocation="part2_frames/netex_vehicleScheduleFrame_version.xsd"/>
+	<xsd:include schemaLocation="part2_frames/netex_driverScheduleFrame_version.xsd"/>
 	<!-- ===eGIF/GovTalk Documentation ======================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -27,14 +27,14 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/}netex__all_frames_part-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/}netex__all_frames_part.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/xsd/part2/part2_frames/netex_timetableFrame_version-v1.0.xsd</Requires>
-					<Requires>http://www.netex.org.uk/schemas/1.0/xsd/part2/part2_frames/netex_serviceFrame_version-v1.1.xsd</Requires>
-					<Requires>http://www.netex.org.uk/schemas/1.0/xsd/part2/part2_frames/netex_vehicleScheduleFrame_version-v1.0.xsd</Requires>
-					<Requires>http://www.netex.org.uk/schemas/1.0/xsd/part2/part2_frames/netex_driverScheduleFrame_version-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/xsd/part2/part2_frames/netex_timetableFrame_version.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/xsd/part2/part2_frames/netex_serviceFrame_version.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/xsd/part2/part2_frames/netex_vehicleScheduleFrame_version.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/xsd/part2/part2_frames/netex_driverScheduleFrame_version.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/netex_all_objects_part2-v1.0.xsd b/xsd/netex_part_2/netex_all_objects_part2.xsd
similarity index 92%
rename from xsd/netex_part_2/netex_all_objects_part2-v1.0.xsd
rename to xsd/netex_part_2/netex_all_objects_part2.xsd
index 692ff77b3..a16c55993 100644
--- a/xsd/netex_part_2/netex_all_objects_part2-v1.0.xsd
+++ b/xsd/netex_part_2/netex_all_objects_part2.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_part2">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="../netex_part_1/netex_all_objects_part1-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_part_1/netex_all_objects_part1.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="part2_journeyTimes/netex_all_objects_part2_journeyTimes-v1.0.xsd"/>
+	<xsd:include schemaLocation="part2_journeyTimes/netex_all_objects_part2_journeyTimes.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="part2_vehicleService/netex_all_objects_part2_vehicleService-v1.0.xsd"/>
+	<xsd:include schemaLocation="part2_vehicleService/netex_all_objects_part2_vehicleService.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -27,14 +27,14 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/}netex_all_objects_part2-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/}netex_all_objects_part2.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _all_devices-v1.0.xsd</Requires>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _all_traffic_events-v1.0.xsd</Requires>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _all_quantiseds-v1.0.xsd</Requires>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _network-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _all_devices.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _all_traffic_events.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _all_quantiseds.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _network.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_frames/netex_driverScheduleFrame_version-v1.0.xsd b/xsd/netex_part_2/part2_frames/netex_driverScheduleFrame_version.xsd
similarity index 96%
rename from xsd/netex_part_2/part2_frames/netex_driverScheduleFrame_version-v1.0.xsd
rename to xsd/netex_part_2/part2_frames/netex_driverScheduleFrame_version.xsd
index be6699cb8..a0be96d7a 100644
--- a/xsd/netex_part_2/part2_frames/netex_driverScheduleFrame_version-v1.0.xsd
+++ b/xsd/netex_part_2/part2_frames/netex_driverScheduleFrame_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_driverScheduleFrame_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_commonFrame_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part2_journeyTimes/netex_serviceJourney_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part2_vehicleService/netex_duty_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_commonFrame_version.xsd"/>
+	<xsd:include schemaLocation="../part2_journeyTimes/netex_serviceJourney_version.xsd"/>
+	<xsd:include schemaLocation="../part2_vehicleService/netex_duty_version.xsd"/>
 	<!-- ==== Production DriverSchedule Delivery =========================================-->
 	<xsd:element name="DriverScheduleFrame" substitutionGroup="CommonFrame">
 		<xsd:annotation>
diff --git a/xsd/netex_part_2/part2_frames/netex_serviceFrame_version-v1.1.xsd b/xsd/netex_part_2/part2_frames/netex_serviceFrame_version.xsd
similarity index 96%
rename from xsd/netex_part_2/part2_frames/netex_serviceFrame_version-v1.1.xsd
rename to xsd/netex_part_2/part2_frames/netex_serviceFrame_version.xsd
index 779412a07..e1e7e25f6 100644
--- a/xsd/netex_part_2/part2_frames/netex_serviceFrame_version-v1.1.xsd
+++ b/xsd/netex_part_2/part2_frames/netex_serviceFrame_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_serviceFrame_version">
-	<xsd:include schemaLocation="../../netex_part_1/netex_all_objects_part1-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_commonFrame_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_all_objects_part2-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/netex_all_objects_part1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_commonFrame_version.xsd"/>
+	<xsd:include schemaLocation="../netex_all_objects_part2.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -24,7 +24,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_serviceFrame_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_serviceFrame_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_2/part2_frames/netex_timetableFrame_support-v1.0.xsd b/xsd/netex_part_2/part2_frames/netex_timetableFrame_support.xsd
similarity index 97%
rename from xsd/netex_part_2/part2_frames/netex_timetableFrame_support-v1.0.xsd
rename to xsd/netex_part_2/part2_frames/netex_timetableFrame_support.xsd
index ca1a20d47..d69e5147c 100644
--- a/xsd/netex_part_2/part2_frames/netex_timetableFrame_support-v1.0.xsd
+++ b/xsd/netex_part_2/part2_frames/netex_timetableFrame_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_timetableFrame_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_versionFrame_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_versionFrame_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,11 +27,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_frames}netex_timetableFrame_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_frames}netex_timetableFrame_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_frames/netex_timetableFrame_version-v1.0.xsd b/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd
similarity index 97%
rename from xsd/netex_part_2/part2_frames/netex_timetableFrame_version-v1.0.xsd
rename to xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd
index df6a6f37a..b7f9253e4 100644
--- a/xsd/netex_part_2/part2_frames/netex_timetableFrame_version-v1.0.xsd
+++ b/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_timetableFrame_version">
-	<xsd:include schemaLocation="netex_timetableFrame_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_trainElement_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_serviceCalendarFrame_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part2_journeyTimes/netex_datedVehicleJourney_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_timetableFrame_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_trainElement_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_serviceCalendarFrame_version.xsd"/>
+	<xsd:include schemaLocation="../part2_journeyTimes/netex_datedVehicleJourney_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -24,7 +24,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_timetableFrame_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_timetableFrame_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_2/part2_frames/netex_vehicleScheduleFrame_version-v1.0.xsd b/xsd/netex_part_2/part2_frames/netex_vehicleScheduleFrame_version.xsd
similarity index 94%
rename from xsd/netex_part_2/part2_frames/netex_vehicleScheduleFrame_version-v1.0.xsd
rename to xsd/netex_part_2/part2_frames/netex_vehicleScheduleFrame_version.xsd
index 928dfce22..9d62f90d2 100644
--- a/xsd/netex_part_2/part2_frames/netex_vehicleScheduleFrame_version-v1.0.xsd
+++ b/xsd/netex_part_2/part2_frames/netex_vehicleScheduleFrame_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_vehicleScheduleFrame_version">
-	<xsd:include schemaLocation="netex_timetableFrame_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_serviceCalendarFrame_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part2_journeyTimes/netex_serviceJourney_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part2_vehicleService/netex_vehicleService_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_timetableFrame_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_serviceCalendarFrame_version.xsd"/>
+	<xsd:include schemaLocation="../part2_journeyTimes/netex_serviceJourney_version.xsd"/>
+	<xsd:include schemaLocation="../part2_vehicleService/netex_vehicleService_version.xsd"/>
 	<!-- ==== Production VehicleSchedule Delivery =========================================-->
 	<xsd:element name="VehicleScheduleFrame" substitutionGroup="CommonFrame">
 		<xsd:annotation>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyTimes-v1.0.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyTimes-v1.0.xsd
deleted file mode 100644
index a2886f57c..000000000
--- a/xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyTimes-v1.0.xsd
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_part2_journeyTimes">
-	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="netex_call_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_call_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_coupledJourney_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_coupledJourney_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_flexibleService_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_flexibleService_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_interchange_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_passingTimes_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_passingTimes_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_datedPassingTimes_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_datedVehicleJourney_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_datedVehicleJourney_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_serviceJourney_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_serviceJourney_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_serviceView_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_timeDemandProfile_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_timeDemandTimes_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourney_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourneyTimes_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourneyTimes_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourneyFrequency_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourneyFrequency_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleService_support-v1.0.xsd"/>
-</xsd:schema>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyTimes.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyTimes.xsd
new file mode 100644
index 000000000..a71a8eacc
--- /dev/null
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyTimes.xsd
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_part2_journeyTimes">
+	<!-- ===Dependencies ======================================= -->
+	<xsd:include schemaLocation="netex_call_version.xsd"/>
+	<xsd:include schemaLocation="netex_call_support.xsd"/>
+	<xsd:include schemaLocation="netex_coupledJourney_support.xsd"/>
+	<xsd:include schemaLocation="netex_coupledJourney_version.xsd"/>
+	<xsd:include schemaLocation="netex_flexibleService_support.xsd"/>
+	<xsd:include schemaLocation="netex_flexibleService_version.xsd"/>
+	<xsd:include schemaLocation="netex_interchange_version.xsd"/>
+	<xsd:include schemaLocation="netex_passingTimes_version.xsd"/>
+	<xsd:include schemaLocation="netex_passingTimes_support.xsd"/>
+	<xsd:include schemaLocation="netex_datedPassingTimes_version.xsd"/>
+	<xsd:include schemaLocation="netex_datedVehicleJourney_support.xsd"/>
+	<xsd:include schemaLocation="netex_datedVehicleJourney_version.xsd"/>
+	<xsd:include schemaLocation="netex_serviceJourney_support.xsd"/>
+	<xsd:include schemaLocation="netex_serviceJourney_version.xsd"/>
+	<xsd:include schemaLocation="netex_serviceView_version.xsd"/>
+	<xsd:include schemaLocation="netex_timeDemandProfile_version.xsd"/>
+	<xsd:include schemaLocation="netex_timeDemandTimes_version.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourney_version.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourneyTimes_support.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourneyTimes_version.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourneyFrequency_support.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourneyFrequency_version.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleService_support.xsd"/>
+</xsd:schema>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_call_support-v1.0.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_call_support.xsd
similarity index 96%
rename from xsd/netex_part_2/part2_journeyTimes/netex_call_support-v1.0.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_call_support.xsd
index dd4b82164..0e65bb71d 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_call_support-v1.0.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_call_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_call_support">
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_call_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_call_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_call_version-v1.1.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd
similarity index 97%
rename from xsd/netex_part_2/part2_journeyTimes/netex_call_version-v1.1.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd
index a88b1db1e..67a139c42 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_call_version-v1.1.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_call_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_servicePattern_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_interchangeRule_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_passingTimes_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_call_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleService_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_journeyDesignator_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part2_vehicleService/netex_duty_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd"/>
+	<xsd:include schemaLocation="netex_interchangeRule_version.xsd"/>
+	<xsd:include schemaLocation="netex_passingTimes_version.xsd"/>
+	<xsd:include schemaLocation="netex_call_support.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleService_support.xsd"/>
+	<xsd:include schemaLocation="netex_journeyDesignator_support.xsd"/>
+	<xsd:include schemaLocation="../part2_vehicleService/netex_duty_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -38,11 +38,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_call_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_call_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_support-v1.1.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_support.xsd
similarity index 98%
rename from xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_support-v1.1.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_support.xsd
index 7c6b156e7..1db22dd49 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_support-v1.1.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_coupledJourney_support">
-	<xsd:include schemaLocation="netex_vehicleJourney_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourney_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -30,11 +30,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_coupledJourney_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_coupledJourney_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version-v1.1.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd
similarity index 98%
rename from xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version-v1.1.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd
index a6746413e..f4b7b93c7 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version-v1.1.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_coupledJourney_version">
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_servicePattern_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleService_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleService_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -42,11 +42,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_coupledJourney_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_coupledJourney_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_datedPassingTimes_version-v1.1.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_datedPassingTimes_version.xsd
similarity index 98%
rename from xsd/netex_part_2/part2_journeyTimes/netex_datedPassingTimes_version-v1.1.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_datedPassingTimes_version.xsd
index 2c5d302a4..f870ad762 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_datedPassingTimes_version-v1.1.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_datedPassingTimes_version.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_datedPassingTimes_version">
-	<xsd:include schemaLocation="netex_passingTimes_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_passingTimes_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -30,11 +30,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_datedPassingTimes_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_datedPassingTimes_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_support-v1.0.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_support.xsd
similarity index 98%
rename from xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_support-v1.0.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_support.xsd
index e4d11a155..468fb5dd4 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_support-v1.0.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_datedVehicleJourney_support">
-	<xsd:include schemaLocation="netex_serviceJourney_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_serviceJourney_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -30,7 +30,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/2.0/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support-v1.1.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/2.0/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_version-v1.0.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_version.xsd
similarity index 97%
rename from xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_version-v1.0.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_version.xsd
index a2af90946..d03d16d29 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_version-v1.0.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_dateVehicleJourney_version">
-	<xsd:include schemaLocation="netex_datedVehicleJourney_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_serviceJourney_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_datedPassingTimes_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_call_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_datedVehicleJourney_support.xsd"/>
+	<xsd:include schemaLocation="netex_serviceJourney_version.xsd"/>
+	<xsd:include schemaLocation="netex_datedPassingTimes_version.xsd"/>
+	<xsd:include schemaLocation="netex_call_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,11 +31,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_datedVehcileJourney_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_datedVehcileJourney_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_support-v1.0.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_support.xsd
similarity index 97%
rename from xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_support-v1.0.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_support.xsd
index 8370f1d90..29556c251 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_support-v1.0.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_flexibleService_support">
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_flexibleService_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_flexibleService_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_version-v1.0.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_version.xsd
similarity index 96%
rename from xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_version-v1.0.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_version.xsd
index 834b34411..3cf8054a6 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_version-v1.0.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2011 rel. 2 sp1 (x64) (http://www.altova.com) by Christophe Duquesne (Dryade) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_flexibleService_version">
-	<xsd:include schemaLocation="netex_flexibleService_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_serviceJourney_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_flexibleService_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd"/>
+	<xsd:include schemaLocation="netex_serviceJourney_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,11 +31,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_flexibleService_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_flexibleService_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_interchangeRule_version-v1.1.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_interchangeRule_version.xsd
similarity index 98%
rename from xsd/netex_part_2/part2_journeyTimes/netex_interchangeRule_version-v1.1.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_interchangeRule_version.xsd
index c5a48c507..1fe48d73e 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_interchangeRule_version-v1.1.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_interchangeRule_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_interchangeRule_version">
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_journeyDesignator_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_interchange_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_journeyDesignator_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd"/>
+	<xsd:include schemaLocation="netex_interchange_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -35,11 +35,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_interchangeRule_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_interchangeRule_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_interchange_support-v1.0.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_interchange_support.xsd
similarity index 98%
rename from xsd/netex_part_2/part2_journeyTimes/netex_interchange_support-v1.0.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_interchange_support.xsd
index c150f7d08..bf41a50c4 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_interchange_support-v1.0.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_interchange_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_interchange_support">
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_timeDemandType_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_timeDemandType_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,11 +29,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_interchange_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_interchange_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version-v1.1.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd
similarity index 98%
rename from xsd/netex_part_2/part2_journeyTimes/netex_interchange_version-v1.1.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd
index ff744e92d..c3e86f974 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version-v1.1.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_interchange_version">
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_servicePattern_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_interchange_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_noticeAssignment_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_place_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_line_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourneyFrequency_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd"/>
+	<xsd:include schemaLocation="netex_interchange_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_noticeAssignment_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_place_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_line_version.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourneyFrequency_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -35,11 +35,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_interchange_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_interchange_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_support-v1.0.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_support.xsd
similarity index 96%
rename from xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_support-v1.0.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_support.xsd
index bbd610bbb..ff4fe5151 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_support-v1.0.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_journeyAccounting_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_relationship-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_relationship.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,11 +29,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyAccounting_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyAccounting_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/xsd//netex_framework/netex_responsibility/netex_relationship-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/xsd//netex_framework/netex_responsibility/netex_relationship.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_version-v1.0.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_version.xsd
similarity index 96%
rename from xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_version-v1.0.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_version.xsd
index b78317997..7b7e75371 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_version-v1.0.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_journeyAccounting_version">
-	<xsd:include schemaLocation="netex_journeyAccounting_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_location_types-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_journeyAccounting_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_location_types.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,11 +29,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyAccounting_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyAccounting_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/xsd//netex_framework/netex_responsibility/netex_relationship-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/xsd//netex_framework/netex_responsibility/netex_relationship.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_journeyDesignator_support-v1.0.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_journeyDesignator_support.xsd
similarity index 95%
rename from xsd/netex_part_2/part2_journeyTimes/netex_journeyDesignator_support-v1.0.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_journeyDesignator_support.xsd
index 3de07ce71..a6d00e48d 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_journeyDesignator_support-v1.0.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_journeyDesignator_support.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_journeyDesignator_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_dayType_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_line_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_route_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourney_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_dayType_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_line_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_route_support.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourney_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -30,11 +30,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyDesignator_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyDesignator_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/2.0/xsd/netex_framework/netex_reusableComponents/netex_dayType_support-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/2.0/xsd/netex_framework/netex_reusableComponents/netex_dayType_support.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_journey_version-v1.1.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_journey_version.xsd
similarity index 95%
rename from xsd/netex_part_2/part2_journeyTimes/netex_journey_version-v1.1.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_journey_version.xsd
index f712bb28e..b8ed82488 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_journey_version-v1.1.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_journey_version.xsd
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_journey_version">
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourney_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_noticeAssignment_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_journeyAccounting_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourney_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_noticeAssignment_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version.xsd"/>
+	<xsd:include schemaLocation="netex_journeyAccounting_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -35,7 +35,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journey_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journey_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>CEN SWG 9 , 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_support-v1.0.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_support.xsd
similarity index 98%
rename from xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_support-v1.0.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_support.xsd
index cc0d3a72e..4deaf4cb2 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_support-v1.0.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_passingTimes_support">
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support.xsd"/>
 	<!-- ==CLOSELY COUPLED ===================================================== -->
 	<!-- ======================================================================= -->
 	<xsd:annotation>
@@ -29,11 +29,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_passingTimes_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_passingTimes_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version-v1.1.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd
similarity index 96%
rename from xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version-v1.1.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd
index 15d649c1d..09deab449 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version-v1.1.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_passingTimes_version">
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourney_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_passingTimes_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourney_support.xsd"/>
+	<xsd:include schemaLocation="netex_passingTimes_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version.xsd"/>
 	<!-- ======================================================================= -->
 	<!-- ==CLOSELY COUPLED ===================================================== -->
 	<xsd:annotation>
@@ -34,11 +34,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_passingTimes_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_passingTimes_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_support-v1.0.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_support.xsd
similarity index 98%
rename from xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_support-v1.0.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_support.xsd
index 5409322ab..d0f144589 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_support-v1.0.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_serviceJourney_support">
-	<xsd:include schemaLocation="netex_vehicleJourney_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourney_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -31,7 +31,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/2.0/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support-v1.1.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/2.0/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_version-v1.1.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_version.xsd
similarity index 98%
rename from xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_version-v1.1.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_version.xsd
index 3f4502ffd..915fe0ad6 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_version-v1.1.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_version.xsd
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_serviceJourney_Version">
-	<xsd:include schemaLocation="netex_vehicleJourney_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_flexibleService_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_serviceCalendar_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_flexibleNetwork_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_call_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourney_version.xsd"/>
+	<xsd:include schemaLocation="netex_flexibleService_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_serviceCalendar_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_flexibleNetwork_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd"/>
+	<xsd:include schemaLocation="netex_call_version.xsd"/>
 	<!-- ==CLOSELY COUPLED ===================================================== -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -39,11 +39,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_serviceJourney_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_serviceJourney_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_serviceView_version-v1.0.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_serviceView_version.xsd
similarity index 87%
rename from xsd/netex_part_2/part2_journeyTimes/netex_serviceView_version-v1.0.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_serviceView_version.xsd
index 734b85756..17753160e 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_serviceView_version-v1.0.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_serviceView_version.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_serviceView_version">
-	<xsd:include schemaLocation="netex_serviceJourney_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_serviceJourney_version.xsd"/>
 	<!-- ==== Production Timetable Delivery =========================================-->
 	<!-- ==== Call =========================================-->
 </xsd:schema>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_timeDemandProfile_version-v1.0.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_timeDemandProfile_version.xsd
similarity index 96%
rename from xsd/netex_part_2/part2_journeyTimes/netex_timeDemandProfile_version-v1.0.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_timeDemandProfile_version.xsd
index 3b1d95261..6213eedf2 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_timeDemandProfile_version-v1.0.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_timeDemandProfile_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_timeDemandProfile_version">
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_timeDemandType_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourney_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_timeDemandType_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_version.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourney_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -29,11 +29,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_timeDemandProfile_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_timeDemandProfile_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_timeDemandTimes_version-v1.0.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_timeDemandTimes_version.xsd
similarity index 97%
rename from xsd/netex_part_2/part2_journeyTimes/netex_timeDemandTimes_version-v1.0.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_timeDemandTimes_version.xsd
index 10fddb6a4..3dfaf6aae 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_timeDemandTimes_version-v1.0.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_timeDemandTimes_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_timeDemandTimes_version-v0.1.xsd">
-	<xsd:include schemaLocation="netex_serviceJourney_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_serviceJourney_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,11 +29,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_timeDemandTimes_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_timeDemandTimes_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_support-v1.0.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_support.xsd
similarity index 98%
rename from xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_support-v1.0.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_support.xsd
index 03a81ee95..9c550b901 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_support-v1.0.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_vehicleJourneyFrequency_support">
-	<xsd:include schemaLocation="netex_serviceJourney_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_serviceJourney_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -31,7 +31,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/2.0/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support-v1.1.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/2.0/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_version-v1.1.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_version.xsd
similarity index 98%
rename from xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_version-v1.1.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_version.xsd
index d4d8f4531..051e4a963 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_version-v1.1.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_vehicleJourneyFrequency_version">
-	<xsd:include schemaLocation="netex_vehicleJourneyFrequency_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourneyTimes_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_grouping_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourneyFrequency_support.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourneyTimes_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_grouping_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -35,11 +35,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_vehicleJourneyFrequency_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_vehicleJourneyFrequency_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_support-v1.0.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_support.xsd
similarity index 98%
rename from xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_support-v1.0.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_support.xsd
index deab020f9..5940aea94 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_support-v1.0.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_vehicleJourneyTimes_support">
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -31,7 +31,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/2.0/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support-v1.1.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/2.0/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_version-v1.0.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_version.xsd
similarity index 96%
rename from xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_version-v1.0.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_version.xsd
index 02e2724ae..bf7dd4fd5 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_version-v1.0.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_vehicleJourneyTimes_version">
-	<xsd:include schemaLocation="netex_vehicleJourney_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourneyTimes_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_dayType_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_timeDemandType_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourney_support.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourneyTimes_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_dayType_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_timeDemandType_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,11 +31,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_vehicleJourneyTimes_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_vehicleJourneyTimes_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_support-v1.0.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_support.xsd
similarity index 98%
rename from xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_support-v1.0.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_support.xsd
index fb9e101a3..32304c569 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_support-v1.0.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_vehicleJourney_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_servicePattern_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -32,7 +32,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/2.0/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support-v1.1.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/2.0/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version-v1.1.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd
similarity index 97%
rename from xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version-v1.1.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd
index 778eba89b..f22e1b2b2 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version-v1.1.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_vehicleJourney_version">
-	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_route_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_line_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_vehicleStopping_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_trainElement_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_journey_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourneyFrequency_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourneyTimes_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_passingTimes_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_coupledJourney_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourneyFrequency_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_route_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_line_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_vehicleStopping_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_trainElement_support.xsd"/>
+	<xsd:include schemaLocation="netex_journey_version.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourneyFrequency_version.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourneyTimes_version.xsd"/>
+	<xsd:include schemaLocation="netex_passingTimes_version.xsd"/>
+	<xsd:include schemaLocation="netex_coupledJourney_version.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourneyFrequency_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -43,11 +43,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_vehicleJourney_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_vehicleJourney_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleService_support-v1.0.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleService_support.xsd
similarity index 98%
rename from xsd/netex_part_2/part2_journeyTimes/netex_vehicleService_support-v1.0.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_vehicleService_support.xsd
index 9d6813edc..19b63ddaf 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleService_support-v1.0.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleService_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_vehicleService_support">
-	<xsd:include schemaLocation="netex_coupledJourney_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_coupledJourney_support.xsd"/>
 	<!-- ====BLOCK======================================================== -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_vehicleService_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_vehicleService_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_vehicleService/netex_all_objects_part2_vehicleService-v1.0.xsd b/xsd/netex_part_2/part2_vehicleService/netex_all_objects_part2_vehicleService.xsd
similarity index 87%
rename from xsd/netex_part_2/part2_vehicleService/netex_all_objects_part2_vehicleService-v1.0.xsd
rename to xsd/netex_part_2/part2_vehicleService/netex_all_objects_part2_vehicleService.xsd
index 8c8f7566d..fd358704a 100644
--- a/xsd/netex_part_2/part2_vehicleService/netex_all_objects_part2_vehicleService-v1.0.xsd
+++ b/xsd/netex_part_2/part2_vehicleService/netex_all_objects_part2_vehicleService.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_part2_vehicleService">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="netex_duty_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_duty_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleService_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_duty_version.xsd"/>
+	<xsd:include schemaLocation="netex_duty_support.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleService_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -25,14 +25,14 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_vehicleService}netex_all_objects-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_vehicleService}netex_all_objects.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _all_devices-v1.0.xsd</Requires>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _all_traffic_events-v1.0.xsd</Requires>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _all_quantiseds-v1.0.xsd</Requires>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _network-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _all_devices.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _all_traffic_events.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _all_quantiseds.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _network.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_vehicleService/netex_duty_support-v1.0.xsd b/xsd/netex_part_2/part2_vehicleService/netex_duty_support.xsd
similarity index 98%
rename from xsd/netex_part_2/part2_vehicleService/netex_duty_support-v1.0.xsd
rename to xsd/netex_part_2/part2_vehicleService/netex_duty_support.xsd
index 0a5e61e89..edefd4c99 100644
--- a/xsd/netex_part_2/part2_vehicleService/netex_duty_support-v1.0.xsd
+++ b/xsd/netex_part_2/part2_vehicleService/netex_duty_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_duty_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_relationship-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_relationship.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,11 +27,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_vehicleService}netex_duty_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_vehicleService}netex_duty_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_vehicleService/netex_duty_version-v1.0.xsd b/xsd/netex_part_2/part2_vehicleService/netex_duty_version.xsd
similarity index 98%
rename from xsd/netex_part_2/part2_vehicleService/netex_duty_version-v1.0.xsd
rename to xsd/netex_part_2/part2_vehicleService/netex_duty_version.xsd
index 3fde17d8f..30f0b228b 100644
--- a/xsd/netex_part_2/part2_vehicleService/netex_duty_version-v1.0.xsd
+++ b/xsd/netex_part_2/part2_vehicleService/netex_duty_version.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_duty_version">
-	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_timingPattern_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part2_frames/netex_timetableFrame_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part2_journeyTimes/netex_vehicleService_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_duty_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_timingPattern_support.xsd"/>
+	<xsd:include schemaLocation="../part2_frames/netex_timetableFrame_support.xsd"/>
+	<xsd:include schemaLocation="../part2_journeyTimes/netex_vehicleService_support.xsd"/>
+	<xsd:include schemaLocation="netex_duty_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -32,11 +32,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_vehicleService}netex_duty_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_vehicleService}netex_duty_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_vehicleService/netex_vehicleService_version-v1.1.xsd b/xsd/netex_part_2/part2_vehicleService/netex_vehicleService_version.xsd
similarity index 99%
rename from xsd/netex_part_2/part2_vehicleService/netex_vehicleService_version-v1.1.xsd
rename to xsd/netex_part_2/part2_vehicleService/netex_vehicleService_version.xsd
index e85d19572..f99750e1d 100644
--- a/xsd/netex_part_2/part2_vehicleService/netex_vehicleService_version-v1.1.xsd
+++ b/xsd/netex_part_2/part2_vehicleService/netex_vehicleService_version.xsd
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_vehicleService_version">
-	<xsd:include schemaLocation="../part2_journeyTimes/netex_vehicleService_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_line_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part2_journeyTimes/netex_journeyDesignator_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_vehicleType_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part2_journeyTimes/netex_coupledJourney_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../part2_journeyTimes/netex_vehicleService_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_line_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_support.xsd"/>
+	<xsd:include schemaLocation="../part2_journeyTimes/netex_journeyDesignator_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd"/>
+	<xsd:include schemaLocation="../part2_journeyTimes/netex_coupledJourney_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -35,11 +35,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_vehicleService}netex_vehicleService_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_vehicleService}netex_vehicleService_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_PiQuery/netex_all_objects_part3_piQuery-v1.0.xsd b/xsd/netex_part_3/part3_PiQuery/netex_all_objects_part3_piQuery.xsd
similarity index 87%
rename from xsd/netex_part_3/part3_PiQuery/netex_all_objects_part3_piQuery-v1.0.xsd
rename to xsd/netex_part_3/part3_PiQuery/netex_all_objects_part3_piQuery.xsd
index 742922035..cb600ed51 100644
--- a/xsd/netex_part_3/part3_PiQuery/netex_all_objects_part3_piQuery-v1.0.xsd
+++ b/xsd/netex_part_3/part3_PiQuery/netex_all_objects_part3_piQuery.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_part3_piQuery">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="netex_piRequest_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_piRequest_support.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_part_3/part3_PiQuery/netex_piQuery_support-v1.0.xsd b/xsd/netex_part_3/part3_PiQuery/netex_piQuery_support.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_PiQuery/netex_piQuery_support-v1.0.xsd
rename to xsd/netex_part_3/part3_PiQuery/netex_piQuery_support.xsd
index c06c0620b..ed40e91f1 100644
--- a/xsd/netex_part_3/part3_PiQuery/netex_piQuery_support-v1.0.xsd
+++ b/xsd/netex_part_3/part3_PiQuery/netex_piQuery_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_piQuery_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_support.xsd"/>
 	<!-- =============================================================== -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_piQuery_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_piQuery_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_PiQuery/netex_piRequest_support-v1.1.xsd b/xsd/netex_part_3/part3_PiQuery/netex_piRequest_support.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_PiQuery/netex_piRequest_support-v1.1.xsd
rename to xsd/netex_part_3/part3_PiQuery/netex_piRequest_support.xsd
index 17d2ea011..240a6e550 100644
--- a/xsd/netex_part_3/part3_PiQuery/netex_piRequest_support-v1.1.xsd
+++ b/xsd/netex_part_3/part3_PiQuery/netex_piRequest_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_piRequest_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_support.xsd"/>
 	<!-- =============================================================== -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -30,11 +30,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_piRequest_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_piRequest_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_support.xsd
similarity index 97%
rename from xsd/netex_part_3/part3_fares/netex_accessRightParameter_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_accessRightParameter_support.xsd
index f75a2dc43..3d445fe4e 100644
--- a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_support-v1.0.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_support.xsd
@@ -2,8 +2,8 @@
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_accessRightParameter_support">
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_farePrice_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -29,11 +29,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_accessRightParameter_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_accessRightParameter_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version-v1.1.xsd b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd
similarity index 95%
rename from xsd/netex_part_3/part3_fares/netex_accessRightParameter_version-v1.1.xsd
rename to xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd
index dee3f62e5..5a32424a7 100644
--- a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version-v1.1.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_accessRightParameter_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_serviceCalendar_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_dayType_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_site_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_line_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_servicePattern_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_route_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_vehicleJourney_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_fareZone_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_validableElement_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareStructureElement_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_qualityStructureFactor_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_timeStructureFactor_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_distanceMatrixElement_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParametersAll_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_serviceJourney_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareProduct_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_salesDistribution_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_salesPackage_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_travelDocument_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_serviceCalendar_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_dayType_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_line_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_route_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_vehicleJourney_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_fareZone_support.xsd"/>
+	<xsd:include schemaLocation="netex_validableElement_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructureElement_support.xsd"/>
+	<xsd:include schemaLocation="netex_qualityStructureFactor_support.xsd"/>
+	<xsd:include schemaLocation="netex_timeStructureFactor_support.xsd"/>
+	<xsd:include schemaLocation="netex_distanceMatrixElement_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParametersAll_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_serviceJourney_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareProduct_support.xsd"/>
+	<xsd:include schemaLocation="netex_salesDistribution_support.xsd"/>
+	<xsd:include schemaLocation="netex_salesPackage_support.xsd"/>
+	<xsd:include schemaLocation="netex_travelDocument_support.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_distanceMatrixElement_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_submode_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_distanceMatrixElement_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_submode_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_version.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_accessRightParameter_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameter_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_accessRightParameter_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -67,11 +67,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_accessRightParameter_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_accessRightParameter_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares-v1.1.xsd b/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares.xsd
similarity index 65%
rename from xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares-v1.1.xsd
rename to xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares.xsd
index 4eaa5636a..d271069b6 100644
--- a/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares-v1.1.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares.xsd
@@ -2,8 +2,8 @@
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_all_objects_part3_fares">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="netex_all_objects_part3_fares_FP-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_all_objects_part3_fares_FS-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_all_objects_part3_fares_AR-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_all_objects_part3_fares_SD-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_all_objects_part3_fares_FP.xsd"/>
+	<xsd:include schemaLocation="netex_all_objects_part3_fares_FS.xsd"/>
+	<xsd:include schemaLocation="netex_all_objects_part3_fares_AR.xsd"/>
+	<xsd:include schemaLocation="netex_all_objects_part3_fares_SD.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_AR-v1.1.xsd b/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_AR.xsd
similarity index 73%
rename from xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_AR-v1.1.xsd
rename to xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_AR.xsd
index 4cc703937..3cd1f7343 100644
--- a/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_AR-v1.1.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_AR.xsd
@@ -2,27 +2,27 @@
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_all_objects_part3_fares_AR">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="netex_accessRightParameter_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_accessRightParameter_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_fareConditionSummary_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareConditionSummary_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareProduct_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareProduct_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameter_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameter_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterAfterSales_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterAfterSales_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterBooking_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterBooking_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterCharging_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterCharging_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterEligibility_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterEligibility_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterEntitlement_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterEntitlement_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterLuggage_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterLuggage_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterTravel_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterTravel_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParametersAll_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_accessRightParameter_support.xsd"/>
+	<xsd:include schemaLocation="netex_accessRightParameter_version.xsd"/>
+	<xsd:include schemaLocation="netex_fareConditionSummary_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareConditionSummary_version.xsd"/>
+	<xsd:include schemaLocation="netex_fareProduct_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareProduct_version.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_version.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterAfterSales_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterAfterSales_version.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterBooking_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterBooking_version.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterCharging_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterCharging_version.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterEligibility_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterEligibility_version.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterEntitlement_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterEntitlement_version.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterLuggage_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterLuggage_version.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterTravel_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterTravel_version.xsd"/>
+	<xsd:include schemaLocation="netex_usageParametersAll_support.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_FP-v1.1.xsd b/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_FP.xsd
similarity index 67%
rename from xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_FP-v1.1.xsd
rename to xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_FP.xsd
index 06046306e..905ea00b5 100644
--- a/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_FP-v1.1.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_FP.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_all_objects_part3_fares_FP">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="netex_calculationParameters_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_calculationParameters_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_farePrice_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_farePrice_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_fareTable_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareTable_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_calculationParameters_support.xsd"/>
+	<xsd:include schemaLocation="netex_calculationParameters_version.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_support.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_version.xsd"/>
+	<xsd:include schemaLocation="netex_fareTable_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareTable_version.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_FS-v1.1.xsd b/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_FS.xsd
similarity index 61%
rename from xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_FS-v1.1.xsd
rename to xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_FS.xsd
index 20a1c1715..1bc5f63ba 100644
--- a/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_FS-v1.1.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_FS.xsd
@@ -2,20 +2,20 @@
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_all_objects_part3_fares_FS">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="netex_distanceMatrixElement_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_distanceMatrixElement_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_fareSeries_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareSeries_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareStructure_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareStructure_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareStructureElement_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareStructureElement_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_geographicStructureFactor_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_geographicStructureFactor_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_qualityStructureFactor_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_qualityStructureFactor_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_timeStructureFactor_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_timeStructureFactor_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_validableElement_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_validableElement_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_distanceMatrixElement_support.xsd"/>
+	<xsd:include schemaLocation="netex_distanceMatrixElement_version.xsd"/>
+	<xsd:include schemaLocation="netex_fareSeries_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareSeries_version.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructure_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructure_version.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructureElement_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructureElement_version.xsd"/>
+	<xsd:include schemaLocation="netex_geographicStructureFactor_support.xsd"/>
+	<xsd:include schemaLocation="netex_geographicStructureFactor_version.xsd"/>
+	<xsd:include schemaLocation="netex_qualityStructureFactor_support.xsd"/>
+	<xsd:include schemaLocation="netex_qualityStructureFactor_version.xsd"/>
+	<xsd:include schemaLocation="netex_timeStructureFactor_version.xsd"/>
+	<xsd:include schemaLocation="netex_timeStructureFactor_support.xsd"/>
+	<xsd:include schemaLocation="netex_validableElement_support.xsd"/>
+	<xsd:include schemaLocation="netex_validableElement_version.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_SD-v1.1.xsd b/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_SD.xsd
similarity index 58%
rename from xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_SD-v1.1.xsd
rename to xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_SD.xsd
index 5ef69f12e..84045e723 100644
--- a/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_SD-v1.1.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_SD.xsd
@@ -2,10 +2,10 @@
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_all_objects_part3_fares_SD">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="netex_salesDistribution_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_salesDistribution_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_salesPackage_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_salesPackage_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_travelDocument_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_travelDocument_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_salesDistribution_support.xsd"/>
+	<xsd:include schemaLocation="netex_salesDistribution_version.xsd"/>
+	<xsd:include schemaLocation="netex_salesPackage_support.xsd"/>
+	<xsd:include schemaLocation="netex_salesPackage_version.xsd"/>
+	<xsd:include schemaLocation="netex_travelDocument_support.xsd"/>
+	<xsd:include schemaLocation="netex_travelDocument_version.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_part_3/part3_fares/netex_calculationParameters_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_calculationParameters_support.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_fares/netex_calculationParameters_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_calculationParameters_support.xsd
index d6fa15777..0963c6dc0 100644
--- a/xsd/netex_part_3/part3_fares/netex_calculationParameters_support-v1.0.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_calculationParameters_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_calculationParameters_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_dayType_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_relationship_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_dayType_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_relationship_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_calculationParameters_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_calculationParameters_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_calculationParameters_version-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_calculationParameters_version.xsd
similarity index 99%
rename from xsd/netex_part_3/part3_fares/netex_calculationParameters_version-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_calculationParameters_version.xsd
index a1468444b..1e745dd8f 100644
--- a/xsd/netex_part_3/part3_fares/netex_calculationParameters_version-v1.0.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_calculationParameters_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_calculationParameters_version">
-	<xsd:include schemaLocation="netex_calculationParameters_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_dayType_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_calculationParameters_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_dayType_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,11 +29,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_calculationParameters_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_calculationParameters_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_support.xsd
similarity index 97%
rename from xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_support.xsd
index 868e77a72..622f4a852 100644
--- a/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_support-v1.0.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_distanceMatrixElement_support">
-	<xsd:include schemaLocation="netex_farePrice_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_linkByValue_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_linkByValue_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,11 +29,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_distanceMatrixElement_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_distanceMatrixElement_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version-v1.1.xsd b/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version-v1.1.xsd
rename to xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version.xsd
index bde85ceeb..775fc413c 100644
--- a/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version-v1.1.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.10" id="netex_distanceMatrixElement_version">
-	<xsd:include schemaLocation="netex_fareSeries_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareTable_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_geographicStructureFactor_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareSeries_version.xsd"/>
+	<xsd:include schemaLocation="netex_fareTable_version.xsd"/>
+	<xsd:include schemaLocation="netex_geographicStructureFactor_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -32,11 +32,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_distanceMatrixElement_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_distanceMatrixElement_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_fareConditionSummary_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_fareConditionSummary_support.xsd
similarity index 97%
rename from xsd/netex_part_3/part3_fares/netex_fareConditionSummary_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_fareConditionSummary_support.xsd
index 26a8df05b..90b6c3819 100644
--- a/xsd/netex_part_3/part3_fares/netex_fareConditionSummary_support-v1.0.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_fareConditionSummary_support.xsd
@@ -27,11 +27,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareConditionSummary_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareConditionSummary_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_fareConditionSummary_version-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_fareConditionSummary_version.xsd
similarity index 99%
rename from xsd/netex_part_3/part3_fares/netex_fareConditionSummary_version-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_fareConditionSummary_version.xsd
index 0637d104f..e58ea7ba2 100644
--- a/xsd/netex_part_3/part3_fares/netex_fareConditionSummary_version-v1.0.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_fareConditionSummary_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_fareConditionSummary_version">
-	<xsd:include schemaLocation="netex_fareConditionSummary_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareStructureElement_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareConditionSummary_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructureElement_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,11 +29,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareConditionSummary_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareConditionSummary_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_farePrice_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_farePrice_support.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_fares/netex_farePrice_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_farePrice_support.xsd
index 3d61aaade..4ddba6b39 100644
--- a/xsd/netex_part_3/part3_fares/netex_farePrice_support-v1.0.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_farePrice_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_farePrice_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_grouping_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_grouping_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_farePrice_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_farePrice_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_farePrice_version-v1.1.xsd b/xsd/netex_part_3/part3_fares/netex_farePrice_version.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_fares/netex_farePrice_version-v1.1.xsd
rename to xsd/netex_part_3/part3_fares/netex_farePrice_version.xsd
index 78291b747..cd6d159f4 100644
--- a/xsd/netex_part_3/part3_fares/netex_farePrice_version-v1.1.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_farePrice_version.xsd
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_farePrice_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_units-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareTable_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_farePrice_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_units.xsd"/>
+	<xsd:include schemaLocation="netex_fareTable_support.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_support.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_alternativeName_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_noticeAssignment_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_calculationParameters_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_alternativeName_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_noticeAssignment_version.xsd"/>
+	<xsd:include schemaLocation="netex_calculationParameters_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -36,11 +36,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_farePrice_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_farePrice_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_fareProduct_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_fareProduct_support.xsd
similarity index 99%
rename from xsd/netex_part_3/part3_fares/netex_fareProduct_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_fareProduct_support.xsd
index 053e27a1c..dd7514150 100644
--- a/xsd/netex_part_3/part3_fares/netex_fareProduct_support-v1.0.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_fareProduct_support.xsd
@@ -2,7 +2,7 @@
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_fareProduct_support">
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_fareStructure_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructure_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareProduct_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareProduct_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_fareProduct_version-v1.1.xsd b/xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd
similarity index 99%
rename from xsd/netex_part_3/part3_fares/netex_fareProduct_version-v1.1.xsd
rename to xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd
index dbd5278c2..c48e29656 100644
--- a/xsd/netex_part_3/part3_fares/netex_fareProduct_version-v1.1.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_fareProduct_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_units-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareProduct_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_otherOrganisation_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_units.xsd"/>
+	<xsd:include schemaLocation="netex_fareProduct_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_otherOrganisation_support.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_validableElement_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareConditionSummary_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_validableElement_version.xsd"/>
+	<xsd:include schemaLocation="netex_fareConditionSummary_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -36,11 +36,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareProduct_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareProduct_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_fareSeries_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_fareSeries_support.xsd
similarity index 97%
rename from xsd/netex_part_3/part3_fares/netex_fareSeries_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_fareSeries_support.xsd
index fe36f7520..7c8e631a6 100644
--- a/xsd/netex_part_3/part3_fares/netex_fareSeries_support-v1.0.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_fareSeries_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_fareSeries_support">
-	<xsd:include schemaLocation="netex_farePrice_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_support.xsd"/>
 	<!-- ======================================================== -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_seriesConstraint_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_seriesConstraint_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_fareSeries_version-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_fareSeries_version.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_fares/netex_fareSeries_version-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_fareSeries_version.xsd
index be0eb8c18..846f2981e 100644
--- a/xsd/netex_part_3/part3_fares/netex_fareSeries_version-v1.0.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_fareSeries_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_fareStructure_version">
-	<xsd:include schemaLocation="netex_fareSeries_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_fareZone_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_farePrice_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_fareSeries_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_fareZone_version.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_version.xsd"/>
 	<!-- ======================================================== -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -30,11 +30,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_seriesConstraint_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_seriesConstraint_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_fareStructureElement_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_fareStructureElement_support.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_fares/netex_fareStructureElement_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_fareStructureElement_support.xsd
index d07640632..5aa7c1367 100644
--- a/xsd/netex_part_3/part3_fares/netex_fareStructureElement_support-v1.0.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_fareStructureElement_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_fareStuctureElement_support">
-	<xsd:include schemaLocation="netex_fareStructure_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructure_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,11 +27,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareStructureElement_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareStructureElement_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_fareStructureElement_version-v1.1.xsd b/xsd/netex_part_3/part3_fares/netex_fareStructureElement_version.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_fares/netex_fareStructureElement_version-v1.1.xsd
rename to xsd/netex_part_3/part3_fares/netex_fareStructureElement_version.xsd
index c7145de53..dbe539f45 100644
--- a/xsd/netex_part_3/part3_fares/netex_fareStructureElement_version-v1.1.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_fareStructureElement_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_fareStructureElement_version">
-	<xsd:include schemaLocation="netex_fareStructureElement_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_validableElement_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructureElement_support.xsd"/>
+	<xsd:include schemaLocation="netex_validableElement_version.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_timeStructureFactor_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_distanceMatrixElement_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_timeStructureFactor_version.xsd"/>
+	<xsd:include schemaLocation="netex_distanceMatrixElement_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -35,11 +35,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareStructureElement_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareStructureElement_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_fareStructure_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_fareStructure_support.xsd
similarity index 97%
rename from xsd/netex_part_3/part3_fares/netex_fareStructure_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_fareStructure_support.xsd
index d844a70c5..9d51388df 100644
--- a/xsd/netex_part_3/part3_fares/netex_fareStructure_support-v1.0.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_fareStructure_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_fareStructure_support">
-	<xsd:include schemaLocation="netex_farePrice_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_support.xsd"/>
 	<!-- =============================================================-->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareStructure_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareStructure_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_fareStructure_version-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_fareStructure_version.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_fares/netex_fareStructure_version-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_fareStructure_version.xsd
index aece0cb95..827ef16a6 100644
--- a/xsd/netex_part_3/part3_fares/netex_fareStructure_version-v1.0.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_fareStructure_version.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_fareStructure_version">
-	<xsd:include schemaLocation="netex_fareStructure_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_farePrice_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructure_support.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareStructure_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareStructure_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_fareTable_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_fareTable_support.xsd
similarity index 97%
rename from xsd/netex_part_3/part3_fares/netex_fareTable_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_fareTable_support.xsd
index 955be37dd..0bfc03b84 100644
--- a/xsd/netex_part_3/part3_fares/netex_fareTable_support-v1.0.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_fareTable_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_fareTable_support">
-	<xsd:include schemaLocation="netex_farePrice_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareProduct_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareProduct_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareTable_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareTable_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_fareTable_version-v1.1.xsd b/xsd/netex_part_3/part3_fares/netex_fareTable_version.xsd
similarity index 96%
rename from xsd/netex_part_3/part3_fares/netex_fareTable_version-v1.1.xsd
rename to xsd/netex_part_3/part3_fares/netex_fareTable_version.xsd
index 79fea7715..48a4d697e 100644
--- a/xsd/netex_part_3/part3_fares/netex_fareTable_version-v1.1.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_fareTable_version.xsd
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_fareTable_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_submode_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_line_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_site_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_fareZone_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_serviceJourney_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_vehicleJourney_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareTable_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareSeries_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_travelDocument_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_salesDistribution_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareStructureElement_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_distanceMatrixElement_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_salesPackage_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareSeries_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParametersAll_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_submode_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_line_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_fareZone_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_serviceJourney_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_vehicleJourney_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareTable_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareSeries_support.xsd"/>
+	<xsd:include schemaLocation="netex_travelDocument_support.xsd"/>
+	<xsd:include schemaLocation="netex_salesDistribution_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructureElement_support.xsd"/>
+	<xsd:include schemaLocation="netex_distanceMatrixElement_support.xsd"/>
+	<xsd:include schemaLocation="netex_salesPackage_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareSeries_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParametersAll_support.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_farePrice_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -51,11 +51,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareTable_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareTable_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_support.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_support.xsd
index e9162103c..98de090ac 100644
--- a/xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_support-v1.0.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_geographicStructureFactor_support">
-	<xsd:include schemaLocation="netex_fareStructure_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructure_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,11 +27,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_geographicalStructureFactor_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_geographicalStructureFactor_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_version-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_version.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_version-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_version.xsd
index 9e5df9ed4..9ae565c79 100644
--- a/xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_version-v1.0.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_version.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_geographicStructureFactor_version">
-	<xsd:include schemaLocation="netex_geographicStructureFactor_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_distanceMatrixElement_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareStructureElement_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_geographicStructureFactor_support.xsd"/>
+	<xsd:include schemaLocation="netex_distanceMatrixElement_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructureElement_support.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_farePrice_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_fareStructure_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_version.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructure_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -32,11 +32,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_geographicalStructureFactor_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_geographicalStructureFactor_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_support.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_support.xsd
index ddd6e0f61..672cf195b 100644
--- a/xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_support-v1.0.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_qualityStructureFactor_support">
-	<xsd:include schemaLocation="netex_fareStructure_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructure_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,11 +27,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_qualityStructureFactor_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_qualityStructureFactor_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_version-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_version.xsd
similarity index 97%
rename from xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_version-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_version.xsd
index c380f3722..4539e7010 100644
--- a/xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_version-v1.0.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_version.xsd
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_qualityStructureFactor_version">
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_timeDemandType_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_servicePattern_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_qualityStructureFactor_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_distanceMatrixElement_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareStructure_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_timeDemandType_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd"/>
+	<xsd:include schemaLocation="netex_qualityStructureFactor_support.xsd"/>
+	<xsd:include schemaLocation="netex_distanceMatrixElement_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructure_support.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_fareStructure_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_farePrice_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructure_version.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -34,11 +34,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_qualityStructureFactor_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_qualityStructureFactor_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_salesDistribution_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_salesDistribution_support.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_fares/netex_salesDistribution_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_salesDistribution_support.xsd
index 5922db8c6..12e29a69b 100644
--- a/xsd/netex_part_3/part3_fares/netex_salesDistribution_support-v1.0.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_salesDistribution_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_salesDistribution_support">
-	<xsd:include schemaLocation="netex_farePrice_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,11 +27,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_salesDistribution_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_salesDistribution_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_salesDistribution_version-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_salesDistribution_version.xsd
similarity index 97%
rename from xsd/netex_part_3/part3_fares/netex_salesDistribution_version-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_salesDistribution_version.xsd
index 2e1b5c23b..100e45b83 100644
--- a/xsd/netex_part_3/part3_fares/netex_salesDistribution_version-v1.0.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_salesDistribution_version.xsd
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_salesDistribution_version">
-	<xsd:include schemaLocation="netex_salesDistribution_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_travelDocument_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_typeOfValue_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_country_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_salesDistribution_support.xsd"/>
+	<xsd:include schemaLocation="netex_travelDocument_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_typeOfValue_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_country_support.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_farePrice_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -34,11 +34,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_salesDistribution_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_salesDistribution_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_salesPackage_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_salesPackage_support.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_fares/netex_salesPackage_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_salesPackage_support.xsd
index a49cd7714..cf3aec9ad 100644
--- a/xsd/netex_part_3/part3_fares/netex_salesPackage_support-v1.0.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_salesPackage_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_salesPackage_support">
-	<xsd:include schemaLocation="netex_fareProduct_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_notice_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareProduct_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_notice_support.xsd"/>
 	<!-- =============================================================== -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,11 +29,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_salesPackage_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_salesPackage_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_salesPackage_version-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_salesPackage_version.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_fares/netex_salesPackage_version-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_salesPackage_version.xsd
index 7689b5647..3a1c3a0df 100644
--- a/xsd/netex_part_3/part3_fares/netex_salesPackage_version-v1.0.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_salesPackage_version.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_salesPackage_version">
-	<xsd:include schemaLocation="netex_salesPackage_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_topographicPlace_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_salesPackage_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_topographicPlace_support.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_salesDistribution_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareProduct_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_salesDistribution_version.xsd"/>
+	<xsd:include schemaLocation="netex_fareProduct_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -32,11 +32,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_salesPackage_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_salesPackage_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_timeStructureFactor_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_timeStructureFactor_support.xsd
similarity index 97%
rename from xsd/netex_part_3/part3_fares/netex_timeStructureFactor_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_timeStructureFactor_support.xsd
index 7e00fe439..5bbfc0397 100644
--- a/xsd/netex_part_3/part3_fares/netex_timeStructureFactor_support-v1.0.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_timeStructureFactor_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_timeStuctureFactor_support">
-	<xsd:include schemaLocation="netex_fareStructure_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructure_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,11 +27,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_timeStructureFactor_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_timeStructureFactor_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_timeStructureFactor_version-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_timeStructureFactor_version.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_fares/netex_timeStructureFactor_version-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_timeStructureFactor_version.xsd
index 656cb48d0..1fe9975b7 100644
--- a/xsd/netex_part_3/part3_fares/netex_timeStructureFactor_version-v1.0.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_timeStructureFactor_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_timeStuctureFactor_version">
-	<xsd:include schemaLocation="netex_timeStructureFactor_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareStructure_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareStructureElement_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_qualityStructureFactor_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_timeStructureFactor_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructure_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructureElement_support.xsd"/>
+	<xsd:include schemaLocation="netex_qualityStructureFactor_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -30,11 +30,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_timeStructureFactor_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_timeStructureFactor_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_travelDocument_support-v1.1.xsd b/xsd/netex_part_3/part3_fares/netex_travelDocument_support.xsd
similarity index 97%
rename from xsd/netex_part_3/part3_fares/netex_travelDocument_support-v1.1.xsd
rename to xsd/netex_part_3/part3_fares/netex_travelDocument_support.xsd
index a6b4718b1..5f7d35f25 100644
--- a/xsd/netex_part_3/part3_fares/netex_travelDocument_support-v1.1.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_travelDocument_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_travelDocument_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_securityList_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_fareProduct_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_securityList_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareProduct_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -30,11 +30,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_travelDocument_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_travelDocument_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_travelDocument_version-v1.1.xsd b/xsd/netex_part_3/part3_fares/netex_travelDocument_version.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_fares/netex_travelDocument_version-v1.1.xsd
rename to xsd/netex_part_3/part3_fares/netex_travelDocument_version.xsd
index a1b96a0f1..e6f2b983c 100644
--- a/xsd/netex_part_3/part3_fares/netex_travelDocument_version-v1.1.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_travelDocument_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_travelDocument_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_alternativeName_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_travelDocument_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_securityList_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_alternativeName_version.xsd"/>
+	<xsd:include schemaLocation="netex_travelDocument_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_securityList_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -32,11 +32,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_travelDocument_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_travelDocument_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_support.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_support.xsd
index 0187bd45a..9fcf2281f 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_support-v1.0.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_support.xsd
@@ -2,7 +2,7 @@
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_usageParameterAfterSales_support">
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_usageParameter_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterAfterSales_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterAfterSales_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd
index b3ad2678a..777670187 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version-v1.0.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_usageParameterAfterSales_version">
-	<xsd:include schemaLocation="netex_usageParameterAfterSales_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_timeStructureFactor_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameter_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterAfterSales_support.xsd"/>
+	<xsd:include schemaLocation="netex_timeStructureFactor_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_version.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,11 +31,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterAfterSales_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterAfterSales_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterBooking_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterBooking_support.xsd
similarity index 97%
rename from xsd/netex_part_3/part3_fares/netex_usageParameterBooking_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameterBooking_support.xsd
index 5121dd405..06fec3bd7 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameterBooking_support-v1.0.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameterBooking_support.xsd
@@ -2,7 +2,7 @@
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_usageParameterBooking_support">
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_usageParameter_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterBooking_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterBooking_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterBooking_version-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterBooking_version.xsd
similarity index 97%
rename from xsd/netex_part_3/part3_fares/netex_usageParameterBooking_version-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameterBooking_version.xsd
index 1b1f5e50c..545972c15 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameterBooking_version-v1.0.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameterBooking_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_usageParameterBooking_version">
-	<xsd:include schemaLocation="netex_usageParameterBooking_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_timeStructureFactor_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameter_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterBooking_support.xsd"/>
+	<xsd:include schemaLocation="netex_timeStructureFactor_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_version.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,11 +31,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterBooking_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterBooking_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterCharging_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterCharging_support.xsd
similarity index 97%
rename from xsd/netex_part_3/part3_fares/netex_usageParameterCharging_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameterCharging_support.xsd
index 80e3c1d2a..e583f2146 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameterCharging_support-v1.0.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameterCharging_support.xsd
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterCharging_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterCharging_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
@@ -59,7 +59,7 @@ Rail transport, Roads and Road transport
 		</xsd:appinfo>
 		<xsd:documentation>NeTEX: Charging USAGE PARAMETER identifier types.</xsd:documentation>
 	</xsd:annotation>
-	<xsd:include schemaLocation="netex_usageParameter_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_support.xsd"/>
 	<!-- === CHARGING POLICY PARAMETER============================================== -->
 	<xsd:simpleType name="ChargingPolicyIdType">
 		<xsd:annotation>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterCharging_version-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterCharging_version.xsd
similarity index 97%
rename from xsd/netex_part_3/part3_fares/netex_usageParameterCharging_version-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameterCharging_version.xsd
index 14eb32c28..4fb5e21f4 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameterCharging_version-v1.0.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameterCharging_version.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_usageParameterCharging_version">
-	<xsd:include schemaLocation="netex_usageParameterCharging_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameter_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterCharging_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,7 +28,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterCharging_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterCharging_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_support.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_support.xsd
index f2c0cf326..31285f8ca 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_support-v1.0.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_support.xsd
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterEligibility_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterEligibility_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
@@ -59,7 +59,7 @@ Rail transport, Roads and Road transport
 		</xsd:appinfo>
 		<xsd:documentation>NeTEX: Eligibility USAGE PARAMETER identifier types.</xsd:documentation>
 	</xsd:annotation>
-	<xsd:include schemaLocation="netex_usageParameter_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_support.xsd"/>
 	<xsd:group name="ProfileRefsGroup">
 		<xsd:annotation>
 			<xsd:documentation>Elements for Profile types.</xsd:documentation>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_version-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_version.xsd
similarity index 99%
rename from xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_version-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_version.xsd
index 62902d71f..eec52af8d 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_version-v1.0.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_usageParameterEligibility_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_topographicPlace_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterEligibility_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameter_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_topographicPlace_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterEligibility_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -30,7 +30,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterEligibility_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterEligibility_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_support.xsd
similarity index 97%
rename from xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_support.xsd
index b059251f4..ed94cbe6a 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_support-v1.0.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_support.xsd
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterEntitlement_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterEntitlement_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
@@ -59,7 +59,7 @@ Rail transport, Roads and Road transport
 		</xsd:appinfo>
 		<xsd:documentation>NeTEX: Entitlement USAGE PARAMETER identifier types.</xsd:documentation>
 	</xsd:annotation>
-	<xsd:include schemaLocation="netex_usageParameter_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_support.xsd"/>
 	<!-- === ENTTITLEMENT REQUIRED PARAMETER======================================= -->
 	<xsd:complexType name="entitlementRequiredRefs_RelStructure">
 		<xsd:annotation>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_version-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_version.xsd
similarity index 97%
rename from xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_version-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_version.xsd
index 002c1ea91..ddcbca437 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_version-v1.0.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_usageParameterEntitlement_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_topographicPlace_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterEntitlement_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameter_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_topographicPlace_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterEntitlement_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -30,7 +30,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterBooking_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterBooking_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_support.xsd
similarity index 97%
rename from xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_support.xsd
index 1980a16ab..889a891d6 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_support-v1.0.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_support.xsd
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterLuggage_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterLuggage_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
@@ -59,7 +59,7 @@ Rail transport, Roads and Road transport
 		</xsd:appinfo>
 		<xsd:documentation>NeTEX: Luggage USAGE PARAMETER identifier types.</xsd:documentation>
 	</xsd:annotation>
-	<xsd:include schemaLocation="netex_usageParameter_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_support.xsd"/>
 	<xsd:group name="UsageParameterLuggageRefGroup">
 		<xsd:annotation>
 			<xsd:documentation>USAGE PARAMETER Elements forCELL.Group.</xsd:documentation>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_version-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_version.xsd
similarity index 97%
rename from xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_version-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_version.xsd
index 12d6a4b7a..62b4d7f46 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_version-v1.0.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_usageParameterLuggage_version">
-	<xsd:include schemaLocation="netex_usageParameterLuggage_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameter_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterLuggage_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,7 +29,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterLuggage_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterLuggage_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_support-v1.1.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_support.xsd
similarity index 99%
rename from xsd/netex_part_3/part3_fares/netex_usageParameterTravel_support-v1.1.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameterTravel_support.xsd
index 52cf2e5c5..cf26706d9 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_support-v1.1.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_usageParameterTravel_support">
-	<xsd:include schemaLocation="netex_usageParameter_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,7 +31,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterTravel_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterTravel_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version.xsd
similarity index 99%
rename from xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version.xsd
index bee329a72..05dc9b0ef 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version-v1.0.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_usageParameterTravel_version">
-	<xsd:include schemaLocation="netex_usageParameterTravel_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_timeStructureFactor_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterTravel_support.xsd"/>
+	<xsd:include schemaLocation="netex_timeStructureFactor_support.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameter_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameter_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameter_support.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_fares/netex_usageParameter_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameter_support.xsd
index e31b6f6a7..060cb5e04 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameter_support-v1.0.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameter_support.xsd
@@ -26,11 +26,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameter_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameter_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
@@ -58,7 +58,7 @@ Rail transport, Roads and Road transport
 		</xsd:appinfo>
 		<xsd:documentation>NeTEX: USAGE PARAMETER identifier types.</xsd:documentation>
 	</xsd:annotation>
-	<xsd:include schemaLocation="netex_farePrice_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_support.xsd"/>
 	<!-- === USAGE PARAMETER====================================================== -->
 	<xsd:complexType name="usageParameterRefs_RelStructure">
 		<xsd:annotation>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameter_version-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameter_version.xsd
similarity index 97%
rename from xsd/netex_part_3/part3_fares/netex_usageParameter_version-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameter_version.xsd
index ce1bba309..14747444c 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameter_version-v1.0.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameter_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_usageParameter_version">
-	<xsd:include schemaLocation="netex_usageParameter_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_support.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_units-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_farePrice_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_units.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,11 +31,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameter_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameter_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParametersAll_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_usageParametersAll_support.xsd
similarity index 89%
rename from xsd/netex_part_3/part3_fares/netex_usageParametersAll_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParametersAll_support.xsd
index 343c91782..54632e3ec 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParametersAll_support-v1.0.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParametersAll_support.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_usageParametersAll_support">
-	<xsd:include schemaLocation="netex_usageParameterBooking_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterAfterSales_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterCharging_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterEligibility_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterEntitlement_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterLuggage_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterTravel_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterBooking_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterAfterSales_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterCharging_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterEligibility_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterEntitlement_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterLuggage_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterTravel_support.xsd"/>
 	<!-- ======================================================================= -->
 </xsd:schema>
diff --git a/xsd/netex_part_3/part3_fares/netex_validableElement_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_validableElement_support.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_fares/netex_validableElement_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_validableElement_support.xsd
index a0f5423e5..44442caaa 100644
--- a/xsd/netex_part_3/part3_fares/netex_validableElement_support-v1.0.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_validableElement_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_validableElement_support">
-	<xsd:include schemaLocation="netex_fareStructure_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructure_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_validableElement_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_validableElement_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_validableElement_version-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_validableElement_version.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_fares/netex_validableElement_version-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_validableElement_version.xsd
index 07491a8a4..71545806e 100644
--- a/xsd/netex_part_3/part3_fares/netex_validableElement_version-v1.0.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_validableElement_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_validableElement_version">
-	<xsd:include schemaLocation="netex_validableElement_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareStructure_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_accessRightParameter_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_validableElement_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructure_version.xsd"/>
+	<xsd:include schemaLocation="netex_accessRightParameter_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -30,11 +30,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_validableElement_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_validableElement_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_frames/netex_all_frames_part3-v1.0.xsd b/xsd/netex_part_3/part3_frames/netex_all_frames_part3.xsd
similarity index 90%
rename from xsd/netex_part_3/part3_frames/netex_all_frames_part3-v1.0.xsd
rename to xsd/netex_part_3/part3_frames/netex_all_frames_part3.xsd
index 60fc417a1..26456e392 100644
--- a/xsd/netex_part_3/part3_frames/netex_all_frames_part3-v1.0.xsd
+++ b/xsd/netex_part_3/part3_frames/netex_all_frames_part3.xsd
@@ -3,7 +3,7 @@
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_frames_part1">
 	<!-- ===Dependencies ======================================= -->
 	<!-- =====Frames================================================= -->
-	<xsd:include schemaLocation="netex_fareFrame_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_salesTransactionFrame_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_fareFrame_version.xsd"/>
+	<xsd:include schemaLocation="netex_salesTransactionFrame_version.xsd"/>
 	<!-- ============================================================ -->
 </xsd:schema>
diff --git a/xsd/netex_part_3/part3_frames/netex_fareFrame_version-v1.0.xsd b/xsd/netex_part_3/part3_frames/netex_fareFrame_version.xsd
similarity index 96%
rename from xsd/netex_part_3/part3_frames/netex_fareFrame_version-v1.0.xsd
rename to xsd/netex_part_3/part3_frames/netex_fareFrame_version.xsd
index 9098d4fc3..b39c32437 100644
--- a/xsd/netex_part_3/part3_frames/netex_fareFrame_version-v1.0.xsd
+++ b/xsd/netex_part_3/part3_frames/netex_fareFrame_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_fareFrame_version">
-	<xsd:include schemaLocation="../part3_fares/netex_all_objects_part3_fares-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part3_monitoring/netex_all_objects_part3_monitoring-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part3_parkingTariff/netex_all_objects_part3_parking-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_fareZone_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_commonFrame_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_all_objects_part3_fares.xsd"/>
+	<xsd:include schemaLocation="../part3_monitoring/netex_all_objects_part3_monitoring.xsd"/>
+	<xsd:include schemaLocation="../part3_parkingTariff/netex_all_objects_part3_parking.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_fareZone_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_commonFrame_version.xsd"/>
 	<!-- ====  =========================================-->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -30,11 +30,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_frames}netex_fareFrame_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_frames}netex_fareFrame_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>CEN TC278 SG6 and Department for Transport, Great Minster House, 76 Marsham Street, London SW1P 4DR</Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_xxxxx-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_xxxxx.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_frames/netex_salesTransactionFrame_version-v1.1.xsd b/xsd/netex_part_3/part3_frames/netex_salesTransactionFrame_version.xsd
similarity index 96%
rename from xsd/netex_part_3/part3_frames/netex_salesTransactionFrame_version-v1.1.xsd
rename to xsd/netex_part_3/part3_frames/netex_salesTransactionFrame_version.xsd
index e2fdb6892..936b8bc74 100644
--- a/xsd/netex_part_3/part3_frames/netex_salesTransactionFrame_version-v1.1.xsd
+++ b/xsd/netex_part_3/part3_frames/netex_salesTransactionFrame_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_salesTransactionFrame_version">
-	<xsd:include schemaLocation="../part3_fares/netex_all_objects_part3_fares-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part3_salesTransactions/netex_all_objects_part3_salesTransactions-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_commonFrame_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_all_objects_part3_fares.xsd"/>
+	<xsd:include schemaLocation="../part3_salesTransactions/netex_all_objects_part3_salesTransactions.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_commonFrame_version.xsd"/>
 	<!-- ====  =========================================-->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -27,11 +27,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_frames}netex_salesTransactionFrame_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_frames}netex_salesTransactionFrame_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>CEN TC278 SG9 </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_xxxxx-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_xxxxx.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_3/part3_monitoring/netex_all_objects_part3_monitoring-v1.0.xsd b/xsd/netex_part_3/part3_monitoring/netex_all_objects_part3_monitoring.xsd
similarity index 85%
rename from xsd/netex_part_3/part3_monitoring/netex_all_objects_part3_monitoring-v1.0.xsd
rename to xsd/netex_part_3/part3_monitoring/netex_all_objects_part3_monitoring.xsd
index e59cb5f32..7058cbd5c 100644
--- a/xsd/netex_part_3/part3_monitoring/netex_all_objects_part3_monitoring-v1.0.xsd
+++ b/xsd/netex_part_3/part3_monitoring/netex_all_objects_part3_monitoring.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_part3_monitoring">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="netex_monitoredCall_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_monitoredPassingTimes_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_monitoredVehicleJourney_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_monitoredCall_version.xsd"/>
+	<xsd:include schemaLocation="netex_monitoredPassingTimes_version.xsd"/>
+	<xsd:include schemaLocation="netex_monitoredVehicleJourney_support.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_part_3/part3_monitoring/netex_monitoredCall_version-v1.0.xsd b/xsd/netex_part_3/part3_monitoring/netex_monitoredCall_version.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_monitoring/netex_monitoredCall_version-v1.0.xsd
rename to xsd/netex_part_3/part3_monitoring/netex_monitoredCall_version.xsd
index 2b489ce99..807bcc306 100644
--- a/xsd/netex_part_3/part3_monitoring/netex_monitoredCall_version-v1.0.xsd
+++ b/xsd/netex_part_3/part3_monitoring/netex_monitoredCall_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_monitoredCall_version">
-	<xsd:include schemaLocation="netex_monitoredPassingTimes_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_monitoredVehicleJourney_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_call_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_monitoredPassingTimes_version.xsd"/>
+	<xsd:include schemaLocation="netex_monitoredVehicleJourney_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_call_version.xsd"/>
 	<!-- ==== CALL =========================================-->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,11 +29,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_monitoring}nnetex_monitoredCall_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_monitoring}nnetex_monitoredCall_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_monitoring/netex_monitoredPassingTimes_version-v1.1.xsd b/xsd/netex_part_3/part3_monitoring/netex_monitoredPassingTimes_version.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_monitoring/netex_monitoredPassingTimes_version-v1.1.xsd
rename to xsd/netex_part_3/part3_monitoring/netex_monitoredPassingTimes_version.xsd
index a161553a8..6b62d35b8 100644
--- a/xsd/netex_part_3/part3_monitoring/netex_monitoredPassingTimes_version-v1.1.xsd
+++ b/xsd/netex_part_3/part3_monitoring/netex_monitoredPassingTimes_version.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_monitoredPassingTimes_version">
-	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_datedPassingTimes_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_datedPassingTimes_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,11 +29,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_monitoring}nnetex_monitoredPassingTimes_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_monitoring}nnetex_monitoredPassingTimes_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_3/part3_monitoring/netex_monitoredVehicleJourney_support-v1.0.xsd b/xsd/netex_part_3/part3_monitoring/netex_monitoredVehicleJourney_support.xsd
similarity index 96%
rename from xsd/netex_part_3/part3_monitoring/netex_monitoredVehicleJourney_support-v1.0.xsd
rename to xsd/netex_part_3/part3_monitoring/netex_monitoredVehicleJourney_support.xsd
index b9740b2aa..00a74e275 100644
--- a/xsd/netex_part_3/part3_monitoring/netex_monitoredVehicleJourney_support-v1.0.xsd
+++ b/xsd/netex_part_3/part3_monitoring/netex_monitoredVehicleJourney_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_monitoredVehicleJourney_support">
-	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_call_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_call_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -27,11 +27,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_monitoring}nnetex_monitoredVehicleJourney_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_monitoring}nnetex_monitoredVehicleJourney_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_parkingTariff/netex_all_objects_part3_parking-v1.0.xsd b/xsd/netex_part_3/part3_parkingTariff/netex_all_objects_part3_parking.xsd
similarity index 76%
rename from xsd/netex_part_3/part3_parkingTariff/netex_all_objects_part3_parking-v1.0.xsd
rename to xsd/netex_part_3/part3_parkingTariff/netex_all_objects_part3_parking.xsd
index 6e64cb0c7..b30a1fe39 100644
--- a/xsd/netex_part_3/part3_parkingTariff/netex_all_objects_part3_parking-v1.0.xsd
+++ b/xsd/netex_part_3/part3_parkingTariff/netex_all_objects_part3_parking.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_part3_parking">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="netex_parkingTariff_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_parkingTariff_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_parkingTariff_support.xsd"/>
+	<xsd:include schemaLocation="netex_parkingTariff_version.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_support-v1.1.xsd b/xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_support.xsd
similarity index 97%
rename from xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_support-v1.1.xsd
rename to xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_support.xsd
index 4eff21a46..5c98147a2 100644
--- a/xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_support-v1.1.xsd
+++ b/xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_parkingTariff_support">
-	<xsd:include schemaLocation="../part3_fares/netex_timeStructureFactor_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_parking_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_timeStructureFactor_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_parking_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,7 +28,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part3/part3_parkingTariff}netex_parkingTariff_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part3/part3_parkingTariff}netex_parkingTariff_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_version-v1.1.xsd b/xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_version.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_version-v1.1.xsd
rename to xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_version.xsd
index 0d045ac4b..0005be829 100644
--- a/xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_version-v1.1.xsd
+++ b/xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_parkingTariff_version">
-	<xsd:include schemaLocation="netex_parkingTariff_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_parking_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part3_fares/netex_fareStructureElement_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part3_fares/netex_timeStructureFactor_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_parkingTariff_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_parking_version.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_fareStructureElement_version.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_timeStructureFactor_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,7 +31,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part3/part3_parkingTariff}netex_parkingTariff_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part3/part3_parkingTariff}netex_parkingTariff_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_all_objects_part3_salesTransactions-v1.0.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_all_objects_part3_salesTransactions.xsd
similarity index 53%
rename from xsd/netex_part_3/part3_salesTransactions/netex_all_objects_part3_salesTransactions-v1.0.xsd
rename to xsd/netex_part_3/part3_salesTransactions/netex_all_objects_part3_salesTransactions.xsd
index ca9c85a6f..87d8b23a6 100644
--- a/xsd/netex_part_3/part3_salesTransactions/netex_all_objects_part3_salesTransactions-v1.0.xsd
+++ b/xsd/netex_part_3/part3_salesTransactions/netex_all_objects_part3_salesTransactions.xsd
@@ -2,14 +2,14 @@
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_part3_salesTransactions">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="netex_salesContract_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_salesContract_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_customerEligibility_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_customerEligibility_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_retailConsortium_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_retailConsortium_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_salesTransaction_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_salesTransaction_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_customerPurchasePackage_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_customerPurchasePackage_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_salesContract_support.xsd"/>
+	<xsd:include schemaLocation="netex_salesContract_version.xsd"/>
+	<xsd:include schemaLocation="netex_customerEligibility_support.xsd"/>
+	<xsd:include schemaLocation="netex_customerEligibility_version.xsd"/>
+	<xsd:include schemaLocation="netex_retailConsortium_support.xsd"/>
+	<xsd:include schemaLocation="netex_retailConsortium_version.xsd"/>
+	<xsd:include schemaLocation="netex_salesTransaction_support.xsd"/>
+	<xsd:include schemaLocation="netex_salesTransaction_version.xsd"/>
+	<xsd:include schemaLocation="netex_customerPurchasePackage_support.xsd"/>
+	<xsd:include schemaLocation="netex_customerPurchasePackage_version.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_support-v1.1.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_support.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_support-v1.1.xsd
rename to xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_support.xsd
index 7b122bf37..8065cc138 100644
--- a/xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_support-v1.1.xsd
+++ b/xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_customerEligibility_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_relationship-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_relationship.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_salesContract_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_salesContract_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Steam Intellect, London N1 1JS </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
 				 <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_version-v1.1.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_version.xsd
similarity index 97%
rename from xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_version-v1.1.xsd
rename to xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_version.xsd
index fe947afc4..82f2579c8 100644
--- a/xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_version-v1.1.xsd
+++ b/xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_customerEligibility_version">
-	<xsd:include schemaLocation="netex_customerEligibility_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_salesContract_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part3_fares/netex_usageParameterEligibility_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_customerEligibility_support.xsd"/>
+	<xsd:include schemaLocation="netex_salesContract_support.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_usageParameterEligibility_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -32,11 +32,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_salesContract_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_salesContract_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Steam Intellect, London N1 1JS </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_support-v1.1.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_support.xsd
similarity index 99%
rename from xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_support-v1.1.xsd
rename to xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_support.xsd
index 9cf6b1338..7df40d29a 100644
--- a/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_support-v1.1.xsd
+++ b/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_customerPurchasePackage_support">
-	<xsd:include schemaLocation="../part3_fares/netex_salesPackage_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part3_fares/netex_accessRightParameter_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_salesPackage_support.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_accessRightParameter_support.xsd"/>
 	<!-- =============================================================== -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,11 +29,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransaction}netex_CustomerPurchasePackage_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransaction}netex_CustomerPurchasePackage_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Steam Intellect, London N1 1JS </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version-v1.1.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version-v1.1.xsd
rename to xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version.xsd
index 9692a84f8..e6321c3c8 100644
--- a/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version-v1.1.xsd
+++ b/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version.xsd
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_customerPurchasePackage_version">
-	<xsd:include schemaLocation="netex_customerPurchasePackage_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_salesTransaction_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_customerPurchasePackage_support.xsd"/>
+	<xsd:include schemaLocation="netex_salesTransaction_support.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="../part3_fares/netex_geographicStructureFactor_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part3_fares/netex_timeStructureFactor_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part3_fares/netex_fareStructureElement_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part3_fares/netex_salesPackage_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part3_fares/netex_travelDocument_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_geographicStructureFactor_support.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_timeStructureFactor_support.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_fareStructureElement_support.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_salesPackage_version.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_travelDocument_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -33,11 +33,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransaction}netex_salesPackage_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransaction}netex_salesPackage_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Steam Intellect, London N1 1JS </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_support-v1.1.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_support.xsd
similarity index 97%
rename from xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_support-v1.1.xsd
rename to xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_support.xsd
index 1cdc3dcec..9c47425ed 100644
--- a/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_support-v1.1.xsd
+++ b/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_support.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_retailConsortium_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_organisation_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_securityList_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_organisation_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_securityList_support.xsd"/>
 	<!-- =============================================================== -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_retailConsortium_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_retailConsortium_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_version-v1.1.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_version.xsd
similarity index 96%
rename from xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_version-v1.1.xsd
rename to xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_version.xsd
index 414a2498f..1b76d07b7 100644
--- a/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_version-v1.1.xsd
+++ b/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_version.xsd
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_retailConsortium_version">
-	<xsd:include schemaLocation="netex_retailConsortium_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_salesContract_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_organisation_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_securityList_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_address_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_retailConsortium_support.xsd"/>
+	<xsd:include schemaLocation="netex_salesContract_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_organisation_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_securityList_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_address_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -35,11 +35,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_retailConsortium_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_retailConsortium_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_salesContract_support-v1.1.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_salesContract_support.xsd
similarity index 99%
rename from xsd/netex_part_3/part3_salesTransactions/netex_salesContract_support-v1.1.xsd
rename to xsd/netex_part_3/part3_salesTransactions/netex_salesContract_support.xsd
index 0a2035657..85d1a15da 100644
--- a/xsd/netex_part_3/part3_salesTransactions/netex_salesContract_support-v1.1.xsd
+++ b/xsd/netex_part_3/part3_salesTransactions/netex_salesContract_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_salesContract_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_securityList_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_loggable_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_securityList_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_loggable_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -34,11 +34,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_salesContract_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_salesContract_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_salesContract_version-v1.1.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_salesContract_version.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_salesTransactions/netex_salesContract_version-v1.1.xsd
rename to xsd/netex_part_3/part3_salesTransactions/netex_salesContract_version.xsd
index 32935e023..64bfd43a1 100644
--- a/xsd/netex_part_3/part3_salesTransactions/netex_salesContract_version-v1.1.xsd
+++ b/xsd/netex_part_3/part3_salesTransactions/netex_salesContract_version.xsd
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_salesContract_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_loggable_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_retailConsortium_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_salesContract_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_customerEligibility_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_securityList_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_address_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_loggable_version.xsd"/>
+	<xsd:include schemaLocation="netex_retailConsortium_support.xsd"/>
+	<xsd:include schemaLocation="netex_salesContract_support.xsd"/>
+	<xsd:include schemaLocation="netex_customerEligibility_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_securityList_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_address_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -40,11 +40,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_salesContract_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_salesContract_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_support-v1.0.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_support.xsd
similarity index 96%
rename from xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_support-v1.0.xsd
rename to xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_support.xsd
index ac3e9742b..c41e5efba 100644
--- a/xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_support-v1.0.xsd
+++ b/xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_salesTransaction_support">
-	<xsd:include schemaLocation="netex_salesContract_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part3_fares/netex_accessRightParameter_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_salesContract_support.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_accessRightParameter_support.xsd"/>
 	<!-- =============================================================== -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,11 +31,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_salesTransaction_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_salesTransaction_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_version-v1.1.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_version.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_version-v1.1.xsd
rename to xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_version.xsd
index 48394f529..db0184dca 100644
--- a/xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_version-v1.1.xsd
+++ b/xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_salesTransaction_version">
-	<xsd:include schemaLocation="netex_salesTransaction_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part3_PiQuery/netex_piRequest_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_salesContract_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part3_fares/netex_salesPackage_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_customerPurchasePackage_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_salesTransaction_support.xsd"/>
+	<xsd:include schemaLocation="../part3_PiQuery/netex_piRequest_support.xsd"/>
+	<xsd:include schemaLocation="netex_salesContract_version.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_salesPackage_version.xsd"/>
+	<xsd:include schemaLocation="netex_customerPurchasePackage_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -33,11 +33,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_salesTransaction_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_salesTransaction_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_service/netex_all-v1.0.xsd b/xsd/netex_service/netex_all.xsd
similarity index 77%
rename from xsd/netex_service/netex_all-v1.0.xsd
rename to xsd/netex_service/netex_all.xsd
index 7e41975dd..0a10b6c85 100644
--- a/xsd/netex_service/netex_all-v1.0.xsd
+++ b/xsd/netex_service/netex_all.xsd
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="../netex_framework/netex_frames/netex_all_frames_framework-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_frames/netex_all_frames_framework.xsd"/>
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="../netex_part_1/part1_tacticalPlanning/netex_all_objects_part1_tacticalPlanning-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_part_1/netex_all_frames_part1-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_part_1/part1_tacticalPlanning/netex_all_objects_part1_tacticalPlanning.xsd"/>
+	<xsd:include schemaLocation="../netex_part_1/netex_all_frames_part1.xsd"/>
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="../netex_part_2/netex_all_objects_part2-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_part_2/netex_all_frames_part2-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_part_2/netex_all_objects_part2.xsd"/>
+	<xsd:include schemaLocation="../netex_part_2/netex_all_frames_part2.xsd"/>
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="../netex_part_3/part3_fares/netex_all_objects_part3_fares-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_part_3/part3_frames/netex_all_frames_part3-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_filter_frame-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_filter_object-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_part_3/part3_fares/netex_all_objects_part3_fares.xsd"/>
+	<xsd:include schemaLocation="../netex_part_3/part3_frames/netex_all_frames_part3.xsd"/>
+	<xsd:include schemaLocation="netex_filter_frame.xsd"/>
+	<xsd:include schemaLocation="netex_filter_object.xsd"/>
 	<!-- ===Entities======================================= -->
 	<!-- ===Filters ======================================= -->
 </xsd:schema>
diff --git a/xsd/netex_service/netex_all_filters-v1.0.xsd b/xsd/netex_service/netex_all_filters.xsd
similarity index 91%
rename from xsd/netex_service/netex_all_filters-v1.0.xsd
rename to xsd/netex_service/netex_all_filters.xsd
index 02362f8c5..ef9b9f3ae 100644
--- a/xsd/netex_service/netex_all_filters-v1.0.xsd
+++ b/xsd/netex_service/netex_all_filters.xsd
@@ -3,7 +3,7 @@
 	<!-- ======================================================================= -->
 	<!-- ======================================================================= -->
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_filter_network-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_filter_network.xsd"/>
 	<!--== Requests ===================================================================== -->
 	<!-- ===eGIF/GovTalk Documentation ======================================= -->
 	<xsd:annotation>
@@ -28,15 +28,15 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/ for svc/} for _filters-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/ for svc/} for _filters.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _filter_device-v1.0.xsd</Requires>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _filter_network-v1.0.xsd</Requires>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _filter_prediction-v1.0.xsd</Requires>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _filter_profile-v1.0.xsd</Requires>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _filter_traffic_event-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _filter_device.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _filter_network.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _filter_prediction.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _filter_profile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _filter_traffic_event.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_service/netex_dataObjectRequest_service-v1.0.xsd b/xsd/netex_service/netex_dataObjectRequest_service.xsd
similarity index 98%
rename from xsd/netex_service/netex_dataObjectRequest_service-v1.0.xsd
rename to xsd/netex_service/netex_dataObjectRequest_service.xsd
index d395da0b8..a8a990d79 100644
--- a/xsd/netex_service/netex_dataObjectRequest_service-v1.0.xsd
+++ b/xsd/netex_service/netex_dataObjectRequest_service.xsd
@@ -2,8 +2,8 @@
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_dataObjectRequest_service">
 	<!-- ===Dependencies ======================================= -->
 	<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri/siri_requests-v2.0.xsd"/>
-	<xsd:include schemaLocation="netex_filter_frame-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_all_objects_framework-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_filter_frame.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_all_objects_framework.xsd"/>
 	<!-- ===eGIF/GovTalk Documentation ======================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -27,10 +27,10 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_service}netex__dataObjectRequest-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_service}netex__dataObjectRequest.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
-				<Relation><Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _data_object-v1.0.xsd</Requires><Requires>http://www.siri.org.uk/schemas/2.0/xsd/siri/siri_requests-v2.0.xsd</Requires> &gt;
+				<Relation><Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _data_object.xsd</Requires><Requires>http://www.siri.org.uk/schemas/2.0/xsd/siri/siri_requests-v2.0.xsd</Requires> &gt;
 				</Relation>
 				<Rights>Unclassified
  					<Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_service/netex_filter_frame-v1.0.xsd b/xsd/netex_service/netex_filter_frame.xsd
similarity index 96%
rename from xsd/netex_service/netex_filter_frame-v1.0.xsd
rename to xsd/netex_service/netex_filter_frame.xsd
index 42300e84f..b94a88804 100644
--- a/xsd/netex_service/netex_filter_frame-v1.0.xsd
+++ b/xsd/netex_service/netex_filter_frame.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_dataObjectRequest_service">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_versionFrame_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_part_1/part1_networkDescription/netex_line_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_filter_object-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_versionFrame_support.xsd"/>
+	<xsd:include schemaLocation="../netex_part_1/part1_networkDescription/netex_line_support.xsd"/>
+	<xsd:include schemaLocation="netex_filter_object.xsd"/>
 	<!-- ===eGIF/GovTalk Documentation ======================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -27,10 +27,10 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_service}netex__dataObjectRequest-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_service}netex__dataObjectRequest.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
-				<Relation><Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _data_object-v1.0.xsd</Requires><Requires>http://www.siri.org.uk/schemas/2.0/xsd/siri/siri_requests-v2.0.xsd</Requires> &gt;
+				<Relation><Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _data_object.xsd</Requires><Requires>http://www.siri.org.uk/schemas/2.0/xsd/siri/siri_requests-v2.0.xsd</Requires> &gt;
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_service/netex_filter_object-v1.0.xsd b/xsd/netex_service/netex_filter_object.xsd
similarity index 95%
rename from xsd/netex_service/netex_filter_object-v1.0.xsd
rename to xsd/netex_service/netex_filter_object.xsd
index f417d92e3..894384d93 100644
--- a/xsd/netex_service/netex_filter_object-v1.0.xsd
+++ b/xsd/netex_service/netex_filter_object.xsd
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_filter_object">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_utility_types-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_utility_time-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_location_types-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_dataSource_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_layer_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_responsibilitySet_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_reusableComponents/netex_availabilityCondition_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_utility_types.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_utility_time.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_location_types.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_dataSource_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_layer_support.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_reusableComponents/netex_availabilityCondition_version.xsd"/>
 	<!-- ===eGIF/GovTalk Documentation ======================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,10 +31,10 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_service}netex__dataObjectRequest-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_service}netex__dataObjectRequest.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
-				<Relation><Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _data_object-v1.0.xsd</Requires><Requires>http://www.siri.org.uk/schemas/2.0/xsd/siri/siri_requests-v2.0.xsd</Requires> &gt;
+				<Relation><Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _data_object.xsd</Requires><Requires>http://www.siri.org.uk/schemas/2.0/xsd/siri/siri_requests-v2.0.xsd</Requires> &gt;
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/siri/siri_base-v2.0.xsd b/xsd/siri/siri_base-v2.0.xsd
index d2a3286d9..3fb1679fd 100644
--- a/xsd/siri/siri_base-v2.0.xsd
+++ b/xsd/siri/siri_base-v2.0.xsd
@@ -57,7 +57,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.siri.org.uk/schema/2.0/xsd/siri__common_services-v1.3xsd</Requires>
+					<Requires>http://www.siri.org.uk/schema/2.0/xsd/siri__common_servicesxsd</Requires>
 				</Relation>
 				<Rights>Unclassified
        <Copyright>CEN, VDV, RTIG 2004-2012</Copyright>
diff --git a/xsd/siri/siri_requests-v2.0.xsd b/xsd/siri/siri_requests-v2.0.xsd
index 0eab548ad..add3f7b4e 100644
--- a/xsd/siri/siri_requests-v2.0.xsd
+++ b/xsd/siri/siri_requests-v2.0.xsd
@@ -2,7 +2,7 @@
 <xsd:schema xmlns="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.siri.org.uk/siri" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0" id="siri_requests">
 	<!-- ===Dependencies ======================================= -->
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="../siri_utility/siri_utility-v1.1.xsd"/>
+	<xsd:include schemaLocation="../siri_utility/siri_utility.xsd"/>
 	<xsd:include schemaLocation="../siri_utility/siri_location-v2.0.xsd"/>
 	<xsd:include schemaLocation="siri_request_errorConditions-v2.0.xsd"/>
 	<!-- ======================================================================= -->
diff --git a/xsd/siri_utility/siri_all_utility-v2.0.xsd b/xsd/siri_utility/siri_all_utility-v2.0.xsd
index 637a9daca..94f2be84e 100644
--- a/xsd/siri_utility/siri_all_utility-v2.0.xsd
+++ b/xsd/siri_utility/siri_all_utility-v2.0.xsd
@@ -7,7 +7,7 @@
 	<!-- ======================================================================= -->
 	<xsd:include schemaLocation="../siri_utility/siri_participant-v2.0.xsd"/>
 	<xsd:include schemaLocation="../siri_utility/siri_types-v2.0.xsd"/>
-	<xsd:include schemaLocation="../siri_utility/siri_utility-v1.1.xsd"/>
+	<xsd:include schemaLocation="../siri_utility/siri_utility.xsd"/>
 	<xsd:include schemaLocation="../siri_utility/siri_location-v2.0.xsd"/>
 	<xsd:include schemaLocation="../siri_utility/siri_permissions-v2.0.xsd"/>
 	<!-- ================= =============================================== -->
diff --git a/xsd/siri_utility/siri_permissions-v2.0.xsd b/xsd/siri_utility/siri_permissions-v2.0.xsd
index cfb7f67da..1ce646024 100644
--- a/xsd/siri_utility/siri_permissions-v2.0.xsd
+++ b/xsd/siri_utility/siri_permissions-v2.0.xsd
@@ -59,7 +59,7 @@ Rail transport, Roads and road transport
 		<xsd:documentation>SIRI Framework Permission Types.</xsd:documentation>
 	</xsd:annotation>
 	<xsd:include schemaLocation="siri_types-v2.0.xsd"/>
-	<xsd:include schemaLocation="siri_utility-v1.1.xsd"/>
+	<xsd:include schemaLocation="siri_utility.xsd"/>
 	<xsd:include schemaLocation="siri_participant-v2.0.xsd"/>
 	<!-- ======================================================================= -->
 	<!-- ====Permissions================================================= -->
diff --git a/xsd/siri_utility/siri_utility-v1.1.xsd b/xsd/siri_utility/siri_utility.xsd
similarity index 98%
rename from xsd/siri_utility/siri_utility-v1.1.xsd
rename to xsd/siri_utility/siri_utility.xsd
index ce7140d6a..75daadc64 100644
--- a/xsd/siri_utility/siri_utility-v1.1.xsd
+++ b/xsd/siri_utility/siri_utility.xsd
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.siri.org.uk/schema/2.0/xsd/siri_utiliyty/}siri_utility-v1.1.xsd</Identifier>
+				<Identifier>{http://www.siri.org.uk/schema/2.0/xsd/siri_utiliyty/}siri_utility.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Rights>Unclassified
diff --git a/xsd/wsdl/siri_all_functionalServices.xsd b/xsd/wsdl/siri_all_functionalServices.xsd
index 72fffadc4..3484b8532 100644
--- a/xsd/wsdl/siri_all_functionalServices.xsd
+++ b/xsd/wsdl/siri_all_functionalServices.xsd
@@ -78,8 +78,8 @@ Rail transport, Roads and road transport.
 	<!-- ======================================================================= -->
 	<!-- ======================================================================= -->
 	<!-- REPLACE THESE PACKAGES WITH OTHER FINCTIONAL SERVICES -->
-	<xsd:import namespace="http://www.netex.org.uk/netex" schemaLocation="../netex_service/netex_dataObjectRequest_service-v1.0.xsd"/>
-	<xsd:import namespace="http://www.netex.org.uk/netex" schemaLocation="../netex_service/netex_all-v1.0.xsd"/>
+	<xsd:import namespace="http://www.netex.org.uk/netex" schemaLocation="../netex_service/netex_dataObjectRequest_service.xsd"/>
+	<xsd:import namespace="http://www.netex.org.uk/netex" schemaLocation="../netex_service/netex_all.xsd"/>
 	<!-- END OF FUNCTIONAL SERVICES -->
 	<!-- ======================================================================= -->
 </xsd:schema>

From 243d503cced4d598fd2fb47bba03c942c24167bf Mon Sep 17 00:00:00 2001
From: Cristoffer Solem <cristoffer.solem@gmail.com>
Date: Wed, 8 Aug 2018 11:14:29 +0200
Subject: [PATCH 2/4] Revert "See #13 Rename all xsd files (and references to
 them) to not have version suffixes"

This reverts commit 25da9ef57f7725f15cee54304c16cbeb9db01869.
---
 xsd/NX.xsd                                    |   4 +-
 xsd/NeTEx_publication-NoConstraint.xsd        |   4 +-
 xsd/NeTEx_publication.xsd                     |   4 +-
 xsd/NeTEx_publication_timetable.xsd           |  18 ++--
 xsd/NeTEx_siri.xsd                            |   4 +-
 xsd/ifopt.xsd                                 |   2 +-
 ...d => netex_all_objects_framework-v1.0.xsd} |   6 +-
 ...xsd => netex_all_objects_generic-v1.0.xsd} | 100 +++++++++---------
 ...sd => netex_all_frames_framework-v1.0.xsd} |  12 +--
 ...xsd => netex_commonFrame_version-v1.0.xsd} |   4 +-
 ... => netex_compositeFrame_version-v1.0.xsd} |   4 +-
 ...sd => netex_generalFrame_version-v1.0.xsd} |   8 +-
 ...d => netex_resourceFrame_support-v1.0.xsd} |   4 +-
 ...d => netex_resourceFrame_version-v1.1.xsd} |   8 +-
 ...tex_serviceCalendarFrame_support-v1.0.xsd} |   4 +-
 ...tex_serviceCalendarFrame_version-v1.0.xsd} |   6 +-
 ....xsd => netex_acsb_accessibility-v1.1.xsd} |   6 +-
 ...x_acsb_all.xsd => netex_acsb_all-v1.0.xsd} |   8 +-
 ...ns.xsd => netex_acsb_limitations-v1.0.xsd} |   0
 ... => netex_acsb_passengerMobility-v1.0.xsd} |   6 +-
 ...upport.xsd => netex_acsb_support-v1.0.xsd} |   4 +-
 ...=> netex_alternativeName_support-v1.0.xsd} |   4 +-
 ...=> netex_alternativeName_version-v1.0.xsd} |   6 +-
 ....xsd => netex_assignment_support-v1.0.xsd} |   4 +-
 ....xsd => netex_assignment_version-v1.0.xsd} |   6 +-
 ...rt.xsd => netex_grouping_support-v1.0.xsd} |   4 +-
 ...on.xsd => netex_grouping_version-v1.1.xsd} |   8 +-
 ...pport.xsd => netex_layer_support-v1.0.xsd} |   4 +-
 ...rsion.xsd => netex_layer_version-v1.0.xsd} |  10 +-
 ...rt.xsd => netex_loggable_support-v1.1.xsd} |   4 +-
 ...on.xsd => netex_loggable_version-v1.1.xsd} |   6 +-
 ...sd => netex_organisation_support-v1.1.xsd} |   8 +-
 ...sd => netex_organisation_version-v1.1.xsd} |  12 +--
 ...pport.xsd => netex_place_support-v1.0.xsd} |   4 +-
 ...rsion.xsd => netex_place_version-v1.1.xsd} |   8 +-
 ...tex_pointAndLinkSequence_support-v1.1.xsd} |   6 +-
 ...tex_pointAndLinkSequence_version-v1.1.xsd} |   8 +-
 ...sd => netex_pointAndLink_support-v1.1.xsd} |   6 +-
 ...sd => netex_pointAndLink_version-v1.1.xsd} |  12 +--
 ....xsd => netex_projection_support-v1.0.xsd} |   4 +-
 ....xsd => netex_projection_version-v1.0.xsd} |  10 +-
 ...ort.xsd => netex_section_support-v1.1.xsd} |   4 +-
 ...ion.xsd => netex_section_version-v1.1.xsd} |   8 +-
 ... => netex_spatialFeature_support-v1.0.xsd} |   4 +-
 ... => netex_spatialFeature_version-v1.0.xsd} |   6 +-
 ... => netex_zoneProjection_version-v1.0.xsd} |   4 +-
 ...upport.xsd => netex_zone_support-v1.0.xsd} |   4 +-
 ...ersion.xsd => netex_zone_version-v1.1.xsd} |   6 +-
 ...k.xsd => netex_payload_framework-v1.0.xsd} |   2 +-
 ...=> netex_alternativeText_support-v1.1.xsd} |   4 +-
 ...=> netex_alternativeText_version-v1.1.xsd} |   6 +-
 ....xsd => netex_dataSource_version-v1.0.xsd} |   4 +-
 ...ntity.xsd => netex_entity_entity-v1.0.xsd} |   6 +-
 ...port.xsd => netex_entity_support-v1.0.xsd} |   2 +-
 ...sion.xsd => netex_entity_version-v1.0.xsd} |   4 +-
 ...onship.xsd => netex_relationship-v1.0.xsd} |   4 +-
 ...sd => netex_relationship_support-v1.1.xsd} |   4 +-
 ... netex_responsibilitySet_version-v1.1.xsd} |   4 +-
 ... => netex_responsibility_support-v1.1.xsd} |   4 +-
 ... => netex_responsibility_version-v1.1.xsd} |  10 +-
 ...xsd => netex_typeOfValue_version-v1.0.xsd} |   4 +-
 ... netex_validityCondition_support-v1.0.xsd} |   4 +-
 ... netex_validityCondition_version-v1.0.xsd} |   6 +-
 ...sd => netex_versionDelta_version-v1.0.xsd} |   4 +-
 ...sd => netex_versionFrame_support-v1.0.xsd} |   4 +-
 ...sd => netex_versionFrame_version-v1.0.xsd} |  12 +--
 ...ort.xsd => netex_version_support-v1.1.xsd} |   4 +-
 ...ion.xsd => netex_version_version-v1.1.xsd} |  10 +-
 ...sion.xsd => netex_access_version-v1.0.xsd} |   6 +-
 ....xsd => netex_accounting_version-v1.0.xsd} |   0
 ...ort.xsd => netex_address_support-v1.0.xsd} |   4 +-
 ...ion.xsd => netex_address_version-v1.1.xsd} |  10 +-
 ...ex_all_objects_reusableComponents-v1.0.xsd |  45 ++++++++
 .../netex_all_objects_reusableComponents.xsd  |  45 --------
 ...ex_availabilityCondition_support-v1.0.xsd} |   4 +-
 ...ex_availabilityCondition_version-v1.0.xsd} |   6 +-
 ...ort.xsd => netex_country_support-v1.1.xsd} |   4 +-
 ...ion.xsd => netex_country_version-v1.1.xsd} |   8 +-
 ...=> netex_dayType_propertiesOfDay-v1.0.xsd} |   8 +-
 ...ort.xsd => netex_dayType_support-v1.0.xsd} |   6 +-
 ...ion.xsd => netex_dayType_version-v1.0.xsd} |  10 +-
 ... => netex_equipmentPlace_version-v1.0.xsd} |   6 +-
 ...quipmentVehiclePassenger_support-v1.0.xsd} |   4 +-
 ...quipmentVehiclePassenger_version-v1.0.xsd} |  14 +--
 ...t.xsd => netex_equipment_support-v1.0.xsd} |   4 +-
 ...n.xsd => netex_equipment_version-v1.0.xsd} |   8 +-
 ...xsd => netex_facilityUic_support-v1.0.xsd} |   4 +-
 ...xsd => netex_facilityUic_version-v1.0.xsd} |   4 +-
 ...rt.xsd => netex_facility_support-v1.1.xsd} |   4 +-
 ...on.xsd => netex_facility_version-v1.0.xsd} |  10 +-
 ...xsd => netex_linkByValue_support-v1.0.xsd} |   6 +-
 ...upport.xsd => netex_mode_support-v1.0.xsd} |   4 +-
 ...ersion.xsd => netex_mode_version-v1.0.xsd} |   8 +-
 ...> netex_noticeAssignment_version-v1.1.xsd} |  12 +--
 ...port.xsd => netex_notice_support-v1.0.xsd} |   4 +-
 ...sion.xsd => netex_notice_version-v1.1.xsd} |   6 +-
 ... netex_otherOrganisation_support-v1.0.xsd} |   4 +-
 ... netex_otherOrganisation_version-v1.0.xsd} |  10 +-
 ...sd => netex_schematicMap_support-v1.0.xsd} |   4 +-
 ...sd => netex_schematicMap_version-v1.0.xsd} |  10 +-
 ...sd => netex_securityList_support-v1.1.xsd} |   6 +-
 ...sd => netex_securityList_version-v1.1.xsd} |   8 +-
 ...=> netex_serviceCalendar_support-v1.0.xsd} |   4 +-
 ...=> netex_serviceCalendar_version-v1.0.xsd} |   8 +-
 ...ion.xsd => netex_submode_version-v1.1.xsd} |   4 +-
 ...> netex_topographicPlace_support-v1.1.xsd} |   6 +-
 ...> netex_topographicPlace_version-v1.1.xsd} |   8 +-
 ...sd => netex_trainElement_support-v1.0.xsd} |   4 +-
 ...sd => netex_trainElement_version-v1.1.xsd} |   8 +-
 ...ex_transportOrganisation_support-v1.0.xsd} |   4 +-
 ...ex_transportOrganisation_version-v1.0.xsd} |  10 +-
 ...sd => netex_travelRights_support-v1.0.xsd} |   4 +-
 ...sd => netex_travelRights_version-v1.1.xsd} |   8 +-
 ...xsd => netex_vehicleType_support-v1.0.xsd} |   4 +-
 ...xsd => netex_vehicleType_version-v1.1.xsd} |   8 +-
 ...ypes.xsd => netex_location_types-v1.0.xsd} |   4 +-
 .../{netex_units.xsd => netex_units-v1.0.xsd} |   2 +-
 ...act.xsd => netex_utility_contact-v1.0.xsd} |   6 +-
 ...y_time.xsd => netex_utility_time-v1.0.xsd} |   2 +-
 ...types.xsd => netex_utility_types-v1.1.xsd} |   2 +-
 ...ity_xml.xsd => netex_utility_xml-v1.0.xsd} |   2 +-
 ...t1.xsd => netex_all_frames_part1-v1.0.xsd} |   6 +-
 ..._all_objects_infrastructureFrame-v1.0.xsd} |   0
 ...1.xsd => netex_all_objects_part1-v1.0.xsd} |   8 +-
 ...etex_infrastructureFrame_version-v1.0.xsd} |  10 +-
 ...n.xsd => netex_siteFrame_version-v1.1.xsd} |  12 +--
 ... netex_assistanceBooking_support-v1.0.xsd} |   4 +-
 ... netex_assistanceBooking_version-v1.0.xsd} |  14 +--
 ...s.xsd => netex_ifopt_all_objects-v1.0.xsd} |  40 +++----
 ...ex_ifopt_checkConstraint_support-v1.1.xsd} |   4 +-
 ...ex_ifopt_checkConstraint_version-v1.1.xsd} |  12 +--
 ...ex_ifopt_equipmentAccess_support-v1.0.xsd} |   4 +-
 ...ex_ifopt_equipmentAccess_version-v1.0.xsd} |   8 +-
 ....xsd => netex_ifopt_equipmentAll-v1.0.xsd} |  40 +++----
 ...x_ifopt_equipmentParking_support-v1.0.xsd} |   4 +-
 ...x_ifopt_equipmentParking_version-v1.0.xsd} |   6 +-
 ...ifopt_equipmentPassenger_support-v1.0.xsd} |   4 +-
 ...ifopt_equipmentPassenger_version-v1.1.xsd} |  10 +-
 ...tex_ifopt_equipmentSigns_support-v1.0.xsd} |   4 +-
 ...tex_ifopt_equipmentSigns_version-v1.0.xsd} |   8 +-
 ...ifopt_equipmentTicketing_support-v1.0.xsd} |   4 +-
 ...ifopt_equipmentTicketing_version-v1.0.xsd} |  10 +-
 ...x_ifopt_equipmentWaiting_support-v1.0.xsd} |   4 +-
 ...x_ifopt_equipmentWaiting_version-v1.0.xsd} |   8 +-
 ..._ifopt_flexibleStopPlace_support-v1.0.xsd} |   4 +-
 ..._ifopt_flexibleStopPlace_version-v1.0.xsd} |   8 +-
 ...t_localServiceCommercial_support-v1.0.xsd} |   4 +-
 ...t_localServiceCommercial_version-v1.0.xsd} |   6 +-
 ...netex_ifopt_localService_support-v1.0.xsd} |   4 +-
 ...netex_ifopt_localService_version-v1.1.xsd} |  18 ++--
 ...tex_ifopt_navigationPath_version-v1.1.xsd} |  14 +--
 ...d => netex_ifopt_parking_support-v1.1.xsd} |   4 +-
 ...d => netex_ifopt_parking_version-v1.1.xsd} |   8 +-
 ....xsd => netex_ifopt_path_support-v1.0.xsd} |   6 +-
 ....xsd => netex_ifopt_path_version-v1.0.xsd} |   8 +-
 ...ex_ifopt_pointOfInterest_support-v1.0.xsd} |   4 +-
 ...ex_ifopt_pointOfInterest_version-v1.0.xsd} |   6 +-
 ...tex_ifopt_serviceFeature_support-v1.0.xsd} |   4 +-
 ...tex_ifopt_serviceFeature_version-v1.0.xsd} |   6 +-
 ....xsd => netex_ifopt_site_support-v1.0.xsd} |   6 +-
 ....xsd => netex_ifopt_site_version-v1.0.xsd} |  24 ++---
 ...=> netex_ifopt_stopPlace_support-v1.1.xsd} |   8 +-
 ...=> netex_ifopt_stopPlace_version-v1.1.xsd} |  24 ++---
 ...ex_ifopt_vehicleStopping_support-v1.0.xsd} |   4 +-
 ....xsd => netex_activation_support-v1.0.xsd} |   8 +-
 ....xsd => netex_activation_version-v1.0.xsd} |  12 +--
 ...rt1_infrastructureFrame_contents-v1.0.xsd} |  18 ++--
 ...netex_all_objects_part1_lineRoute-v1.0.xsd |  18 ++++
 .../netex_all_objects_part1_lineRoute.xsd     |  18 ----
 ...objects_part1_networkDescription-v1.0.xsd} |   6 +-
 ...=> netex_flexibleNetwork_support-v1.0.xsd} |   8 +-
 ...=> netex_flexibleNetwork_version-v1.1.xsd} |  14 +--
 ...xsd => netex_lineNetwork_support-v1.1.xsd} |   8 +-
 ...xsd => netex_lineNetwork_version-v1.1.xsd} |  10 +-
 ...upport.xsd => netex_line_support-v1.1.xsd} |   6 +-
 ...ersion.xsd => netex_line_version-v1.1.xsd} |  26 ++---
 ...ex_networkInfrastructure_support-v1.0.xsd} |   6 +-
 ...ex_networkInfrastructure_version-v1.0.xsd} |   8 +-
 ...netex_networkRestriction_support-v1.0.xsd} |   8 +-
 ...netex_networkRestriction_version-v1.0.xsd} |  10 +-
 ...> netex_routeInstruction_support-v1.1.xsd} |   6 +-
 ...> netex_routeInstruction_version-v1.1.xsd} |  10 +-
 ...pport.xsd => netex_route_support-v1.1.xsd} |   8 +-
 ...rsion.xsd => netex_route_version-v1.1.xsd} |  12 +--
 ...d => netex_timingPattern_support-v1.1.xsd} |   8 +-
 ...etex_vehicleAndCrewPoint_support-v1.0.xsd} |   8 +-
 ...etex_vehicleAndCrewPoint_version-v1.1.xsd} |  12 +--
 ...ll_objects_part1_tacticalPlanning-v1.0.xsd |  33 ++++++
 ...tex_all_objects_part1_tacticalPlanning.xsd |  33 ------
 ...d => netex_commonSection_support-v1.1.xsd} |   4 +-
 ...d => netex_commonSection_version-v1.1.xsd} |   6 +-
 ...rt.xsd => netex_fareZone_support-v1.1.xsd} |   6 +-
 ...on.xsd => netex_fareZone_version-v1.1.xsd} |  10 +-
 ...ex_journeyPatternTimings_support-v1.0.xsd} |   6 +-
 ...ex_journeyPatternTimings_version-v1.0.xsd} |  10 +-
 ... => netex_journeyPattern_support-v1.0.xsd} |   6 +-
 ... => netex_journeyPattern_version-v1.1.xsd} |  10 +-
 ...d => netex_journeyTiming_support-v1.0.xsd} |   6 +-
 ...d => netex_journeyTiming_version-v1.0.xsd} |  18 ++--
 ...ngerInformationEquipment_support-v1.0.xsd} |   6 +-
 ...ngerInformationEquipment_version-v1.0.xsd} |  20 ++--
 ... => netex_pathAssignment_version-v1.0.xsd} |   4 +-
 ... netex_routingConstraint_support-v1.0.xsd} |   8 +-
 ... netex_routingConstraint_version-v1.0.xsd} |   8 +-
 ... => netex_servicePattern_support-v1.1.xsd} |  10 +-
 ... => netex_servicePattern_version-v1.1.xsd} |  16 +--
 ... => netex_siteConnection_support-v1.0.xsd} |   6 +-
 ... => netex_siteConnection_version-v1.0.xsd} |  14 +--
 ... => netex_stopAssignment_support-v1.0.xsd} |   4 +-
 ... => netex_stopAssignment_version-v1.1.xsd} |  12 +--
 ... => netex_timeDemandType_support-v1.0.xsd} |   8 +-
 ... => netex_timeDemandType_version-v1.0.xsd} |  14 +--
 ...d => netex_timingPattern_version-v1.1.xsd} |  12 +--
 ...t2.xsd => netex_all_frames_part2-v1.0.xsd} |  18 ++--
 ...2.xsd => netex_all_objects_part2-v1.0.xsd} |  16 +--
 ...etex_driverScheduleFrame_version-v1.0.xsd} |   6 +-
 ...sd => netex_serviceFrame_version-v1.1.xsd} |   8 +-
 ... => netex_timetableFrame_support-v1.0.xsd} |   6 +-
 ... => netex_timetableFrame_version-v1.0.xsd} |  10 +-
 ...tex_vehicleScheduleFrame_version-v1.0.xsd} |   8 +-
 ...ex_all_objects_part2_journeyTimes-v1.0.xsd |  27 +++++
 .../netex_all_objects_part2_journeyTimes.xsd  |  27 -----
 ...upport.xsd => netex_call_support-v1.0.xsd} |   6 +-
 ...ersion.xsd => netex_call_version-v1.1.xsd} |  22 ++--
 ... => netex_coupledJourney_support-v1.1.xsd} |   6 +-
 ... => netex_coupledJourney_version-v1.1.xsd} |  10 +-
 ... netex_datedPassingTimes_version-v1.1.xsd} |   6 +-
 ...etex_datedVehicleJourney_support-v1.0.xsd} |   4 +-
 ...etex_datedVehicleJourney_version-v1.0.xsd} |  12 +--
 ...=> netex_flexibleService_support-v1.0.xsd} |   6 +-
 ...=> netex_flexibleService_version-v1.0.xsd} |  12 +--
 ...=> netex_interchangeRule_version-v1.1.xsd} |  10 +-
 ...xsd => netex_interchange_support-v1.0.xsd} |   8 +-
 ...xsd => netex_interchange_version-v1.1.xsd} |  16 +--
 ... netex_journeyAccounting_support-v1.0.xsd} |   8 +-
 ... netex_journeyAccounting_version-v1.0.xsd} |  10 +-
 ... netex_journeyDesignator_support-v1.0.xsd} |  12 +--
 ...ion.xsd => netex_journey_version-v1.1.xsd} |  16 +--
 ...sd => netex_passingTimes_support-v1.0.xsd} |   6 +-
 ...sd => netex_passingTimes_version-v1.1.xsd} |  12 +--
 ... => netex_serviceJourney_support-v1.0.xsd} |   4 +-
 ... => netex_serviceJourney_version-v1.1.xsd} |  16 +--
 ...xsd => netex_serviceView_version-v1.0.xsd} |   2 +-
 ... netex_timeDemandProfile_version-v1.0.xsd} |  10 +-
 ...=> netex_timeDemandTimes_version-v1.0.xsd} |   8 +-
 ..._vehicleJourneyFrequency_support-v1.0.xsd} |   4 +-
 ..._vehicleJourneyFrequency_version-v1.1.xsd} |  12 +--
 ...etex_vehicleJourneyTimes_support-v1.0.xsd} |   4 +-
 ...etex_vehicleJourneyTimes_version-v1.0.xsd} |  12 +--
 ... => netex_vehicleJourney_support-v1.0.xsd} |   8 +-
 ... => netex_vehicleJourney_version-v1.1.xsd} |  24 ++---
 ... => netex_vehicleService_support-v1.0.xsd} |   6 +-
 ...all_objects_part2_vehicleService-v1.0.xsd} |  16 +--
 ...upport.xsd => netex_duty_support-v1.0.xsd} |   6 +-
 ...ersion.xsd => netex_duty_version-v1.0.xsd} |  14 +--
 ... => netex_vehicleService_version-v1.1.xsd} |  16 +--
 ... netex_all_objects_part3_piQuery-v1.0.xsd} |   2 +-
 ...ort.xsd => netex_piQuery_support-v1.0.xsd} |   6 +-
 ...t.xsd => netex_piRequest_support-v1.1.xsd} |   6 +-
 ...tex_accessRightParameter_support-v1.0.xsd} |   8 +-
 ...tex_accessRightParameter_version-v1.1.xsd} |  58 +++++-----
 ...=> netex_all_objects_part3_fares-v1.1.xsd} |   8 +-
 ...netex_all_objects_part3_fares_AR-v1.1.xsd} |  46 ++++----
 ...netex_all_objects_part3_fares_FP-v1.1.xsd} |  12 +--
 ...netex_all_objects_part3_fares_FS-v1.1.xsd} |  32 +++---
 ...netex_all_objects_part3_fares_SD-v1.1.xsd} |  12 +--
 ...ex_calculationParameters_support-v1.0.xsd} |   8 +-
 ...ex_calculationParameters_version-v1.0.xsd} |   8 +-
 ...ex_distanceMatrixElement_support-v1.0.xsd} |   8 +-
 ...ex_distanceMatrixElement_version-v1.1.xsd} |  10 +-
 ...tex_fareConditionSummary_support-v1.0.xsd} |   4 +-
 ...tex_fareConditionSummary_version-v1.0.xsd} |   8 +-
 ...t.xsd => netex_farePrice_support-v1.0.xsd} |   6 +-
 ...n.xsd => netex_farePrice_version-v1.1.xsd} |  16 +--
 ...xsd => netex_fareProduct_support-v1.0.xsd} |   6 +-
 ...xsd => netex_fareProduct_version-v1.1.xsd} |  14 +--
 ....xsd => netex_fareSeries_support-v1.0.xsd} |   6 +-
 ....xsd => netex_fareSeries_version-v1.0.xsd} |  10 +-
 ...tex_fareStructureElement_support-v1.0.xsd} |   6 +-
 ...tex_fareStructureElement_version-v1.1.xsd} |  12 +--
 ...d => netex_fareStructure_support-v1.0.xsd} |   6 +-
 ...d => netex_fareStructure_version-v1.0.xsd} |   8 +-
 ...t.xsd => netex_fareTable_support-v1.0.xsd} |   8 +-
 ...n.xsd => netex_fareTable_version-v1.1.xsd} |  44 ++++----
 ...eographicStructureFactor_support-v1.0.xsd} |   6 +-
 ...eographicStructureFactor_version-v1.0.xsd} |  14 +--
 ...x_qualityStructureFactor_support-v1.0.xsd} |   6 +-
 ...x_qualityStructureFactor_version-v1.0.xsd} |  18 ++--
 ... netex_salesDistribution_support-v1.0.xsd} |   6 +-
 ... netex_salesDistribution_version-v1.0.xsd} |  16 +--
 ...sd => netex_salesPackage_support-v1.0.xsd} |   8 +-
 ...sd => netex_salesPackage_version-v1.0.xsd} |  12 +--
 ...etex_timeStructureFactor_support-v1.0.xsd} |   6 +-
 ...etex_timeStructureFactor_version-v1.0.xsd} |  12 +--
 ... => netex_travelDocument_support-v1.1.xsd} |   8 +-
 ... => netex_travelDocument_version-v1.1.xsd} |  10 +-
 ...usageParameterAfterSales_support-v1.0.xsd} |   6 +-
 ...usageParameterAfterSales_version-v1.0.xsd} |  12 +--
 ...ex_usageParameterBooking_support-v1.0.xsd} |   6 +-
 ...ex_usageParameterBooking_version-v1.0.xsd} |  12 +--
 ...x_usageParameterCharging_support-v1.0.xsd} |   4 +-
 ...x_usageParameterCharging_version-v1.0.xsd} |   6 +-
 ...sageParameterEligibility_support-v1.0.xsd} |   4 +-
 ...sageParameterEligibility_version-v1.0.xsd} |   8 +-
 ...sageParameterEntitlement_support-v1.0.xsd} |   4 +-
 ...sageParameterEntitlement_version-v1.0.xsd} |   8 +-
 ...ex_usageParameterLuggage_support-v1.0.xsd} |   4 +-
 ...ex_usageParameterLuggage_version-v1.0.xsd} |   6 +-
 ...tex_usageParameterTravel_support-v1.1.xsd} |   4 +-
 ...tex_usageParameterTravel_version-v1.0.xsd} |   8 +-
 ... => netex_usageParameter_support-v1.0.xsd} |   6 +-
 ... => netex_usageParameter_version-v1.0.xsd} |  12 +--
 ...netex_usageParametersAll_support-v1.0.xsd} |  14 +--
 ...> netex_validableElement_support-v1.0.xsd} |   6 +-
 ...> netex_validableElement_version-v1.0.xsd} |  10 +-
 ...t3.xsd => netex_all_frames_part3-v1.0.xsd} |   4 +-
 ...n.xsd => netex_fareFrame_version-v1.0.xsd} |  14 +--
 ...ex_salesTransactionFrame_version-v1.1.xsd} |  10 +-
 ...tex_all_objects_part3_monitoring-v1.0.xsd} |   6 +-
 ...d => netex_monitoredCall_version-v1.0.xsd} |  10 +-
 ...ex_monitoredPassingTimes_version-v1.1.xsd} |   6 +-
 ..._monitoredVehicleJourney_support-v1.0.xsd} |   6 +-
 ... netex_all_objects_part3_parking-v1.0.xsd} |   4 +-
 ...d => netex_parkingTariff_support-v1.1.xsd} |   6 +-
 ...d => netex_parkingTariff_version-v1.1.xsd} |  10 +-
 ..._objects_part3_salesTransactions-v1.0.xsd} |  20 ++--
 ...etex_customerEligibility_support-v1.1.xsd} |   6 +-
 ...etex_customerEligibility_version-v1.1.xsd} |  12 +--
 ..._customerPurchasePackage_support-v1.1.xsd} |   8 +-
 ..._customerPurchasePackage_version-v1.1.xsd} |  18 ++--
 ...> netex_retailConsortium_support-v1.1.xsd} |  10 +-
 ...> netex_retailConsortium_version-v1.1.xsd} |  16 +--
 ...d => netex_salesContract_support-v1.1.xsd} |   8 +-
 ...d => netex_salesContract_version-v1.1.xsd} |  18 ++--
 ...> netex_salesTransaction_support-v1.0.xsd} |   8 +-
 ...> netex_salesTransaction_version-v1.1.xsd} |  14 +--
 .../{netex_all.xsd => netex_all-v1.0.xsd}     |  18 ++--
 ...filters.xsd => netex_all_filters-v1.0.xsd} |  14 +--
 ... netex_dataObjectRequest_service-v1.0.xsd} |   8 +-
 ..._frame.xsd => netex_filter_frame-v1.0.xsd} |  10 +-
 ...bject.xsd => netex_filter_object-v1.0.xsd} |  18 ++--
 xsd/siri/siri_base-v2.0.xsd                   |   2 +-
 xsd/siri/siri_requests-v2.0.xsd               |   2 +-
 xsd/siri_utility/siri_all_utility-v2.0.xsd    |   2 +-
 xsd/siri_utility/siri_permissions-v2.0.xsd    |   2 +-
 ...siri_utility.xsd => siri_utility-v1.1.xsd} |   2 +-
 xsd/wsdl/siri_all_functionalServices.xsd      |   4 +-
 347 files changed, 1610 insertions(+), 1610 deletions(-)
 rename xsd/netex_framework/{netex_all_objects_framework.xsd => netex_all_objects_framework-v1.0.xsd} (78%)
 rename xsd/netex_framework/{netex_all_objects_generic.xsd => netex_all_objects_generic-v1.0.xsd} (63%)
 rename xsd/netex_framework/netex_frames/{netex_all_frames_framework.xsd => netex_all_frames_framework-v1.0.xsd} (70%)
 rename xsd/netex_framework/netex_frames/{netex_commonFrame_version.xsd => netex_commonFrame_version-v1.0.xsd} (97%)
 rename xsd/netex_framework/netex_frames/{netex_compositeFrame_version.xsd => netex_compositeFrame_version-v1.0.xsd} (98%)
 rename xsd/netex_framework/netex_frames/{netex_generalFrame_version.xsd => netex_generalFrame_version-v1.0.xsd} (98%)
 rename xsd/netex_framework/netex_frames/{netex_resourceFrame_support.xsd => netex_resourceFrame_support-v1.0.xsd} (97%)
 rename xsd/netex_framework/netex_frames/{netex_resourceFrame_version.xsd => netex_resourceFrame_version-v1.1.xsd} (96%)
 rename xsd/netex_framework/netex_frames/{netex_serviceCalendarFrame_support.xsd => netex_serviceCalendarFrame_support-v1.0.xsd} (97%)
 rename xsd/netex_framework/netex_frames/{netex_serviceCalendarFrame_version.xsd => netex_serviceCalendarFrame_version-v1.0.xsd} (97%)
 rename xsd/netex_framework/netex_genericFramework/netex_accessibility/{netex_acsb_accessibility.xsd => netex_acsb_accessibility-v1.1.xsd} (97%)
 rename xsd/netex_framework/netex_genericFramework/netex_accessibility/{netex_acsb_all.xsd => netex_acsb_all-v1.0.xsd} (85%)
 rename xsd/netex_framework/netex_genericFramework/netex_accessibility/{netex_acsb_limitations.xsd => netex_acsb_limitations-v1.0.xsd} (100%)
 rename xsd/netex_framework/netex_genericFramework/netex_accessibility/{netex_acsb_passengerMobility.xsd => netex_acsb_passengerMobility-v1.0.xsd} (99%)
 rename xsd/netex_framework/netex_genericFramework/netex_accessibility/{netex_acsb_support.xsd => netex_acsb_support-v1.0.xsd} (99%)
 rename xsd/netex_framework/netex_genericFramework/{netex_alternativeName_support.xsd => netex_alternativeName_support-v1.0.xsd} (97%)
 rename xsd/netex_framework/netex_genericFramework/{netex_alternativeName_version.xsd => netex_alternativeName_version-v1.0.xsd} (97%)
 rename xsd/netex_framework/netex_genericFramework/{netex_assignment_support.xsd => netex_assignment_support-v1.0.xsd} (97%)
 rename xsd/netex_framework/netex_genericFramework/{netex_assignment_version.xsd => netex_assignment_version-v1.0.xsd} (97%)
 rename xsd/netex_framework/netex_genericFramework/{netex_grouping_support.xsd => netex_grouping_support-v1.0.xsd} (98%)
 rename xsd/netex_framework/netex_genericFramework/{netex_grouping_version.xsd => netex_grouping_version-v1.1.xsd} (98%)
 rename xsd/netex_framework/netex_genericFramework/{netex_layer_support.xsd => netex_layer_support-v1.0.xsd} (97%)
 rename xsd/netex_framework/netex_genericFramework/{netex_layer_version.xsd => netex_layer_version-v1.0.xsd} (95%)
 rename xsd/netex_framework/netex_genericFramework/{netex_loggable_support.xsd => netex_loggable_support-v1.1.xsd} (97%)
 rename xsd/netex_framework/netex_genericFramework/{netex_loggable_version.xsd => netex_loggable_version-v1.1.xsd} (97%)
 rename xsd/netex_framework/netex_genericFramework/{netex_organisation_support.xsd => netex_organisation_support-v1.1.xsd} (98%)
 rename xsd/netex_framework/netex_genericFramework/{netex_organisation_version.xsd => netex_organisation_version-v1.1.xsd} (99%)
 rename xsd/netex_framework/netex_genericFramework/{netex_place_support.xsd => netex_place_support-v1.0.xsd} (99%)
 rename xsd/netex_framework/netex_genericFramework/{netex_place_version.xsd => netex_place_version-v1.1.xsd} (98%)
 rename xsd/netex_framework/netex_genericFramework/{netex_pointAndLinkSequence_support.xsd => netex_pointAndLinkSequence_support-v1.1.xsd} (98%)
 rename xsd/netex_framework/netex_genericFramework/{netex_pointAndLinkSequence_version.xsd => netex_pointAndLinkSequence_version-v1.1.xsd} (98%)
 rename xsd/netex_framework/netex_genericFramework/{netex_pointAndLink_support.xsd => netex_pointAndLink_support-v1.1.xsd} (98%)
 rename xsd/netex_framework/netex_genericFramework/{netex_pointAndLink_version.xsd => netex_pointAndLink_version-v1.1.xsd} (98%)
 rename xsd/netex_framework/netex_genericFramework/{netex_projection_support.xsd => netex_projection_support-v1.0.xsd} (98%)
 rename xsd/netex_framework/netex_genericFramework/{netex_projection_version.xsd => netex_projection_version-v1.0.xsd} (99%)
 rename xsd/netex_framework/netex_genericFramework/{netex_section_support.xsd => netex_section_support-v1.1.xsd} (98%)
 rename xsd/netex_framework/netex_genericFramework/{netex_section_version.xsd => netex_section_version-v1.1.xsd} (98%)
 rename xsd/netex_framework/netex_genericFramework/{netex_spatialFeature_support.xsd => netex_spatialFeature_support-v1.0.xsd} (97%)
 rename xsd/netex_framework/netex_genericFramework/{netex_spatialFeature_version.xsd => netex_spatialFeature_version-v1.0.xsd} (97%)
 rename xsd/netex_framework/netex_genericFramework/{netex_zoneProjection_version.xsd => netex_zoneProjection_version-v1.0.xsd} (97%)
 rename xsd/netex_framework/netex_genericFramework/{netex_zone_support.xsd => netex_zone_support-v1.0.xsd} (97%)
 rename xsd/netex_framework/netex_genericFramework/{netex_zone_version.xsd => netex_zone_version-v1.1.xsd} (98%)
 rename xsd/netex_framework/{netex_payload_framework.xsd => netex_payload_framework-v1.0.xsd} (98%)
 rename xsd/netex_framework/netex_responsibility/{netex_alternativeText_support.xsd => netex_alternativeText_support-v1.1.xsd} (96%)
 rename xsd/netex_framework/netex_responsibility/{netex_alternativeText_version.xsd => netex_alternativeText_version-v1.1.xsd} (96%)
 rename xsd/netex_framework/netex_responsibility/{netex_dataSource_version.xsd => netex_dataSource_version-v1.0.xsd} (97%)
 rename xsd/netex_framework/netex_responsibility/{netex_entity_entity.xsd => netex_entity_entity-v1.0.xsd} (95%)
 rename xsd/netex_framework/netex_responsibility/{netex_entity_support.xsd => netex_entity_support-v1.0.xsd} (99%)
 rename xsd/netex_framework/netex_responsibility/{netex_entity_version.xsd => netex_entity_version-v1.0.xsd} (98%)
 rename xsd/netex_framework/netex_responsibility/{netex_relationship.xsd => netex_relationship-v1.0.xsd} (98%)
 rename xsd/netex_framework/netex_responsibility/{netex_relationship_support.xsd => netex_relationship_support-v1.1.xsd} (98%)
 rename xsd/netex_framework/netex_responsibility/{netex_responsibilitySet_version.xsd => netex_responsibilitySet_version-v1.1.xsd} (98%)
 rename xsd/netex_framework/netex_responsibility/{netex_responsibility_support.xsd => netex_responsibility_support-v1.1.xsd} (98%)
 rename xsd/netex_framework/netex_responsibility/{netex_responsibility_version.xsd => netex_responsibility_version-v1.1.xsd} (96%)
 rename xsd/netex_framework/netex_responsibility/{netex_typeOfValue_version.xsd => netex_typeOfValue_version-v1.0.xsd} (98%)
 rename xsd/netex_framework/netex_responsibility/{netex_validityCondition_support.xsd => netex_validityCondition_support-v1.0.xsd} (98%)
 rename xsd/netex_framework/netex_responsibility/{netex_validityCondition_version.xsd => netex_validityCondition_version-v1.0.xsd} (98%)
 rename xsd/netex_framework/netex_responsibility/{netex_versionDelta_version.xsd => netex_versionDelta_version-v1.0.xsd} (98%)
 rename xsd/netex_framework/netex_responsibility/{netex_versionFrame_support.xsd => netex_versionFrame_support-v1.0.xsd} (98%)
 rename xsd/netex_framework/netex_responsibility/{netex_versionFrame_version.xsd => netex_versionFrame_version-v1.0.xsd} (98%)
 rename xsd/netex_framework/netex_responsibility/{netex_version_support.xsd => netex_version_support-v1.1.xsd} (98%)
 rename xsd/netex_framework/netex_responsibility/{netex_version_version.xsd => netex_version_version-v1.1.xsd} (97%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_access_version.xsd => netex_access_version-v1.0.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_accounting_version.xsd => netex_accounting_version-v1.0.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_address_support.xsd => netex_address_support-v1.0.xsd} (99%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_address_version.xsd => netex_address_version-v1.1.xsd} (98%)
 create mode 100644 xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents-v1.0.xsd
 delete mode 100644 xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd
 rename xsd/netex_framework/netex_reusableComponents/{netex_availabilityCondition_support.xsd => netex_availabilityCondition_support-v1.0.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_availabilityCondition_version.xsd => netex_availabilityCondition_version-v1.0.xsd} (99%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_country_support.xsd => netex_country_support-v1.1.xsd} (99%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_country_version.xsd => netex_country_version-v1.1.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_dayType_propertiesOfDay.xsd => netex_dayType_propertiesOfDay-v1.0.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_dayType_support.xsd => netex_dayType_support-v1.0.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_dayType_version.xsd => netex_dayType_version-v1.0.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_equipmentPlace_version.xsd => netex_equipmentPlace_version-v1.0.xsd} (97%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_equipmentVehiclePassenger_support.xsd => netex_equipmentVehiclePassenger_support-v1.0.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_equipmentVehiclePassenger_version.xsd => netex_equipmentVehiclePassenger_version-v1.0.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_equipment_support.xsd => netex_equipment_support-v1.0.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_equipment_version.xsd => netex_equipment_version-v1.0.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_facilityUic_support.xsd => netex_facilityUic_support-v1.0.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_facilityUic_version.xsd => netex_facilityUic_version-v1.0.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_facility_support.xsd => netex_facility_support-v1.1.xsd} (99%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_facility_version.xsd => netex_facility_version-v1.0.xsd} (99%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_linkByValue_support.xsd => netex_linkByValue_support-v1.0.xsd} (97%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_mode_support.xsd => netex_mode_support-v1.0.xsd} (99%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_mode_version.xsd => netex_mode_version-v1.0.xsd} (96%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_noticeAssignment_version.xsd => netex_noticeAssignment_version-v1.1.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_notice_support.xsd => netex_notice_support-v1.0.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_notice_version.xsd => netex_notice_version-v1.1.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_otherOrganisation_support.xsd => netex_otherOrganisation_support-v1.0.xsd} (99%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_otherOrganisation_version.xsd => netex_otherOrganisation_version-v1.0.xsd} (97%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_schematicMap_support.xsd => netex_schematicMap_support-v1.0.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_schematicMap_version.xsd => netex_schematicMap_version-v1.0.xsd} (97%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_securityList_support.xsd => netex_securityList_support-v1.1.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_securityList_version.xsd => netex_securityList_version-v1.1.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_serviceCalendar_support.xsd => netex_serviceCalendar_support-v1.0.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_serviceCalendar_version.xsd => netex_serviceCalendar_version-v1.0.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_submode_version.xsd => netex_submode_version-v1.1.xsd} (99%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_topographicPlace_support.xsd => netex_topographicPlace_support-v1.1.xsd} (99%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_topographicPlace_version.xsd => netex_topographicPlace_version-v1.1.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_trainElement_support.xsd => netex_trainElement_support-v1.0.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_trainElement_version.xsd => netex_trainElement_version-v1.1.xsd} (98%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_transportOrganisation_support.xsd => netex_transportOrganisation_support-v1.0.xsd} (99%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_transportOrganisation_version.xsd => netex_transportOrganisation_version-v1.0.xsd} (99%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_travelRights_support.xsd => netex_travelRights_support-v1.0.xsd} (99%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_travelRights_version.xsd => netex_travelRights_version-v1.1.xsd} (97%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_vehicleType_support.xsd => netex_vehicleType_support-v1.0.xsd} (99%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_vehicleType_version.xsd => netex_vehicleType_version-v1.1.xsd} (99%)
 rename xsd/netex_framework/netex_utility/{netex_location_types.xsd => netex_location_types-v1.0.xsd} (98%)
 rename xsd/netex_framework/netex_utility/{netex_units.xsd => netex_units-v1.0.xsd} (98%)
 rename xsd/netex_framework/netex_utility/{netex_utility_contact.xsd => netex_utility_contact-v1.0.xsd} (96%)
 rename xsd/netex_framework/netex_utility/{netex_utility_time.xsd => netex_utility_time-v1.0.xsd} (99%)
 rename xsd/netex_framework/netex_utility/{netex_utility_types.xsd => netex_utility_types-v1.1.xsd} (99%)
 rename xsd/netex_framework/netex_utility/{netex_utility_xml.xsd => netex_utility_xml-v1.0.xsd} (98%)
 rename xsd/netex_part_1/{netex_all_frames_part1.xsd => netex_all_frames_part1-v1.0.xsd} (88%)
 rename xsd/netex_part_1/{netex_all_objects_infrastructureFrame.xsd => netex_all_objects_infrastructureFrame-v1.0.xsd} (100%)
 rename xsd/netex_part_1/{netex_all_objects_part1.xsd => netex_all_objects_part1-v1.0.xsd} (89%)
 rename xsd/netex_part_1/part1_frames/{netex_infrastructureFrame_version.xsd => netex_infrastructureFrame_version-v1.0.xsd} (96%)
 rename xsd/netex_part_1/part1_frames/{netex_siteFrame_version.xsd => netex_siteFrame_version-v1.1.xsd} (97%)
 rename xsd/netex_part_1/part1_ifopt/{netex_assistanceBooking_support.xsd => netex_assistanceBooking_support-v1.0.xsd} (97%)
 rename xsd/netex_part_1/part1_ifopt/{netex_assistanceBooking_version.xsd => netex_assistanceBooking_version-v1.0.xsd} (94%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_all_objects.xsd => netex_ifopt_all_objects-v1.0.xsd} (72%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_checkConstraint_support.xsd => netex_ifopt_checkConstraint_support-v1.1.xsd} (98%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_checkConstraint_version.xsd => netex_ifopt_checkConstraint_version-v1.1.xsd} (98%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_equipmentAccess_support.xsd => netex_ifopt_equipmentAccess_support-v1.0.xsd} (99%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_equipmentAccess_version.xsd => netex_ifopt_equipmentAccess_version-v1.0.xsd} (99%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_equipmentAll.xsd => netex_ifopt_equipmentAll-v1.0.xsd} (91%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_equipmentParking_support.xsd => netex_ifopt_equipmentParking_support-v1.0.xsd} (97%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_equipmentParking_version.xsd => netex_ifopt_equipmentParking_version-v1.0.xsd} (98%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_equipmentPassenger_support.xsd => netex_ifopt_equipmentPassenger_support-v1.0.xsd} (98%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_equipmentPassenger_version.xsd => netex_ifopt_equipmentPassenger_version-v1.1.xsd} (98%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_equipmentSigns_support.xsd => netex_ifopt_equipmentSigns_support-v1.0.xsd} (98%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_equipmentSigns_version.xsd => netex_ifopt_equipmentSigns_version-v1.0.xsd} (98%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_equipmentTicketing_support.xsd => netex_ifopt_equipmentTicketing_support-v1.0.xsd} (97%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_equipmentTicketing_version.xsd => netex_ifopt_equipmentTicketing_version-v1.0.xsd} (97%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_equipmentWaiting_support.xsd => netex_ifopt_equipmentWaiting_support-v1.0.xsd} (98%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_equipmentWaiting_version.xsd => netex_ifopt_equipmentWaiting_version-v1.0.xsd} (99%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_flexibleStopPlace_support.xsd => netex_ifopt_flexibleStopPlace_support-v1.0.xsd} (98%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_flexibleStopPlace_version.xsd => netex_ifopt_flexibleStopPlace_version-v1.0.xsd} (98%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_localServiceCommercial_support.xsd => netex_ifopt_localServiceCommercial_support-v1.0.xsd} (98%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_localServiceCommercial_version.xsd => netex_ifopt_localServiceCommercial_version-v1.0.xsd} (98%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_localService_support.xsd => netex_ifopt_localService_support-v1.0.xsd} (99%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_localService_version.xsd => netex_ifopt_localService_version-v1.1.xsd} (98%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_navigationPath_version.xsd => netex_ifopt_navigationPath_version-v1.1.xsd} (98%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_parking_support.xsd => netex_ifopt_parking_support-v1.1.xsd} (99%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_parking_version.xsd => netex_ifopt_parking_version-v1.1.xsd} (99%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_path_support.xsd => netex_ifopt_path_support-v1.0.xsd} (98%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_path_version.xsd => netex_ifopt_path_version-v1.0.xsd} (98%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_pointOfInterest_support.xsd => netex_ifopt_pointOfInterest_support-v1.0.xsd} (98%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_pointOfInterest_version.xsd => netex_ifopt_pointOfInterest_version-v1.0.xsd} (99%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_serviceFeature_support.xsd => netex_ifopt_serviceFeature_support-v1.0.xsd} (97%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_serviceFeature_version.xsd => netex_ifopt_serviceFeature_version-v1.0.xsd} (96%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_site_support.xsd => netex_ifopt_site_support-v1.0.xsd} (99%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_site_version.xsd => netex_ifopt_site_version-v1.0.xsd} (97%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_stopPlace_support.xsd => netex_ifopt_stopPlace_support-v1.1.xsd} (98%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_stopPlace_version.xsd => netex_ifopt_stopPlace_version-v1.1.xsd} (99%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_vehicleStopping_support.xsd => netex_ifopt_vehicleStopping_support-v1.0.xsd} (98%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_activation_support.xsd => netex_activation_support-v1.0.xsd} (98%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_activation_version.xsd => netex_activation_version-v1.0.xsd} (98%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_all_objects_part1_infrastructureFrame_contents.xsd => netex_all_objects_part1_infrastructureFrame_contents-v1.0.xsd} (62%)
 create mode 100644 xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_lineRoute-v1.0.xsd
 delete mode 100644 xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_lineRoute.xsd
 rename xsd/netex_part_1/part1_networkDescription/{netex_all_objects_part1_networkDescription.xsd => netex_all_objects_part1_networkDescription-v1.0.xsd} (86%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_flexibleNetwork_support.xsd => netex_flexibleNetwork_support-v1.0.xsd} (97%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_flexibleNetwork_version.xsd => netex_flexibleNetwork_version-v1.1.xsd} (97%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_lineNetwork_support.xsd => netex_lineNetwork_support-v1.1.xsd} (97%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_lineNetwork_version.xsd => netex_lineNetwork_version-v1.1.xsd} (98%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_line_support.xsd => netex_line_support-v1.1.xsd} (98%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_line_version.xsd => netex_line_version-v1.1.xsd} (98%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_networkInfrastructure_support.xsd => netex_networkInfrastructure_support-v1.0.xsd} (99%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_networkInfrastructure_version.xsd => netex_networkInfrastructure_version-v1.0.xsd} (99%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_networkRestriction_support.xsd => netex_networkRestriction_support-v1.0.xsd} (97%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_networkRestriction_version.xsd => netex_networkRestriction_version-v1.0.xsd} (98%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_routeInstruction_support.xsd => netex_routeInstruction_support-v1.1.xsd} (96%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_routeInstruction_version.xsd => netex_routeInstruction_version-v1.1.xsd} (97%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_route_support.xsd => netex_route_support-v1.1.xsd} (98%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_route_version.xsd => netex_route_version-v1.1.xsd} (98%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_timingPattern_support.xsd => netex_timingPattern_support-v1.1.xsd} (97%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_vehicleAndCrewPoint_support.xsd => netex_vehicleAndCrewPoint_support-v1.0.xsd} (98%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_vehicleAndCrewPoint_version.xsd => netex_vehicleAndCrewPoint_version-v1.1.xsd} (98%)
 create mode 100644 xsd/netex_part_1/part1_tacticalPlanning/netex_all_objects_part1_tacticalPlanning-v1.0.xsd
 delete mode 100644 xsd/netex_part_1/part1_tacticalPlanning/netex_all_objects_part1_tacticalPlanning.xsd
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_commonSection_support.xsd => netex_commonSection_support-v1.1.xsd} (96%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_commonSection_version.xsd => netex_commonSection_version-v1.1.xsd} (97%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_fareZone_support.xsd => netex_fareZone_support-v1.1.xsd} (98%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_fareZone_version.xsd => netex_fareZone_version-v1.1.xsd} (98%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_journeyPatternTimings_support.xsd => netex_journeyPatternTimings_support-v1.0.xsd} (98%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_journeyPatternTimings_version.xsd => netex_journeyPatternTimings_version-v1.0.xsd} (98%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_journeyPattern_support.xsd => netex_journeyPattern_support-v1.0.xsd} (98%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_journeyPattern_version.xsd => netex_journeyPattern_version-v1.1.xsd} (98%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_journeyTiming_support.xsd => netex_journeyTiming_support-v1.0.xsd} (98%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_journeyTiming_version.xsd => netex_journeyTiming_version-v1.0.xsd} (97%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_passengerInformationEquipment_support.xsd => netex_passengerInformationEquipment_support-v1.0.xsd} (98%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_passengerInformationEquipment_version.xsd => netex_passengerInformationEquipment_version-v1.0.xsd} (98%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_pathAssignment_version.xsd => netex_pathAssignment_version-v1.0.xsd} (96%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_routingConstraint_support.xsd => netex_routingConstraint_support-v1.0.xsd} (97%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_routingConstraint_version.xsd => netex_routingConstraint_version-v1.0.xsd} (98%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_servicePattern_support.xsd => netex_servicePattern_support-v1.1.xsd} (98%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_servicePattern_version.xsd => netex_servicePattern_version-v1.1.xsd} (99%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_siteConnection_support.xsd => netex_siteConnection_support-v1.0.xsd} (96%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_siteConnection_version.xsd => netex_siteConnection_version-v1.0.xsd} (97%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_stopAssignment_support.xsd => netex_stopAssignment_support-v1.0.xsd} (98%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_stopAssignment_version.xsd => netex_stopAssignment_version-v1.1.xsd} (98%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_timeDemandType_support.xsd => netex_timeDemandType_support-v1.0.xsd} (97%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_timeDemandType_version.xsd => netex_timeDemandType_version-v1.0.xsd} (97%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_timingPattern_version.xsd => netex_timingPattern_version-v1.1.xsd} (98%)
 rename xsd/netex_part_2/{netex_all_frames_part2.xsd => netex_all_frames_part2-v1.0.xsd} (89%)
 rename xsd/netex_part_2/{netex_all_objects_part2.xsd => netex_all_objects_part2-v1.0.xsd} (92%)
 rename xsd/netex_part_2/part2_frames/{netex_driverScheduleFrame_version.xsd => netex_driverScheduleFrame_version-v1.0.xsd} (96%)
 rename xsd/netex_part_2/part2_frames/{netex_serviceFrame_version.xsd => netex_serviceFrame_version-v1.1.xsd} (96%)
 rename xsd/netex_part_2/part2_frames/{netex_timetableFrame_support.xsd => netex_timetableFrame_support-v1.0.xsd} (97%)
 rename xsd/netex_part_2/part2_frames/{netex_timetableFrame_version.xsd => netex_timetableFrame_version-v1.0.xsd} (97%)
 rename xsd/netex_part_2/part2_frames/{netex_vehicleScheduleFrame_version.xsd => netex_vehicleScheduleFrame_version-v1.0.xsd} (94%)
 create mode 100644 xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyTimes-v1.0.xsd
 delete mode 100644 xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyTimes.xsd
 rename xsd/netex_part_2/part2_journeyTimes/{netex_call_support.xsd => netex_call_support-v1.0.xsd} (96%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_call_version.xsd => netex_call_version-v1.1.xsd} (97%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_coupledJourney_support.xsd => netex_coupledJourney_support-v1.1.xsd} (98%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_coupledJourney_version.xsd => netex_coupledJourney_version-v1.1.xsd} (98%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_datedPassingTimes_version.xsd => netex_datedPassingTimes_version-v1.1.xsd} (98%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_datedVehicleJourney_support.xsd => netex_datedVehicleJourney_support-v1.0.xsd} (98%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_datedVehicleJourney_version.xsd => netex_datedVehicleJourney_version-v1.0.xsd} (97%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_flexibleService_support.xsd => netex_flexibleService_support-v1.0.xsd} (97%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_flexibleService_version.xsd => netex_flexibleService_version-v1.0.xsd} (96%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_interchangeRule_version.xsd => netex_interchangeRule_version-v1.1.xsd} (98%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_interchange_support.xsd => netex_interchange_support-v1.0.xsd} (98%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_interchange_version.xsd => netex_interchange_version-v1.1.xsd} (98%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_journeyAccounting_support.xsd => netex_journeyAccounting_support-v1.0.xsd} (96%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_journeyAccounting_version.xsd => netex_journeyAccounting_version-v1.0.xsd} (96%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_journeyDesignator_support.xsd => netex_journeyDesignator_support-v1.0.xsd} (95%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_journey_version.xsd => netex_journey_version-v1.1.xsd} (95%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_passingTimes_support.xsd => netex_passingTimes_support-v1.0.xsd} (98%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_passingTimes_version.xsd => netex_passingTimes_version-v1.1.xsd} (96%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_serviceJourney_support.xsd => netex_serviceJourney_support-v1.0.xsd} (98%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_serviceJourney_version.xsd => netex_serviceJourney_version-v1.1.xsd} (98%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_serviceView_version.xsd => netex_serviceView_version-v1.0.xsd} (87%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_timeDemandProfile_version.xsd => netex_timeDemandProfile_version-v1.0.xsd} (96%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_timeDemandTimes_version.xsd => netex_timeDemandTimes_version-v1.0.xsd} (97%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_vehicleJourneyFrequency_support.xsd => netex_vehicleJourneyFrequency_support-v1.0.xsd} (98%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_vehicleJourneyFrequency_version.xsd => netex_vehicleJourneyFrequency_version-v1.1.xsd} (98%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_vehicleJourneyTimes_support.xsd => netex_vehicleJourneyTimes_support-v1.0.xsd} (98%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_vehicleJourneyTimes_version.xsd => netex_vehicleJourneyTimes_version-v1.0.xsd} (96%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_vehicleJourney_support.xsd => netex_vehicleJourney_support-v1.0.xsd} (98%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_vehicleJourney_version.xsd => netex_vehicleJourney_version-v1.1.xsd} (97%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_vehicleService_support.xsd => netex_vehicleService_support-v1.0.xsd} (98%)
 rename xsd/netex_part_2/part2_vehicleService/{netex_all_objects_part2_vehicleService.xsd => netex_all_objects_part2_vehicleService-v1.0.xsd} (87%)
 rename xsd/netex_part_2/part2_vehicleService/{netex_duty_support.xsd => netex_duty_support-v1.0.xsd} (98%)
 rename xsd/netex_part_2/part2_vehicleService/{netex_duty_version.xsd => netex_duty_version-v1.0.xsd} (98%)
 rename xsd/netex_part_2/part2_vehicleService/{netex_vehicleService_version.xsd => netex_vehicleService_version-v1.1.xsd} (99%)
 rename xsd/netex_part_3/part3_PiQuery/{netex_all_objects_part3_piQuery.xsd => netex_all_objects_part3_piQuery-v1.0.xsd} (87%)
 rename xsd/netex_part_3/part3_PiQuery/{netex_piQuery_support.xsd => netex_piQuery_support-v1.0.xsd} (98%)
 rename xsd/netex_part_3/part3_PiQuery/{netex_piRequest_support.xsd => netex_piRequest_support-v1.1.xsd} (98%)
 rename xsd/netex_part_3/part3_fares/{netex_accessRightParameter_support.xsd => netex_accessRightParameter_support-v1.0.xsd} (97%)
 rename xsd/netex_part_3/part3_fares/{netex_accessRightParameter_version.xsd => netex_accessRightParameter_version-v1.1.xsd} (95%)
 rename xsd/netex_part_3/part3_fares/{netex_all_objects_part3_fares.xsd => netex_all_objects_part3_fares-v1.1.xsd} (65%)
 rename xsd/netex_part_3/part3_fares/{netex_all_objects_part3_fares_AR.xsd => netex_all_objects_part3_fares_AR-v1.1.xsd} (73%)
 rename xsd/netex_part_3/part3_fares/{netex_all_objects_part3_fares_FP.xsd => netex_all_objects_part3_fares_FP-v1.1.xsd} (67%)
 rename xsd/netex_part_3/part3_fares/{netex_all_objects_part3_fares_FS.xsd => netex_all_objects_part3_fares_FS-v1.1.xsd} (61%)
 rename xsd/netex_part_3/part3_fares/{netex_all_objects_part3_fares_SD.xsd => netex_all_objects_part3_fares_SD-v1.1.xsd} (58%)
 rename xsd/netex_part_3/part3_fares/{netex_calculationParameters_support.xsd => netex_calculationParameters_support-v1.0.xsd} (98%)
 rename xsd/netex_part_3/part3_fares/{netex_calculationParameters_version.xsd => netex_calculationParameters_version-v1.0.xsd} (99%)
 rename xsd/netex_part_3/part3_fares/{netex_distanceMatrixElement_support.xsd => netex_distanceMatrixElement_support-v1.0.xsd} (97%)
 rename xsd/netex_part_3/part3_fares/{netex_distanceMatrixElement_version.xsd => netex_distanceMatrixElement_version-v1.1.xsd} (98%)
 rename xsd/netex_part_3/part3_fares/{netex_fareConditionSummary_support.xsd => netex_fareConditionSummary_support-v1.0.xsd} (97%)
 rename xsd/netex_part_3/part3_fares/{netex_fareConditionSummary_version.xsd => netex_fareConditionSummary_version-v1.0.xsd} (99%)
 rename xsd/netex_part_3/part3_fares/{netex_farePrice_support.xsd => netex_farePrice_support-v1.0.xsd} (98%)
 rename xsd/netex_part_3/part3_fares/{netex_farePrice_version.xsd => netex_farePrice_version-v1.1.xsd} (98%)
 rename xsd/netex_part_3/part3_fares/{netex_fareProduct_support.xsd => netex_fareProduct_support-v1.0.xsd} (99%)
 rename xsd/netex_part_3/part3_fares/{netex_fareProduct_version.xsd => netex_fareProduct_version-v1.1.xsd} (99%)
 rename xsd/netex_part_3/part3_fares/{netex_fareSeries_support.xsd => netex_fareSeries_support-v1.0.xsd} (97%)
 rename xsd/netex_part_3/part3_fares/{netex_fareSeries_version.xsd => netex_fareSeries_version-v1.0.xsd} (98%)
 rename xsd/netex_part_3/part3_fares/{netex_fareStructureElement_support.xsd => netex_fareStructureElement_support-v1.0.xsd} (98%)
 rename xsd/netex_part_3/part3_fares/{netex_fareStructureElement_version.xsd => netex_fareStructureElement_version-v1.1.xsd} (98%)
 rename xsd/netex_part_3/part3_fares/{netex_fareStructure_support.xsd => netex_fareStructure_support-v1.0.xsd} (97%)
 rename xsd/netex_part_3/part3_fares/{netex_fareStructure_version.xsd => netex_fareStructure_version-v1.0.xsd} (98%)
 rename xsd/netex_part_3/part3_fares/{netex_fareTable_support.xsd => netex_fareTable_support-v1.0.xsd} (97%)
 rename xsd/netex_part_3/part3_fares/{netex_fareTable_version.xsd => netex_fareTable_version-v1.1.xsd} (96%)
 rename xsd/netex_part_3/part3_fares/{netex_geographicStructureFactor_support.xsd => netex_geographicStructureFactor_support-v1.0.xsd} (98%)
 rename xsd/netex_part_3/part3_fares/{netex_geographicStructureFactor_version.xsd => netex_geographicStructureFactor_version-v1.0.xsd} (98%)
 rename xsd/netex_part_3/part3_fares/{netex_qualityStructureFactor_support.xsd => netex_qualityStructureFactor_support-v1.0.xsd} (98%)
 rename xsd/netex_part_3/part3_fares/{netex_qualityStructureFactor_version.xsd => netex_qualityStructureFactor_version-v1.0.xsd} (97%)
 rename xsd/netex_part_3/part3_fares/{netex_salesDistribution_support.xsd => netex_salesDistribution_support-v1.0.xsd} (98%)
 rename xsd/netex_part_3/part3_fares/{netex_salesDistribution_version.xsd => netex_salesDistribution_version-v1.0.xsd} (97%)
 rename xsd/netex_part_3/part3_fares/{netex_salesPackage_support.xsd => netex_salesPackage_support-v1.0.xsd} (98%)
 rename xsd/netex_part_3/part3_fares/{netex_salesPackage_version.xsd => netex_salesPackage_version-v1.0.xsd} (98%)
 rename xsd/netex_part_3/part3_fares/{netex_timeStructureFactor_support.xsd => netex_timeStructureFactor_support-v1.0.xsd} (97%)
 rename xsd/netex_part_3/part3_fares/{netex_timeStructureFactor_version.xsd => netex_timeStructureFactor_version-v1.0.xsd} (98%)
 rename xsd/netex_part_3/part3_fares/{netex_travelDocument_support.xsd => netex_travelDocument_support-v1.1.xsd} (97%)
 rename xsd/netex_part_3/part3_fares/{netex_travelDocument_version.xsd => netex_travelDocument_version-v1.1.xsd} (98%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameterAfterSales_support.xsd => netex_usageParameterAfterSales_support-v1.0.xsd} (98%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameterAfterSales_version.xsd => netex_usageParameterAfterSales_version-v1.0.xsd} (98%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameterBooking_support.xsd => netex_usageParameterBooking_support-v1.0.xsd} (97%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameterBooking_version.xsd => netex_usageParameterBooking_version-v1.0.xsd} (97%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameterCharging_support.xsd => netex_usageParameterCharging_support-v1.0.xsd} (97%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameterCharging_version.xsd => netex_usageParameterCharging_version-v1.0.xsd} (97%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameterEligibility_support.xsd => netex_usageParameterEligibility_support-v1.0.xsd} (98%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameterEligibility_version.xsd => netex_usageParameterEligibility_version-v1.0.xsd} (99%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameterEntitlement_support.xsd => netex_usageParameterEntitlement_support-v1.0.xsd} (97%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameterEntitlement_version.xsd => netex_usageParameterEntitlement_version-v1.0.xsd} (97%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameterLuggage_support.xsd => netex_usageParameterLuggage_support-v1.0.xsd} (97%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameterLuggage_version.xsd => netex_usageParameterLuggage_version-v1.0.xsd} (97%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameterTravel_support.xsd => netex_usageParameterTravel_support-v1.1.xsd} (99%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameterTravel_version.xsd => netex_usageParameterTravel_version-v1.0.xsd} (99%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameter_support.xsd => netex_usageParameter_support-v1.0.xsd} (98%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameter_version.xsd => netex_usageParameter_version-v1.0.xsd} (97%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParametersAll_support.xsd => netex_usageParametersAll_support-v1.0.xsd} (89%)
 rename xsd/netex_part_3/part3_fares/{netex_validableElement_support.xsd => netex_validableElement_support-v1.0.xsd} (98%)
 rename xsd/netex_part_3/part3_fares/{netex_validableElement_version.xsd => netex_validableElement_version-v1.0.xsd} (98%)
 rename xsd/netex_part_3/part3_frames/{netex_all_frames_part3.xsd => netex_all_frames_part3-v1.0.xsd} (90%)
 rename xsd/netex_part_3/part3_frames/{netex_fareFrame_version.xsd => netex_fareFrame_version-v1.0.xsd} (96%)
 rename xsd/netex_part_3/part3_frames/{netex_salesTransactionFrame_version.xsd => netex_salesTransactionFrame_version-v1.1.xsd} (96%)
 rename xsd/netex_part_3/part3_monitoring/{netex_all_objects_part3_monitoring.xsd => netex_all_objects_part3_monitoring-v1.0.xsd} (85%)
 rename xsd/netex_part_3/part3_monitoring/{netex_monitoredCall_version.xsd => netex_monitoredCall_version-v1.0.xsd} (98%)
 rename xsd/netex_part_3/part3_monitoring/{netex_monitoredPassingTimes_version.xsd => netex_monitoredPassingTimes_version-v1.1.xsd} (98%)
 rename xsd/netex_part_3/part3_monitoring/{netex_monitoredVehicleJourney_support.xsd => netex_monitoredVehicleJourney_support-v1.0.xsd} (96%)
 rename xsd/netex_part_3/part3_parkingTariff/{netex_all_objects_part3_parking.xsd => netex_all_objects_part3_parking-v1.0.xsd} (76%)
 rename xsd/netex_part_3/part3_parkingTariff/{netex_parkingTariff_support.xsd => netex_parkingTariff_support-v1.1.xsd} (97%)
 rename xsd/netex_part_3/part3_parkingTariff/{netex_parkingTariff_version.xsd => netex_parkingTariff_version-v1.1.xsd} (98%)
 rename xsd/netex_part_3/part3_salesTransactions/{netex_all_objects_part3_salesTransactions.xsd => netex_all_objects_part3_salesTransactions-v1.0.xsd} (53%)
 rename xsd/netex_part_3/part3_salesTransactions/{netex_customerEligibility_support.xsd => netex_customerEligibility_support-v1.1.xsd} (98%)
 rename xsd/netex_part_3/part3_salesTransactions/{netex_customerEligibility_version.xsd => netex_customerEligibility_version-v1.1.xsd} (97%)
 rename xsd/netex_part_3/part3_salesTransactions/{netex_customerPurchasePackage_support.xsd => netex_customerPurchasePackage_support-v1.1.xsd} (99%)
 rename xsd/netex_part_3/part3_salesTransactions/{netex_customerPurchasePackage_version.xsd => netex_customerPurchasePackage_version-v1.1.xsd} (98%)
 rename xsd/netex_part_3/part3_salesTransactions/{netex_retailConsortium_support.xsd => netex_retailConsortium_support-v1.1.xsd} (97%)
 rename xsd/netex_part_3/part3_salesTransactions/{netex_retailConsortium_version.xsd => netex_retailConsortium_version-v1.1.xsd} (96%)
 rename xsd/netex_part_3/part3_salesTransactions/{netex_salesContract_support.xsd => netex_salesContract_support-v1.1.xsd} (99%)
 rename xsd/netex_part_3/part3_salesTransactions/{netex_salesContract_version.xsd => netex_salesContract_version-v1.1.xsd} (98%)
 rename xsd/netex_part_3/part3_salesTransactions/{netex_salesTransaction_support.xsd => netex_salesTransaction_support-v1.0.xsd} (96%)
 rename xsd/netex_part_3/part3_salesTransactions/{netex_salesTransaction_version.xsd => netex_salesTransaction_version-v1.1.xsd} (98%)
 rename xsd/netex_service/{netex_all.xsd => netex_all-v1.0.xsd} (77%)
 rename xsd/netex_service/{netex_all_filters.xsd => netex_all_filters-v1.0.xsd} (91%)
 rename xsd/netex_service/{netex_dataObjectRequest_service.xsd => netex_dataObjectRequest_service-v1.0.xsd} (98%)
 rename xsd/netex_service/{netex_filter_frame.xsd => netex_filter_frame-v1.0.xsd} (96%)
 rename xsd/netex_service/{netex_filter_object.xsd => netex_filter_object-v1.0.xsd} (95%)
 rename xsd/siri_utility/{siri_utility.xsd => siri_utility-v1.1.xsd} (98%)

diff --git a/xsd/NX.xsd b/xsd/NX.xsd
index 8841cc4c5..692bd3db2 100644
--- a/xsd/NX.xsd
+++ b/xsd/NX.xsd
@@ -5,8 +5,8 @@
 	<!-- ===  ONLY TO FACILITATE  STUDY OF SCHEMA ELEMENTS.  DO NOT USE IT FOR DOCUMENTS  =========== -->
 	<!-- === Use NeTEx_publication.xsd or NeTEx_publication_timetable  or NeTEx_siri.xsd=========== -->
 	<!-- (C) Copyright 2009-2012 CEN,Crown Copyright -->
-	<xsd:include schemaLocation="netex_service/netex_all.xsd"/>
-	<xsd:include schemaLocation="netex_framework/netex_payload_framework.xsd"/>
+	<xsd:include schemaLocation="netex_service/netex_all-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_framework/netex_payload_framework-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<!-- ======================================================================= -->
 	<xsd:element name="Nx">
diff --git a/xsd/NeTEx_publication-NoConstraint.xsd b/xsd/NeTEx_publication-NoConstraint.xsd
index 70c0dce46..1584b9858 100644
--- a/xsd/NeTEx_publication-NoConstraint.xsd
+++ b/xsd/NeTEx_publication-NoConstraint.xsd
@@ -5,8 +5,8 @@
 	<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="siri_utility/siri_participant-v2.0.xsd"/>
 	<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="siri/siri_requests-v2.0.xsd"/>
 	<!-- ===Regular netex============================================================== -->
-	<xsd:include schemaLocation="netex_service/netex_dataObjectRequest_service.xsd"/>
-	<xsd:include schemaLocation="netex_service/netex_all.xsd"/>
+	<xsd:include schemaLocation="netex_service/netex_dataObjectRequest_service-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_service/netex_all-v1.0.xsd"/>
 	<!-- ===eGIF/GovTalk Documentation ======================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd
index 6cc97ba5e..d45fba403 100644
--- a/xsd/NeTEx_publication.xsd
+++ b/xsd/NeTEx_publication.xsd
@@ -5,8 +5,8 @@
 	<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="siri_utility/siri_participant-v2.0.xsd"/>
 	<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="siri/siri_requests-v2.0.xsd"/>
 	<!-- ===Regular netex============================================================== -->
-	<xsd:include schemaLocation="netex_service/netex_dataObjectRequest_service.xsd"/>
-	<xsd:include schemaLocation="netex_service/netex_all.xsd"/>
+	<xsd:include schemaLocation="netex_service/netex_dataObjectRequest_service-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_service/netex_all-v1.0.xsd"/>
 	<!-- ===eGIF/GovTalk Documentation ======================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
diff --git a/xsd/NeTEx_publication_timetable.xsd b/xsd/NeTEx_publication_timetable.xsd
index a789b6fa0..4244811d0 100644
--- a/xsd/NeTEx_publication_timetable.xsd
+++ b/xsd/NeTEx_publication_timetable.xsd
@@ -4,22 +4,22 @@
 	<!-- ==+ IT INCLUDES ELEMENTS RELEVANT FOR THE EXCHANGE OF TIMETABLES ===== -->
 	<!-- ==+ANY DOCUMENT COMPLIANT WITH THIS SCHEMA WILL ALSO BE COMPLIANT WITH NetEx_publication.xsd ===== -->
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="netex_framework/netex_frames/netex_all_frames_framework.xsd"/>
-	<xsd:include schemaLocation="netex_framework/netex_frames/netex_resourceFrame_version.xsd"/>
-	<xsd:include schemaLocation="netex_framework/netex_frames/netex_serviceCalendarFrame_version.xsd"/>
-	<xsd:include schemaLocation="netex_framework/netex_frames/netex_compositeFrame_version.xsd"/>
+	<xsd:include schemaLocation="netex_framework/netex_frames/netex_all_frames_framework-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_framework/netex_frames/netex_resourceFrame_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_framework/netex_frames/netex_serviceCalendarFrame_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_framework/netex_frames/netex_compositeFrame_version-v1.0.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_part_1/part1_frames/netex_siteFrame_version.xsd"/>
+	<xsd:include schemaLocation="netex_part_1/part1_frames/netex_siteFrame_version-v1.1.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_part_2/part2_frames/netex_timetableFrame_version.xsd"/>
-	<xsd:include schemaLocation="netex_part_2/part2_frames/netex_serviceFrame_version.xsd"/>
+	<xsd:include schemaLocation="netex_part_2/part2_frames/netex_timetableFrame_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_part_2/part2_frames/netex_serviceFrame_version-v1.1.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_part_3/part3_frames/netex_fareFrame_version.xsd"/>
+	<xsd:include schemaLocation="netex_part_3/part3_frames/netex_fareFrame_version-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="siri/siri_base-v2.0.xsd"/>
 	<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="siri_utility/siri_participant-v2.0.xsd"/>
 	<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="siri/siri_requests-v2.0.xsd"/>
-	<xsd:include schemaLocation="netex_service/netex_dataObjectRequest_service.xsd"/>
+	<xsd:include schemaLocation="netex_service/netex_dataObjectRequest_service-v1.0.xsd"/>
 	<!-- ===eGIF/GovTalk Documentation ======================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
diff --git a/xsd/NeTEx_siri.xsd b/xsd/NeTEx_siri.xsd
index 908d0830d..b44293305 100644
--- a/xsd/NeTEx_siri.xsd
+++ b/xsd/NeTEx_siri.xsd
@@ -3,8 +3,8 @@
 <xsd:schema xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.siri.org.uk/siri" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_siri">
 	<!-- ===Dependencies ======================================= -->
 	<!-- ====INCLUDE NETEX REQUESTS==================================================== -->
-	<xsd:import namespace="http://www.netex.org.uk/netex" schemaLocation="netex_service/netex_all.xsd"/>
-	<xsd:import namespace="http://www.netex.org.uk/netex" schemaLocation="netex_service/netex_dataObjectRequest_service.xsd"/>
+	<xsd:import namespace="http://www.netex.org.uk/netex" schemaLocation="netex_service/netex_all-v1.0.xsd"/>
+	<xsd:import namespace="http://www.netex.org.uk/netex" schemaLocation="netex_service/netex_dataObjectRequest_service-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:include schemaLocation="siri/siri_base-v2.0.xsd"/>
 	<!-- ===eGIF/GovTalk Documentation ======================================= -->
diff --git a/xsd/ifopt.xsd b/xsd/ifopt.xsd
index 8d019c624..9fff45e9b 100644
--- a/xsd/ifopt.xsd
+++ b/xsd/ifopt.xsd
@@ -4,7 +4,7 @@
 	<!-- === THIS IS FOR DOCUMENTATION TO SHOW THE COVERAGE OF THE ORIGINAL  IFOPT ELEMENTS ===== -->
 	<!-- ===  USE THE NeTEX publication schema FOR ACTUAL DOCUMENTS============= -->
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_part_1/netex_all_objects_part1.xsd"/>
+	<xsd:include schemaLocation="netex_part_1/netex_all_objects_part1-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:group name="IfoptPayloadGroup">
 		<xsd:sequence>
diff --git a/xsd/netex_framework/netex_all_objects_framework.xsd b/xsd/netex_framework/netex_all_objects_framework-v1.0.xsd
similarity index 78%
rename from xsd/netex_framework/netex_all_objects_framework.xsd
rename to xsd/netex_framework/netex_all_objects_framework-v1.0.xsd
index 3fc26f2be..72ceede69 100644
--- a/xsd/netex_framework/netex_all_objects_framework.xsd
+++ b/xsd/netex_framework/netex_all_objects_framework-v1.0.xsd
@@ -2,7 +2,7 @@
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_framework">
 	<!-- ===Types ======================================= -->
-	<xsd:include schemaLocation="netex_payload_framework.xsd"/>
-	<xsd:include schemaLocation="netex_all_objects_generic.xsd"/>
-	<xsd:include schemaLocation="netex_reusableComponents/netex_all_objects_reusableComponents.xsd"/>
+	<xsd:include schemaLocation="netex_payload_framework-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_all_objects_generic-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_reusableComponents/netex_all_objects_reusableComponents-v1.0.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_framework/netex_all_objects_generic.xsd b/xsd/netex_framework/netex_all_objects_generic-v1.0.xsd
similarity index 63%
rename from xsd/netex_framework/netex_all_objects_generic.xsd
rename to xsd/netex_framework/netex_all_objects_generic-v1.0.xsd
index 76367f73f..6f1ef93f6 100644
--- a/xsd/netex_framework/netex_all_objects_generic.xsd
+++ b/xsd/netex_framework/netex_all_objects_generic-v1.0.xsd
@@ -1,56 +1,56 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_generic">
 	<!-- ===Types =======================================  -->
-	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_utility_types.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_location_types.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_units.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_utility_contact.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_utility_time.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_utility_xml.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_utility_types-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_location_types-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_units-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_utility_contact-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_utility_time-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_utility_xml-v1.0.xsd"/>
 	<!-- =====entity=========================================================== -->
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_alternativeText_support.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_alternativeText_version.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_entity_support.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_entity_version.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_relationship_support.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_relationship.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_typeOfValue_version.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_responsibility_support.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_responsibility_version.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_dataSource_version.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_validityCondition_support.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_versionDelta_version.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_versionFrame_support.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_versionFrame_version.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_version_support.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_version_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_alternativeText_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_alternativeText_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_entity_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_entity_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_relationship_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_relationship-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_typeOfValue_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_responsibility_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_responsibility_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_responsibilitySet_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_dataSource_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_validityCondition_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_versionDelta_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_versionFrame_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_versionFrame_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_version_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_version_version-v1.1.xsd"/>
 	<!-- ======Framework========================================================= -->
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_alternativeName_support.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_alternativeName_version.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_all.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_assignment_support.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_assignment_version.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_grouping_support.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_grouping_version.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_layer_support.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_layer_version.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_loggable_support.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_loggable_version.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_organisation_support.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_organisation_version.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_place_support.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_place_version.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_pointAndLink_support.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_projection_support.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_projection_version.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_section_support.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_section_version.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_spatialFeature_support.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_spatialFeature_version.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_zone_support.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_zone_version.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_zoneProjection_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_alternativeName_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_alternativeName_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_all-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_assignment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_assignment_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_grouping_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_grouping_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_layer_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_layer_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_loggable_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_loggable_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_organisation_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_organisation_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_place_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_place_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_pointAndLink_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_pointAndLink_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_projection_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_projection_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_section_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_section_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_spatialFeature_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_spatialFeature_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_zone_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_zone_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_zoneProjection_version-v1.0.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_framework/netex_frames/netex_all_frames_framework.xsd b/xsd/netex_framework/netex_frames/netex_all_frames_framework-v1.0.xsd
similarity index 70%
rename from xsd/netex_framework/netex_frames/netex_all_frames_framework.xsd
rename to xsd/netex_framework/netex_frames/netex_all_frames_framework-v1.0.xsd
index 9588c56fd..9db45449e 100644
--- a/xsd/netex_framework/netex_frames/netex_all_frames_framework.xsd
+++ b/xsd/netex_framework/netex_frames/netex_all_frames_framework-v1.0.xsd
@@ -2,10 +2,10 @@
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://www.ifopt.org.uk/ifopt" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_frames_framework">
 	<!-- ===Types ======================================= -->
-	<xsd:include schemaLocation="netex_commonFrame_version.xsd"/>
-	<xsd:include schemaLocation="netex_compositeFrame_version.xsd"/>
-	<xsd:include schemaLocation="netex_serviceCalendarFrame_version.xsd"/>
-	<xsd:include schemaLocation="netex_serviceCalendarFrame_version.xsd"/>
-	<xsd:include schemaLocation="netex_resourceFrame_version.xsd"/>
-	<xsd:include schemaLocation="netex_generalFrame_version.xsd"/>
+	<xsd:include schemaLocation="netex_commonFrame_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_compositeFrame_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_serviceCalendarFrame_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_serviceCalendarFrame_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_resourceFrame_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_generalFrame_version-v1.0.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_framework/netex_frames/netex_commonFrame_version.xsd b/xsd/netex_framework/netex_frames/netex_commonFrame_version-v1.0.xsd
similarity index 97%
rename from xsd/netex_framework/netex_frames/netex_commonFrame_version.xsd
rename to xsd/netex_framework/netex_frames/netex_commonFrame_version-v1.0.xsd
index 79ef472b1..379cb1041 100644
--- a/xsd/netex_framework/netex_frames/netex_commonFrame_version.xsd
+++ b/xsd/netex_framework/netex_frames/netex_commonFrame_version-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_commonFrame_version">
-	<xsd:include schemaLocation="../netex_responsibility/netex_versionFrame_version.xsd"/>
-	<xsd:include schemaLocation="../netex_reusableComponents/netex_availabilityCondition_version.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_versionFrame_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_reusableComponents/netex_availabilityCondition_version-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
diff --git a/xsd/netex_framework/netex_frames/netex_compositeFrame_version.xsd b/xsd/netex_framework/netex_frames/netex_compositeFrame_version-v1.0.xsd
similarity index 98%
rename from xsd/netex_framework/netex_frames/netex_compositeFrame_version.xsd
rename to xsd/netex_framework/netex_frames/netex_compositeFrame_version-v1.0.xsd
index 62d6157fd..b2dd83f03 100644
--- a/xsd/netex_framework/netex_frames/netex_compositeFrame_version.xsd
+++ b/xsd/netex_framework/netex_frames/netex_compositeFrame_version-v1.0.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_compositeFrame_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_commonFrame_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_commonFrame_version-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -25,7 +25,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_frames}netex_compositeFrame_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_frames}netex_compositeFrame_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_frames/netex_generalFrame_version.xsd b/xsd/netex_framework/netex_frames/netex_generalFrame_version-v1.0.xsd
similarity index 98%
rename from xsd/netex_framework/netex_frames/netex_generalFrame_version.xsd
rename to xsd/netex_framework/netex_frames/netex_generalFrame_version-v1.0.xsd
index d2f5b9121..a5592ba05 100644
--- a/xsd/netex_framework/netex_frames/netex_generalFrame_version.xsd
+++ b/xsd/netex_framework/netex_frames/netex_generalFrame_version-v1.0.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_generalFrame_version">
-	<xsd:include schemaLocation="netex_commonFrame_version.xsd"/>
-	<xsd:include schemaLocation="../netex_responsibility/netex_entity_entity.xsd"/>
-	<xsd:include schemaLocation="../netex_reusableComponents/netex_linkByValue_support.xsd"/>
+	<xsd:include schemaLocation="netex_commonFrame_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_entity_entity-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_reusableComponents/netex_linkByValue_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_frames}netex_generalFrame_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_frames}netex_generalFrame_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_frames/netex_resourceFrame_support.xsd b/xsd/netex_framework/netex_frames/netex_resourceFrame_support-v1.0.xsd
similarity index 97%
rename from xsd/netex_framework/netex_frames/netex_resourceFrame_support.xsd
rename to xsd/netex_framework/netex_frames/netex_resourceFrame_support-v1.0.xsd
index 109bfae27..110d916d0 100644
--- a/xsd/netex_framework/netex_frames/netex_resourceFrame_support.xsd
+++ b/xsd/netex_framework/netex_frames/netex_resourceFrame_support-v1.0.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_resourceFrame_support">
-	<xsd:include schemaLocation="../netex_responsibility/netex_versionFrame_support.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_versionFrame_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -25,7 +25,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_frames}netex_resourceFrame_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_frames}netex_resourceFrame_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd b/xsd/netex_framework/netex_frames/netex_resourceFrame_version-v1.1.xsd
similarity index 96%
rename from xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd
rename to xsd/netex_framework/netex_frames/netex_resourceFrame_version-v1.1.xsd
index 40ae3a72e..e4a0de6af 100644
--- a/xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd
+++ b/xsd/netex_framework/netex_frames/netex_resourceFrame_version-v1.1.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_resourceFrame_version">
-	<xsd:include schemaLocation="netex_commonFrame_version.xsd"/>
-	<xsd:include schemaLocation="../netex_reusableComponents/netex_transportOrganisation_version.xsd"/>
-	<xsd:include schemaLocation="../netex_all_objects_framework.xsd"/>
-	<xsd:include schemaLocation="netex_resourceFrame_support.xsd"/>
+	<xsd:include schemaLocation="netex_commonFrame_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_reusableComponents/netex_transportOrganisation_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_all_objects_framework-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_resourceFrame_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
diff --git a/xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_support.xsd b/xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_support-v1.0.xsd
similarity index 97%
rename from xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_support.xsd
rename to xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_support-v1.0.xsd
index d50acd675..82b168ac3 100644
--- a/xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_support.xsd
+++ b/xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_support-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2006 sp2 U (http://www.altova.com) by christophe duquesne (Dryade SARL) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_serviceCalendar_support">
-	<xsd:include schemaLocation="../netex_responsibility/netex_versionFrame_support.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_versionFrame_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -26,7 +26,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_frames}netex_serviceCalendarFrame_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_frames}netex_serviceCalendarFrame_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_version.xsd b/xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_version-v1.0.xsd
similarity index 97%
rename from xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_version.xsd
rename to xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_version-v1.0.xsd
index 8684a0f08..c4cfdbbf8 100644
--- a/xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_version.xsd
+++ b/xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_version-v1.0.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_serviceCalendarFrame_version">
-	<xsd:include schemaLocation="netex_serviceCalendarFrame_support.xsd"/>
-	<xsd:include schemaLocation="../netex_reusableComponents/netex_serviceCalendar_version.xsd"/>
-	<xsd:include schemaLocation="netex_commonFrame_version.xsd"/>
+	<xsd:include schemaLocation="netex_serviceCalendarFrame_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_reusableComponents/netex_serviceCalendar_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_commonFrame_version-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
diff --git a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility.xsd b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility-v1.1.xsd
similarity index 97%
rename from xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility-v1.1.xsd
index d7e07e75d..feab3b874 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility-v1.1.xsd
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework/netex_accessibility}netex_acsb_accessibility.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework/netex_accessibility}netex_acsb_accessibility-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
@@ -56,8 +56,8 @@ Rail transport, Roads and Road transport
 		</xsd:appinfo>
 		<xsd:documentation>ACCESSIBILITY types for IFOPT Fixed Objects in Public Transport.</xsd:documentation>
 	</xsd:annotation>
-	<xsd:include schemaLocation="netex_acsb_limitations.xsd"/>
-	<xsd:include schemaLocation="netex_acsb_passengerMobility.xsd"/>
+	<xsd:include schemaLocation="netex_acsb_limitations-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_acsb_passengerMobility-v1.0.xsd"/>
 	<!--===========================================================================================-->
 	<xsd:complexType name="accessibilityLimitations_RelStructure">
 		<xsd:annotation>
diff --git a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_all.xsd b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_all-v1.0.xsd
similarity index 85%
rename from xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_all.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_all-v1.0.xsd
index f4c81528b..fb0b16d65 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_all.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_all-v1.0.xsd
@@ -14,8 +14,8 @@
  -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_acsb_all">
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_acsb_accessibility.xsd"/>
-	<xsd:include schemaLocation="netex_acsb_limitations.xsd"/>
-	<xsd:include schemaLocation="netex_acsb_passengerMobility.xsd"/>
-	<xsd:include schemaLocation="netex_acsb_support.xsd"/>
+	<xsd:include schemaLocation="netex_acsb_accessibility-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_acsb_limitations-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_acsb_passengerMobility-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_acsb_support-v1.0.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations.xsd b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations-v1.0.xsd
similarity index 100%
rename from xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations-v1.0.xsd
diff --git a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_passengerMobility.xsd b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_passengerMobility-v1.0.xsd
similarity index 99%
rename from xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_passengerMobility.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_passengerMobility-v1.0.xsd
index cb2d52413..5d2854f10 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_passengerMobility.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_passengerMobility-v1.0.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_acsb_passengerMobility">
-	<xsd:include schemaLocation="../../netex_responsibility/netex_responsibility_version.xsd"/>
-	<xsd:include schemaLocation="netex_acsb_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_responsibility/netex_responsibility_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_acsb_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework/netex_accessibility}netex_acsb_passengerMobility.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework/netex_accessibility}netex_acsb_passengerMobility-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_support-v1.0.xsd
similarity index 99%
rename from xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_support.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_support-v1.0.xsd
index cd02996b2..72d27c332 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_support.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_support-v1.0.xsd
@@ -25,7 +25,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework/netex_accessibility}netex_acsb_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework/netex_accessibility}netex_acsb_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
@@ -54,7 +54,7 @@ Rail transport, Roads and Road transport
 		</xsd:appinfo>
 		<xsd:documentation>NeTEx ACCESSIBILITY identifier types for IFOPT Fixed Objects in Public Transport.</xsd:documentation>
 	</xsd:annotation>
-	<xsd:include schemaLocation="../../netex_responsibility/netex_relationship.xsd"/>
+	<xsd:include schemaLocation="../../netex_responsibility/netex_relationship-v1.0.xsd"/>
 	<!--===========================================================================================-->
 	<xsd:simpleType name="LimitationIdType">
 		<xsd:annotation>
diff --git a/xsd/netex_framework/netex_genericFramework/netex_alternativeName_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_alternativeName_support-v1.0.xsd
similarity index 97%
rename from xsd/netex_framework/netex_genericFramework/netex_alternativeName_support.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_alternativeName_support-v1.0.xsd
index 67f147c7f..de776cf3a 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_alternativeName_support.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_alternativeName_support-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_alternativeName_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_relationship.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_relationship-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -26,7 +26,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_alternativeName_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_alternativeName_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_alternativeName_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_alternativeName_version-v1.0.xsd
similarity index 97%
rename from xsd/netex_framework/netex_genericFramework/netex_alternativeName_version.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_alternativeName_version-v1.0.xsd
index a1acd96b8..947ad77b1 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_alternativeName_version.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_alternativeName_version-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_alternativeName_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_version.xsd"/>
-	<xsd:include schemaLocation="netex_alternativeName_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_alternativeName_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_alternativeName_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_alternativeName_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_assignment_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_assignment_support-v1.0.xsd
similarity index 97%
rename from xsd/netex_framework/netex_genericFramework/netex_assignment_support.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_assignment_support-v1.0.xsd
index 720ea3f4b..71a18a6d1 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_assignment_support.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_assignment_support-v1.0.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_assigment_support">
-	<xsd:include schemaLocation="../netex_responsibility/netex_relationship.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_relationship-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -22,7 +22,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_assignment_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_assignment_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_assignment_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_assignment_version-v1.0.xsd
similarity index 97%
rename from xsd/netex_framework/netex_genericFramework/netex_assignment_version.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_assignment_version-v1.0.xsd
index c725793d7..4d64ca3d6 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_assignment_version.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_assignment_version-v1.0.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_assignment_version">
-	<xsd:include schemaLocation="netex_assignment_support.xsd"/>
-	<xsd:include schemaLocation="../netex_responsibility/netex_responsibility_version.xsd"/>
+	<xsd:include schemaLocation="netex_assignment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_responsibility_version-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_assignment_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_assignment_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_grouping_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_grouping_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_framework/netex_genericFramework/netex_grouping_support.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_grouping_support-v1.0.xsd
index e4b78ae1b..9c150238a 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_grouping_support.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_grouping_support-v1.0.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_grouping_support">
-	<xsd:include schemaLocation="../netex_responsibility/netex_relationship.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_relationship-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -22,7 +22,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_grouping_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_grouping_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_grouping_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_grouping_version-v1.1.xsd
similarity index 98%
rename from xsd/netex_framework/netex_genericFramework/netex_grouping_version.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_grouping_version-v1.1.xsd
index bbaa62e63..5e025ecc3 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_grouping_version.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_grouping_version-v1.1.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_grouping_version">
-	<xsd:include schemaLocation="../netex_utility/netex_utility_types.xsd"/>
-	<xsd:include schemaLocation="netex_grouping_support.xsd"/>
-	<xsd:include schemaLocation="../netex_responsibility/netex_typeOfValue_version.xsd"/>
+	<xsd:include schemaLocation="../netex_utility/netex_utility_types-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_grouping_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_typeOfValue_version-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -32,7 +32,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_grouping_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_grouping_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_layer_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_layer_support-v1.0.xsd
similarity index 97%
rename from xsd/netex_framework/netex_genericFramework/netex_layer_support.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_layer_support-v1.0.xsd
index e5ffaf290..57f378e70 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_layer_support.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_layer_support-v1.0.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_layer_support">
-	<xsd:include schemaLocation="../netex_responsibility/netex_relationship.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_relationship-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -22,7 +22,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_layer_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_layer_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_layer_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_layer_version-v1.0.xsd
similarity index 95%
rename from xsd/netex_framework/netex_genericFramework/netex_layer_version.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_layer_version-v1.0.xsd
index 9db2d103f..f73b33ccd 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_layer_version.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_layer_version-v1.0.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_layer_version">
-	<xsd:include schemaLocation="netex_layer_support.xsd"/>
-	<xsd:include schemaLocation="../netex_utility/netex_location_types.xsd"/>
-	<xsd:include schemaLocation="../netex_responsibility/netex_versionFrame_support.xsd"/>
-	<xsd:include schemaLocation="netex_grouping_version.xsd"/>
+	<xsd:include schemaLocation="netex_layer_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_utility/netex_location_types-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_versionFrame_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_grouping_version-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -25,7 +25,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_layer_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_layer_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_loggable_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_loggable_support-v1.1.xsd
similarity index 97%
rename from xsd/netex_framework/netex_genericFramework/netex_loggable_support.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_loggable_support-v1.1.xsd
index 193daf925..79dfbfe26 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_loggable_support.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_loggable_support-v1.1.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_loggable_support">
-	<xsd:include schemaLocation="netex_grouping_support.xsd"/>
+	<xsd:include schemaLocation="netex_grouping_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -20,7 +20,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_section_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_section_support-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Steam Intellect, London N1 1JS</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_loggable_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_loggable_version-v1.1.xsd
similarity index 97%
rename from xsd/netex_framework/netex_genericFramework/netex_loggable_version.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_loggable_version-v1.1.xsd
index 232e2bac2..61cad2762 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_loggable_version.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_loggable_version-v1.1.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_loggable_version">
-	<xsd:include schemaLocation="netex_loggable_support.xsd"/>
+	<xsd:include schemaLocation="netex_loggable_support-v1.1.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_grouping_version.xsd"/>
+	<xsd:include schemaLocation="netex_grouping_version-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,7 +28,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_section_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_section_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Steam Intellect, London N1 1JS</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_organisation_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_organisation_support-v1.1.xsd
similarity index 98%
rename from xsd/netex_framework/netex_genericFramework/netex_organisation_support.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_organisation_support-v1.1.xsd
index fa36af943..25a80944d 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_organisation_support.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_organisation_support-v1.1.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_organisation_support">
-	<xsd:include schemaLocation="../netex_responsibility/netex_responsibility_support.xsd"/>
-	<xsd:include schemaLocation="../netex_responsibility/netex_relationship_support.xsd"/>
-	<xsd:include schemaLocation="netex_zone_support.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_responsibility_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_relationship_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_zone_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -30,7 +30,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_organisation_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_organisation_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_organisation_version-v1.1.xsd
similarity index 99%
rename from xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_organisation_version-v1.1.xsd
index f1479bd6e..f6c7cdd43 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_organisation_version-v1.1.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_organisation_version">
-	<xsd:include schemaLocation="../netex_utility/netex_utility_contact.xsd"/>
-	<xsd:include schemaLocation="../netex_responsibility/netex_responsibilitySet_version.xsd"/>
-	<xsd:include schemaLocation="netex_alternativeName_version.xsd"/>
-	<xsd:include schemaLocation="netex_organisation_support.xsd"/>
-	<xsd:include schemaLocation="netex_zone_version.xsd"/>
+	<xsd:include schemaLocation="../netex_utility/netex_utility_contact-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_responsibilitySet_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_alternativeName_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_organisation_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_zone_version-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -32,7 +32,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_organisation_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_organisation_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_place_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_place_support-v1.0.xsd
similarity index 99%
rename from xsd/netex_framework/netex_genericFramework/netex_place_support.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_place_support-v1.0.xsd
index 757de21fe..f964ca8c8 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_place_support.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_place_support-v1.0.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_place_support">
-	<xsd:include schemaLocation="../netex_genericFramework/netex_zone_support.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_zone_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,7 +31,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_place_version-v1.1.xsd
similarity index 98%
rename from xsd/netex_framework/netex_genericFramework/netex_place_version.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_place_version-v1.1.xsd
index bb533341b..1ed19b7fe 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_place_version-v1.1.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_place_version">
-	<xsd:include schemaLocation="netex_place_support.xsd"/>
-	<xsd:include schemaLocation="../netex_genericFramework/netex_zoneProjection_version.xsd"/>
+	<xsd:include schemaLocation="netex_place_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_zoneProjection_version-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,11 +31,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}place_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}place_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support-v1.1.xsd
similarity index 98%
rename from xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support-v1.1.xsd
index b7e521b20..eb75b407c 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support-v1.1.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_pointAndLinkSequence_support">
-	<xsd:include schemaLocation="netex_grouping_support.xsd"/>
-	<xsd:include schemaLocation="../netex_responsibility/netex_responsibility_support.xsd"/>
+	<xsd:include schemaLocation="netex_grouping_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_responsibility_support-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -25,7 +25,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_pointAndLinkSequence_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_pointAndLinkSequence_support-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version-v1.1.xsd
similarity index 98%
rename from xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version-v1.1.xsd
index baf397ba6..f4502bfe1 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version-v1.1.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_pointAndLinkSequence_version">
-	<xsd:include schemaLocation="netex_pointAndLinkSequence_support.xsd"/>
-	<xsd:include schemaLocation="netex_section_version.xsd"/>
-	<xsd:include schemaLocation="netex_grouping_version.xsd"/>
+	<xsd:include schemaLocation="netex_pointAndLinkSequence_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_section_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_grouping_version-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -29,7 +29,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_pointAndLinkSequence_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_pointAndLinkSequence_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_support-v1.1.xsd
similarity index 98%
rename from xsd/netex_framework/netex_genericFramework/netex_pointAndLink_support.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_pointAndLink_support-v1.1.xsd
index 460d2a5ce..ceed5a1cd 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_support.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_support-v1.1.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_pointAndLink_support">
-	<xsd:include schemaLocation="netex_grouping_support.xsd"/>
-	<xsd:include schemaLocation="../netex_utility/netex_units.xsd"/>
+	<xsd:include schemaLocation="netex_grouping_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_utility/netex_units-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,7 +28,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_pointAndLink_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_pointAndLink_support-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version-v1.1.xsd
similarity index 98%
rename from xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version-v1.1.xsd
index 29b4301e2..ecff0cc32 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version-v1.1.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_pointAndLink_version">
-	<xsd:include schemaLocation="netex_pointAndLink_support.xsd"/>
-	<xsd:include schemaLocation="../netex_utility/netex_location_types.xsd"/>
-	<xsd:include schemaLocation="netex_pointAndLinkSequence_support.xsd"/>
+	<xsd:include schemaLocation="netex_pointAndLink_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_utility/netex_location_types-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_pointAndLinkSequence_support-v1.1.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_grouping_version.xsd"/>
-	<xsd:include schemaLocation="netex_projection_version.xsd"/>
+	<xsd:include schemaLocation="netex_grouping_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_projection_version-v1.0.xsd"/>
 	<!--fulll gml dependency-->
 	<xsd:import namespace="http://www.opengis.net/gml/3.2" schemaLocation="../../gml/gml_extract_all_objects_v_3_2_1.xsd"/>
 	<!--actual gml dependency-->
@@ -42,7 +42,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_pointAndLink_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_pointAndLink_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_projection_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_projection_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_framework/netex_genericFramework/netex_projection_support.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_projection_support-v1.0.xsd
index 84de50d5e..182d90a4c 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_projection_support.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_projection_support-v1.0.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="01." id="netex_projection_support">
-	<xsd:include schemaLocation="netex_spatialFeature_support.xsd"/>
+	<xsd:include schemaLocation="netex_spatialFeature_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -25,7 +25,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_projection_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_projection_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_projection_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_projection_version-v1.0.xsd
similarity index 99%
rename from xsd/netex_framework/netex_genericFramework/netex_projection_version.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_projection_version-v1.0.xsd
index ad140f491..445e948db 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_projection_version.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_projection_version-v1.0.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="01." id="netex_projection_version">
-	<xsd:include schemaLocation="../netex_responsibility/netex_typeOfValue_version.xsd"/>
-	<xsd:include schemaLocation="netex_pointAndLinkSequence_support.xsd"/>
-	<xsd:include schemaLocation="../netex_utility/netex_location_types.xsd"/>
-	<xsd:include schemaLocation="netex_projection_support.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_typeOfValue_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_pointAndLinkSequence_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_utility/netex_location_types-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_projection_support-v1.0.xsd"/>
 	<xsd:import namespace="http://www.opengis.net/gml/3.2" schemaLocation="../../gml/gml_extract_all_objects_v_3_2_1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,7 +29,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_projection_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_projection_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_section_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_section_support-v1.1.xsd
similarity index 98%
rename from xsd/netex_framework/netex_genericFramework/netex_section_support.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_section_support-v1.1.xsd
index efd188c0f..6112bddd7 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_section_support.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_section_support-v1.1.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_section_support">
-	<xsd:include schemaLocation="netex_pointAndLinkSequence_support.xsd"/>
+	<xsd:include schemaLocation="netex_pointAndLinkSequence_support-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -22,7 +22,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_section_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_section_support-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Steam Intellect, London N1 1JS</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_section_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_section_version-v1.1.xsd
similarity index 98%
rename from xsd/netex_framework/netex_genericFramework/netex_section_version.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_section_version-v1.1.xsd
index cbbd0c35d..406d4f95b 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_section_version.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_section_version-v1.1.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_section_version">
-	<xsd:include schemaLocation="netex_section_support.xsd"/>
+	<xsd:include schemaLocation="netex_section_support-v1.1.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_pointAndLink_version.xsd"/>
-	<xsd:include schemaLocation="netex_pointAndLinkSequence_version.xsd"/>
+	<xsd:include schemaLocation="netex_pointAndLink_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_pointAndLinkSequence_version-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -35,7 +35,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_section_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_section_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Steam Intellect, London N1 1JS</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_support-v1.0.xsd
similarity index 97%
rename from xsd/netex_framework/netex_genericFramework/netex_spatialFeature_support.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_spatialFeature_support-v1.0.xsd
index 3a2106434..0f516b3ad 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_support.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_support-v1.0.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_spatialFeature_support">
-	<xsd:include schemaLocation="netex_zone_support.xsd"/>
+	<xsd:include schemaLocation="netex_zone_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -25,7 +25,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_spatialFeature_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_spatialFeature_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_version-v1.0.xsd
similarity index 97%
rename from xsd/netex_framework/netex_genericFramework/netex_spatialFeature_version.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_spatialFeature_version-v1.0.xsd
index 40b4b75af..3affd2ae6 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_version.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_version-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_spatialFeature_version">
-	<xsd:include schemaLocation="netex_spatialFeature_support.xsd"/>
-	<xsd:include schemaLocation="netex_zone_version.xsd"/>
+	<xsd:include schemaLocation="netex_spatialFeature_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_zone_version-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -26,7 +26,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_spatialFeature_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_spatialFeature_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_zoneProjection_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_zoneProjection_version-v1.0.xsd
similarity index 97%
rename from xsd/netex_framework/netex_genericFramework/netex_zoneProjection_version.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_zoneProjection_version-v1.0.xsd
index 1c4cbf719..f1c777feb 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_zoneProjection_version.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_zoneProjection_version-v1.0.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="01." id="netex_zoneProjection_version">
-	<xsd:include schemaLocation="netex_zone_version.xsd"/>
+	<xsd:include schemaLocation="netex_zone_version-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -25,7 +25,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_zoneProjection_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_zoneProjection_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_zone_support-v1.0.xsd
similarity index 97%
rename from xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_zone_support-v1.0.xsd
index 73211f37b..693c20505 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_zone_support-v1.0.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_zone_version">
-	<xsd:include schemaLocation="netex_pointAndLink_support.xsd"/>
+	<xsd:include schemaLocation="netex_pointAndLink_support-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -25,7 +25,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_zone_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_zone_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_zone_version-v1.1.xsd
similarity index 98%
rename from xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_zone_version-v1.1.xsd
index c6566b290..550557ba1 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_zone_version-v1.1.xsd
@@ -3,8 +3,8 @@
 	<xsd:import namespace="http://www.opengis.net/gml/3.2" schemaLocation="../../gml/gml_extract_all_objects_v_3_2_1.xsd"/>
 	<!--Actual dependency-->
 	<xsd:import namespace="http://www.opengis.net/gml/3.2" schemaLocation="../../gml/gmlBasic2d-extract-v3_2_1-.xsd"/>
-	<xsd:include schemaLocation="netex_pointAndLink_version.xsd"/>
-	<xsd:include schemaLocation="netex_zone_support.xsd"/>
+	<xsd:include schemaLocation="netex_pointAndLink_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_zone_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -31,7 +31,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_zone_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_zone_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_payload_framework.xsd b/xsd/netex_framework/netex_payload_framework-v1.0.xsd
similarity index 98%
rename from xsd/netex_framework/netex_payload_framework.xsd
rename to xsd/netex_framework/netex_payload_framework-v1.0.xsd
index 5f83006f6..0f506150e 100644
--- a/xsd/netex_framework/netex_payload_framework.xsd
+++ b/xsd/netex_framework/netex_payload_framework-v1.0.xsd
@@ -2,7 +2,7 @@
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_payload_framework">
 	<!-- ===Payload ============================= -->
-	<xsd:include schemaLocation="netex_frames/netex_compositeFrame_version.xsd"/>
+	<xsd:include schemaLocation="netex_frames/netex_compositeFrame_version-v1.0.xsd"/>
 	<xsd:complexType name="dataObjects_RelStructure">
 		<xsd:annotation>
 			<xsd:documentation>Type for a list of objects.</xsd:documentation>
diff --git a/xsd/netex_framework/netex_responsibility/netex_alternativeText_support.xsd b/xsd/netex_framework/netex_responsibility/netex_alternativeText_support-v1.1.xsd
similarity index 96%
rename from xsd/netex_framework/netex_responsibility/netex_alternativeText_support.xsd
rename to xsd/netex_framework/netex_responsibility/netex_alternativeText_support-v1.1.xsd
index 57cd90fb3..add326130 100644
--- a/xsd/netex_framework/netex_responsibility/netex_alternativeText_support.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_alternativeText_support-v1.1.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_AlternativeText_support">
-	<xsd:include schemaLocation="netex_relationship_support.xsd"/>
+	<xsd:include schemaLocation="netex_relationship_support-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_AlternativeText_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_AlternativeText_support-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Steam Intellect, London N1 1JS</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_alternativeText_version.xsd b/xsd/netex_framework/netex_responsibility/netex_alternativeText_version-v1.1.xsd
similarity index 96%
rename from xsd/netex_framework/netex_responsibility/netex_alternativeText_version.xsd
rename to xsd/netex_framework/netex_responsibility/netex_alternativeText_version-v1.1.xsd
index c02a0560b..836099d48 100644
--- a/xsd/netex_framework/netex_responsibility/netex_alternativeText_version.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_alternativeText_version-v1.1.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_alternativeName_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_version.xsd"/>
-	<xsd:include schemaLocation="netex_alternativeText_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_alternativeText_support-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -26,7 +26,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_alternativeText_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_alternativeText_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Steam Intellect, London N1 1JS</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_dataSource_version.xsd b/xsd/netex_framework/netex_responsibility/netex_dataSource_version-v1.0.xsd
similarity index 97%
rename from xsd/netex_framework/netex_responsibility/netex_dataSource_version.xsd
rename to xsd/netex_framework/netex_responsibility/netex_dataSource_version-v1.0.xsd
index 76bf3054d..9b6cc1a90 100644
--- a/xsd/netex_framework/netex_responsibility/netex_dataSource_version.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_dataSource_version-v1.0.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_dataSource_version">
-	<xsd:include schemaLocation="netex_typeOfValue_version.xsd"/>
+	<xsd:include schemaLocation="netex_typeOfValue_version-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -22,7 +22,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_dataSource_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_dataSource_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_entity.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_entity-v1.0.xsd
similarity index 95%
rename from xsd/netex_framework/netex_responsibility/netex_entity_entity.xsd
rename to xsd/netex_framework/netex_responsibility/netex_entity_entity-v1.0.xsd
index a9e6dd34e..077058c76 100644
--- a/xsd/netex_framework/netex_responsibility/netex_entity_entity.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_entity_entity-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_entity_entity">
-	<xsd:include schemaLocation="netex_entity_version.xsd"/>
-	<xsd:include schemaLocation="netex_version_version.xsd"/>
+	<xsd:include schemaLocation="netex_entity_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_version_version-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -26,7 +26,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_entity_entity.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_entity_entity-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_support-v1.0.xsd
similarity index 99%
rename from xsd/netex_framework/netex_responsibility/netex_entity_support.xsd
rename to xsd/netex_framework/netex_responsibility/netex_entity_support-v1.0.xsd
index 653f089c0..c7d75744a 100644
--- a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_entity_support-v1.0.xsd
@@ -26,7 +26,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_entity_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_entity_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_version.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_version-v1.0.xsd
similarity index 98%
rename from xsd/netex_framework/netex_responsibility/netex_entity_version.xsd
rename to xsd/netex_framework/netex_responsibility/netex_entity_version-v1.0.xsd
index 55b5b31e6..525bb2cfa 100644
--- a/xsd/netex_framework/netex_responsibility/netex_entity_version.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_entity_version-v1.0.xsd
@@ -2,7 +2,7 @@
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <!-- 2207 04 11 recode x,llang to work arround spy bug -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_entity_version">
-	<xsd:include schemaLocation="netex_entity_support.xsd"/>
+	<xsd:include schemaLocation="netex_entity_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -24,7 +24,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_entity_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_entity_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_relationship.xsd b/xsd/netex_framework/netex_responsibility/netex_relationship-v1.0.xsd
similarity index 98%
rename from xsd/netex_framework/netex_responsibility/netex_relationship.xsd
rename to xsd/netex_framework/netex_responsibility/netex_relationship-v1.0.xsd
index 69455981a..cb2a313ac 100644
--- a/xsd/netex_framework/netex_responsibility/netex_relationship.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_relationship-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2009 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_relationship">
-	<xsd:include schemaLocation="netex_relationship_support.xsd"/>
+	<xsd:include schemaLocation="netex_relationship_support-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_relationship.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_relationship-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_relationship_support.xsd b/xsd/netex_framework/netex_responsibility/netex_relationship_support-v1.1.xsd
similarity index 98%
rename from xsd/netex_framework/netex_responsibility/netex_relationship_support.xsd
rename to xsd/netex_framework/netex_responsibility/netex_relationship_support-v1.1.xsd
index 997b48a46..91795b007 100644
--- a/xsd/netex_framework/netex_responsibility/netex_relationship_support.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_relationship_support-v1.1.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2009 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_relationship_support">
-	<xsd:include schemaLocation="netex_version_support.xsd"/>
+	<xsd:include schemaLocation="netex_version_support-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -30,7 +30,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_relationship_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_relationship_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd b/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version-v1.1.xsd
similarity index 98%
rename from xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd
rename to xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version-v1.1.xsd
index f693a1d36..707abaf59 100644
--- a/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version-v1.1.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_responsibilitySet">
-	<xsd:include schemaLocation="netex_typeOfValue_version.xsd"/>
+	<xsd:include schemaLocation="netex_typeOfValue_version-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -30,7 +30,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_responsibilitySet_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_responsibilitySet_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd b/xsd/netex_framework/netex_responsibility/netex_responsibility_support-v1.1.xsd
similarity index 98%
rename from xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd
rename to xsd/netex_framework/netex_responsibility/netex_responsibility_support-v1.1.xsd
index 0c15237b0..f9c5e6dd6 100644
--- a/xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_responsibility_support-v1.1.xsd
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_responsibility_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_responsibility_support-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
@@ -56,7 +56,7 @@ Rail transport, Roads and Road transport
 		</xsd:appinfo>
 		<xsd:documentation>RESPONSIBILITY i.e. Data administration identifier types for NeTEx.</xsd:documentation>
 	</xsd:annotation>
-	<xsd:include schemaLocation="netex_relationship.xsd"/>
+	<xsd:include schemaLocation="netex_relationship-v1.0.xsd"/>
 	<!-- =====Responsibility============================================ -->
 	<xsd:simpleType name="ResponsibilitySetIdType">
 		<xsd:annotation>
diff --git a/xsd/netex_framework/netex_responsibility/netex_responsibility_version.xsd b/xsd/netex_framework/netex_responsibility/netex_responsibility_version-v1.1.xsd
similarity index 96%
rename from xsd/netex_framework/netex_responsibility/netex_responsibility_version.xsd
rename to xsd/netex_framework/netex_responsibility/netex_responsibility_version-v1.1.xsd
index 587c276da..d720d7b90 100644
--- a/xsd/netex_framework/netex_responsibility/netex_responsibility_version.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_responsibility_version-v1.1.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_responsibility">
-	<xsd:include schemaLocation="netex_version_version.xsd"/>
-	<xsd:include schemaLocation="netex_responsibility_support.xsd"/>
-	<xsd:include schemaLocation="netex_validityCondition_version.xsd"/>
-	<xsd:include schemaLocation="netex_alternativeText_version.xsd"/>
+	<xsd:include schemaLocation="netex_version_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_responsibility_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_validityCondition_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_alternativeText_version-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -31,7 +31,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_responsibility_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_responsibility_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_typeOfValue_version.xsd b/xsd/netex_framework/netex_responsibility/netex_typeOfValue_version-v1.0.xsd
similarity index 98%
rename from xsd/netex_framework/netex_responsibility/netex_typeOfValue_version.xsd
rename to xsd/netex_framework/netex_responsibility/netex_typeOfValue_version-v1.0.xsd
index cc1d69bc2..9fefb77a5 100644
--- a/xsd/netex_framework/netex_responsibility/netex_typeOfValue_version.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_typeOfValue_version-v1.0.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_typeOfValue_version">
-	<xsd:include schemaLocation="netex_responsibility_version.xsd"/>
+	<xsd:include schemaLocation="netex_responsibility_version-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,7 +28,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_typeOfValue_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_typeOfValue_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_validityCondition_support.xsd b/xsd/netex_framework/netex_responsibility/netex_validityCondition_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_framework/netex_responsibility/netex_validityCondition_support.xsd
rename to xsd/netex_framework/netex_responsibility/netex_validityCondition_support-v1.0.xsd
index bdce1272f..7b07dbec9 100644
--- a/xsd/netex_framework/netex_responsibility/netex_validityCondition_support.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_validityCondition_support-v1.0.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_validityCondition_support">
-	<xsd:include schemaLocation="netex_relationship.xsd"/>
+	<xsd:include schemaLocation="netex_relationship-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_validityCondition_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_validityCondition_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_validityCondition_version.xsd b/xsd/netex_framework/netex_responsibility/netex_validityCondition_version-v1.0.xsd
similarity index 98%
rename from xsd/netex_framework/netex_responsibility/netex_validityCondition_version.xsd
rename to xsd/netex_framework/netex_responsibility/netex_validityCondition_version-v1.0.xsd
index 2e10683b4..84152bd29 100644
--- a/xsd/netex_framework/netex_responsibility/netex_validityCondition_version.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_validityCondition_version-v1.0.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2006 sp2 U (http://www.altova.com) by christophe duquesne (Dryade SARL) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_validityCondition_version">
-	<xsd:include schemaLocation="netex_validityCondition_support.xsd"/>
-	<xsd:include schemaLocation="netex_responsibility_version.xsd"/>
+	<xsd:include schemaLocation="netex_validityCondition_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_responsibility_version-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_validityCondition_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_validityCondition_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_versionDelta_version.xsd b/xsd/netex_framework/netex_responsibility/netex_versionDelta_version-v1.0.xsd
similarity index 98%
rename from xsd/netex_framework/netex_responsibility/netex_versionDelta_version.xsd
rename to xsd/netex_framework/netex_responsibility/netex_versionDelta_version-v1.0.xsd
index 25f492272..212ec157b 100644
--- a/xsd/netex_framework/netex_responsibility/netex_versionDelta_version.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_versionDelta_version-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2006 sp2 U (http://www.altova.com) by christophe duquesne (Dryade SARL) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_versionDelta_version">
-	<xsd:include schemaLocation="netex_relationship_support.xsd"/>
+	<xsd:include schemaLocation="netex_relationship_support-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_versionDelta_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_versionDelta_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_versionFrame_support.xsd b/xsd/netex_framework/netex_responsibility/netex_versionFrame_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_framework/netex_responsibility/netex_versionFrame_support.xsd
rename to xsd/netex_framework/netex_responsibility/netex_versionFrame_support-v1.0.xsd
index 476323641..0ea32137f 100644
--- a/xsd/netex_framework/netex_responsibility/netex_versionFrame_support.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_versionFrame_support-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2006 sp2 U (http://www.altova.com) by christophe duquesne (Dryade SARL) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_versionFrame_support">
-	<xsd:include schemaLocation="netex_relationship.xsd"/>
+	<xsd:include schemaLocation="netex_relationship-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_versionFrame_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_versionFrame_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_versionFrame_version.xsd b/xsd/netex_framework/netex_responsibility/netex_versionFrame_version-v1.0.xsd
similarity index 98%
rename from xsd/netex_framework/netex_responsibility/netex_versionFrame_version.xsd
rename to xsd/netex_framework/netex_responsibility/netex_versionFrame_version-v1.0.xsd
index 6cedc8ec4..42a38ba7b 100644
--- a/xsd/netex_framework/netex_responsibility/netex_versionFrame_version.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_versionFrame_version-v1.0.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2006 sp2 U (http://www.altova.com) by christophe duquesne (Dryade SARL) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_versionFrame_version">
-	<xsd:include schemaLocation="netex_versionFrame_support.xsd"/>
-	<xsd:include schemaLocation="netex_typeOfValue_version.xsd"/>
-	<xsd:include schemaLocation="../netex_utility/netex_location_types.xsd"/>
-	<xsd:include schemaLocation="../netex_responsibility/netex_versionDelta_version.xsd"/>
-	<xsd:include schemaLocation="../netex_utility/netex_units.xsd"/>
+	<xsd:include schemaLocation="netex_versionFrame_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_typeOfValue_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_utility/netex_location_types-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_versionDelta_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_utility/netex_units-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_versionFrame_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_versionFrame_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_version_support.xsd b/xsd/netex_framework/netex_responsibility/netex_version_support-v1.1.xsd
similarity index 98%
rename from xsd/netex_framework/netex_responsibility/netex_version_support.xsd
rename to xsd/netex_framework/netex_responsibility/netex_version_support-v1.1.xsd
index b2a1966d8..227caee8f 100644
--- a/xsd/netex_framework/netex_responsibility/netex_version_support.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_version_support-v1.1.xsd
@@ -2,7 +2,7 @@
 <!-- edited with XMLSpy v2009 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <!-- 2207 04 11 recode x,llang to work arround spy bug -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_version_support">
-	<xsd:include schemaLocation="netex_entity_support.xsd"/>
+	<xsd:include schemaLocation="netex_entity_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -30,7 +30,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_version_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_version_support-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_version_version.xsd b/xsd/netex_framework/netex_responsibility/netex_version_version-v1.1.xsd
similarity index 97%
rename from xsd/netex_framework/netex_responsibility/netex_version_version.xsd
rename to xsd/netex_framework/netex_responsibility/netex_version_version-v1.1.xsd
index 7254df085..0acf29a0a 100644
--- a/xsd/netex_framework/netex_responsibility/netex_version_version.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_version_version-v1.1.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_version_version">
-	<xsd:include schemaLocation="../netex_utility/netex_utility_contact.xsd"/>
-	<xsd:include schemaLocation="netex_entity_version.xsd"/>
-	<xsd:include schemaLocation="netex_responsibility_version.xsd"/>
-	<xsd:include schemaLocation="netex_version_support.xsd"/>
+	<xsd:include schemaLocation="../netex_utility/netex_utility_contact-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_entity_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_responsibility_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_version_support-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,7 +28,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_version_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_version_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_access_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_access_version-v1.0.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_access_version.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_access_version-v1.0.xsd
index c97c81803..2c1e3696d 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_access_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_access_version-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_access_version">
-	<xsd:include schemaLocation="../netex_genericFramework/netex_place_version.xsd"/>
-	<xsd:include schemaLocation="netex_mode_version.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_place_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_mode_version-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,7 +31,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_accounting_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_accounting_version-v1.0.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_accounting_version.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_accounting_version-v1.0.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_address_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_address_support-v1.0.xsd
similarity index 99%
rename from xsd/netex_framework/netex_reusableComponents/netex_address_support.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_address_support-v1.0.xsd
index 1acf8dc4f..0d39c1ea2 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_address_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_address_support-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2006 sp2 U (http://www.altova.com) by christophe duquesne (Dryade SARL) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_address_support">
-	<xsd:include schemaLocation="../netex_genericFramework/netex_place_support.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_place_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -30,7 +30,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_address_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_address_version-v1.1.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_address_version.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_address_version-v1.1.xsd
index e25585329..84882d807 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_address_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_address_version-v1.1.xsd
@@ -25,7 +25,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_address_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_address_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
@@ -54,10 +54,10 @@ Rail transport, Roads and Road transport
 		</xsd:appinfo>
 		<xsd:documentation>ADDRESS types for IFOPT Fixed Objects in Public Transport.</xsd:documentation>
 	</xsd:annotation>
-	<xsd:include schemaLocation="../netex_genericFramework/netex_place_version.xsd"/>
-	<xsd:include schemaLocation="../netex_genericFramework/netex_alternativeName_version.xsd"/>
-	<xsd:include schemaLocation="netex_address_support.xsd"/>
-	<xsd:include schemaLocation="netex_country_support.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_place_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_alternativeName_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_address_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_country_support-v1.1.xsd"/>
 	<!--=============================================================================-->
 	<!-- ===ENTIITY IN VERSION IN FRAME====Used in SERVICE FRAME)=================================================== -->
 	<xsd:complexType name="addressesInFrame_RelStructure">
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents-v1.0.xsd
new file mode 100644
index 000000000..4baf10151
--- /dev/null
+++ b/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents-v1.0.xsd
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
+<xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_reusableComponents">
+	<!-- ======General====================================================== -->
+	<xsd:include schemaLocation="netex_access_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_address_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_address_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_availabilityCondition_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_availabilityCondition_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_country_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_dayType_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_dayType_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_dayType_propertiesOfDay-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_equipment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_equipmentPlace_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_equipment_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_equipmentVehiclePassenger_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_equipmentVehiclePassenger_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_facility_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_facility_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_linkByValue_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_mode_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_mode_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_notice_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_notice_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_noticeAssignment_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_otherOrganisation_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_otherOrganisation_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_schematicMap_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_securityList_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_securityList_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_serviceCalendar_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_serviceCalendar_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_submode_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_topographicPlace_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_topographicPlace_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_trainElement_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_trainElement_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_transportOrganisation_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_transportOrganisation_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_travelRights_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_travelRights_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleType_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleType_version-v1.1.xsd"/>
+</xsd:schema>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd b/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd
deleted file mode 100644
index 5194f3357..000000000
--- a/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
-<xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_reusableComponents">
-	<!-- ======General====================================================== -->
-	<xsd:include schemaLocation="netex_access_version.xsd"/>
-	<xsd:include schemaLocation="netex_address_support.xsd"/>
-	<xsd:include schemaLocation="netex_address_version.xsd"/>
-	<xsd:include schemaLocation="netex_availabilityCondition_version.xsd"/>
-	<xsd:include schemaLocation="netex_availabilityCondition_support.xsd"/>
-	<xsd:include schemaLocation="netex_country_support.xsd"/>
-	<xsd:include schemaLocation="netex_dayType_support.xsd"/>
-	<xsd:include schemaLocation="netex_dayType_version.xsd"/>
-	<xsd:include schemaLocation="netex_dayType_propertiesOfDay.xsd"/>
-	<xsd:include schemaLocation="netex_equipment_support.xsd"/>
-	<xsd:include schemaLocation="netex_equipmentPlace_version.xsd"/>
-	<xsd:include schemaLocation="netex_equipment_version.xsd"/>
-	<xsd:include schemaLocation="netex_equipmentVehiclePassenger_support.xsd"/>
-	<xsd:include schemaLocation="netex_equipmentVehiclePassenger_version.xsd"/>
-	<xsd:include schemaLocation="netex_facility_support.xsd"/>
-	<xsd:include schemaLocation="netex_facility_version.xsd"/>
-	<xsd:include schemaLocation="netex_linkByValue_support.xsd"/>
-	<xsd:include schemaLocation="netex_mode_support.xsd"/>
-	<xsd:include schemaLocation="netex_mode_version.xsd"/>
-	<xsd:include schemaLocation="netex_notice_support.xsd"/>
-	<xsd:include schemaLocation="netex_notice_version.xsd"/>
-	<xsd:include schemaLocation="netex_noticeAssignment_version.xsd"/>
-	<xsd:include schemaLocation="netex_otherOrganisation_support.xsd"/>
-	<xsd:include schemaLocation="netex_otherOrganisation_version.xsd"/>
-	<xsd:include schemaLocation="netex_schematicMap_version.xsd"/>
-	<xsd:include schemaLocation="netex_securityList_support.xsd"/>
-	<xsd:include schemaLocation="netex_securityList_version.xsd"/>
-	<xsd:include schemaLocation="netex_serviceCalendar_support.xsd"/>
-	<xsd:include schemaLocation="netex_serviceCalendar_version.xsd"/>
-	<xsd:include schemaLocation="netex_submode_version.xsd"/>
-	<xsd:include schemaLocation="netex_topographicPlace_support.xsd"/>
-	<xsd:include schemaLocation="netex_topographicPlace_version.xsd"/>
-	<xsd:include schemaLocation="netex_trainElement_support.xsd"/>
-	<xsd:include schemaLocation="netex_trainElement_version.xsd"/>
-	<xsd:include schemaLocation="netex_transportOrganisation_support.xsd"/>
-	<xsd:include schemaLocation="netex_transportOrganisation_version.xsd"/>
-	<xsd:include schemaLocation="netex_travelRights_support.xsd"/>
-	<xsd:include schemaLocation="netex_travelRights_version.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleType_support.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleType_version.xsd"/>
-</xsd:schema>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_support.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_support-v1.0.xsd
index 9c98d9733..35651b97d 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_support-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2006 sp2 U (http://www.altova.com) by christophe duquesne (Dryade SARL) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_availabilityCondition_support">
-	<xsd:include schemaLocation="../netex_responsibility/netex_validityCondition_support.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_validityCondition_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_availabilityCondition_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_availabilityCondition_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_version-v1.0.xsd
similarity index 99%
rename from xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_version.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_version-v1.0.xsd
index 4a832107f..d4ba10f21 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_version-v1.0.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_availabilityCondition_version">
-	<xsd:include schemaLocation="netex_availabilityCondition_support.xsd"/>
-	<xsd:include schemaLocation="netex_serviceCalendar_version.xsd"/>
+	<xsd:include schemaLocation="netex_availabilityCondition_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_serviceCalendar_version-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -25,7 +25,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_availabilityCondition_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_availabilityCondition_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_country_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_country_support-v1.1.xsd
similarity index 99%
rename from xsd/netex_framework/netex_reusableComponents/netex_country_support.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_country_support-v1.1.xsd
index 8cc8f8b77..5c5cd5c70 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_country_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_country_support-v1.1.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_country_support">
-	<xsd:include schemaLocation="../netex_genericFramework/netex_place_support.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_place_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_country_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_country_support-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_country_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_country_version-v1.1.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_country_version.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_country_version-v1.1.xsd
index 3be005949..c1e65252a 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_country_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_country_version-v1.1.xsd
@@ -25,7 +25,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_topographicPlace_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_topographicPlace_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
@@ -56,9 +56,9 @@ Rail transport, Roads and Road transport
 	</xsd:annotation>
 	<!-- ======================================================================= -->
 	<!-- ===IFOPT Name Space includes (Which also may Reference SIRI) ============================================================== -->
-	<xsd:include schemaLocation="netex_address_version.xsd"/>
-	<xsd:include schemaLocation="netex_access_version.xsd"/>
-	<xsd:include schemaLocation="netex_topographicPlace_support.xsd"/>
+	<xsd:include schemaLocation="netex_address_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_access_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_topographicPlace_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:complexType name="topographicPlacesInFrame_RelStructure">
 		<xsd:annotation>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_dayType_propertiesOfDay.xsd b/xsd/netex_framework/netex_reusableComponents/netex_dayType_propertiesOfDay-v1.0.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_dayType_propertiesOfDay.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_dayType_propertiesOfDay-v1.0.xsd
index e9c7bf404..88e895963 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_dayType_propertiesOfDay.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_dayType_propertiesOfDay-v1.0.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_dayType_propertiesOfDay">
-	<xsd:include schemaLocation="../netex_responsibility/netex_relationship.xsd"/>
-	<xsd:include schemaLocation="../netex_utility/netex_utility_xml.xsd"/>
-	<xsd:include schemaLocation="netex_country_support.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_relationship-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_utility/netex_utility_xml-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_country_support-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_dayType_propertiesOfDay.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_dayType_propertiesOfDay-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_dayType_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_dayType_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_dayType_support.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_dayType_support-v1.0.xsd
index bb725802f..731f92635 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_dayType_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_dayType_support-v1.0.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2006 sp2 U (http://www.altova.com) by christophe duquesne (Dryade SARL) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_dayType_support">
-	<xsd:include schemaLocation="../netex_responsibility/netex_relationship.xsd"/>
-	<xsd:include schemaLocation="../netex_genericFramework/netex_grouping_support.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_relationship-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_grouping_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_dayType_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_dayType_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_dayType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_dayType_version-v1.0.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_dayType_version.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_dayType_version-v1.0.xsd
index 4b05ca9f2..592f39e40 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_dayType_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_dayType_version-v1.0.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2006 sp2 U (http://www.altova.com) by christophe duquesne (Dryade SARL) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_day_type_version">
-	<xsd:include schemaLocation="netex_dayType_propertiesOfDay.xsd"/>
-	<xsd:include schemaLocation="netex_dayType_support.xsd"/>
-	<xsd:include schemaLocation="../netex_responsibility/netex_responsibility_version.xsd"/>
-	<xsd:include schemaLocation="../netex_genericFramework/netex_grouping_version.xsd"/>
+	<xsd:include schemaLocation="netex_dayType_propertiesOfDay-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_dayType_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_responsibility_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_grouping_version-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -29,7 +29,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_dayType_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_dayType_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipmentPlace_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipmentPlace_version-v1.0.xsd
similarity index 97%
rename from xsd/netex_framework/netex_reusableComponents/netex_equipmentPlace_version.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_equipmentPlace_version-v1.0.xsd
index afe139712..5710645c2 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_equipmentPlace_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_equipmentPlace_version-v1.0.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_equipmentPlace_version">
-	<xsd:include schemaLocation="netex_equipment_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_place_version.xsd"/>
+	<xsd:include schemaLocation="netex_equipment_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_place_version-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_equipmentPlace_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_equipmentPlace_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support-v1.0.xsd
index 3b20712b8..b093b681b 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support-v1.0.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_equipmentVehiclePassenger_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -22,7 +22,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_equipmentVehiclePassenger_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_equipmentVehiclePassenger_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version-v1.0.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version-v1.0.xsd
index 0ad270766..3da9eeab4 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version-v1.0.xsd
@@ -24,7 +24,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_equipmentVehiclePassenger_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_equipmentVehiclePassenger_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
@@ -53,12 +53,12 @@ Rail transport, Roads and Road transport
 		</xsd:appinfo>
 		<xsd:documentation>VEHICLE PASSENGER EQUIPMENT types for IFOPT Fixed Objects in Public Transport.</xsd:documentation>
 	</xsd:annotation>
-	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_units.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version.xsd"/>
-	<xsd:include schemaLocation="../netex_genericFramework/netex_accessibility/netex_acsb_accessibility.xsd"/>
-	<xsd:include schemaLocation="netex_equipmentVehiclePassenger_support.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleType_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_units-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_accessibility/netex_acsb_accessibility-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_equipmentVehiclePassenger_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleType_support-v1.0.xsd"/>
 	<xsd:group name="VehicleEquipmentChoice">
 		<xsd:annotation>
 			<xsd:documentation>Choice of VEHICLE EQUIPMENT.</xsd:documentation>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipment_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_equipment_support.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd
index cd4a79bb6..fa236b7ee 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_equipment_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2006 sp2 U (http://www.altova.com) by christophe duquesne (Dryade SARL) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_equipment_support">
-	<xsd:include schemaLocation="../netex_genericFramework/netex_place_support.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_place_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -26,7 +26,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_equipmnet_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_equipmnet_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipment_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipment_version-v1.0.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_equipment_version.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_equipment_version-v1.0.xsd
index f831aff21..b1b840235 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_equipment_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_equipment_version-v1.0.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_equipment_version">
-	<xsd:include schemaLocation="../netex_utility/netex_utility_types.xsd"/>
-	<xsd:include schemaLocation="netex_equipment_support.xsd"/>
-	<xsd:include schemaLocation="../netex_responsibility/netex_typeOfValue_version.xsd"/>
+	<xsd:include schemaLocation="../netex_utility/netex_utility_types-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_equipment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_typeOfValue_version-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,7 +29,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_equipment_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_equipment_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_facilityUic_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_facilityUic_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_facilityUic_support.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_facilityUic_support-v1.0.xsd
index 8026af0b7..89294a8f6 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_facilityUic_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_facilityUic_support-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ifopt="http://www.ifopt.org.uk/ifopt" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_facilityUic_support">
-	<xsd:include schemaLocation="../netex_responsibility/netex_relationship.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_relationship-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -31,7 +31,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2011</Copyright>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_facilityUic_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_facilityUic_version-v1.0.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_facilityUic_version.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_facilityUic_version-v1.0.xsd
index 700d667b2..53bc1fbac 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_facilityUic_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_facilityUic_version-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ifopt="http://www.ifopt.org.uk/ifopt" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_facilityUic_version">
-	<xsd:include schemaLocation="../netex_responsibility/netex_relationship.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_relationship-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -31,7 +31,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_facility_support-v1.1.xsd
similarity index 99%
rename from xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_facility_support-v1.1.xsd
index f1ac4e928..6a8730314 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_facility_support-v1.1.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ifopt="http://www.ifopt.org.uk/ifopt" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_facility_support">
-	<xsd:include schemaLocation="../netex_responsibility/netex_relationship.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_relationship-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -40,7 +40,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_facility_version-v1.0.xsd
similarity index 99%
rename from xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_facility_version-v1.0.xsd
index c0fe19936..616c4cfa4 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_facility_version-v1.0.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ifopt="http://www.ifopt.org.uk/ifopt" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_facility_version">
-	<xsd:include schemaLocation="netex_facility_support.xsd"/>
-	<xsd:include schemaLocation="netex_travelRights_version.xsd"/>
-	<xsd:include schemaLocation="netex_facilityUic_support.xsd"/>
-	<xsd:include schemaLocation="netex_equipment_version.xsd"/>
+	<xsd:include schemaLocation="netex_facility_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_travelRights_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_facilityUic_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_equipment_version-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -34,7 +34,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_linkByValue_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_linkByValue_support-v1.0.xsd
similarity index 97%
rename from xsd/netex_framework/netex_reusableComponents/netex_linkByValue_support.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_linkByValue_support-v1.0.xsd
index 824b89ab4..b2c853111 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_linkByValue_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_linkByValue_support-v1.0.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_linkByValue_support">
-	<xsd:include schemaLocation="../netex_genericFramework/netex_pointAndLink_version.xsd"/>
-	<xsd:include schemaLocation="netex_mode_version.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_pointAndLink_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_mode_version-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -32,7 +32,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_mode_support-v1.0.xsd
similarity index 99%
rename from xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_mode_support-v1.0.xsd
index e42338f82..26cc8ce57 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_mode_support-v1.0.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_mode_support">
-	<xsd:include schemaLocation="../netex_responsibility/netex_relationship.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_relationship-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -22,7 +22,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_mode_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_mode_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_mode_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_mode_version-v1.0.xsd
similarity index 96%
rename from xsd/netex_framework/netex_reusableComponents/netex_mode_version.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_mode_version-v1.0.xsd
index 8e3d107ac..aa7eca123 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_mode_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_mode_version-v1.0.xsd
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_mode_version">
-	<xsd:include schemaLocation="../netex_responsibility/netex_typeOfValue_version.xsd"/>
-	<xsd:include schemaLocation="netex_mode_support.xsd"/>
-	<xsd:include schemaLocation="netex_submode_version.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_typeOfValue_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_mode_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_submode_version-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs"><Aggregation>main schema</Aggregation><Audience>e-service developers</Audience><Coverage>Europe</Coverage><Creator>First drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles.  mailto:schemer@netex.org.uk</Creator><Date><Created>2010-09-04</Created></Date><Date><Modified>2011-02-05</Modified></Date><Description><p>NeTEx - Network Exchange. This subschema defines common MODE types.</p></Description><Format><MediaType>text/xml</MediaType><Syntax>http://www.w3.org/2001/XMLSchema</Syntax><Description>XML schema, W3C Recommendation 2001</Description></Format>m
-			<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_mode_version.xsd</Identifier>
+			<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_mode_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_noticeAssignment_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_noticeAssignment_version-v1.1.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_noticeAssignment_version.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_noticeAssignment_version-v1.1.xsd
index 052059e50..bdd692bd3 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_noticeAssignment_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_noticeAssignment_version-v1.1.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_noticeAssignment_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd"/>
-	<xsd:include schemaLocation="../netex_genericFramework/netex_pointAndLink_support.xsd"/>
-	<xsd:include schemaLocation="../netex_genericFramework/netex_section_support.xsd"/>
-	<xsd:include schemaLocation="../netex_genericFramework/netex_assignment_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_notice_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_pointAndLink_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_section_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_assignment_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_notice_version-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -31,7 +31,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_noticeAssignment_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_noticeAssignment_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_notice_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_notice_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_notice_support.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_notice_support-v1.0.xsd
index 9fd1e03c8..bcdf01f88 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_notice_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_notice_support-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_notice_support">
-	<xsd:include schemaLocation="../netex_genericFramework/netex_assignment_support.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_assignment_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_notice_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_notice_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_notice_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_notice_version-v1.1.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_notice_version.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_notice_version-v1.1.xsd
index ba300e1b4..f36ab3299 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_notice_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_notice_version-v1.1.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_notice_version">
-	<xsd:include schemaLocation="netex_notice_support.xsd"/>
-	<xsd:include schemaLocation="../netex_responsibility/netex_typeOfValue_version.xsd"/>
+	<xsd:include schemaLocation="netex_notice_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_typeOfValue_version-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_notice_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_notice_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_support-v1.0.xsd
similarity index 99%
rename from xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_support.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_support-v1.0.xsd
index 312dab027..adf662a85 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_support-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_otherOrganisation_support">
-	<xsd:include schemaLocation="../netex_genericFramework/netex_organisation_support.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_organisation_support-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_otherOrganisation_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_otherOrganisation_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_version-v1.0.xsd
similarity index 97%
rename from xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_version.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_version-v1.0.xsd
index ddc928af7..929946e00 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_version-v1.0.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_otherOrganisation_version">
-	<xsd:include schemaLocation="netex_otherOrganisation_support.xsd"/>
-	<xsd:include schemaLocation="../netex_genericFramework/netex_organisation_version.xsd"/>
-	<xsd:include schemaLocation="netex_serviceCalendar_version.xsd"/>
-	<xsd:include schemaLocation="netex_address_version.xsd"/>
+	<xsd:include schemaLocation="netex_otherOrganisation_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_organisation_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_serviceCalendar_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_address_version-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -26,7 +26,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_otherOrganisation_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_otherOrganisation_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_schematicMap_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_schematicMap_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_schematicMap_support.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_schematicMap_support-v1.0.xsd
index 781fab523..dbbbdd130 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_schematicMap_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_schematicMap_support-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2006 sp2 U (http://www.altova.com) by christophe duquesne (Dryade SARL) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_schematicMap_support">
-	<xsd:include schemaLocation="../netex_responsibility/netex_relationship.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_relationship-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_schematicMap_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_schematicMap_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_schematicMap_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_schematicMap_version-v1.0.xsd
similarity index 97%
rename from xsd/netex_framework/netex_reusableComponents/netex_schematicMap_version.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_schematicMap_version-v1.0.xsd
index 8f9b43594..086770ba9 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_schematicMap_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_schematicMap_version-v1.0.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_schematicMap_version">
-	<xsd:include schemaLocation="../netex_responsibility/netex_responsibility_version.xsd"/>
-	<xsd:include schemaLocation="../netex_genericFramework/netex_projection_version.xsd"/>
-	<xsd:include schemaLocation="../netex_utility/netex_utility_types.xsd"/>
-	<xsd:include schemaLocation="netex_schematicMap_support.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_responsibility_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_projection_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_utility/netex_utility_types-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_schematicMap_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,7 +28,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_schematicMap_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_schematicMap_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_securityList_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_securityList_support-v1.1.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_securityList_support.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_securityList_support-v1.1.xsd
index c21a85f8a..364e078e6 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_securityList_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_securityList_support-v1.1.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_securityList_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_support-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -25,11 +25,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_securityList_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_securityList_support-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Steam Intellect, London N1 1JS </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  ``````````````````````````<Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_securityList_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_securityList_version-v1.1.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_securityList_version.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_securityList_version-v1.1.xsd
index f8e85205a..c14637845 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_securityList_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_securityList_version-v1.1.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_securityList_version">
-	<xsd:include schemaLocation="netex_securityList_support.xsd"/>
-	<xsd:include schemaLocation="../netex_responsibility/netex_typeOfValue_version.xsd"/>
+	<xsd:include schemaLocation="netex_securityList_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_typeOfValue_version-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -26,11 +26,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_securityList_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_securityList_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Steam Intellect, London N1 1JS </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_support.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_support-v1.0.xsd
index f64f5df32..24916ec68 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_support-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2006 sp2 U (http://www.altova.com) by christophe duquesne (Dryade SARL) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_serviceCalendar_support">
-	<xsd:include schemaLocation="../netex_genericFramework/netex_assignment_support.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_assignment_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_schematicMap_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_schematicMap_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_version-v1.0.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_version.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_version-v1.0.xsd
index fa352f728..4b8915d28 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_version-v1.0.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2011 rel. 2 sp1 (x64) (http://www.altova.com) by Christophe Duquesne (Dryade) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_serviceCalendar_version">
-	<xsd:include schemaLocation="netex_serviceCalendar_support.xsd"/>
-	<xsd:include schemaLocation="netex_dayType_version.xsd"/>
-	<xsd:include schemaLocation="../netex_genericFramework/netex_assignment_version.xsd"/>
+	<xsd:include schemaLocation="netex_serviceCalendar_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_dayType_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_assignment_version-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -25,7 +25,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_serviceCalendar_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_serviceCalendar_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_submode_version-v1.1.xsd
similarity index 99%
rename from xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_submode_version-v1.1.xsd
index 2842b1d05..c8f12183a 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_submode_version-v1.1.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_submode_version">
-	<xsd:include schemaLocation="../netex_responsibility/netex_relationship.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_relationship-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,7 +28,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netx_reusableComponents}netex_submode_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netx_reusableComponents}netex_submode_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_support-v1.1.xsd
similarity index 99%
rename from xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_support.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_support-v1.1.xsd
index 05efbfe8c..848502fb2 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_support-v1.1.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_topographicPlace_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_place_support.xsd"/>
-	<xsd:include schemaLocation="../netex_genericFramework/netex_projection_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_place_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_projection_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -30,7 +30,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_topographicPlace_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_topographicPlace_support-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_version-v1.1.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_version.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_version-v1.1.xsd
index 0ded0714f..bd382502f 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_version-v1.1.xsd
@@ -29,7 +29,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_topographicPlace_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_topographicPlace_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
@@ -60,9 +60,9 @@ Rail transport, Roads and Road transport
 	</xsd:annotation>
 	<!-- ======================================================================= -->
 	<!-- ===IFOPT Name Space includes (Which also may Reference SIRI) ============================================================== -->
-	<xsd:include schemaLocation="netex_address_version.xsd"/>
-	<xsd:include schemaLocation="netex_access_version.xsd"/>
-	<xsd:include schemaLocation="netex_topographicPlace_support.xsd"/>
+	<xsd:include schemaLocation="netex_address_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_access_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_topographicPlace_support-v1.1.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:complexType name="topographicPlacesInFrame_RelStructure">
 		<xsd:annotation>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_trainElement_support-v1.0.xsd
index e679ab197..74baaa5f6 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_trainElement_support">
-	<xsd:include schemaLocation="netex_vehicleType_support.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleType_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -32,7 +32,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version-v1.1.xsd
similarity index 98%
rename from xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_trainElement_version-v1.1.xsd
index 154470bf2..f6f0d82ab 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version-v1.1.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_trainElement">
-	<xsd:include schemaLocation="netex_vehicleType_version.xsd"/>
-	<xsd:include schemaLocation="netex_trainElement_support.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleType_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_trainElement_support-v1.0.xsd"/>
 	<xsd:group name="ServiceRequirementTypeGroup">
 		<xsd:annotation>
 			<xsd:documentation>SERVICE REQUIEMENTS for  SERVICE JOURNEY. These are the normal planned values, not necessarily the ACTUAL VEHICLE EQUIPMENT.</xsd:documentation>
@@ -52,11 +52,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_trainElement_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_trainElement_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support-v1.0.xsd
similarity index 99%
rename from xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support-v1.0.xsd
index 1416d081d..f4dd874e9 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_transportOrganisation_version">
-	<xsd:include schemaLocation="../netex_genericFramework/netex_organisation_support.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_organisation_support-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_transportOrganisation_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_transportOrganisation_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version-v1.0.xsd
similarity index 99%
rename from xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version-v1.0.xsd
index 44c051091..9ae893117 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version-v1.0.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_transportOrganisation_version">
-	<xsd:include schemaLocation="netex_transportOrganisation_support.xsd"/>
-	<xsd:include schemaLocation="../netex_reusableComponents/netex_mode_version.xsd"/>
-	<xsd:include schemaLocation="../netex_genericFramework/netex_organisation_version.xsd"/>
-	<xsd:include schemaLocation="netex_address_version.xsd"/>
+	<xsd:include schemaLocation="netex_transportOrganisation_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_reusableComponents/netex_mode_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_organisation_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_address_version-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -26,7 +26,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_transportOrganisation_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_transportOrganisation_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_travelRights_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_travelRights_support-v1.0.xsd
similarity index 99%
rename from xsd/netex_framework/netex_reusableComponents/netex_travelRights_support.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_travelRights_support-v1.0.xsd
index fe608297c..c5ab9dedd 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_travelRights_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_travelRights_support-v1.0.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_travelRights_support">
-	<xsd:include schemaLocation="../netex_responsibility/netex_responsibility_support.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_responsibility_support-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -21,7 +21,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_travelRights_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_travelRights_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_travelRights_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_travelRights_version-v1.1.xsd
similarity index 97%
rename from xsd/netex_framework/netex_reusableComponents/netex_travelRights_version.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_travelRights_version-v1.1.xsd
index c2588383f..2cba1d489 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_travelRights_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_travelRights_version-v1.1.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_travelRights_version">
-	<xsd:include schemaLocation="../netex_responsibility/netex_typeOfValue_version.xsd"/>
-	<xsd:include schemaLocation="netex_travelRights_support.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_typeOfValue_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_travelRights_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -32,11 +32,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_travelRights_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_travelRights_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support-v1.0.xsd
similarity index 99%
rename from xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support-v1.0.xsd
index b076d2129..771d78cbb 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_vehicleType_support">
-	<xsd:include schemaLocation="netex_equipment_support.xsd"/>
+	<xsd:include schemaLocation="netex_equipment_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -36,7 +36,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version-v1.1.xsd
similarity index 99%
rename from xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version-v1.1.xsd
index f67e20a70..b3ca4b21a 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version-v1.1.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_vehicleType_version">
-	<xsd:include schemaLocation="netex_vehicleType_support.xsd"/>
-	<xsd:include schemaLocation="netex_transportOrganisation_support.xsd"/>
-	<xsd:include schemaLocation="netex_equipmentVehiclePassenger_version.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleType_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_transportOrganisation_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_equipmentVehiclePassenger_version-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -37,7 +37,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_framework/netex_utility/netex_location_types.xsd b/xsd/netex_framework/netex_utility/netex_location_types-v1.0.xsd
similarity index 98%
rename from xsd/netex_framework/netex_utility/netex_location_types.xsd
rename to xsd/netex_framework/netex_utility/netex_location_types-v1.0.xsd
index ed99b1d8d..2fb3c5793 100644
--- a/xsd/netex_framework/netex_utility/netex_location_types.xsd
+++ b/xsd/netex_framework/netex_utility/netex_location_types-v1.0.xsd
@@ -2,7 +2,7 @@
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <!-- 2007 03 23 Revise projections -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_location_types">
-	<xsd:include schemaLocation="netex_units.xsd"/>
+	<xsd:include schemaLocation="netex_units-v1.0.xsd"/>
 	<!--fulll gml dependency-->
 	<xsd:import namespace="http://www.opengis.net/gml/3.2" schemaLocation="../../gml/gml_extract_all_objects_v_3_2_1.xsd"/>
 	<xsd:import namespace="http://www.opengis.net/gml/3.2" schemaLocation="../../gml/geometryBasic0d1d-extract-v3_2_1.xsd"/>
@@ -33,7 +33,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_utility}netex_location_types.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_utility}netex_location_types-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_utility/netex_units.xsd b/xsd/netex_framework/netex_utility/netex_units-v1.0.xsd
similarity index 98%
rename from xsd/netex_framework/netex_utility/netex_units.xsd
rename to xsd/netex_framework/netex_utility/netex_units-v1.0.xsd
index 4474d3596..a1b23b88e 100644
--- a/xsd/netex_framework/netex_utility/netex_units.xsd
+++ b/xsd/netex_framework/netex_utility/netex_units-v1.0.xsd
@@ -21,7 +21,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netext.org.uk/schemas/0.4/netex/netex_framework/netex_utility}netex_units.xsd</Identifier>
+				<Identifier>{http://www.netext.org.uk/schemas/0.4/netex/netex_framework/netex_utility}netex_units-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_utility/netex_utility_contact.xsd b/xsd/netex_framework/netex_utility/netex_utility_contact-v1.0.xsd
similarity index 96%
rename from xsd/netex_framework/netex_utility/netex_utility_contact.xsd
rename to xsd/netex_framework/netex_utility/netex_utility_contact-v1.0.xsd
index d51ab295c..9fd7e8ff6 100644
--- a/xsd/netex_framework/netex_utility/netex_utility_contact.xsd
+++ b/xsd/netex_framework/netex_utility/netex_utility_contact-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_utility_contact">
-	<xsd:include schemaLocation="netex_utility_types.xsd"/>
-	<xsd:include schemaLocation="netex_utility_xml.xsd"/>
+	<xsd:include schemaLocation="netex_utility_types-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_utility_xml-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -26,7 +26,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_utility}utility_contact.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_utility}utility_contact-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_utility/netex_utility_time.xsd b/xsd/netex_framework/netex_utility/netex_utility_time-v1.0.xsd
similarity index 99%
rename from xsd/netex_framework/netex_utility/netex_utility_time.xsd
rename to xsd/netex_framework/netex_utility/netex_utility_time-v1.0.xsd
index a0c89db71..0d8625ab4 100644
--- a/xsd/netex_framework/netex_utility/netex_utility_time.xsd
+++ b/xsd/netex_framework/netex_utility/netex_utility_time-v1.0.xsd
@@ -22,7 +22,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_utility}netex_utility_time.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_utility}netex_utility_time-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
diff --git a/xsd/netex_framework/netex_utility/netex_utility_types.xsd b/xsd/netex_framework/netex_utility/netex_utility_types-v1.1.xsd
similarity index 99%
rename from xsd/netex_framework/netex_utility/netex_utility_types.xsd
rename to xsd/netex_framework/netex_utility/netex_utility_types-v1.1.xsd
index b417ab2a4..b78fdd22f 100644
--- a/xsd/netex_framework/netex_utility/netex_utility_types.xsd
+++ b/xsd/netex_framework/netex_utility/netex_utility_types-v1.1.xsd
@@ -34,7 +34,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_utility}netex_utility_types.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_utility}netex_utility_types-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_utility/netex_utility_xml.xsd b/xsd/netex_framework/netex_utility/netex_utility_xml-v1.0.xsd
similarity index 98%
rename from xsd/netex_framework/netex_utility/netex_utility_xml.xsd
rename to xsd/netex_framework/netex_utility/netex_utility_xml-v1.0.xsd
index aaaa8e2bf..b743f3886 100644
--- a/xsd/netex_framework/netex_utility/netex_utility_xml.xsd
+++ b/xsd/netex_framework/netex_utility/netex_utility_xml-v1.0.xsd
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_utility}netex_utility_xml.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_utility}netex_utility_xml-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
diff --git a/xsd/netex_part_1/netex_all_frames_part1.xsd b/xsd/netex_part_1/netex_all_frames_part1-v1.0.xsd
similarity index 88%
rename from xsd/netex_part_1/netex_all_frames_part1.xsd
rename to xsd/netex_part_1/netex_all_frames_part1-v1.0.xsd
index ab69f08c1..8ee6d08fc 100644
--- a/xsd/netex_part_1/netex_all_frames_part1.xsd
+++ b/xsd/netex_part_1/netex_all_frames_part1-v1.0.xsd
@@ -2,9 +2,9 @@
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_frames_part1">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="netex_all_objects_part1.xsd"/>
+	<xsd:include schemaLocation="netex_all_objects_part1-v1.0.xsd"/>
 	<!-- =====Frames================================================= -->
-	<xsd:include schemaLocation="part1_frames/netex_infrastructureFrame_version.xsd"/>
-	<xsd:include schemaLocation="part1_frames/netex_siteFrame_version.xsd"/>
+	<xsd:include schemaLocation="part1_frames/netex_infrastructureFrame_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="part1_frames/netex_siteFrame_version-v1.1.xsd"/>
 	<!-- ============================================================ -->
 </xsd:schema>
diff --git a/xsd/netex_part_1/netex_all_objects_infrastructureFrame.xsd b/xsd/netex_part_1/netex_all_objects_infrastructureFrame-v1.0.xsd
similarity index 100%
rename from xsd/netex_part_1/netex_all_objects_infrastructureFrame.xsd
rename to xsd/netex_part_1/netex_all_objects_infrastructureFrame-v1.0.xsd
diff --git a/xsd/netex_part_1/netex_all_objects_part1.xsd b/xsd/netex_part_1/netex_all_objects_part1-v1.0.xsd
similarity index 89%
rename from xsd/netex_part_1/netex_all_objects_part1.xsd
rename to xsd/netex_part_1/netex_all_objects_part1-v1.0.xsd
index 775cebf61..dd82b04f8 100644
--- a/xsd/netex_part_1/netex_all_objects_part1.xsd
+++ b/xsd/netex_part_1/netex_all_objects_part1-v1.0.xsd
@@ -2,12 +2,12 @@
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_part1">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="../netex_framework/netex_all_objects_framework.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_all_objects_framework-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="part1_networkDescription/netex_all_objects_part1_networkDescription.xsd"/>
+	<xsd:include schemaLocation="part1_networkDescription/netex_all_objects_part1_networkDescription-v1.0.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="part1_ifopt/netex_ifopt_all_objects.xsd"/>
+	<xsd:include schemaLocation="part1_ifopt/netex_ifopt_all_objects-v1.0.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="part1_tacticalPlanning/netex_all_objects_part1_tacticalPlanning.xsd"/>
+	<xsd:include schemaLocation="part1_tacticalPlanning/netex_all_objects_part1_tacticalPlanning-v1.0.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_part_1/part1_frames/netex_infrastructureFrame_version.xsd b/xsd/netex_part_1/part1_frames/netex_infrastructureFrame_version-v1.0.xsd
similarity index 96%
rename from xsd/netex_part_1/part1_frames/netex_infrastructureFrame_version.xsd
rename to xsd/netex_part_1/part1_frames/netex_infrastructureFrame_version-v1.0.xsd
index 0a2e0dd80..1e5739010 100644
--- a/xsd/netex_part_1/part1_frames/netex_infrastructureFrame_version.xsd
+++ b/xsd/netex_part_1/part1_frames/netex_infrastructureFrame_version-v1.0.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_InfrastructureFrame_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_all_objects_generic.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_trainElement_version.xsd"/>
-	<xsd:include schemaLocation="../part1_networkDescription/netex_all_objects_part1_infrastructureFrame_contents.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_commonFrame_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_all_objects_generic-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_trainElement_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_all_objects_part1_infrastructureFrame_contents-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_commonFrame_version-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,7 +28,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_frames}netex_InfrastructureFrame_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_frames}netex_InfrastructureFrame_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd b/xsd/netex_part_1/part1_frames/netex_siteFrame_version-v1.1.xsd
similarity index 97%
rename from xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd
rename to xsd/netex_part_1/part1_frames/netex_siteFrame_version-v1.1.xsd
index 8dd1871b6..9f5e40a0e 100644
--- a/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd
+++ b/xsd/netex_part_1/part1_frames/netex_siteFrame_version-v1.1.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_siteFrame_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_commonFrame_version.xsd"/>
-	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_flexibleStopPlace_version.xsd"/>
-	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_pointOfInterest_version.xsd"/>
-	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_parking_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_commonFrame_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_flexibleStopPlace_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_pointOfInterest_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_parking_version-v1.1.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -35,11 +35,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_frames}netex_siteFrame_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_frames}netex_siteFrame_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>CEN TC278 SG6 and Department for Transport, Great Minster House, 76 Marsham Street, London SW1P 4DR</Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_xxxxx.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_xxxxx-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_support-v1.0.xsd
similarity index 97%
rename from xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_support.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_support-v1.0.xsd
index f7eb2f787..8c2cb6ac4 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_support.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_support-v1.0.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_assistanceBooking_support">
-	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_localService_support.xsd"/>
+	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_localService_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -30,7 +30,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/xsd//netex_framework/netex_responsibility/netex_relationship.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/xsd//netex_framework/netex_responsibility/netex_relationship-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_version-v1.0.xsd
similarity index 94%
rename from xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_version.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_version-v1.0.xsd
index 3586dd96d..5f349a1c3 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_version-v1.0.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_assistanceBooking_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd"/>
-	<xsd:include schemaLocation="../part1_networkDescription/netex_line_support.xsd"/>
-	<xsd:include schemaLocation="netex_assistanceBooking_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_noticeAssignment_version.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_localService_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_line_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_assistanceBooking_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_noticeAssignment_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_localService_version-v1.1.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,11 +31,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_assistanceBooking_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_assistanceBooking_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/xsd//netex_framework/netex_responsibility/netex_relationship.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/xsd//netex_framework/netex_responsibility/netex_relationship-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_all_objects.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_all_objects-v1.0.xsd
similarity index 72%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_all_objects.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_all_objects-v1.0.xsd
index 0ca389cee..5889d9cfd 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_all_objects.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_all_objects-v1.0.xsd
@@ -13,24 +13,24 @@ The Purpose of this file is to overcome a technical limitation in Xerces (and po
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:nx="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_all_objects">
 	<!-- ===Global include of all ACSB namespace elements neeeded to work around XERCES limitation=====-->
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_ifopt_checkConstraint_version.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentAll.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_flexibleStopPlace_support.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_flexibleStopPlace_version.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_path_version.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_path_support.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_navigationPath_version.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_parking_version.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_parking_support.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_pointOfInterest_support.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_pointOfInterest_version.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_serviceFeature_support.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_serviceFeature_version.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_site_support.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_site_version.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_stopPlace_support.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_vehicleStopping_support.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_stopPlace_version.xsd"/>
-	<!--  For some reason OXygen doesnt like this <xsd:include schemaLocation="netex_assistanceBooking_support.xsd"/> -->
-	<xsd:include schemaLocation="netex_assistanceBooking_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_checkConstraint_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentAll-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_flexibleStopPlace_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_flexibleStopPlace_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_path_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_path_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_navigationPath_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_parking_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_parking_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_pointOfInterest_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_pointOfInterest_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_serviceFeature_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_serviceFeature_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_site_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_site_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_stopPlace_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_vehicleStopping_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_stopPlace_version-v1.1.xsd"/>
+	<!--  For some reason OXygen doesnt like this <xsd:include schemaLocation="netex_assistanceBooking_support-v1.0.xsd"/> -->
+	<xsd:include schemaLocation="netex_assistanceBooking_version-v1.0.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_support-v1.1.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_support.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_support-v1.1.xsd
index be5e59e5e..8b2be7ce6 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_support.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_support-v1.1.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_checkConstraint_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -25,7 +25,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_checkConstraint_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_checkConstraint_support-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_version-v1.1.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_version.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_version-v1.1.xsd
index f1b9be880..b45075a02 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_version-v1.1.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_ifopt_checkConstraint_version">
-	<xsd:include schemaLocation="netex_ifopt_checkConstraint_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_checkConstraint_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version-v1.0.xsd"/>
 	<!--============================================================================================-->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -33,7 +33,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_checkConstraint_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_checkConstraint_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support-v1.0.xsd
similarity index 99%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support-v1.0.xsd
index 8be6d5b30..06aeb9213 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support-v1.0.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_equipmentAccess_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifot_equipmentAccess_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifot_equipmentAccess_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version-v1.0.xsd
similarity index 99%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version-v1.0.xsd
index 8b9057c1c..c6d76374f 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version-v1.0.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_equipmentAccess_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_support.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentAccess_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipmentPlace_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentAccess_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipmentPlace_version-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,7 +31,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifot_equipmentAccess_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifot_equipmentAccess_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAll.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAll-v1.0.xsd
similarity index 91%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAll.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAll-v1.0.xsd
index 1cf0f60c3..06fb36c36 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAll.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAll-v1.0.xsd
@@ -6,9 +6,9 @@
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs"><Aggregation>main schema</Aggregation><Audience>e-service developers</Audience><Contributor>V1.0 Nicholas Knowles</Contributor><Contributor>Roger Slevin [Roger.Slevin@dft.gsi.gov.uk]</Contributor><Coverage>Europe</Coverage><Creator>Created as W3C .xsd schema by Nicholas Knowles. as 1.0 XML schema </Creator><Date><Created>2007-06-10</Created></Date><Date><Modified>2007-06-22</Modified></Date><Description><p>Equipment types
 
- </p></Description><Format><MediaType>text/xml</MediaType><Syntax>http://www.w3.org/2001/XMLSchema</Syntax><Description>XML schema, W3C Recommendation 2001</Description></Format><Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_Ifopt_equipmentAll.xsd</Identifier><Language>[ISO 639-2/B] ENG</Language>netex_Ifopt_equipmentAll.xsd
+ </p></Description><Format><MediaType>text/xml</MediaType><Syntax>http://www.w3.org/2001/XMLSchema</Syntax><Description>XML schema, W3C Recommendation 2001</Description></Format><Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_Ifopt_equipmentAll-v1.0.xsd</Identifier><Language>[ISO 639-2/B] ENG</Language>netex_Ifopt_equipmentAll-v1.0.xsd
 				<Publisher>CEN TC278 SG6 and Department for Transport, Great Minster House, 76 Marsham Street, London SW1P 4DR</Publisher>
-				<Relation><Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_ifopt_xxxxx.xsd</Requires></Relation>
+				<Relation><Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_ifopt_xxxxx-v1.0.xsd</Requires></Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
 				</Rights>
@@ -30,24 +30,24 @@ Rail transport, Roads and road transport
 	</xsd:annotation>
 	<!-- ======================================================================= -->
 	<!--.....These are the actual dependencies...-->
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentSigns_support.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentSigns_version.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentAccess_support.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentAccess_version.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentWaiting_support.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentWaiting_version.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentTicketing_support.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentTicketing_version.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentParking_support.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentParking_version.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentPassenger_version.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentPassenger_version.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_localService_support.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_localService_version.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_localServiceCommercial_support.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_localServiceCommercial_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentSigns_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentSigns_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentAccess_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentAccess_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentWaiting_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentWaiting_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentTicketing_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentTicketing_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentParking_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentParking_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentPassenger_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentPassenger_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_localService_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_localService_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_localServiceCommercial_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_localServiceCommercial_version-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:group name="AllEquipmentGroup">
 		<xsd:annotation>
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_support-v1.0.xsd
similarity index 97%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_support.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_support-v1.0.xsd
index fae0f5b9c..fb453c3c9 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_support.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_support-v1.0.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_equipmentParking_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentParking_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentParking_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_version-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_version.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_version-v1.0.xsd
index d73d1035e..b97b22df5 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_version-v1.0.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_equipmentParking_version">
-	<xsd:include schemaLocation="netex_ifopt_equipmentParking_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipmentPlace_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentParking_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipmentPlace_version-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -30,7 +30,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentParking_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentParking_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support-v1.0.xsd
index 88f7ef6c3..404465b99 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support-v1.0.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_equipmentPassenger_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentPassenger_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentPassenger_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version-v1.1.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version-v1.1.xsd
index 50deea7b8..ddd2786ef 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version-v1.1.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_ifopt_equipmentPassenger_version">
-	<xsd:include schemaLocation="netex_ifopt_equipmentPassenger_support.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentAccess_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentPassenger_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentAccess_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,7 +31,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentPassenger_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentPassenger_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_support.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_support-v1.0.xsd
index a13e7847e..a438dbc42 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_support.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_support-v1.0.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_equipmentSign_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentSign_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentSign_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_version-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_version.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_version-v1.0.xsd
index 923ce5ecb..11fa928f8 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_version-v1.0.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_equipmentSigns_version">
-	<xsd:include schemaLocation="netex_ifopt_equipmentSigns_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version.xsd"/>
-	<xsd:include schemaLocation="../part1_networkDescription/netex_line_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentSigns_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_line_version-v1.1.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -26,7 +26,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentSigns_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentSigns_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_support-v1.0.xsd
similarity index 97%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_support.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_support-v1.0.xsd
index fe27cbf5b..3f224e57a 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_support.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_support-v1.0.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_equipmentTicketing_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentTicketing_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentTicketing_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version-v1.0.xsd
similarity index 97%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version-v1.0.xsd
index f3d3be695..2025de18f 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version-v1.0.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_equipmentTicketing_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_support.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentTicketing_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentTicketing_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -30,7 +30,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentTicketing_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentTicketing_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_support.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_support-v1.0.xsd
index 9efd036d1..8066b45ef 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_support.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_support-v1.0.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_equipmentWaiting_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentTicketing_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentTicketing_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_version-v1.0.xsd
similarity index 99%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_version.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_version-v1.0.xsd
index 84eb81002..4f119ac8e 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_version-v1.0.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_equipmentWaiting_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentWaiting_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentWaiting_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,7 +29,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentWaiting.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentWaiting-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_support.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_support-v1.0.xsd
index 73aee8a7e..b5fea9ac3 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_support.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_support-v1.0.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="inetex_ifopt_flexibleStopPlace_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_place_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_place_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -26,7 +26,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_flexibleStopPlace_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_flexibleStopPlace_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_version-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_version.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_version-v1.0.xsd
index 909a60e24..79240c324 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_version-v1.0.xsd
@@ -2,8 +2,8 @@
 <!-- edited with XMLSpy v2009 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <!-- 2007 03 23 Add repeating name -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_flexibleStopPlace_version">
-	<xsd:include schemaLocation="netex_ifopt_flexibleStopPlace_support.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_stopPlace_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_flexibleStopPlace_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_stopPlace_version-v1.1.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_flexibleStopPlace_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_flexibleStopPlace_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>CEN TC278 SG6 and Department for Transport, Great Minster House, 76 Marsham Street, London SW1P 4DR</Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_ifopt_FlexibleStopPlaceModel.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_ifopt_FlexibleStopPlaceModel-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_support.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_support-v1.0.xsd
index cb7274ed3..a28455752 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_support.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_support-v1.0.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_localServiceCommercial_support">
-	<xsd:include schemaLocation="netex_ifopt_localService_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_localService_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_localServiceCommecrial_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_localServiceCommecrial_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_version-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_version.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_version-v1.0.xsd
index f3bccd2b5..84975b73c 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_version-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_localServiceCommercial_version">
-	<xsd:include schemaLocation="netex_ifopt_localServiceCommercial_support.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_localService_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_localServiceCommercial_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_localService_version-v1.1.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -24,7 +24,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_localServiceCommercial_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_localServiceCommercial_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_support-v1.0.xsd
similarity index 99%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_support.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_support-v1.0.xsd
index e213d41a0..0529deb8f 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_support.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_support-v1.0.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_localService_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_localService_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_localService_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version-v1.1.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version-v1.1.xsd
index 1d0f56138..bdab45db8 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version-v1.1.xsd
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_ifopt_localService_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_utility_types.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_units.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_localService_support.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_serviceFeature_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_utility_types-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_units-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_localService_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_serviceFeature_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -32,7 +32,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_localService_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_localService_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version-v1.1.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version-v1.1.xsd
index 351fc378e..edcaadf6a 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version-v1.1.xsd
@@ -4,12 +4,12 @@
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_ifopt_navigationPath_version">
 	<!-- ======================================================================= -->
 	<!-- ===Global import of all acsb namespace elements neeeded to work around XERCES limitation
-	<xsd:include schemaLocation="../acsb/netex_acsb_all.xsd"/> =====-->
+	<xsd:include schemaLocation="../acsb/netex_acsb_all-v1.0.xsd"/> =====-->
 	<!--.....These are the actual dependencies...-->
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_place_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_path_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_place_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_path_version-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -47,11 +47,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_navigationPath_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_navigationPath_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>CEN TC278 SG6 and Department for Transport, Great Minster House, 76 Marsham Street, London SW1P 4DR</Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_ifopt_xxxxx.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_ifopt_xxxxx-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_support-v1.1.xsd
similarity index 99%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_support.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_support-v1.1.xsd
index 2b3bdd600..17427207c 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_support.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_support-v1.1.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_ifopt_parking_support">
-	<xsd:include schemaLocation="netex_ifopt_site_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_site_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,7 +28,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_parking_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_parking_support-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_version-v1.1.xsd
similarity index 99%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_version.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_version-v1.1.xsd
index 2e2934c72..5c36b214e 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_version-v1.1.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_ifopt_parking_version">
-	<xsd:include schemaLocation="netex_ifopt_parking_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_support.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_navigationPath_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_parking_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_navigationPath_version-v1.1.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -30,7 +30,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_parking.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_parking-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support-v1.0.xsd
index 7cc657e9e..4f14bbaba 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_path_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_site_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_site_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -24,7 +24,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_path_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_path_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version-v1.0.xsd
index b71dc2d4d..fa914f240 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version-v1.0.xsd
@@ -2,8 +2,8 @@
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <!-- 2007 03 23 Add repeating name -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_path_version">
-	<xsd:include schemaLocation="netex_ifopt_path_support.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_site_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_path_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_site_version-v1.0.xsd"/>
 	<!-- ============================================== -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -33,11 +33,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_Ifopt_path_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_Ifopt_path_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>CEN TC278 SG6 and Department for Transport, Great Minster House, 76 Marsham Street, London SW1P 4DR</Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_ifopt_xxxxx.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_ifopt_xxxxx-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_support.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_support-v1.0.xsd
index ca3b59673..25dedd470 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_support.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_support-v1.0.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_pointOfInterest_support">
-	<xsd:include schemaLocation="netex_ifopt_site_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_site_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,7 +28,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_pointOfInterest_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_pointOfInterest_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_version-v1.0.xsd
similarity index 99%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_version.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_version-v1.0.xsd
index 780955b80..7d7c60c86 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_version-v1.0.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_pointOfInterest_version">
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_ifopt_pointOfInterest_support.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_navigationPath_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_pointOfInterest_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_navigationPath_version-v1.1.xsd"/>
 	<!-- ============================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -36,7 +36,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>CEN TC278 SG6 and Department for Transport, Great Minster House, 76 Marsham Street, London SW1P 4DR</Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_ifopt_PointOfInterestModel.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_ifopt_PointOfInterestModel-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
 
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_support-v1.0.xsd
similarity index 97%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_support.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_support-v1.0.xsd
index fc0a7d612..3358754d6 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_support.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_support-v1.0.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_serviceFeature">
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_relationship.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_relationship-v1.0.xsd"/>
 	<!--===== ========================================================-->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,7 +29,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_serviceFeature.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_serviceFeature-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_version-v1.0.xsd
similarity index 96%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_version.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_version-v1.0.xsd
index 2ec394d55..6a5904931 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_version-v1.0.xsd
@@ -2,8 +2,8 @@
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <!-- 2007 03 23 Revise projections -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_serviceFeature">
-	<xsd:include schemaLocation="netex_ifopt_serviceFeature_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_typeOfValue_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_serviceFeature_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_typeOfValue_version-v1.0.xsd"/>
 	<!--===== =================================================================================-->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -32,7 +32,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_serviceFeature.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_serviceFeature-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support-v1.0.xsd
similarity index 99%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support-v1.0.xsd
index 0c972462a..4d8a61ed5 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support-v1.0.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_site_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_address_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_address_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -26,11 +26,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_site_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_site_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version-v1.0.xsd
similarity index 97%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version-v1.0.xsd
index fe45b341d..1c16f8937 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version-v1.0.xsd
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_site_version">
-	<xsd:include schemaLocation="netex_ifopt_site_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipmentPlace_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_address_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_topographicPlace_version.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_checkConstraint_version.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentAll.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_site_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipmentPlace_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_address_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_topographicPlace_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_checkConstraint_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentAll-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -37,11 +37,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_site_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_site_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support-v1.1.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support-v1.1.xsd
index 4ca14659c..83daee07d 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support-v1.1.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_ifopt_stopPlace_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_utility_types.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_site_support.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_path_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_utility_types-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_site_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_path_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -30,7 +30,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_stopPlace_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_stopPlace_support-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
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-v1.1.xsd
similarity index 99%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version-v1.1.xsd
index 32a64af31..18806edaa 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version-v1.1.xsd
@@ -39,11 +39,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_Ifopt_stopPlace_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_Ifopt_stopPlace_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>CEN TC278 SG6 and Department for Transport, Great Minster House, 76 Marsham Street, London SW1P 4DR</Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_ifopt_xxxxx.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_ifopt_xxxxx-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
@@ -72,17 +72,17 @@ Rail transport, Roads and Road transport
 		<xsd:documentation>IFOPT STOP PLACE Model.</xsd:documentation>
 	</xsd:annotation>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_topographicPlace_support.xsd"/>
-	<xsd:include schemaLocation="../part1_networkDescription/netex_networkInfrastructure_support.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_stopPlace_support.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_vehicleStopping_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_topographicPlace_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_networkInfrastructure_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_stopPlace_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_vehicleStopping_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_address_version.xsd"/>
-	<xsd:include schemaLocation="../part1_networkDescription/netex_line_version.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_navigationPath_version.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentAccess_version.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentSigns_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_address_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_line_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_navigationPath_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentAccess_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentSigns_version-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<!-- ===ENTIITY IN VERSION IN FRAME====(Used in SITE FRAME)=================================================== -->
 	<xsd:complexType name="stopPlacesInFrame_RelStructure">
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_vehicleStopping_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_vehicleStopping_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_vehicleStopping_support.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_vehicleStopping_support-v1.0.xsd
index 76b3f044d..3f3f7dcd6 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_vehicleStopping_support.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_vehicleStopping_support-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_vehicleStopping_support">
-	<xsd:include schemaLocation="netex_ifopt_stopPlace_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_stopPlace_support-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -26,7 +26,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_vehicleStopping_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_vehicleStopping_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_activation_support.xsd b/xsd/netex_part_1/part1_networkDescription/netex_activation_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_networkDescription/netex_activation_support.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_activation_support-v1.0.xsd
index afee08bbc..4fd63fab5 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_activation_support.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_activation_support-v1.0.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_activation_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,11 +29,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_activation_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_activation_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_activation_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_activation_version-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_networkDescription/netex_activation_version.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_activation_version-v1.0.xsd
index 15810af2e..23943be58 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_activation_version.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_activation_version-v1.0.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_activation_version">
-	<xsd:include schemaLocation="netex_activation_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version.xsd"/>
+	<xsd:include schemaLocation="netex_activation_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLink_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -30,11 +30,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_activation_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_activation_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_infrastructureFrame_contents.xsd b/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_infrastructureFrame_contents-v1.0.xsd
similarity index 62%
rename from xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_infrastructureFrame_contents.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_infrastructureFrame_contents-v1.0.xsd
index 5eedf6d7e..cfebba627 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_infrastructureFrame_contents.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_infrastructureFrame_contents-v1.0.xsd
@@ -3,14 +3,14 @@
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_infrastructureFrame_contents">
 	<!-- ===Dependencies ======================================= -->
 	<!-- ====================================================================== -->
-	<xsd:include schemaLocation="netex_activation_support.xsd"/>
-	<xsd:include schemaLocation="netex_activation_version.xsd"/>
-	<xsd:include schemaLocation="netex_networkInfrastructure_support.xsd"/>
-	<xsd:include schemaLocation="netex_networkInfrastructure_version.xsd"/>
-	<xsd:include schemaLocation="netex_networkRestriction_support.xsd"/>
-	<xsd:include schemaLocation="netex_networkRestriction_version.xsd"/>
-	<xsd:include schemaLocation="netex_timingPattern_support.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleAndCrewPoint_version.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleAndCrewPoint_support.xsd"/>
+	<xsd:include schemaLocation="netex_activation_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_activation_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_networkInfrastructure_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_networkInfrastructure_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_networkRestriction_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_networkRestriction_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_timingPattern_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleAndCrewPoint_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleAndCrewPoint_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 </xsd:schema>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_lineRoute-v1.0.xsd b/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_lineRoute-v1.0.xsd
new file mode 100644
index 000000000..20f347b4c
--- /dev/null
+++ b/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_lineRoute-v1.0.xsd
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
+<xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_lineRoute">
+	<!-- ===Dependencies ======================================= -->
+	<!-- ===================================================================== -->
+	<xsd:include schemaLocation="netex_flexibleNetwork_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_flexibleNetwork_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_line_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_line_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_lineNetwork_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_lineNetwork_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_route_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_route_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_routeInstruction_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_routeInstruction_version-v1.1.xsd"/>
+	<!-- ======================================================================= -->
+	<xsd:include schemaLocation="netex_timingPattern_support-v1.1.xsd"/>
+</xsd:schema>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_lineRoute.xsd b/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_lineRoute.xsd
deleted file mode 100644
index b8c26f5ab..000000000
--- a/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_lineRoute.xsd
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
-<xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_lineRoute">
-	<!-- ===Dependencies ======================================= -->
-	<!-- ===================================================================== -->
-	<xsd:include schemaLocation="netex_flexibleNetwork_support.xsd"/>
-	<xsd:include schemaLocation="netex_flexibleNetwork_version.xsd"/>
-	<xsd:include schemaLocation="netex_line_support.xsd"/>
-	<xsd:include schemaLocation="netex_line_version.xsd"/>
-	<xsd:include schemaLocation="netex_lineNetwork_support.xsd"/>
-	<xsd:include schemaLocation="netex_lineNetwork_version.xsd"/>
-	<xsd:include schemaLocation="netex_route_support.xsd"/>
-	<xsd:include schemaLocation="netex_route_version.xsd"/>
-	<xsd:include schemaLocation="netex_routeInstruction_support.xsd"/>
-	<xsd:include schemaLocation="netex_routeInstruction_version.xsd"/>
-	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_timingPattern_support.xsd"/>
-</xsd:schema>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_networkDescription.xsd b/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_networkDescription-v1.0.xsd
similarity index 86%
rename from xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_networkDescription.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_networkDescription-v1.0.xsd
index 6cdb80aaf..ea9408e7b 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_networkDescription.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_networkDescription-v1.0.xsd
@@ -2,9 +2,9 @@
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_networkDescription">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="../../netex_framework/netex_all_objects_framework.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_all_objects_framework-v1.0.xsd"/>
 	<!-- ====================================================================== -->
 	<!-- ====================================================================== -->
-	<xsd:include schemaLocation="netex_all_objects_part1_infrastructureFrame_contents.xsd"/>
-	<xsd:include schemaLocation="netex_all_objects_part1_lineRoute.xsd"/>
+	<xsd:include schemaLocation="netex_all_objects_part1_infrastructureFrame_contents-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_all_objects_part1_lineRoute-v1.0.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_support.xsd b/xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_support-v1.0.xsd
similarity index 97%
rename from xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_support.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_support-v1.0.xsd
index 7275d703b..1d2a5552b 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_support.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_support-v1.0.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_flexibleNetwork_support">
-	<xsd:include schemaLocation="netex_route_support.xsd"/>
-	<xsd:include schemaLocation="netex_line_support.xsd"/>
+	<xsd:include schemaLocation="netex_route_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_line_support-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_flexibleNetwork_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_flexibleNetwork_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_version-v1.1.xsd
similarity index 97%
rename from xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_version.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_version-v1.1.xsd
index 967937179..51afcac8a 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_version.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_version-v1.1.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_flexibleNetwork_version">
-	<xsd:include schemaLocation="netex_flexibleNetwork_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_utility_contact.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_notice_version.xsd"/>
-	<xsd:include schemaLocation="../part1_networkDescription/netex_route_version.xsd"/>
+	<xsd:include schemaLocation="netex_flexibleNetwork_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_utility_contact-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_notice_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_route_version-v1.1.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -13,10 +13,10 @@
 				</Date><Date><Modified>2017-06-11</Modified> Move Booking COntact to shared grou. No functional changep 	
 					
 </Date><Description><p>NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.</p><p>This sub-schema describes the FLEXIBLE NETWORK types.</p></Description><Format><MediaType>text/xml</MediaType><Syntax>http://www.w3.org/2001/XMLSchema</Syntax><Description>XML schema, W3C Recommendation 2001</Description></Format>&gt;
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_flexibleNetwork_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_flexibleNetwork_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
-				<Relation><Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires></Relation>
+				<Relation><Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires></Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
 				</Rights>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_support.xsd b/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_support-v1.1.xsd
similarity index 97%
rename from xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_support.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_support-v1.1.xsd
index 433540edb..413f10d35 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_support.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_support-v1.1.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_lineNetwork_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLink_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_section_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLink_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_section_support-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -30,11 +30,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_lineNetwork_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_lineNetwork_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version-v1.1.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version-v1.1.xsd
index 91547ea29..d46f40b1e 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version-v1.1.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_lineNetwork_version">
-	<xsd:include schemaLocation="netex_lineNetwork_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_section_version.xsd"/>
-	<xsd:include schemaLocation="../part1_networkDescription/netex_line_version.xsd"/>
+	<xsd:include schemaLocation="netex_lineNetwork_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_section_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_line_version-v1.1.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -32,11 +32,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_lineNetwork_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_lineNetwork_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_line_support.xsd b/xsd/netex_part_1/part1_networkDescription/netex_line_support-v1.1.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_networkDescription/netex_line_support.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_line_support-v1.1.xsd
index 4a1a32c1b..1dc6355ae 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_line_support.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_line_support-v1.1.xsd
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_line_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_grouping_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_grouping_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs"><Aggregation>main schema</Aggregation><Audience>e-service developers</Audience><Contributor>V1.0 Christophe Duquesne</Contributor><Contributor>Nicholas Knowles</Contributor><Coverage>Europe</Coverage><Creator>First drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles.  mailto:schemer@netex.org.uk</Creator><Date><Created>2010-09-04</Created></Date><Date><Modified>2011-02-05</Modified><!-- Name Space changes --></Date><Date><Modified>2017-07-03</Modified> CR025  add secodnary destination context enum
 														CR10 add type of Line 7 Type of Group Enums
 				</Date><Date><Modified>2017-06-28</Modified>CR014  Add GroupOfLinesType				</Date><Description><p>NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.</p><p>This sub-schema describes the LINE identifier  utility types.</p></Description><Format><MediaType>text/xml</MediaType><Syntax>http://www.w3.org/2001/XMLSchema</Syntax><Description>XML schema, W3C Recommendation 2001</Description></Format>&gt;
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_line_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_line_support-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
-				<Relation><Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires></Relation>
+				<Relation><Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires></Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
 				</Rights>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_line_version-v1.1.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_line_version-v1.1.xsd
index 1435690f2..01e1fa93f 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_line_version-v1.1.xsd
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_line_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_utility_types.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_submode_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_grouping_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_noticeAssignment_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_version.xsd"/>
-	<xsd:include schemaLocation="netex_line_support.xsd"/>
-	<xsd:include schemaLocation="netex_route_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_utility_types-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_submode_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_grouping_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_noticeAssignment_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_line_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_route_support-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -48,11 +48,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_line_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_line_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_support.xsd b/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_support-v1.0.xsd
similarity index 99%
rename from xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_support.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_support-v1.0.xsd
index 9ef9e92e0..26d6eb225 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_support.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_support-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_networkInfrastructure_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLink_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLink_support-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,11 +27,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_networkInfrastructure_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_networkInfrastructure_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_version-v1.0.xsd
similarity index 99%
rename from xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_version.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_version-v1.0.xsd
index 83d6582f4..88c0fb3ee 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_version.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_version-v1.0.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_networkInfrastructure_version">
-	<xsd:include schemaLocation="netex_networkInfrastructure_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd"/>
+	<xsd:include schemaLocation="netex_networkInfrastructure_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLink_version-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_networkInfrastructure_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_networkInfrastructure_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_support.xsd b/xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_support-v1.0.xsd
similarity index 97%
rename from xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_support.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_support-v1.0.xsd
index 483cb4d8f..395cdf957 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_support.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_support-v1.0.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_networkRestriction_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_vehicleType_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_networkRestriction_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_networkRestriction_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_version-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_version.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_version-v1.0.xsd
index caef5f5e1..da2d6c355 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_version.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_version-v1.0.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_networkRestriction_version">
-	<xsd:include schemaLocation="netex_networkInfrastructure_version.xsd"/>
-	<xsd:include schemaLocation="netex_networkRestriction_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version.xsd"/>
+	<xsd:include schemaLocation="netex_networkInfrastructure_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_networkRestriction_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,10 +27,10 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_networkRestriction_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_networkRestriction_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
-				<Relation><Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires> &gt;
+				<Relation><Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires> &gt;
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_support.xsd b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_support-v1.1.xsd
similarity index 96%
rename from xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_support.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_support-v1.1.xsd
index 7d6d1f0af..9a3519218 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_support.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_support-v1.1.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_route_support">
-	<xsd:include schemaLocation="netex_route_support.xsd"/>
+	<xsd:include schemaLocation="netex_route_support-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -26,11 +26,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_route_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_route_support-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version-v1.1.xsd
similarity index 97%
rename from xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version-v1.1.xsd
index cf911bfdd..1a05c5bef 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version-v1.1.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_route_version">
-	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_path_support.xsd"/>
-	<xsd:include schemaLocation="netex_routeInstruction_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_spatialFeature_version.xsd"/>
+	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_path_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_routeInstruction_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_spatialFeature_version-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -32,11 +32,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_route_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_route_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_route_support.xsd b/xsd/netex_part_1/part1_networkDescription/netex_route_support-v1.1.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_networkDescription/netex_route_support.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_route_support-v1.1.xsd
index 039c58a3c..396591fed 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_route_support.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_route_support-v1.1.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_route_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLink_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLink_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_route_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_route_support-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_route_version-v1.1.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_route_version-v1.1.xsd
index 6fff2fbf6..093446dbe 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_route_version-v1.1.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_route_version">
-	<xsd:include schemaLocation="netex_line_version.xsd"/>
-	<xsd:include schemaLocation="netex_routeInstruction_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version.xsd"/>
+	<xsd:include schemaLocation="netex_line_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_routeInstruction_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -33,11 +33,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_route_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_route_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_timingPattern_support.xsd b/xsd/netex_part_1/part1_networkDescription/netex_timingPattern_support-v1.1.xsd
similarity index 97%
rename from xsd/netex_part_1/part1_networkDescription/netex_timingPattern_support.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_timingPattern_support-v1.1.xsd
index 5b2dd0ca4..c37dcf354 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_timingPattern_support.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_timingPattern_support-v1.1.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_timingPattern_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd"/>
-	<xsd:include schemaLocation="netex_route_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_route_support-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -30,11 +30,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_timingPattern_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_timingPattern_support-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_support.xsd b/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_support.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_support-v1.0.xsd
index ee7582390..c38843cc6 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_support.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_support-v1.0.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_vehicleAndCrewPoint_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_address_support.xsd"/>
-	<xsd:include schemaLocation="netex_timingPattern_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_address_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_timingPattern_support-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_vehicleAndCrewPoint_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_vehicleAndCrewPoint_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_version-v1.1.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_version.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_version-v1.1.xsd
index 9a278c1f2..56e74fe45 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_version.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_version-v1.1.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_vehicleAndCrewPoint_version">
-	<xsd:include schemaLocation="netex_vehicleAndCrewPoint_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_address_version.xsd"/>
-	<xsd:include schemaLocation="../part1_tacticalPlanning/netex_timingPattern_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleAndCrewPoint_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_address_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../part1_tacticalPlanning/netex_timingPattern_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -32,11 +32,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_vehicleAndCrewPoint_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_vehicleAndCrewPoint_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_all_objects_part1_tacticalPlanning-v1.0.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_all_objects_part1_tacticalPlanning-v1.0.xsd
new file mode 100644
index 000000000..2ddf087b0
--- /dev/null
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_all_objects_part1_tacticalPlanning-v1.0.xsd
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
+<xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_part1_tacticalPlanning">
+	<!-- ===Dependencies ======================================= -->
+	<xsd:include schemaLocation="../../netex_framework/netex_all_objects_framework-v1.0.xsd"/>
+	<!-- ======================================================================= -->
+	<!-- ======================================================================= -->
+	<xsd:include schemaLocation="../part1_networkDescription/netex_all_objects_part1_networkDescription-v1.0.xsd"/>
+	<!-- ======================================================================= -->
+	<xsd:include schemaLocation="netex_commonSection_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_commonSection_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_fareZone_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_fareZone_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_journeyPattern_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_journeyPattern_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_journeyPatternTimings_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_journeyTiming_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_journeyTiming_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_passengerInformationEquipment_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_passengerInformationEquipment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_pathAssignment_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_routingConstraint_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_routingConstraint_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_servicePattern_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_servicePattern_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_siteConnection_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_siteConnection_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_stopAssignment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_stopAssignment_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_timeDemandType_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_timeDemandType_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_timingPattern_version-v1.1.xsd"/>
+</xsd:schema>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_all_objects_part1_tacticalPlanning.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_all_objects_part1_tacticalPlanning.xsd
deleted file mode 100644
index 0387d56bc..000000000
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_all_objects_part1_tacticalPlanning.xsd
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
-<xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_part1_tacticalPlanning">
-	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="../../netex_framework/netex_all_objects_framework.xsd"/>
-	<!-- ======================================================================= -->
-	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="../part1_networkDescription/netex_all_objects_part1_networkDescription.xsd"/>
-	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_commonSection_support.xsd"/>
-	<xsd:include schemaLocation="netex_commonSection_version.xsd"/>
-	<xsd:include schemaLocation="netex_fareZone_support.xsd"/>
-	<xsd:include schemaLocation="netex_fareZone_version.xsd"/>
-	<xsd:include schemaLocation="netex_journeyPattern_support.xsd"/>
-	<xsd:include schemaLocation="netex_journeyPattern_version.xsd"/>
-	<xsd:include schemaLocation="netex_journeyPatternTimings_version.xsd"/>
-	<xsd:include schemaLocation="netex_journeyTiming_support.xsd"/>
-	<xsd:include schemaLocation="netex_journeyTiming_version.xsd"/>
-	<xsd:include schemaLocation="netex_passengerInformationEquipment_version.xsd"/>
-	<xsd:include schemaLocation="netex_passengerInformationEquipment_support.xsd"/>
-	<xsd:include schemaLocation="netex_pathAssignment_version.xsd"/>
-	<xsd:include schemaLocation="netex_routingConstraint_support.xsd"/>
-	<xsd:include schemaLocation="netex_routingConstraint_version.xsd"/>
-	<xsd:include schemaLocation="netex_servicePattern_support.xsd"/>
-	<xsd:include schemaLocation="netex_servicePattern_version.xsd"/>
-	<xsd:include schemaLocation="netex_siteConnection_support.xsd"/>
-	<xsd:include schemaLocation="netex_siteConnection_version.xsd"/>
-	<xsd:include schemaLocation="netex_stopAssignment_support.xsd"/>
-	<xsd:include schemaLocation="netex_stopAssignment_version.xsd"/>
-	<xsd:include schemaLocation="netex_timeDemandType_support.xsd"/>
-	<xsd:include schemaLocation="netex_timeDemandType_version.xsd"/>
-	<xsd:include schemaLocation="netex_timingPattern_version.xsd"/>
-</xsd:schema>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_support-v1.1.xsd
similarity index 96%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_support.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_support-v1.1.xsd
index a85a21de0..0b1ce08dd 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_support.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_support-v1.1.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_commonSection_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_section_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_section_support-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -20,7 +20,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_commonSection_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_commonSection_support-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Steam Intellect, London N1 1JS</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_version-v1.1.xsd
similarity index 97%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_version.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_version-v1.1.xsd
index 1d3485223..a6e7987a1 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_version.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_version-v1.1.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_commonSection_version">
-	<xsd:include schemaLocation="netex_commonSection_support.xsd"/>
+	<xsd:include schemaLocation="netex_commonSection_support-v1.1.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_section_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_section_version-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -22,7 +22,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_commonSection_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_commonSection_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Steam Intellect, London N1 1JS</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_support-v1.1.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_support.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_support-v1.1.xsd
index 282141512..15c21f112 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_support.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_support-v1.1.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_fareZone_support">
-	<xsd:include schemaLocation="../part1_tacticalPlanning/netex_servicePattern_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_section_support.xsd"/>
+	<xsd:include schemaLocation="../part1_tacticalPlanning/netex_servicePattern_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_section_support-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -36,7 +36,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareZone_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareZone_support-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_version-v1.1.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_version.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_version-v1.1.xsd
index c5e494c10..14c65d9ee 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_version.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_version-v1.1.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_fareZone_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd"/>
-	<xsd:include schemaLocation="netex_fareZone_support.xsd"/>
-	<xsd:include schemaLocation="../part1_tacticalPlanning/netex_servicePattern_version.xsd"/>
-	<xsd:include schemaLocation="../part1_networkDescription/netex_route_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareZone_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../part1_tacticalPlanning/netex_servicePattern_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_route_version-v1.1.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareZone_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareZone_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>CEN SWG 9 , 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_support.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_support-v1.0.xsd
index cc8118172..28e9c4437 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_support.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_support-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_journeyPatternTimings_support">
-	<xsd:include schemaLocation="netex_journeyTiming_support.xsd"/>
+	<xsd:include schemaLocation="netex_journeyTiming_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyPatternTimings_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyPatternTimings_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_version-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_version.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_version-v1.0.xsd
index 7c762f24a..e386f84a0 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_version.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_version-v1.0.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_journeyPatternTimings_version">
-	<xsd:include schemaLocation="netex_journeyPattern_support.xsd"/>
-	<xsd:include schemaLocation="netex_journeyPatternTimings_support.xsd"/>
-	<xsd:include schemaLocation="netex_journeyTiming_version.xsd"/>
+	<xsd:include schemaLocation="netex_journeyPattern_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_journeyPatternTimings_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_journeyTiming_version-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -30,11 +30,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyPatternTimings_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyPatternTimings_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support-v1.0.xsd
index 68d490c34..365462186 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_journeyPattern_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support-v1.1.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyPattern_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyPattern_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_version-v1.1.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_version.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_version-v1.1.xsd
index efafc68a0..8f3c6e174 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_version.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_version-v1.1.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_journeyPattern_version">
-	<xsd:include schemaLocation="../part1_networkDescription/netex_line_support.xsd"/>
-	<xsd:include schemaLocation="netex_servicePattern_version.xsd"/>
-	<xsd:include schemaLocation="netex_journeyPatternTimings_version.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_line_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_servicePattern_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_journeyPatternTimings_version-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -32,11 +32,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyPattern_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyPattern_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support-v1.0.xsd
index fd8c3d68c..c871ab0d4 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_journeyTiming_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_relationship.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_relationship-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyTiming_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyTiming_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version-v1.0.xsd
similarity index 97%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version-v1.0.xsd
index 8fc16d430..9a24bfb6f 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version-v1.0.xsd
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_journeyTiming_version">
-	<xsd:include schemaLocation="netex_journeyTiming_support.xsd"/>
-	<xsd:include schemaLocation="netex_timeDemandType_support.xsd"/>
-	<xsd:include schemaLocation="../part1_networkDescription/netex_timingPattern_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_dayType_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_version.xsd"/>
+	<xsd:include schemaLocation="netex_journeyTiming_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_timeDemandType_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_timingPattern_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_dayType_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_version-v1.1.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -33,11 +33,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyTiming_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyTiming_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_support.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_support-v1.0.xsd
index 1d95e1cea..b83a44309 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_support.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_support-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_passengerInformationEquipment_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_passengerInformationEquipment_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_passengerInformationEquipment_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version-v1.0.xsd
index 961ed482d..27463b573 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version-v1.0.xsd
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_passengerInformationEquipment_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_support.xsd"/>
-	<xsd:include schemaLocation="../part1_networkDescription/netex_line_support.xsd"/>
-	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_stopPlace_support.xsd"/>
-	<xsd:include schemaLocation="../part1_networkDescription/netex_route_support.xsd"/>
-	<xsd:include schemaLocation="netex_passengerInformationEquipment_support.xsd"/>
-	<xsd:include schemaLocation="netex_servicePattern_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_line_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_stopPlace_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_route_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_passengerInformationEquipment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_servicePattern_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -35,7 +35,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_passengerInformationEquipment_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_passengerInformationEquipment_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_pathAssignment_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_pathAssignment_version-v1.0.xsd
similarity index 96%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_pathAssignment_version.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_pathAssignment_version-v1.0.xsd
index b41c1e061..df96ba70b 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_pathAssignment_version.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_pathAssignment_version-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_pathAssignment_version">
-	<xsd:include schemaLocation="netex_stopAssignment_version.xsd"/>
+	<xsd:include schemaLocation="netex_stopAssignment_version-v1.1.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_pathAssignment_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_pathAssignment_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support-v1.0.xsd
similarity index 97%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support-v1.0.xsd
index 4de0754bc..218e7062c 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_routingConstraint_support_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_place_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_place_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_routingConstraint_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_routingConstraint_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_version-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_version.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_version-v1.0.xsd
index 49be1e6c1..5e88520cd 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_version.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_version-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_routingConstraint_version">
-	<xsd:include schemaLocation="netex_routingConstraint_support.xsd"/>
-	<xsd:include schemaLocation="netex_servicePattern_version.xsd"/>
+	<xsd:include schemaLocation="netex_routingConstraint_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_servicePattern_version-v1.1.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_routingConstraint_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_routingConstraint_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support-v1.1.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support-v1.1.xsd
index 59c5d3466..370325ee4 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support-v1.1.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_servicePattern_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_place_support.xsd"/>
-	<xsd:include schemaLocation="../part1_networkDescription/netex_timingPattern_support.xsd"/>
-	<xsd:include schemaLocation="netex_journeyPattern_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_place_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_timingPattern_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_journeyPattern_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -35,11 +35,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_servicePattern_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_servicePattern_support-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version-v1.1.xsd
similarity index 99%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version-v1.1.xsd
index d2d060495..c7b23abe3 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version-v1.1.xsd
@@ -2,12 +2,12 @@
 <!-- edited with XMLSpy v2011 rel. 2 sp1 (x64) (http://www.altova.com) by Christophe Duquesne (Dryade) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_servicePattern_version">
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_servicePattern_support.xsd"/>
-	<xsd:include schemaLocation="../part1_tacticalPlanning/netex_fareZone_support.xsd"/>
-	<xsd:include schemaLocation="netex_journeyPattern_version.xsd"/>
-	<xsd:include schemaLocation="netex_timingPattern_version.xsd"/>
-	<xsd:include schemaLocation="netex_siteConnection_version.xsd"/>
-	<xsd:include schemaLocation="../part1_networkDescription/netex_flexibleNetwork_version.xsd"/>
+	<xsd:include schemaLocation="netex_servicePattern_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../part1_tacticalPlanning/netex_fareZone_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_journeyPattern_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_timingPattern_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_siteConnection_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_flexibleNetwork_version-v1.1.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -41,11 +41,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_servicePattern_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_servicePattern_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_support-v1.0.xsd
similarity index 96%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_support.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_support-v1.0.xsd
index dc561445e..34de849fc 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_support.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_support-v1.0.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_siteConnection_support">
-	<xsd:include schemaLocation="netex_servicePattern_support.xsd"/>
+	<xsd:include schemaLocation="netex_servicePattern_support-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -26,11 +26,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_siteConnection_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_siteConnection_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_version-v1.0.xsd
similarity index 97%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_version.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_version-v1.0.xsd
index 53049a3bf..d619db51e 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_version.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_version-v1.0.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_siteConnection_version">
-	<xsd:include schemaLocation="netex_siteConnection_support.xsd"/>
-	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_pointOfInterest_support.xsd"/>
-	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_parking_support.xsd"/>
-	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_stopPlace_support.xsd"/>
-	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_navigationPath_version.xsd"/>
+	<xsd:include schemaLocation="netex_siteConnection_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_pointOfInterest_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_parking_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_stopPlace_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_navigationPath_version-v1.1.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,11 +31,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_siteConnection_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_siteConnection_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support-v1.0.xsd
index 1854ec569..b1d66d817 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support-v1.0.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_stopAssignment_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -26,7 +26,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_stopAssignment_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_stopAssignment_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version-v1.1.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version-v1.1.xsd
index 92b20b492..685f12061 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version-v1.1.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_stopAssignment_version">
-	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_stopPlace_version.xsd"/>
-	<xsd:include schemaLocation="netex_stopAssignment_support.xsd"/>
-	<xsd:include schemaLocation="netex_servicePattern_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_trainElement_version.xsd"/>
+	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_stopPlace_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_stopAssignment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_servicePattern_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_trainElement_version-v1.1.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -33,7 +33,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_stopAssignment_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_stopAssignment_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_support-v1.0.xsd
similarity index 97%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_support.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_support-v1.0.xsd
index bca0f9454..7363a762a 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_support.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_support-v1.0.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_timeDemandType_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support.xsd"/>
-	<xsd:include schemaLocation="netex_journeyTiming_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_journeyTiming_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_timeDemandType_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_timeDemandType_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_version-v1.0.xsd
similarity index 97%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_version.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_version-v1.0.xsd
index 2ee348a50..b1c3fc16d 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_version.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_version-v1.0.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_timeDemandType_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version.xsd"/>
-	<xsd:include schemaLocation="netex_journeyTiming_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_vehicleType_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLink_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_journeyTiming_version-v1.0.xsd"/>
 	<!--CLOSE COUPLED WITH JOURNEY TIMINGS-->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,11 +31,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_timeDemandType_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_timeDemandType_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version-v1.1.xsd
similarity index 98%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version-v1.1.xsd
index cd238c892..1335824cf 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version-v1.1.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_timingPattern_version">
-	<xsd:include schemaLocation="../part1_networkDescription/netex_route_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_noticeAssignment_version.xsd"/>
-	<xsd:include schemaLocation="netex_journeyPatternTimings_version.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_route_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_noticeAssignment_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_journeyPatternTimings_version-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -33,11 +33,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_timingPattern_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_timingPattern_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_2/netex_all_frames_part2.xsd b/xsd/netex_part_2/netex_all_frames_part2-v1.0.xsd
similarity index 89%
rename from xsd/netex_part_2/netex_all_frames_part2.xsd
rename to xsd/netex_part_2/netex_all_frames_part2-v1.0.xsd
index 67103dd77..868e1527b 100644
--- a/xsd/netex_part_2/netex_all_frames_part2.xsd
+++ b/xsd/netex_part_2/netex_all_frames_part2-v1.0.xsd
@@ -2,10 +2,10 @@
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_frames_part2">
 	<!-- ===Dependencies ======================================= -->
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="part2_frames/netex_timetableFrame_version.xsd"/>
-	<xsd:include schemaLocation="part2_frames/netex_serviceFrame_version.xsd"/>
-	<xsd:include schemaLocation="part2_frames/netex_vehicleScheduleFrame_version.xsd"/>
-	<xsd:include schemaLocation="part2_frames/netex_driverScheduleFrame_version.xsd"/>
+	<xsd:include schemaLocation="part2_frames/netex_timetableFrame_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="part2_frames/netex_serviceFrame_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="part2_frames/netex_vehicleScheduleFrame_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="part2_frames/netex_driverScheduleFrame_version-v1.0.xsd"/>
 	<!-- ===eGIF/GovTalk Documentation ======================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -27,14 +27,14 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/}netex__all_frames_part.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/}netex__all_frames_part-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/xsd/part2/part2_frames/netex_timetableFrame_version.xsd</Requires>
-					<Requires>http://www.netex.org.uk/schemas/1.0/xsd/part2/part2_frames/netex_serviceFrame_version.xsd</Requires>
-					<Requires>http://www.netex.org.uk/schemas/1.0/xsd/part2/part2_frames/netex_vehicleScheduleFrame_version.xsd</Requires>
-					<Requires>http://www.netex.org.uk/schemas/1.0/xsd/part2/part2_frames/netex_driverScheduleFrame_version.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/xsd/part2/part2_frames/netex_timetableFrame_version-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/xsd/part2/part2_frames/netex_serviceFrame_version-v1.1.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/xsd/part2/part2_frames/netex_vehicleScheduleFrame_version-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/xsd/part2/part2_frames/netex_driverScheduleFrame_version-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/netex_all_objects_part2.xsd b/xsd/netex_part_2/netex_all_objects_part2-v1.0.xsd
similarity index 92%
rename from xsd/netex_part_2/netex_all_objects_part2.xsd
rename to xsd/netex_part_2/netex_all_objects_part2-v1.0.xsd
index a16c55993..692ff77b3 100644
--- a/xsd/netex_part_2/netex_all_objects_part2.xsd
+++ b/xsd/netex_part_2/netex_all_objects_part2-v1.0.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_part2">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="../netex_part_1/netex_all_objects_part1.xsd"/>
+	<xsd:include schemaLocation="../netex_part_1/netex_all_objects_part1-v1.0.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="part2_journeyTimes/netex_all_objects_part2_journeyTimes.xsd"/>
+	<xsd:include schemaLocation="part2_journeyTimes/netex_all_objects_part2_journeyTimes-v1.0.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="part2_vehicleService/netex_all_objects_part2_vehicleService.xsd"/>
+	<xsd:include schemaLocation="part2_vehicleService/netex_all_objects_part2_vehicleService-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -27,14 +27,14 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/}netex_all_objects_part2.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/}netex_all_objects_part2-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _all_devices.xsd</Requires>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _all_traffic_events.xsd</Requires>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _all_quantiseds.xsd</Requires>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _network.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _all_devices-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _all_traffic_events-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _all_quantiseds-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _network-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_frames/netex_driverScheduleFrame_version.xsd b/xsd/netex_part_2/part2_frames/netex_driverScheduleFrame_version-v1.0.xsd
similarity index 96%
rename from xsd/netex_part_2/part2_frames/netex_driverScheduleFrame_version.xsd
rename to xsd/netex_part_2/part2_frames/netex_driverScheduleFrame_version-v1.0.xsd
index a0be96d7a..be6699cb8 100644
--- a/xsd/netex_part_2/part2_frames/netex_driverScheduleFrame_version.xsd
+++ b/xsd/netex_part_2/part2_frames/netex_driverScheduleFrame_version-v1.0.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_driverScheduleFrame_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_commonFrame_version.xsd"/>
-	<xsd:include schemaLocation="../part2_journeyTimes/netex_serviceJourney_version.xsd"/>
-	<xsd:include schemaLocation="../part2_vehicleService/netex_duty_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_commonFrame_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../part2_journeyTimes/netex_serviceJourney_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../part2_vehicleService/netex_duty_version-v1.0.xsd"/>
 	<!-- ==== Production DriverSchedule Delivery =========================================-->
 	<xsd:element name="DriverScheduleFrame" substitutionGroup="CommonFrame">
 		<xsd:annotation>
diff --git a/xsd/netex_part_2/part2_frames/netex_serviceFrame_version.xsd b/xsd/netex_part_2/part2_frames/netex_serviceFrame_version-v1.1.xsd
similarity index 96%
rename from xsd/netex_part_2/part2_frames/netex_serviceFrame_version.xsd
rename to xsd/netex_part_2/part2_frames/netex_serviceFrame_version-v1.1.xsd
index e1e7e25f6..779412a07 100644
--- a/xsd/netex_part_2/part2_frames/netex_serviceFrame_version.xsd
+++ b/xsd/netex_part_2/part2_frames/netex_serviceFrame_version-v1.1.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_serviceFrame_version">
-	<xsd:include schemaLocation="../../netex_part_1/netex_all_objects_part1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_commonFrame_version.xsd"/>
-	<xsd:include schemaLocation="../netex_all_objects_part2.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/netex_all_objects_part1-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_commonFrame_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_all_objects_part2-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -24,7 +24,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_serviceFrame_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_serviceFrame_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_2/part2_frames/netex_timetableFrame_support.xsd b/xsd/netex_part_2/part2_frames/netex_timetableFrame_support-v1.0.xsd
similarity index 97%
rename from xsd/netex_part_2/part2_frames/netex_timetableFrame_support.xsd
rename to xsd/netex_part_2/part2_frames/netex_timetableFrame_support-v1.0.xsd
index d69e5147c..ca1a20d47 100644
--- a/xsd/netex_part_2/part2_frames/netex_timetableFrame_support.xsd
+++ b/xsd/netex_part_2/part2_frames/netex_timetableFrame_support-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_timetableFrame_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_versionFrame_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_versionFrame_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,11 +27,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_frames}netex_timetableFrame_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_frames}netex_timetableFrame_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd b/xsd/netex_part_2/part2_frames/netex_timetableFrame_version-v1.0.xsd
similarity index 97%
rename from xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd
rename to xsd/netex_part_2/part2_frames/netex_timetableFrame_version-v1.0.xsd
index b7f9253e4..df6a6f37a 100644
--- a/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd
+++ b/xsd/netex_part_2/part2_frames/netex_timetableFrame_version-v1.0.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_timetableFrame_version">
-	<xsd:include schemaLocation="netex_timetableFrame_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_trainElement_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_serviceCalendarFrame_version.xsd"/>
-	<xsd:include schemaLocation="../part2_journeyTimes/netex_datedVehicleJourney_version.xsd"/>
+	<xsd:include schemaLocation="netex_timetableFrame_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_trainElement_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_serviceCalendarFrame_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../part2_journeyTimes/netex_datedVehicleJourney_version-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -24,7 +24,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_timetableFrame_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_timetableFrame_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_2/part2_frames/netex_vehicleScheduleFrame_version.xsd b/xsd/netex_part_2/part2_frames/netex_vehicleScheduleFrame_version-v1.0.xsd
similarity index 94%
rename from xsd/netex_part_2/part2_frames/netex_vehicleScheduleFrame_version.xsd
rename to xsd/netex_part_2/part2_frames/netex_vehicleScheduleFrame_version-v1.0.xsd
index 9d62f90d2..928dfce22 100644
--- a/xsd/netex_part_2/part2_frames/netex_vehicleScheduleFrame_version.xsd
+++ b/xsd/netex_part_2/part2_frames/netex_vehicleScheduleFrame_version-v1.0.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_vehicleScheduleFrame_version">
-	<xsd:include schemaLocation="netex_timetableFrame_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_serviceCalendarFrame_version.xsd"/>
-	<xsd:include schemaLocation="../part2_journeyTimes/netex_serviceJourney_version.xsd"/>
-	<xsd:include schemaLocation="../part2_vehicleService/netex_vehicleService_version.xsd"/>
+	<xsd:include schemaLocation="netex_timetableFrame_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_serviceCalendarFrame_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../part2_journeyTimes/netex_serviceJourney_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../part2_vehicleService/netex_vehicleService_version-v1.1.xsd"/>
 	<!-- ==== Production VehicleSchedule Delivery =========================================-->
 	<xsd:element name="VehicleScheduleFrame" substitutionGroup="CommonFrame">
 		<xsd:annotation>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyTimes-v1.0.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyTimes-v1.0.xsd
new file mode 100644
index 000000000..a2886f57c
--- /dev/null
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyTimes-v1.0.xsd
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_part2_journeyTimes">
+	<!-- ===Dependencies ======================================= -->
+	<xsd:include schemaLocation="netex_call_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_call_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_coupledJourney_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_coupledJourney_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_flexibleService_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_flexibleService_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_interchange_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_passingTimes_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_passingTimes_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_datedPassingTimes_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_datedVehicleJourney_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_datedVehicleJourney_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_serviceJourney_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_serviceJourney_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_serviceView_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_timeDemandProfile_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_timeDemandTimes_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourney_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourneyTimes_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourneyTimes_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourneyFrequency_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourneyFrequency_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleService_support-v1.0.xsd"/>
+</xsd:schema>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyTimes.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyTimes.xsd
deleted file mode 100644
index a71a8eacc..000000000
--- a/xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyTimes.xsd
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_part2_journeyTimes">
-	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="netex_call_version.xsd"/>
-	<xsd:include schemaLocation="netex_call_support.xsd"/>
-	<xsd:include schemaLocation="netex_coupledJourney_support.xsd"/>
-	<xsd:include schemaLocation="netex_coupledJourney_version.xsd"/>
-	<xsd:include schemaLocation="netex_flexibleService_support.xsd"/>
-	<xsd:include schemaLocation="netex_flexibleService_version.xsd"/>
-	<xsd:include schemaLocation="netex_interchange_version.xsd"/>
-	<xsd:include schemaLocation="netex_passingTimes_version.xsd"/>
-	<xsd:include schemaLocation="netex_passingTimes_support.xsd"/>
-	<xsd:include schemaLocation="netex_datedPassingTimes_version.xsd"/>
-	<xsd:include schemaLocation="netex_datedVehicleJourney_support.xsd"/>
-	<xsd:include schemaLocation="netex_datedVehicleJourney_version.xsd"/>
-	<xsd:include schemaLocation="netex_serviceJourney_support.xsd"/>
-	<xsd:include schemaLocation="netex_serviceJourney_version.xsd"/>
-	<xsd:include schemaLocation="netex_serviceView_version.xsd"/>
-	<xsd:include schemaLocation="netex_timeDemandProfile_version.xsd"/>
-	<xsd:include schemaLocation="netex_timeDemandTimes_version.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourney_version.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourneyTimes_support.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourneyTimes_version.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourneyFrequency_support.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourneyFrequency_version.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleService_support.xsd"/>
-</xsd:schema>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_call_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_call_support-v1.0.xsd
similarity index 96%
rename from xsd/netex_part_2/part2_journeyTimes/netex_call_support.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_call_support-v1.0.xsd
index 0e65bb71d..dd4b82164 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_call_support.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_call_support-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_call_support">
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_call_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_call_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_call_version-v1.1.xsd
similarity index 97%
rename from xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_call_version-v1.1.xsd
index 67a139c42..a88b1db1e 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_call_version-v1.1.xsd
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_call_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd"/>
-	<xsd:include schemaLocation="netex_interchangeRule_version.xsd"/>
-	<xsd:include schemaLocation="netex_passingTimes_version.xsd"/>
-	<xsd:include schemaLocation="netex_call_support.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleService_support.xsd"/>
-	<xsd:include schemaLocation="netex_journeyDesignator_support.xsd"/>
-	<xsd:include schemaLocation="../part2_vehicleService/netex_duty_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_servicePattern_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_interchangeRule_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_passingTimes_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_call_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleService_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_journeyDesignator_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../part2_vehicleService/netex_duty_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -38,11 +38,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_call_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_call_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_support-v1.1.xsd
similarity index 98%
rename from xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_support.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_support-v1.1.xsd
index 1db22dd49..7c6b156e7 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_support.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_support-v1.1.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_coupledJourney_support">
-	<xsd:include schemaLocation="netex_vehicleJourney_support.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourney_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -30,11 +30,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_coupledJourney_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_coupledJourney_support-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version-v1.1.xsd
similarity index 98%
rename from xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version-v1.1.xsd
index f4b7b93c7..a6746413e 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version-v1.1.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_coupledJourney_version">
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleService_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_servicePattern_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleService_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -42,11 +42,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_coupledJourney_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_coupledJourney_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_datedPassingTimes_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_datedPassingTimes_version-v1.1.xsd
similarity index 98%
rename from xsd/netex_part_2/part2_journeyTimes/netex_datedPassingTimes_version.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_datedPassingTimes_version-v1.1.xsd
index f870ad762..2c5d302a4 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_datedPassingTimes_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_datedPassingTimes_version-v1.1.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_datedPassingTimes_version">
-	<xsd:include schemaLocation="netex_passingTimes_version.xsd"/>
+	<xsd:include schemaLocation="netex_passingTimes_version-v1.1.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -30,11 +30,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_datedPassingTimes_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_datedPassingTimes_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_support.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_support-v1.0.xsd
index 468fb5dd4..e4d11a155 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_support.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_support-v1.0.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_datedVehicleJourney_support">
-	<xsd:include schemaLocation="netex_serviceJourney_support.xsd"/>
+	<xsd:include schemaLocation="netex_serviceJourney_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -30,7 +30,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/2.0/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/2.0/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support-v1.1.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_version-v1.0.xsd
similarity index 97%
rename from xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_version.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_version-v1.0.xsd
index d03d16d29..a2af90946 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_version-v1.0.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_dateVehicleJourney_version">
-	<xsd:include schemaLocation="netex_datedVehicleJourney_support.xsd"/>
-	<xsd:include schemaLocation="netex_serviceJourney_version.xsd"/>
-	<xsd:include schemaLocation="netex_datedPassingTimes_version.xsd"/>
-	<xsd:include schemaLocation="netex_call_version.xsd"/>
+	<xsd:include schemaLocation="netex_datedVehicleJourney_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_serviceJourney_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_datedPassingTimes_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_call_version-v1.1.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,11 +31,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_datedVehcileJourney_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_datedVehcileJourney_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_support-v1.0.xsd
similarity index 97%
rename from xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_support.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_support-v1.0.xsd
index 29556c251..8370f1d90 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_support.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_support-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_flexibleService_support">
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_flexibleService_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_flexibleService_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_version-v1.0.xsd
similarity index 96%
rename from xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_version.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_version-v1.0.xsd
index 3cf8054a6..834b34411 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_version-v1.0.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2011 rel. 2 sp1 (x64) (http://www.altova.com) by Christophe Duquesne (Dryade) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_flexibleService_version">
-	<xsd:include schemaLocation="netex_flexibleService_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd"/>
-	<xsd:include schemaLocation="netex_serviceJourney_version.xsd"/>
+	<xsd:include schemaLocation="netex_flexibleService_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_serviceJourney_version-v1.1.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,11 +31,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_flexibleService_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_flexibleService_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_interchangeRule_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_interchangeRule_version-v1.1.xsd
similarity index 98%
rename from xsd/netex_part_2/part2_journeyTimes/netex_interchangeRule_version.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_interchangeRule_version-v1.1.xsd
index 1fe48d73e..c5a48c507 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_interchangeRule_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_interchangeRule_version-v1.1.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_interchangeRule_version">
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_journeyDesignator_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd"/>
-	<xsd:include schemaLocation="netex_interchange_version.xsd"/>
+	<xsd:include schemaLocation="netex_journeyDesignator_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_interchange_version-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -35,11 +35,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_interchangeRule_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_interchangeRule_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_interchange_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_interchange_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_2/part2_journeyTimes/netex_interchange_support.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_interchange_support-v1.0.xsd
index bf41a50c4..c150f7d08 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_interchange_support.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_interchange_support-v1.0.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_interchange_support">
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_timeDemandType_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_timeDemandType_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,11 +29,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_interchange_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_interchange_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version-v1.1.xsd
similarity index 98%
rename from xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_interchange_version-v1.1.xsd
index c3e86f974..ff744e92d 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version-v1.1.xsd
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_interchange_version">
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd"/>
-	<xsd:include schemaLocation="netex_interchange_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_noticeAssignment_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_place_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_line_version.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourneyFrequency_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_servicePattern_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_interchange_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_noticeAssignment_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_place_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_line_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourneyFrequency_version-v1.1.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -35,11 +35,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_interchange_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_interchange_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_support-v1.0.xsd
similarity index 96%
rename from xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_support.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_support-v1.0.xsd
index ff4fe5151..bbd610bbb 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_support.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_support-v1.0.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_journeyAccounting_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_relationship.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_relationship-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,11 +29,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyAccounting_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyAccounting_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/xsd//netex_framework/netex_responsibility/netex_relationship.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/xsd//netex_framework/netex_responsibility/netex_relationship-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_version-v1.0.xsd
similarity index 96%
rename from xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_version.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_version-v1.0.xsd
index 7b7e75371..b78317997 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_version-v1.0.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_journeyAccounting_version">
-	<xsd:include schemaLocation="netex_journeyAccounting_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_location_types.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version.xsd"/>
+	<xsd:include schemaLocation="netex_journeyAccounting_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_location_types-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,11 +29,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyAccounting_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyAccounting_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/xsd//netex_framework/netex_responsibility/netex_relationship.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/xsd//netex_framework/netex_responsibility/netex_relationship-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_journeyDesignator_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_journeyDesignator_support-v1.0.xsd
similarity index 95%
rename from xsd/netex_part_2/part2_journeyTimes/netex_journeyDesignator_support.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_journeyDesignator_support-v1.0.xsd
index a6d00e48d..3de07ce71 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_journeyDesignator_support.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_journeyDesignator_support-v1.0.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_journeyDesignator_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_dayType_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_line_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_route_support.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourney_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_dayType_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_line_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_route_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourney_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -30,11 +30,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyDesignator_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyDesignator_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/2.0/xsd/netex_framework/netex_reusableComponents/netex_dayType_support.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/2.0/xsd/netex_framework/netex_reusableComponents/netex_dayType_support-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_journey_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_journey_version-v1.1.xsd
similarity index 95%
rename from xsd/netex_part_2/part2_journeyTimes/netex_journey_version.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_journey_version-v1.1.xsd
index b8ed82488..f712bb28e 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_journey_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_journey_version-v1.1.xsd
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_journey_version">
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourney_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_noticeAssignment_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version.xsd"/>
-	<xsd:include schemaLocation="netex_journeyAccounting_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourney_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_noticeAssignment_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_journeyAccounting_version-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -35,7 +35,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journey_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journey_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>CEN SWG 9 , 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_support.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_support-v1.0.xsd
index 4deaf4cb2..cc0d3a72e 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_support.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_support-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_passingTimes_support">
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support-v1.0.xsd"/>
 	<!-- ==CLOSELY COUPLED ===================================================== -->
 	<!-- ======================================================================= -->
 	<xsd:annotation>
@@ -29,11 +29,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_passingTimes_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_passingTimes_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version-v1.1.xsd
similarity index 96%
rename from xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version-v1.1.xsd
index 09deab449..15d649c1d 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version-v1.1.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_passingTimes_version">
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourney_support.xsd"/>
-	<xsd:include schemaLocation="netex_passingTimes_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourney_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_passingTimes_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<!-- ==CLOSELY COUPLED ===================================================== -->
 	<xsd:annotation>
@@ -34,11 +34,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_passingTimes_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_passingTimes_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_support.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_support-v1.0.xsd
index d0f144589..5409322ab 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_support.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_support-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_serviceJourney_support">
-	<xsd:include schemaLocation="netex_vehicleJourney_support.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourney_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -31,7 +31,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/2.0/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/2.0/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support-v1.1.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_version-v1.1.xsd
similarity index 98%
rename from xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_version.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_version-v1.1.xsd
index 915fe0ad6..3f4502ffd 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_version-v1.1.xsd
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_serviceJourney_Version">
-	<xsd:include schemaLocation="netex_vehicleJourney_version.xsd"/>
-	<xsd:include schemaLocation="netex_flexibleService_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_serviceCalendar_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_flexibleNetwork_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd"/>
-	<xsd:include schemaLocation="netex_call_version.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourney_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_flexibleService_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_serviceCalendar_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_flexibleNetwork_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_call_version-v1.1.xsd"/>
 	<!-- ==CLOSELY COUPLED ===================================================== -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -39,11 +39,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_serviceJourney_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_serviceJourney_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_serviceView_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_serviceView_version-v1.0.xsd
similarity index 87%
rename from xsd/netex_part_2/part2_journeyTimes/netex_serviceView_version.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_serviceView_version-v1.0.xsd
index 17753160e..734b85756 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_serviceView_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_serviceView_version-v1.0.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_serviceView_version">
-	<xsd:include schemaLocation="netex_serviceJourney_version.xsd"/>
+	<xsd:include schemaLocation="netex_serviceJourney_version-v1.1.xsd"/>
 	<!-- ==== Production Timetable Delivery =========================================-->
 	<!-- ==== Call =========================================-->
 </xsd:schema>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_timeDemandProfile_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_timeDemandProfile_version-v1.0.xsd
similarity index 96%
rename from xsd/netex_part_2/part2_journeyTimes/netex_timeDemandProfile_version.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_timeDemandProfile_version-v1.0.xsd
index 6213eedf2..3b1d95261 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_timeDemandProfile_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_timeDemandProfile_version-v1.0.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_timeDemandProfile_version">
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_timeDemandType_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_version.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourney_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_timeDemandType_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourney_version-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -29,11 +29,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_timeDemandProfile_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_timeDemandProfile_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_timeDemandTimes_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_timeDemandTimes_version-v1.0.xsd
similarity index 97%
rename from xsd/netex_part_2/part2_journeyTimes/netex_timeDemandTimes_version.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_timeDemandTimes_version-v1.0.xsd
index 3dfaf6aae..10fddb6a4 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_timeDemandTimes_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_timeDemandTimes_version-v1.0.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_timeDemandTimes_version-v0.1.xsd">
-	<xsd:include schemaLocation="netex_serviceJourney_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_version.xsd"/>
+	<xsd:include schemaLocation="netex_serviceJourney_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_version-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,11 +29,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_timeDemandTimes_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_timeDemandTimes_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_support.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_support-v1.0.xsd
index 9c550b901..03a81ee95 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_support.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_support-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_vehicleJourneyFrequency_support">
-	<xsd:include schemaLocation="netex_serviceJourney_support.xsd"/>
+	<xsd:include schemaLocation="netex_serviceJourney_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -31,7 +31,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/2.0/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/2.0/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support-v1.1.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_version-v1.1.xsd
similarity index 98%
rename from xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_version.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_version-v1.1.xsd
index 051e4a963..d4d8f4531 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_version-v1.1.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_vehicleJourneyFrequency_version">
-	<xsd:include schemaLocation="netex_vehicleJourneyFrequency_support.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourneyTimes_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_grouping_version.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourneyFrequency_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourneyTimes_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_grouping_version-v1.1.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -35,11 +35,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_vehicleJourneyFrequency_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_vehicleJourneyFrequency_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_support.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_support-v1.0.xsd
index 5940aea94..deab020f9 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_support.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_support-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_vehicleJourneyTimes_support">
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -31,7 +31,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/2.0/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/2.0/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support-v1.1.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_version-v1.0.xsd
similarity index 96%
rename from xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_version.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_version-v1.0.xsd
index bf7dd4fd5..02e2724ae 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_version-v1.0.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_vehicleJourneyTimes_version">
-	<xsd:include schemaLocation="netex_vehicleJourney_support.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourneyTimes_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_dayType_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_timeDemandType_version.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourney_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourneyTimes_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_dayType_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_timeDemandType_version-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,11 +31,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_vehicleJourneyTimes_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_vehicleJourneyTimes_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_support.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_support-v1.0.xsd
index 32304c569..fb9e101a3 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_support.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_support-v1.0.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_vehicleJourney_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_servicePattern_support-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -32,7 +32,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/2.0/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/2.0/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support-v1.1.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version-v1.1.xsd
similarity index 97%
rename from xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version-v1.1.xsd
index f22e1b2b2..778eba89b 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version-v1.1.xsd
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_vehicleJourney_version">
-	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_route_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_line_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_vehicleStopping_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_trainElement_support.xsd"/>
-	<xsd:include schemaLocation="netex_journey_version.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourneyFrequency_version.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourneyTimes_version.xsd"/>
-	<xsd:include schemaLocation="netex_passingTimes_version.xsd"/>
-	<xsd:include schemaLocation="netex_coupledJourney_version.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourneyFrequency_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_route_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_line_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_vehicleStopping_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_trainElement_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_journey_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourneyFrequency_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourneyTimes_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_passingTimes_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_coupledJourney_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourneyFrequency_version-v1.1.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -43,11 +43,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_vehicleJourney_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_vehicleJourney_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleService_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleService_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_2/part2_journeyTimes/netex_vehicleService_support.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_vehicleService_support-v1.0.xsd
index 19b63ddaf..9d6813edc 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleService_support.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleService_support-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_vehicleService_support">
-	<xsd:include schemaLocation="netex_coupledJourney_support.xsd"/>
+	<xsd:include schemaLocation="netex_coupledJourney_support-v1.1.xsd"/>
 	<!-- ====BLOCK======================================================== -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_vehicleService_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_vehicleService_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_vehicleService/netex_all_objects_part2_vehicleService.xsd b/xsd/netex_part_2/part2_vehicleService/netex_all_objects_part2_vehicleService-v1.0.xsd
similarity index 87%
rename from xsd/netex_part_2/part2_vehicleService/netex_all_objects_part2_vehicleService.xsd
rename to xsd/netex_part_2/part2_vehicleService/netex_all_objects_part2_vehicleService-v1.0.xsd
index fd358704a..8c8f7566d 100644
--- a/xsd/netex_part_2/part2_vehicleService/netex_all_objects_part2_vehicleService.xsd
+++ b/xsd/netex_part_2/part2_vehicleService/netex_all_objects_part2_vehicleService-v1.0.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_part2_vehicleService">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="netex_duty_version.xsd"/>
-	<xsd:include schemaLocation="netex_duty_support.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleService_version.xsd"/>
+	<xsd:include schemaLocation="netex_duty_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_duty_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleService_version-v1.1.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -25,14 +25,14 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_vehicleService}netex_all_objects.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_vehicleService}netex_all_objects-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _all_devices.xsd</Requires>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _all_traffic_events.xsd</Requires>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _all_quantiseds.xsd</Requires>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _network.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _all_devices-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _all_traffic_events-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _all_quantiseds-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _network-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_vehicleService/netex_duty_support.xsd b/xsd/netex_part_2/part2_vehicleService/netex_duty_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_2/part2_vehicleService/netex_duty_support.xsd
rename to xsd/netex_part_2/part2_vehicleService/netex_duty_support-v1.0.xsd
index edefd4c99..0a5e61e89 100644
--- a/xsd/netex_part_2/part2_vehicleService/netex_duty_support.xsd
+++ b/xsd/netex_part_2/part2_vehicleService/netex_duty_support-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_duty_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_relationship.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_relationship-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,11 +27,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_vehicleService}netex_duty_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_vehicleService}netex_duty_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_vehicleService/netex_duty_version.xsd b/xsd/netex_part_2/part2_vehicleService/netex_duty_version-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_2/part2_vehicleService/netex_duty_version.xsd
rename to xsd/netex_part_2/part2_vehicleService/netex_duty_version-v1.0.xsd
index 30f0b228b..3fde17d8f 100644
--- a/xsd/netex_part_2/part2_vehicleService/netex_duty_version.xsd
+++ b/xsd/netex_part_2/part2_vehicleService/netex_duty_version-v1.0.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_duty_version">
-	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_timingPattern_support.xsd"/>
-	<xsd:include schemaLocation="../part2_frames/netex_timetableFrame_support.xsd"/>
-	<xsd:include schemaLocation="../part2_journeyTimes/netex_vehicleService_support.xsd"/>
-	<xsd:include schemaLocation="netex_duty_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_timingPattern_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../part2_frames/netex_timetableFrame_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../part2_journeyTimes/netex_vehicleService_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_duty_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -32,11 +32,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_vehicleService}netex_duty_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_vehicleService}netex_duty_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_vehicleService/netex_vehicleService_version.xsd b/xsd/netex_part_2/part2_vehicleService/netex_vehicleService_version-v1.1.xsd
similarity index 99%
rename from xsd/netex_part_2/part2_vehicleService/netex_vehicleService_version.xsd
rename to xsd/netex_part_2/part2_vehicleService/netex_vehicleService_version-v1.1.xsd
index f99750e1d..e85d19572 100644
--- a/xsd/netex_part_2/part2_vehicleService/netex_vehicleService_version.xsd
+++ b/xsd/netex_part_2/part2_vehicleService/netex_vehicleService_version-v1.1.xsd
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_vehicleService_version">
-	<xsd:include schemaLocation="../part2_journeyTimes/netex_vehicleService_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_line_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_support.xsd"/>
-	<xsd:include schemaLocation="../part2_journeyTimes/netex_journeyDesignator_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd"/>
-	<xsd:include schemaLocation="../part2_journeyTimes/netex_coupledJourney_version.xsd"/>
+	<xsd:include schemaLocation="../part2_journeyTimes/netex_vehicleService_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_line_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../part2_journeyTimes/netex_journeyDesignator_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_vehicleType_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../part2_journeyTimes/netex_coupledJourney_version-v1.1.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -35,11 +35,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_vehicleService}netex_vehicleService_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_vehicleService}netex_vehicleService_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_PiQuery/netex_all_objects_part3_piQuery.xsd b/xsd/netex_part_3/part3_PiQuery/netex_all_objects_part3_piQuery-v1.0.xsd
similarity index 87%
rename from xsd/netex_part_3/part3_PiQuery/netex_all_objects_part3_piQuery.xsd
rename to xsd/netex_part_3/part3_PiQuery/netex_all_objects_part3_piQuery-v1.0.xsd
index cb600ed51..742922035 100644
--- a/xsd/netex_part_3/part3_PiQuery/netex_all_objects_part3_piQuery.xsd
+++ b/xsd/netex_part_3/part3_PiQuery/netex_all_objects_part3_piQuery-v1.0.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_part3_piQuery">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="netex_piRequest_support.xsd"/>
+	<xsd:include schemaLocation="netex_piRequest_support-v1.1.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_part_3/part3_PiQuery/netex_piQuery_support.xsd b/xsd/netex_part_3/part3_PiQuery/netex_piQuery_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_PiQuery/netex_piQuery_support.xsd
rename to xsd/netex_part_3/part3_PiQuery/netex_piQuery_support-v1.0.xsd
index ed40e91f1..c06c0620b 100644
--- a/xsd/netex_part_3/part3_PiQuery/netex_piQuery_support.xsd
+++ b/xsd/netex_part_3/part3_PiQuery/netex_piQuery_support-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_piQuery_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_support-v1.1.xsd"/>
 	<!-- =============================================================== -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_piQuery_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_piQuery_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_PiQuery/netex_piRequest_support.xsd b/xsd/netex_part_3/part3_PiQuery/netex_piRequest_support-v1.1.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_PiQuery/netex_piRequest_support.xsd
rename to xsd/netex_part_3/part3_PiQuery/netex_piRequest_support-v1.1.xsd
index 240a6e550..17d2ea011 100644
--- a/xsd/netex_part_3/part3_PiQuery/netex_piRequest_support.xsd
+++ b/xsd/netex_part_3/part3_PiQuery/netex_piRequest_support-v1.1.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_piRequest_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_support-v1.1.xsd"/>
 	<!-- =============================================================== -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -30,11 +30,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_piRequest_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_piRequest_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_support.xsd b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_support-v1.0.xsd
similarity index 97%
rename from xsd/netex_part_3/part3_fares/netex_accessRightParameter_support.xsd
rename to xsd/netex_part_3/part3_fares/netex_accessRightParameter_support-v1.0.xsd
index 3d445fe4e..f75a2dc43 100644
--- a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_support-v1.0.xsd
@@ -2,8 +2,8 @@
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_accessRightParameter_support">
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_farePrice_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -29,11 +29,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_accessRightParameter_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_accessRightParameter_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version-v1.1.xsd
similarity index 95%
rename from xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd
rename to xsd/netex_part_3/part3_fares/netex_accessRightParameter_version-v1.1.xsd
index 5a32424a7..dee3f62e5 100644
--- a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version-v1.1.xsd
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_accessRightParameter_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_serviceCalendar_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_dayType_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_line_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_route_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_vehicleJourney_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_fareZone_support.xsd"/>
-	<xsd:include schemaLocation="netex_validableElement_support.xsd"/>
-	<xsd:include schemaLocation="netex_fareStructureElement_support.xsd"/>
-	<xsd:include schemaLocation="netex_qualityStructureFactor_support.xsd"/>
-	<xsd:include schemaLocation="netex_timeStructureFactor_support.xsd"/>
-	<xsd:include schemaLocation="netex_distanceMatrixElement_support.xsd"/>
-	<xsd:include schemaLocation="netex_usageParametersAll_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_serviceJourney_support.xsd"/>
-	<xsd:include schemaLocation="netex_fareProduct_support.xsd"/>
-	<xsd:include schemaLocation="netex_salesDistribution_support.xsd"/>
-	<xsd:include schemaLocation="netex_salesPackage_support.xsd"/>
-	<xsd:include schemaLocation="netex_travelDocument_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_serviceCalendar_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_dayType_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_site_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_line_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_servicePattern_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_route_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_vehicleJourney_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_fareZone_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_validableElement_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructureElement_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_qualityStructureFactor_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_timeStructureFactor_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_distanceMatrixElement_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParametersAll_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_serviceJourney_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareProduct_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_salesDistribution_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_salesPackage_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_travelDocument_support-v1.1.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_distanceMatrixElement_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_submode_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_version.xsd"/>
+	<xsd:include schemaLocation="netex_distanceMatrixElement_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_submode_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_version-v1.1.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_accessRightParameter_support.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameter_version.xsd"/>
+	<xsd:include schemaLocation="netex_accessRightParameter_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_version-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -67,11 +67,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_accessRightParameter_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_accessRightParameter_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares.xsd b/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares-v1.1.xsd
similarity index 65%
rename from xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares.xsd
rename to xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares-v1.1.xsd
index d271069b6..4eaa5636a 100644
--- a/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares-v1.1.xsd
@@ -2,8 +2,8 @@
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_all_objects_part3_fares">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="netex_all_objects_part3_fares_FP.xsd"/>
-	<xsd:include schemaLocation="netex_all_objects_part3_fares_FS.xsd"/>
-	<xsd:include schemaLocation="netex_all_objects_part3_fares_AR.xsd"/>
-	<xsd:include schemaLocation="netex_all_objects_part3_fares_SD.xsd"/>
+	<xsd:include schemaLocation="netex_all_objects_part3_fares_FP-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_all_objects_part3_fares_FS-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_all_objects_part3_fares_AR-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_all_objects_part3_fares_SD-v1.1.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_AR.xsd b/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_AR-v1.1.xsd
similarity index 73%
rename from xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_AR.xsd
rename to xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_AR-v1.1.xsd
index 3cd1f7343..4cc703937 100644
--- a/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_AR.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_AR-v1.1.xsd
@@ -2,27 +2,27 @@
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_all_objects_part3_fares_AR">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="netex_accessRightParameter_support.xsd"/>
-	<xsd:include schemaLocation="netex_accessRightParameter_version.xsd"/>
-	<xsd:include schemaLocation="netex_fareConditionSummary_support.xsd"/>
-	<xsd:include schemaLocation="netex_fareConditionSummary_version.xsd"/>
-	<xsd:include schemaLocation="netex_fareProduct_support.xsd"/>
-	<xsd:include schemaLocation="netex_fareProduct_version.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameter_support.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameter_version.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterAfterSales_support.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterAfterSales_version.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterBooking_support.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterBooking_version.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterCharging_support.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterCharging_version.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterEligibility_support.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterEligibility_version.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterEntitlement_support.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterEntitlement_version.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterLuggage_support.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterLuggage_version.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterTravel_support.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterTravel_version.xsd"/>
-	<xsd:include schemaLocation="netex_usageParametersAll_support.xsd"/>
+	<xsd:include schemaLocation="netex_accessRightParameter_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_accessRightParameter_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_fareConditionSummary_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareConditionSummary_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareProduct_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareProduct_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterAfterSales_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterAfterSales_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterBooking_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterBooking_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterCharging_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterCharging_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterEligibility_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterEligibility_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterEntitlement_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterEntitlement_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterLuggage_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterLuggage_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterTravel_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterTravel_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParametersAll_support-v1.0.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_FP.xsd b/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_FP-v1.1.xsd
similarity index 67%
rename from xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_FP.xsd
rename to xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_FP-v1.1.xsd
index 905ea00b5..06046306e 100644
--- a/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_FP.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_FP-v1.1.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_all_objects_part3_fares_FP">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="netex_calculationParameters_support.xsd"/>
-	<xsd:include schemaLocation="netex_calculationParameters_version.xsd"/>
-	<xsd:include schemaLocation="netex_farePrice_support.xsd"/>
-	<xsd:include schemaLocation="netex_farePrice_version.xsd"/>
-	<xsd:include schemaLocation="netex_fareTable_support.xsd"/>
-	<xsd:include schemaLocation="netex_fareTable_version.xsd"/>
+	<xsd:include schemaLocation="netex_calculationParameters_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_calculationParameters_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_fareTable_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareTable_version-v1.1.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_FS.xsd b/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_FS-v1.1.xsd
similarity index 61%
rename from xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_FS.xsd
rename to xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_FS-v1.1.xsd
index 1bc5f63ba..20a1c1715 100644
--- a/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_FS.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_FS-v1.1.xsd
@@ -2,20 +2,20 @@
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_all_objects_part3_fares_FS">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="netex_distanceMatrixElement_support.xsd"/>
-	<xsd:include schemaLocation="netex_distanceMatrixElement_version.xsd"/>
-	<xsd:include schemaLocation="netex_fareSeries_support.xsd"/>
-	<xsd:include schemaLocation="netex_fareSeries_version.xsd"/>
-	<xsd:include schemaLocation="netex_fareStructure_support.xsd"/>
-	<xsd:include schemaLocation="netex_fareStructure_version.xsd"/>
-	<xsd:include schemaLocation="netex_fareStructureElement_support.xsd"/>
-	<xsd:include schemaLocation="netex_fareStructureElement_version.xsd"/>
-	<xsd:include schemaLocation="netex_geographicStructureFactor_support.xsd"/>
-	<xsd:include schemaLocation="netex_geographicStructureFactor_version.xsd"/>
-	<xsd:include schemaLocation="netex_qualityStructureFactor_support.xsd"/>
-	<xsd:include schemaLocation="netex_qualityStructureFactor_version.xsd"/>
-	<xsd:include schemaLocation="netex_timeStructureFactor_version.xsd"/>
-	<xsd:include schemaLocation="netex_timeStructureFactor_support.xsd"/>
-	<xsd:include schemaLocation="netex_validableElement_support.xsd"/>
-	<xsd:include schemaLocation="netex_validableElement_version.xsd"/>
+	<xsd:include schemaLocation="netex_distanceMatrixElement_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_distanceMatrixElement_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_fareSeries_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareSeries_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructure_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructure_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructureElement_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructureElement_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_geographicStructureFactor_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_geographicStructureFactor_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_qualityStructureFactor_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_qualityStructureFactor_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_timeStructureFactor_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_timeStructureFactor_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_validableElement_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_validableElement_version-v1.0.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_SD.xsd b/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_SD-v1.1.xsd
similarity index 58%
rename from xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_SD.xsd
rename to xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_SD-v1.1.xsd
index 84045e723..5ef69f12e 100644
--- a/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_SD.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_SD-v1.1.xsd
@@ -2,10 +2,10 @@
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_all_objects_part3_fares_SD">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="netex_salesDistribution_support.xsd"/>
-	<xsd:include schemaLocation="netex_salesDistribution_version.xsd"/>
-	<xsd:include schemaLocation="netex_salesPackage_support.xsd"/>
-	<xsd:include schemaLocation="netex_salesPackage_version.xsd"/>
-	<xsd:include schemaLocation="netex_travelDocument_support.xsd"/>
-	<xsd:include schemaLocation="netex_travelDocument_version.xsd"/>
+	<xsd:include schemaLocation="netex_salesDistribution_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_salesDistribution_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_salesPackage_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_salesPackage_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_travelDocument_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_travelDocument_version-v1.1.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_part_3/part3_fares/netex_calculationParameters_support.xsd b/xsd/netex_part_3/part3_fares/netex_calculationParameters_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_fares/netex_calculationParameters_support.xsd
rename to xsd/netex_part_3/part3_fares/netex_calculationParameters_support-v1.0.xsd
index 0963c6dc0..d6fa15777 100644
--- a/xsd/netex_part_3/part3_fares/netex_calculationParameters_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_calculationParameters_support-v1.0.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_calculationParameters_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_dayType_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_relationship_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_dayType_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_relationship_support-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_calculationParameters_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_calculationParameters_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_calculationParameters_version.xsd b/xsd/netex_part_3/part3_fares/netex_calculationParameters_version-v1.0.xsd
similarity index 99%
rename from xsd/netex_part_3/part3_fares/netex_calculationParameters_version.xsd
rename to xsd/netex_part_3/part3_fares/netex_calculationParameters_version-v1.0.xsd
index 1e745dd8f..a1468444b 100644
--- a/xsd/netex_part_3/part3_fares/netex_calculationParameters_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_calculationParameters_version-v1.0.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_calculationParameters_version">
-	<xsd:include schemaLocation="netex_calculationParameters_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_dayType_version.xsd"/>
+	<xsd:include schemaLocation="netex_calculationParameters_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_dayType_version-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,11 +29,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_calculationParameters_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_calculationParameters_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_support.xsd b/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_support-v1.0.xsd
similarity index 97%
rename from xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_support.xsd
rename to xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_support-v1.0.xsd
index 622f4a852..868e77a72 100644
--- a/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_support-v1.0.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_distanceMatrixElement_support">
-	<xsd:include schemaLocation="netex_farePrice_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_linkByValue_support.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_linkByValue_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,11 +29,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_distanceMatrixElement_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_distanceMatrixElement_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version.xsd b/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version-v1.1.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version.xsd
rename to xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version-v1.1.xsd
index 775fc413c..bde85ceeb 100644
--- a/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version-v1.1.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.10" id="netex_distanceMatrixElement_version">
-	<xsd:include schemaLocation="netex_fareSeries_version.xsd"/>
-	<xsd:include schemaLocation="netex_fareTable_version.xsd"/>
-	<xsd:include schemaLocation="netex_geographicStructureFactor_version.xsd"/>
+	<xsd:include schemaLocation="netex_fareSeries_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareTable_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_geographicStructureFactor_version-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -32,11 +32,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_distanceMatrixElement_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_distanceMatrixElement_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_fareConditionSummary_support.xsd b/xsd/netex_part_3/part3_fares/netex_fareConditionSummary_support-v1.0.xsd
similarity index 97%
rename from xsd/netex_part_3/part3_fares/netex_fareConditionSummary_support.xsd
rename to xsd/netex_part_3/part3_fares/netex_fareConditionSummary_support-v1.0.xsd
index 90b6c3819..26a8df05b 100644
--- a/xsd/netex_part_3/part3_fares/netex_fareConditionSummary_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_fareConditionSummary_support-v1.0.xsd
@@ -27,11 +27,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareConditionSummary_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareConditionSummary_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_fareConditionSummary_version.xsd b/xsd/netex_part_3/part3_fares/netex_fareConditionSummary_version-v1.0.xsd
similarity index 99%
rename from xsd/netex_part_3/part3_fares/netex_fareConditionSummary_version.xsd
rename to xsd/netex_part_3/part3_fares/netex_fareConditionSummary_version-v1.0.xsd
index e58ea7ba2..0637d104f 100644
--- a/xsd/netex_part_3/part3_fares/netex_fareConditionSummary_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_fareConditionSummary_version-v1.0.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_fareConditionSummary_version">
-	<xsd:include schemaLocation="netex_fareConditionSummary_support.xsd"/>
-	<xsd:include schemaLocation="netex_fareStructureElement_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareConditionSummary_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructureElement_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,11 +29,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareConditionSummary_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareConditionSummary_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_farePrice_support.xsd b/xsd/netex_part_3/part3_fares/netex_farePrice_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_fares/netex_farePrice_support.xsd
rename to xsd/netex_part_3/part3_fares/netex_farePrice_support-v1.0.xsd
index 4ddba6b39..3d61aaade 100644
--- a/xsd/netex_part_3/part3_fares/netex_farePrice_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_farePrice_support-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_farePrice_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_grouping_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_grouping_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_farePrice_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_farePrice_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_farePrice_version.xsd b/xsd/netex_part_3/part3_fares/netex_farePrice_version-v1.1.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_fares/netex_farePrice_version.xsd
rename to xsd/netex_part_3/part3_fares/netex_farePrice_version-v1.1.xsd
index cd6d159f4..78291b747 100644
--- a/xsd/netex_part_3/part3_fares/netex_farePrice_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_farePrice_version-v1.1.xsd
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_farePrice_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_units.xsd"/>
-	<xsd:include schemaLocation="netex_fareTable_support.xsd"/>
-	<xsd:include schemaLocation="netex_farePrice_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_units-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareTable_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_alternativeName_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_noticeAssignment_version.xsd"/>
-	<xsd:include schemaLocation="netex_calculationParameters_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_alternativeName_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_noticeAssignment_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_calculationParameters_version-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -36,11 +36,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_farePrice_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_farePrice_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_fareProduct_support.xsd b/xsd/netex_part_3/part3_fares/netex_fareProduct_support-v1.0.xsd
similarity index 99%
rename from xsd/netex_part_3/part3_fares/netex_fareProduct_support.xsd
rename to xsd/netex_part_3/part3_fares/netex_fareProduct_support-v1.0.xsd
index dd7514150..053e27a1c 100644
--- a/xsd/netex_part_3/part3_fares/netex_fareProduct_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_fareProduct_support-v1.0.xsd
@@ -2,7 +2,7 @@
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_fareProduct_support">
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_fareStructure_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructure_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareProduct_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareProduct_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd b/xsd/netex_part_3/part3_fares/netex_fareProduct_version-v1.1.xsd
similarity index 99%
rename from xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd
rename to xsd/netex_part_3/part3_fares/netex_fareProduct_version-v1.1.xsd
index c48e29656..dbd5278c2 100644
--- a/xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_fareProduct_version-v1.1.xsd
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_fareProduct_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_units.xsd"/>
-	<xsd:include schemaLocation="netex_fareProduct_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_otherOrganisation_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_units-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareProduct_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_otherOrganisation_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_validableElement_version.xsd"/>
-	<xsd:include schemaLocation="netex_fareConditionSummary_version.xsd"/>
+	<xsd:include schemaLocation="netex_validableElement_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareConditionSummary_version-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -36,11 +36,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareProduct_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareProduct_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_fareSeries_support.xsd b/xsd/netex_part_3/part3_fares/netex_fareSeries_support-v1.0.xsd
similarity index 97%
rename from xsd/netex_part_3/part3_fares/netex_fareSeries_support.xsd
rename to xsd/netex_part_3/part3_fares/netex_fareSeries_support-v1.0.xsd
index 7c8e631a6..fe36f7520 100644
--- a/xsd/netex_part_3/part3_fares/netex_fareSeries_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_fareSeries_support-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_fareSeries_support">
-	<xsd:include schemaLocation="netex_farePrice_support.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_support-v1.0.xsd"/>
 	<!-- ======================================================== -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_seriesConstraint_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_seriesConstraint_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_fareSeries_version.xsd b/xsd/netex_part_3/part3_fares/netex_fareSeries_version-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_fares/netex_fareSeries_version.xsd
rename to xsd/netex_part_3/part3_fares/netex_fareSeries_version-v1.0.xsd
index 846f2981e..be0eb8c18 100644
--- a/xsd/netex_part_3/part3_fares/netex_fareSeries_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_fareSeries_version-v1.0.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_fareStructure_version">
-	<xsd:include schemaLocation="netex_fareSeries_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_fareZone_version.xsd"/>
-	<xsd:include schemaLocation="netex_farePrice_version.xsd"/>
+	<xsd:include schemaLocation="netex_fareSeries_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_fareZone_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_version-v1.1.xsd"/>
 	<!-- ======================================================== -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -30,11 +30,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_seriesConstraint_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_seriesConstraint_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_fareStructureElement_support.xsd b/xsd/netex_part_3/part3_fares/netex_fareStructureElement_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_fares/netex_fareStructureElement_support.xsd
rename to xsd/netex_part_3/part3_fares/netex_fareStructureElement_support-v1.0.xsd
index 5aa7c1367..d07640632 100644
--- a/xsd/netex_part_3/part3_fares/netex_fareStructureElement_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_fareStructureElement_support-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_fareStuctureElement_support">
-	<xsd:include schemaLocation="netex_fareStructure_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructure_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,11 +27,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareStructureElement_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareStructureElement_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_fareStructureElement_version.xsd b/xsd/netex_part_3/part3_fares/netex_fareStructureElement_version-v1.1.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_fares/netex_fareStructureElement_version.xsd
rename to xsd/netex_part_3/part3_fares/netex_fareStructureElement_version-v1.1.xsd
index dbe539f45..c7145de53 100644
--- a/xsd/netex_part_3/part3_fares/netex_fareStructureElement_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_fareStructureElement_version-v1.1.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_fareStructureElement_version">
-	<xsd:include schemaLocation="netex_fareStructureElement_support.xsd"/>
-	<xsd:include schemaLocation="netex_validableElement_version.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructureElement_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_validableElement_version-v1.0.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_timeStructureFactor_version.xsd"/>
-	<xsd:include schemaLocation="netex_distanceMatrixElement_version.xsd"/>
+	<xsd:include schemaLocation="netex_timeStructureFactor_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_distanceMatrixElement_version-v1.1.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -35,11 +35,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareStructureElement_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareStructureElement_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_fareStructure_support.xsd b/xsd/netex_part_3/part3_fares/netex_fareStructure_support-v1.0.xsd
similarity index 97%
rename from xsd/netex_part_3/part3_fares/netex_fareStructure_support.xsd
rename to xsd/netex_part_3/part3_fares/netex_fareStructure_support-v1.0.xsd
index 9d51388df..d844a70c5 100644
--- a/xsd/netex_part_3/part3_fares/netex_fareStructure_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_fareStructure_support-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_fareStructure_support">
-	<xsd:include schemaLocation="netex_farePrice_support.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_support-v1.0.xsd"/>
 	<!-- =============================================================-->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareStructure_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareStructure_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_fareStructure_version.xsd b/xsd/netex_part_3/part3_fares/netex_fareStructure_version-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_fares/netex_fareStructure_version.xsd
rename to xsd/netex_part_3/part3_fares/netex_fareStructure_version-v1.0.xsd
index 827ef16a6..aece0cb95 100644
--- a/xsd/netex_part_3/part3_fares/netex_fareStructure_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_fareStructure_version-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_fareStructure_version">
-	<xsd:include schemaLocation="netex_fareStructure_support.xsd"/>
-	<xsd:include schemaLocation="netex_farePrice_version.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructure_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_version-v1.1.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareStructure_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareStructure_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_fareTable_support.xsd b/xsd/netex_part_3/part3_fares/netex_fareTable_support-v1.0.xsd
similarity index 97%
rename from xsd/netex_part_3/part3_fares/netex_fareTable_support.xsd
rename to xsd/netex_part_3/part3_fares/netex_fareTable_support-v1.0.xsd
index 0bfc03b84..955be37dd 100644
--- a/xsd/netex_part_3/part3_fares/netex_fareTable_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_fareTable_support-v1.0.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_fareTable_support">
-	<xsd:include schemaLocation="netex_farePrice_support.xsd"/>
-	<xsd:include schemaLocation="netex_fareProduct_support.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareProduct_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareTable_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareTable_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_fareTable_version.xsd b/xsd/netex_part_3/part3_fares/netex_fareTable_version-v1.1.xsd
similarity index 96%
rename from xsd/netex_part_3/part3_fares/netex_fareTable_version.xsd
rename to xsd/netex_part_3/part3_fares/netex_fareTable_version-v1.1.xsd
index 48a4d697e..79fea7715 100644
--- a/xsd/netex_part_3/part3_fares/netex_fareTable_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_fareTable_version-v1.1.xsd
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_fareTable_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_submode_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_line_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_fareZone_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_serviceJourney_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_vehicleJourney_support.xsd"/>
-	<xsd:include schemaLocation="netex_fareTable_support.xsd"/>
-	<xsd:include schemaLocation="netex_fareSeries_support.xsd"/>
-	<xsd:include schemaLocation="netex_travelDocument_support.xsd"/>
-	<xsd:include schemaLocation="netex_salesDistribution_support.xsd"/>
-	<xsd:include schemaLocation="netex_fareStructureElement_support.xsd"/>
-	<xsd:include schemaLocation="netex_distanceMatrixElement_support.xsd"/>
-	<xsd:include schemaLocation="netex_salesPackage_support.xsd"/>
-	<xsd:include schemaLocation="netex_fareSeries_support.xsd"/>
-	<xsd:include schemaLocation="netex_usageParametersAll_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_submode_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_line_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_site_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_fareZone_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_serviceJourney_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_vehicleJourney_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareTable_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareSeries_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_travelDocument_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_salesDistribution_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructureElement_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_distanceMatrixElement_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_salesPackage_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareSeries_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParametersAll_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_farePrice_version.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_version-v1.1.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -51,11 +51,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareTable_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareTable_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_support.xsd b/xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_support.xsd
rename to xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_support-v1.0.xsd
index 98de090ac..e9162103c 100644
--- a/xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_support-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_geographicStructureFactor_support">
-	<xsd:include schemaLocation="netex_fareStructure_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructure_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,11 +27,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_geographicalStructureFactor_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_geographicalStructureFactor_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_version.xsd b/xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_version-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_version.xsd
rename to xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_version-v1.0.xsd
index 9ae565c79..9e5df9ed4 100644
--- a/xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_version-v1.0.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_geographicStructureFactor_version">
-	<xsd:include schemaLocation="netex_geographicStructureFactor_support.xsd"/>
-	<xsd:include schemaLocation="netex_distanceMatrixElement_support.xsd"/>
-	<xsd:include schemaLocation="netex_fareStructureElement_support.xsd"/>
+	<xsd:include schemaLocation="netex_geographicStructureFactor_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_distanceMatrixElement_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructureElement_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_farePrice_version.xsd"/>
-	<xsd:include schemaLocation="netex_fareStructure_version.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructure_version-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -32,11 +32,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_geographicalStructureFactor_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_geographicalStructureFactor_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_support.xsd b/xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_support.xsd
rename to xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_support-v1.0.xsd
index 672cf195b..ddd6e0f61 100644
--- a/xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_support-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_qualityStructureFactor_support">
-	<xsd:include schemaLocation="netex_fareStructure_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructure_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,11 +27,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_qualityStructureFactor_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_qualityStructureFactor_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_version.xsd b/xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_version-v1.0.xsd
similarity index 97%
rename from xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_version.xsd
rename to xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_version-v1.0.xsd
index 4539e7010..c380f3722 100644
--- a/xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_version-v1.0.xsd
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_qualityStructureFactor_version">
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_timeDemandType_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd"/>
-	<xsd:include schemaLocation="netex_qualityStructureFactor_support.xsd"/>
-	<xsd:include schemaLocation="netex_distanceMatrixElement_support.xsd"/>
-	<xsd:include schemaLocation="netex_fareStructure_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_timeDemandType_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_servicePattern_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_qualityStructureFactor_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_distanceMatrixElement_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructure_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_fareStructure_version.xsd"/>
-	<xsd:include schemaLocation="netex_farePrice_version.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructure_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_version-v1.1.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -34,11 +34,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_qualityStructureFactor_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_qualityStructureFactor_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_salesDistribution_support.xsd b/xsd/netex_part_3/part3_fares/netex_salesDistribution_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_fares/netex_salesDistribution_support.xsd
rename to xsd/netex_part_3/part3_fares/netex_salesDistribution_support-v1.0.xsd
index 12e29a69b..5922db8c6 100644
--- a/xsd/netex_part_3/part3_fares/netex_salesDistribution_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_salesDistribution_support-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_salesDistribution_support">
-	<xsd:include schemaLocation="netex_farePrice_support.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,11 +27,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_salesDistribution_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_salesDistribution_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_salesDistribution_version.xsd b/xsd/netex_part_3/part3_fares/netex_salesDistribution_version-v1.0.xsd
similarity index 97%
rename from xsd/netex_part_3/part3_fares/netex_salesDistribution_version.xsd
rename to xsd/netex_part_3/part3_fares/netex_salesDistribution_version-v1.0.xsd
index 100e45b83..2e1b5c23b 100644
--- a/xsd/netex_part_3/part3_fares/netex_salesDistribution_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_salesDistribution_version-v1.0.xsd
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_salesDistribution_version">
-	<xsd:include schemaLocation="netex_salesDistribution_support.xsd"/>
-	<xsd:include schemaLocation="netex_travelDocument_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_typeOfValue_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_country_support.xsd"/>
+	<xsd:include schemaLocation="netex_salesDistribution_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_travelDocument_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_typeOfValue_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_country_support-v1.1.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd"/>
-	<xsd:include schemaLocation="netex_farePrice_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_version-v1.1.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -34,11 +34,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_salesDistribution_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_salesDistribution_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_salesPackage_support.xsd b/xsd/netex_part_3/part3_fares/netex_salesPackage_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_fares/netex_salesPackage_support.xsd
rename to xsd/netex_part_3/part3_fares/netex_salesPackage_support-v1.0.xsd
index cf3aec9ad..a49cd7714 100644
--- a/xsd/netex_part_3/part3_fares/netex_salesPackage_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_salesPackage_support-v1.0.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_salesPackage_support">
-	<xsd:include schemaLocation="netex_fareProduct_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_notice_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareProduct_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_notice_support-v1.0.xsd"/>
 	<!-- =============================================================== -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,11 +29,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_salesPackage_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_salesPackage_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_salesPackage_version.xsd b/xsd/netex_part_3/part3_fares/netex_salesPackage_version-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_fares/netex_salesPackage_version.xsd
rename to xsd/netex_part_3/part3_fares/netex_salesPackage_version-v1.0.xsd
index 3a1c3a0df..7689b5647 100644
--- a/xsd/netex_part_3/part3_fares/netex_salesPackage_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_salesPackage_version-v1.0.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_salesPackage_version">
-	<xsd:include schemaLocation="netex_salesPackage_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_topographicPlace_support.xsd"/>
+	<xsd:include schemaLocation="netex_salesPackage_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_topographicPlace_support-v1.1.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_salesDistribution_version.xsd"/>
-	<xsd:include schemaLocation="netex_fareProduct_version.xsd"/>
+	<xsd:include schemaLocation="netex_salesDistribution_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareProduct_version-v1.1.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -32,11 +32,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_salesPackage_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_salesPackage_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_timeStructureFactor_support.xsd b/xsd/netex_part_3/part3_fares/netex_timeStructureFactor_support-v1.0.xsd
similarity index 97%
rename from xsd/netex_part_3/part3_fares/netex_timeStructureFactor_support.xsd
rename to xsd/netex_part_3/part3_fares/netex_timeStructureFactor_support-v1.0.xsd
index 5bbfc0397..7e00fe439 100644
--- a/xsd/netex_part_3/part3_fares/netex_timeStructureFactor_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_timeStructureFactor_support-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_timeStuctureFactor_support">
-	<xsd:include schemaLocation="netex_fareStructure_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructure_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,11 +27,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_timeStructureFactor_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_timeStructureFactor_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_timeStructureFactor_version.xsd b/xsd/netex_part_3/part3_fares/netex_timeStructureFactor_version-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_fares/netex_timeStructureFactor_version.xsd
rename to xsd/netex_part_3/part3_fares/netex_timeStructureFactor_version-v1.0.xsd
index 1fe9975b7..656cb48d0 100644
--- a/xsd/netex_part_3/part3_fares/netex_timeStructureFactor_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_timeStructureFactor_version-v1.0.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_timeStuctureFactor_version">
-	<xsd:include schemaLocation="netex_timeStructureFactor_support.xsd"/>
-	<xsd:include schemaLocation="netex_fareStructure_support.xsd"/>
-	<xsd:include schemaLocation="netex_fareStructureElement_support.xsd"/>
-	<xsd:include schemaLocation="netex_qualityStructureFactor_version.xsd"/>
+	<xsd:include schemaLocation="netex_timeStructureFactor_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructure_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructureElement_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_qualityStructureFactor_version-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -30,11 +30,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_timeStructureFactor_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_timeStructureFactor_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_travelDocument_support.xsd b/xsd/netex_part_3/part3_fares/netex_travelDocument_support-v1.1.xsd
similarity index 97%
rename from xsd/netex_part_3/part3_fares/netex_travelDocument_support.xsd
rename to xsd/netex_part_3/part3_fares/netex_travelDocument_support-v1.1.xsd
index 5f7d35f25..a6b4718b1 100644
--- a/xsd/netex_part_3/part3_fares/netex_travelDocument_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_travelDocument_support-v1.1.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_travelDocument_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_securityList_support.xsd"/>
-	<xsd:include schemaLocation="netex_fareProduct_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_securityList_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_fareProduct_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -30,11 +30,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_travelDocument_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_travelDocument_support-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_travelDocument_version.xsd b/xsd/netex_part_3/part3_fares/netex_travelDocument_version-v1.1.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_fares/netex_travelDocument_version.xsd
rename to xsd/netex_part_3/part3_fares/netex_travelDocument_version-v1.1.xsd
index e6f2b983c..a1b96a0f1 100644
--- a/xsd/netex_part_3/part3_fares/netex_travelDocument_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_travelDocument_version-v1.1.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_travelDocument_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_alternativeName_version.xsd"/>
-	<xsd:include schemaLocation="netex_travelDocument_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_securityList_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_alternativeName_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_travelDocument_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_securityList_version-v1.1.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -32,11 +32,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_travelDocument_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_travelDocument_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_support.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_support.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_support-v1.0.xsd
index 9fcf2281f..0187bd45a 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_support-v1.0.xsd
@@ -2,7 +2,7 @@
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_usageParameterAfterSales_support">
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_usageParameter_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterAfterSales_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterAfterSales_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version-v1.0.xsd
index 777670187..b3ad2678a 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version-v1.0.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_usageParameterAfterSales_version">
-	<xsd:include schemaLocation="netex_usageParameterAfterSales_support.xsd"/>
-	<xsd:include schemaLocation="netex_timeStructureFactor_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_version.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameter_version.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterAfterSales_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_timeStructureFactor_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_version-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,11 +31,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterAfterSales_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterAfterSales_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterBooking_support.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterBooking_support-v1.0.xsd
similarity index 97%
rename from xsd/netex_part_3/part3_fares/netex_usageParameterBooking_support.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameterBooking_support-v1.0.xsd
index 06fec3bd7..5121dd405 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameterBooking_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameterBooking_support-v1.0.xsd
@@ -2,7 +2,7 @@
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_usageParameterBooking_support">
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_usageParameter_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_support-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterBooking_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterBooking_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterBooking_version.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterBooking_version-v1.0.xsd
similarity index 97%
rename from xsd/netex_part_3/part3_fares/netex_usageParameterBooking_version.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameterBooking_version-v1.0.xsd
index 545972c15..1b1f5e50c 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameterBooking_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameterBooking_version-v1.0.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_usageParameterBooking_version">
-	<xsd:include schemaLocation="netex_usageParameterBooking_support.xsd"/>
-	<xsd:include schemaLocation="netex_timeStructureFactor_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_version.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameter_version.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterBooking_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_timeStructureFactor_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_version-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,11 +31,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterBooking_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterBooking_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterCharging_support.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterCharging_support-v1.0.xsd
similarity index 97%
rename from xsd/netex_part_3/part3_fares/netex_usageParameterCharging_support.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameterCharging_support-v1.0.xsd
index e583f2146..80e3c1d2a 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameterCharging_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameterCharging_support-v1.0.xsd
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterCharging_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterCharging_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
@@ -59,7 +59,7 @@ Rail transport, Roads and Road transport
 		</xsd:appinfo>
 		<xsd:documentation>NeTEX: Charging USAGE PARAMETER identifier types.</xsd:documentation>
 	</xsd:annotation>
-	<xsd:include schemaLocation="netex_usageParameter_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_support-v1.0.xsd"/>
 	<!-- === CHARGING POLICY PARAMETER============================================== -->
 	<xsd:simpleType name="ChargingPolicyIdType">
 		<xsd:annotation>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterCharging_version.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterCharging_version-v1.0.xsd
similarity index 97%
rename from xsd/netex_part_3/part3_fares/netex_usageParameterCharging_version.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameterCharging_version-v1.0.xsd
index 4fb5e21f4..14eb32c28 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameterCharging_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameterCharging_version-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_usageParameterCharging_version">
-	<xsd:include schemaLocation="netex_usageParameterCharging_support.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameter_version.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterCharging_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_version-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,7 +28,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterCharging_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterCharging_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_support.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_support.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_support-v1.0.xsd
index 31285f8ca..f2c0cf326 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_support-v1.0.xsd
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterEligibility_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterEligibility_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
@@ -59,7 +59,7 @@ Rail transport, Roads and Road transport
 		</xsd:appinfo>
 		<xsd:documentation>NeTEX: Eligibility USAGE PARAMETER identifier types.</xsd:documentation>
 	</xsd:annotation>
-	<xsd:include schemaLocation="netex_usageParameter_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_support-v1.0.xsd"/>
 	<xsd:group name="ProfileRefsGroup">
 		<xsd:annotation>
 			<xsd:documentation>Elements for Profile types.</xsd:documentation>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_version.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_version-v1.0.xsd
similarity index 99%
rename from xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_version.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_version-v1.0.xsd
index eec52af8d..62902d71f 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_version-v1.0.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_usageParameterEligibility_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_topographicPlace_support.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterEligibility_support.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameter_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_topographicPlace_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterEligibility_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_version-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -30,7 +30,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterEligibility_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterEligibility_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_support.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_support-v1.0.xsd
similarity index 97%
rename from xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_support.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_support-v1.0.xsd
index ed94cbe6a..b059251f4 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_support-v1.0.xsd
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterEntitlement_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterEntitlement_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
@@ -59,7 +59,7 @@ Rail transport, Roads and Road transport
 		</xsd:appinfo>
 		<xsd:documentation>NeTEX: Entitlement USAGE PARAMETER identifier types.</xsd:documentation>
 	</xsd:annotation>
-	<xsd:include schemaLocation="netex_usageParameter_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_support-v1.0.xsd"/>
 	<!-- === ENTTITLEMENT REQUIRED PARAMETER======================================= -->
 	<xsd:complexType name="entitlementRequiredRefs_RelStructure">
 		<xsd:annotation>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_version.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_version-v1.0.xsd
similarity index 97%
rename from xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_version.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_version-v1.0.xsd
index ddcbca437..002c1ea91 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_version-v1.0.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_usageParameterEntitlement_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_topographicPlace_support.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterEntitlement_support.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameter_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_topographicPlace_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterEntitlement_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_version-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -30,7 +30,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterBooking_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterBooking_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_support.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_support-v1.0.xsd
similarity index 97%
rename from xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_support.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_support-v1.0.xsd
index 889a891d6..1980a16ab 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_support-v1.0.xsd
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterLuggage_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterLuggage_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
@@ -59,7 +59,7 @@ Rail transport, Roads and Road transport
 		</xsd:appinfo>
 		<xsd:documentation>NeTEX: Luggage USAGE PARAMETER identifier types.</xsd:documentation>
 	</xsd:annotation>
-	<xsd:include schemaLocation="netex_usageParameter_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_support-v1.0.xsd"/>
 	<xsd:group name="UsageParameterLuggageRefGroup">
 		<xsd:annotation>
 			<xsd:documentation>USAGE PARAMETER Elements forCELL.Group.</xsd:documentation>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_version.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_version-v1.0.xsd
similarity index 97%
rename from xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_version.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_version-v1.0.xsd
index 62b4d7f46..12d6a4b7a 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_version-v1.0.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_usageParameterLuggage_version">
-	<xsd:include schemaLocation="netex_usageParameterLuggage_support.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameter_version.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterLuggage_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_version-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,7 +29,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterLuggage_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterLuggage_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_support.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_support-v1.1.xsd
similarity index 99%
rename from xsd/netex_part_3/part3_fares/netex_usageParameterTravel_support.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameterTravel_support-v1.1.xsd
index cf26706d9..52cf2e5c5 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_support-v1.1.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_usageParameterTravel_support">
-	<xsd:include schemaLocation="netex_usageParameter_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,7 +31,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterTravel_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterTravel_support-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version-v1.0.xsd
similarity index 99%
rename from xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version-v1.0.xsd
index 05dc9b0ef..bee329a72 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version-v1.0.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_usageParameterTravel_version">
-	<xsd:include schemaLocation="netex_usageParameterTravel_support.xsd"/>
-	<xsd:include schemaLocation="netex_timeStructureFactor_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterTravel_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_timeStructureFactor_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_support.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameter_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_version-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameter_support.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameter_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_fares/netex_usageParameter_support.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameter_support-v1.0.xsd
index 060cb5e04..e31b6f6a7 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameter_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameter_support-v1.0.xsd
@@ -26,11 +26,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameter_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameter_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
@@ -58,7 +58,7 @@ Rail transport, Roads and Road transport
 		</xsd:appinfo>
 		<xsd:documentation>NeTEX: USAGE PARAMETER identifier types.</xsd:documentation>
 	</xsd:annotation>
-	<xsd:include schemaLocation="netex_farePrice_support.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_support-v1.0.xsd"/>
 	<!-- === USAGE PARAMETER====================================================== -->
 	<xsd:complexType name="usageParameterRefs_RelStructure">
 		<xsd:annotation>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameter_version.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameter_version-v1.0.xsd
similarity index 97%
rename from xsd/netex_part_3/part3_fares/netex_usageParameter_version.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameter_version-v1.0.xsd
index 14747444c..ce1bba309 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameter_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameter_version-v1.0.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_usageParameter_version">
-	<xsd:include schemaLocation="netex_usageParameter_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_units.xsd"/>
-	<xsd:include schemaLocation="netex_farePrice_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_units-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_version-v1.1.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,11 +31,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameter_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameter_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParametersAll_support.xsd b/xsd/netex_part_3/part3_fares/netex_usageParametersAll_support-v1.0.xsd
similarity index 89%
rename from xsd/netex_part_3/part3_fares/netex_usageParametersAll_support.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParametersAll_support-v1.0.xsd
index 54632e3ec..343c91782 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParametersAll_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParametersAll_support-v1.0.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_usageParametersAll_support">
-	<xsd:include schemaLocation="netex_usageParameterBooking_support.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterAfterSales_support.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterCharging_support.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterEligibility_support.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterEntitlement_support.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterLuggage_support.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterTravel_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterBooking_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterAfterSales_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterCharging_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterEligibility_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterEntitlement_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterLuggage_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterTravel_support-v1.1.xsd"/>
 	<!-- ======================================================================= -->
 </xsd:schema>
diff --git a/xsd/netex_part_3/part3_fares/netex_validableElement_support.xsd b/xsd/netex_part_3/part3_fares/netex_validableElement_support-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_fares/netex_validableElement_support.xsd
rename to xsd/netex_part_3/part3_fares/netex_validableElement_support-v1.0.xsd
index 44442caaa..a0f5423e5 100644
--- a/xsd/netex_part_3/part3_fares/netex_validableElement_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_validableElement_support-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_validableElement_support">
-	<xsd:include schemaLocation="netex_fareStructure_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructure_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_validableElement_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_validableElement_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_validableElement_version.xsd b/xsd/netex_part_3/part3_fares/netex_validableElement_version-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_fares/netex_validableElement_version.xsd
rename to xsd/netex_part_3/part3_fares/netex_validableElement_version-v1.0.xsd
index 71545806e..07491a8a4 100644
--- a/xsd/netex_part_3/part3_fares/netex_validableElement_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_validableElement_version-v1.0.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_validableElement_version">
-	<xsd:include schemaLocation="netex_validableElement_support.xsd"/>
-	<xsd:include schemaLocation="netex_fareStructure_version.xsd"/>
-	<xsd:include schemaLocation="netex_accessRightParameter_version.xsd"/>
+	<xsd:include schemaLocation="netex_validableElement_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructure_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_accessRightParameter_version-v1.1.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -30,11 +30,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_validableElement_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_validableElement_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_frames/netex_all_frames_part3.xsd b/xsd/netex_part_3/part3_frames/netex_all_frames_part3-v1.0.xsd
similarity index 90%
rename from xsd/netex_part_3/part3_frames/netex_all_frames_part3.xsd
rename to xsd/netex_part_3/part3_frames/netex_all_frames_part3-v1.0.xsd
index 26456e392..60fc417a1 100644
--- a/xsd/netex_part_3/part3_frames/netex_all_frames_part3.xsd
+++ b/xsd/netex_part_3/part3_frames/netex_all_frames_part3-v1.0.xsd
@@ -3,7 +3,7 @@
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_frames_part1">
 	<!-- ===Dependencies ======================================= -->
 	<!-- =====Frames================================================= -->
-	<xsd:include schemaLocation="netex_fareFrame_version.xsd"/>
-	<xsd:include schemaLocation="netex_salesTransactionFrame_version.xsd"/>
+	<xsd:include schemaLocation="netex_fareFrame_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_salesTransactionFrame_version-v1.1.xsd"/>
 	<!-- ============================================================ -->
 </xsd:schema>
diff --git a/xsd/netex_part_3/part3_frames/netex_fareFrame_version.xsd b/xsd/netex_part_3/part3_frames/netex_fareFrame_version-v1.0.xsd
similarity index 96%
rename from xsd/netex_part_3/part3_frames/netex_fareFrame_version.xsd
rename to xsd/netex_part_3/part3_frames/netex_fareFrame_version-v1.0.xsd
index b39c32437..9098d4fc3 100644
--- a/xsd/netex_part_3/part3_frames/netex_fareFrame_version.xsd
+++ b/xsd/netex_part_3/part3_frames/netex_fareFrame_version-v1.0.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_fareFrame_version">
-	<xsd:include schemaLocation="../part3_fares/netex_all_objects_part3_fares.xsd"/>
-	<xsd:include schemaLocation="../part3_monitoring/netex_all_objects_part3_monitoring.xsd"/>
-	<xsd:include schemaLocation="../part3_parkingTariff/netex_all_objects_part3_parking.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_fareZone_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_commonFrame_version.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_all_objects_part3_fares-v1.1.xsd"/>
+	<xsd:include schemaLocation="../part3_monitoring/netex_all_objects_part3_monitoring-v1.0.xsd"/>
+	<xsd:include schemaLocation="../part3_parkingTariff/netex_all_objects_part3_parking-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_fareZone_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_commonFrame_version-v1.0.xsd"/>
 	<!-- ====  =========================================-->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -30,11 +30,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_frames}netex_fareFrame_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_frames}netex_fareFrame_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>CEN TC278 SG6 and Department for Transport, Great Minster House, 76 Marsham Street, London SW1P 4DR</Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_xxxxx.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_xxxxx-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_frames/netex_salesTransactionFrame_version.xsd b/xsd/netex_part_3/part3_frames/netex_salesTransactionFrame_version-v1.1.xsd
similarity index 96%
rename from xsd/netex_part_3/part3_frames/netex_salesTransactionFrame_version.xsd
rename to xsd/netex_part_3/part3_frames/netex_salesTransactionFrame_version-v1.1.xsd
index 936b8bc74..e2fdb6892 100644
--- a/xsd/netex_part_3/part3_frames/netex_salesTransactionFrame_version.xsd
+++ b/xsd/netex_part_3/part3_frames/netex_salesTransactionFrame_version-v1.1.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_salesTransactionFrame_version">
-	<xsd:include schemaLocation="../part3_fares/netex_all_objects_part3_fares.xsd"/>
-	<xsd:include schemaLocation="../part3_salesTransactions/netex_all_objects_part3_salesTransactions.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_commonFrame_version.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_all_objects_part3_fares-v1.1.xsd"/>
+	<xsd:include schemaLocation="../part3_salesTransactions/netex_all_objects_part3_salesTransactions-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_commonFrame_version-v1.0.xsd"/>
 	<!-- ====  =========================================-->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -27,11 +27,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_frames}netex_salesTransactionFrame_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_frames}netex_salesTransactionFrame_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>CEN TC278 SG9 </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_xxxxx.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_xxxxx-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_3/part3_monitoring/netex_all_objects_part3_monitoring.xsd b/xsd/netex_part_3/part3_monitoring/netex_all_objects_part3_monitoring-v1.0.xsd
similarity index 85%
rename from xsd/netex_part_3/part3_monitoring/netex_all_objects_part3_monitoring.xsd
rename to xsd/netex_part_3/part3_monitoring/netex_all_objects_part3_monitoring-v1.0.xsd
index 7058cbd5c..e59cb5f32 100644
--- a/xsd/netex_part_3/part3_monitoring/netex_all_objects_part3_monitoring.xsd
+++ b/xsd/netex_part_3/part3_monitoring/netex_all_objects_part3_monitoring-v1.0.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_part3_monitoring">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="netex_monitoredCall_version.xsd"/>
-	<xsd:include schemaLocation="netex_monitoredPassingTimes_version.xsd"/>
-	<xsd:include schemaLocation="netex_monitoredVehicleJourney_support.xsd"/>
+	<xsd:include schemaLocation="netex_monitoredCall_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_monitoredPassingTimes_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_monitoredVehicleJourney_support-v1.0.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_part_3/part3_monitoring/netex_monitoredCall_version.xsd b/xsd/netex_part_3/part3_monitoring/netex_monitoredCall_version-v1.0.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_monitoring/netex_monitoredCall_version.xsd
rename to xsd/netex_part_3/part3_monitoring/netex_monitoredCall_version-v1.0.xsd
index 807bcc306..2b489ce99 100644
--- a/xsd/netex_part_3/part3_monitoring/netex_monitoredCall_version.xsd
+++ b/xsd/netex_part_3/part3_monitoring/netex_monitoredCall_version-v1.0.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_monitoredCall_version">
-	<xsd:include schemaLocation="netex_monitoredPassingTimes_version.xsd"/>
-	<xsd:include schemaLocation="netex_monitoredVehicleJourney_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_call_version.xsd"/>
+	<xsd:include schemaLocation="netex_monitoredPassingTimes_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_monitoredVehicleJourney_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_call_version-v1.1.xsd"/>
 	<!-- ==== CALL =========================================-->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,11 +29,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_monitoring}nnetex_monitoredCall_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_monitoring}nnetex_monitoredCall_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_monitoring/netex_monitoredPassingTimes_version.xsd b/xsd/netex_part_3/part3_monitoring/netex_monitoredPassingTimes_version-v1.1.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_monitoring/netex_monitoredPassingTimes_version.xsd
rename to xsd/netex_part_3/part3_monitoring/netex_monitoredPassingTimes_version-v1.1.xsd
index 6b62d35b8..a161553a8 100644
--- a/xsd/netex_part_3/part3_monitoring/netex_monitoredPassingTimes_version.xsd
+++ b/xsd/netex_part_3/part3_monitoring/netex_monitoredPassingTimes_version-v1.1.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_monitoredPassingTimes_version">
-	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_datedPassingTimes_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_datedPassingTimes_version-v1.1.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,11 +29,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_monitoring}nnetex_monitoredPassingTimes_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_monitoring}nnetex_monitoredPassingTimes_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_3/part3_monitoring/netex_monitoredVehicleJourney_support.xsd b/xsd/netex_part_3/part3_monitoring/netex_monitoredVehicleJourney_support-v1.0.xsd
similarity index 96%
rename from xsd/netex_part_3/part3_monitoring/netex_monitoredVehicleJourney_support.xsd
rename to xsd/netex_part_3/part3_monitoring/netex_monitoredVehicleJourney_support-v1.0.xsd
index 00a74e275..b9740b2aa 100644
--- a/xsd/netex_part_3/part3_monitoring/netex_monitoredVehicleJourney_support.xsd
+++ b/xsd/netex_part_3/part3_monitoring/netex_monitoredVehicleJourney_support-v1.0.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_monitoredVehicleJourney_support">
-	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_call_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_call_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -27,11 +27,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_monitoring}nnetex_monitoredVehicleJourney_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_monitoring}nnetex_monitoredVehicleJourney_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_parkingTariff/netex_all_objects_part3_parking.xsd b/xsd/netex_part_3/part3_parkingTariff/netex_all_objects_part3_parking-v1.0.xsd
similarity index 76%
rename from xsd/netex_part_3/part3_parkingTariff/netex_all_objects_part3_parking.xsd
rename to xsd/netex_part_3/part3_parkingTariff/netex_all_objects_part3_parking-v1.0.xsd
index b30a1fe39..6e64cb0c7 100644
--- a/xsd/netex_part_3/part3_parkingTariff/netex_all_objects_part3_parking.xsd
+++ b/xsd/netex_part_3/part3_parkingTariff/netex_all_objects_part3_parking-v1.0.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_part3_parking">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="netex_parkingTariff_support.xsd"/>
-	<xsd:include schemaLocation="netex_parkingTariff_version.xsd"/>
+	<xsd:include schemaLocation="netex_parkingTariff_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_parkingTariff_version-v1.1.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_support.xsd b/xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_support-v1.1.xsd
similarity index 97%
rename from xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_support.xsd
rename to xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_support-v1.1.xsd
index 5c98147a2..4eff21a46 100644
--- a/xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_support.xsd
+++ b/xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_support-v1.1.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_parkingTariff_support">
-	<xsd:include schemaLocation="../part3_fares/netex_timeStructureFactor_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_parking_support.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_timeStructureFactor_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_parking_support-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,7 +28,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part3/part3_parkingTariff}netex_parkingTariff_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part3/part3_parkingTariff}netex_parkingTariff_support-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_version.xsd b/xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_version-v1.1.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_version.xsd
rename to xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_version-v1.1.xsd
index 0005be829..0d045ac4b 100644
--- a/xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_version.xsd
+++ b/xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_version-v1.1.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_parkingTariff_version">
-	<xsd:include schemaLocation="netex_parkingTariff_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_parking_version.xsd"/>
-	<xsd:include schemaLocation="../part3_fares/netex_fareStructureElement_version.xsd"/>
-	<xsd:include schemaLocation="../part3_fares/netex_timeStructureFactor_version.xsd"/>
+	<xsd:include schemaLocation="netex_parkingTariff_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_parking_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_fareStructureElement_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_timeStructureFactor_version-v1.0.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,7 +31,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part3/part3_parkingTariff}netex_parkingTariff_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part3/part3_parkingTariff}netex_parkingTariff_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_all_objects_part3_salesTransactions.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_all_objects_part3_salesTransactions-v1.0.xsd
similarity index 53%
rename from xsd/netex_part_3/part3_salesTransactions/netex_all_objects_part3_salesTransactions.xsd
rename to xsd/netex_part_3/part3_salesTransactions/netex_all_objects_part3_salesTransactions-v1.0.xsd
index 87d8b23a6..ca9c85a6f 100644
--- a/xsd/netex_part_3/part3_salesTransactions/netex_all_objects_part3_salesTransactions.xsd
+++ b/xsd/netex_part_3/part3_salesTransactions/netex_all_objects_part3_salesTransactions-v1.0.xsd
@@ -2,14 +2,14 @@
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_part3_salesTransactions">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="netex_salesContract_support.xsd"/>
-	<xsd:include schemaLocation="netex_salesContract_version.xsd"/>
-	<xsd:include schemaLocation="netex_customerEligibility_support.xsd"/>
-	<xsd:include schemaLocation="netex_customerEligibility_version.xsd"/>
-	<xsd:include schemaLocation="netex_retailConsortium_support.xsd"/>
-	<xsd:include schemaLocation="netex_retailConsortium_version.xsd"/>
-	<xsd:include schemaLocation="netex_salesTransaction_support.xsd"/>
-	<xsd:include schemaLocation="netex_salesTransaction_version.xsd"/>
-	<xsd:include schemaLocation="netex_customerPurchasePackage_support.xsd"/>
-	<xsd:include schemaLocation="netex_customerPurchasePackage_version.xsd"/>
+	<xsd:include schemaLocation="netex_salesContract_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_salesContract_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_customerEligibility_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_customerEligibility_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_retailConsortium_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_retailConsortium_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_salesTransaction_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_salesTransaction_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_customerPurchasePackage_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_customerPurchasePackage_version-v1.1.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_support.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_support-v1.1.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_support.xsd
rename to xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_support-v1.1.xsd
index 8065cc138..7b122bf37 100644
--- a/xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_support.xsd
+++ b/xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_support-v1.1.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_customerEligibility_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_relationship.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_relationship-v1.0.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_salesContract_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_salesContract_support-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Steam Intellect, London N1 1JS </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
 				 <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_version.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_version-v1.1.xsd
similarity index 97%
rename from xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_version.xsd
rename to xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_version-v1.1.xsd
index 82f2579c8..fe947afc4 100644
--- a/xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_version.xsd
+++ b/xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_version-v1.1.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_customerEligibility_version">
-	<xsd:include schemaLocation="netex_customerEligibility_support.xsd"/>
-	<xsd:include schemaLocation="netex_salesContract_support.xsd"/>
-	<xsd:include schemaLocation="../part3_fares/netex_usageParameterEligibility_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_version.xsd"/>
+	<xsd:include schemaLocation="netex_customerEligibility_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_salesContract_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_usageParameterEligibility_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_version-v1.1.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -32,11 +32,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_salesContract_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_salesContract_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Steam Intellect, London N1 1JS </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_support.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_support-v1.1.xsd
similarity index 99%
rename from xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_support.xsd
rename to xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_support-v1.1.xsd
index 7df40d29a..9cf6b1338 100644
--- a/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_support.xsd
+++ b/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_support-v1.1.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_customerPurchasePackage_support">
-	<xsd:include schemaLocation="../part3_fares/netex_salesPackage_support.xsd"/>
-	<xsd:include schemaLocation="../part3_fares/netex_accessRightParameter_support.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_salesPackage_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_accessRightParameter_support-v1.0.xsd"/>
 	<!-- =============================================================== -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,11 +29,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransaction}netex_CustomerPurchasePackage_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransaction}netex_CustomerPurchasePackage_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Steam Intellect, London N1 1JS </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version-v1.1.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version.xsd
rename to xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version-v1.1.xsd
index e6321c3c8..9692a84f8 100644
--- a/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version.xsd
+++ b/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version-v1.1.xsd
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_customerPurchasePackage_version">
-	<xsd:include schemaLocation="netex_customerPurchasePackage_support.xsd"/>
-	<xsd:include schemaLocation="netex_salesTransaction_support.xsd"/>
+	<xsd:include schemaLocation="netex_customerPurchasePackage_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_salesTransaction_support-v1.0.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="../part3_fares/netex_geographicStructureFactor_support.xsd"/>
-	<xsd:include schemaLocation="../part3_fares/netex_timeStructureFactor_support.xsd"/>
-	<xsd:include schemaLocation="../part3_fares/netex_fareStructureElement_support.xsd"/>
-	<xsd:include schemaLocation="../part3_fares/netex_salesPackage_version.xsd"/>
-	<xsd:include schemaLocation="../part3_fares/netex_travelDocument_version.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_geographicStructureFactor_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_timeStructureFactor_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_fareStructureElement_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_salesPackage_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_travelDocument_version-v1.1.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -33,11 +33,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransaction}netex_salesPackage_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransaction}netex_salesPackage_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Steam Intellect, London N1 1JS </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_support.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_support-v1.1.xsd
similarity index 97%
rename from xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_support.xsd
rename to xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_support-v1.1.xsd
index 9c47425ed..1cdc3dcec 100644
--- a/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_support.xsd
+++ b/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_support-v1.1.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_retailConsortium_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_organisation_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_securityList_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_organisation_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_securityList_support-v1.1.xsd"/>
 	<!-- =============================================================== -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_retailConsortium_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_retailConsortium_support-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_version.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_version-v1.1.xsd
similarity index 96%
rename from xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_version.xsd
rename to xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_version-v1.1.xsd
index 1b76d07b7..414a2498f 100644
--- a/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_version.xsd
+++ b/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_version-v1.1.xsd
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_retailConsortium_version">
-	<xsd:include schemaLocation="netex_retailConsortium_support.xsd"/>
-	<xsd:include schemaLocation="netex_salesContract_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_organisation_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_securityList_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_address_version.xsd"/>
+	<xsd:include schemaLocation="netex_retailConsortium_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_salesContract_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_organisation_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_securityList_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_address_version-v1.1.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -35,11 +35,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_retailConsortium_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_retailConsortium_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_salesContract_support.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_salesContract_support-v1.1.xsd
similarity index 99%
rename from xsd/netex_part_3/part3_salesTransactions/netex_salesContract_support.xsd
rename to xsd/netex_part_3/part3_salesTransactions/netex_salesContract_support-v1.1.xsd
index 85d1a15da..0a2035657 100644
--- a/xsd/netex_part_3/part3_salesTransactions/netex_salesContract_support.xsd
+++ b/xsd/netex_part_3/part3_salesTransactions/netex_salesContract_support-v1.1.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_salesContract_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_securityList_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_loggable_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_securityList_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_loggable_support-v1.1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -34,11 +34,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_salesContract_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_salesContract_support-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_salesContract_version.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_salesContract_version-v1.1.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_salesTransactions/netex_salesContract_version.xsd
rename to xsd/netex_part_3/part3_salesTransactions/netex_salesContract_version-v1.1.xsd
index 64bfd43a1..32935e023 100644
--- a/xsd/netex_part_3/part3_salesTransactions/netex_salesContract_version.xsd
+++ b/xsd/netex_part_3/part3_salesTransactions/netex_salesContract_version-v1.1.xsd
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_salesContract_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_support.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_loggable_version.xsd"/>
-	<xsd:include schemaLocation="netex_retailConsortium_support.xsd"/>
-	<xsd:include schemaLocation="netex_salesContract_support.xsd"/>
-	<xsd:include schemaLocation="netex_customerEligibility_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_securityList_version.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_address_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_loggable_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_retailConsortium_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_salesContract_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_customerEligibility_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_securityList_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_address_version-v1.1.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -40,11 +40,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_salesContract_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_salesContract_version-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_support.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_support-v1.0.xsd
similarity index 96%
rename from xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_support.xsd
rename to xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_support-v1.0.xsd
index c41e5efba..ac3e9742b 100644
--- a/xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_support.xsd
+++ b/xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_support-v1.0.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_salesTransaction_support">
-	<xsd:include schemaLocation="netex_salesContract_support.xsd"/>
-	<xsd:include schemaLocation="../part3_fares/netex_accessRightParameter_support.xsd"/>
+	<xsd:include schemaLocation="netex_salesContract_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_accessRightParameter_support-v1.0.xsd"/>
 	<!-- =============================================================== -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,11 +31,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_salesTransaction_support.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_salesTransaction_support-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_version.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_version-v1.1.xsd
similarity index 98%
rename from xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_version.xsd
rename to xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_version-v1.1.xsd
index db0184dca..48394f529 100644
--- a/xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_version.xsd
+++ b/xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_version-v1.1.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_salesTransaction_version">
-	<xsd:include schemaLocation="netex_salesTransaction_support.xsd"/>
-	<xsd:include schemaLocation="../part3_PiQuery/netex_piRequest_support.xsd"/>
-	<xsd:include schemaLocation="netex_salesContract_version.xsd"/>
-	<xsd:include schemaLocation="../part3_fares/netex_salesPackage_version.xsd"/>
-	<xsd:include schemaLocation="netex_customerPurchasePackage_support.xsd"/>
+	<xsd:include schemaLocation="netex_salesTransaction_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../part3_PiQuery/netex_piRequest_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_salesContract_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_salesPackage_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_customerPurchasePackage_support-v1.1.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -33,11 +33,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_salesTransaction_version.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_salesTransaction_version-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_service/netex_all.xsd b/xsd/netex_service/netex_all-v1.0.xsd
similarity index 77%
rename from xsd/netex_service/netex_all.xsd
rename to xsd/netex_service/netex_all-v1.0.xsd
index 0a10b6c85..7e41975dd 100644
--- a/xsd/netex_service/netex_all.xsd
+++ b/xsd/netex_service/netex_all-v1.0.xsd
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="../netex_framework/netex_frames/netex_all_frames_framework.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_frames/netex_all_frames_framework-v1.0.xsd"/>
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="../netex_part_1/part1_tacticalPlanning/netex_all_objects_part1_tacticalPlanning.xsd"/>
-	<xsd:include schemaLocation="../netex_part_1/netex_all_frames_part1.xsd"/>
+	<xsd:include schemaLocation="../netex_part_1/part1_tacticalPlanning/netex_all_objects_part1_tacticalPlanning-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_part_1/netex_all_frames_part1-v1.0.xsd"/>
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="../netex_part_2/netex_all_objects_part2.xsd"/>
-	<xsd:include schemaLocation="../netex_part_2/netex_all_frames_part2.xsd"/>
+	<xsd:include schemaLocation="../netex_part_2/netex_all_objects_part2-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_part_2/netex_all_frames_part2-v1.0.xsd"/>
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="../netex_part_3/part3_fares/netex_all_objects_part3_fares.xsd"/>
-	<xsd:include schemaLocation="../netex_part_3/part3_frames/netex_all_frames_part3.xsd"/>
-	<xsd:include schemaLocation="netex_filter_frame.xsd"/>
-	<xsd:include schemaLocation="netex_filter_object.xsd"/>
+	<xsd:include schemaLocation="../netex_part_3/part3_fares/netex_all_objects_part3_fares-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_part_3/part3_frames/netex_all_frames_part3-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_filter_frame-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_filter_object-v1.0.xsd"/>
 	<!-- ===Entities======================================= -->
 	<!-- ===Filters ======================================= -->
 </xsd:schema>
diff --git a/xsd/netex_service/netex_all_filters.xsd b/xsd/netex_service/netex_all_filters-v1.0.xsd
similarity index 91%
rename from xsd/netex_service/netex_all_filters.xsd
rename to xsd/netex_service/netex_all_filters-v1.0.xsd
index ef9b9f3ae..02362f8c5 100644
--- a/xsd/netex_service/netex_all_filters.xsd
+++ b/xsd/netex_service/netex_all_filters-v1.0.xsd
@@ -3,7 +3,7 @@
 	<!-- ======================================================================= -->
 	<!-- ======================================================================= -->
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_filter_network.xsd"/>
+	<xsd:include schemaLocation="netex_filter_network-v1.0.xsd"/>
 	<!--== Requests ===================================================================== -->
 	<!-- ===eGIF/GovTalk Documentation ======================================= -->
 	<xsd:annotation>
@@ -28,15 +28,15 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/ for svc/} for _filters.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/ for svc/} for _filters-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _filter_device.xsd</Requires>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _filter_network.xsd</Requires>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _filter_prediction.xsd</Requires>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _filter_profile.xsd</Requires>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _filter_traffic_event.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _filter_device-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _filter_network-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _filter_prediction-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _filter_profile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _filter_traffic_event-v1.0.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_service/netex_dataObjectRequest_service.xsd b/xsd/netex_service/netex_dataObjectRequest_service-v1.0.xsd
similarity index 98%
rename from xsd/netex_service/netex_dataObjectRequest_service.xsd
rename to xsd/netex_service/netex_dataObjectRequest_service-v1.0.xsd
index a8a990d79..d395da0b8 100644
--- a/xsd/netex_service/netex_dataObjectRequest_service.xsd
+++ b/xsd/netex_service/netex_dataObjectRequest_service-v1.0.xsd
@@ -2,8 +2,8 @@
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_dataObjectRequest_service">
 	<!-- ===Dependencies ======================================= -->
 	<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri/siri_requests-v2.0.xsd"/>
-	<xsd:include schemaLocation="netex_filter_frame.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_all_objects_framework.xsd"/>
+	<xsd:include schemaLocation="netex_filter_frame-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_all_objects_framework-v1.0.xsd"/>
 	<!-- ===eGIF/GovTalk Documentation ======================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -27,10 +27,10 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_service}netex__dataObjectRequest.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_service}netex__dataObjectRequest-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
-				<Relation><Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _data_object.xsd</Requires><Requires>http://www.siri.org.uk/schemas/2.0/xsd/siri/siri_requests-v2.0.xsd</Requires> &gt;
+				<Relation><Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _data_object-v1.0.xsd</Requires><Requires>http://www.siri.org.uk/schemas/2.0/xsd/siri/siri_requests-v2.0.xsd</Requires> &gt;
 				</Relation>
 				<Rights>Unclassified
  					<Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_service/netex_filter_frame.xsd b/xsd/netex_service/netex_filter_frame-v1.0.xsd
similarity index 96%
rename from xsd/netex_service/netex_filter_frame.xsd
rename to xsd/netex_service/netex_filter_frame-v1.0.xsd
index b94a88804..42300e84f 100644
--- a/xsd/netex_service/netex_filter_frame.xsd
+++ b/xsd/netex_service/netex_filter_frame-v1.0.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_dataObjectRequest_service">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_versionFrame_support.xsd"/>
-	<xsd:include schemaLocation="../netex_part_1/part1_networkDescription/netex_line_support.xsd"/>
-	<xsd:include schemaLocation="netex_filter_object.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_versionFrame_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_part_1/part1_networkDescription/netex_line_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_filter_object-v1.0.xsd"/>
 	<!-- ===eGIF/GovTalk Documentation ======================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -27,10 +27,10 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_service}netex__dataObjectRequest.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_service}netex__dataObjectRequest-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
-				<Relation><Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _data_object.xsd</Requires><Requires>http://www.siri.org.uk/schemas/2.0/xsd/siri/siri_requests-v2.0.xsd</Requires> &gt;
+				<Relation><Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _data_object-v1.0.xsd</Requires><Requires>http://www.siri.org.uk/schemas/2.0/xsd/siri/siri_requests-v2.0.xsd</Requires> &gt;
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_service/netex_filter_object.xsd b/xsd/netex_service/netex_filter_object-v1.0.xsd
similarity index 95%
rename from xsd/netex_service/netex_filter_object.xsd
rename to xsd/netex_service/netex_filter_object-v1.0.xsd
index 894384d93..f417d92e3 100644
--- a/xsd/netex_service/netex_filter_object.xsd
+++ b/xsd/netex_service/netex_filter_object-v1.0.xsd
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_filter_object">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_utility_types.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_utility_time.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_location_types.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_dataSource_version.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_layer_support.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_reusableComponents/netex_availabilityCondition_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_utility_types-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_utility_time-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_location_types-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_dataSource_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_layer_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_responsibilitySet_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_reusableComponents/netex_availabilityCondition_version-v1.0.xsd"/>
 	<!-- ===eGIF/GovTalk Documentation ======================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,10 +31,10 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_service}netex__dataObjectRequest.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_service}netex__dataObjectRequest-v1.0.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
-				<Relation><Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _data_object.xsd</Requires><Requires>http://www.siri.org.uk/schemas/2.0/xsd/siri/siri_requests-v2.0.xsd</Requires> &gt;
+				<Relation><Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _data_object-v1.0.xsd</Requires><Requires>http://www.siri.org.uk/schemas/2.0/xsd/siri/siri_requests-v2.0.xsd</Requires> &gt;
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/siri/siri_base-v2.0.xsd b/xsd/siri/siri_base-v2.0.xsd
index 3fb1679fd..d2a3286d9 100644
--- a/xsd/siri/siri_base-v2.0.xsd
+++ b/xsd/siri/siri_base-v2.0.xsd
@@ -57,7 +57,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.siri.org.uk/schema/2.0/xsd/siri__common_servicesxsd</Requires>
+					<Requires>http://www.siri.org.uk/schema/2.0/xsd/siri__common_services-v1.3xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
        <Copyright>CEN, VDV, RTIG 2004-2012</Copyright>
diff --git a/xsd/siri/siri_requests-v2.0.xsd b/xsd/siri/siri_requests-v2.0.xsd
index add3f7b4e..0eab548ad 100644
--- a/xsd/siri/siri_requests-v2.0.xsd
+++ b/xsd/siri/siri_requests-v2.0.xsd
@@ -2,7 +2,7 @@
 <xsd:schema xmlns="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.siri.org.uk/siri" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0" id="siri_requests">
 	<!-- ===Dependencies ======================================= -->
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="../siri_utility/siri_utility.xsd"/>
+	<xsd:include schemaLocation="../siri_utility/siri_utility-v1.1.xsd"/>
 	<xsd:include schemaLocation="../siri_utility/siri_location-v2.0.xsd"/>
 	<xsd:include schemaLocation="siri_request_errorConditions-v2.0.xsd"/>
 	<!-- ======================================================================= -->
diff --git a/xsd/siri_utility/siri_all_utility-v2.0.xsd b/xsd/siri_utility/siri_all_utility-v2.0.xsd
index 94f2be84e..637a9daca 100644
--- a/xsd/siri_utility/siri_all_utility-v2.0.xsd
+++ b/xsd/siri_utility/siri_all_utility-v2.0.xsd
@@ -7,7 +7,7 @@
 	<!-- ======================================================================= -->
 	<xsd:include schemaLocation="../siri_utility/siri_participant-v2.0.xsd"/>
 	<xsd:include schemaLocation="../siri_utility/siri_types-v2.0.xsd"/>
-	<xsd:include schemaLocation="../siri_utility/siri_utility.xsd"/>
+	<xsd:include schemaLocation="../siri_utility/siri_utility-v1.1.xsd"/>
 	<xsd:include schemaLocation="../siri_utility/siri_location-v2.0.xsd"/>
 	<xsd:include schemaLocation="../siri_utility/siri_permissions-v2.0.xsd"/>
 	<!-- ================= =============================================== -->
diff --git a/xsd/siri_utility/siri_permissions-v2.0.xsd b/xsd/siri_utility/siri_permissions-v2.0.xsd
index 1ce646024..cfb7f67da 100644
--- a/xsd/siri_utility/siri_permissions-v2.0.xsd
+++ b/xsd/siri_utility/siri_permissions-v2.0.xsd
@@ -59,7 +59,7 @@ Rail transport, Roads and road transport
 		<xsd:documentation>SIRI Framework Permission Types.</xsd:documentation>
 	</xsd:annotation>
 	<xsd:include schemaLocation="siri_types-v2.0.xsd"/>
-	<xsd:include schemaLocation="siri_utility.xsd"/>
+	<xsd:include schemaLocation="siri_utility-v1.1.xsd"/>
 	<xsd:include schemaLocation="siri_participant-v2.0.xsd"/>
 	<!-- ======================================================================= -->
 	<!-- ====Permissions================================================= -->
diff --git a/xsd/siri_utility/siri_utility.xsd b/xsd/siri_utility/siri_utility-v1.1.xsd
similarity index 98%
rename from xsd/siri_utility/siri_utility.xsd
rename to xsd/siri_utility/siri_utility-v1.1.xsd
index 75daadc64..ce7140d6a 100644
--- a/xsd/siri_utility/siri_utility.xsd
+++ b/xsd/siri_utility/siri_utility-v1.1.xsd
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.siri.org.uk/schema/2.0/xsd/siri_utiliyty/}siri_utility.xsd</Identifier>
+				<Identifier>{http://www.siri.org.uk/schema/2.0/xsd/siri_utiliyty/}siri_utility-v1.1.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Rights>Unclassified
diff --git a/xsd/wsdl/siri_all_functionalServices.xsd b/xsd/wsdl/siri_all_functionalServices.xsd
index 3484b8532..72fffadc4 100644
--- a/xsd/wsdl/siri_all_functionalServices.xsd
+++ b/xsd/wsdl/siri_all_functionalServices.xsd
@@ -78,8 +78,8 @@ Rail transport, Roads and road transport.
 	<!-- ======================================================================= -->
 	<!-- ======================================================================= -->
 	<!-- REPLACE THESE PACKAGES WITH OTHER FINCTIONAL SERVICES -->
-	<xsd:import namespace="http://www.netex.org.uk/netex" schemaLocation="../netex_service/netex_dataObjectRequest_service.xsd"/>
-	<xsd:import namespace="http://www.netex.org.uk/netex" schemaLocation="../netex_service/netex_all.xsd"/>
+	<xsd:import namespace="http://www.netex.org.uk/netex" schemaLocation="../netex_service/netex_dataObjectRequest_service-v1.0.xsd"/>
+	<xsd:import namespace="http://www.netex.org.uk/netex" schemaLocation="../netex_service/netex_all-v1.0.xsd"/>
 	<!-- END OF FUNCTIONAL SERVICES -->
 	<!-- ======================================================================= -->
 </xsd:schema>

From 743723eae8aceb4f4dae3b7df364d48c3719cb22 Mon Sep 17 00:00:00 2001
From: Cristoffer Solem <cristoffer.solem@gmail.com>
Date: Wed, 8 Aug 2018 11:52:57 +0200
Subject: [PATCH 3/4] #13 Remove version suffices from xsd file names, ignoring
 siri as it should be a sub module or equivalent

---
 ...objects_framework-v1.0.xsd => netex_all_objects_framework.xsd} | 0
 ...all_objects_generic-v1.0.xsd => netex_all_objects_generic.xsd} | 0
 ...l_frames_framework-v1.0.xsd => netex_all_frames_framework.xsd} | 0
 ...commonFrame_version-v1.0.xsd => netex_commonFrame_version.xsd} | 0
 ...iteFrame_version-v1.0.xsd => netex_compositeFrame_version.xsd} | 0
 ...neralFrame_version-v1.0.xsd => netex_generalFrame_version.xsd} | 0
 ...urceFrame_support-v1.0.xsd => netex_resourceFrame_support.xsd} | 0
 ...urceFrame_version-v1.1.xsd => netex_resourceFrame_version.xsd} | 0
 ...me_support-v1.0.xsd => netex_serviceCalendarFrame_support.xsd} | 0
 ...me_version-v1.0.xsd => netex_serviceCalendarFrame_version.xsd} | 0
 ...x_acsb_accessibility-v1.1.xsd => netex_acsb_accessibility.xsd} | 0
 .../{netex_acsb_all-v1.0.xsd => netex_acsb_all.xsd}               | 0
 ...netex_acsb_limitations-v1.0.xsd => netex_acsb_limitations.xsd} | 0
 ...assengerMobility-v1.0.xsd => netex_acsb_passengerMobility.xsd} | 0
 .../{netex_acsb_support-v1.0.xsd => netex_acsb_support.xsd}       | 0
 ...iveName_support-v1.0.xsd => netex_alternativeName_support.xsd} | 0
 ...iveName_version-v1.0.xsd => netex_alternativeName_version.xsd} | 0
 ...x_assignment_support-v1.0.xsd => netex_assignment_support.xsd} | 0
 ...x_assignment_version-v1.0.xsd => netex_assignment_version.xsd} | 0
 ...netex_grouping_support-v1.0.xsd => netex_grouping_support.xsd} | 0
 ...netex_grouping_version-v1.1.xsd => netex_grouping_version.xsd} | 0
 .../{netex_layer_support-v1.0.xsd => netex_layer_support.xsd}     | 0
 .../{netex_layer_version-v1.0.xsd => netex_layer_version.xsd}     | 0
 ...netex_loggable_support-v1.1.xsd => netex_loggable_support.xsd} | 0
 ...netex_loggable_version-v1.1.xsd => netex_loggable_version.xsd} | 0
 ...ganisation_support-v1.1.xsd => netex_organisation_support.xsd} | 0
 ...ganisation_version-v1.1.xsd => netex_organisation_version.xsd} | 0
 .../{netex_place_support-v1.0.xsd => netex_place_support.xsd}     | 0
 .../{netex_place_version-v1.1.xsd => netex_place_version.xsd}     | 0
 ...ce_support-v1.1.xsd => netex_pointAndLinkSequence_support.xsd} | 0
 ...ce_version-v1.1.xsd => netex_pointAndLinkSequence_version.xsd} | 0
 ...intAndLink_support-v1.1.xsd => netex_pointAndLink_support.xsd} | 0
 ...intAndLink_version-v1.1.xsd => netex_pointAndLink_version.xsd} | 0
 ...x_projection_support-v1.0.xsd => netex_projection_support.xsd} | 0
 ...x_projection_version-v1.0.xsd => netex_projection_version.xsd} | 0
 .../{netex_section_support-v1.1.xsd => netex_section_support.xsd} | 0
 .../{netex_section_version-v1.1.xsd => netex_section_version.xsd} | 0
 ...lFeature_support-v1.0.xsd => netex_spatialFeature_support.xsd} | 0
 ...lFeature_version-v1.0.xsd => netex_spatialFeature_version.xsd} | 0
 ...ojection_version-v1.0.xsd => netex_zoneProjection_version.xsd} | 0
 .../{netex_zone_support-v1.0.xsd => netex_zone_support.xsd}       | 0
 .../{netex_zone_version-v1.1.xsd => netex_zone_version.xsd}       | 0
 ...tex_payload_framework-v1.0.xsd => netex_payload_framework.xsd} | 0
 ...iveText_support-v1.1.xsd => netex_alternativeText_support.xsd} | 0
 ...iveText_version-v1.1.xsd => netex_alternativeText_version.xsd} | 0
 ...x_dataSource_version-v1.0.xsd => netex_dataSource_version.xsd} | 0
 .../{netex_entity_entity-v1.0.xsd => netex_entity_entity.xsd}     | 0
 .../{netex_entity_support-v1.0.xsd => netex_entity_support.xsd}   | 0
 .../{netex_entity_version-v1.0.xsd => netex_entity_version.xsd}   | 0
 .../{netex_relationship-v1.0.xsd => netex_relationship.xsd}       | 0
 ...lationship_support-v1.1.xsd => netex_relationship_support.xsd} | 0
 ...tySet_version-v1.1.xsd => netex_responsibilitySet_version.xsd} | 0
 ...sibility_support-v1.1.xsd => netex_responsibility_support.xsd} | 0
 ...sibility_version-v1.1.xsd => netex_responsibility_version.xsd} | 0
 ...typeOfValue_version-v1.0.xsd => netex_typeOfValue_version.xsd} | 0
 ...ition_support-v1.0.xsd => netex_validityCondition_support.xsd} | 0
 ...ition_version-v1.0.xsd => netex_validityCondition_version.xsd} | 0
 ...rsionDelta_version-v1.0.xsd => netex_versionDelta_version.xsd} | 0
 ...rsionFrame_support-v1.0.xsd => netex_versionFrame_support.xsd} | 0
 ...rsionFrame_version-v1.0.xsd => netex_versionFrame_version.xsd} | 0
 .../{netex_version_support-v1.1.xsd => netex_version_support.xsd} | 0
 .../{netex_version_version-v1.1.xsd => netex_version_version.xsd} | 0
 .../{netex_access_version-v1.0.xsd => netex_access_version.xsd}   | 0
 ...x_accounting_version-v1.0.xsd => netex_accounting_version.xsd} | 0
 .../{netex_address_support-v1.0.xsd => netex_address_support.xsd} | 0
 .../{netex_address_version-v1.1.xsd => netex_address_version.xsd} | 0
 ...mponents-v1.0.xsd => netex_all_objects_reusableComponents.xsd} | 0
 ...n_support-v1.0.xsd => netex_availabilityCondition_support.xsd} | 0
 ...n_version-v1.0.xsd => netex_availabilityCondition_version.xsd} | 0
 .../{netex_country_support-v1.1.xsd => netex_country_support.xsd} | 0
 .../{netex_country_version-v1.1.xsd => netex_country_version.xsd} | 0
 ...propertiesOfDay-v1.0.xsd => netex_dayType_propertiesOfDay.xsd} | 0
 .../{netex_dayType_support-v1.0.xsd => netex_dayType_support.xsd} | 0
 .../{netex_dayType_version-v1.0.xsd => netex_dayType_version.xsd} | 0
 ...entPlace_version-v1.0.xsd => netex_equipmentPlace_version.xsd} | 0
 ...pport-v1.0.xsd => netex_equipmentVehiclePassenger_support.xsd} | 0
 ...rsion-v1.0.xsd => netex_equipmentVehiclePassenger_version.xsd} | 0
 ...tex_equipment_support-v1.0.xsd => netex_equipment_support.xsd} | 0
 ...tex_equipment_version-v1.0.xsd => netex_equipment_version.xsd} | 0
 ...facilityUic_support-v1.0.xsd => netex_facilityUic_support.xsd} | 0
 ...netex_facility_support-v1.1.xsd => netex_facility_support.xsd} | 0
 ...netex_facility_version-v1.0.xsd => netex_facility_version.xsd} | 0
 ...linkByValue_support-v1.0.xsd => netex_linkByValue_support.xsd} | 0
 .../{netex_mode_support-v1.0.xsd => netex_mode_support.xsd}       | 0
 .../{netex_mode_version-v1.0.xsd => netex_mode_version.xsd}       | 0
 ...gnment_version-v1.1.xsd => netex_noticeAssignment_version.xsd} | 0
 .../{netex_notice_support-v1.0.xsd => netex_notice_support.xsd}   | 0
 .../{netex_notice_version-v1.1.xsd => netex_notice_version.xsd}   | 0
 ...ation_support-v1.0.xsd => netex_otherOrganisation_support.xsd} | 0
 ...ation_version-v1.0.xsd => netex_otherOrganisation_version.xsd} | 0
 ...hematicMap_support-v1.0.xsd => netex_schematicMap_support.xsd} | 0
 ...hematicMap_version-v1.0.xsd => netex_schematicMap_version.xsd} | 0
 ...curityList_support-v1.1.xsd => netex_securityList_support.xsd} | 0
 ...curityList_version-v1.1.xsd => netex_securityList_version.xsd} | 0
 ...alendar_support-v1.0.xsd => netex_serviceCalendar_support.xsd} | 0
 ...alendar_version-v1.0.xsd => netex_serviceCalendar_version.xsd} | 0
 .../{netex_submode_version-v1.1.xsd => netex_submode_version.xsd} | 0
 ...cPlace_support-v1.1.xsd => netex_topographicPlace_support.xsd} | 0
 ...cPlace_version-v1.1.xsd => netex_topographicPlace_version.xsd} | 0
 ...ainElement_support-v1.0.xsd => netex_trainElement_support.xsd} | 0
 ...ainElement_version-v1.1.xsd => netex_trainElement_version.xsd} | 0
 ...n_support-v1.0.xsd => netex_transportOrganisation_support.xsd} | 0
 ...n_version-v1.0.xsd => netex_transportOrganisation_version.xsd} | 0
 ...avelRights_support-v1.0.xsd => netex_travelRights_support.xsd} | 0
 ...avelRights_version-v1.1.xsd => netex_travelRights_version.xsd} | 0
 ...vehicleType_support-v1.0.xsd => netex_vehicleType_support.xsd} | 0
 ...vehicleType_version-v1.1.xsd => netex_vehicleType_version.xsd} | 0
 .../{netex_location_types-v1.0.xsd => netex_location_types.xsd}   | 0
 .../netex_utility/{netex_units-v1.0.xsd => netex_units.xsd}       | 0
 .../{netex_utility_contact-v1.0.xsd => netex_utility_contact.xsd} | 0
 .../{netex_utility_time-v1.0.xsd => netex_utility_time.xsd}       | 0
 .../{netex_utility_types-v1.1.xsd => netex_utility_types.xsd}     | 0
 .../{netex_utility_xml-v1.0.xsd => netex_utility_xml.xsd}         | 0
 ...netex_all_frames_part1-v1.0.xsd => netex_all_frames_part1.xsd} | 0
 ...reFrame-v1.0.xsd => netex_all_objects_infrastructureFrame.xsd} | 0
 ...tex_all_objects_part1-v1.0.xsd => netex_all_objects_part1.xsd} | 0
 ...ame_version-v1.0.xsd => netex_infrastructureFrame_version.xsd} | 0
 ...tex_siteFrame_version-v1.1.xsd => netex_siteFrame_version.xsd} | 0
 ...oking_support-v1.0.xsd => netex_assistanceBooking_support.xsd} | 0
 ...oking_version-v1.0.xsd => netex_assistanceBooking_version.xsd} | 0
 ...tex_ifopt_all_objects-v1.0.xsd => netex_ifopt_all_objects.xsd} | 0
 ...t_support-v1.1.xsd => netex_ifopt_checkConstraint_support.xsd} | 0
 ...t_version-v1.1.xsd => netex_ifopt_checkConstraint_version.xsd} | 0
 ...s_support-v1.0.xsd => netex_ifopt_equipmentAccess_support.xsd} | 0
 ...s_version-v1.0.xsd => netex_ifopt_equipmentAccess_version.xsd} | 0
 ...x_ifopt_equipmentAll-v1.0.xsd => netex_ifopt_equipmentAll.xsd} | 0
 ..._support-v1.0.xsd => netex_ifopt_equipmentParking_support.xsd} | 0
 ..._version-v1.0.xsd => netex_ifopt_equipmentParking_version.xsd} | 0
 ...upport-v1.0.xsd => netex_ifopt_equipmentPassenger_support.xsd} | 0
 ...ersion-v1.1.xsd => netex_ifopt_equipmentPassenger_version.xsd} | 0
 ...ns_support-v1.0.xsd => netex_ifopt_equipmentSigns_support.xsd} | 0
 ...ns_version-v1.0.xsd => netex_ifopt_equipmentSigns_version.xsd} | 0
 ...upport-v1.0.xsd => netex_ifopt_equipmentTicketing_support.xsd} | 0
 ...ersion-v1.0.xsd => netex_ifopt_equipmentTicketing_version.xsd} | 0
 ..._support-v1.0.xsd => netex_ifopt_equipmentWaiting_support.xsd} | 0
 ..._version-v1.0.xsd => netex_ifopt_equipmentWaiting_version.xsd} | 0
 ...support-v1.0.xsd => netex_ifopt_flexibleStopPlace_support.xsd} | 0
 ...version-v1.0.xsd => netex_ifopt_flexibleStopPlace_version.xsd} | 0
 ...rt-v1.0.xsd => netex_ifopt_localServiceCommercial_support.xsd} | 0
 ...on-v1.0.xsd => netex_ifopt_localServiceCommercial_version.xsd} | 0
 ...vice_support-v1.0.xsd => netex_ifopt_localService_support.xsd} | 0
 ...vice_version-v1.1.xsd => netex_ifopt_localService_version.xsd} | 0
 ...th_version-v1.1.xsd => netex_ifopt_navigationPath_version.xsd} | 0
 ...t_parking_support-v1.1.xsd => netex_ifopt_parking_support.xsd} | 0
 ...t_parking_version-v1.1.xsd => netex_ifopt_parking_version.xsd} | 0
 ...x_ifopt_path_support-v1.0.xsd => netex_ifopt_path_support.xsd} | 0
 ...x_ifopt_path_version-v1.0.xsd => netex_ifopt_path_version.xsd} | 0
 ...t_support-v1.0.xsd => netex_ifopt_pointOfInterest_support.xsd} | 0
 ...t_version-v1.0.xsd => netex_ifopt_pointOfInterest_version.xsd} | 0
 ...re_support-v1.0.xsd => netex_ifopt_serviceFeature_support.xsd} | 0
 ...re_version-v1.0.xsd => netex_ifopt_serviceFeature_version.xsd} | 0
 ...x_ifopt_site_support-v1.0.xsd => netex_ifopt_site_support.xsd} | 0
 ...x_ifopt_site_version-v1.0.xsd => netex_ifopt_site_version.xsd} | 0
 ...opPlace_support-v1.1.xsd => netex_ifopt_stopPlace_support.xsd} | 0
 ...opPlace_version-v1.1.xsd => netex_ifopt_stopPlace_version.xsd} | 0
 ...g_support-v1.0.xsd => netex_ifopt_vehicleStopping_support.xsd} | 0
 ...x_activation_support-v1.0.xsd => netex_activation_support.xsd} | 0
 ...x_activation_version-v1.0.xsd => netex_activation_version.xsd} | 0
 ...d => netex_all_objects_part1_infrastructureFrame_contents.xsd} | 0
 ...1_lineRoute-v1.0.xsd => netex_all_objects_part1_lineRoute.xsd} | 0
 ...on-v1.0.xsd => netex_all_objects_part1_networkDescription.xsd} | 0
 ...Network_support-v1.0.xsd => netex_flexibleNetwork_support.xsd} | 0
 ...Network_version-v1.1.xsd => netex_flexibleNetwork_version.xsd} | 0
 ...lineNetwork_support-v1.1.xsd => netex_lineNetwork_support.xsd} | 0
 ...lineNetwork_version-v1.1.xsd => netex_lineNetwork_version.xsd} | 0
 .../{netex_line_support-v1.1.xsd => netex_line_support.xsd}       | 0
 .../{netex_line_version-v1.1.xsd => netex_line_version.xsd}       | 0
 ...e_support-v1.0.xsd => netex_networkInfrastructure_support.xsd} | 0
 ...e_version-v1.0.xsd => netex_networkInfrastructure_version.xsd} | 0
 ...tion_support-v1.0.xsd => netex_networkRestriction_support.xsd} | 0
 ...tion_version-v1.0.xsd => netex_networkRestriction_version.xsd} | 0
 ...uction_support-v1.1.xsd => netex_routeInstruction_support.xsd} | 0
 ...uction_version-v1.1.xsd => netex_routeInstruction_version.xsd} | 0
 .../{netex_route_support-v1.1.xsd => netex_route_support.xsd}     | 0
 .../{netex_route_version-v1.1.xsd => netex_route_version.xsd}     | 0
 ...ngPattern_support-v1.1.xsd => netex_timingPattern_support.xsd} | 0
 ...int_support-v1.0.xsd => netex_vehicleAndCrewPoint_support.xsd} | 0
 ...int_version-v1.1.xsd => netex_vehicleAndCrewPoint_version.xsd} | 0
 ...ning-v1.0.xsd => netex_all_objects_part1_tacticalPlanning.xsd} | 0
 ...onSection_support-v1.1.xsd => netex_commonSection_support.xsd} | 0
 ...onSection_version-v1.1.xsd => netex_commonSection_version.xsd} | 0
 ...netex_fareZone_support-v1.1.xsd => netex_fareZone_support.xsd} | 0
 ...netex_fareZone_version-v1.1.xsd => netex_fareZone_version.xsd} | 0
 ...s_support-v1.0.xsd => netex_journeyPatternTimings_support.xsd} | 0
 ...s_version-v1.0.xsd => netex_journeyPatternTimings_version.xsd} | 0
 ...yPattern_support-v1.0.xsd => netex_journeyPattern_support.xsd} | 0
 ...yPattern_version-v1.1.xsd => netex_journeyPattern_version.xsd} | 0
 ...neyTiming_support-v1.0.xsd => netex_journeyTiming_support.xsd} | 0
 ...neyTiming_version-v1.0.xsd => netex_journeyTiming_version.xsd} | 0
 ...t-v1.0.xsd => netex_passengerInformationEquipment_support.xsd} | 0
 ...n-v1.0.xsd => netex_passengerInformationEquipment_version.xsd} | 0
 ...signment_version-v1.0.xsd => netex_pathAssignment_version.xsd} | 0
 ...raint_support-v1.0.xsd => netex_routingConstraint_support.xsd} | 0
 ...raint_version-v1.0.xsd => netex_routingConstraint_version.xsd} | 0
 ...ePattern_support-v1.1.xsd => netex_servicePattern_support.xsd} | 0
 ...ePattern_version-v1.1.xsd => netex_servicePattern_version.xsd} | 0
 ...nnection_support-v1.0.xsd => netex_siteConnection_support.xsd} | 0
 ...nnection_version-v1.0.xsd => netex_siteConnection_version.xsd} | 0
 ...signment_support-v1.0.xsd => netex_stopAssignment_support.xsd} | 0
 ...signment_version-v1.1.xsd => netex_stopAssignment_version.xsd} | 0
 ...mandType_support-v1.0.xsd => netex_timeDemandType_support.xsd} | 0
 ...mandType_version-v1.0.xsd => netex_timeDemandType_version.xsd} | 0
 ...ngPattern_version-v1.1.xsd => netex_timingPattern_version.xsd} | 0
 ...netex_all_frames_part2-v1.0.xsd => netex_all_frames_part2.xsd} | 0
 ...tex_all_objects_part2-v1.0.xsd => netex_all_objects_part2.xsd} | 0
 ...ame_version-v1.0.xsd => netex_driverScheduleFrame_version.xsd} | 0
 ...rviceFrame_version-v1.1.xsd => netex_serviceFrame_version.xsd} | 0
 ...bleFrame_support-v1.0.xsd => netex_timetableFrame_support.xsd} | 0
 ...bleFrame_version-v1.0.xsd => netex_timetableFrame_version.xsd} | 0
 ...me_version-v1.0.xsd => netex_vehicleScheduleFrame_version.xsd} | 0
 ...neyTimes-v1.0.xsd => netex_all_objects_part2_journeyTimes.xsd} | 0
 .../{netex_call_support-v1.0.xsd => netex_call_support.xsd}       | 0
 .../{netex_call_version-v1.1.xsd => netex_call_version.xsd}       | 0
 ...dJourney_support-v1.1.xsd => netex_coupledJourney_support.xsd} | 0
 ...dJourney_version-v1.1.xsd => netex_coupledJourney_version.xsd} | 0
 ...Times_version-v1.1.xsd => netex_datedPassingTimes_version.xsd} | 0
 ...ney_support-v1.0.xsd => netex_datedVehicleJourney_support.xsd} | 0
 ...ney_version-v1.0.xsd => netex_datedVehicleJourney_version.xsd} | 0
 ...Service_support-v1.0.xsd => netex_flexibleService_support.xsd} | 0
 ...Service_version-v1.0.xsd => netex_flexibleService_version.xsd} | 0
 ...ngeRule_version-v1.1.xsd => netex_interchangeRule_version.xsd} | 0
 ...interchange_support-v1.0.xsd => netex_interchange_support.xsd} | 0
 ...interchange_version-v1.1.xsd => netex_interchange_version.xsd} | 0
 ...nting_support-v1.0.xsd => netex_journeyAccounting_support.xsd} | 0
 ...nting_version-v1.0.xsd => netex_journeyAccounting_version.xsd} | 0
 ...nator_support-v1.0.xsd => netex_journeyDesignator_support.xsd} | 0
 .../{netex_journey_version-v1.1.xsd => netex_journey_version.xsd} | 0
 ...ssingTimes_support-v1.0.xsd => netex_passingTimes_support.xsd} | 0
 ...ssingTimes_version-v1.1.xsd => netex_passingTimes_version.xsd} | 0
 ...eJourney_support-v1.0.xsd => netex_serviceJourney_support.xsd} | 0
 ...eJourney_version-v1.1.xsd => netex_serviceJourney_version.xsd} | 0
 ...serviceView_version-v1.0.xsd => netex_serviceView_version.xsd} | 0
 ...ofile_version-v1.0.xsd => netex_timeDemandProfile_version.xsd} | 0
 ...ndTimes_version-v1.0.xsd => netex_timeDemandTimes_version.xsd} | 0
 ...support-v1.0.xsd => netex_vehicleJourneyFrequency_support.xsd} | 0
 ...version-v1.1.xsd => netex_vehicleJourneyFrequency_version.xsd} | 0
 ...mes_support-v1.0.xsd => netex_vehicleJourneyTimes_support.xsd} | 0
 ...mes_version-v1.0.xsd => netex_vehicleJourneyTimes_version.xsd} | 0
 ...eJourney_support-v1.0.xsd => netex_vehicleJourney_support.xsd} | 0
 ...eJourney_version-v1.1.xsd => netex_vehicleJourney_version.xsd} | 0
 ...eService_support-v1.0.xsd => netex_vehicleService_support.xsd} | 0
 ...ervice-v1.0.xsd => netex_all_objects_part2_vehicleService.xsd} | 0
 .../{netex_duty_support-v1.0.xsd => netex_duty_support.xsd}       | 0
 .../{netex_duty_version-v1.0.xsd => netex_duty_version.xsd}       | 0
 ...eService_version-v1.1.xsd => netex_vehicleService_version.xsd} | 0
 ...part3_piQuery-v1.0.xsd => netex_all_objects_part3_piQuery.xsd} | 0
 .../{netex_piQuery_support-v1.0.xsd => netex_piQuery_support.xsd} | 0
 ...tex_piRequest_support-v1.1.xsd => netex_piRequest_support.xsd} | 0
 ...er_support-v1.0.xsd => netex_accessRightParameter_support.xsd} | 0
 ...er_version-v1.1.xsd => netex_accessRightParameter_version.xsd} | 0
 ...cts_part3_fares-v1.1.xsd => netex_all_objects_part3_fares.xsd} | 0
 ...rt3_fares_AR-v1.1.xsd => netex_all_objects_part3_fares_AR.xsd} | 0
 ...rt3_fares_FP-v1.1.xsd => netex_all_objects_part3_fares_FP.xsd} | 0
 ...rt3_fares_FS-v1.1.xsd => netex_all_objects_part3_fares_FS.xsd} | 0
 ...rt3_fares_SD-v1.1.xsd => netex_all_objects_part3_fares_SD.xsd} | 0
 ...s_support-v1.0.xsd => netex_calculationParameters_support.xsd} | 0
 ...s_version-v1.0.xsd => netex_calculationParameters_version.xsd} | 0
 ...t_support-v1.0.xsd => netex_distanceMatrixElement_support.xsd} | 0
 ...t_version-v1.1.xsd => netex_distanceMatrixElement_version.xsd} | 0
 ...ry_support-v1.0.xsd => netex_fareConditionSummary_support.xsd} | 0
 ...ry_version-v1.0.xsd => netex_fareConditionSummary_version.xsd} | 0
 ...tex_farePrice_support-v1.0.xsd => netex_farePrice_support.xsd} | 0
 ...tex_farePrice_version-v1.1.xsd => netex_farePrice_version.xsd} | 0
 ...fareProduct_support-v1.0.xsd => netex_fareProduct_support.xsd} | 0
 ...fareProduct_version-v1.1.xsd => netex_fareProduct_version.xsd} | 0
 ...x_fareSeries_support-v1.0.xsd => netex_fareSeries_support.xsd} | 0
 ...x_fareSeries_version-v1.0.xsd => netex_fareSeries_version.xsd} | 0
 ...nt_support-v1.0.xsd => netex_fareStructureElement_support.xsd} | 0
 ...nt_version-v1.1.xsd => netex_fareStructureElement_version.xsd} | 0
 ...Structure_support-v1.0.xsd => netex_fareStructure_support.xsd} | 0
 ...Structure_version-v1.0.xsd => netex_fareStructure_version.xsd} | 0
 ...tex_fareTable_support-v1.0.xsd => netex_fareTable_support.xsd} | 0
 ...tex_fareTable_version-v1.1.xsd => netex_fareTable_version.xsd} | 0
 ...pport-v1.0.xsd => netex_geographicStructureFactor_support.xsd} | 0
 ...rsion-v1.0.xsd => netex_geographicStructureFactor_version.xsd} | 0
 ..._support-v1.0.xsd => netex_qualityStructureFactor_support.xsd} | 0
 ..._version-v1.0.xsd => netex_qualityStructureFactor_version.xsd} | 0
 ...ution_support-v1.0.xsd => netex_salesDistribution_support.xsd} | 0
 ...ution_version-v1.0.xsd => netex_salesDistribution_version.xsd} | 0
 ...ckage_support-v1.1.xsd => netex_salesOfferPackage_support.xsd} | 0
 ...ckage_version-v1.1.xsd => netex_salesOfferPackage_version.xsd} | 0
 ...lesPackage_support-v1.1.xsd => netex_salesPackage_support.xsd} | 0
 ...lesPackage_version-v1.1.xsd => netex_salesPackage_version.xsd} | 0
 ...tor_support-v1.0.xsd => netex_timeStructureFactor_support.xsd} | 0
 ...tor_version-v1.0.xsd => netex_timeStructureFactor_version.xsd} | 0
 ...Document_support-v1.1.xsd => netex_travelDocument_support.xsd} | 0
 ...Document_version-v1.1.xsd => netex_travelDocument_version.xsd} | 0
 ...upport-v1.0.xsd => netex_usageParameterAfterSales_support.xsd} | 0
 ...ersion-v1.0.xsd => netex_usageParameterAfterSales_version.xsd} | 0
 ...g_support-v1.0.xsd => netex_usageParameterBooking_support.xsd} | 0
 ...g_version-v1.0.xsd => netex_usageParameterBooking_version.xsd} | 0
 ..._support-v1.0.xsd => netex_usageParameterCharging_support.xsd} | 0
 ..._version-v1.0.xsd => netex_usageParameterCharging_version.xsd} | 0
 ...pport-v1.0.xsd => netex_usageParameterEligibility_support.xsd} | 0
 ...rsion-v1.0.xsd => netex_usageParameterEligibility_version.xsd} | 0
 ...pport-v1.0.xsd => netex_usageParameterEntitlement_support.xsd} | 0
 ...rsion-v1.0.xsd => netex_usageParameterEntitlement_version.xsd} | 0
 ...e_support-v1.0.xsd => netex_usageParameterLuggage_support.xsd} | 0
 ...e_version-v1.0.xsd => netex_usageParameterLuggage_version.xsd} | 0
 ...el_support-v1.1.xsd => netex_usageParameterTravel_support.xsd} | 0
 ...el_version-v1.0.xsd => netex_usageParameterTravel_version.xsd} | 0
 ...arameter_support-v1.0.xsd => netex_usageParameter_support.xsd} | 0
 ...arameter_version-v1.0.xsd => netex_usageParameter_version.xsd} | 0
 ...sAll_support-v1.0.xsd => netex_usageParametersAll_support.xsd} | 0
 ...lement_support-v1.0.xsd => netex_validableElement_support.xsd} | 0
 ...lement_version-v1.0.xsd => netex_validableElement_version.xsd} | 0
 ...netex_all_frames_part3-v1.0.xsd => netex_all_frames_part3.xsd} | 0
 ...tex_fareFrame_version-v1.0.xsd => netex_fareFrame_version.xsd} | 0
 ...e_version-v1.1.xsd => netex_salesTransactionFrame_version.xsd} | 0
 ...monitoring-v1.0.xsd => netex_all_objects_part3_monitoring.xsd} | 0
 ...toredCall_version-v1.0.xsd => netex_monitoredCall_version.xsd} | 0
 ...s_version-v1.1.xsd => netex_monitoredPassingTimes_version.xsd} | 0
 ...support-v1.0.xsd => netex_monitoredVehicleJourney_support.xsd} | 0
 ...part3_parking-v1.0.xsd => netex_all_objects_part3_parking.xsd} | 0
 ...ingTariff_support-v1.1.xsd => netex_parkingTariff_support.xsd} | 0
 ...ingTariff_version-v1.1.xsd => netex_parkingTariff_version.xsd} | 0
 ...ons-v1.0.xsd => netex_all_objects_part3_salesTransactions.xsd} | 0
 ...ity_support-v1.1.xsd => netex_customerEligibility_support.xsd} | 0
 ...ity_version-v1.1.xsd => netex_customerEligibility_version.xsd} | 0
 ...support-v1.1.xsd => netex_customerPurchasePackage_support.xsd} | 0
 ...version-v1.1.xsd => netex_customerPurchasePackage_version.xsd} | 0
 ...ortium_support-v1.1.xsd => netex_retailConsortium_support.xsd} | 0
 ...ortium_version-v1.1.xsd => netex_retailConsortium_version.xsd} | 0
 ...sContract_support-v1.1.xsd => netex_salesContract_support.xsd} | 0
 ...sContract_version-v1.1.xsd => netex_salesContract_version.xsd} | 0
 ...action_support-v1.0.xsd => netex_salesTransaction_support.xsd} | 0
 ...action_version-v1.1.xsd => netex_salesTransaction_version.xsd} | 0
 xsd/netex_service/{netex_all-v1.0.xsd => netex_all.xsd}           | 0
 .../{netex_all_filters-v1.0.xsd => netex_all_filters.xsd}         | 0
 ...quest_service-v1.0.xsd => netex_dataObjectRequest_service.xsd} | 0
 .../{netex_filter_frame-v1.0.xsd => netex_filter_frame.xsd}       | 0
 .../{netex_filter_object-v1.0.xsd => netex_filter_object.xsd}     | 0
 ...netex_subThing_support-v0.1.xsd => netex_subThing_support.xsd} | 0
 ...netex_subThing_version-v0.1.xsd => netex_subThing_version.xsd} | 0
 .../{netex_thing_support-v0.1.xsd => netex_thing_support.xsd}     | 0
 .../{netex_thing_version-v0.1.xsd => netex_thing_version.xsd}     | 0
 336 files changed, 0 insertions(+), 0 deletions(-)
 rename xsd/netex_framework/{netex_all_objects_framework-v1.0.xsd => netex_all_objects_framework.xsd} (100%)
 rename xsd/netex_framework/{netex_all_objects_generic-v1.0.xsd => netex_all_objects_generic.xsd} (100%)
 rename xsd/netex_framework/netex_frames/{netex_all_frames_framework-v1.0.xsd => netex_all_frames_framework.xsd} (100%)
 rename xsd/netex_framework/netex_frames/{netex_commonFrame_version-v1.0.xsd => netex_commonFrame_version.xsd} (100%)
 rename xsd/netex_framework/netex_frames/{netex_compositeFrame_version-v1.0.xsd => netex_compositeFrame_version.xsd} (100%)
 rename xsd/netex_framework/netex_frames/{netex_generalFrame_version-v1.0.xsd => netex_generalFrame_version.xsd} (100%)
 rename xsd/netex_framework/netex_frames/{netex_resourceFrame_support-v1.0.xsd => netex_resourceFrame_support.xsd} (100%)
 rename xsd/netex_framework/netex_frames/{netex_resourceFrame_version-v1.1.xsd => netex_resourceFrame_version.xsd} (100%)
 rename xsd/netex_framework/netex_frames/{netex_serviceCalendarFrame_support-v1.0.xsd => netex_serviceCalendarFrame_support.xsd} (100%)
 rename xsd/netex_framework/netex_frames/{netex_serviceCalendarFrame_version-v1.0.xsd => netex_serviceCalendarFrame_version.xsd} (100%)
 rename xsd/netex_framework/netex_genericFramework/netex_accessibility/{netex_acsb_accessibility-v1.1.xsd => netex_acsb_accessibility.xsd} (100%)
 rename xsd/netex_framework/netex_genericFramework/netex_accessibility/{netex_acsb_all-v1.0.xsd => netex_acsb_all.xsd} (100%)
 rename xsd/netex_framework/netex_genericFramework/netex_accessibility/{netex_acsb_limitations-v1.0.xsd => netex_acsb_limitations.xsd} (100%)
 rename xsd/netex_framework/netex_genericFramework/netex_accessibility/{netex_acsb_passengerMobility-v1.0.xsd => netex_acsb_passengerMobility.xsd} (100%)
 rename xsd/netex_framework/netex_genericFramework/netex_accessibility/{netex_acsb_support-v1.0.xsd => netex_acsb_support.xsd} (100%)
 rename xsd/netex_framework/netex_genericFramework/{netex_alternativeName_support-v1.0.xsd => netex_alternativeName_support.xsd} (100%)
 rename xsd/netex_framework/netex_genericFramework/{netex_alternativeName_version-v1.0.xsd => netex_alternativeName_version.xsd} (100%)
 rename xsd/netex_framework/netex_genericFramework/{netex_assignment_support-v1.0.xsd => netex_assignment_support.xsd} (100%)
 rename xsd/netex_framework/netex_genericFramework/{netex_assignment_version-v1.0.xsd => netex_assignment_version.xsd} (100%)
 rename xsd/netex_framework/netex_genericFramework/{netex_grouping_support-v1.0.xsd => netex_grouping_support.xsd} (100%)
 rename xsd/netex_framework/netex_genericFramework/{netex_grouping_version-v1.1.xsd => netex_grouping_version.xsd} (100%)
 rename xsd/netex_framework/netex_genericFramework/{netex_layer_support-v1.0.xsd => netex_layer_support.xsd} (100%)
 rename xsd/netex_framework/netex_genericFramework/{netex_layer_version-v1.0.xsd => netex_layer_version.xsd} (100%)
 rename xsd/netex_framework/netex_genericFramework/{netex_loggable_support-v1.1.xsd => netex_loggable_support.xsd} (100%)
 rename xsd/netex_framework/netex_genericFramework/{netex_loggable_version-v1.1.xsd => netex_loggable_version.xsd} (100%)
 rename xsd/netex_framework/netex_genericFramework/{netex_organisation_support-v1.1.xsd => netex_organisation_support.xsd} (100%)
 rename xsd/netex_framework/netex_genericFramework/{netex_organisation_version-v1.1.xsd => netex_organisation_version.xsd} (100%)
 rename xsd/netex_framework/netex_genericFramework/{netex_place_support-v1.0.xsd => netex_place_support.xsd} (100%)
 rename xsd/netex_framework/netex_genericFramework/{netex_place_version-v1.1.xsd => netex_place_version.xsd} (100%)
 rename xsd/netex_framework/netex_genericFramework/{netex_pointAndLinkSequence_support-v1.1.xsd => netex_pointAndLinkSequence_support.xsd} (100%)
 rename xsd/netex_framework/netex_genericFramework/{netex_pointAndLinkSequence_version-v1.1.xsd => netex_pointAndLinkSequence_version.xsd} (100%)
 rename xsd/netex_framework/netex_genericFramework/{netex_pointAndLink_support-v1.1.xsd => netex_pointAndLink_support.xsd} (100%)
 rename xsd/netex_framework/netex_genericFramework/{netex_pointAndLink_version-v1.1.xsd => netex_pointAndLink_version.xsd} (100%)
 rename xsd/netex_framework/netex_genericFramework/{netex_projection_support-v1.0.xsd => netex_projection_support.xsd} (100%)
 rename xsd/netex_framework/netex_genericFramework/{netex_projection_version-v1.0.xsd => netex_projection_version.xsd} (100%)
 rename xsd/netex_framework/netex_genericFramework/{netex_section_support-v1.1.xsd => netex_section_support.xsd} (100%)
 rename xsd/netex_framework/netex_genericFramework/{netex_section_version-v1.1.xsd => netex_section_version.xsd} (100%)
 rename xsd/netex_framework/netex_genericFramework/{netex_spatialFeature_support-v1.0.xsd => netex_spatialFeature_support.xsd} (100%)
 rename xsd/netex_framework/netex_genericFramework/{netex_spatialFeature_version-v1.0.xsd => netex_spatialFeature_version.xsd} (100%)
 rename xsd/netex_framework/netex_genericFramework/{netex_zoneProjection_version-v1.0.xsd => netex_zoneProjection_version.xsd} (100%)
 rename xsd/netex_framework/netex_genericFramework/{netex_zone_support-v1.0.xsd => netex_zone_support.xsd} (100%)
 rename xsd/netex_framework/netex_genericFramework/{netex_zone_version-v1.1.xsd => netex_zone_version.xsd} (100%)
 rename xsd/netex_framework/{netex_payload_framework-v1.0.xsd => netex_payload_framework.xsd} (100%)
 rename xsd/netex_framework/netex_responsibility/{netex_alternativeText_support-v1.1.xsd => netex_alternativeText_support.xsd} (100%)
 rename xsd/netex_framework/netex_responsibility/{netex_alternativeText_version-v1.1.xsd => netex_alternativeText_version.xsd} (100%)
 rename xsd/netex_framework/netex_responsibility/{netex_dataSource_version-v1.0.xsd => netex_dataSource_version.xsd} (100%)
 rename xsd/netex_framework/netex_responsibility/{netex_entity_entity-v1.0.xsd => netex_entity_entity.xsd} (100%)
 rename xsd/netex_framework/netex_responsibility/{netex_entity_support-v1.0.xsd => netex_entity_support.xsd} (100%)
 rename xsd/netex_framework/netex_responsibility/{netex_entity_version-v1.0.xsd => netex_entity_version.xsd} (100%)
 rename xsd/netex_framework/netex_responsibility/{netex_relationship-v1.0.xsd => netex_relationship.xsd} (100%)
 rename xsd/netex_framework/netex_responsibility/{netex_relationship_support-v1.1.xsd => netex_relationship_support.xsd} (100%)
 rename xsd/netex_framework/netex_responsibility/{netex_responsibilitySet_version-v1.1.xsd => netex_responsibilitySet_version.xsd} (100%)
 rename xsd/netex_framework/netex_responsibility/{netex_responsibility_support-v1.1.xsd => netex_responsibility_support.xsd} (100%)
 rename xsd/netex_framework/netex_responsibility/{netex_responsibility_version-v1.1.xsd => netex_responsibility_version.xsd} (100%)
 rename xsd/netex_framework/netex_responsibility/{netex_typeOfValue_version-v1.0.xsd => netex_typeOfValue_version.xsd} (100%)
 rename xsd/netex_framework/netex_responsibility/{netex_validityCondition_support-v1.0.xsd => netex_validityCondition_support.xsd} (100%)
 rename xsd/netex_framework/netex_responsibility/{netex_validityCondition_version-v1.0.xsd => netex_validityCondition_version.xsd} (100%)
 rename xsd/netex_framework/netex_responsibility/{netex_versionDelta_version-v1.0.xsd => netex_versionDelta_version.xsd} (100%)
 rename xsd/netex_framework/netex_responsibility/{netex_versionFrame_support-v1.0.xsd => netex_versionFrame_support.xsd} (100%)
 rename xsd/netex_framework/netex_responsibility/{netex_versionFrame_version-v1.0.xsd => netex_versionFrame_version.xsd} (100%)
 rename xsd/netex_framework/netex_responsibility/{netex_version_support-v1.1.xsd => netex_version_support.xsd} (100%)
 rename xsd/netex_framework/netex_responsibility/{netex_version_version-v1.1.xsd => netex_version_version.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_access_version-v1.0.xsd => netex_access_version.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_accounting_version-v1.0.xsd => netex_accounting_version.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_address_support-v1.0.xsd => netex_address_support.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_address_version-v1.1.xsd => netex_address_version.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_all_objects_reusableComponents-v1.0.xsd => netex_all_objects_reusableComponents.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_availabilityCondition_support-v1.0.xsd => netex_availabilityCondition_support.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_availabilityCondition_version-v1.0.xsd => netex_availabilityCondition_version.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_country_support-v1.1.xsd => netex_country_support.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_country_version-v1.1.xsd => netex_country_version.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_dayType_propertiesOfDay-v1.0.xsd => netex_dayType_propertiesOfDay.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_dayType_support-v1.0.xsd => netex_dayType_support.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_dayType_version-v1.0.xsd => netex_dayType_version.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_equipmentPlace_version-v1.0.xsd => netex_equipmentPlace_version.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_equipmentVehiclePassenger_support-v1.0.xsd => netex_equipmentVehiclePassenger_support.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_equipmentVehiclePassenger_version-v1.0.xsd => netex_equipmentVehiclePassenger_version.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_equipment_support-v1.0.xsd => netex_equipment_support.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_equipment_version-v1.0.xsd => netex_equipment_version.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_facilityUic_support-v1.0.xsd => netex_facilityUic_support.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_facility_support-v1.1.xsd => netex_facility_support.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_facility_version-v1.0.xsd => netex_facility_version.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_linkByValue_support-v1.0.xsd => netex_linkByValue_support.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_mode_support-v1.0.xsd => netex_mode_support.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_mode_version-v1.0.xsd => netex_mode_version.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_noticeAssignment_version-v1.1.xsd => netex_noticeAssignment_version.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_notice_support-v1.0.xsd => netex_notice_support.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_notice_version-v1.1.xsd => netex_notice_version.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_otherOrganisation_support-v1.0.xsd => netex_otherOrganisation_support.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_otherOrganisation_version-v1.0.xsd => netex_otherOrganisation_version.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_schematicMap_support-v1.0.xsd => netex_schematicMap_support.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_schematicMap_version-v1.0.xsd => netex_schematicMap_version.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_securityList_support-v1.1.xsd => netex_securityList_support.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_securityList_version-v1.1.xsd => netex_securityList_version.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_serviceCalendar_support-v1.0.xsd => netex_serviceCalendar_support.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_serviceCalendar_version-v1.0.xsd => netex_serviceCalendar_version.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_submode_version-v1.1.xsd => netex_submode_version.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_topographicPlace_support-v1.1.xsd => netex_topographicPlace_support.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_topographicPlace_version-v1.1.xsd => netex_topographicPlace_version.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_trainElement_support-v1.0.xsd => netex_trainElement_support.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_trainElement_version-v1.1.xsd => netex_trainElement_version.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_transportOrganisation_support-v1.0.xsd => netex_transportOrganisation_support.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_transportOrganisation_version-v1.0.xsd => netex_transportOrganisation_version.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_travelRights_support-v1.0.xsd => netex_travelRights_support.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_travelRights_version-v1.1.xsd => netex_travelRights_version.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_vehicleType_support-v1.0.xsd => netex_vehicleType_support.xsd} (100%)
 rename xsd/netex_framework/netex_reusableComponents/{netex_vehicleType_version-v1.1.xsd => netex_vehicleType_version.xsd} (100%)
 rename xsd/netex_framework/netex_utility/{netex_location_types-v1.0.xsd => netex_location_types.xsd} (100%)
 rename xsd/netex_framework/netex_utility/{netex_units-v1.0.xsd => netex_units.xsd} (100%)
 rename xsd/netex_framework/netex_utility/{netex_utility_contact-v1.0.xsd => netex_utility_contact.xsd} (100%)
 rename xsd/netex_framework/netex_utility/{netex_utility_time-v1.0.xsd => netex_utility_time.xsd} (100%)
 rename xsd/netex_framework/netex_utility/{netex_utility_types-v1.1.xsd => netex_utility_types.xsd} (100%)
 rename xsd/netex_framework/netex_utility/{netex_utility_xml-v1.0.xsd => netex_utility_xml.xsd} (100%)
 rename xsd/netex_part_1/{netex_all_frames_part1-v1.0.xsd => netex_all_frames_part1.xsd} (100%)
 rename xsd/netex_part_1/{netex_all_objects_infrastructureFrame-v1.0.xsd => netex_all_objects_infrastructureFrame.xsd} (100%)
 rename xsd/netex_part_1/{netex_all_objects_part1-v1.0.xsd => netex_all_objects_part1.xsd} (100%)
 rename xsd/netex_part_1/part1_frames/{netex_infrastructureFrame_version-v1.0.xsd => netex_infrastructureFrame_version.xsd} (100%)
 rename xsd/netex_part_1/part1_frames/{netex_siteFrame_version-v1.1.xsd => netex_siteFrame_version.xsd} (100%)
 rename xsd/netex_part_1/part1_ifopt/{netex_assistanceBooking_support-v1.0.xsd => netex_assistanceBooking_support.xsd} (100%)
 rename xsd/netex_part_1/part1_ifopt/{netex_assistanceBooking_version-v1.0.xsd => netex_assistanceBooking_version.xsd} (100%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_all_objects-v1.0.xsd => netex_ifopt_all_objects.xsd} (100%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_checkConstraint_support-v1.1.xsd => netex_ifopt_checkConstraint_support.xsd} (100%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_checkConstraint_version-v1.1.xsd => netex_ifopt_checkConstraint_version.xsd} (100%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_equipmentAccess_support-v1.0.xsd => netex_ifopt_equipmentAccess_support.xsd} (100%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_equipmentAccess_version-v1.0.xsd => netex_ifopt_equipmentAccess_version.xsd} (100%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_equipmentAll-v1.0.xsd => netex_ifopt_equipmentAll.xsd} (100%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_equipmentParking_support-v1.0.xsd => netex_ifopt_equipmentParking_support.xsd} (100%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_equipmentParking_version-v1.0.xsd => netex_ifopt_equipmentParking_version.xsd} (100%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_equipmentPassenger_support-v1.0.xsd => netex_ifopt_equipmentPassenger_support.xsd} (100%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_equipmentPassenger_version-v1.1.xsd => netex_ifopt_equipmentPassenger_version.xsd} (100%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_equipmentSigns_support-v1.0.xsd => netex_ifopt_equipmentSigns_support.xsd} (100%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_equipmentSigns_version-v1.0.xsd => netex_ifopt_equipmentSigns_version.xsd} (100%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_equipmentTicketing_support-v1.0.xsd => netex_ifopt_equipmentTicketing_support.xsd} (100%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_equipmentTicketing_version-v1.0.xsd => netex_ifopt_equipmentTicketing_version.xsd} (100%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_equipmentWaiting_support-v1.0.xsd => netex_ifopt_equipmentWaiting_support.xsd} (100%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_equipmentWaiting_version-v1.0.xsd => netex_ifopt_equipmentWaiting_version.xsd} (100%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_flexibleStopPlace_support-v1.0.xsd => netex_ifopt_flexibleStopPlace_support.xsd} (100%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_flexibleStopPlace_version-v1.0.xsd => netex_ifopt_flexibleStopPlace_version.xsd} (100%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_localServiceCommercial_support-v1.0.xsd => netex_ifopt_localServiceCommercial_support.xsd} (100%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_localServiceCommercial_version-v1.0.xsd => netex_ifopt_localServiceCommercial_version.xsd} (100%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_localService_support-v1.0.xsd => netex_ifopt_localService_support.xsd} (100%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_localService_version-v1.1.xsd => netex_ifopt_localService_version.xsd} (100%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_navigationPath_version-v1.1.xsd => netex_ifopt_navigationPath_version.xsd} (100%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_parking_support-v1.1.xsd => netex_ifopt_parking_support.xsd} (100%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_parking_version-v1.1.xsd => netex_ifopt_parking_version.xsd} (100%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_path_support-v1.0.xsd => netex_ifopt_path_support.xsd} (100%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_path_version-v1.0.xsd => netex_ifopt_path_version.xsd} (100%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_pointOfInterest_support-v1.0.xsd => netex_ifopt_pointOfInterest_support.xsd} (100%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_pointOfInterest_version-v1.0.xsd => netex_ifopt_pointOfInterest_version.xsd} (100%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_serviceFeature_support-v1.0.xsd => netex_ifopt_serviceFeature_support.xsd} (100%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_serviceFeature_version-v1.0.xsd => netex_ifopt_serviceFeature_version.xsd} (100%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_site_support-v1.0.xsd => netex_ifopt_site_support.xsd} (100%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_site_version-v1.0.xsd => netex_ifopt_site_version.xsd} (100%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_stopPlace_support-v1.1.xsd => netex_ifopt_stopPlace_support.xsd} (100%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_stopPlace_version-v1.1.xsd => netex_ifopt_stopPlace_version.xsd} (100%)
 rename xsd/netex_part_1/part1_ifopt/{netex_ifopt_vehicleStopping_support-v1.0.xsd => netex_ifopt_vehicleStopping_support.xsd} (100%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_activation_support-v1.0.xsd => netex_activation_support.xsd} (100%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_activation_version-v1.0.xsd => netex_activation_version.xsd} (100%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_all_objects_part1_infrastructureFrame_contents-v1.0.xsd => netex_all_objects_part1_infrastructureFrame_contents.xsd} (100%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_all_objects_part1_lineRoute-v1.0.xsd => netex_all_objects_part1_lineRoute.xsd} (100%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_all_objects_part1_networkDescription-v1.0.xsd => netex_all_objects_part1_networkDescription.xsd} (100%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_flexibleNetwork_support-v1.0.xsd => netex_flexibleNetwork_support.xsd} (100%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_flexibleNetwork_version-v1.1.xsd => netex_flexibleNetwork_version.xsd} (100%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_lineNetwork_support-v1.1.xsd => netex_lineNetwork_support.xsd} (100%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_lineNetwork_version-v1.1.xsd => netex_lineNetwork_version.xsd} (100%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_line_support-v1.1.xsd => netex_line_support.xsd} (100%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_line_version-v1.1.xsd => netex_line_version.xsd} (100%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_networkInfrastructure_support-v1.0.xsd => netex_networkInfrastructure_support.xsd} (100%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_networkInfrastructure_version-v1.0.xsd => netex_networkInfrastructure_version.xsd} (100%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_networkRestriction_support-v1.0.xsd => netex_networkRestriction_support.xsd} (100%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_networkRestriction_version-v1.0.xsd => netex_networkRestriction_version.xsd} (100%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_routeInstruction_support-v1.1.xsd => netex_routeInstruction_support.xsd} (100%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_routeInstruction_version-v1.1.xsd => netex_routeInstruction_version.xsd} (100%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_route_support-v1.1.xsd => netex_route_support.xsd} (100%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_route_version-v1.1.xsd => netex_route_version.xsd} (100%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_timingPattern_support-v1.1.xsd => netex_timingPattern_support.xsd} (100%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_vehicleAndCrewPoint_support-v1.0.xsd => netex_vehicleAndCrewPoint_support.xsd} (100%)
 rename xsd/netex_part_1/part1_networkDescription/{netex_vehicleAndCrewPoint_version-v1.1.xsd => netex_vehicleAndCrewPoint_version.xsd} (100%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_all_objects_part1_tacticalPlanning-v1.0.xsd => netex_all_objects_part1_tacticalPlanning.xsd} (100%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_commonSection_support-v1.1.xsd => netex_commonSection_support.xsd} (100%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_commonSection_version-v1.1.xsd => netex_commonSection_version.xsd} (100%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_fareZone_support-v1.1.xsd => netex_fareZone_support.xsd} (100%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_fareZone_version-v1.1.xsd => netex_fareZone_version.xsd} (100%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_journeyPatternTimings_support-v1.0.xsd => netex_journeyPatternTimings_support.xsd} (100%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_journeyPatternTimings_version-v1.0.xsd => netex_journeyPatternTimings_version.xsd} (100%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_journeyPattern_support-v1.0.xsd => netex_journeyPattern_support.xsd} (100%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_journeyPattern_version-v1.1.xsd => netex_journeyPattern_version.xsd} (100%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_journeyTiming_support-v1.0.xsd => netex_journeyTiming_support.xsd} (100%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_journeyTiming_version-v1.0.xsd => netex_journeyTiming_version.xsd} (100%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_passengerInformationEquipment_support-v1.0.xsd => netex_passengerInformationEquipment_support.xsd} (100%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_passengerInformationEquipment_version-v1.0.xsd => netex_passengerInformationEquipment_version.xsd} (100%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_pathAssignment_version-v1.0.xsd => netex_pathAssignment_version.xsd} (100%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_routingConstraint_support-v1.0.xsd => netex_routingConstraint_support.xsd} (100%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_routingConstraint_version-v1.0.xsd => netex_routingConstraint_version.xsd} (100%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_servicePattern_support-v1.1.xsd => netex_servicePattern_support.xsd} (100%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_servicePattern_version-v1.1.xsd => netex_servicePattern_version.xsd} (100%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_siteConnection_support-v1.0.xsd => netex_siteConnection_support.xsd} (100%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_siteConnection_version-v1.0.xsd => netex_siteConnection_version.xsd} (100%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_stopAssignment_support-v1.0.xsd => netex_stopAssignment_support.xsd} (100%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_stopAssignment_version-v1.1.xsd => netex_stopAssignment_version.xsd} (100%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_timeDemandType_support-v1.0.xsd => netex_timeDemandType_support.xsd} (100%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_timeDemandType_version-v1.0.xsd => netex_timeDemandType_version.xsd} (100%)
 rename xsd/netex_part_1/part1_tacticalPlanning/{netex_timingPattern_version-v1.1.xsd => netex_timingPattern_version.xsd} (100%)
 rename xsd/netex_part_2/{netex_all_frames_part2-v1.0.xsd => netex_all_frames_part2.xsd} (100%)
 rename xsd/netex_part_2/{netex_all_objects_part2-v1.0.xsd => netex_all_objects_part2.xsd} (100%)
 rename xsd/netex_part_2/part2_frames/{netex_driverScheduleFrame_version-v1.0.xsd => netex_driverScheduleFrame_version.xsd} (100%)
 rename xsd/netex_part_2/part2_frames/{netex_serviceFrame_version-v1.1.xsd => netex_serviceFrame_version.xsd} (100%)
 rename xsd/netex_part_2/part2_frames/{netex_timetableFrame_support-v1.0.xsd => netex_timetableFrame_support.xsd} (100%)
 rename xsd/netex_part_2/part2_frames/{netex_timetableFrame_version-v1.0.xsd => netex_timetableFrame_version.xsd} (100%)
 rename xsd/netex_part_2/part2_frames/{netex_vehicleScheduleFrame_version-v1.0.xsd => netex_vehicleScheduleFrame_version.xsd} (100%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_all_objects_part2_journeyTimes-v1.0.xsd => netex_all_objects_part2_journeyTimes.xsd} (100%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_call_support-v1.0.xsd => netex_call_support.xsd} (100%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_call_version-v1.1.xsd => netex_call_version.xsd} (100%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_coupledJourney_support-v1.1.xsd => netex_coupledJourney_support.xsd} (100%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_coupledJourney_version-v1.1.xsd => netex_coupledJourney_version.xsd} (100%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_datedPassingTimes_version-v1.1.xsd => netex_datedPassingTimes_version.xsd} (100%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_datedVehicleJourney_support-v1.0.xsd => netex_datedVehicleJourney_support.xsd} (100%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_datedVehicleJourney_version-v1.0.xsd => netex_datedVehicleJourney_version.xsd} (100%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_flexibleService_support-v1.0.xsd => netex_flexibleService_support.xsd} (100%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_flexibleService_version-v1.0.xsd => netex_flexibleService_version.xsd} (100%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_interchangeRule_version-v1.1.xsd => netex_interchangeRule_version.xsd} (100%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_interchange_support-v1.0.xsd => netex_interchange_support.xsd} (100%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_interchange_version-v1.1.xsd => netex_interchange_version.xsd} (100%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_journeyAccounting_support-v1.0.xsd => netex_journeyAccounting_support.xsd} (100%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_journeyAccounting_version-v1.0.xsd => netex_journeyAccounting_version.xsd} (100%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_journeyDesignator_support-v1.0.xsd => netex_journeyDesignator_support.xsd} (100%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_journey_version-v1.1.xsd => netex_journey_version.xsd} (100%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_passingTimes_support-v1.0.xsd => netex_passingTimes_support.xsd} (100%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_passingTimes_version-v1.1.xsd => netex_passingTimes_version.xsd} (100%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_serviceJourney_support-v1.0.xsd => netex_serviceJourney_support.xsd} (100%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_serviceJourney_version-v1.1.xsd => netex_serviceJourney_version.xsd} (100%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_serviceView_version-v1.0.xsd => netex_serviceView_version.xsd} (100%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_timeDemandProfile_version-v1.0.xsd => netex_timeDemandProfile_version.xsd} (100%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_timeDemandTimes_version-v1.0.xsd => netex_timeDemandTimes_version.xsd} (100%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_vehicleJourneyFrequency_support-v1.0.xsd => netex_vehicleJourneyFrequency_support.xsd} (100%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_vehicleJourneyFrequency_version-v1.1.xsd => netex_vehicleJourneyFrequency_version.xsd} (100%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_vehicleJourneyTimes_support-v1.0.xsd => netex_vehicleJourneyTimes_support.xsd} (100%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_vehicleJourneyTimes_version-v1.0.xsd => netex_vehicleJourneyTimes_version.xsd} (100%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_vehicleJourney_support-v1.0.xsd => netex_vehicleJourney_support.xsd} (100%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_vehicleJourney_version-v1.1.xsd => netex_vehicleJourney_version.xsd} (100%)
 rename xsd/netex_part_2/part2_journeyTimes/{netex_vehicleService_support-v1.0.xsd => netex_vehicleService_support.xsd} (100%)
 rename xsd/netex_part_2/part2_vehicleService/{netex_all_objects_part2_vehicleService-v1.0.xsd => netex_all_objects_part2_vehicleService.xsd} (100%)
 rename xsd/netex_part_2/part2_vehicleService/{netex_duty_support-v1.0.xsd => netex_duty_support.xsd} (100%)
 rename xsd/netex_part_2/part2_vehicleService/{netex_duty_version-v1.0.xsd => netex_duty_version.xsd} (100%)
 rename xsd/netex_part_2/part2_vehicleService/{netex_vehicleService_version-v1.1.xsd => netex_vehicleService_version.xsd} (100%)
 rename xsd/netex_part_3/part3_PiQuery/{netex_all_objects_part3_piQuery-v1.0.xsd => netex_all_objects_part3_piQuery.xsd} (100%)
 rename xsd/netex_part_3/part3_PiQuery/{netex_piQuery_support-v1.0.xsd => netex_piQuery_support.xsd} (100%)
 rename xsd/netex_part_3/part3_PiQuery/{netex_piRequest_support-v1.1.xsd => netex_piRequest_support.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_accessRightParameter_support-v1.0.xsd => netex_accessRightParameter_support.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_accessRightParameter_version-v1.1.xsd => netex_accessRightParameter_version.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_all_objects_part3_fares-v1.1.xsd => netex_all_objects_part3_fares.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_all_objects_part3_fares_AR-v1.1.xsd => netex_all_objects_part3_fares_AR.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_all_objects_part3_fares_FP-v1.1.xsd => netex_all_objects_part3_fares_FP.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_all_objects_part3_fares_FS-v1.1.xsd => netex_all_objects_part3_fares_FS.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_all_objects_part3_fares_SD-v1.1.xsd => netex_all_objects_part3_fares_SD.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_calculationParameters_support-v1.0.xsd => netex_calculationParameters_support.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_calculationParameters_version-v1.0.xsd => netex_calculationParameters_version.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_distanceMatrixElement_support-v1.0.xsd => netex_distanceMatrixElement_support.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_distanceMatrixElement_version-v1.1.xsd => netex_distanceMatrixElement_version.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_fareConditionSummary_support-v1.0.xsd => netex_fareConditionSummary_support.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_fareConditionSummary_version-v1.0.xsd => netex_fareConditionSummary_version.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_farePrice_support-v1.0.xsd => netex_farePrice_support.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_farePrice_version-v1.1.xsd => netex_farePrice_version.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_fareProduct_support-v1.0.xsd => netex_fareProduct_support.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_fareProduct_version-v1.1.xsd => netex_fareProduct_version.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_fareSeries_support-v1.0.xsd => netex_fareSeries_support.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_fareSeries_version-v1.0.xsd => netex_fareSeries_version.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_fareStructureElement_support-v1.0.xsd => netex_fareStructureElement_support.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_fareStructureElement_version-v1.1.xsd => netex_fareStructureElement_version.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_fareStructure_support-v1.0.xsd => netex_fareStructure_support.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_fareStructure_version-v1.0.xsd => netex_fareStructure_version.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_fareTable_support-v1.0.xsd => netex_fareTable_support.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_fareTable_version-v1.1.xsd => netex_fareTable_version.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_geographicStructureFactor_support-v1.0.xsd => netex_geographicStructureFactor_support.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_geographicStructureFactor_version-v1.0.xsd => netex_geographicStructureFactor_version.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_qualityStructureFactor_support-v1.0.xsd => netex_qualityStructureFactor_support.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_qualityStructureFactor_version-v1.0.xsd => netex_qualityStructureFactor_version.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_salesDistribution_support-v1.0.xsd => netex_salesDistribution_support.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_salesDistribution_version-v1.0.xsd => netex_salesDistribution_version.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_salesOfferPackage_support-v1.1.xsd => netex_salesOfferPackage_support.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_salesOfferPackage_version-v1.1.xsd => netex_salesOfferPackage_version.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_salesPackage_support-v1.1.xsd => netex_salesPackage_support.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_salesPackage_version-v1.1.xsd => netex_salesPackage_version.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_timeStructureFactor_support-v1.0.xsd => netex_timeStructureFactor_support.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_timeStructureFactor_version-v1.0.xsd => netex_timeStructureFactor_version.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_travelDocument_support-v1.1.xsd => netex_travelDocument_support.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_travelDocument_version-v1.1.xsd => netex_travelDocument_version.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameterAfterSales_support-v1.0.xsd => netex_usageParameterAfterSales_support.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameterAfterSales_version-v1.0.xsd => netex_usageParameterAfterSales_version.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameterBooking_support-v1.0.xsd => netex_usageParameterBooking_support.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameterBooking_version-v1.0.xsd => netex_usageParameterBooking_version.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameterCharging_support-v1.0.xsd => netex_usageParameterCharging_support.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameterCharging_version-v1.0.xsd => netex_usageParameterCharging_version.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameterEligibility_support-v1.0.xsd => netex_usageParameterEligibility_support.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameterEligibility_version-v1.0.xsd => netex_usageParameterEligibility_version.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameterEntitlement_support-v1.0.xsd => netex_usageParameterEntitlement_support.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameterEntitlement_version-v1.0.xsd => netex_usageParameterEntitlement_version.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameterLuggage_support-v1.0.xsd => netex_usageParameterLuggage_support.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameterLuggage_version-v1.0.xsd => netex_usageParameterLuggage_version.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameterTravel_support-v1.1.xsd => netex_usageParameterTravel_support.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameterTravel_version-v1.0.xsd => netex_usageParameterTravel_version.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameter_support-v1.0.xsd => netex_usageParameter_support.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParameter_version-v1.0.xsd => netex_usageParameter_version.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_usageParametersAll_support-v1.0.xsd => netex_usageParametersAll_support.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_validableElement_support-v1.0.xsd => netex_validableElement_support.xsd} (100%)
 rename xsd/netex_part_3/part3_fares/{netex_validableElement_version-v1.0.xsd => netex_validableElement_version.xsd} (100%)
 rename xsd/netex_part_3/part3_frames/{netex_all_frames_part3-v1.0.xsd => netex_all_frames_part3.xsd} (100%)
 rename xsd/netex_part_3/part3_frames/{netex_fareFrame_version-v1.0.xsd => netex_fareFrame_version.xsd} (100%)
 rename xsd/netex_part_3/part3_frames/{netex_salesTransactionFrame_version-v1.1.xsd => netex_salesTransactionFrame_version.xsd} (100%)
 rename xsd/netex_part_3/part3_monitoring/{netex_all_objects_part3_monitoring-v1.0.xsd => netex_all_objects_part3_monitoring.xsd} (100%)
 rename xsd/netex_part_3/part3_monitoring/{netex_monitoredCall_version-v1.0.xsd => netex_monitoredCall_version.xsd} (100%)
 rename xsd/netex_part_3/part3_monitoring/{netex_monitoredPassingTimes_version-v1.1.xsd => netex_monitoredPassingTimes_version.xsd} (100%)
 rename xsd/netex_part_3/part3_monitoring/{netex_monitoredVehicleJourney_support-v1.0.xsd => netex_monitoredVehicleJourney_support.xsd} (100%)
 rename xsd/netex_part_3/part3_parkingTariff/{netex_all_objects_part3_parking-v1.0.xsd => netex_all_objects_part3_parking.xsd} (100%)
 rename xsd/netex_part_3/part3_parkingTariff/{netex_parkingTariff_support-v1.1.xsd => netex_parkingTariff_support.xsd} (100%)
 rename xsd/netex_part_3/part3_parkingTariff/{netex_parkingTariff_version-v1.1.xsd => netex_parkingTariff_version.xsd} (100%)
 rename xsd/netex_part_3/part3_salesTransactions/{netex_all_objects_part3_salesTransactions-v1.0.xsd => netex_all_objects_part3_salesTransactions.xsd} (100%)
 rename xsd/netex_part_3/part3_salesTransactions/{netex_customerEligibility_support-v1.1.xsd => netex_customerEligibility_support.xsd} (100%)
 rename xsd/netex_part_3/part3_salesTransactions/{netex_customerEligibility_version-v1.1.xsd => netex_customerEligibility_version.xsd} (100%)
 rename xsd/netex_part_3/part3_salesTransactions/{netex_customerPurchasePackage_support-v1.1.xsd => netex_customerPurchasePackage_support.xsd} (100%)
 rename xsd/netex_part_3/part3_salesTransactions/{netex_customerPurchasePackage_version-v1.1.xsd => netex_customerPurchasePackage_version.xsd} (100%)
 rename xsd/netex_part_3/part3_salesTransactions/{netex_retailConsortium_support-v1.1.xsd => netex_retailConsortium_support.xsd} (100%)
 rename xsd/netex_part_3/part3_salesTransactions/{netex_retailConsortium_version-v1.1.xsd => netex_retailConsortium_version.xsd} (100%)
 rename xsd/netex_part_3/part3_salesTransactions/{netex_salesContract_support-v1.1.xsd => netex_salesContract_support.xsd} (100%)
 rename xsd/netex_part_3/part3_salesTransactions/{netex_salesContract_version-v1.1.xsd => netex_salesContract_version.xsd} (100%)
 rename xsd/netex_part_3/part3_salesTransactions/{netex_salesTransaction_support-v1.0.xsd => netex_salesTransaction_support.xsd} (100%)
 rename xsd/netex_part_3/part3_salesTransactions/{netex_salesTransaction_version-v1.1.xsd => netex_salesTransaction_version.xsd} (100%)
 rename xsd/netex_service/{netex_all-v1.0.xsd => netex_all.xsd} (100%)
 rename xsd/netex_service/{netex_all_filters-v1.0.xsd => netex_all_filters.xsd} (100%)
 rename xsd/netex_service/{netex_dataObjectRequest_service-v1.0.xsd => netex_dataObjectRequest_service.xsd} (100%)
 rename xsd/netex_service/{netex_filter_frame-v1.0.xsd => netex_filter_frame.xsd} (100%)
 rename xsd/netex_service/{netex_filter_object-v1.0.xsd => netex_filter_object.xsd} (100%)
 rename xsd/ynotation/{netex_subThing_support-v0.1.xsd => netex_subThing_support.xsd} (100%)
 rename xsd/ynotation/{netex_subThing_version-v0.1.xsd => netex_subThing_version.xsd} (100%)
 rename xsd/ynotation/{netex_thing_support-v0.1.xsd => netex_thing_support.xsd} (100%)
 rename xsd/ynotation/{netex_thing_version-v0.1.xsd => netex_thing_version.xsd} (100%)

diff --git a/xsd/netex_framework/netex_all_objects_framework-v1.0.xsd b/xsd/netex_framework/netex_all_objects_framework.xsd
similarity index 100%
rename from xsd/netex_framework/netex_all_objects_framework-v1.0.xsd
rename to xsd/netex_framework/netex_all_objects_framework.xsd
diff --git a/xsd/netex_framework/netex_all_objects_generic-v1.0.xsd b/xsd/netex_framework/netex_all_objects_generic.xsd
similarity index 100%
rename from xsd/netex_framework/netex_all_objects_generic-v1.0.xsd
rename to xsd/netex_framework/netex_all_objects_generic.xsd
diff --git a/xsd/netex_framework/netex_frames/netex_all_frames_framework-v1.0.xsd b/xsd/netex_framework/netex_frames/netex_all_frames_framework.xsd
similarity index 100%
rename from xsd/netex_framework/netex_frames/netex_all_frames_framework-v1.0.xsd
rename to xsd/netex_framework/netex_frames/netex_all_frames_framework.xsd
diff --git a/xsd/netex_framework/netex_frames/netex_commonFrame_version-v1.0.xsd b/xsd/netex_framework/netex_frames/netex_commonFrame_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_frames/netex_commonFrame_version-v1.0.xsd
rename to xsd/netex_framework/netex_frames/netex_commonFrame_version.xsd
diff --git a/xsd/netex_framework/netex_frames/netex_compositeFrame_version-v1.0.xsd b/xsd/netex_framework/netex_frames/netex_compositeFrame_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_frames/netex_compositeFrame_version-v1.0.xsd
rename to xsd/netex_framework/netex_frames/netex_compositeFrame_version.xsd
diff --git a/xsd/netex_framework/netex_frames/netex_generalFrame_version-v1.0.xsd b/xsd/netex_framework/netex_frames/netex_generalFrame_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_frames/netex_generalFrame_version-v1.0.xsd
rename to xsd/netex_framework/netex_frames/netex_generalFrame_version.xsd
diff --git a/xsd/netex_framework/netex_frames/netex_resourceFrame_support-v1.0.xsd b/xsd/netex_framework/netex_frames/netex_resourceFrame_support.xsd
similarity index 100%
rename from xsd/netex_framework/netex_frames/netex_resourceFrame_support-v1.0.xsd
rename to xsd/netex_framework/netex_frames/netex_resourceFrame_support.xsd
diff --git a/xsd/netex_framework/netex_frames/netex_resourceFrame_version-v1.1.xsd b/xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_frames/netex_resourceFrame_version-v1.1.xsd
rename to xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd
diff --git a/xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_support-v1.0.xsd b/xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_support.xsd
similarity index 100%
rename from xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_support-v1.0.xsd
rename to xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_support.xsd
diff --git a/xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_version-v1.0.xsd b/xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_version-v1.0.xsd
rename to xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_version.xsd
diff --git a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility-v1.1.xsd b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility.xsd
similarity index 100%
rename from xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility-v1.1.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility.xsd
diff --git a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_all-v1.0.xsd b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_all.xsd
similarity index 100%
rename from xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_all-v1.0.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_all.xsd
diff --git a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations-v1.0.xsd b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations.xsd
similarity index 100%
rename from xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations-v1.0.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations.xsd
diff --git a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_passengerMobility-v1.0.xsd b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_passengerMobility.xsd
similarity index 100%
rename from xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_passengerMobility-v1.0.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_passengerMobility.xsd
diff --git a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_support-v1.0.xsd b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_support.xsd
similarity index 100%
rename from xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_support-v1.0.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_support.xsd
diff --git a/xsd/netex_framework/netex_genericFramework/netex_alternativeName_support-v1.0.xsd b/xsd/netex_framework/netex_genericFramework/netex_alternativeName_support.xsd
similarity index 100%
rename from xsd/netex_framework/netex_genericFramework/netex_alternativeName_support-v1.0.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_alternativeName_support.xsd
diff --git a/xsd/netex_framework/netex_genericFramework/netex_alternativeName_version-v1.0.xsd b/xsd/netex_framework/netex_genericFramework/netex_alternativeName_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_genericFramework/netex_alternativeName_version-v1.0.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_alternativeName_version.xsd
diff --git a/xsd/netex_framework/netex_genericFramework/netex_assignment_support-v1.0.xsd b/xsd/netex_framework/netex_genericFramework/netex_assignment_support.xsd
similarity index 100%
rename from xsd/netex_framework/netex_genericFramework/netex_assignment_support-v1.0.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_assignment_support.xsd
diff --git a/xsd/netex_framework/netex_genericFramework/netex_assignment_version-v1.0.xsd b/xsd/netex_framework/netex_genericFramework/netex_assignment_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_genericFramework/netex_assignment_version-v1.0.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_assignment_version.xsd
diff --git a/xsd/netex_framework/netex_genericFramework/netex_grouping_support-v1.0.xsd b/xsd/netex_framework/netex_genericFramework/netex_grouping_support.xsd
similarity index 100%
rename from xsd/netex_framework/netex_genericFramework/netex_grouping_support-v1.0.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_grouping_support.xsd
diff --git a/xsd/netex_framework/netex_genericFramework/netex_grouping_version-v1.1.xsd b/xsd/netex_framework/netex_genericFramework/netex_grouping_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_genericFramework/netex_grouping_version-v1.1.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_grouping_version.xsd
diff --git a/xsd/netex_framework/netex_genericFramework/netex_layer_support-v1.0.xsd b/xsd/netex_framework/netex_genericFramework/netex_layer_support.xsd
similarity index 100%
rename from xsd/netex_framework/netex_genericFramework/netex_layer_support-v1.0.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_layer_support.xsd
diff --git a/xsd/netex_framework/netex_genericFramework/netex_layer_version-v1.0.xsd b/xsd/netex_framework/netex_genericFramework/netex_layer_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_genericFramework/netex_layer_version-v1.0.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_layer_version.xsd
diff --git a/xsd/netex_framework/netex_genericFramework/netex_loggable_support-v1.1.xsd b/xsd/netex_framework/netex_genericFramework/netex_loggable_support.xsd
similarity index 100%
rename from xsd/netex_framework/netex_genericFramework/netex_loggable_support-v1.1.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_loggable_support.xsd
diff --git a/xsd/netex_framework/netex_genericFramework/netex_loggable_version-v1.1.xsd b/xsd/netex_framework/netex_genericFramework/netex_loggable_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_genericFramework/netex_loggable_version-v1.1.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_loggable_version.xsd
diff --git a/xsd/netex_framework/netex_genericFramework/netex_organisation_support-v1.1.xsd b/xsd/netex_framework/netex_genericFramework/netex_organisation_support.xsd
similarity index 100%
rename from xsd/netex_framework/netex_genericFramework/netex_organisation_support-v1.1.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_organisation_support.xsd
diff --git a/xsd/netex_framework/netex_genericFramework/netex_organisation_version-v1.1.xsd b/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_genericFramework/netex_organisation_version-v1.1.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd
diff --git a/xsd/netex_framework/netex_genericFramework/netex_place_support-v1.0.xsd b/xsd/netex_framework/netex_genericFramework/netex_place_support.xsd
similarity index 100%
rename from xsd/netex_framework/netex_genericFramework/netex_place_support-v1.0.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_place_support.xsd
diff --git a/xsd/netex_framework/netex_genericFramework/netex_place_version-v1.1.xsd b/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_genericFramework/netex_place_version-v1.1.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_place_version.xsd
diff --git a/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support-v1.1.xsd b/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd
similarity index 100%
rename from xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support-v1.1.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd
diff --git a/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version-v1.1.xsd b/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version-v1.1.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd
diff --git a/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_support-v1.1.xsd b/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_support.xsd
similarity index 100%
rename from xsd/netex_framework/netex_genericFramework/netex_pointAndLink_support-v1.1.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_pointAndLink_support.xsd
diff --git a/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version-v1.1.xsd b/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version-v1.1.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd
diff --git a/xsd/netex_framework/netex_genericFramework/netex_projection_support-v1.0.xsd b/xsd/netex_framework/netex_genericFramework/netex_projection_support.xsd
similarity index 100%
rename from xsd/netex_framework/netex_genericFramework/netex_projection_support-v1.0.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_projection_support.xsd
diff --git a/xsd/netex_framework/netex_genericFramework/netex_projection_version-v1.0.xsd b/xsd/netex_framework/netex_genericFramework/netex_projection_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_genericFramework/netex_projection_version-v1.0.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_projection_version.xsd
diff --git a/xsd/netex_framework/netex_genericFramework/netex_section_support-v1.1.xsd b/xsd/netex_framework/netex_genericFramework/netex_section_support.xsd
similarity index 100%
rename from xsd/netex_framework/netex_genericFramework/netex_section_support-v1.1.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_section_support.xsd
diff --git a/xsd/netex_framework/netex_genericFramework/netex_section_version-v1.1.xsd b/xsd/netex_framework/netex_genericFramework/netex_section_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_genericFramework/netex_section_version-v1.1.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_section_version.xsd
diff --git a/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_support-v1.0.xsd b/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_support.xsd
similarity index 100%
rename from xsd/netex_framework/netex_genericFramework/netex_spatialFeature_support-v1.0.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_spatialFeature_support.xsd
diff --git a/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_version-v1.0.xsd b/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_genericFramework/netex_spatialFeature_version-v1.0.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_spatialFeature_version.xsd
diff --git a/xsd/netex_framework/netex_genericFramework/netex_zoneProjection_version-v1.0.xsd b/xsd/netex_framework/netex_genericFramework/netex_zoneProjection_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_genericFramework/netex_zoneProjection_version-v1.0.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_zoneProjection_version.xsd
diff --git a/xsd/netex_framework/netex_genericFramework/netex_zone_support-v1.0.xsd b/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd
similarity index 100%
rename from xsd/netex_framework/netex_genericFramework/netex_zone_support-v1.0.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd
diff --git a/xsd/netex_framework/netex_genericFramework/netex_zone_version-v1.1.xsd b/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_genericFramework/netex_zone_version-v1.1.xsd
rename to xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd
diff --git a/xsd/netex_framework/netex_payload_framework-v1.0.xsd b/xsd/netex_framework/netex_payload_framework.xsd
similarity index 100%
rename from xsd/netex_framework/netex_payload_framework-v1.0.xsd
rename to xsd/netex_framework/netex_payload_framework.xsd
diff --git a/xsd/netex_framework/netex_responsibility/netex_alternativeText_support-v1.1.xsd b/xsd/netex_framework/netex_responsibility/netex_alternativeText_support.xsd
similarity index 100%
rename from xsd/netex_framework/netex_responsibility/netex_alternativeText_support-v1.1.xsd
rename to xsd/netex_framework/netex_responsibility/netex_alternativeText_support.xsd
diff --git a/xsd/netex_framework/netex_responsibility/netex_alternativeText_version-v1.1.xsd b/xsd/netex_framework/netex_responsibility/netex_alternativeText_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_responsibility/netex_alternativeText_version-v1.1.xsd
rename to xsd/netex_framework/netex_responsibility/netex_alternativeText_version.xsd
diff --git a/xsd/netex_framework/netex_responsibility/netex_dataSource_version-v1.0.xsd b/xsd/netex_framework/netex_responsibility/netex_dataSource_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_responsibility/netex_dataSource_version-v1.0.xsd
rename to xsd/netex_framework/netex_responsibility/netex_dataSource_version.xsd
diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_entity-v1.0.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_entity.xsd
similarity index 100%
rename from xsd/netex_framework/netex_responsibility/netex_entity_entity-v1.0.xsd
rename to xsd/netex_framework/netex_responsibility/netex_entity_entity.xsd
diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_support-v1.0.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd
similarity index 100%
rename from xsd/netex_framework/netex_responsibility/netex_entity_support-v1.0.xsd
rename to xsd/netex_framework/netex_responsibility/netex_entity_support.xsd
diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_version-v1.0.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_responsibility/netex_entity_version-v1.0.xsd
rename to xsd/netex_framework/netex_responsibility/netex_entity_version.xsd
diff --git a/xsd/netex_framework/netex_responsibility/netex_relationship-v1.0.xsd b/xsd/netex_framework/netex_responsibility/netex_relationship.xsd
similarity index 100%
rename from xsd/netex_framework/netex_responsibility/netex_relationship-v1.0.xsd
rename to xsd/netex_framework/netex_responsibility/netex_relationship.xsd
diff --git a/xsd/netex_framework/netex_responsibility/netex_relationship_support-v1.1.xsd b/xsd/netex_framework/netex_responsibility/netex_relationship_support.xsd
similarity index 100%
rename from xsd/netex_framework/netex_responsibility/netex_relationship_support-v1.1.xsd
rename to xsd/netex_framework/netex_responsibility/netex_relationship_support.xsd
diff --git a/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version-v1.1.xsd b/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version-v1.1.xsd
rename to xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd
diff --git a/xsd/netex_framework/netex_responsibility/netex_responsibility_support-v1.1.xsd b/xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd
similarity index 100%
rename from xsd/netex_framework/netex_responsibility/netex_responsibility_support-v1.1.xsd
rename to xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd
diff --git a/xsd/netex_framework/netex_responsibility/netex_responsibility_version-v1.1.xsd b/xsd/netex_framework/netex_responsibility/netex_responsibility_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_responsibility/netex_responsibility_version-v1.1.xsd
rename to xsd/netex_framework/netex_responsibility/netex_responsibility_version.xsd
diff --git a/xsd/netex_framework/netex_responsibility/netex_typeOfValue_version-v1.0.xsd b/xsd/netex_framework/netex_responsibility/netex_typeOfValue_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_responsibility/netex_typeOfValue_version-v1.0.xsd
rename to xsd/netex_framework/netex_responsibility/netex_typeOfValue_version.xsd
diff --git a/xsd/netex_framework/netex_responsibility/netex_validityCondition_support-v1.0.xsd b/xsd/netex_framework/netex_responsibility/netex_validityCondition_support.xsd
similarity index 100%
rename from xsd/netex_framework/netex_responsibility/netex_validityCondition_support-v1.0.xsd
rename to xsd/netex_framework/netex_responsibility/netex_validityCondition_support.xsd
diff --git a/xsd/netex_framework/netex_responsibility/netex_validityCondition_version-v1.0.xsd b/xsd/netex_framework/netex_responsibility/netex_validityCondition_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_responsibility/netex_validityCondition_version-v1.0.xsd
rename to xsd/netex_framework/netex_responsibility/netex_validityCondition_version.xsd
diff --git a/xsd/netex_framework/netex_responsibility/netex_versionDelta_version-v1.0.xsd b/xsd/netex_framework/netex_responsibility/netex_versionDelta_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_responsibility/netex_versionDelta_version-v1.0.xsd
rename to xsd/netex_framework/netex_responsibility/netex_versionDelta_version.xsd
diff --git a/xsd/netex_framework/netex_responsibility/netex_versionFrame_support-v1.0.xsd b/xsd/netex_framework/netex_responsibility/netex_versionFrame_support.xsd
similarity index 100%
rename from xsd/netex_framework/netex_responsibility/netex_versionFrame_support-v1.0.xsd
rename to xsd/netex_framework/netex_responsibility/netex_versionFrame_support.xsd
diff --git a/xsd/netex_framework/netex_responsibility/netex_versionFrame_version-v1.0.xsd b/xsd/netex_framework/netex_responsibility/netex_versionFrame_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_responsibility/netex_versionFrame_version-v1.0.xsd
rename to xsd/netex_framework/netex_responsibility/netex_versionFrame_version.xsd
diff --git a/xsd/netex_framework/netex_responsibility/netex_version_support-v1.1.xsd b/xsd/netex_framework/netex_responsibility/netex_version_support.xsd
similarity index 100%
rename from xsd/netex_framework/netex_responsibility/netex_version_support-v1.1.xsd
rename to xsd/netex_framework/netex_responsibility/netex_version_support.xsd
diff --git a/xsd/netex_framework/netex_responsibility/netex_version_version-v1.1.xsd b/xsd/netex_framework/netex_responsibility/netex_version_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_responsibility/netex_version_version-v1.1.xsd
rename to xsd/netex_framework/netex_responsibility/netex_version_version.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_access_version-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_access_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_access_version-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_access_version.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_accounting_version-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_accounting_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_accounting_version-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_accounting_version.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_address_support-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_address_support.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_address_support-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_address_support.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_address_version-v1.1.xsd b/xsd/netex_framework/netex_reusableComponents/netex_address_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_address_version-v1.1.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_address_version.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_support-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_support.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_support-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_support.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_version-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_version-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_version.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_country_support-v1.1.xsd b/xsd/netex_framework/netex_reusableComponents/netex_country_support.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_country_support-v1.1.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_country_support.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_country_version-v1.1.xsd b/xsd/netex_framework/netex_reusableComponents/netex_country_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_country_version-v1.1.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_country_version.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_dayType_propertiesOfDay-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_dayType_propertiesOfDay.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_dayType_propertiesOfDay-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_dayType_propertiesOfDay.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_dayType_support-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_dayType_support.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_dayType_support-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_dayType_support.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_dayType_version-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_dayType_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_dayType_version-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_dayType_version.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipmentPlace_version-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipmentPlace_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_equipmentPlace_version-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_equipmentPlace_version.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipment_support.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_equipment_support.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipment_version-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipment_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_equipment_version-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_equipment_version.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_facilityUic_support-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_facilityUic_support.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_facilityUic_support-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_facilityUic_support.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_facility_support-v1.1.xsd b/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_facility_support-v1.1.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_facility_version-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_facility_version-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_linkByValue_support-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_linkByValue_support.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_linkByValue_support-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_linkByValue_support.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_mode_support-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_mode_support-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_mode_version-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_mode_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_mode_version-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_mode_version.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_noticeAssignment_version-v1.1.xsd b/xsd/netex_framework/netex_reusableComponents/netex_noticeAssignment_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_noticeAssignment_version-v1.1.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_noticeAssignment_version.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_notice_support-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_notice_support.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_notice_support-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_notice_support.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_notice_version-v1.1.xsd b/xsd/netex_framework/netex_reusableComponents/netex_notice_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_notice_version-v1.1.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_notice_version.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_support-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_support.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_support-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_support.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_version-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_version-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_version.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_schematicMap_support-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_schematicMap_support.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_schematicMap_support-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_schematicMap_support.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_schematicMap_version-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_schematicMap_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_schematicMap_version-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_schematicMap_version.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_securityList_support-v1.1.xsd b/xsd/netex_framework/netex_reusableComponents/netex_securityList_support.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_securityList_support-v1.1.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_securityList_support.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_securityList_version-v1.1.xsd b/xsd/netex_framework/netex_reusableComponents/netex_securityList_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_securityList_version-v1.1.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_securityList_version.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_support-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_support.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_support-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_support.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_version-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_version-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_version.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_submode_version-v1.1.xsd b/xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_submode_version-v1.1.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_support-v1.1.xsd b/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_support.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_support-v1.1.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_support.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_version-v1.1.xsd b/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_version-v1.1.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_version.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_trainElement_support-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version-v1.1.xsd b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_trainElement_version-v1.1.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_travelRights_support-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_travelRights_support.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_travelRights_support-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_travelRights_support.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_travelRights_version-v1.1.xsd b/xsd/netex_framework/netex_reusableComponents/netex_travelRights_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_travelRights_version-v1.1.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_travelRights_version.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support-v1.0.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support-v1.0.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version-v1.1.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd
similarity index 100%
rename from xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version-v1.1.xsd
rename to xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd
diff --git a/xsd/netex_framework/netex_utility/netex_location_types-v1.0.xsd b/xsd/netex_framework/netex_utility/netex_location_types.xsd
similarity index 100%
rename from xsd/netex_framework/netex_utility/netex_location_types-v1.0.xsd
rename to xsd/netex_framework/netex_utility/netex_location_types.xsd
diff --git a/xsd/netex_framework/netex_utility/netex_units-v1.0.xsd b/xsd/netex_framework/netex_utility/netex_units.xsd
similarity index 100%
rename from xsd/netex_framework/netex_utility/netex_units-v1.0.xsd
rename to xsd/netex_framework/netex_utility/netex_units.xsd
diff --git a/xsd/netex_framework/netex_utility/netex_utility_contact-v1.0.xsd b/xsd/netex_framework/netex_utility/netex_utility_contact.xsd
similarity index 100%
rename from xsd/netex_framework/netex_utility/netex_utility_contact-v1.0.xsd
rename to xsd/netex_framework/netex_utility/netex_utility_contact.xsd
diff --git a/xsd/netex_framework/netex_utility/netex_utility_time-v1.0.xsd b/xsd/netex_framework/netex_utility/netex_utility_time.xsd
similarity index 100%
rename from xsd/netex_framework/netex_utility/netex_utility_time-v1.0.xsd
rename to xsd/netex_framework/netex_utility/netex_utility_time.xsd
diff --git a/xsd/netex_framework/netex_utility/netex_utility_types-v1.1.xsd b/xsd/netex_framework/netex_utility/netex_utility_types.xsd
similarity index 100%
rename from xsd/netex_framework/netex_utility/netex_utility_types-v1.1.xsd
rename to xsd/netex_framework/netex_utility/netex_utility_types.xsd
diff --git a/xsd/netex_framework/netex_utility/netex_utility_xml-v1.0.xsd b/xsd/netex_framework/netex_utility/netex_utility_xml.xsd
similarity index 100%
rename from xsd/netex_framework/netex_utility/netex_utility_xml-v1.0.xsd
rename to xsd/netex_framework/netex_utility/netex_utility_xml.xsd
diff --git a/xsd/netex_part_1/netex_all_frames_part1-v1.0.xsd b/xsd/netex_part_1/netex_all_frames_part1.xsd
similarity index 100%
rename from xsd/netex_part_1/netex_all_frames_part1-v1.0.xsd
rename to xsd/netex_part_1/netex_all_frames_part1.xsd
diff --git a/xsd/netex_part_1/netex_all_objects_infrastructureFrame-v1.0.xsd b/xsd/netex_part_1/netex_all_objects_infrastructureFrame.xsd
similarity index 100%
rename from xsd/netex_part_1/netex_all_objects_infrastructureFrame-v1.0.xsd
rename to xsd/netex_part_1/netex_all_objects_infrastructureFrame.xsd
diff --git a/xsd/netex_part_1/netex_all_objects_part1-v1.0.xsd b/xsd/netex_part_1/netex_all_objects_part1.xsd
similarity index 100%
rename from xsd/netex_part_1/netex_all_objects_part1-v1.0.xsd
rename to xsd/netex_part_1/netex_all_objects_part1.xsd
diff --git a/xsd/netex_part_1/part1_frames/netex_infrastructureFrame_version-v1.0.xsd b/xsd/netex_part_1/part1_frames/netex_infrastructureFrame_version.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_frames/netex_infrastructureFrame_version-v1.0.xsd
rename to xsd/netex_part_1/part1_frames/netex_infrastructureFrame_version.xsd
diff --git a/xsd/netex_part_1/part1_frames/netex_siteFrame_version-v1.1.xsd b/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_frames/netex_siteFrame_version-v1.1.xsd
rename to xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd
diff --git a/xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_support-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_support.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_support-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_support.xsd
diff --git a/xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_version-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_version.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_version-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_version.xsd
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_all_objects-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_all_objects.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_all_objects-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_all_objects.xsd
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_support-v1.1.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_support.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_support-v1.1.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_support.xsd
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_version-v1.1.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_version.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_version-v1.1.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_version.xsd
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAll-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAll.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAll-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAll.xsd
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_support-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_support.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_support-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_support.xsd
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_version-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_version.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_version-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_version.xsd
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version-v1.1.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version-v1.1.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_support-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_support.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_support-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_support.xsd
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_version-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_version.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_version-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_version.xsd
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_support-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_support.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_support-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_support.xsd
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_support-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_support.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_support-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_support.xsd
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_version-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_version.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_version-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_version.xsd
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_support-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_support.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_support-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_support.xsd
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_version-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_version.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_version-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_version.xsd
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_support-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_support.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_support-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_support.xsd
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_version-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_version.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_version-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_version.xsd
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_support-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_support.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_support-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_support.xsd
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version-v1.1.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version-v1.1.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version.xsd
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version-v1.1.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version-v1.1.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version.xsd
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_support-v1.1.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_support.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_support-v1.1.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_support.xsd
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_version-v1.1.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_version.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_version-v1.1.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_version.xsd
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_support-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_support.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_support-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_support.xsd
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_version-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_version.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_version-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_version.xsd
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_support-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_support.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_support-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_support.xsd
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_version-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_version.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_version-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_version.xsd
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support-v1.1.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support-v1.1.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version-v1.1.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version-v1.1.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_version.xsd
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_vehicleStopping_support-v1.0.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_vehicleStopping_support.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_ifopt/netex_ifopt_vehicleStopping_support-v1.0.xsd
rename to xsd/netex_part_1/part1_ifopt/netex_ifopt_vehicleStopping_support.xsd
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_activation_support-v1.0.xsd b/xsd/netex_part_1/part1_networkDescription/netex_activation_support.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_networkDescription/netex_activation_support-v1.0.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_activation_support.xsd
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_activation_version-v1.0.xsd b/xsd/netex_part_1/part1_networkDescription/netex_activation_version.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_networkDescription/netex_activation_version-v1.0.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_activation_version.xsd
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_infrastructureFrame_contents-v1.0.xsd b/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_infrastructureFrame_contents.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_infrastructureFrame_contents-v1.0.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_infrastructureFrame_contents.xsd
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_lineRoute-v1.0.xsd b/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_lineRoute.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_lineRoute-v1.0.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_lineRoute.xsd
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_networkDescription-v1.0.xsd b/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_networkDescription.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_networkDescription-v1.0.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_networkDescription.xsd
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_support-v1.0.xsd b/xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_support.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_support-v1.0.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_support.xsd
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_version-v1.1.xsd b/xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_version.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_version-v1.1.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_version.xsd
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_support-v1.1.xsd b/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_support.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_support-v1.1.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_support.xsd
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version-v1.1.xsd b/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version-v1.1.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version.xsd
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_line_support-v1.1.xsd b/xsd/netex_part_1/part1_networkDescription/netex_line_support.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_networkDescription/netex_line_support-v1.1.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_line_support.xsd
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_line_version-v1.1.xsd b/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_networkDescription/netex_line_version-v1.1.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_support-v1.0.xsd b/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_support.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_support-v1.0.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_support.xsd
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_version-v1.0.xsd b/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_version.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_version-v1.0.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_version.xsd
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_support-v1.0.xsd b/xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_support.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_support-v1.0.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_support.xsd
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_version-v1.0.xsd b/xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_version.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_version-v1.0.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_version.xsd
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_support-v1.1.xsd b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_support.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_support-v1.1.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_support.xsd
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version-v1.1.xsd b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version-v1.1.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_route_support-v1.1.xsd b/xsd/netex_part_1/part1_networkDescription/netex_route_support.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_networkDescription/netex_route_support-v1.1.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_route_support.xsd
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_route_version-v1.1.xsd b/xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_networkDescription/netex_route_version-v1.1.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_timingPattern_support-v1.1.xsd b/xsd/netex_part_1/part1_networkDescription/netex_timingPattern_support.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_networkDescription/netex_timingPattern_support-v1.1.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_timingPattern_support.xsd
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_support-v1.0.xsd b/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_support.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_support-v1.0.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_support.xsd
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_version-v1.1.xsd b/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_version.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_version-v1.1.xsd
rename to xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_version.xsd
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_all_objects_part1_tacticalPlanning-v1.0.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_all_objects_part1_tacticalPlanning.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_all_objects_part1_tacticalPlanning-v1.0.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_all_objects_part1_tacticalPlanning.xsd
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_support-v1.1.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_support.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_support-v1.1.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_support.xsd
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_version-v1.1.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_version.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_version-v1.1.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_version.xsd
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_support-v1.1.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_support.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_support-v1.1.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_support.xsd
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_version-v1.1.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_version.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_version-v1.1.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_version.xsd
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_support-v1.0.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_support.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_support-v1.0.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_support.xsd
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_version-v1.0.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_version.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_version-v1.0.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_version.xsd
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support-v1.0.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support-v1.0.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support.xsd
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_version-v1.1.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_version.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_version-v1.1.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_version.xsd
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support-v1.0.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support-v1.0.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support.xsd
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version-v1.0.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version-v1.0.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version.xsd
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_support-v1.0.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_support.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_support-v1.0.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_support.xsd
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version-v1.0.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version-v1.0.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_pathAssignment_version-v1.0.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_pathAssignment_version.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_pathAssignment_version-v1.0.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_pathAssignment_version.xsd
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support-v1.0.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support-v1.0.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_version-v1.0.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_version.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_version-v1.0.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_version.xsd
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support-v1.1.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support-v1.1.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version-v1.1.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version-v1.1.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_support-v1.0.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_support.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_support-v1.0.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_support.xsd
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_version-v1.0.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_version.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_version-v1.0.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_version.xsd
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support-v1.0.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support-v1.0.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version-v1.1.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version-v1.1.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_support-v1.0.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_support.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_support-v1.0.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_support.xsd
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_version-v1.0.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_version.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_version-v1.0.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_version.xsd
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version-v1.1.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version.xsd
similarity index 100%
rename from xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version-v1.1.xsd
rename to xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version.xsd
diff --git a/xsd/netex_part_2/netex_all_frames_part2-v1.0.xsd b/xsd/netex_part_2/netex_all_frames_part2.xsd
similarity index 100%
rename from xsd/netex_part_2/netex_all_frames_part2-v1.0.xsd
rename to xsd/netex_part_2/netex_all_frames_part2.xsd
diff --git a/xsd/netex_part_2/netex_all_objects_part2-v1.0.xsd b/xsd/netex_part_2/netex_all_objects_part2.xsd
similarity index 100%
rename from xsd/netex_part_2/netex_all_objects_part2-v1.0.xsd
rename to xsd/netex_part_2/netex_all_objects_part2.xsd
diff --git a/xsd/netex_part_2/part2_frames/netex_driverScheduleFrame_version-v1.0.xsd b/xsd/netex_part_2/part2_frames/netex_driverScheduleFrame_version.xsd
similarity index 100%
rename from xsd/netex_part_2/part2_frames/netex_driverScheduleFrame_version-v1.0.xsd
rename to xsd/netex_part_2/part2_frames/netex_driverScheduleFrame_version.xsd
diff --git a/xsd/netex_part_2/part2_frames/netex_serviceFrame_version-v1.1.xsd b/xsd/netex_part_2/part2_frames/netex_serviceFrame_version.xsd
similarity index 100%
rename from xsd/netex_part_2/part2_frames/netex_serviceFrame_version-v1.1.xsd
rename to xsd/netex_part_2/part2_frames/netex_serviceFrame_version.xsd
diff --git a/xsd/netex_part_2/part2_frames/netex_timetableFrame_support-v1.0.xsd b/xsd/netex_part_2/part2_frames/netex_timetableFrame_support.xsd
similarity index 100%
rename from xsd/netex_part_2/part2_frames/netex_timetableFrame_support-v1.0.xsd
rename to xsd/netex_part_2/part2_frames/netex_timetableFrame_support.xsd
diff --git a/xsd/netex_part_2/part2_frames/netex_timetableFrame_version-v1.0.xsd b/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd
similarity index 100%
rename from xsd/netex_part_2/part2_frames/netex_timetableFrame_version-v1.0.xsd
rename to xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd
diff --git a/xsd/netex_part_2/part2_frames/netex_vehicleScheduleFrame_version-v1.0.xsd b/xsd/netex_part_2/part2_frames/netex_vehicleScheduleFrame_version.xsd
similarity index 100%
rename from xsd/netex_part_2/part2_frames/netex_vehicleScheduleFrame_version-v1.0.xsd
rename to xsd/netex_part_2/part2_frames/netex_vehicleScheduleFrame_version.xsd
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyTimes-v1.0.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyTimes.xsd
similarity index 100%
rename from xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyTimes-v1.0.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyTimes.xsd
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_call_support-v1.0.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_call_support.xsd
similarity index 100%
rename from xsd/netex_part_2/part2_journeyTimes/netex_call_support-v1.0.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_call_support.xsd
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_call_version-v1.1.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd
similarity index 100%
rename from xsd/netex_part_2/part2_journeyTimes/netex_call_version-v1.1.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_support-v1.1.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_support.xsd
similarity index 100%
rename from xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_support-v1.1.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_support.xsd
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version-v1.1.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd
similarity index 100%
rename from xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version-v1.1.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_datedPassingTimes_version-v1.1.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_datedPassingTimes_version.xsd
similarity index 100%
rename from xsd/netex_part_2/part2_journeyTimes/netex_datedPassingTimes_version-v1.1.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_datedPassingTimes_version.xsd
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_support-v1.0.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_support.xsd
similarity index 100%
rename from xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_support-v1.0.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_support.xsd
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_version-v1.0.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_version.xsd
similarity index 100%
rename from xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_version-v1.0.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_version.xsd
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_support-v1.0.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_support.xsd
similarity index 100%
rename from xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_support-v1.0.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_support.xsd
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_version-v1.0.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_version.xsd
similarity index 100%
rename from xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_version-v1.0.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_version.xsd
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_interchangeRule_version-v1.1.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_interchangeRule_version.xsd
similarity index 100%
rename from xsd/netex_part_2/part2_journeyTimes/netex_interchangeRule_version-v1.1.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_interchangeRule_version.xsd
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_interchange_support-v1.0.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_interchange_support.xsd
similarity index 100%
rename from xsd/netex_part_2/part2_journeyTimes/netex_interchange_support-v1.0.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_interchange_support.xsd
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version-v1.1.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd
similarity index 100%
rename from xsd/netex_part_2/part2_journeyTimes/netex_interchange_version-v1.1.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_support-v1.0.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_support.xsd
similarity index 100%
rename from xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_support-v1.0.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_support.xsd
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_version-v1.0.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_version.xsd
similarity index 100%
rename from xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_version-v1.0.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_version.xsd
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_journeyDesignator_support-v1.0.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_journeyDesignator_support.xsd
similarity index 100%
rename from xsd/netex_part_2/part2_journeyTimes/netex_journeyDesignator_support-v1.0.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_journeyDesignator_support.xsd
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_journey_version-v1.1.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_journey_version.xsd
similarity index 100%
rename from xsd/netex_part_2/part2_journeyTimes/netex_journey_version-v1.1.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_journey_version.xsd
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_support-v1.0.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_support.xsd
similarity index 100%
rename from xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_support-v1.0.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_support.xsd
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version-v1.1.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd
similarity index 100%
rename from xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version-v1.1.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_support-v1.0.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_support.xsd
similarity index 100%
rename from xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_support-v1.0.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_support.xsd
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_version-v1.1.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_version.xsd
similarity index 100%
rename from xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_version-v1.1.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_version.xsd
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_serviceView_version-v1.0.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_serviceView_version.xsd
similarity index 100%
rename from xsd/netex_part_2/part2_journeyTimes/netex_serviceView_version-v1.0.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_serviceView_version.xsd
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_timeDemandProfile_version-v1.0.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_timeDemandProfile_version.xsd
similarity index 100%
rename from xsd/netex_part_2/part2_journeyTimes/netex_timeDemandProfile_version-v1.0.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_timeDemandProfile_version.xsd
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_timeDemandTimes_version-v1.0.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_timeDemandTimes_version.xsd
similarity index 100%
rename from xsd/netex_part_2/part2_journeyTimes/netex_timeDemandTimes_version-v1.0.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_timeDemandTimes_version.xsd
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_support-v1.0.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_support.xsd
similarity index 100%
rename from xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_support-v1.0.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_support.xsd
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_version-v1.1.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_version.xsd
similarity index 100%
rename from xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_version-v1.1.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_version.xsd
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_support-v1.0.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_support.xsd
similarity index 100%
rename from xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_support-v1.0.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_support.xsd
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_version-v1.0.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_version.xsd
similarity index 100%
rename from xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_version-v1.0.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_version.xsd
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_support-v1.0.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_support.xsd
similarity index 100%
rename from xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_support-v1.0.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_support.xsd
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version-v1.1.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd
similarity index 100%
rename from xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version-v1.1.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleService_support-v1.0.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleService_support.xsd
similarity index 100%
rename from xsd/netex_part_2/part2_journeyTimes/netex_vehicleService_support-v1.0.xsd
rename to xsd/netex_part_2/part2_journeyTimes/netex_vehicleService_support.xsd
diff --git a/xsd/netex_part_2/part2_vehicleService/netex_all_objects_part2_vehicleService-v1.0.xsd b/xsd/netex_part_2/part2_vehicleService/netex_all_objects_part2_vehicleService.xsd
similarity index 100%
rename from xsd/netex_part_2/part2_vehicleService/netex_all_objects_part2_vehicleService-v1.0.xsd
rename to xsd/netex_part_2/part2_vehicleService/netex_all_objects_part2_vehicleService.xsd
diff --git a/xsd/netex_part_2/part2_vehicleService/netex_duty_support-v1.0.xsd b/xsd/netex_part_2/part2_vehicleService/netex_duty_support.xsd
similarity index 100%
rename from xsd/netex_part_2/part2_vehicleService/netex_duty_support-v1.0.xsd
rename to xsd/netex_part_2/part2_vehicleService/netex_duty_support.xsd
diff --git a/xsd/netex_part_2/part2_vehicleService/netex_duty_version-v1.0.xsd b/xsd/netex_part_2/part2_vehicleService/netex_duty_version.xsd
similarity index 100%
rename from xsd/netex_part_2/part2_vehicleService/netex_duty_version-v1.0.xsd
rename to xsd/netex_part_2/part2_vehicleService/netex_duty_version.xsd
diff --git a/xsd/netex_part_2/part2_vehicleService/netex_vehicleService_version-v1.1.xsd b/xsd/netex_part_2/part2_vehicleService/netex_vehicleService_version.xsd
similarity index 100%
rename from xsd/netex_part_2/part2_vehicleService/netex_vehicleService_version-v1.1.xsd
rename to xsd/netex_part_2/part2_vehicleService/netex_vehicleService_version.xsd
diff --git a/xsd/netex_part_3/part3_PiQuery/netex_all_objects_part3_piQuery-v1.0.xsd b/xsd/netex_part_3/part3_PiQuery/netex_all_objects_part3_piQuery.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_PiQuery/netex_all_objects_part3_piQuery-v1.0.xsd
rename to xsd/netex_part_3/part3_PiQuery/netex_all_objects_part3_piQuery.xsd
diff --git a/xsd/netex_part_3/part3_PiQuery/netex_piQuery_support-v1.0.xsd b/xsd/netex_part_3/part3_PiQuery/netex_piQuery_support.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_PiQuery/netex_piQuery_support-v1.0.xsd
rename to xsd/netex_part_3/part3_PiQuery/netex_piQuery_support.xsd
diff --git a/xsd/netex_part_3/part3_PiQuery/netex_piRequest_support-v1.1.xsd b/xsd/netex_part_3/part3_PiQuery/netex_piRequest_support.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_PiQuery/netex_piRequest_support-v1.1.xsd
rename to xsd/netex_part_3/part3_PiQuery/netex_piRequest_support.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_support.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_accessRightParameter_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_accessRightParameter_support.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version-v1.1.xsd b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_accessRightParameter_version-v1.1.xsd
rename to xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares-v1.1.xsd b/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares-v1.1.xsd
rename to xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_AR-v1.1.xsd b/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_AR.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_AR-v1.1.xsd
rename to xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_AR.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_FP-v1.1.xsd b/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_FP.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_FP-v1.1.xsd
rename to xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_FP.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_FS-v1.1.xsd b/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_FS.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_FS-v1.1.xsd
rename to xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_FS.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_SD-v1.1.xsd b/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_SD.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_SD-v1.1.xsd
rename to xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_SD.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_calculationParameters_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_calculationParameters_support.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_calculationParameters_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_calculationParameters_support.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_calculationParameters_version-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_calculationParameters_version.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_calculationParameters_version-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_calculationParameters_version.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_support.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_support.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version-v1.1.xsd b/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version-v1.1.xsd
rename to xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_fareConditionSummary_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_fareConditionSummary_support.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_fareConditionSummary_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_fareConditionSummary_support.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_fareConditionSummary_version-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_fareConditionSummary_version.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_fareConditionSummary_version-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_fareConditionSummary_version.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_farePrice_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_farePrice_support.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_farePrice_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_farePrice_support.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_farePrice_version-v1.1.xsd b/xsd/netex_part_3/part3_fares/netex_farePrice_version.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_farePrice_version-v1.1.xsd
rename to xsd/netex_part_3/part3_fares/netex_farePrice_version.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_fareProduct_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_fareProduct_support.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_fareProduct_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_fareProduct_support.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_fareProduct_version-v1.1.xsd b/xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_fareProduct_version-v1.1.xsd
rename to xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_fareSeries_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_fareSeries_support.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_fareSeries_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_fareSeries_support.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_fareSeries_version-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_fareSeries_version.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_fareSeries_version-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_fareSeries_version.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_fareStructureElement_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_fareStructureElement_support.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_fareStructureElement_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_fareStructureElement_support.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_fareStructureElement_version-v1.1.xsd b/xsd/netex_part_3/part3_fares/netex_fareStructureElement_version.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_fareStructureElement_version-v1.1.xsd
rename to xsd/netex_part_3/part3_fares/netex_fareStructureElement_version.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_fareStructure_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_fareStructure_support.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_fareStructure_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_fareStructure_support.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_fareStructure_version-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_fareStructure_version.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_fareStructure_version-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_fareStructure_version.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_fareTable_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_fareTable_support.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_fareTable_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_fareTable_support.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_fareTable_version-v1.1.xsd b/xsd/netex_part_3/part3_fares/netex_fareTable_version.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_fareTable_version-v1.1.xsd
rename to xsd/netex_part_3/part3_fares/netex_fareTable_version.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_support.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_support.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_version-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_version.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_version-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_version.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_support.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_support.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_version-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_version.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_version-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_version.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_salesDistribution_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_salesDistribution_support.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_salesDistribution_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_salesDistribution_support.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_salesDistribution_version-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_salesDistribution_version.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_salesDistribution_version-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_salesDistribution_version.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_salesOfferPackage_support-v1.1.xsd b/xsd/netex_part_3/part3_fares/netex_salesOfferPackage_support.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_salesOfferPackage_support-v1.1.xsd
rename to xsd/netex_part_3/part3_fares/netex_salesOfferPackage_support.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_salesOfferPackage_version-v1.1.xsd b/xsd/netex_part_3/part3_fares/netex_salesOfferPackage_version.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_salesOfferPackage_version-v1.1.xsd
rename to xsd/netex_part_3/part3_fares/netex_salesOfferPackage_version.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_salesPackage_support-v1.1.xsd b/xsd/netex_part_3/part3_fares/netex_salesPackage_support.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_salesPackage_support-v1.1.xsd
rename to xsd/netex_part_3/part3_fares/netex_salesPackage_support.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_salesPackage_version-v1.1.xsd b/xsd/netex_part_3/part3_fares/netex_salesPackage_version.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_salesPackage_version-v1.1.xsd
rename to xsd/netex_part_3/part3_fares/netex_salesPackage_version.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_timeStructureFactor_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_timeStructureFactor_support.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_timeStructureFactor_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_timeStructureFactor_support.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_timeStructureFactor_version-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_timeStructureFactor_version.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_timeStructureFactor_version-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_timeStructureFactor_version.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_travelDocument_support-v1.1.xsd b/xsd/netex_part_3/part3_fares/netex_travelDocument_support.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_travelDocument_support-v1.1.xsd
rename to xsd/netex_part_3/part3_fares/netex_travelDocument_support.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_travelDocument_version-v1.1.xsd b/xsd/netex_part_3/part3_fares/netex_travelDocument_version.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_travelDocument_version-v1.1.xsd
rename to xsd/netex_part_3/part3_fares/netex_travelDocument_version.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_support.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_support.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterBooking_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterBooking_support.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_usageParameterBooking_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameterBooking_support.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterBooking_version-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterBooking_version.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_usageParameterBooking_version-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameterBooking_version.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterCharging_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterCharging_support.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_usageParameterCharging_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameterCharging_support.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterCharging_version-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterCharging_version.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_usageParameterCharging_version-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameterCharging_version.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_support.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_support.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_version-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_version.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_version-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_version.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_support.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_support.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_version-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_version.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_version-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_version.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_support.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_support.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_version-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_version.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_version-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_version.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_support-v1.1.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_support.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_usageParameterTravel_support-v1.1.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameterTravel_support.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameter_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameter_support.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_usageParameter_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameter_support.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameter_version-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameter_version.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_usageParameter_version-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParameter_version.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParametersAll_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_usageParametersAll_support.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_usageParametersAll_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_usageParametersAll_support.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_validableElement_support-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_validableElement_support.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_validableElement_support-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_validableElement_support.xsd
diff --git a/xsd/netex_part_3/part3_fares/netex_validableElement_version-v1.0.xsd b/xsd/netex_part_3/part3_fares/netex_validableElement_version.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_fares/netex_validableElement_version-v1.0.xsd
rename to xsd/netex_part_3/part3_fares/netex_validableElement_version.xsd
diff --git a/xsd/netex_part_3/part3_frames/netex_all_frames_part3-v1.0.xsd b/xsd/netex_part_3/part3_frames/netex_all_frames_part3.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_frames/netex_all_frames_part3-v1.0.xsd
rename to xsd/netex_part_3/part3_frames/netex_all_frames_part3.xsd
diff --git a/xsd/netex_part_3/part3_frames/netex_fareFrame_version-v1.0.xsd b/xsd/netex_part_3/part3_frames/netex_fareFrame_version.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_frames/netex_fareFrame_version-v1.0.xsd
rename to xsd/netex_part_3/part3_frames/netex_fareFrame_version.xsd
diff --git a/xsd/netex_part_3/part3_frames/netex_salesTransactionFrame_version-v1.1.xsd b/xsd/netex_part_3/part3_frames/netex_salesTransactionFrame_version.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_frames/netex_salesTransactionFrame_version-v1.1.xsd
rename to xsd/netex_part_3/part3_frames/netex_salesTransactionFrame_version.xsd
diff --git a/xsd/netex_part_3/part3_monitoring/netex_all_objects_part3_monitoring-v1.0.xsd b/xsd/netex_part_3/part3_monitoring/netex_all_objects_part3_monitoring.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_monitoring/netex_all_objects_part3_monitoring-v1.0.xsd
rename to xsd/netex_part_3/part3_monitoring/netex_all_objects_part3_monitoring.xsd
diff --git a/xsd/netex_part_3/part3_monitoring/netex_monitoredCall_version-v1.0.xsd b/xsd/netex_part_3/part3_monitoring/netex_monitoredCall_version.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_monitoring/netex_monitoredCall_version-v1.0.xsd
rename to xsd/netex_part_3/part3_monitoring/netex_monitoredCall_version.xsd
diff --git a/xsd/netex_part_3/part3_monitoring/netex_monitoredPassingTimes_version-v1.1.xsd b/xsd/netex_part_3/part3_monitoring/netex_monitoredPassingTimes_version.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_monitoring/netex_monitoredPassingTimes_version-v1.1.xsd
rename to xsd/netex_part_3/part3_monitoring/netex_monitoredPassingTimes_version.xsd
diff --git a/xsd/netex_part_3/part3_monitoring/netex_monitoredVehicleJourney_support-v1.0.xsd b/xsd/netex_part_3/part3_monitoring/netex_monitoredVehicleJourney_support.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_monitoring/netex_monitoredVehicleJourney_support-v1.0.xsd
rename to xsd/netex_part_3/part3_monitoring/netex_monitoredVehicleJourney_support.xsd
diff --git a/xsd/netex_part_3/part3_parkingTariff/netex_all_objects_part3_parking-v1.0.xsd b/xsd/netex_part_3/part3_parkingTariff/netex_all_objects_part3_parking.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_parkingTariff/netex_all_objects_part3_parking-v1.0.xsd
rename to xsd/netex_part_3/part3_parkingTariff/netex_all_objects_part3_parking.xsd
diff --git a/xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_support-v1.1.xsd b/xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_support.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_support-v1.1.xsd
rename to xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_support.xsd
diff --git a/xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_version-v1.1.xsd b/xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_version.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_version-v1.1.xsd
rename to xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_version.xsd
diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_all_objects_part3_salesTransactions-v1.0.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_all_objects_part3_salesTransactions.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_salesTransactions/netex_all_objects_part3_salesTransactions-v1.0.xsd
rename to xsd/netex_part_3/part3_salesTransactions/netex_all_objects_part3_salesTransactions.xsd
diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_support-v1.1.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_support.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_support-v1.1.xsd
rename to xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_support.xsd
diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_version-v1.1.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_version.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_version-v1.1.xsd
rename to xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_version.xsd
diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_support-v1.1.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_support.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_support-v1.1.xsd
rename to xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_support.xsd
diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version-v1.1.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version-v1.1.xsd
rename to xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version.xsd
diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_support-v1.1.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_support.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_support-v1.1.xsd
rename to xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_support.xsd
diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_version-v1.1.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_version.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_version-v1.1.xsd
rename to xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_version.xsd
diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_salesContract_support-v1.1.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_salesContract_support.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_salesTransactions/netex_salesContract_support-v1.1.xsd
rename to xsd/netex_part_3/part3_salesTransactions/netex_salesContract_support.xsd
diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_salesContract_version-v1.1.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_salesContract_version.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_salesTransactions/netex_salesContract_version-v1.1.xsd
rename to xsd/netex_part_3/part3_salesTransactions/netex_salesContract_version.xsd
diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_support-v1.0.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_support.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_support-v1.0.xsd
rename to xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_support.xsd
diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_version-v1.1.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_version.xsd
similarity index 100%
rename from xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_version-v1.1.xsd
rename to xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_version.xsd
diff --git a/xsd/netex_service/netex_all-v1.0.xsd b/xsd/netex_service/netex_all.xsd
similarity index 100%
rename from xsd/netex_service/netex_all-v1.0.xsd
rename to xsd/netex_service/netex_all.xsd
diff --git a/xsd/netex_service/netex_all_filters-v1.0.xsd b/xsd/netex_service/netex_all_filters.xsd
similarity index 100%
rename from xsd/netex_service/netex_all_filters-v1.0.xsd
rename to xsd/netex_service/netex_all_filters.xsd
diff --git a/xsd/netex_service/netex_dataObjectRequest_service-v1.0.xsd b/xsd/netex_service/netex_dataObjectRequest_service.xsd
similarity index 100%
rename from xsd/netex_service/netex_dataObjectRequest_service-v1.0.xsd
rename to xsd/netex_service/netex_dataObjectRequest_service.xsd
diff --git a/xsd/netex_service/netex_filter_frame-v1.0.xsd b/xsd/netex_service/netex_filter_frame.xsd
similarity index 100%
rename from xsd/netex_service/netex_filter_frame-v1.0.xsd
rename to xsd/netex_service/netex_filter_frame.xsd
diff --git a/xsd/netex_service/netex_filter_object-v1.0.xsd b/xsd/netex_service/netex_filter_object.xsd
similarity index 100%
rename from xsd/netex_service/netex_filter_object-v1.0.xsd
rename to xsd/netex_service/netex_filter_object.xsd
diff --git a/xsd/ynotation/netex_subThing_support-v0.1.xsd b/xsd/ynotation/netex_subThing_support.xsd
similarity index 100%
rename from xsd/ynotation/netex_subThing_support-v0.1.xsd
rename to xsd/ynotation/netex_subThing_support.xsd
diff --git a/xsd/ynotation/netex_subThing_version-v0.1.xsd b/xsd/ynotation/netex_subThing_version.xsd
similarity index 100%
rename from xsd/ynotation/netex_subThing_version-v0.1.xsd
rename to xsd/ynotation/netex_subThing_version.xsd
diff --git a/xsd/ynotation/netex_thing_support-v0.1.xsd b/xsd/ynotation/netex_thing_support.xsd
similarity index 100%
rename from xsd/ynotation/netex_thing_support-v0.1.xsd
rename to xsd/ynotation/netex_thing_support.xsd
diff --git a/xsd/ynotation/netex_thing_version-v0.1.xsd b/xsd/ynotation/netex_thing_version.xsd
similarity index 100%
rename from xsd/ynotation/netex_thing_version-v0.1.xsd
rename to xsd/ynotation/netex_thing_version.xsd

From 380000f5f229b7a92036ffc47824270122ecdc13 Mon Sep 17 00:00:00 2001
From: Cristoffer Solem <cristoffer.solem@gmail.com>
Date: Wed, 8 Aug 2018 14:13:05 +0200
Subject: [PATCH 4/4] See #13  Remove version suffixes in netex files, ignoring
 siri files

---
 xsd/NX.xsd                                    |   4 +-
 xsd/NeTEx_publication-NoConstraint.xsd        |   4 +-
 xsd/NeTEx_publication.xsd                     |   4 +-
 xsd/NeTEx_publication_timetable.xsd           |  18 ++--
 xsd/NeTEx_siri.xsd                            |   4 +-
 xsd/ifopt.xsd                                 |   2 +-
 .../netex_all_objects_framework.xsd           |   6 +-
 .../netex_all_objects_generic.xsd             | 100 +++++++++---------
 .../netex_all_frames_framework.xsd            |  12 +--
 .../netex_commonFrame_version.xsd             |   6 +-
 .../netex_compositeFrame_version.xsd          |   4 +-
 .../netex_generalFrame_version.xsd            |   8 +-
 .../netex_resourceFrame_support.xsd           |   4 +-
 .../netex_resourceFrame_version.xsd           |   8 +-
 .../netex_serviceCalendarFrame_support.xsd    |   4 +-
 .../netex_serviceCalendarFrame_version.xsd    |   6 +-
 .../netex_acsb_accessibility.xsd              |   6 +-
 .../netex_accessibility/netex_acsb_all.xsd    |   8 +-
 .../netex_acsb_limitations.xsd                |   2 +-
 .../netex_acsb_passengerMobility.xsd          |   6 +-
 .../netex_acsb_support.xsd                    |   4 +-
 .../netex_alternativeName_support.xsd         |   4 +-
 .../netex_alternativeName_version.xsd         |   6 +-
 .../netex_assignment_support.xsd              |   4 +-
 .../netex_assignment_version.xsd              |   6 +-
 .../netex_grouping_support.xsd                |   4 +-
 .../netex_grouping_version.xsd                |   8 +-
 .../netex_layer_support.xsd                   |   4 +-
 .../netex_layer_version.xsd                   |  10 +-
 .../netex_loggable_support.xsd                |   4 +-
 .../netex_loggable_version.xsd                |   6 +-
 .../netex_organisation_support.xsd            |   8 +-
 .../netex_organisation_version.xsd            |  12 +--
 .../netex_place_support.xsd                   |   4 +-
 .../netex_place_version.xsd                   |   8 +-
 .../netex_pointAndLinkSequence_support.xsd    |   6 +-
 .../netex_pointAndLinkSequence_version.xsd    |   8 +-
 .../netex_pointAndLink_support.xsd            |   6 +-
 .../netex_pointAndLink_version.xsd            |  12 +--
 .../netex_projection_support.xsd              |   4 +-
 .../netex_projection_version.xsd              |  10 +-
 .../netex_section_support.xsd                 |   4 +-
 .../netex_section_version.xsd                 |   8 +-
 .../netex_spatialFeature_support.xsd          |   4 +-
 .../netex_spatialFeature_version.xsd          |   6 +-
 .../netex_zoneProjection_version.xsd          |   4 +-
 .../netex_zone_support.xsd                    |   4 +-
 .../netex_zone_version.xsd                    |   6 +-
 .../netex_payload_framework.xsd               |   2 +-
 .../netex_alternativeText_support.xsd         |   4 +-
 .../netex_alternativeText_version.xsd         |   6 +-
 .../netex_dataSource_version.xsd              |   4 +-
 .../netex_entity_entity.xsd                   |   6 +-
 .../netex_entity_support.xsd                  |   2 +-
 .../netex_entity_version.xsd                  |   4 +-
 .../netex_relationship.xsd                    |   4 +-
 .../netex_relationship_support.xsd            |   4 +-
 .../netex_responsibilitySet_version.xsd       |   4 +-
 .../netex_responsibility_support.xsd          |   4 +-
 .../netex_responsibility_version.xsd          |  10 +-
 .../netex_typeOfValue_version.xsd             |   4 +-
 .../netex_validityCondition_support.xsd       |   4 +-
 .../netex_validityCondition_version.xsd       |   6 +-
 .../netex_versionDelta_version.xsd            |   4 +-
 .../netex_versionFrame_support.xsd            |   4 +-
 .../netex_versionFrame_version.xsd            |  12 +--
 .../netex_version_support.xsd                 |   4 +-
 .../netex_version_version.xsd                 |  10 +-
 .../netex_access_version.xsd                  |   6 +-
 .../netex_address_support.xsd                 |   4 +-
 .../netex_address_version.xsd                 |  10 +-
 .../netex_all_objects_reusableComponents.xsd  |  80 +++++++-------
 .../netex_availabilityCondition_support.xsd   |   4 +-
 .../netex_availabilityCondition_version.xsd   |   6 +-
 .../netex_country_support.xsd                 |   4 +-
 .../netex_country_version.xsd                 |   8 +-
 .../netex_dayType_propertiesOfDay.xsd         |   8 +-
 .../netex_dayType_support.xsd                 |   6 +-
 .../netex_dayType_version.xsd                 |  10 +-
 .../netex_equipmentPlace_version.xsd          |   6 +-
 ...etex_equipmentVehiclePassenger_support.xsd |   4 +-
 ...etex_equipmentVehiclePassenger_version.xsd |  14 +--
 .../netex_equipment_support.xsd               |   4 +-
 .../netex_equipment_version.xsd               |   8 +-
 .../netex_facilityUic_support.xsd             |   4 +-
 .../netex_facility_support.xsd                |   4 +-
 .../netex_facility_version.xsd                |  10 +-
 .../netex_linkByValue_support.xsd             |   6 +-
 .../netex_mode_support.xsd                    |   4 +-
 .../netex_mode_version.xsd                    |   8 +-
 .../netex_noticeAssignment_version.xsd        |  12 +--
 .../netex_notice_support.xsd                  |   4 +-
 .../netex_notice_version.xsd                  |   6 +-
 .../netex_otherOrganisation_support.xsd       |   4 +-
 .../netex_otherOrganisation_version.xsd       |  10 +-
 .../netex_schematicMap_support.xsd            |   4 +-
 .../netex_schematicMap_version.xsd            |  10 +-
 .../netex_securityList_support.xsd            |   6 +-
 .../netex_securityList_version.xsd            |   8 +-
 .../netex_serviceCalendar_support.xsd         |   4 +-
 .../netex_serviceCalendar_version.xsd         |   8 +-
 .../netex_submode_version.xsd                 |   4 +-
 .../netex_topographicPlace_support.xsd        |   6 +-
 .../netex_topographicPlace_version.xsd        |   8 +-
 .../netex_trainElement_support.xsd            |   4 +-
 .../netex_trainElement_version.xsd            |   8 +-
 .../netex_transportOrganisation_support.xsd   |   4 +-
 .../netex_transportOrganisation_version.xsd   |  10 +-
 .../netex_travelRights_support.xsd            |   4 +-
 .../netex_travelRights_version.xsd            |   8 +-
 .../netex_vehicleType_support.xsd             |   4 +-
 .../netex_vehicleType_version.xsd             |   8 +-
 .../netex_utility/netex_location_types.xsd    |   4 +-
 .../netex_utility/netex_units.xsd             |   2 +-
 .../netex_utility/netex_utility_contact.xsd   |   6 +-
 .../netex_utility/netex_utility_time.xsd      |   2 +-
 .../netex_utility/netex_utility_types.xsd     |   2 +-
 .../netex_utility/netex_utility_xml.xsd       |   2 +-
 xsd/netex_part_1/netex_all_frames_part1.xsd   |   6 +-
 .../netex_all_objects_infrastructureFrame.xsd |   8 +-
 xsd/netex_part_1/netex_all_objects_part1.xsd  |   8 +-
 .../netex_infrastructureFrame_version.xsd     |  10 +-
 .../part1_frames/netex_siteFrame_version.xsd  |  12 +--
 .../netex_assistanceBooking_support.xsd       |   4 +-
 .../netex_assistanceBooking_version.xsd       |  14 +--
 .../part1_ifopt/netex_ifopt_all_objects.xsd   |  40 +++----
 .../netex_ifopt_checkConstraint_support.xsd   |   4 +-
 .../netex_ifopt_checkConstraint_version.xsd   |  12 +--
 .../netex_ifopt_equipmentAccess_support.xsd   |   4 +-
 .../netex_ifopt_equipmentAccess_version.xsd   |   8 +-
 .../part1_ifopt/netex_ifopt_equipmentAll.xsd  |  40 +++----
 .../netex_ifopt_equipmentParking_support.xsd  |   4 +-
 .../netex_ifopt_equipmentParking_version.xsd  |   6 +-
 ...netex_ifopt_equipmentPassenger_support.xsd |   4 +-
 ...netex_ifopt_equipmentPassenger_version.xsd |  10 +-
 .../netex_ifopt_equipmentSigns_support.xsd    |   4 +-
 .../netex_ifopt_equipmentSigns_version.xsd    |   8 +-
 ...netex_ifopt_equipmentTicketing_support.xsd |   4 +-
 ...netex_ifopt_equipmentTicketing_version.xsd |  10 +-
 .../netex_ifopt_equipmentWaiting_support.xsd  |   4 +-
 .../netex_ifopt_equipmentWaiting_version.xsd  |   8 +-
 .../netex_ifopt_flexibleStopPlace_support.xsd |   4 +-
 .../netex_ifopt_flexibleStopPlace_version.xsd |   8 +-
 ...x_ifopt_localServiceCommercial_support.xsd |   4 +-
 ...x_ifopt_localServiceCommercial_version.xsd |   6 +-
 .../netex_ifopt_localService_support.xsd      |   4 +-
 .../netex_ifopt_localService_version.xsd      |  18 ++--
 .../netex_ifopt_navigationPath_version.xsd    |  14 +--
 .../netex_ifopt_parking_support.xsd           |   4 +-
 .../netex_ifopt_parking_version.xsd           |   8 +-
 .../part1_ifopt/netex_ifopt_path_support.xsd  |   6 +-
 .../part1_ifopt/netex_ifopt_path_version.xsd  |   8 +-
 .../netex_ifopt_pointOfInterest_support.xsd   |   4 +-
 .../netex_ifopt_pointOfInterest_version.xsd   |   6 +-
 .../netex_ifopt_serviceFeature_support.xsd    |   4 +-
 .../netex_ifopt_serviceFeature_version.xsd    |   6 +-
 .../part1_ifopt/netex_ifopt_site_support.xsd  |   6 +-
 .../part1_ifopt/netex_ifopt_site_version.xsd  |  24 ++---
 .../netex_ifopt_stopPlace_support.xsd         |   8 +-
 .../netex_ifopt_stopPlace_version.xsd         |  24 ++---
 .../netex_ifopt_vehicleStopping_support.xsd   |   4 +-
 .../netex_activation_support.xsd              |   8 +-
 .../netex_activation_version.xsd              |  12 +--
 ...cts_part1_infrastructureFrame_contents.xsd |  18 ++--
 .../netex_all_objects_part1_lineRoute.xsd     |  22 ++--
 ...x_all_objects_part1_networkDescription.xsd |   6 +-
 .../netex_flexibleNetwork_support.xsd         |   8 +-
 .../netex_flexibleNetwork_version.xsd         |  14 +--
 .../netex_lineNetwork_support.xsd             |   8 +-
 .../netex_lineNetwork_version.xsd             |  10 +-
 .../netex_line_support.xsd                    |   6 +-
 .../netex_line_version.xsd                    |  26 ++---
 .../netex_networkInfrastructure_support.xsd   |   6 +-
 .../netex_networkInfrastructure_version.xsd   |   8 +-
 .../netex_networkRestriction_support.xsd      |   8 +-
 .../netex_networkRestriction_version.xsd      |  10 +-
 .../netex_routeInstruction_support.xsd        |   6 +-
 .../netex_routeInstruction_version.xsd        |  10 +-
 .../netex_route_support.xsd                   |   8 +-
 .../netex_route_version.xsd                   |  12 +--
 .../netex_timingPattern_support.xsd           |   8 +-
 .../netex_vehicleAndCrewPoint_support.xsd     |   8 +-
 .../netex_vehicleAndCrewPoint_version.xsd     |  12 +--
 ...tex_all_objects_part1_tacticalPlanning.xsd |  50 ++++-----
 .../netex_commonSection_support.xsd           |   4 +-
 .../netex_commonSection_version.xsd           |   6 +-
 .../netex_fareZone_support.xsd                |   6 +-
 .../netex_fareZone_version.xsd                |  10 +-
 .../netex_journeyPatternTimings_support.xsd   |   6 +-
 .../netex_journeyPatternTimings_version.xsd   |  10 +-
 .../netex_journeyPattern_support.xsd          |   6 +-
 .../netex_journeyPattern_version.xsd          |  10 +-
 .../netex_journeyTiming_support.xsd           |   6 +-
 .../netex_journeyTiming_version.xsd           |  18 ++--
 ..._passengerInformationEquipment_support.xsd |   6 +-
 ..._passengerInformationEquipment_version.xsd |  20 ++--
 .../netex_pathAssignment_version.xsd          |   4 +-
 .../netex_routingConstraint_support.xsd       |   8 +-
 .../netex_routingConstraint_version.xsd       |   8 +-
 .../netex_servicePattern_support.xsd          |  10 +-
 .../netex_servicePattern_version.xsd          |  16 +--
 .../netex_siteConnection_support.xsd          |   6 +-
 .../netex_siteConnection_version.xsd          |  14 +--
 .../netex_stopAssignment_support.xsd          |   4 +-
 .../netex_stopAssignment_version.xsd          |  12 +--
 .../netex_timeDemandType_support.xsd          |   8 +-
 .../netex_timeDemandType_version.xsd          |  14 +--
 .../netex_timingPattern_version.xsd           |  12 +--
 xsd/netex_part_2/netex_all_frames_part2.xsd   |  18 ++--
 xsd/netex_part_2/netex_all_objects_part2.xsd  |  16 +--
 .../netex_driverScheduleFrame_version.xsd     |   6 +-
 .../netex_serviceFrame_version.xsd            |   8 +-
 .../netex_timetableFrame_support.xsd          |   6 +-
 .../netex_timetableFrame_version.xsd          |  10 +-
 .../netex_vehicleScheduleFrame_version.xsd    |   8 +-
 .../netex_all_objects_part2_journeyTimes.xsd  |  46 ++++----
 .../part2_journeyTimes/netex_call_support.xsd |   6 +-
 .../part2_journeyTimes/netex_call_version.xsd |  22 ++--
 .../netex_coupledJourney_support.xsd          |   6 +-
 .../netex_coupledJourney_version.xsd          |  10 +-
 .../netex_datedPassingTimes_version.xsd       |   6 +-
 .../netex_datedVehicleJourney_support.xsd     |   4 +-
 .../netex_datedVehicleJourney_version.xsd     |  12 +--
 .../netex_flexibleService_support.xsd         |   6 +-
 .../netex_flexibleService_version.xsd         |  12 +--
 .../netex_interchangeRule_version.xsd         |  10 +-
 .../netex_interchange_support.xsd             |   8 +-
 .../netex_interchange_version.xsd             |  16 +--
 .../netex_journeyAccounting_support.xsd       |   8 +-
 .../netex_journeyAccounting_version.xsd       |  10 +-
 .../netex_journeyDesignator_support.xsd       |  12 +--
 .../netex_journey_version.xsd                 |  16 +--
 .../netex_passingTimes_support.xsd            |   6 +-
 .../netex_passingTimes_version.xsd            |  12 +--
 .../netex_serviceJourney_support.xsd          |   4 +-
 .../netex_serviceJourney_version.xsd          |  16 +--
 .../netex_serviceView_version.xsd             |   2 +-
 .../netex_timeDemandProfile_version.xsd       |  10 +-
 .../netex_timeDemandTimes_version.xsd         |  10 +-
 .../netex_vehicleJourneyFrequency_support.xsd |   4 +-
 .../netex_vehicleJourneyFrequency_version.xsd |  12 +--
 .../netex_vehicleJourneyTimes_support.xsd     |   4 +-
 .../netex_vehicleJourneyTimes_version.xsd     |  12 +--
 .../netex_vehicleJourney_support.xsd          |   8 +-
 .../netex_vehicleJourney_version.xsd          |  24 ++---
 .../netex_vehicleService_support.xsd          |   6 +-
 ...netex_all_objects_part2_vehicleService.xsd |  16 +--
 .../netex_duty_support.xsd                    |   6 +-
 .../netex_duty_version.xsd                    |  14 +--
 .../netex_vehicleService_version.xsd          |  16 +--
 .../netex_all_objects_part3_piQuery.xsd       |   2 +-
 .../part3_PiQuery/netex_piQuery_support.xsd   |   6 +-
 .../part3_PiQuery/netex_piRequest_support.xsd |   6 +-
 .../netex_accessRightParameter_support.xsd    |   8 +-
 .../netex_accessRightParameter_version.xsd    |  58 +++++-----
 .../netex_all_objects_part3_fares.xsd         |   8 +-
 .../netex_all_objects_part3_fares_AR.xsd      |  46 ++++----
 .../netex_all_objects_part3_fares_FP.xsd      |  12 +--
 .../netex_all_objects_part3_fares_FS.xsd      |  32 +++---
 .../netex_all_objects_part3_fares_SD.xsd      |  12 +--
 .../netex_calculationParameters_support.xsd   |   8 +-
 .../netex_calculationParameters_version.xsd   |   8 +-
 .../netex_distanceMatrixElement_support.xsd   |   8 +-
 .../netex_distanceMatrixElement_version.xsd   |  10 +-
 .../netex_fareConditionSummary_support.xsd    |   4 +-
 .../netex_fareConditionSummary_version.xsd    |   8 +-
 .../part3_fares/netex_farePrice_support.xsd   |   6 +-
 .../part3_fares/netex_farePrice_version.xsd   |  16 +--
 .../part3_fares/netex_fareProduct_support.xsd |   6 +-
 .../part3_fares/netex_fareProduct_version.xsd |  14 +--
 .../part3_fares/netex_fareSeries_support.xsd  |   6 +-
 .../part3_fares/netex_fareSeries_version.xsd  |  10 +-
 .../netex_fareStructureElement_support.xsd    |   6 +-
 .../netex_fareStructureElement_version.xsd    |  12 +--
 .../netex_fareStructure_support.xsd           |   6 +-
 .../netex_fareStructure_version.xsd           |   8 +-
 .../part3_fares/netex_fareTable_support.xsd   |   8 +-
 .../part3_fares/netex_fareTable_version.xsd   |  44 ++++----
 ...etex_geographicStructureFactor_support.xsd |   6 +-
 ...etex_geographicStructureFactor_version.xsd |  14 +--
 .../netex_qualityStructureFactor_support.xsd  |   6 +-
 .../netex_qualityStructureFactor_version.xsd  |  18 ++--
 .../netex_salesDistribution_support.xsd       |   6 +-
 .../netex_salesDistribution_version.xsd       |  16 +--
 .../netex_salesOfferPackage_support.xsd       |   8 +-
 .../netex_salesOfferPackage_version.xsd       |  12 +--
 .../netex_salesPackage_support.xsd            |   8 +-
 .../netex_salesPackage_version.xsd            |  12 +--
 .../netex_timeStructureFactor_support.xsd     |   6 +-
 .../netex_timeStructureFactor_version.xsd     |  12 +--
 .../netex_travelDocument_support.xsd          |   8 +-
 .../netex_travelDocument_version.xsd          |  10 +-
 ...netex_usageParameterAfterSales_support.xsd |   6 +-
 ...netex_usageParameterAfterSales_version.xsd |  12 +--
 .../netex_usageParameterBooking_support.xsd   |   6 +-
 .../netex_usageParameterBooking_version.xsd   |  12 +--
 .../netex_usageParameterCharging_support.xsd  |   4 +-
 .../netex_usageParameterCharging_version.xsd  |   6 +-
 ...etex_usageParameterEligibility_support.xsd |   4 +-
 ...etex_usageParameterEligibility_version.xsd |   8 +-
 ...etex_usageParameterEntitlement_support.xsd |   4 +-
 ...etex_usageParameterEntitlement_version.xsd |   8 +-
 .../netex_usageParameterLuggage_support.xsd   |   4 +-
 .../netex_usageParameterLuggage_version.xsd   |   6 +-
 .../netex_usageParameterTravel_support.xsd    |   4 +-
 .../netex_usageParameterTravel_version.xsd    |   8 +-
 .../netex_usageParameter_support.xsd          |   6 +-
 .../netex_usageParameter_version.xsd          |  12 +--
 .../netex_usageParametersAll_support.xsd      |  14 +--
 .../netex_validableElement_support.xsd        |   6 +-
 .../netex_validableElement_version.xsd        |  10 +-
 .../part3_frames/netex_all_frames_part3.xsd   |   4 +-
 .../part3_frames/netex_fareFrame_version.xsd  |  14 +--
 .../netex_salesTransactionFrame_version.xsd   |  10 +-
 .../netex_all_objects_part3_monitoring.xsd    |   6 +-
 .../netex_monitoredCall_version.xsd           |  10 +-
 .../netex_monitoredPassingTimes_version.xsd   |   6 +-
 .../netex_monitoredVehicleJourney_support.xsd |   6 +-
 .../netex_all_objects_part3_parking.xsd       |   4 +-
 .../netex_parkingTariff_support.xsd           |   6 +-
 .../netex_parkingTariff_version.xsd           |  10 +-
 ...ex_all_objects_part3_salesTransactions.xsd |  20 ++--
 .../netex_customerEligibility_support.xsd     |   6 +-
 .../netex_customerEligibility_version.xsd     |  12 +--
 .../netex_customerPurchasePackage_support.xsd |   8 +-
 .../netex_customerPurchasePackage_version.xsd |  18 ++--
 .../netex_retailConsortium_support.xsd        |  10 +-
 .../netex_retailConsortium_version.xsd        |  16 +--
 .../netex_salesContract_support.xsd           |   8 +-
 .../netex_salesContract_version.xsd           |  18 ++--
 .../netex_salesTransaction_support.xsd        |   8 +-
 .../netex_salesTransaction_version.xsd        |  14 +--
 xsd/netex_service/netex_all.xsd               |  18 ++--
 xsd/netex_service/netex_all_filters.xsd       |  14 +--
 .../netex_dataObjectRequest_service.xsd       |   8 +-
 xsd/netex_service/netex_filter_frame.xsd      |  10 +-
 xsd/netex_service/netex_filter_object.xsd     |  18 ++--
 xsd/wsdl/siri_all_functionalServices.xsd      |   4 +-
 xsd/ynotation/netex_subThing_support.xsd      |   2 +-
 xsd/ynotation/netex_subThing_version.xsd      |   4 +-
 xsd/ynotation/netex_thing_support.xsd         |   2 +-
 xsd/ynotation/netex_thing_version.xsd         |   4 +-
 342 files changed, 1602 insertions(+), 1602 deletions(-)

diff --git a/xsd/NX.xsd b/xsd/NX.xsd
index 692bd3db2..8841cc4c5 100644
--- a/xsd/NX.xsd
+++ b/xsd/NX.xsd
@@ -5,8 +5,8 @@
 	<!-- ===  ONLY TO FACILITATE  STUDY OF SCHEMA ELEMENTS.  DO NOT USE IT FOR DOCUMENTS  =========== -->
 	<!-- === Use NeTEx_publication.xsd or NeTEx_publication_timetable  or NeTEx_siri.xsd=========== -->
 	<!-- (C) Copyright 2009-2012 CEN,Crown Copyright -->
-	<xsd:include schemaLocation="netex_service/netex_all-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_framework/netex_payload_framework-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_service/netex_all.xsd"/>
+	<xsd:include schemaLocation="netex_framework/netex_payload_framework.xsd"/>
 	<!-- ======================================================================= -->
 	<!-- ======================================================================= -->
 	<xsd:element name="Nx">
diff --git a/xsd/NeTEx_publication-NoConstraint.xsd b/xsd/NeTEx_publication-NoConstraint.xsd
index 1584b9858..70c0dce46 100644
--- a/xsd/NeTEx_publication-NoConstraint.xsd
+++ b/xsd/NeTEx_publication-NoConstraint.xsd
@@ -5,8 +5,8 @@
 	<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="siri_utility/siri_participant-v2.0.xsd"/>
 	<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="siri/siri_requests-v2.0.xsd"/>
 	<!-- ===Regular netex============================================================== -->
-	<xsd:include schemaLocation="netex_service/netex_dataObjectRequest_service-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_service/netex_all-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_service/netex_dataObjectRequest_service.xsd"/>
+	<xsd:include schemaLocation="netex_service/netex_all.xsd"/>
 	<!-- ===eGIF/GovTalk Documentation ======================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
diff --git a/xsd/NeTEx_publication.xsd b/xsd/NeTEx_publication.xsd
index 7dd2a3270..ccb1a56db 100644
--- a/xsd/NeTEx_publication.xsd
+++ b/xsd/NeTEx_publication.xsd
@@ -5,8 +5,8 @@
 	<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="siri_utility/siri_participant-v2.0.xsd"/>
 	<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="siri/siri_requests-v2.0.xsd"/>
 	<!-- ===Regular netex============================================================== -->
-	<xsd:include schemaLocation="netex_service/netex_dataObjectRequest_service-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_service/netex_all-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_service/netex_dataObjectRequest_service.xsd"/>
+	<xsd:include schemaLocation="netex_service/netex_all.xsd"/>
 	<!-- ===eGIF/GovTalk Documentation ======================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
diff --git a/xsd/NeTEx_publication_timetable.xsd b/xsd/NeTEx_publication_timetable.xsd
index ddcedfd6f..36e561871 100644
--- a/xsd/NeTEx_publication_timetable.xsd
+++ b/xsd/NeTEx_publication_timetable.xsd
@@ -4,22 +4,22 @@
 	<!-- ==+ IT INCLUDES ELEMENTS RELEVANT FOR THE EXCHANGE OF TIMETABLES ===== -->
 	<!-- ==+ANY DOCUMENT COMPLIANT WITH THIS SCHEMA WILL ALSO BE COMPLIANT WITH NetEx_publication.xsd ===== -->
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="netex_framework/netex_frames/netex_all_frames_framework-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_framework/netex_frames/netex_resourceFrame_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_framework/netex_frames/netex_serviceCalendarFrame_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_framework/netex_frames/netex_compositeFrame_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_framework/netex_frames/netex_all_frames_framework.xsd"/>
+	<xsd:include schemaLocation="netex_framework/netex_frames/netex_resourceFrame_version.xsd"/>
+	<xsd:include schemaLocation="netex_framework/netex_frames/netex_serviceCalendarFrame_version.xsd"/>
+	<xsd:include schemaLocation="netex_framework/netex_frames/netex_compositeFrame_version.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_part_1/part1_frames/netex_siteFrame_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_part_1/part1_frames/netex_siteFrame_version.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_part_2/part2_frames/netex_timetableFrame_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_part_2/part2_frames/netex_serviceFrame_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_part_2/part2_frames/netex_timetableFrame_version.xsd"/>
+	<xsd:include schemaLocation="netex_part_2/part2_frames/netex_serviceFrame_version.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_part_3/part3_frames/netex_fareFrame_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_part_3/part3_frames/netex_fareFrame_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="siri/siri_base-v2.0.xsd"/>
 	<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="siri_utility/siri_participant-v2.0.xsd"/>
 	<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="siri/siri_requests-v2.0.xsd"/>
-	<xsd:include schemaLocation="netex_service/netex_dataObjectRequest_service-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_service/netex_dataObjectRequest_service.xsd"/>
 	<!-- ===eGIF/GovTalk Documentation ======================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
diff --git a/xsd/NeTEx_siri.xsd b/xsd/NeTEx_siri.xsd
index b44293305..908d0830d 100644
--- a/xsd/NeTEx_siri.xsd
+++ b/xsd/NeTEx_siri.xsd
@@ -3,8 +3,8 @@
 <xsd:schema xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.siri.org.uk/siri" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_siri">
 	<!-- ===Dependencies ======================================= -->
 	<!-- ====INCLUDE NETEX REQUESTS==================================================== -->
-	<xsd:import namespace="http://www.netex.org.uk/netex" schemaLocation="netex_service/netex_all-v1.0.xsd"/>
-	<xsd:import namespace="http://www.netex.org.uk/netex" schemaLocation="netex_service/netex_dataObjectRequest_service-v1.0.xsd"/>
+	<xsd:import namespace="http://www.netex.org.uk/netex" schemaLocation="netex_service/netex_all.xsd"/>
+	<xsd:import namespace="http://www.netex.org.uk/netex" schemaLocation="netex_service/netex_dataObjectRequest_service.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:include schemaLocation="siri/siri_base-v2.0.xsd"/>
 	<!-- ===eGIF/GovTalk Documentation ======================================= -->
diff --git a/xsd/ifopt.xsd b/xsd/ifopt.xsd
index 9fff45e9b..8d019c624 100644
--- a/xsd/ifopt.xsd
+++ b/xsd/ifopt.xsd
@@ -4,7 +4,7 @@
 	<!-- === THIS IS FOR DOCUMENTATION TO SHOW THE COVERAGE OF THE ORIGINAL  IFOPT ELEMENTS ===== -->
 	<!-- ===  USE THE NeTEX publication schema FOR ACTUAL DOCUMENTS============= -->
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_part_1/netex_all_objects_part1-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_part_1/netex_all_objects_part1.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:group name="IfoptPayloadGroup">
 		<xsd:sequence>
diff --git a/xsd/netex_framework/netex_all_objects_framework.xsd b/xsd/netex_framework/netex_all_objects_framework.xsd
index 72ceede69..3fc26f2be 100644
--- a/xsd/netex_framework/netex_all_objects_framework.xsd
+++ b/xsd/netex_framework/netex_all_objects_framework.xsd
@@ -2,7 +2,7 @@
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_framework">
 	<!-- ===Types ======================================= -->
-	<xsd:include schemaLocation="netex_payload_framework-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_all_objects_generic-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_reusableComponents/netex_all_objects_reusableComponents-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_payload_framework.xsd"/>
+	<xsd:include schemaLocation="netex_all_objects_generic.xsd"/>
+	<xsd:include schemaLocation="netex_reusableComponents/netex_all_objects_reusableComponents.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_framework/netex_all_objects_generic.xsd b/xsd/netex_framework/netex_all_objects_generic.xsd
index 6f1ef93f6..76367f73f 100644
--- a/xsd/netex_framework/netex_all_objects_generic.xsd
+++ b/xsd/netex_framework/netex_all_objects_generic.xsd
@@ -1,56 +1,56 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_generic">
 	<!-- ===Types =======================================  -->
-	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_utility_types-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_location_types-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_units-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_utility_contact-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_utility_time-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_utility_xml-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_utility_types.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_location_types.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_units.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_utility_contact.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_utility_time.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_utility_xml.xsd"/>
 	<!-- =====entity=========================================================== -->
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_alternativeText_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_alternativeText_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_entity_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_entity_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_relationship_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_relationship-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_typeOfValue_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_responsibility_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_responsibility_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_responsibilitySet_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_dataSource_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_validityCondition_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_versionDelta_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_versionFrame_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_versionFrame_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_version_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_version_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_alternativeText_support.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_alternativeText_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_entity_support.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_entity_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_relationship_support.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_relationship.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_typeOfValue_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_responsibility_support.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_responsibility_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_dataSource_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_validityCondition_support.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_versionDelta_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_versionFrame_support.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_versionFrame_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_version_support.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_version_version.xsd"/>
 	<!-- ======Framework========================================================= -->
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_alternativeName_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_alternativeName_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_all-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_assignment_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_assignment_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_grouping_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_grouping_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_layer_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_layer_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_loggable_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_loggable_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_organisation_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_organisation_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_place_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_place_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_pointAndLink_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_pointAndLink_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_projection_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_projection_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_section_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_section_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_spatialFeature_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_spatialFeature_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_zone_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_zone_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_zoneProjection_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_alternativeName_support.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_alternativeName_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_all.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_assignment_support.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_assignment_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_grouping_support.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_grouping_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_layer_support.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_layer_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_loggable_support.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_loggable_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_organisation_support.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_organisation_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_place_support.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_place_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_pointAndLink_support.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_projection_support.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_projection_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_section_support.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_section_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_spatialFeature_support.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_spatialFeature_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_zone_support.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_zone_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_zoneProjection_version.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_framework/netex_frames/netex_all_frames_framework.xsd b/xsd/netex_framework/netex_frames/netex_all_frames_framework.xsd
index 9db45449e..9588c56fd 100644
--- a/xsd/netex_framework/netex_frames/netex_all_frames_framework.xsd
+++ b/xsd/netex_framework/netex_frames/netex_all_frames_framework.xsd
@@ -2,10 +2,10 @@
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://www.ifopt.org.uk/ifopt" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_frames_framework">
 	<!-- ===Types ======================================= -->
-	<xsd:include schemaLocation="netex_commonFrame_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_compositeFrame_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_serviceCalendarFrame_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_serviceCalendarFrame_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_resourceFrame_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_generalFrame_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_commonFrame_version.xsd"/>
+	<xsd:include schemaLocation="netex_compositeFrame_version.xsd"/>
+	<xsd:include schemaLocation="netex_serviceCalendarFrame_version.xsd"/>
+	<xsd:include schemaLocation="netex_serviceCalendarFrame_version.xsd"/>
+	<xsd:include schemaLocation="netex_resourceFrame_version.xsd"/>
+	<xsd:include schemaLocation="netex_generalFrame_version.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_framework/netex_frames/netex_commonFrame_version.xsd b/xsd/netex_framework/netex_frames/netex_commonFrame_version.xsd
index 379cb1041..db905c397 100644
--- a/xsd/netex_framework/netex_frames/netex_commonFrame_version.xsd
+++ b/xsd/netex_framework/netex_frames/netex_commonFrame_version.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_commonFrame_version">
-	<xsd:include schemaLocation="../netex_responsibility/netex_versionFrame_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_reusableComponents/netex_availabilityCondition_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_versionFrame_version.xsd"/>
+	<xsd:include schemaLocation="../netex_reusableComponents/netex_availabilityCondition_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -26,7 +26,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/0.4/netex}netex_utility_types-v0.2.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/0.4/netex}netex_utility_types.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_frames/netex_compositeFrame_version.xsd b/xsd/netex_framework/netex_frames/netex_compositeFrame_version.xsd
index b2dd83f03..62d6157fd 100644
--- a/xsd/netex_framework/netex_frames/netex_compositeFrame_version.xsd
+++ b/xsd/netex_framework/netex_frames/netex_compositeFrame_version.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_compositeFrame_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_commonFrame_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_commonFrame_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -25,7 +25,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_frames}netex_compositeFrame_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_frames}netex_compositeFrame_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_frames/netex_generalFrame_version.xsd b/xsd/netex_framework/netex_frames/netex_generalFrame_version.xsd
index a5592ba05..d2f5b9121 100644
--- a/xsd/netex_framework/netex_frames/netex_generalFrame_version.xsd
+++ b/xsd/netex_framework/netex_frames/netex_generalFrame_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_generalFrame_version">
-	<xsd:include schemaLocation="netex_commonFrame_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_responsibility/netex_entity_entity-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_reusableComponents/netex_linkByValue_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_commonFrame_version.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_entity_entity.xsd"/>
+	<xsd:include schemaLocation="../netex_reusableComponents/netex_linkByValue_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_frames}netex_generalFrame_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_frames}netex_generalFrame_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_frames/netex_resourceFrame_support.xsd b/xsd/netex_framework/netex_frames/netex_resourceFrame_support.xsd
index 110d916d0..109bfae27 100644
--- a/xsd/netex_framework/netex_frames/netex_resourceFrame_support.xsd
+++ b/xsd/netex_framework/netex_frames/netex_resourceFrame_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_resourceFrame_support">
-	<xsd:include schemaLocation="../netex_responsibility/netex_versionFrame_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_versionFrame_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -25,7 +25,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_frames}netex_resourceFrame_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_frames}netex_resourceFrame_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd b/xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd
index e4a0de6af..40ae3a72e 100644
--- a/xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd
+++ b/xsd/netex_framework/netex_frames/netex_resourceFrame_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_resourceFrame_version">
-	<xsd:include schemaLocation="netex_commonFrame_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_reusableComponents/netex_transportOrganisation_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_all_objects_framework-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_resourceFrame_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_commonFrame_version.xsd"/>
+	<xsd:include schemaLocation="../netex_reusableComponents/netex_transportOrganisation_version.xsd"/>
+	<xsd:include schemaLocation="../netex_all_objects_framework.xsd"/>
+	<xsd:include schemaLocation="netex_resourceFrame_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
diff --git a/xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_support.xsd b/xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_support.xsd
index 82b168ac3..d50acd675 100644
--- a/xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_support.xsd
+++ b/xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2006 sp2 U (http://www.altova.com) by christophe duquesne (Dryade SARL) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_serviceCalendar_support">
-	<xsd:include schemaLocation="../netex_responsibility/netex_versionFrame_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_versionFrame_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -26,7 +26,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_frames}netex_serviceCalendarFrame_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_frames}netex_serviceCalendarFrame_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_version.xsd b/xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_version.xsd
index c4cfdbbf8..8684a0f08 100644
--- a/xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_version.xsd
+++ b/xsd/netex_framework/netex_frames/netex_serviceCalendarFrame_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_serviceCalendarFrame_version">
-	<xsd:include schemaLocation="netex_serviceCalendarFrame_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_reusableComponents/netex_serviceCalendar_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_commonFrame_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_serviceCalendarFrame_support.xsd"/>
+	<xsd:include schemaLocation="../netex_reusableComponents/netex_serviceCalendar_version.xsd"/>
+	<xsd:include schemaLocation="netex_commonFrame_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
diff --git a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility.xsd b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility.xsd
index feab3b874..d7e07e75d 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility.xsd
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework/netex_accessibility}netex_acsb_accessibility-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework/netex_accessibility}netex_acsb_accessibility.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
@@ -56,8 +56,8 @@ Rail transport, Roads and Road transport
 		</xsd:appinfo>
 		<xsd:documentation>ACCESSIBILITY types for IFOPT Fixed Objects in Public Transport.</xsd:documentation>
 	</xsd:annotation>
-	<xsd:include schemaLocation="netex_acsb_limitations-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_acsb_passengerMobility-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_acsb_limitations.xsd"/>
+	<xsd:include schemaLocation="netex_acsb_passengerMobility.xsd"/>
 	<!--===========================================================================================-->
 	<xsd:complexType name="accessibilityLimitations_RelStructure">
 		<xsd:annotation>
diff --git a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_all.xsd b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_all.xsd
index fb0b16d65..f4c81528b 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_all.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_all.xsd
@@ -14,8 +14,8 @@
  -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_acsb_all">
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_acsb_accessibility-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_acsb_limitations-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_acsb_passengerMobility-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_acsb_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_acsb_accessibility.xsd"/>
+	<xsd:include schemaLocation="netex_acsb_limitations.xsd"/>
+	<xsd:include schemaLocation="netex_acsb_passengerMobility.xsd"/>
+	<xsd:include schemaLocation="netex_acsb_support.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations.xsd b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations.xsd
index 7e05eb546..bc4a74451 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations.xsd
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/ifopt}ifopt_accessibility-v0.2.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/ifopt}ifopt_accessibility.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_passengerMobility.xsd b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_passengerMobility.xsd
index 255a2985c..7d7575ef6 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_passengerMobility.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_passengerMobility.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_acsb_passengerMobility">
-	<xsd:include schemaLocation="../../netex_responsibility/netex_responsibility_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_acsb_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_responsibility/netex_responsibility_version.xsd"/>
+	<xsd:include schemaLocation="netex_acsb_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework/netex_accessibility}netex_acsb_passengerMobility-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework/netex_accessibility}netex_acsb_passengerMobility.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_support.xsd
index 72d27c332..cd02996b2 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_support.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_support.xsd
@@ -25,7 +25,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework/netex_accessibility}netex_acsb_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework/netex_accessibility}netex_acsb_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
@@ -54,7 +54,7 @@ Rail transport, Roads and Road transport
 		</xsd:appinfo>
 		<xsd:documentation>NeTEx ACCESSIBILITY identifier types for IFOPT Fixed Objects in Public Transport.</xsd:documentation>
 	</xsd:annotation>
-	<xsd:include schemaLocation="../../netex_responsibility/netex_relationship-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_responsibility/netex_relationship.xsd"/>
 	<!--===========================================================================================-->
 	<xsd:simpleType name="LimitationIdType">
 		<xsd:annotation>
diff --git a/xsd/netex_framework/netex_genericFramework/netex_alternativeName_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_alternativeName_support.xsd
index de776cf3a..67f147c7f 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_alternativeName_support.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_alternativeName_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_alternativeName_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_relationship-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_relationship.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -26,7 +26,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_alternativeName_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_alternativeName_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_alternativeName_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_alternativeName_version.xsd
index 947ad77b1..a1acd96b8 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_alternativeName_version.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_alternativeName_version.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_alternativeName_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_alternativeName_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_version.xsd"/>
+	<xsd:include schemaLocation="netex_alternativeName_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_alternativeName_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_alternativeName_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_assignment_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_assignment_support.xsd
index 71a18a6d1..720ea3f4b 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_assignment_support.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_assignment_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_assigment_support">
-	<xsd:include schemaLocation="../netex_responsibility/netex_relationship-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_relationship.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -22,7 +22,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_assignment_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_assignment_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_assignment_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_assignment_version.xsd
index 4d64ca3d6..c725793d7 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_assignment_version.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_assignment_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_assignment_version">
-	<xsd:include schemaLocation="netex_assignment_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_responsibility/netex_responsibility_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_assignment_support.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_responsibility_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_assignment_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_assignment_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_grouping_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_grouping_support.xsd
index 9c150238a..e4b78ae1b 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_grouping_support.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_grouping_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_grouping_support">
-	<xsd:include schemaLocation="../netex_responsibility/netex_relationship-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_relationship.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -22,7 +22,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_grouping_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_grouping_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_grouping_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_grouping_version.xsd
index 5e025ecc3..bbaa62e63 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_grouping_version.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_grouping_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_grouping_version">
-	<xsd:include schemaLocation="../netex_utility/netex_utility_types-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_grouping_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_responsibility/netex_typeOfValue_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_utility/netex_utility_types.xsd"/>
+	<xsd:include schemaLocation="netex_grouping_support.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_typeOfValue_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -32,7 +32,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_grouping_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_grouping_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_layer_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_layer_support.xsd
index 57f378e70..e5ffaf290 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_layer_support.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_layer_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_layer_support">
-	<xsd:include schemaLocation="../netex_responsibility/netex_relationship-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_relationship.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -22,7 +22,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_layer_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_layer_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_layer_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_layer_version.xsd
index 6635edb96..e9496ff02 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_layer_version.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_layer_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_layer_version">
-	<xsd:include schemaLocation="netex_layer_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_utility/netex_location_types-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_responsibility/netex_versionFrame_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_grouping_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_layer_support.xsd"/>
+	<xsd:include schemaLocation="../netex_utility/netex_location_types.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_versionFrame_support.xsd"/>
+	<xsd:include schemaLocation="netex_grouping_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -25,7 +25,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_layer_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_layer_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_loggable_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_loggable_support.xsd
index 79dfbfe26..193daf925 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_loggable_support.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_loggable_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_loggable_support">
-	<xsd:include schemaLocation="netex_grouping_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_grouping_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -20,7 +20,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_section_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_section_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Steam Intellect, London N1 1JS</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_loggable_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_loggable_version.xsd
index 61cad2762..232e2bac2 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_loggable_version.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_loggable_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_loggable_version">
-	<xsd:include schemaLocation="netex_loggable_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_loggable_support.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_grouping_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_grouping_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,7 +28,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_section_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_section_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Steam Intellect, London N1 1JS</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_organisation_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_organisation_support.xsd
index 80a17fc11..27acceaf6 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_organisation_support.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_organisation_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_organisation_support">
-	<xsd:include schemaLocation="../netex_responsibility/netex_responsibility_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_responsibility/netex_relationship_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_zone_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_responsibility_support.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_relationship_support.xsd"/>
+	<xsd:include schemaLocation="netex_zone_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -30,7 +30,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_organisation_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_organisation_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd
index f6c7cdd43..f1479bd6e 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_organisation_version.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_organisation_version">
-	<xsd:include schemaLocation="../netex_utility/netex_utility_contact-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_responsibility/netex_responsibilitySet_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_alternativeName_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_organisation_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_zone_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_utility/netex_utility_contact.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_responsibilitySet_version.xsd"/>
+	<xsd:include schemaLocation="netex_alternativeName_version.xsd"/>
+	<xsd:include schemaLocation="netex_organisation_support.xsd"/>
+	<xsd:include schemaLocation="netex_zone_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -32,7 +32,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_organisation_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_organisation_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_place_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_place_support.xsd
index f964ca8c8..757de21fe 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_place_support.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_place_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_place_support">
-	<xsd:include schemaLocation="../netex_genericFramework/netex_zone_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_zone_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,7 +31,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd
index 1ed19b7fe..bb533341b 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_place_version.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_place_version">
-	<xsd:include schemaLocation="netex_place_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_genericFramework/netex_zoneProjection_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_place_support.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_zoneProjection_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,11 +31,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}place_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}place_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd
index eb75b407c..b7e521b20 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_pointAndLinkSequence_support">
-	<xsd:include schemaLocation="netex_grouping_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_responsibility/netex_responsibility_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_grouping_support.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_responsibility_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -25,7 +25,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_pointAndLinkSequence_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_pointAndLinkSequence_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd
index f4502bfe1..baf397ba6 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_pointAndLinkSequence_version">
-	<xsd:include schemaLocation="netex_pointAndLinkSequence_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_section_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_grouping_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_pointAndLinkSequence_support.xsd"/>
+	<xsd:include schemaLocation="netex_section_version.xsd"/>
+	<xsd:include schemaLocation="netex_grouping_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -29,7 +29,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_pointAndLinkSequence_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_pointAndLinkSequence_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_support.xsd
index ceed5a1cd..460d2a5ce 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_support.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_pointAndLink_support">
-	<xsd:include schemaLocation="netex_grouping_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_utility/netex_units-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_grouping_support.xsd"/>
+	<xsd:include schemaLocation="../netex_utility/netex_units.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,7 +28,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_pointAndLink_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_pointAndLink_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd
index ecff0cc32..29b4301e2 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_pointAndLink_version">
-	<xsd:include schemaLocation="netex_pointAndLink_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_utility/netex_location_types-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_pointAndLinkSequence_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_pointAndLink_support.xsd"/>
+	<xsd:include schemaLocation="../netex_utility/netex_location_types.xsd"/>
+	<xsd:include schemaLocation="netex_pointAndLinkSequence_support.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_grouping_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_projection_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_grouping_version.xsd"/>
+	<xsd:include schemaLocation="netex_projection_version.xsd"/>
 	<!--fulll gml dependency-->
 	<xsd:import namespace="http://www.opengis.net/gml/3.2" schemaLocation="../../gml/gml_extract_all_objects_v_3_2_1.xsd"/>
 	<!--actual gml dependency-->
@@ -42,7 +42,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_pointAndLink_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_pointAndLink_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_projection_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_projection_support.xsd
index 182d90a4c..84de50d5e 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_projection_support.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_projection_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="01." id="netex_projection_support">
-	<xsd:include schemaLocation="netex_spatialFeature_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_spatialFeature_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -25,7 +25,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_projection_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_projection_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_projection_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_projection_version.xsd
index 445e948db..ad140f491 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_projection_version.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_projection_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="01." id="netex_projection_version">
-	<xsd:include schemaLocation="../netex_responsibility/netex_typeOfValue_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_pointAndLinkSequence_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_utility/netex_location_types-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_projection_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_typeOfValue_version.xsd"/>
+	<xsd:include schemaLocation="netex_pointAndLinkSequence_support.xsd"/>
+	<xsd:include schemaLocation="../netex_utility/netex_location_types.xsd"/>
+	<xsd:include schemaLocation="netex_projection_support.xsd"/>
 	<xsd:import namespace="http://www.opengis.net/gml/3.2" schemaLocation="../../gml/gml_extract_all_objects_v_3_2_1.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,7 +29,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_projection_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_projection_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_section_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_section_support.xsd
index 6112bddd7..efd188c0f 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_section_support.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_section_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_section_support">
-	<xsd:include schemaLocation="netex_pointAndLinkSequence_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_pointAndLinkSequence_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -22,7 +22,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_section_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_section_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Steam Intellect, London N1 1JS</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_section_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_section_version.xsd
index 406d4f95b..cbbd0c35d 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_section_version.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_section_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_section_version">
-	<xsd:include schemaLocation="netex_section_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_section_support.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_pointAndLink_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_pointAndLinkSequence_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_pointAndLink_version.xsd"/>
+	<xsd:include schemaLocation="netex_pointAndLinkSequence_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -35,7 +35,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_section_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_section_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Steam Intellect, London N1 1JS</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_support.xsd
index 0f516b3ad..3a2106434 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_support.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_spatialFeature_support">
-	<xsd:include schemaLocation="netex_zone_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_zone_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -25,7 +25,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_spatialFeature_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_spatialFeature_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_version.xsd
index 3affd2ae6..40b4b75af 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_version.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_spatialFeature_version.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_spatialFeature_version">
-	<xsd:include schemaLocation="netex_spatialFeature_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_zone_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_spatialFeature_support.xsd"/>
+	<xsd:include schemaLocation="netex_zone_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -26,7 +26,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_spatialFeature_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_spatialFeature_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_zoneProjection_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_zoneProjection_version.xsd
index f1c777feb..1c4cbf719 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_zoneProjection_version.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_zoneProjection_version.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="01." id="netex_zoneProjection_version">
-	<xsd:include schemaLocation="netex_zone_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_zone_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -25,7 +25,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_zoneProjection_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_zoneProjection_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd b/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd
index 693c20505..73211f37b 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_zone_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_zone_version">
-	<xsd:include schemaLocation="netex_pointAndLink_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_pointAndLink_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -25,7 +25,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_zone_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_zone_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd b/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd
index f09a9e05f..36a7745e1 100644
--- a/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd
+++ b/xsd/netex_framework/netex_genericFramework/netex_zone_version.xsd
@@ -3,8 +3,8 @@
 	<xsd:import namespace="http://www.opengis.net/gml/3.2" schemaLocation="../../gml/gml_extract_all_objects_v_3_2_1.xsd"/>
 	<!--Actual dependency-->
 	<xsd:import namespace="http://www.opengis.net/gml/3.2" schemaLocation="../../gml/gmlBasic2d-extract-v3_2_1-.xsd"/>
-	<xsd:include schemaLocation="netex_pointAndLink_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_zone_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_pointAndLink_version.xsd"/>
+	<xsd:include schemaLocation="netex_zone_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -38,7 +38,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_zone_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_zone_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_payload_framework.xsd b/xsd/netex_framework/netex_payload_framework.xsd
index 0f506150e..5f83006f6 100644
--- a/xsd/netex_framework/netex_payload_framework.xsd
+++ b/xsd/netex_framework/netex_payload_framework.xsd
@@ -2,7 +2,7 @@
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_payload_framework">
 	<!-- ===Payload ============================= -->
-	<xsd:include schemaLocation="netex_frames/netex_compositeFrame_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_frames/netex_compositeFrame_version.xsd"/>
 	<xsd:complexType name="dataObjects_RelStructure">
 		<xsd:annotation>
 			<xsd:documentation>Type for a list of objects.</xsd:documentation>
diff --git a/xsd/netex_framework/netex_responsibility/netex_alternativeText_support.xsd b/xsd/netex_framework/netex_responsibility/netex_alternativeText_support.xsd
index add326130..57cd90fb3 100644
--- a/xsd/netex_framework/netex_responsibility/netex_alternativeText_support.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_alternativeText_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_AlternativeText_support">
-	<xsd:include schemaLocation="netex_relationship_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_relationship_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_AlternativeText_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_AlternativeText_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Steam Intellect, London N1 1JS</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_alternativeText_version.xsd b/xsd/netex_framework/netex_responsibility/netex_alternativeText_version.xsd
index 836099d48..c02a0560b 100644
--- a/xsd/netex_framework/netex_responsibility/netex_alternativeText_version.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_alternativeText_version.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_alternativeName_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_alternativeText_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_version.xsd"/>
+	<xsd:include schemaLocation="netex_alternativeText_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -26,7 +26,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_alternativeText_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_alternativeText_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Steam Intellect, London N1 1JS</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_dataSource_version.xsd b/xsd/netex_framework/netex_responsibility/netex_dataSource_version.xsd
index 9b6cc1a90..76bf3054d 100644
--- a/xsd/netex_framework/netex_responsibility/netex_dataSource_version.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_dataSource_version.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_dataSource_version">
-	<xsd:include schemaLocation="netex_typeOfValue_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_typeOfValue_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -22,7 +22,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_dataSource_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_dataSource_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_entity.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_entity.xsd
index 077058c76..a9e6dd34e 100644
--- a/xsd/netex_framework/netex_responsibility/netex_entity_entity.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_entity_entity.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_entity_entity">
-	<xsd:include schemaLocation="netex_entity_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_version_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_entity_version.xsd"/>
+	<xsd:include schemaLocation="netex_version_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -26,7 +26,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_entity_entity-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_entity_entity.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd
index c7d75744a..653f089c0 100644
--- a/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_entity_support.xsd
@@ -26,7 +26,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_entity_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_entity_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_entity_version.xsd b/xsd/netex_framework/netex_responsibility/netex_entity_version.xsd
index 525bb2cfa..55b5b31e6 100644
--- a/xsd/netex_framework/netex_responsibility/netex_entity_version.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_entity_version.xsd
@@ -2,7 +2,7 @@
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <!-- 2207 04 11 recode x,llang to work arround spy bug -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_entity_version">
-	<xsd:include schemaLocation="netex_entity_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_entity_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -24,7 +24,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_entity_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_entity_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_relationship.xsd b/xsd/netex_framework/netex_responsibility/netex_relationship.xsd
index cb2a313ac..69455981a 100644
--- a/xsd/netex_framework/netex_responsibility/netex_relationship.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_relationship.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2009 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_relationship">
-	<xsd:include schemaLocation="netex_relationship_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_relationship_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_relationship-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_relationship.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_relationship_support.xsd b/xsd/netex_framework/netex_responsibility/netex_relationship_support.xsd
index 91795b007..997b48a46 100644
--- a/xsd/netex_framework/netex_responsibility/netex_relationship_support.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_relationship_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2009 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_relationship_support">
-	<xsd:include schemaLocation="netex_version_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_version_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -30,7 +30,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_relationship_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_relationship_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd b/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd
index 707abaf59..f693a1d36 100644
--- a/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_responsibilitySet">
-	<xsd:include schemaLocation="netex_typeOfValue_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_typeOfValue_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -30,7 +30,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_responsibilitySet_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_responsibilitySet_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd b/xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd
index f9c5e6dd6..0c15237b0 100644
--- a/xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_responsibility_support.xsd
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_responsibility_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_responsibility_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
@@ -56,7 +56,7 @@ Rail transport, Roads and Road transport
 		</xsd:appinfo>
 		<xsd:documentation>RESPONSIBILITY i.e. Data administration identifier types for NeTEx.</xsd:documentation>
 	</xsd:annotation>
-	<xsd:include schemaLocation="netex_relationship-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_relationship.xsd"/>
 	<!-- =====Responsibility============================================ -->
 	<xsd:simpleType name="ResponsibilitySetIdType">
 		<xsd:annotation>
diff --git a/xsd/netex_framework/netex_responsibility/netex_responsibility_version.xsd b/xsd/netex_framework/netex_responsibility/netex_responsibility_version.xsd
index d720d7b90..587c276da 100644
--- a/xsd/netex_framework/netex_responsibility/netex_responsibility_version.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_responsibility_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_responsibility">
-	<xsd:include schemaLocation="netex_version_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_responsibility_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_validityCondition_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_alternativeText_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_version_version.xsd"/>
+	<xsd:include schemaLocation="netex_responsibility_support.xsd"/>
+	<xsd:include schemaLocation="netex_validityCondition_version.xsd"/>
+	<xsd:include schemaLocation="netex_alternativeText_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -31,7 +31,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_responsibility_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_responsibility_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_typeOfValue_version.xsd b/xsd/netex_framework/netex_responsibility/netex_typeOfValue_version.xsd
index 9fefb77a5..cc1d69bc2 100644
--- a/xsd/netex_framework/netex_responsibility/netex_typeOfValue_version.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_typeOfValue_version.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_typeOfValue_version">
-	<xsd:include schemaLocation="netex_responsibility_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_responsibility_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,7 +28,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_typeOfValue_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_typeOfValue_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_validityCondition_support.xsd b/xsd/netex_framework/netex_responsibility/netex_validityCondition_support.xsd
index 7b07dbec9..bdce1272f 100644
--- a/xsd/netex_framework/netex_responsibility/netex_validityCondition_support.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_validityCondition_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_validityCondition_support">
-	<xsd:include schemaLocation="netex_relationship-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_relationship.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_validityCondition_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_validityCondition_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_validityCondition_version.xsd b/xsd/netex_framework/netex_responsibility/netex_validityCondition_version.xsd
index 5a3be5921..03c23818c 100644
--- a/xsd/netex_framework/netex_responsibility/netex_validityCondition_version.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_validityCondition_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2006 sp2 U (http://www.altova.com) by christophe duquesne (Dryade SARL) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_validityCondition_version">
-	<xsd:include schemaLocation="netex_validityCondition_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_responsibility_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_validityCondition_support.xsd"/>
+	<xsd:include schemaLocation="netex_responsibility_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_validityCondition_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_validityCondition_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_versionDelta_version.xsd b/xsd/netex_framework/netex_responsibility/netex_versionDelta_version.xsd
index 212ec157b..25f492272 100644
--- a/xsd/netex_framework/netex_responsibility/netex_versionDelta_version.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_versionDelta_version.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2006 sp2 U (http://www.altova.com) by christophe duquesne (Dryade SARL) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_versionDelta_version">
-	<xsd:include schemaLocation="netex_relationship_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_relationship_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_versionDelta_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_versionDelta_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_versionFrame_support.xsd b/xsd/netex_framework/netex_responsibility/netex_versionFrame_support.xsd
index 0ea32137f..476323641 100644
--- a/xsd/netex_framework/netex_responsibility/netex_versionFrame_support.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_versionFrame_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2006 sp2 U (http://www.altova.com) by christophe duquesne (Dryade SARL) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_versionFrame_support">
-	<xsd:include schemaLocation="netex_relationship-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_relationship.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_versionFrame_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_versionFrame_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_versionFrame_version.xsd b/xsd/netex_framework/netex_responsibility/netex_versionFrame_version.xsd
index 42a38ba7b..6cedc8ec4 100644
--- a/xsd/netex_framework/netex_responsibility/netex_versionFrame_version.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_versionFrame_version.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2006 sp2 U (http://www.altova.com) by christophe duquesne (Dryade SARL) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_versionFrame_version">
-	<xsd:include schemaLocation="netex_versionFrame_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_typeOfValue_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_utility/netex_location_types-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_responsibility/netex_versionDelta_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_utility/netex_units-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_versionFrame_support.xsd"/>
+	<xsd:include schemaLocation="netex_typeOfValue_version.xsd"/>
+	<xsd:include schemaLocation="../netex_utility/netex_location_types.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_versionDelta_version.xsd"/>
+	<xsd:include schemaLocation="../netex_utility/netex_units.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_versionFrame_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_versionFrame_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_version_support.xsd b/xsd/netex_framework/netex_responsibility/netex_version_support.xsd
index 227caee8f..b2a1966d8 100644
--- a/xsd/netex_framework/netex_responsibility/netex_version_support.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_version_support.xsd
@@ -2,7 +2,7 @@
 <!-- edited with XMLSpy v2009 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <!-- 2207 04 11 recode x,llang to work arround spy bug -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_version_support">
-	<xsd:include schemaLocation="netex_entity_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_entity_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -30,7 +30,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_version_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_version_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_responsibility/netex_version_version.xsd b/xsd/netex_framework/netex_responsibility/netex_version_version.xsd
index 0acf29a0a..7254df085 100644
--- a/xsd/netex_framework/netex_responsibility/netex_version_version.xsd
+++ b/xsd/netex_framework/netex_responsibility/netex_version_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_version_version">
-	<xsd:include schemaLocation="../netex_utility/netex_utility_contact-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_entity_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_responsibility_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_version_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_utility/netex_utility_contact.xsd"/>
+	<xsd:include schemaLocation="netex_entity_version.xsd"/>
+	<xsd:include schemaLocation="netex_responsibility_version.xsd"/>
+	<xsd:include schemaLocation="netex_version_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,7 +28,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_version_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_version_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_access_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_access_version.xsd
index 2c1e3696d..c97c81803 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_access_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_access_version.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_access_version">
-	<xsd:include schemaLocation="../netex_genericFramework/netex_place_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_mode_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_place_version.xsd"/>
+	<xsd:include schemaLocation="netex_mode_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,7 +31,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_address_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_address_support.xsd
index 0d39c1ea2..1acf8dc4f 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_address_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_address_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2006 sp2 U (http://www.altova.com) by christophe duquesne (Dryade SARL) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_address_support">
-	<xsd:include schemaLocation="../netex_genericFramework/netex_place_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_place_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -30,7 +30,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_address_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_address_version.xsd
index 84882d807..e25585329 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_address_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_address_version.xsd
@@ -25,7 +25,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_address_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_address_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
@@ -54,10 +54,10 @@ Rail transport, Roads and Road transport
 		</xsd:appinfo>
 		<xsd:documentation>ADDRESS types for IFOPT Fixed Objects in Public Transport.</xsd:documentation>
 	</xsd:annotation>
-	<xsd:include schemaLocation="../netex_genericFramework/netex_place_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_genericFramework/netex_alternativeName_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_address_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_country_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_place_version.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_alternativeName_version.xsd"/>
+	<xsd:include schemaLocation="netex_address_support.xsd"/>
+	<xsd:include schemaLocation="netex_country_support.xsd"/>
 	<!--=============================================================================-->
 	<!-- ===ENTIITY IN VERSION IN FRAME====Used in SERVICE FRAME)=================================================== -->
 	<xsd:complexType name="addressesInFrame_RelStructure">
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd b/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd
index 4baf10151..5194f3357 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_all_objects_reusableComponents.xsd
@@ -2,44 +2,44 @@
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_reusableComponents">
 	<!-- ======General====================================================== -->
-	<xsd:include schemaLocation="netex_access_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_address_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_address_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_availabilityCondition_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_availabilityCondition_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_country_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_dayType_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_dayType_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_dayType_propertiesOfDay-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_equipment_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_equipmentPlace_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_equipment_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_equipmentVehiclePassenger_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_equipmentVehiclePassenger_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_facility_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_facility_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_linkByValue_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_mode_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_mode_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_notice_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_notice_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_noticeAssignment_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_otherOrganisation_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_otherOrganisation_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_schematicMap_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_securityList_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_securityList_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_serviceCalendar_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_serviceCalendar_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_submode_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_topographicPlace_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_topographicPlace_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_trainElement_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_trainElement_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_transportOrganisation_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_transportOrganisation_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_travelRights_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_travelRights_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleType_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleType_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_access_version.xsd"/>
+	<xsd:include schemaLocation="netex_address_support.xsd"/>
+	<xsd:include schemaLocation="netex_address_version.xsd"/>
+	<xsd:include schemaLocation="netex_availabilityCondition_version.xsd"/>
+	<xsd:include schemaLocation="netex_availabilityCondition_support.xsd"/>
+	<xsd:include schemaLocation="netex_country_support.xsd"/>
+	<xsd:include schemaLocation="netex_dayType_support.xsd"/>
+	<xsd:include schemaLocation="netex_dayType_version.xsd"/>
+	<xsd:include schemaLocation="netex_dayType_propertiesOfDay.xsd"/>
+	<xsd:include schemaLocation="netex_equipment_support.xsd"/>
+	<xsd:include schemaLocation="netex_equipmentPlace_version.xsd"/>
+	<xsd:include schemaLocation="netex_equipment_version.xsd"/>
+	<xsd:include schemaLocation="netex_equipmentVehiclePassenger_support.xsd"/>
+	<xsd:include schemaLocation="netex_equipmentVehiclePassenger_version.xsd"/>
+	<xsd:include schemaLocation="netex_facility_support.xsd"/>
+	<xsd:include schemaLocation="netex_facility_version.xsd"/>
+	<xsd:include schemaLocation="netex_linkByValue_support.xsd"/>
+	<xsd:include schemaLocation="netex_mode_support.xsd"/>
+	<xsd:include schemaLocation="netex_mode_version.xsd"/>
+	<xsd:include schemaLocation="netex_notice_support.xsd"/>
+	<xsd:include schemaLocation="netex_notice_version.xsd"/>
+	<xsd:include schemaLocation="netex_noticeAssignment_version.xsd"/>
+	<xsd:include schemaLocation="netex_otherOrganisation_support.xsd"/>
+	<xsd:include schemaLocation="netex_otherOrganisation_version.xsd"/>
+	<xsd:include schemaLocation="netex_schematicMap_version.xsd"/>
+	<xsd:include schemaLocation="netex_securityList_support.xsd"/>
+	<xsd:include schemaLocation="netex_securityList_version.xsd"/>
+	<xsd:include schemaLocation="netex_serviceCalendar_support.xsd"/>
+	<xsd:include schemaLocation="netex_serviceCalendar_version.xsd"/>
+	<xsd:include schemaLocation="netex_submode_version.xsd"/>
+	<xsd:include schemaLocation="netex_topographicPlace_support.xsd"/>
+	<xsd:include schemaLocation="netex_topographicPlace_version.xsd"/>
+	<xsd:include schemaLocation="netex_trainElement_support.xsd"/>
+	<xsd:include schemaLocation="netex_trainElement_version.xsd"/>
+	<xsd:include schemaLocation="netex_transportOrganisation_support.xsd"/>
+	<xsd:include schemaLocation="netex_transportOrganisation_version.xsd"/>
+	<xsd:include schemaLocation="netex_travelRights_support.xsd"/>
+	<xsd:include schemaLocation="netex_travelRights_version.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleType_support.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleType_version.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_support.xsd
index 35651b97d..9c98d9733 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2006 sp2 U (http://www.altova.com) by christophe duquesne (Dryade SARL) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_availabilityCondition_support">
-	<xsd:include schemaLocation="../netex_responsibility/netex_validityCondition_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_validityCondition_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_availabilityCondition_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_availabilityCondition_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_version.xsd
index d4ba10f21..4a832107f 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_availabilityCondition_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_availabilityCondition_version">
-	<xsd:include schemaLocation="netex_availabilityCondition_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_serviceCalendar_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_availabilityCondition_support.xsd"/>
+	<xsd:include schemaLocation="netex_serviceCalendar_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -25,7 +25,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_availabilityCondition_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_availabilityCondition_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_country_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_country_support.xsd
index 5c5cd5c70..8cc8f8b77 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_country_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_country_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_country_support">
-	<xsd:include schemaLocation="../netex_genericFramework/netex_place_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_place_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_country_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_country_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_country_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_country_version.xsd
index c1e65252a..3be005949 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_country_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_country_version.xsd
@@ -25,7 +25,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_topographicPlace_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_topographicPlace_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
@@ -56,9 +56,9 @@ Rail transport, Roads and Road transport
 	</xsd:annotation>
 	<!-- ======================================================================= -->
 	<!-- ===IFOPT Name Space includes (Which also may Reference SIRI) ============================================================== -->
-	<xsd:include schemaLocation="netex_address_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_access_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_topographicPlace_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_address_version.xsd"/>
+	<xsd:include schemaLocation="netex_access_version.xsd"/>
+	<xsd:include schemaLocation="netex_topographicPlace_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:complexType name="topographicPlacesInFrame_RelStructure">
 		<xsd:annotation>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_dayType_propertiesOfDay.xsd b/xsd/netex_framework/netex_reusableComponents/netex_dayType_propertiesOfDay.xsd
index 88e895963..e9c7bf404 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_dayType_propertiesOfDay.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_dayType_propertiesOfDay.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_dayType_propertiesOfDay">
-	<xsd:include schemaLocation="../netex_responsibility/netex_relationship-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_utility/netex_utility_xml-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_country_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_relationship.xsd"/>
+	<xsd:include schemaLocation="../netex_utility/netex_utility_xml.xsd"/>
+	<xsd:include schemaLocation="netex_country_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_dayType_propertiesOfDay-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_dayType_propertiesOfDay.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_dayType_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_dayType_support.xsd
index 731f92635..bb725802f 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_dayType_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_dayType_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2006 sp2 U (http://www.altova.com) by christophe duquesne (Dryade SARL) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_dayType_support">
-	<xsd:include schemaLocation="../netex_responsibility/netex_relationship-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_genericFramework/netex_grouping_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_relationship.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_grouping_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_dayType_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_dayType_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_dayType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_dayType_version.xsd
index 592f39e40..4b05ca9f2 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_dayType_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_dayType_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2006 sp2 U (http://www.altova.com) by christophe duquesne (Dryade SARL) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_day_type_version">
-	<xsd:include schemaLocation="netex_dayType_propertiesOfDay-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_dayType_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_responsibility/netex_responsibility_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_genericFramework/netex_grouping_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_dayType_propertiesOfDay.xsd"/>
+	<xsd:include schemaLocation="netex_dayType_support.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_responsibility_version.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_grouping_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -29,7 +29,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_dayType_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_dayType_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipmentPlace_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipmentPlace_version.xsd
index 5710645c2..afe139712 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_equipmentPlace_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_equipmentPlace_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_equipmentPlace_version">
-	<xsd:include schemaLocation="netex_equipment_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_place_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_equipment_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_place_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_equipmentPlace_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_equipmentPlace_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd
index b093b681b..3b20712b8 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_equipmentVehiclePassenger_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -22,7 +22,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_equipmentVehiclePassenger_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_equipmentVehiclePassenger_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd
index e1441115f..3a966a87f 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd
@@ -24,7 +24,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_equipmentVehiclePassenger_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_equipmentVehiclePassenger_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
@@ -53,12 +53,12 @@ Rail transport, Roads and Road transport
 		</xsd:appinfo>
 		<xsd:documentation>VEHICLE PASSENGER EQUIPMENT types for IFOPT Fixed Objects in Public Transport.</xsd:documentation>
 	</xsd:annotation>
-	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_units-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_genericFramework/netex_accessibility/netex_acsb_accessibility-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_equipmentVehiclePassenger_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleType_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_units.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_accessibility/netex_acsb_accessibility.xsd"/>
+	<xsd:include schemaLocation="netex_equipmentVehiclePassenger_support.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleType_support.xsd"/>
 	<xsd:group name="VehicleEquipmentChoice">
 		<xsd:annotation>
 			<xsd:documentation>Choice of VEHICLE EQUIPMENT.</xsd:documentation>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipment_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipment_support.xsd
index fa236b7ee..cd4a79bb6 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_equipment_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_equipment_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2006 sp2 U (http://www.altova.com) by christophe duquesne (Dryade SARL) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_equipment_support">
-	<xsd:include schemaLocation="../netex_genericFramework/netex_place_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_place_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -26,7 +26,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_equipmnet_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_equipmnet_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_equipment_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_equipment_version.xsd
index b1b840235..f831aff21 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_equipment_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_equipment_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_equipment_version">
-	<xsd:include schemaLocation="../netex_utility/netex_utility_types-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_equipment_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_responsibility/netex_typeOfValue_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_utility/netex_utility_types.xsd"/>
+	<xsd:include schemaLocation="netex_equipment_support.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_typeOfValue_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,7 +29,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_equipment_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_equipment_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_facilityUic_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_facilityUic_support.xsd
index 89294a8f6..8026af0b7 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_facilityUic_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_facilityUic_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ifopt="http://www.ifopt.org.uk/ifopt" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_facilityUic_support">
-	<xsd:include schemaLocation="../netex_responsibility/netex_relationship-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_relationship.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -31,7 +31,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2011</Copyright>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd
index 6a8730314..f1ac4e928 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ifopt="http://www.ifopt.org.uk/ifopt" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_facility_support">
-	<xsd:include schemaLocation="../netex_responsibility/netex_relationship-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_relationship.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -40,7 +40,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd
index 2d83a83b5..6c49fcf50 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_facility_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ifopt="http://www.ifopt.org.uk/ifopt" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_facility_version">
-	<xsd:include schemaLocation="netex_facility_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_travelRights_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_facilityUic_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_equipment_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_facility_support.xsd"/>
+	<xsd:include schemaLocation="netex_travelRights_version.xsd"/>
+	<xsd:include schemaLocation="netex_facilityUic_support.xsd"/>
+	<xsd:include schemaLocation="netex_equipment_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -34,7 +34,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_linkByValue_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_linkByValue_support.xsd
index b2c853111..824b89ab4 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_linkByValue_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_linkByValue_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_linkByValue_support">
-	<xsd:include schemaLocation="../netex_genericFramework/netex_pointAndLink_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_mode_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_pointAndLink_version.xsd"/>
+	<xsd:include schemaLocation="netex_mode_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -32,7 +32,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd
index 26cc8ce57..e42338f82 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_mode_support">
-	<xsd:include schemaLocation="../netex_responsibility/netex_relationship-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_relationship.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -22,7 +22,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_mode_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_mode_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_mode_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_mode_version.xsd
index aa7eca123..8e3d107ac 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_mode_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_mode_version.xsd
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_mode_version">
-	<xsd:include schemaLocation="../netex_responsibility/netex_typeOfValue_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_mode_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_submode_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_typeOfValue_version.xsd"/>
+	<xsd:include schemaLocation="netex_mode_support.xsd"/>
+	<xsd:include schemaLocation="netex_submode_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs"><Aggregation>main schema</Aggregation><Audience>e-service developers</Audience><Coverage>Europe</Coverage><Creator>First drafted for version 1.0 CEN TC278 WG3 SG6 Editor Nicholas Knowles.  mailto:schemer@netex.org.uk</Creator><Date><Created>2010-09-04</Created></Date><Date><Modified>2011-02-05</Modified></Date><Description><p>NeTEx - Network Exchange. This subschema defines common MODE types.</p></Description><Format><MediaType>text/xml</MediaType><Syntax>http://www.w3.org/2001/XMLSchema</Syntax><Description>XML schema, W3C Recommendation 2001</Description></Format>m
-			<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_mode_version-v1.0.xsd</Identifier>
+			<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_mode_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_noticeAssignment_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_noticeAssignment_version.xsd
index bdd692bd3..052059e50 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_noticeAssignment_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_noticeAssignment_version.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_noticeAssignment_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_genericFramework/netex_pointAndLink_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_genericFramework/netex_section_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_genericFramework/netex_assignment_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_notice_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_pointAndLink_support.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_section_support.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_assignment_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_notice_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -31,7 +31,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_noticeAssignment_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_noticeAssignment_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_notice_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_notice_support.xsd
index bcdf01f88..9fd1e03c8 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_notice_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_notice_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_notice_support">
-	<xsd:include schemaLocation="../netex_genericFramework/netex_assignment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_assignment_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_notice_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_notice_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_notice_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_notice_version.xsd
index f36ab3299..ba300e1b4 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_notice_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_notice_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_notice_version">
-	<xsd:include schemaLocation="netex_notice_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_responsibility/netex_typeOfValue_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_notice_support.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_typeOfValue_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_notice_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_notice_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_support.xsd
index adf662a85..312dab027 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_otherOrganisation_support">
-	<xsd:include schemaLocation="../netex_genericFramework/netex_organisation_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_organisation_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_otherOrganisation_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_otherOrganisation_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_version.xsd
index 929946e00..ddc928af7 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_otherOrganisation_version">
-	<xsd:include schemaLocation="netex_otherOrganisation_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_genericFramework/netex_organisation_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_serviceCalendar_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_address_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_otherOrganisation_support.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_organisation_version.xsd"/>
+	<xsd:include schemaLocation="netex_serviceCalendar_version.xsd"/>
+	<xsd:include schemaLocation="netex_address_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -26,7 +26,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_otherOrganisation_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_otherOrganisation_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_schematicMap_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_schematicMap_support.xsd
index dbbbdd130..781fab523 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_schematicMap_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_schematicMap_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2006 sp2 U (http://www.altova.com) by christophe duquesne (Dryade SARL) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_schematicMap_support">
-	<xsd:include schemaLocation="../netex_responsibility/netex_relationship-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_relationship.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_schematicMap_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_schematicMap_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_schematicMap_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_schematicMap_version.xsd
index 086770ba9..8f9b43594 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_schematicMap_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_schematicMap_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_schematicMap_version">
-	<xsd:include schemaLocation="../netex_responsibility/netex_responsibility_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_genericFramework/netex_projection_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_utility/netex_utility_types-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_schematicMap_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_responsibility_version.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_projection_version.xsd"/>
+	<xsd:include schemaLocation="../netex_utility/netex_utility_types.xsd"/>
+	<xsd:include schemaLocation="netex_schematicMap_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,7 +28,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_schematicMap_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_schematicMap_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_securityList_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_securityList_support.xsd
index 364e078e6..c21a85f8a 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_securityList_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_securityList_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_securityList_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -25,11 +25,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_securityList_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_securityList_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Steam Intellect, London N1 1JS </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  ``````````````````````````<Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_securityList_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_securityList_version.xsd
index b9518ad89..3ebb0f026 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_securityList_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_securityList_version.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_securityList_version">
-	<xsd:include schemaLocation="netex_securityList_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_responsibility/netex_typeOfValue_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_securityList_support.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_typeOfValue_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -26,11 +26,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_securityList_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_securityList_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Steam Intellect, London N1 1JS </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_support.xsd
index 24916ec68..f64f5df32 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2006 sp2 U (http://www.altova.com) by christophe duquesne (Dryade SARL) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_serviceCalendar_support">
-	<xsd:include schemaLocation="../netex_genericFramework/netex_assignment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_assignment_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_schematicMap_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_schematicMap_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_version.xsd
index 4b8915d28..fa352f728 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_serviceCalendar_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2011 rel. 2 sp1 (x64) (http://www.altova.com) by Christophe Duquesne (Dryade) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_serviceCalendar_version">
-	<xsd:include schemaLocation="netex_serviceCalendar_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_dayType_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_genericFramework/netex_assignment_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_serviceCalendar_support.xsd"/>
+	<xsd:include schemaLocation="netex_dayType_version.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_assignment_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -25,7 +25,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_serviceCalendar_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_serviceCalendar_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd
index 5f72d216b..43f53d7f2 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_submode_version">
-	<xsd:include schemaLocation="../netex_responsibility/netex_relationship-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_relationship.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,7 +28,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netx_reusableComponents}netex_submode_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netx_reusableComponents}netex_submode_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_support.xsd
index 848502fb2..05efbfe8c 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_topographicPlace_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_place_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_genericFramework/netex_projection_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_place_support.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_projection_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -30,7 +30,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_topographicPlace_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_topographicPlace_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_version.xsd
index bd382502f..0ded0714f 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_version.xsd
@@ -29,7 +29,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_topographicPlace_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_topographicPlace_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
@@ -60,9 +60,9 @@ Rail transport, Roads and Road transport
 	</xsd:annotation>
 	<!-- ======================================================================= -->
 	<!-- ===IFOPT Name Space includes (Which also may Reference SIRI) ============================================================== -->
-	<xsd:include schemaLocation="netex_address_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_access_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_topographicPlace_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_address_version.xsd"/>
+	<xsd:include schemaLocation="netex_access_version.xsd"/>
+	<xsd:include schemaLocation="netex_topographicPlace_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:complexType name="topographicPlacesInFrame_RelStructure">
 		<xsd:annotation>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd
index 74baaa5f6..e679ab197 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_trainElement_support">
-	<xsd:include schemaLocation="netex_vehicleType_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleType_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -32,7 +32,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd
index f6f0d82ab..154470bf2 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_trainElement_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_trainElement">
-	<xsd:include schemaLocation="netex_vehicleType_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_trainElement_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleType_version.xsd"/>
+	<xsd:include schemaLocation="netex_trainElement_support.xsd"/>
 	<xsd:group name="ServiceRequirementTypeGroup">
 		<xsd:annotation>
 			<xsd:documentation>SERVICE REQUIEMENTS for  SERVICE JOURNEY. These are the normal planned values, not necessarily the ACTUAL VEHICLE EQUIPMENT.</xsd:documentation>
@@ -52,11 +52,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_trainElement_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_trainElement_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd
index f4dd874e9..1416d081d 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_transportOrganisation_version">
-	<xsd:include schemaLocation="../netex_genericFramework/netex_organisation_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_organisation_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_transportOrganisation_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_transportOrganisation_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd
index 5a15aa318..70112ac27 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_transportOrganisation_version">
-	<xsd:include schemaLocation="netex_transportOrganisation_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_reusableComponents/netex_mode_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_genericFramework/netex_organisation_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_address_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_transportOrganisation_support.xsd"/>
+	<xsd:include schemaLocation="../netex_reusableComponents/netex_mode_version.xsd"/>
+	<xsd:include schemaLocation="../netex_genericFramework/netex_organisation_version.xsd"/>
+	<xsd:include schemaLocation="netex_address_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -26,7 +26,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_transportOrganisation_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_transportOrganisation_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_travelRights_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_travelRights_support.xsd
index c5ab9dedd..fe608297c 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_travelRights_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_travelRights_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_travelRights_support">
-	<xsd:include schemaLocation="../netex_responsibility/netex_responsibility_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_responsibility_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -21,7 +21,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_travelRights_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_travelRights_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_travelRights_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_travelRights_version.xsd
index 2cba1d489..c2588383f 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_travelRights_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_travelRights_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_travelRights_version">
-	<xsd:include schemaLocation="../netex_responsibility/netex_typeOfValue_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_travelRights_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_responsibility/netex_typeOfValue_version.xsd"/>
+	<xsd:include schemaLocation="netex_travelRights_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -32,11 +32,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_travelRights_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_reusableComponents}netex_travelRights_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd
index 771d78cbb..b076d2129 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_vehicleType_support">
-	<xsd:include schemaLocation="netex_equipment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_equipment_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -36,7 +36,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd
index b3ca4b21a..f67e20a70 100644
--- a/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd
+++ b/xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_vehicleType_version">
-	<xsd:include schemaLocation="netex_vehicleType_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_transportOrganisation_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_equipmentVehiclePassenger_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleType_support.xsd"/>
+	<xsd:include schemaLocation="netex_transportOrganisation_support.xsd"/>
+	<xsd:include schemaLocation="netex_equipmentVehiclePassenger_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -37,7 +37,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_framework/netex_utility/netex_location_types.xsd b/xsd/netex_framework/netex_utility/netex_location_types.xsd
index 2fb3c5793..ed99b1d8d 100644
--- a/xsd/netex_framework/netex_utility/netex_location_types.xsd
+++ b/xsd/netex_framework/netex_utility/netex_location_types.xsd
@@ -2,7 +2,7 @@
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <!-- 2007 03 23 Revise projections -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_location_types">
-	<xsd:include schemaLocation="netex_units-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_units.xsd"/>
 	<!--fulll gml dependency-->
 	<xsd:import namespace="http://www.opengis.net/gml/3.2" schemaLocation="../../gml/gml_extract_all_objects_v_3_2_1.xsd"/>
 	<xsd:import namespace="http://www.opengis.net/gml/3.2" schemaLocation="../../gml/geometryBasic0d1d-extract-v3_2_1.xsd"/>
@@ -33,7 +33,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_utility}netex_location_types-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_utility}netex_location_types.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_utility/netex_units.xsd b/xsd/netex_framework/netex_utility/netex_units.xsd
index a1b23b88e..4474d3596 100644
--- a/xsd/netex_framework/netex_utility/netex_units.xsd
+++ b/xsd/netex_framework/netex_utility/netex_units.xsd
@@ -21,7 +21,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netext.org.uk/schemas/0.4/netex/netex_framework/netex_utility}netex_units-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netext.org.uk/schemas/0.4/netex/netex_framework/netex_utility}netex_units.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_utility/netex_utility_contact.xsd b/xsd/netex_framework/netex_utility/netex_utility_contact.xsd
index 9fd7e8ff6..d51ab295c 100644
--- a/xsd/netex_framework/netex_utility/netex_utility_contact.xsd
+++ b/xsd/netex_framework/netex_utility/netex_utility_contact.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_utility_contact">
-	<xsd:include schemaLocation="netex_utility_types-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_utility_xml-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_utility_types.xsd"/>
+	<xsd:include schemaLocation="netex_utility_xml.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -26,7 +26,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_utility}utility_contact-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_utility}utility_contact.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_utility/netex_utility_time.xsd b/xsd/netex_framework/netex_utility/netex_utility_time.xsd
index 0d8625ab4..a0c89db71 100644
--- a/xsd/netex_framework/netex_utility/netex_utility_time.xsd
+++ b/xsd/netex_framework/netex_utility/netex_utility_time.xsd
@@ -22,7 +22,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_utility}netex_utility_time-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_utility}netex_utility_time.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
diff --git a/xsd/netex_framework/netex_utility/netex_utility_types.xsd b/xsd/netex_framework/netex_utility/netex_utility_types.xsd
index b78fdd22f..b417ab2a4 100644
--- a/xsd/netex_framework/netex_utility/netex_utility_types.xsd
+++ b/xsd/netex_framework/netex_utility/netex_utility_types.xsd
@@ -34,7 +34,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_utility}netex_utility_types-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_utility}netex_utility_types.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_framework/netex_utility/netex_utility_xml.xsd b/xsd/netex_framework/netex_utility/netex_utility_xml.xsd
index b743f3886..aaaa8e2bf 100644
--- a/xsd/netex_framework/netex_utility/netex_utility_xml.xsd
+++ b/xsd/netex_framework/netex_utility/netex_utility_xml.xsd
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_utility}netex_utility_xml-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_utility}netex_utility_xml.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
diff --git a/xsd/netex_part_1/netex_all_frames_part1.xsd b/xsd/netex_part_1/netex_all_frames_part1.xsd
index 8ee6d08fc..ab69f08c1 100644
--- a/xsd/netex_part_1/netex_all_frames_part1.xsd
+++ b/xsd/netex_part_1/netex_all_frames_part1.xsd
@@ -2,9 +2,9 @@
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_frames_part1">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="netex_all_objects_part1-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_all_objects_part1.xsd"/>
 	<!-- =====Frames================================================= -->
-	<xsd:include schemaLocation="part1_frames/netex_infrastructureFrame_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="part1_frames/netex_siteFrame_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="part1_frames/netex_infrastructureFrame_version.xsd"/>
+	<xsd:include schemaLocation="part1_frames/netex_siteFrame_version.xsd"/>
 	<!-- ============================================================ -->
 </xsd:schema>
diff --git a/xsd/netex_part_1/netex_all_objects_infrastructureFrame.xsd b/xsd/netex_part_1/netex_all_objects_infrastructureFrame.xsd
index 9d02745fe..14bbcc36f 100644
--- a/xsd/netex_part_1/netex_all_objects_infrastructureFrame.xsd
+++ b/xsd/netex_part_1/netex_all_objects_infrastructureFrame.xsd
@@ -2,12 +2,12 @@
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="../netex_framework/netex_all_objects_framework-v0.1.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_all_objects_framework.xsd"/>
 	<!-- ======================================================================= -->
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="part1_networkDescription/netex_all_objects_part1_networkDescription-v0.1.xsd"/>
+	<xsd:include schemaLocation="part1_networkDescription/netex_all_objects_part1_networkDescription.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="part1_ifopt/netex_ifopt_all_objects-v0.4.xsd"/>
+	<xsd:include schemaLocation="part1_ifopt/netex_ifopt_all_objects.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="part1_tacticalPlanning/netex_all_objects_part1_tacticalPlanning-v0.1.xsd"/>
+	<xsd:include schemaLocation="part1_tacticalPlanning/netex_all_objects_part1_tacticalPlanning.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_part_1/netex_all_objects_part1.xsd b/xsd/netex_part_1/netex_all_objects_part1.xsd
index dd82b04f8..775cebf61 100644
--- a/xsd/netex_part_1/netex_all_objects_part1.xsd
+++ b/xsd/netex_part_1/netex_all_objects_part1.xsd
@@ -2,12 +2,12 @@
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_part1">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="../netex_framework/netex_all_objects_framework-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_all_objects_framework.xsd"/>
 	<!-- ======================================================================= -->
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="part1_networkDescription/netex_all_objects_part1_networkDescription-v1.0.xsd"/>
+	<xsd:include schemaLocation="part1_networkDescription/netex_all_objects_part1_networkDescription.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="part1_ifopt/netex_ifopt_all_objects-v1.0.xsd"/>
+	<xsd:include schemaLocation="part1_ifopt/netex_ifopt_all_objects.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="part1_tacticalPlanning/netex_all_objects_part1_tacticalPlanning-v1.0.xsd"/>
+	<xsd:include schemaLocation="part1_tacticalPlanning/netex_all_objects_part1_tacticalPlanning.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_part_1/part1_frames/netex_infrastructureFrame_version.xsd b/xsd/netex_part_1/part1_frames/netex_infrastructureFrame_version.xsd
index 1e5739010..0a2e0dd80 100644
--- a/xsd/netex_part_1/part1_frames/netex_infrastructureFrame_version.xsd
+++ b/xsd/netex_part_1/part1_frames/netex_infrastructureFrame_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_InfrastructureFrame_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_all_objects_generic-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_trainElement_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part1_networkDescription/netex_all_objects_part1_infrastructureFrame_contents-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_commonFrame_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_all_objects_generic.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_trainElement_version.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_all_objects_part1_infrastructureFrame_contents.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_commonFrame_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,7 +28,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_frames}netex_InfrastructureFrame_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_frames}netex_InfrastructureFrame_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd b/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd
index 9f5e40a0e..8dd1871b6 100644
--- a/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd
+++ b/xsd/netex_part_1/part1_frames/netex_siteFrame_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_siteFrame_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_commonFrame_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_flexibleStopPlace_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_pointOfInterest_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_parking_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_commonFrame_version.xsd"/>
+	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_flexibleStopPlace_version.xsd"/>
+	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_pointOfInterest_version.xsd"/>
+	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_parking_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -35,11 +35,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_frames}netex_siteFrame_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_frames}netex_siteFrame_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>CEN TC278 SG6 and Department for Transport, Great Minster House, 76 Marsham Street, London SW1P 4DR</Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_xxxxx-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_xxxxx.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_support.xsd
index 8c2cb6ac4..f7eb2f787 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_support.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_assistanceBooking_support">
-	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_localService_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_localService_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -30,7 +30,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/xsd//netex_framework/netex_responsibility/netex_relationship-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/xsd//netex_framework/netex_responsibility/netex_relationship.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_version.xsd
index 5f349a1c3..3586dd96d 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_assistanceBooking_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_assistanceBooking_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part1_networkDescription/netex_line_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_assistanceBooking_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_noticeAssignment_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_localService_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_line_support.xsd"/>
+	<xsd:include schemaLocation="netex_assistanceBooking_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_noticeAssignment_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_localService_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,11 +31,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_assistanceBooking_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_assistanceBooking_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/xsd//netex_framework/netex_responsibility/netex_relationship-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/xsd//netex_framework/netex_responsibility/netex_relationship.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_all_objects.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_all_objects.xsd
index 5889d9cfd..0ca389cee 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_all_objects.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_all_objects.xsd
@@ -13,24 +13,24 @@ The Purpose of this file is to overcome a technical limitation in Xerces (and po
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:nx="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_all_objects">
 	<!-- ===Global include of all ACSB namespace elements neeeded to work around XERCES limitation=====-->
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_ifopt_checkConstraint_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentAll-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_flexibleStopPlace_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_flexibleStopPlace_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_path_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_path_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_navigationPath_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_parking_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_parking_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_pointOfInterest_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_pointOfInterest_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_serviceFeature_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_serviceFeature_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_site_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_site_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_stopPlace_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_vehicleStopping_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_stopPlace_version-v1.1.xsd"/>
-	<!--  For some reason OXygen doesnt like this <xsd:include schemaLocation="netex_assistanceBooking_support-v1.0.xsd"/> -->
-	<xsd:include schemaLocation="netex_assistanceBooking_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_checkConstraint_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentAll.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_flexibleStopPlace_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_flexibleStopPlace_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_path_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_path_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_navigationPath_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_parking_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_parking_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_pointOfInterest_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_pointOfInterest_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_serviceFeature_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_serviceFeature_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_site_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_site_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_stopPlace_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_vehicleStopping_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_stopPlace_version.xsd"/>
+	<!--  For some reason OXygen doesnt like this <xsd:include schemaLocation="netex_assistanceBooking_support.xsd"/> -->
+	<xsd:include schemaLocation="netex_assistanceBooking_version.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_support.xsd
index 8b2be7ce6..be5e59e5e 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_support.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_checkConstraint_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -25,7 +25,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_checkConstraint_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_checkConstraint_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_version.xsd
index b45075a02..f1b9be880 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_checkConstraint_version.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_ifopt_checkConstraint_version">
-	<xsd:include schemaLocation="netex_ifopt_checkConstraint_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_checkConstraint_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version.xsd"/>
 	<!--============================================================================================-->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -33,7 +33,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_checkConstraint_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_checkConstraint_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd
index 06aeb9213..8be6d5b30 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_equipmentAccess_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifot_equipmentAccess_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifot_equipmentAccess_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd
index cbf175641..5e47ca663 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_equipmentAccess_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentAccess_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipmentPlace_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentAccess_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipmentPlace_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,7 +31,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifot_equipmentAccess_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifot_equipmentAccess_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAll.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAll.xsd
index 06fb36c36..1cf0f60c3 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAll.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAll.xsd
@@ -6,9 +6,9 @@
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs"><Aggregation>main schema</Aggregation><Audience>e-service developers</Audience><Contributor>V1.0 Nicholas Knowles</Contributor><Contributor>Roger Slevin [Roger.Slevin@dft.gsi.gov.uk]</Contributor><Coverage>Europe</Coverage><Creator>Created as W3C .xsd schema by Nicholas Knowles. as 1.0 XML schema </Creator><Date><Created>2007-06-10</Created></Date><Date><Modified>2007-06-22</Modified></Date><Description><p>Equipment types
 
- </p></Description><Format><MediaType>text/xml</MediaType><Syntax>http://www.w3.org/2001/XMLSchema</Syntax><Description>XML schema, W3C Recommendation 2001</Description></Format><Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_Ifopt_equipmentAll-v1.0.xsd</Identifier><Language>[ISO 639-2/B] ENG</Language>netex_Ifopt_equipmentAll-v1.0.xsd
+ </p></Description><Format><MediaType>text/xml</MediaType><Syntax>http://www.w3.org/2001/XMLSchema</Syntax><Description>XML schema, W3C Recommendation 2001</Description></Format><Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_Ifopt_equipmentAll.xsd</Identifier><Language>[ISO 639-2/B] ENG</Language>netex_Ifopt_equipmentAll.xsd
 				<Publisher>CEN TC278 SG6 and Department for Transport, Great Minster House, 76 Marsham Street, London SW1P 4DR</Publisher>
-				<Relation><Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_ifopt_xxxxx-v1.0.xsd</Requires></Relation>
+				<Relation><Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_ifopt_xxxxx.xsd</Requires></Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
 				</Rights>
@@ -30,24 +30,24 @@ Rail transport, Roads and road transport
 	</xsd:annotation>
 	<!-- ======================================================================= -->
 	<!--.....These are the actual dependencies...-->
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentSigns_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentSigns_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentAccess_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentAccess_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentWaiting_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentWaiting_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentTicketing_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentTicketing_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentParking_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentParking_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentPassenger_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentPassenger_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_localService_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_localService_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_localServiceCommercial_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_localServiceCommercial_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentSigns_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentSigns_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentAccess_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentAccess_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentWaiting_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentWaiting_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentTicketing_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentTicketing_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentParking_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentParking_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentPassenger_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentPassenger_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_localService_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_localService_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_localServiceCommercial_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_localServiceCommercial_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:group name="AllEquipmentGroup">
 		<xsd:annotation>
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_support.xsd
index fb453c3c9..fae0f5b9c 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_support.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_equipmentParking_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentParking_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentParking_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_version.xsd
index a8e90a0ba..f95d7988f 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentParking_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_equipmentParking_version">
-	<xsd:include schemaLocation="netex_ifopt_equipmentParking_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipmentPlace_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentParking_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipmentPlace_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -30,7 +30,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentParking_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentParking_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd
index 404465b99..88f7ef6c3 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_equipmentPassenger_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentPassenger_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentPassenger_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd
index ddd2786ef..50deea7b8 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_ifopt_equipmentPassenger_version">
-	<xsd:include schemaLocation="netex_ifopt_equipmentPassenger_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentAccess_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentPassenger_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentAccess_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,7 +31,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentPassenger_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentPassenger_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_support.xsd
index a438dbc42..a13e7847e 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_support.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_equipmentSign_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentSign_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentSign_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_version.xsd
index 11fa928f8..923ce5ecb 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentSigns_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_equipmentSigns_version">
-	<xsd:include schemaLocation="netex_ifopt_equipmentSigns_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part1_networkDescription/netex_line_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentSigns_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_line_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -26,7 +26,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentSigns_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentSigns_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_support.xsd
index 3f224e57a..fe27cbf5b 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_support.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_equipmentTicketing_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentTicketing_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentTicketing_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd
index 2025de18f..f3d3be695 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_equipmentTicketing_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentTicketing_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentTicketing_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -30,7 +30,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentTicketing_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentTicketing_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_support.xsd
index 8066b45ef..9efd036d1 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_support.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_equipmentWaiting_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentTicketing_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentTicketing_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_version.xsd
index 9cbc1e272..ac7cc8954 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_equipmentWaiting_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentWaiting_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentWaiting_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,7 +29,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentWaiting-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_equipmentWaiting.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_support.xsd
index b5fea9ac3..73aee8a7e 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_support.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="inetex_ifopt_flexibleStopPlace_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_place_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_place_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -26,7 +26,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_flexibleStopPlace_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_flexibleStopPlace_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_version.xsd
index 79240c324..909a60e24 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_version.xsd
@@ -2,8 +2,8 @@
 <!-- edited with XMLSpy v2009 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <!-- 2007 03 23 Add repeating name -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_flexibleStopPlace_version">
-	<xsd:include schemaLocation="netex_ifopt_flexibleStopPlace_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_stopPlace_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_flexibleStopPlace_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_stopPlace_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_flexibleStopPlace_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_flexibleStopPlace_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>CEN TC278 SG6 and Department for Transport, Great Minster House, 76 Marsham Street, London SW1P 4DR</Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_ifopt_FlexibleStopPlaceModel-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_ifopt_FlexibleStopPlaceModel.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_support.xsd
index a28455752..cb7274ed3 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_support.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_localServiceCommercial_support">
-	<xsd:include schemaLocation="netex_ifopt_localService_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_localService_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_localServiceCommecrial_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_localServiceCommecrial_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_version.xsd
index 84975b73c..f3bccd2b5 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localServiceCommercial_version.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_localServiceCommercial_version">
-	<xsd:include schemaLocation="netex_ifopt_localServiceCommercial_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_localService_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_localServiceCommercial_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_localService_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -24,7 +24,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_localServiceCommercial_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_localServiceCommercial_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_support.xsd
index 0529deb8f..e213d41a0 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_support.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_localService_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -23,7 +23,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_localService_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_localService_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version.xsd
index bdab45db8..1d0f56138 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_localService_version.xsd
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_ifopt_localService_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_utility_types-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_units-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_localService_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_serviceFeature_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_utility_types.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_units.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_localService_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_serviceFeature_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -32,7 +32,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_localService_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_localService_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version.xsd
index edcaadf6a..351fc378e 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_navigationPath_version.xsd
@@ -4,12 +4,12 @@
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_ifopt_navigationPath_version">
 	<!-- ======================================================================= -->
 	<!-- ===Global import of all acsb namespace elements neeeded to work around XERCES limitation
-	<xsd:include schemaLocation="../acsb/netex_acsb_all-v1.0.xsd"/> =====-->
+	<xsd:include schemaLocation="../acsb/netex_acsb_all.xsd"/> =====-->
 	<!--.....These are the actual dependencies...-->
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_place_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_path_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_place_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_path_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -47,11 +47,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_navigationPath_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_navigationPath_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>CEN TC278 SG6 and Department for Transport, Great Minster House, 76 Marsham Street, London SW1P 4DR</Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_ifopt_xxxxx-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_ifopt_xxxxx.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_support.xsd
index 17427207c..2b3bdd600 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_support.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_ifopt_parking_support">
-	<xsd:include schemaLocation="netex_ifopt_site_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_site_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,7 +28,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_parking_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_parking_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_version.xsd
index 5c36b214e..2e2934c72 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_parking_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_ifopt_parking_version">
-	<xsd:include schemaLocation="netex_ifopt_parking_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_navigationPath_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_parking_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_navigationPath_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -30,7 +30,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_parking-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_parking.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd
index 4f14bbaba..7cc657e9e 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_path_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_site_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_site_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -24,7 +24,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_path_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_path_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd
index fa914f240..b71dc2d4d 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_path_version.xsd
@@ -2,8 +2,8 @@
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <!-- 2007 03 23 Add repeating name -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_path_version">
-	<xsd:include schemaLocation="netex_ifopt_path_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_site_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_path_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_site_version.xsd"/>
 	<!-- ============================================== -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -33,11 +33,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_Ifopt_path_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_Ifopt_path_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>CEN TC278 SG6 and Department for Transport, Great Minster House, 76 Marsham Street, London SW1P 4DR</Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_ifopt_xxxxx-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_ifopt_xxxxx.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_support.xsd
index 25dedd470..ca3b59673 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_support.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_pointOfInterest_support">
-	<xsd:include schemaLocation="netex_ifopt_site_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_site_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,7 +28,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_pointOfInterest_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_pointOfInterest_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_version.xsd
index 7d7c60c86..780955b80 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_pointOfInterest_version">
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_ifopt_pointOfInterest_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_navigationPath_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_pointOfInterest_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_navigationPath_version.xsd"/>
 	<!-- ============================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -36,7 +36,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>CEN TC278 SG6 and Department for Transport, Great Minster House, 76 Marsham Street, London SW1P 4DR</Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_ifopt_PointOfInterestModel-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_ifopt_PointOfInterestModel.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
 
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_support.xsd
index 3358754d6..fc0a7d612 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_support.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_serviceFeature">
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_relationship-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_relationship.xsd"/>
 	<!--===== ========================================================-->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,7 +29,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_serviceFeature-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_serviceFeature.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_version.xsd
index 6a5904931..2ec394d55 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_serviceFeature_version.xsd
@@ -2,8 +2,8 @@
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <!-- 2007 03 23 Revise projections -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_serviceFeature">
-	<xsd:include schemaLocation="netex_ifopt_serviceFeature_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_typeOfValue_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_serviceFeature_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_typeOfValue_version.xsd"/>
 	<!--===== =================================================================================-->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -32,7 +32,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_serviceFeature-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_serviceFeature.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd
index 4d8a61ed5..0c972462a 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_site_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_address_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_address_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -26,11 +26,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_site_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_site_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd
index 1c16f8937..fe45b341d 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_site_version">
-	<xsd:include schemaLocation="netex_ifopt_site_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipmentPlace_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_address_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_topographicPlace_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_checkConstraint_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentAll-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_site_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipmentPlace_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_address_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_topographicPlace_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_checkConstraint_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentAll.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -37,11 +37,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_site_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_site_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd
index 83daee07d..4ca14659c 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_ifopt_stopPlace_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_utility_types-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_site_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_path_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_utility_types.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_site_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_path_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -30,7 +30,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_stopPlace_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_stopPlace_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
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 cc76139be..3a42e5de7 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
@@ -42,11 +42,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_Ifopt_stopPlace_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_Ifopt_stopPlace_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>CEN TC278 SG6 and Department for Transport, Great Minster House, 76 Marsham Street, London SW1P 4DR</Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_ifopt_xxxxx-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_ifopt_xxxxx.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
@@ -75,17 +75,17 @@ Rail transport, Roads and Road transport
 		<xsd:documentation>IFOPT STOP PLACE Model.</xsd:documentation>
 	</xsd:annotation>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_topographicPlace_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part1_networkDescription/netex_networkInfrastructure_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_stopPlace_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_vehicleStopping_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_topographicPlace_support.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_networkInfrastructure_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_stopPlace_support.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_vehicleStopping_support.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_address_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part1_networkDescription/netex_line_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_navigationPath_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentAccess_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_ifopt_equipmentSigns_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_address_version.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_line_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_navigationPath_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentAccess_version.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_equipmentSigns_version.xsd"/>
 	<!-- ======================================================================= -->
 	<!-- ===ENTIITY IN VERSION IN FRAME====(Used in SITE FRAME)=================================================== -->
 	<xsd:complexType name="stopPlacesInFrame_RelStructure">
diff --git a/xsd/netex_part_1/part1_ifopt/netex_ifopt_vehicleStopping_support.xsd b/xsd/netex_part_1/part1_ifopt/netex_ifopt_vehicleStopping_support.xsd
index 3f3f7dcd6..76b3f044d 100644
--- a/xsd/netex_part_1/part1_ifopt/netex_ifopt_vehicleStopping_support.xsd
+++ b/xsd/netex_part_1/part1_ifopt/netex_ifopt_vehicleStopping_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_ifopt_vehicleStopping_support">
-	<xsd:include schemaLocation="netex_ifopt_stopPlace_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_ifopt_stopPlace_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -26,7 +26,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_vehicleStopping_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_ifopt}netex_ifopt_vehicleStopping_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_activation_support.xsd b/xsd/netex_part_1/part1_networkDescription/netex_activation_support.xsd
index 4fd63fab5..afee08bbc 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_activation_support.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_activation_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_activation_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,11 +29,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_activation_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_activation_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_activation_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_activation_version.xsd
index 23943be58..15810af2e 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_activation_version.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_activation_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_activation_version">
-	<xsd:include schemaLocation="netex_activation_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLink_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_activation_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -30,11 +30,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_activation_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_activation_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_infrastructureFrame_contents.xsd b/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_infrastructureFrame_contents.xsd
index cfebba627..5eedf6d7e 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_infrastructureFrame_contents.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_infrastructureFrame_contents.xsd
@@ -3,14 +3,14 @@
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_infrastructureFrame_contents">
 	<!-- ===Dependencies ======================================= -->
 	<!-- ====================================================================== -->
-	<xsd:include schemaLocation="netex_activation_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_activation_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_networkInfrastructure_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_networkInfrastructure_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_networkRestriction_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_networkRestriction_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_timingPattern_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleAndCrewPoint_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleAndCrewPoint_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_activation_support.xsd"/>
+	<xsd:include schemaLocation="netex_activation_version.xsd"/>
+	<xsd:include schemaLocation="netex_networkInfrastructure_support.xsd"/>
+	<xsd:include schemaLocation="netex_networkInfrastructure_version.xsd"/>
+	<xsd:include schemaLocation="netex_networkRestriction_support.xsd"/>
+	<xsd:include schemaLocation="netex_networkRestriction_version.xsd"/>
+	<xsd:include schemaLocation="netex_timingPattern_support.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleAndCrewPoint_version.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleAndCrewPoint_support.xsd"/>
 	<!-- ======================================================================= -->
 </xsd:schema>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_lineRoute.xsd b/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_lineRoute.xsd
index 20f347b4c..b8c26f5ab 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_lineRoute.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_lineRoute.xsd
@@ -3,16 +3,16 @@
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_lineRoute">
 	<!-- ===Dependencies ======================================= -->
 	<!-- ===================================================================== -->
-	<xsd:include schemaLocation="netex_flexibleNetwork_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_flexibleNetwork_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_line_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_line_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_lineNetwork_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_lineNetwork_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_route_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_route_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_routeInstruction_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_routeInstruction_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_flexibleNetwork_support.xsd"/>
+	<xsd:include schemaLocation="netex_flexibleNetwork_version.xsd"/>
+	<xsd:include schemaLocation="netex_line_support.xsd"/>
+	<xsd:include schemaLocation="netex_line_version.xsd"/>
+	<xsd:include schemaLocation="netex_lineNetwork_support.xsd"/>
+	<xsd:include schemaLocation="netex_lineNetwork_version.xsd"/>
+	<xsd:include schemaLocation="netex_route_support.xsd"/>
+	<xsd:include schemaLocation="netex_route_version.xsd"/>
+	<xsd:include schemaLocation="netex_routeInstruction_support.xsd"/>
+	<xsd:include schemaLocation="netex_routeInstruction_version.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_timingPattern_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_timingPattern_support.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_networkDescription.xsd b/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_networkDescription.xsd
index ea9408e7b..6cdb80aaf 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_networkDescription.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_all_objects_part1_networkDescription.xsd
@@ -2,9 +2,9 @@
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_networkDescription">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="../../netex_framework/netex_all_objects_framework-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_all_objects_framework.xsd"/>
 	<!-- ====================================================================== -->
 	<!-- ====================================================================== -->
-	<xsd:include schemaLocation="netex_all_objects_part1_infrastructureFrame_contents-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_all_objects_part1_lineRoute-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_all_objects_part1_infrastructureFrame_contents.xsd"/>
+	<xsd:include schemaLocation="netex_all_objects_part1_lineRoute.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_support.xsd b/xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_support.xsd
index 1d2a5552b..7275d703b 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_support.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_flexibleNetwork_support">
-	<xsd:include schemaLocation="netex_route_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_line_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_route_support.xsd"/>
+	<xsd:include schemaLocation="netex_line_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_flexibleNetwork_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_flexibleNetwork_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_version.xsd
index 51afcac8a..967937179 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_version.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_flexibleNetwork_version.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_flexibleNetwork_version">
-	<xsd:include schemaLocation="netex_flexibleNetwork_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_utility_contact-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_notice_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part1_networkDescription/netex_route_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_flexibleNetwork_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_utility_contact.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_notice_version.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_route_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -13,10 +13,10 @@
 				</Date><Date><Modified>2017-06-11</Modified> Move Booking COntact to shared grou. No functional changep 	
 					
 </Date><Description><p>NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.</p><p>This sub-schema describes the FLEXIBLE NETWORK types.</p></Description><Format><MediaType>text/xml</MediaType><Syntax>http://www.w3.org/2001/XMLSchema</Syntax><Description>XML schema, W3C Recommendation 2001</Description></Format>&gt;
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_flexibleNetwork_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_flexibleNetwork_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
-				<Relation><Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires></Relation>
+				<Relation><Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires></Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
 				</Rights>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_support.xsd b/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_support.xsd
index 413f10d35..433540edb 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_support.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_lineNetwork_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLink_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_section_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLink_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_section_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -30,11 +30,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_lineNetwork_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_lineNetwork_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version.xsd
index d46f40b1e..91547ea29 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_lineNetwork_version">
-	<xsd:include schemaLocation="netex_lineNetwork_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_section_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part1_networkDescription/netex_line_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_lineNetwork_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_section_version.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_line_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -32,11 +32,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_lineNetwork_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_lineNetwork_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_line_support.xsd b/xsd/netex_part_1/part1_networkDescription/netex_line_support.xsd
index 1dc6355ae..4a1a32c1b 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_line_support.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_line_support.xsd
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_line_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_grouping_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_grouping_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs"><Aggregation>main schema</Aggregation><Audience>e-service developers</Audience><Contributor>V1.0 Christophe Duquesne</Contributor><Contributor>Nicholas Knowles</Contributor><Coverage>Europe</Coverage><Creator>First drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles.  mailto:schemer@netex.org.uk</Creator><Date><Created>2010-09-04</Created></Date><Date><Modified>2011-02-05</Modified><!-- Name Space changes --></Date><Date><Modified>2017-07-03</Modified> CR025  add secodnary destination context enum
 														CR10 add type of Line 7 Type of Group Enums
 				</Date><Date><Modified>2017-06-28</Modified>CR014  Add GroupOfLinesType				</Date><Description><p>NeTEx is a European CEN standard for the exchange of Public Transport data including timetables.</p><p>This sub-schema describes the LINE identifier  utility types.</p></Description><Format><MediaType>text/xml</MediaType><Syntax>http://www.w3.org/2001/XMLSchema</Syntax><Description>XML schema, W3C Recommendation 2001</Description></Format>&gt;
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_line_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_line_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
-				<Relation><Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires></Relation>
+				<Relation><Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires></Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
 				</Rights>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd
index e52ad0f4c..c1025f482 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_line_version.xsd
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_line_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_utility_types-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_submode_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_grouping_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_noticeAssignment_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_line_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_route_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_utility_types.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_submode_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_grouping_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_noticeAssignment_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_version.xsd"/>
+	<xsd:include schemaLocation="netex_line_support.xsd"/>
+	<xsd:include schemaLocation="netex_route_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -48,11 +48,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_line_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_line_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_support.xsd b/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_support.xsd
index 26d6eb225..9ef9e92e0 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_support.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_networkInfrastructure_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLink_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLink_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,11 +27,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_networkInfrastructure_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_networkInfrastructure_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_version.xsd
index 88c0fb3ee..83d6582f4 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_version.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_networkInfrastructure_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_networkInfrastructure_version">
-	<xsd:include schemaLocation="netex_networkInfrastructure_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLink_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_networkInfrastructure_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_networkInfrastructure_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_networkInfrastructure_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_support.xsd b/xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_support.xsd
index 395cdf957..483cb4d8f 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_support.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_networkRestriction_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_vehicleType_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_networkRestriction_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_networkRestriction_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_version.xsd
index da2d6c355..caef5f5e1 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_version.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_networkRestriction_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_networkRestriction_version">
-	<xsd:include schemaLocation="netex_networkInfrastructure_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_networkRestriction_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_networkInfrastructure_version.xsd"/>
+	<xsd:include schemaLocation="netex_networkRestriction_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,10 +27,10 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_networkRestriction_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_networkRestriction_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
-				<Relation><Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires> &gt;
+				<Relation><Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires> &gt;
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_support.xsd b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_support.xsd
index 9a3519218..7d6d1f0af 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_support.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_route_support">
-	<xsd:include schemaLocation="netex_route_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_route_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -26,11 +26,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_route_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_route_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd
index 1a05c5bef..cf911bfdd 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_route_version">
-	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_path_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_routeInstruction_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_spatialFeature_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_path_support.xsd"/>
+	<xsd:include schemaLocation="netex_routeInstruction_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_spatialFeature_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -32,11 +32,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_route_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_route_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_route_support.xsd b/xsd/netex_part_1/part1_networkDescription/netex_route_support.xsd
index 396591fed..039c58a3c 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_route_support.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_route_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_route_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLink_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLink_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_route_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_route_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd
index d3244a5d6..76feabc34 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_route_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_route_version">
-	<xsd:include schemaLocation="netex_line_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_routeInstruction_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_line_version.xsd"/>
+	<xsd:include schemaLocation="netex_routeInstruction_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -33,11 +33,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_route_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_route_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_timingPattern_support.xsd b/xsd/netex_part_1/part1_networkDescription/netex_timingPattern_support.xsd
index c37dcf354..5b2dd0ca4 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_timingPattern_support.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_timingPattern_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_timingPattern_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_route_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd"/>
+	<xsd:include schemaLocation="netex_route_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -30,11 +30,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_timingPattern_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_timingPattern_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_support.xsd b/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_support.xsd
index c38843cc6..ee7582390 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_support.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_vehicleAndCrewPoint_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_address_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_timingPattern_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_address_support.xsd"/>
+	<xsd:include schemaLocation="netex_timingPattern_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_vehicleAndCrewPoint_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_vehicleAndCrewPoint_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_version.xsd b/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_version.xsd
index 56e74fe45..9a278c1f2 100644
--- a/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_version.xsd
+++ b/xsd/netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_vehicleAndCrewPoint_version">
-	<xsd:include schemaLocation="netex_vehicleAndCrewPoint_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_address_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part1_tacticalPlanning/netex_timingPattern_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleAndCrewPoint_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_address_version.xsd"/>
+	<xsd:include schemaLocation="../part1_tacticalPlanning/netex_timingPattern_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -32,11 +32,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_vehicleAndCrewPoint_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_networkDescription}netex_vehicleAndCrewPoint_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_all_objects_part1_tacticalPlanning.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_all_objects_part1_tacticalPlanning.xsd
index 2ddf087b0..0387d56bc 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_all_objects_part1_tacticalPlanning.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_all_objects_part1_tacticalPlanning.xsd
@@ -2,32 +2,32 @@
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_part1_tacticalPlanning">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="../../netex_framework/netex_all_objects_framework-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_all_objects_framework.xsd"/>
 	<!-- ======================================================================= -->
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="../part1_networkDescription/netex_all_objects_part1_networkDescription-v1.0.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_all_objects_part1_networkDescription.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_commonSection_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_commonSection_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_fareZone_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_fareZone_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_journeyPattern_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_journeyPattern_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_journeyPatternTimings_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_journeyTiming_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_journeyTiming_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_passengerInformationEquipment_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_passengerInformationEquipment_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_pathAssignment_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_routingConstraint_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_routingConstraint_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_servicePattern_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_servicePattern_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_siteConnection_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_siteConnection_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_stopAssignment_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_stopAssignment_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_timeDemandType_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_timeDemandType_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_timingPattern_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_commonSection_support.xsd"/>
+	<xsd:include schemaLocation="netex_commonSection_version.xsd"/>
+	<xsd:include schemaLocation="netex_fareZone_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareZone_version.xsd"/>
+	<xsd:include schemaLocation="netex_journeyPattern_support.xsd"/>
+	<xsd:include schemaLocation="netex_journeyPattern_version.xsd"/>
+	<xsd:include schemaLocation="netex_journeyPatternTimings_version.xsd"/>
+	<xsd:include schemaLocation="netex_journeyTiming_support.xsd"/>
+	<xsd:include schemaLocation="netex_journeyTiming_version.xsd"/>
+	<xsd:include schemaLocation="netex_passengerInformationEquipment_version.xsd"/>
+	<xsd:include schemaLocation="netex_passengerInformationEquipment_support.xsd"/>
+	<xsd:include schemaLocation="netex_pathAssignment_version.xsd"/>
+	<xsd:include schemaLocation="netex_routingConstraint_support.xsd"/>
+	<xsd:include schemaLocation="netex_routingConstraint_version.xsd"/>
+	<xsd:include schemaLocation="netex_servicePattern_support.xsd"/>
+	<xsd:include schemaLocation="netex_servicePattern_version.xsd"/>
+	<xsd:include schemaLocation="netex_siteConnection_support.xsd"/>
+	<xsd:include schemaLocation="netex_siteConnection_version.xsd"/>
+	<xsd:include schemaLocation="netex_stopAssignment_support.xsd"/>
+	<xsd:include schemaLocation="netex_stopAssignment_version.xsd"/>
+	<xsd:include schemaLocation="netex_timeDemandType_support.xsd"/>
+	<xsd:include schemaLocation="netex_timeDemandType_version.xsd"/>
+	<xsd:include schemaLocation="netex_timingPattern_version.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_support.xsd
index 0b1ce08dd..a85a21de0 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_support.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_commonSection_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_section_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_section_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -20,7 +20,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_commonSection_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_commonSection_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Steam Intellect, London N1 1JS</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_version.xsd
index a6e7987a1..1d3485223 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_version.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_commonSection_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_commonSection_version">
-	<xsd:include schemaLocation="netex_commonSection_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_commonSection_support.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_section_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_section_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -22,7 +22,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_commonSection_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_commonSection_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Steam Intellect, London N1 1JS</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_support.xsd
index 15c21f112..282141512 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_support.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_fareZone_support">
-	<xsd:include schemaLocation="../part1_tacticalPlanning/netex_servicePattern_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_section_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../part1_tacticalPlanning/netex_servicePattern_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_section_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -36,7 +36,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareZone_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareZone_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_version.xsd
index 83a1dac08..05d32fe0d 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_version.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_fareZone_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareZone_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part1_tacticalPlanning/netex_servicePattern_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part1_networkDescription/netex_route_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareZone_support.xsd"/>
+	<xsd:include schemaLocation="../part1_tacticalPlanning/netex_servicePattern_version.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_route_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareZone_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareZone_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>CEN SWG 9 , 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_support.xsd
index 28e9c4437..cc8118172 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_support.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_journeyPatternTimings_support">
-	<xsd:include schemaLocation="netex_journeyTiming_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_journeyTiming_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyPatternTimings_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyPatternTimings_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_version.xsd
index e386f84a0..7c762f24a 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_version.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_journeyPatternTimings_version">
-	<xsd:include schemaLocation="netex_journeyPattern_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_journeyPatternTimings_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_journeyTiming_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_journeyPattern_support.xsd"/>
+	<xsd:include schemaLocation="netex_journeyPatternTimings_support.xsd"/>
+	<xsd:include schemaLocation="netex_journeyTiming_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -30,11 +30,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyPatternTimings_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyPatternTimings_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support.xsd
index 365462186..68d490c34 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_journeyPattern_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyPattern_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyPattern_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_version.xsd
index 8f3c6e174..efafc68a0 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_version.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyPattern_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_journeyPattern_version">
-	<xsd:include schemaLocation="../part1_networkDescription/netex_line_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_servicePattern_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_journeyPatternTimings_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_line_support.xsd"/>
+	<xsd:include schemaLocation="netex_servicePattern_version.xsd"/>
+	<xsd:include schemaLocation="netex_journeyPatternTimings_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -32,11 +32,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyPattern_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyPattern_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support.xsd
index c871ab0d4..fd8c3d68c 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_journeyTiming_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_relationship-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_relationship.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyTiming_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyTiming_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version.xsd
index 9a24bfb6f..8fc16d430 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version.xsd
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_journeyTiming_version">
-	<xsd:include schemaLocation="netex_journeyTiming_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_timeDemandType_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part1_networkDescription/netex_timingPattern_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_dayType_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_journeyTiming_support.xsd"/>
+	<xsd:include schemaLocation="netex_timeDemandType_support.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_timingPattern_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_dayType_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -33,11 +33,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyTiming_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyTiming_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_support.xsd
index b83a44309..1d95e1cea 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_support.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_passengerInformationEquipment_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_passengerInformationEquipment_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_passengerInformationEquipment_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd
index 27463b573..961ed482d 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_passengerInformationEquipment_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part1_networkDescription/netex_line_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_stopPlace_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part1_networkDescription/netex_route_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_passengerInformationEquipment_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_servicePattern_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_support.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_line_support.xsd"/>
+	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_stopPlace_support.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_route_support.xsd"/>
+	<xsd:include schemaLocation="netex_passengerInformationEquipment_support.xsd"/>
+	<xsd:include schemaLocation="netex_servicePattern_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -35,7 +35,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_passengerInformationEquipment_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_passengerInformationEquipment_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_pathAssignment_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_pathAssignment_version.xsd
index df96ba70b..b41c1e061 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_pathAssignment_version.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_pathAssignment_version.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2010 rel. 3 sp1 (http://www.altova.com) by Nicholas Knowles (Kizoom) -->
 <xsd:schema xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_pathAssignment_version">
-	<xsd:include schemaLocation="netex_stopAssignment_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_stopAssignment_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_pathAssignment_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_pathAssignment_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd
index 218e7062c..4de0754bc 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_routingConstraint_support_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_place_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_place_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_routingConstraint_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_routingConstraint_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_version.xsd
index e6c36cbc6..dcc038764 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_version.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_routingConstraint_version.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_routingConstraint_version">
-	<xsd:include schemaLocation="netex_routingConstraint_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_servicePattern_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_routingConstraint_support.xsd"/>
+	<xsd:include schemaLocation="netex_servicePattern_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_routingConstraint_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_routingConstraint_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd
index dabc08a4f..5222c551b 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_servicePattern_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_place_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part1_networkDescription/netex_timingPattern_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_journeyPattern_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_place_support.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_timingPattern_support.xsd"/>
+	<xsd:include schemaLocation="netex_journeyPattern_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -35,11 +35,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_servicePattern_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_servicePattern_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
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 bddc6b48a..1baf485b3 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd
@@ -2,12 +2,12 @@
 <!-- edited with XMLSpy v2011 rel. 2 sp1 (x64) (http://www.altova.com) by Christophe Duquesne (Dryade) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_servicePattern_version">
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_servicePattern_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part1_tacticalPlanning/netex_fareZone_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_journeyPattern_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_timingPattern_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_siteConnection_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part1_networkDescription/netex_flexibleNetwork_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_servicePattern_support.xsd"/>
+	<xsd:include schemaLocation="../part1_tacticalPlanning/netex_fareZone_support.xsd"/>
+	<xsd:include schemaLocation="netex_journeyPattern_version.xsd"/>
+	<xsd:include schemaLocation="netex_timingPattern_version.xsd"/>
+	<xsd:include schemaLocation="netex_siteConnection_version.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_flexibleNetwork_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -41,11 +41,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_servicePattern_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_servicePattern_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_support.xsd
index 34de849fc..dc561445e 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_support.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_siteConnection_support">
-	<xsd:include schemaLocation="netex_servicePattern_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_servicePattern_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -26,11 +26,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_siteConnection_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_siteConnection_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_version.xsd
index d619db51e..53049a3bf 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_version.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_siteConnection_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_siteConnection_version">
-	<xsd:include schemaLocation="netex_siteConnection_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_pointOfInterest_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_parking_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_stopPlace_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_navigationPath_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_siteConnection_support.xsd"/>
+	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_pointOfInterest_support.xsd"/>
+	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_parking_support.xsd"/>
+	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_stopPlace_support.xsd"/>
+	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_navigationPath_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,11 +31,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_siteConnection_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_siteConnection_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd
index b1d66d817..1854ec569 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_stopAssignment_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -26,7 +26,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_stopAssignment_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_stopAssignment_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd
index 685f12061..92b20b492 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_stopAssignment_version">
-	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_stopPlace_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_stopAssignment_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_servicePattern_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_trainElement_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../part1_ifopt/netex_ifopt_stopPlace_version.xsd"/>
+	<xsd:include schemaLocation="netex_stopAssignment_support.xsd"/>
+	<xsd:include schemaLocation="netex_servicePattern_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_trainElement_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -33,7 +33,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_stopAssignment_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_stopAssignment_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_support.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_support.xsd
index 7363a762a..bca0f9454 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_support.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_timeDemandType_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_journeyTiming_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support.xsd"/>
+	<xsd:include schemaLocation="netex_journeyTiming_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_timeDemandType_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_timeDemandType_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_version.xsd
index b1c3fc16d..2ee348a50 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_version.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_timeDemandType_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_timeDemandType_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_vehicleType_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLink_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_journeyTiming_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLink_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version.xsd"/>
+	<xsd:include schemaLocation="netex_journeyTiming_version.xsd"/>
 	<!--CLOSE COUPLED WITH JOURNEY TIMINGS-->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,11 +31,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_timeDemandType_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_timeDemandType_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version.xsd b/xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version.xsd
index 1335824cf..cd238c892 100644
--- a/xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version.xsd
+++ b/xsd/netex_part_1/part1_tacticalPlanning/netex_timingPattern_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_timingPattern_version">
-	<xsd:include schemaLocation="../part1_networkDescription/netex_route_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_noticeAssignment_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_journeyPatternTimings_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../part1_networkDescription/netex_route_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_noticeAssignment_version.xsd"/>
+	<xsd:include schemaLocation="netex_journeyPatternTimings_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -33,11 +33,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_timingPattern_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_timingPattern_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_2/netex_all_frames_part2.xsd b/xsd/netex_part_2/netex_all_frames_part2.xsd
index 868e1527b..67103dd77 100644
--- a/xsd/netex_part_2/netex_all_frames_part2.xsd
+++ b/xsd/netex_part_2/netex_all_frames_part2.xsd
@@ -2,10 +2,10 @@
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_frames_part2">
 	<!-- ===Dependencies ======================================= -->
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="part2_frames/netex_timetableFrame_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="part2_frames/netex_serviceFrame_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="part2_frames/netex_vehicleScheduleFrame_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="part2_frames/netex_driverScheduleFrame_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="part2_frames/netex_timetableFrame_version.xsd"/>
+	<xsd:include schemaLocation="part2_frames/netex_serviceFrame_version.xsd"/>
+	<xsd:include schemaLocation="part2_frames/netex_vehicleScheduleFrame_version.xsd"/>
+	<xsd:include schemaLocation="part2_frames/netex_driverScheduleFrame_version.xsd"/>
 	<!-- ===eGIF/GovTalk Documentation ======================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -27,14 +27,14 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/}netex__all_frames_part-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/}netex__all_frames_part.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/xsd/part2/part2_frames/netex_timetableFrame_version-v1.0.xsd</Requires>
-					<Requires>http://www.netex.org.uk/schemas/1.0/xsd/part2/part2_frames/netex_serviceFrame_version-v1.1.xsd</Requires>
-					<Requires>http://www.netex.org.uk/schemas/1.0/xsd/part2/part2_frames/netex_vehicleScheduleFrame_version-v1.0.xsd</Requires>
-					<Requires>http://www.netex.org.uk/schemas/1.0/xsd/part2/part2_frames/netex_driverScheduleFrame_version-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/xsd/part2/part2_frames/netex_timetableFrame_version.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/xsd/part2/part2_frames/netex_serviceFrame_version.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/xsd/part2/part2_frames/netex_vehicleScheduleFrame_version.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/xsd/part2/part2_frames/netex_driverScheduleFrame_version.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/netex_all_objects_part2.xsd b/xsd/netex_part_2/netex_all_objects_part2.xsd
index 692ff77b3..a16c55993 100644
--- a/xsd/netex_part_2/netex_all_objects_part2.xsd
+++ b/xsd/netex_part_2/netex_all_objects_part2.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_part2">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="../netex_part_1/netex_all_objects_part1-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_part_1/netex_all_objects_part1.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="part2_journeyTimes/netex_all_objects_part2_journeyTimes-v1.0.xsd"/>
+	<xsd:include schemaLocation="part2_journeyTimes/netex_all_objects_part2_journeyTimes.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="part2_vehicleService/netex_all_objects_part2_vehicleService-v1.0.xsd"/>
+	<xsd:include schemaLocation="part2_vehicleService/netex_all_objects_part2_vehicleService.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -27,14 +27,14 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/}netex_all_objects_part2-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/}netex_all_objects_part2.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _all_devices-v1.0.xsd</Requires>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _all_traffic_events-v1.0.xsd</Requires>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _all_quantiseds-v1.0.xsd</Requires>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _network-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _all_devices.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _all_traffic_events.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _all_quantiseds.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _network.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_frames/netex_driverScheduleFrame_version.xsd b/xsd/netex_part_2/part2_frames/netex_driverScheduleFrame_version.xsd
index be6699cb8..a0be96d7a 100644
--- a/xsd/netex_part_2/part2_frames/netex_driverScheduleFrame_version.xsd
+++ b/xsd/netex_part_2/part2_frames/netex_driverScheduleFrame_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_driverScheduleFrame_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_commonFrame_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part2_journeyTimes/netex_serviceJourney_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part2_vehicleService/netex_duty_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_commonFrame_version.xsd"/>
+	<xsd:include schemaLocation="../part2_journeyTimes/netex_serviceJourney_version.xsd"/>
+	<xsd:include schemaLocation="../part2_vehicleService/netex_duty_version.xsd"/>
 	<!-- ==== Production DriverSchedule Delivery =========================================-->
 	<xsd:element name="DriverScheduleFrame" substitutionGroup="CommonFrame">
 		<xsd:annotation>
diff --git a/xsd/netex_part_2/part2_frames/netex_serviceFrame_version.xsd b/xsd/netex_part_2/part2_frames/netex_serviceFrame_version.xsd
index 779412a07..e1e7e25f6 100644
--- a/xsd/netex_part_2/part2_frames/netex_serviceFrame_version.xsd
+++ b/xsd/netex_part_2/part2_frames/netex_serviceFrame_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_serviceFrame_version">
-	<xsd:include schemaLocation="../../netex_part_1/netex_all_objects_part1-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_commonFrame_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_all_objects_part2-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/netex_all_objects_part1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_commonFrame_version.xsd"/>
+	<xsd:include schemaLocation="../netex_all_objects_part2.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -24,7 +24,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_serviceFrame_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_responsibility}netex_serviceFrame_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_2/part2_frames/netex_timetableFrame_support.xsd b/xsd/netex_part_2/part2_frames/netex_timetableFrame_support.xsd
index ca1a20d47..d69e5147c 100644
--- a/xsd/netex_part_2/part2_frames/netex_timetableFrame_support.xsd
+++ b/xsd/netex_part_2/part2_frames/netex_timetableFrame_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_timetableFrame_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_versionFrame_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_versionFrame_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,11 +27,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_frames}netex_timetableFrame_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_frames}netex_timetableFrame_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
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 df6a6f37a..b7f9253e4 100644
--- a/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd
+++ b/xsd/netex_part_2/part2_frames/netex_timetableFrame_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_timetableFrame_version">
-	<xsd:include schemaLocation="netex_timetableFrame_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_trainElement_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_serviceCalendarFrame_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part2_journeyTimes/netex_datedVehicleJourney_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_timetableFrame_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_trainElement_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_serviceCalendarFrame_version.xsd"/>
+	<xsd:include schemaLocation="../part2_journeyTimes/netex_datedVehicleJourney_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -24,7 +24,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_timetableFrame_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_framework/netex_genericFramework}netex_timetableFrame_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_2/part2_frames/netex_vehicleScheduleFrame_version.xsd b/xsd/netex_part_2/part2_frames/netex_vehicleScheduleFrame_version.xsd
index 928dfce22..9d62f90d2 100644
--- a/xsd/netex_part_2/part2_frames/netex_vehicleScheduleFrame_version.xsd
+++ b/xsd/netex_part_2/part2_frames/netex_vehicleScheduleFrame_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_vehicleScheduleFrame_version">
-	<xsd:include schemaLocation="netex_timetableFrame_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_serviceCalendarFrame_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part2_journeyTimes/netex_serviceJourney_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part2_vehicleService/netex_vehicleService_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_timetableFrame_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_serviceCalendarFrame_version.xsd"/>
+	<xsd:include schemaLocation="../part2_journeyTimes/netex_serviceJourney_version.xsd"/>
+	<xsd:include schemaLocation="../part2_vehicleService/netex_vehicleService_version.xsd"/>
 	<!-- ==== Production VehicleSchedule Delivery =========================================-->
 	<xsd:element name="VehicleScheduleFrame" substitutionGroup="CommonFrame">
 		<xsd:annotation>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyTimes.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyTimes.xsd
index a2886f57c..a71a8eacc 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyTimes.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_all_objects_part2_journeyTimes.xsd
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_part2_journeyTimes">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="netex_call_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_call_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_coupledJourney_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_coupledJourney_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_flexibleService_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_flexibleService_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_interchange_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_passingTimes_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_passingTimes_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_datedPassingTimes_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_datedVehicleJourney_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_datedVehicleJourney_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_serviceJourney_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_serviceJourney_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_serviceView_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_timeDemandProfile_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_timeDemandTimes_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourney_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourneyTimes_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourneyTimes_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourneyFrequency_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourneyFrequency_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleService_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_call_version.xsd"/>
+	<xsd:include schemaLocation="netex_call_support.xsd"/>
+	<xsd:include schemaLocation="netex_coupledJourney_support.xsd"/>
+	<xsd:include schemaLocation="netex_coupledJourney_version.xsd"/>
+	<xsd:include schemaLocation="netex_flexibleService_support.xsd"/>
+	<xsd:include schemaLocation="netex_flexibleService_version.xsd"/>
+	<xsd:include schemaLocation="netex_interchange_version.xsd"/>
+	<xsd:include schemaLocation="netex_passingTimes_version.xsd"/>
+	<xsd:include schemaLocation="netex_passingTimes_support.xsd"/>
+	<xsd:include schemaLocation="netex_datedPassingTimes_version.xsd"/>
+	<xsd:include schemaLocation="netex_datedVehicleJourney_support.xsd"/>
+	<xsd:include schemaLocation="netex_datedVehicleJourney_version.xsd"/>
+	<xsd:include schemaLocation="netex_serviceJourney_support.xsd"/>
+	<xsd:include schemaLocation="netex_serviceJourney_version.xsd"/>
+	<xsd:include schemaLocation="netex_serviceView_version.xsd"/>
+	<xsd:include schemaLocation="netex_timeDemandProfile_version.xsd"/>
+	<xsd:include schemaLocation="netex_timeDemandTimes_version.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourney_version.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourneyTimes_support.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourneyTimes_version.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourneyFrequency_support.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourneyFrequency_version.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleService_support.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_call_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_call_support.xsd
index dd4b82164..0e65bb71d 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_call_support.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_call_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_call_support">
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_call_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_call_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd
index a88b1db1e..67a139c42 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_call_version.xsd
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_call_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_servicePattern_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_interchangeRule_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_passingTimes_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_call_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleService_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_journeyDesignator_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part2_vehicleService/netex_duty_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_stopAssignment_version.xsd"/>
+	<xsd:include schemaLocation="netex_interchangeRule_version.xsd"/>
+	<xsd:include schemaLocation="netex_passingTimes_version.xsd"/>
+	<xsd:include schemaLocation="netex_call_support.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleService_support.xsd"/>
+	<xsd:include schemaLocation="netex_journeyDesignator_support.xsd"/>
+	<xsd:include schemaLocation="../part2_vehicleService/netex_duty_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -38,11 +38,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_call_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_call_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_support.xsd
index 7c6b156e7..1db22dd49 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_support.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_coupledJourney_support">
-	<xsd:include schemaLocation="netex_vehicleJourney_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourney_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -30,11 +30,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_coupledJourney_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_coupledJourney_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd
index 1a9ca9a2a..e4349792b 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_coupledJourney_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_coupledJourney_version">
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_servicePattern_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleService_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleService_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -42,11 +42,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_coupledJourney_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_coupledJourney_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_datedPassingTimes_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_datedPassingTimes_version.xsd
index 2c5d302a4..f870ad762 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_datedPassingTimes_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_datedPassingTimes_version.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_datedPassingTimes_version">
-	<xsd:include schemaLocation="netex_passingTimes_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_passingTimes_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -30,11 +30,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_datedPassingTimes_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_datedPassingTimes_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_support.xsd
index e4d11a155..468fb5dd4 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_support.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_datedVehicleJourney_support">
-	<xsd:include schemaLocation="netex_serviceJourney_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_serviceJourney_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -30,7 +30,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/2.0/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support-v1.1.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/2.0/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_version.xsd
index a2af90946..d03d16d29 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_dateVehicleJourney_version">
-	<xsd:include schemaLocation="netex_datedVehicleJourney_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_serviceJourney_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_datedPassingTimes_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_call_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_datedVehicleJourney_support.xsd"/>
+	<xsd:include schemaLocation="netex_serviceJourney_version.xsd"/>
+	<xsd:include schemaLocation="netex_datedPassingTimes_version.xsd"/>
+	<xsd:include schemaLocation="netex_call_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,11 +31,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_datedVehcileJourney_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_datedVehcileJourney_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_support.xsd
index 8370f1d90..29556c251 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_support.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_flexibleService_support">
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_flexibleService_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_flexibleService_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_version.xsd
index d9dc22ed5..47aed745d 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_flexibleService_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2011 rel. 2 sp1 (x64) (http://www.altova.com) by Christophe Duquesne (Dryade) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_flexibleService_version">
-	<xsd:include schemaLocation="netex_flexibleService_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_serviceJourney_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_flexibleService_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_flexibleStopPlace_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd"/>
+	<xsd:include schemaLocation="netex_serviceJourney_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,11 +31,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_flexibleService_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_flexibleService_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_interchangeRule_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_interchangeRule_version.xsd
index 14ed4b015..43c83df97 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_interchangeRule_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_interchangeRule_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_interchangeRule_version">
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_journeyDesignator_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_interchange_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_journeyDesignator_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd"/>
+	<xsd:include schemaLocation="netex_interchange_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -35,11 +35,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_interchangeRule_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_interchangeRule_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_interchange_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_interchange_support.xsd
index c150f7d08..bf41a50c4 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_interchange_support.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_interchange_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_interchange_support">
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_timeDemandType_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_timeDemandType_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,11 +29,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_interchange_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_interchange_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd
index 6c9b69fa8..5701e574a 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_interchange_version">
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_servicePattern_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_interchange_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_noticeAssignment_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_place_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_line_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourneyFrequency_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd"/>
+	<xsd:include schemaLocation="netex_interchange_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_noticeAssignment_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_place_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_line_version.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourneyFrequency_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -35,11 +35,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_interchange_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_interchange_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_support.xsd
index bbd610bbb..ff4fe5151 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_support.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_journeyAccounting_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_relationship-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_relationship.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,11 +29,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyAccounting_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyAccounting_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/xsd//netex_framework/netex_responsibility/netex_relationship-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/xsd//netex_framework/netex_responsibility/netex_relationship.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_version.xsd
index b78317997..7b7e75371 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_journeyAccounting_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_journeyAccounting_version">
-	<xsd:include schemaLocation="netex_journeyAccounting_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_location_types-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_journeyAccounting_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_location_types.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,11 +29,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyAccounting_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyAccounting_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/xsd//netex_framework/netex_responsibility/netex_relationship-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/xsd//netex_framework/netex_responsibility/netex_relationship.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_journeyDesignator_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_journeyDesignator_support.xsd
index 3de07ce71..a6d00e48d 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_journeyDesignator_support.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_journeyDesignator_support.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_journeyDesignator_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_dayType_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_line_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_route_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourney_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_dayType_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_line_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_route_support.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourney_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -30,11 +30,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyDesignator_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journeyDesignator_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/2.0/xsd/netex_framework/netex_reusableComponents/netex_dayType_support-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/2.0/xsd/netex_framework/netex_reusableComponents/netex_dayType_support.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_journey_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_journey_version.xsd
index f712bb28e..b8ed82488 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_journey_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_journey_version.xsd
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_journey_version">
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourney_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_noticeAssignment_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_journeyAccounting_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourney_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_accessibility.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_noticeAssignment_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version.xsd"/>
+	<xsd:include schemaLocation="netex_journeyAccounting_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -35,7 +35,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journey_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_1/part1_tacticalPlanning}netex_journey_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>CEN SWG 9 , 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_support.xsd
index cc0d3a72e..4deaf4cb2 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_support.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_passingTimes_support">
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support.xsd"/>
 	<!-- ==CLOSELY COUPLED ===================================================== -->
 	<!-- ======================================================================= -->
 	<xsd:annotation>
@@ -29,11 +29,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_passingTimes_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_passingTimes_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd
index 15d649c1d..09deab449 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_passingTimes_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_passingTimes_version">
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourney_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_passingTimes_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyPattern_support.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourney_support.xsd"/>
+	<xsd:include schemaLocation="netex_passingTimes_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version.xsd"/>
 	<!-- ======================================================================= -->
 	<!-- ==CLOSELY COUPLED ===================================================== -->
 	<xsd:annotation>
@@ -34,11 +34,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_passingTimes_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_passingTimes_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_support.xsd
index 5409322ab..d0f144589 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_support.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_serviceJourney_support">
-	<xsd:include schemaLocation="netex_vehicleJourney_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourney_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -31,7 +31,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/2.0/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support-v1.1.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/2.0/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_version.xsd
index 3f4502ffd..915fe0ad6 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_serviceJourney_version.xsd
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_serviceJourney_Version">
-	<xsd:include schemaLocation="netex_vehicleJourney_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_flexibleService_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_serviceCalendar_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_flexibleNetwork_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_call_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourney_version.xsd"/>
+	<xsd:include schemaLocation="netex_flexibleService_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_serviceCalendar_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_flexibleNetwork_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipmentVehiclePassenger_version.xsd"/>
+	<xsd:include schemaLocation="netex_call_version.xsd"/>
 	<!-- ==CLOSELY COUPLED ===================================================== -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -39,11 +39,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_serviceJourney_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_serviceJourney_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_serviceView_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_serviceView_version.xsd
index 734b85756..17753160e 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_serviceView_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_serviceView_version.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_serviceView_version">
-	<xsd:include schemaLocation="netex_serviceJourney_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_serviceJourney_version.xsd"/>
 	<!-- ==== Production Timetable Delivery =========================================-->
 	<!-- ==== Call =========================================-->
 </xsd:schema>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_timeDemandProfile_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_timeDemandProfile_version.xsd
index 3b1d95261..6213eedf2 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_timeDemandProfile_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_timeDemandProfile_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_timeDemandProfile_version">
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_timeDemandType_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourney_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_timeDemandType_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_version.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourney_version.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -29,11 +29,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_timeDemandProfile_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_timeDemandProfile_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_timeDemandTimes_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_timeDemandTimes_version.xsd
index 10fddb6a4..ae3b18fc2 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_timeDemandTimes_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_timeDemandTimes_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
-<xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_timeDemandTimes_version-v0.1.xsd">
-	<xsd:include schemaLocation="netex_serviceJourney_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_version-v1.0.xsd"/>
+<xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_timeDemandTimes_version.xsd">
+	<xsd:include schemaLocation="netex_serviceJourney_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyPatternTimings_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,11 +29,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_timeDemandTimes_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_timeDemandTimes_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_support.xsd
index 03a81ee95..9c550b901 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_support.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_vehicleJourneyFrequency_support">
-	<xsd:include schemaLocation="netex_serviceJourney_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_serviceJourney_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -31,7 +31,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/2.0/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support-v1.1.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/2.0/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_version.xsd
index f022931a4..a123b0c59 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_vehicleJourneyFrequency_version">
-	<xsd:include schemaLocation="netex_vehicleJourneyFrequency_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourneyTimes_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_grouping_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourneyFrequency_support.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourneyTimes_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyTiming_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_grouping_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -35,11 +35,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_vehicleJourneyFrequency_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_vehicleJourneyFrequency_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_support.xsd
index deab020f9..5940aea94 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_support.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_vehicleJourneyTimes_support">
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_journeyTiming_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -31,7 +31,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/2.0/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support-v1.1.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/2.0/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_version.xsd
index 02e2724ae..bf7dd4fd5 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourneyTimes_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_vehicleJourneyTimes_version">
-	<xsd:include schemaLocation="netex_vehicleJourney_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourneyTimes_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_dayType_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_timeDemandType_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourney_support.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourneyTimes_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_dayType_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_timeDemandType_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,11 +31,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_vehicleJourneyTimes_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_vehicleJourneyTimes_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_support.xsd
index fb9e101a3..32304c569 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_support.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_vehicleJourney_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_servicePattern_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_stopAssignment_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -32,7 +32,7 @@
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/2.0/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support-v1.1.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/2.0/xsd/netex_framework/netex_genericFramework/netex_pointAndLinkSequence_support.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd
index 778eba89b..f22e1b2b2 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_vehicleJourney_version">
-	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_route_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_line_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_vehicleStopping_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_trainElement_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_journey_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourneyFrequency_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourneyTimes_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_passingTimes_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_coupledJourney_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleJourneyFrequency_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_route_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_line_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_vehicleStopping_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_trainElement_support.xsd"/>
+	<xsd:include schemaLocation="netex_journey_version.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourneyFrequency_version.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourneyTimes_version.xsd"/>
+	<xsd:include schemaLocation="netex_passingTimes_version.xsd"/>
+	<xsd:include schemaLocation="netex_coupledJourney_version.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleJourneyFrequency_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -43,11 +43,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_vehicleJourney_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_vehicleJourney_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleService_support.xsd b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleService_support.xsd
index 9d6813edc..19b63ddaf 100644
--- a/xsd/netex_part_2/part2_journeyTimes/netex_vehicleService_support.xsd
+++ b/xsd/netex_part_2/part2_journeyTimes/netex_vehicleService_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_vehicleService_support">
-	<xsd:include schemaLocation="netex_coupledJourney_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_coupledJourney_support.xsd"/>
 	<!-- ====BLOCK======================================================== -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_vehicleService_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_journeyTimes}netex_vehicleService_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_vehicleService/netex_all_objects_part2_vehicleService.xsd b/xsd/netex_part_2/part2_vehicleService/netex_all_objects_part2_vehicleService.xsd
index 8c8f7566d..fd358704a 100644
--- a/xsd/netex_part_2/part2_vehicleService/netex_all_objects_part2_vehicleService.xsd
+++ b/xsd/netex_part_2/part2_vehicleService/netex_all_objects_part2_vehicleService.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_part2_vehicleService">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="netex_duty_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_duty_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_vehicleService_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_duty_version.xsd"/>
+	<xsd:include schemaLocation="netex_duty_support.xsd"/>
+	<xsd:include schemaLocation="netex_vehicleService_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -25,14 +25,14 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_vehicleService}netex_all_objects-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_vehicleService}netex_all_objects.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _all_devices-v1.0.xsd</Requires>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _all_traffic_events-v1.0.xsd</Requires>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _all_quantiseds-v1.0.xsd</Requires>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _network-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _all_devices.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _all_traffic_events.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _all_quantiseds.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ for / for _network.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_vehicleService/netex_duty_support.xsd b/xsd/netex_part_2/part2_vehicleService/netex_duty_support.xsd
index 0a5e61e89..edefd4c99 100644
--- a/xsd/netex_part_2/part2_vehicleService/netex_duty_support.xsd
+++ b/xsd/netex_part_2/part2_vehicleService/netex_duty_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_duty_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_relationship-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_relationship.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,11 +27,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_vehicleService}netex_duty_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_vehicleService}netex_duty_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_vehicleService/netex_duty_version.xsd b/xsd/netex_part_2/part2_vehicleService/netex_duty_version.xsd
index 39e14c5d2..ad2746894 100644
--- a/xsd/netex_part_2/part2_vehicleService/netex_duty_version.xsd
+++ b/xsd/netex_part_2/part2_vehicleService/netex_duty_version.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_duty_version">
-	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_timingPattern_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part2_frames/netex_timetableFrame_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part2_journeyTimes/netex_vehicleService_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_duty_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_timingPattern_support.xsd"/>
+	<xsd:include schemaLocation="../part2_frames/netex_timetableFrame_support.xsd"/>
+	<xsd:include schemaLocation="../part2_journeyTimes/netex_vehicleService_support.xsd"/>
+	<xsd:include schemaLocation="netex_duty_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -32,11 +32,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_vehicleService}netex_duty_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_vehicleService}netex_duty_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_2/part2_vehicleService/netex_vehicleService_version.xsd b/xsd/netex_part_2/part2_vehicleService/netex_vehicleService_version.xsd
index 53cfe43e0..a21bb2991 100644
--- a/xsd/netex_part_2/part2_vehicleService/netex_vehicleService_version.xsd
+++ b/xsd/netex_part_2/part2_vehicleService/netex_vehicleService_version.xsd
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_vehicleService_version">
-	<xsd:include schemaLocation="../part2_journeyTimes/netex_vehicleService_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_line_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part2_journeyTimes/netex_journeyDesignator_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_vehicleType_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part2_journeyTimes/netex_coupledJourney_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../part2_journeyTimes/netex_vehicleService_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_line_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_vehicleAndCrewPoint_support.xsd"/>
+	<xsd:include schemaLocation="../part2_journeyTimes/netex_journeyDesignator_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd"/>
+	<xsd:include schemaLocation="../part2_journeyTimes/netex_coupledJourney_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -35,11 +35,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_vehicleService}netex_vehicleService_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_2/part2_vehicleService}netex_vehicleService_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_PiQuery/netex_all_objects_part3_piQuery.xsd b/xsd/netex_part_3/part3_PiQuery/netex_all_objects_part3_piQuery.xsd
index 742922035..cb600ed51 100644
--- a/xsd/netex_part_3/part3_PiQuery/netex_all_objects_part3_piQuery.xsd
+++ b/xsd/netex_part_3/part3_PiQuery/netex_all_objects_part3_piQuery.xsd
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_part3_piQuery">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="netex_piRequest_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_piRequest_support.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_part_3/part3_PiQuery/netex_piQuery_support.xsd b/xsd/netex_part_3/part3_PiQuery/netex_piQuery_support.xsd
index c06c0620b..ed40e91f1 100644
--- a/xsd/netex_part_3/part3_PiQuery/netex_piQuery_support.xsd
+++ b/xsd/netex_part_3/part3_PiQuery/netex_piQuery_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_piQuery_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_support.xsd"/>
 	<!-- =============================================================== -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_piQuery_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_piQuery_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_PiQuery/netex_piRequest_support.xsd b/xsd/netex_part_3/part3_PiQuery/netex_piRequest_support.xsd
index 17d2ea011..240a6e550 100644
--- a/xsd/netex_part_3/part3_PiQuery/netex_piRequest_support.xsd
+++ b/xsd/netex_part_3/part3_PiQuery/netex_piRequest_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_piRequest_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_support.xsd"/>
 	<!-- =============================================================== -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -30,11 +30,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_piRequest_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_piRequest_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_support.xsd b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_support.xsd
index 45cf43422..4819f68eb 100644
--- a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_support.xsd
@@ -2,8 +2,8 @@
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_accessRightParameter_support">
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_farePrice_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_assignment_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -29,11 +29,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_accessRightParameter_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_accessRightParameter_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd
index 8343a9a7f..bb748b213 100644
--- a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_accessRightParameter_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_serviceCalendar_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_dayType_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_site_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_line_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_servicePattern_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_route_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_vehicleJourney_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_fareZone_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_validableElement_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareStructureElement_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_qualityStructureFactor_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_timeStructureFactor_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_distanceMatrixElement_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParametersAll_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_serviceJourney_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareProduct_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_salesDistribution_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_salesOfferPackage_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_travelDocument_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_serviceCalendar_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_dayType_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_pointOfInterest_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_line_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_route_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_vehicleJourney_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_fareZone_support.xsd"/>
+	<xsd:include schemaLocation="netex_validableElement_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructureElement_support.xsd"/>
+	<xsd:include schemaLocation="netex_qualityStructureFactor_support.xsd"/>
+	<xsd:include schemaLocation="netex_timeStructureFactor_support.xsd"/>
+	<xsd:include schemaLocation="netex_distanceMatrixElement_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParametersAll_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_serviceJourney_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareProduct_support.xsd"/>
+	<xsd:include schemaLocation="netex_salesDistribution_support.xsd"/>
+	<xsd:include schemaLocation="netex_salesOfferPackage_support.xsd"/>
+	<xsd:include schemaLocation="netex_travelDocument_support.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_distanceMatrixElement_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_submode_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_distanceMatrixElement_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_submode_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_version.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_accessRightParameter_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameter_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_accessRightParameter_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -67,11 +67,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_accessRightParameter_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_accessRightParameter_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares.xsd b/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares.xsd
index 4eaa5636a..d271069b6 100644
--- a/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares.xsd
@@ -2,8 +2,8 @@
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_all_objects_part3_fares">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="netex_all_objects_part3_fares_FP-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_all_objects_part3_fares_FS-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_all_objects_part3_fares_AR-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_all_objects_part3_fares_SD-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_all_objects_part3_fares_FP.xsd"/>
+	<xsd:include schemaLocation="netex_all_objects_part3_fares_FS.xsd"/>
+	<xsd:include schemaLocation="netex_all_objects_part3_fares_AR.xsd"/>
+	<xsd:include schemaLocation="netex_all_objects_part3_fares_SD.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_AR.xsd b/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_AR.xsd
index 4cc703937..3cd1f7343 100644
--- a/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_AR.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_AR.xsd
@@ -2,27 +2,27 @@
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_all_objects_part3_fares_AR">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="netex_accessRightParameter_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_accessRightParameter_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_fareConditionSummary_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareConditionSummary_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareProduct_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareProduct_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameter_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameter_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterAfterSales_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterAfterSales_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterBooking_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterBooking_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterCharging_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterCharging_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterEligibility_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterEligibility_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterEntitlement_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterEntitlement_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterLuggage_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterLuggage_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterTravel_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterTravel_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParametersAll_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_accessRightParameter_support.xsd"/>
+	<xsd:include schemaLocation="netex_accessRightParameter_version.xsd"/>
+	<xsd:include schemaLocation="netex_fareConditionSummary_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareConditionSummary_version.xsd"/>
+	<xsd:include schemaLocation="netex_fareProduct_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareProduct_version.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_version.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterAfterSales_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterAfterSales_version.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterBooking_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterBooking_version.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterCharging_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterCharging_version.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterEligibility_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterEligibility_version.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterEntitlement_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterEntitlement_version.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterLuggage_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterLuggage_version.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterTravel_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterTravel_version.xsd"/>
+	<xsd:include schemaLocation="netex_usageParametersAll_support.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_FP.xsd b/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_FP.xsd
index 06046306e..905ea00b5 100644
--- a/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_FP.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_FP.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_all_objects_part3_fares_FP">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="netex_calculationParameters_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_calculationParameters_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_farePrice_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_farePrice_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_fareTable_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareTable_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_calculationParameters_support.xsd"/>
+	<xsd:include schemaLocation="netex_calculationParameters_version.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_support.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_version.xsd"/>
+	<xsd:include schemaLocation="netex_fareTable_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareTable_version.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_FS.xsd b/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_FS.xsd
index 20a1c1715..1bc5f63ba 100644
--- a/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_FS.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_FS.xsd
@@ -2,20 +2,20 @@
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_all_objects_part3_fares_FS">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="netex_distanceMatrixElement_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_distanceMatrixElement_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_fareSeries_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareSeries_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareStructure_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareStructure_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareStructureElement_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareStructureElement_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_geographicStructureFactor_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_geographicStructureFactor_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_qualityStructureFactor_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_qualityStructureFactor_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_timeStructureFactor_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_timeStructureFactor_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_validableElement_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_validableElement_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_distanceMatrixElement_support.xsd"/>
+	<xsd:include schemaLocation="netex_distanceMatrixElement_version.xsd"/>
+	<xsd:include schemaLocation="netex_fareSeries_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareSeries_version.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructure_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructure_version.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructureElement_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructureElement_version.xsd"/>
+	<xsd:include schemaLocation="netex_geographicStructureFactor_support.xsd"/>
+	<xsd:include schemaLocation="netex_geographicStructureFactor_version.xsd"/>
+	<xsd:include schemaLocation="netex_qualityStructureFactor_support.xsd"/>
+	<xsd:include schemaLocation="netex_qualityStructureFactor_version.xsd"/>
+	<xsd:include schemaLocation="netex_timeStructureFactor_version.xsd"/>
+	<xsd:include schemaLocation="netex_timeStructureFactor_support.xsd"/>
+	<xsd:include schemaLocation="netex_validableElement_support.xsd"/>
+	<xsd:include schemaLocation="netex_validableElement_version.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_SD.xsd b/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_SD.xsd
index 0237f8360..be6010850 100644
--- a/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_SD.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_all_objects_part3_fares_SD.xsd
@@ -2,10 +2,10 @@
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_all_objects_part3_fares_SD">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="netex_salesDistribution_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_salesDistribution_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_salesOfferPackage_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_salesOfferPackage_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_travelDocument_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_travelDocument_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_salesDistribution_support.xsd"/>
+	<xsd:include schemaLocation="netex_salesDistribution_version.xsd"/>
+	<xsd:include schemaLocation="netex_salesOfferPackage_support.xsd"/>
+	<xsd:include schemaLocation="netex_salesOfferPackage_version.xsd"/>
+	<xsd:include schemaLocation="netex_travelDocument_support.xsd"/>
+	<xsd:include schemaLocation="netex_travelDocument_version.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_part_3/part3_fares/netex_calculationParameters_support.xsd b/xsd/netex_part_3/part3_fares/netex_calculationParameters_support.xsd
index d6fa15777..0963c6dc0 100644
--- a/xsd/netex_part_3/part3_fares/netex_calculationParameters_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_calculationParameters_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_calculationParameters_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_dayType_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_relationship_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_dayType_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_relationship_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_calculationParameters_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_calculationParameters_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_calculationParameters_version.xsd b/xsd/netex_part_3/part3_fares/netex_calculationParameters_version.xsd
index 5b2cd0c26..070a21f6d 100644
--- a/xsd/netex_part_3/part3_fares/netex_calculationParameters_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_calculationParameters_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_calculationParameters_version">
-	<xsd:include schemaLocation="netex_calculationParameters_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_dayType_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_calculationParameters_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_dayType_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,11 +29,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_calculationParameters_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_calculationParameters_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_support.xsd b/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_support.xsd
index 868e77a72..622f4a852 100644
--- a/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_distanceMatrixElement_support">
-	<xsd:include schemaLocation="netex_farePrice_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_linkByValue_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_linkByValue_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,11 +29,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_distanceMatrixElement_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_distanceMatrixElement_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version.xsd b/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version.xsd
index 453f28891..779cf8b3d 100644
--- a/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.10" id="netex_distanceMatrixElement_version">
-	<xsd:include schemaLocation="netex_fareSeries_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareTable_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_geographicStructureFactor_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareSeries_version.xsd"/>
+	<xsd:include schemaLocation="netex_fareTable_version.xsd"/>
+	<xsd:include schemaLocation="netex_geographicStructureFactor_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -32,11 +32,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_distanceMatrixElement_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_distanceMatrixElement_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_fareConditionSummary_support.xsd b/xsd/netex_part_3/part3_fares/netex_fareConditionSummary_support.xsd
index 26a8df05b..90b6c3819 100644
--- a/xsd/netex_part_3/part3_fares/netex_fareConditionSummary_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_fareConditionSummary_support.xsd
@@ -27,11 +27,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareConditionSummary_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareConditionSummary_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_fareConditionSummary_version.xsd b/xsd/netex_part_3/part3_fares/netex_fareConditionSummary_version.xsd
index 0637d104f..e58ea7ba2 100644
--- a/xsd/netex_part_3/part3_fares/netex_fareConditionSummary_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_fareConditionSummary_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_fareConditionSummary_version">
-	<xsd:include schemaLocation="netex_fareConditionSummary_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareStructureElement_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareConditionSummary_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructureElement_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,11 +29,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareConditionSummary_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareConditionSummary_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_farePrice_support.xsd b/xsd/netex_part_3/part3_fares/netex_farePrice_support.xsd
index 3d61aaade..4ddba6b39 100644
--- a/xsd/netex_part_3/part3_fares/netex_farePrice_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_farePrice_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_farePrice_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_grouping_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_grouping_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_farePrice_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_farePrice_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_farePrice_version.xsd b/xsd/netex_part_3/part3_fares/netex_farePrice_version.xsd
index 565fd1265..a715cbf2d 100644
--- a/xsd/netex_part_3/part3_fares/netex_farePrice_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_farePrice_version.xsd
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_farePrice_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_units-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareTable_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_farePrice_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_units.xsd"/>
+	<xsd:include schemaLocation="netex_fareTable_support.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_support.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_alternativeName_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_noticeAssignment_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_calculationParameters_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_alternativeName_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_noticeAssignment_version.xsd"/>
+	<xsd:include schemaLocation="netex_calculationParameters_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -37,11 +37,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_farePrice_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_farePrice_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
 					<Copyright>CEN, Crown Copyright 2009-2018</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_fareProduct_support.xsd b/xsd/netex_part_3/part3_fares/netex_fareProduct_support.xsd
index 053e27a1c..dd7514150 100644
--- a/xsd/netex_part_3/part3_fares/netex_fareProduct_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_fareProduct_support.xsd
@@ -2,7 +2,7 @@
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_fareProduct_support">
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_fareStructure_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructure_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareProduct_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareProduct_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd b/xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd
index f3e32121d..4614c803d 100644
--- a/xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_fareProduct_version.xsd
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_fareProduct_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_units-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareProduct_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_otherOrganisation_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_units.xsd"/>
+	<xsd:include schemaLocation="netex_fareProduct_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_otherOrganisation_support.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_validableElement_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareConditionSummary_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_validableElement_version.xsd"/>
+	<xsd:include schemaLocation="netex_fareConditionSummary_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -40,11 +40,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareProduct_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareProduct_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
 					<Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_fareSeries_support.xsd b/xsd/netex_part_3/part3_fares/netex_fareSeries_support.xsd
index fe36f7520..7c8e631a6 100644
--- a/xsd/netex_part_3/part3_fares/netex_fareSeries_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_fareSeries_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_fareSeries_support">
-	<xsd:include schemaLocation="netex_farePrice_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_support.xsd"/>
 	<!-- ======================================================== -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_seriesConstraint_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_seriesConstraint_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_fareSeries_version.xsd b/xsd/netex_part_3/part3_fares/netex_fareSeries_version.xsd
index 9ad9ec58e..f0af82851 100644
--- a/xsd/netex_part_3/part3_fares/netex_fareSeries_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_fareSeries_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_fareStructure_version">
-	<xsd:include schemaLocation="netex_fareSeries_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_fareZone_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_farePrice_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_fareSeries_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_fareZone_version.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_version.xsd"/>
 	<!-- ======================================================== -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -30,11 +30,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_seriesConstraint_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_seriesConstraint_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_fareStructureElement_support.xsd b/xsd/netex_part_3/part3_fares/netex_fareStructureElement_support.xsd
index d07640632..5aa7c1367 100644
--- a/xsd/netex_part_3/part3_fares/netex_fareStructureElement_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_fareStructureElement_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_fareStuctureElement_support">
-	<xsd:include schemaLocation="netex_fareStructure_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructure_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,11 +27,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareStructureElement_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareStructureElement_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_fareStructureElement_version.xsd b/xsd/netex_part_3/part3_fares/netex_fareStructureElement_version.xsd
index 7b05e3c13..3f424d40d 100644
--- a/xsd/netex_part_3/part3_fares/netex_fareStructureElement_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_fareStructureElement_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_fareStructureElement_version">
-	<xsd:include schemaLocation="netex_fareStructureElement_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_validableElement_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructureElement_support.xsd"/>
+	<xsd:include schemaLocation="netex_validableElement_version.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_timeStructureFactor_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_distanceMatrixElement_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_timeStructureFactor_version.xsd"/>
+	<xsd:include schemaLocation="netex_distanceMatrixElement_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -35,11 +35,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareStructureElement_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareStructureElement_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_fareStructure_support.xsd b/xsd/netex_part_3/part3_fares/netex_fareStructure_support.xsd
index d844a70c5..9d51388df 100644
--- a/xsd/netex_part_3/part3_fares/netex_fareStructure_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_fareStructure_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_fareStructure_support">
-	<xsd:include schemaLocation="netex_farePrice_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_support.xsd"/>
 	<!-- =============================================================-->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareStructure_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareStructure_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_fareStructure_version.xsd b/xsd/netex_part_3/part3_fares/netex_fareStructure_version.xsd
index 0908afae9..f41d5e74a 100644
--- a/xsd/netex_part_3/part3_fares/netex_fareStructure_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_fareStructure_version.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_fareStructure_version">
-	<xsd:include schemaLocation="netex_fareStructure_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_farePrice_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructure_support.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareStructure_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareStructure_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_fareTable_support.xsd b/xsd/netex_part_3/part3_fares/netex_fareTable_support.xsd
index 955be37dd..0bfc03b84 100644
--- a/xsd/netex_part_3/part3_fares/netex_fareTable_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_fareTable_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_fareTable_support">
-	<xsd:include schemaLocation="netex_farePrice_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareProduct_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareProduct_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareTable_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareTable_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_fareTable_version.xsd b/xsd/netex_part_3/part3_fares/netex_fareTable_version.xsd
index 2104b6b48..9d124de93 100644
--- a/xsd/netex_part_3/part3_fares/netex_fareTable_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_fareTable_version.xsd
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_fareTable_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_submode_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_line_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_site_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_fareZone_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_serviceJourney_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_vehicleJourney_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareTable_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareSeries_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_travelDocument_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_salesDistribution_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareStructureElement_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_distanceMatrixElement_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_salesOfferPackage_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_fareSeries_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParametersAll_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_transportOrganisation_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_submode_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_networkDescription/netex_line_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_site_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_fareZone_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_serviceJourney_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_vehicleJourney_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareTable_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareSeries_support.xsd"/>
+	<xsd:include schemaLocation="netex_travelDocument_support.xsd"/>
+	<xsd:include schemaLocation="netex_salesDistribution_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructureElement_support.xsd"/>
+	<xsd:include schemaLocation="netex_distanceMatrixElement_support.xsd"/>
+	<xsd:include schemaLocation="netex_salesOfferPackage_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareSeries_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParametersAll_support.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_farePrice_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -53,11 +53,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareTable_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_fareTable_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_support.xsd b/xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_support.xsd
index e9162103c..98de090ac 100644
--- a/xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_geographicStructureFactor_support">
-	<xsd:include schemaLocation="netex_fareStructure_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructure_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,11 +27,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_geographicalStructureFactor_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_geographicalStructureFactor_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_version.xsd b/xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_version.xsd
index f2f306d0e..892a10cac 100644
--- a/xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_geographicStructureFactor_version.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_geographicStructureFactor_version">
-	<xsd:include schemaLocation="netex_geographicStructureFactor_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_distanceMatrixElement_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareStructureElement_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_geographicStructureFactor_support.xsd"/>
+	<xsd:include schemaLocation="netex_distanceMatrixElement_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructureElement_support.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_farePrice_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_fareStructure_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_version.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructure_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -32,11 +32,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_geographicalStructureFactor_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_geographicalStructureFactor_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_support.xsd b/xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_support.xsd
index ddd6e0f61..672cf195b 100644
--- a/xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_qualityStructureFactor_support">
-	<xsd:include schemaLocation="netex_fareStructure_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructure_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,11 +27,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_qualityStructureFactor_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_qualityStructureFactor_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_version.xsd b/xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_version.xsd
index da4905550..dca09b15b 100644
--- a/xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_qualityStructureFactor_version.xsd
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_qualityStructureFactor_version">
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_timeDemandType_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_servicePattern_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_qualityStructureFactor_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_distanceMatrixElement_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareStructure_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_timeDemandType_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd"/>
+	<xsd:include schemaLocation="netex_qualityStructureFactor_support.xsd"/>
+	<xsd:include schemaLocation="netex_distanceMatrixElement_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructure_support.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_fareStructure_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_farePrice_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructure_version.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -34,11 +34,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_qualityStructureFactor_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_qualityStructureFactor_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_salesDistribution_support.xsd b/xsd/netex_part_3/part3_fares/netex_salesDistribution_support.xsd
index 5922db8c6..12e29a69b 100644
--- a/xsd/netex_part_3/part3_fares/netex_salesDistribution_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_salesDistribution_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_salesDistribution_support">
-	<xsd:include schemaLocation="netex_farePrice_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,11 +27,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_salesDistribution_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_salesDistribution_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_salesDistribution_version.xsd b/xsd/netex_part_3/part3_fares/netex_salesDistribution_version.xsd
index b69c6b3e6..ba69241b8 100644
--- a/xsd/netex_part_3/part3_fares/netex_salesDistribution_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_salesDistribution_version.xsd
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_salesDistribution_version">
-	<xsd:include schemaLocation="netex_salesDistribution_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_travelDocument_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_typeOfValue_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_country_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_salesDistribution_support.xsd"/>
+	<xsd:include schemaLocation="netex_travelDocument_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_typeOfValue_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_country_support.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_farePrice_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -34,11 +34,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_salesDistribution_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_salesDistribution_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_salesOfferPackage_support.xsd b/xsd/netex_part_3/part3_fares/netex_salesOfferPackage_support.xsd
index 8ac26a273..917ebbb8f 100644
--- a/xsd/netex_part_3/part3_fares/netex_salesOfferPackage_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_salesOfferPackage_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_salesOfferPackage_support">
-	<xsd:include schemaLocation="netex_fareProduct_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_notice_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareProduct_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_notice_support.xsd"/>
 	<!-- =============================================================== -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -33,11 +33,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_salesOfferPackage_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_salesOfferPackage_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_salesOfferPackage_version.xsd b/xsd/netex_part_3/part3_fares/netex_salesOfferPackage_version.xsd
index 03858093f..a643d2b9c 100644
--- a/xsd/netex_part_3/part3_fares/netex_salesOfferPackage_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_salesOfferPackage_version.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_salesOfferPackage_version">
-	<xsd:include schemaLocation="netex_salesOfferPackage_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_topographicPlace_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_salesOfferPackage_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_topographicPlace_support.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_salesDistribution_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareProduct_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_salesDistribution_version.xsd"/>
+	<xsd:include schemaLocation="netex_fareProduct_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -36,11 +36,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_salesOfferPackage_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_salesOfferPackage_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_salesPackage_support.xsd b/xsd/netex_part_3/part3_fares/netex_salesPackage_support.xsd
index 6cde9756d..e57f21a97 100644
--- a/xsd/netex_part_3/part3_fares/netex_salesPackage_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_salesPackage_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_salesOfferPackage_support">
-	<xsd:include schemaLocation="netex_fareProduct_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_notice_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareProduct_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_notice_support.xsd"/>
 	<!-- =============================================================== -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -32,11 +32,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_SalesPackage_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_SalesPackage_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_salesPackage_version.xsd b/xsd/netex_part_3/part3_fares/netex_salesPackage_version.xsd
index fc2deb705..248330a5b 100644
--- a/xsd/netex_part_3/part3_fares/netex_salesPackage_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_salesPackage_version.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_salesOfferPackage_version">
-	<xsd:include schemaLocation="netex_salesPackage_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_topographicPlace_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_salesPackage_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_topographicPlace_support.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_salesDistribution_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareProduct_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_salesDistribution_version.xsd"/>
+	<xsd:include schemaLocation="netex_fareProduct_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -36,11 +36,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_SalesPackage_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_SalesPackage_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_timeStructureFactor_support.xsd b/xsd/netex_part_3/part3_fares/netex_timeStructureFactor_support.xsd
index 7e00fe439..5bbfc0397 100644
--- a/xsd/netex_part_3/part3_fares/netex_timeStructureFactor_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_timeStructureFactor_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_timeStuctureFactor_support">
-	<xsd:include schemaLocation="netex_fareStructure_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructure_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -27,11 +27,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_timeStructureFactor_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_timeStructureFactor_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_timeStructureFactor_version.xsd b/xsd/netex_part_3/part3_fares/netex_timeStructureFactor_version.xsd
index bb75a21fe..27f8133b4 100644
--- a/xsd/netex_part_3/part3_fares/netex_timeStructureFactor_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_timeStructureFactor_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_timeStuctureFactor_version">
-	<xsd:include schemaLocation="netex_timeStructureFactor_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareStructure_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareStructureElement_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_qualityStructureFactor_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_timeStructureFactor_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructure_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructureElement_support.xsd"/>
+	<xsd:include schemaLocation="netex_qualityStructureFactor_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -30,11 +30,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_timeStructureFactor_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_timeStructureFactor_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_travelDocument_support.xsd b/xsd/netex_part_3/part3_fares/netex_travelDocument_support.xsd
index a6b4718b1..5f7d35f25 100644
--- a/xsd/netex_part_3/part3_fares/netex_travelDocument_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_travelDocument_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_travelDocument_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_securityList_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_fareProduct_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_securityList_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareProduct_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -30,11 +30,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_travelDocument_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_travelDocument_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_travelDocument_version.xsd b/xsd/netex_part_3/part3_fares/netex_travelDocument_version.xsd
index 2728bcea0..46d251061 100644
--- a/xsd/netex_part_3/part3_fares/netex_travelDocument_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_travelDocument_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_travelDocument_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_alternativeName_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_travelDocument_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_securityList_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_alternativeName_version.xsd"/>
+	<xsd:include schemaLocation="netex_travelDocument_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_securityList_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -34,11 +34,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_travelDocument_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_travelDocument_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_support.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_support.xsd
index 0187bd45a..9fcf2281f 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_support.xsd
@@ -2,7 +2,7 @@
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_usageParameterAfterSales_support">
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_usageParameter_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterAfterSales_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterAfterSales_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd
index b91121641..d07f8294c 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameterAfterSales_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_usageParameterAfterSales_version">
-	<xsd:include schemaLocation="netex_usageParameterAfterSales_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_timeStructureFactor_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameter_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterAfterSales_support.xsd"/>
+	<xsd:include schemaLocation="netex_timeStructureFactor_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_version.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,11 +31,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterAfterSales_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterAfterSales_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterBooking_support.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterBooking_support.xsd
index 5121dd405..06fec3bd7 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameterBooking_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameterBooking_support.xsd
@@ -2,7 +2,7 @@
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_usageParameterBooking_support">
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_usageParameter_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterBooking_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterBooking_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterBooking_version.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterBooking_version.xsd
index adca04640..b2b4e6bf9 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameterBooking_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameterBooking_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_usageParameterBooking_version">
-	<xsd:include schemaLocation="netex_usageParameterBooking_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_timeStructureFactor_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameter_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterBooking_support.xsd"/>
+	<xsd:include schemaLocation="netex_timeStructureFactor_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_travelRights_version.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,11 +31,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterBooking_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterBooking_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterCharging_support.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterCharging_support.xsd
index 80e3c1d2a..e583f2146 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameterCharging_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameterCharging_support.xsd
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterCharging_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterCharging_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
@@ -59,7 +59,7 @@ Rail transport, Roads and Road transport
 		</xsd:appinfo>
 		<xsd:documentation>NeTEX: Charging USAGE PARAMETER identifier types.</xsd:documentation>
 	</xsd:annotation>
-	<xsd:include schemaLocation="netex_usageParameter_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_support.xsd"/>
 	<!-- === CHARGING POLICY PARAMETER============================================== -->
 	<xsd:simpleType name="ChargingPolicyIdType">
 		<xsd:annotation>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterCharging_version.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterCharging_version.xsd
index 130657a10..7d50e45f9 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameterCharging_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameterCharging_version.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_usageParameterCharging_version">
-	<xsd:include schemaLocation="netex_usageParameterCharging_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameter_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterCharging_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,7 +28,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterCharging_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterCharging_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_support.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_support.xsd
index f2c0cf326..31285f8ca 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_support.xsd
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterEligibility_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterEligibility_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
@@ -59,7 +59,7 @@ Rail transport, Roads and Road transport
 		</xsd:appinfo>
 		<xsd:documentation>NeTEX: Eligibility USAGE PARAMETER identifier types.</xsd:documentation>
 	</xsd:annotation>
-	<xsd:include schemaLocation="netex_usageParameter_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_support.xsd"/>
 	<xsd:group name="ProfileRefsGroup">
 		<xsd:annotation>
 			<xsd:documentation>Elements for Profile types.</xsd:documentation>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_version.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_version.xsd
index 4d29fb0d0..0d269cc07 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameterEligibility_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_usageParameterEligibility_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_topographicPlace_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterEligibility_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameter_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_topographicPlace_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterEligibility_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -30,7 +30,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterEligibility_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterEligibility_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_support.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_support.xsd
index b059251f4..ed94cbe6a 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_support.xsd
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterEntitlement_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterEntitlement_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
@@ -59,7 +59,7 @@ Rail transport, Roads and Road transport
 		</xsd:appinfo>
 		<xsd:documentation>NeTEX: Entitlement USAGE PARAMETER identifier types.</xsd:documentation>
 	</xsd:annotation>
-	<xsd:include schemaLocation="netex_usageParameter_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_support.xsd"/>
 	<!-- === ENTTITLEMENT REQUIRED PARAMETER======================================= -->
 	<xsd:complexType name="entitlementRequiredRefs_RelStructure">
 		<xsd:annotation>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_version.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_version.xsd
index 002c1ea91..ddcbca437 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameterEntitlement_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_usageParameterEntitlement_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_topographicPlace_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterEntitlement_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameter_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_topographicPlace_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterEntitlement_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -30,7 +30,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterBooking_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterBooking_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_support.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_support.xsd
index 1980a16ab..889a891d6 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_support.xsd
@@ -27,7 +27,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterLuggage_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterLuggage_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
@@ -59,7 +59,7 @@ Rail transport, Roads and Road transport
 		</xsd:appinfo>
 		<xsd:documentation>NeTEX: Luggage USAGE PARAMETER identifier types.</xsd:documentation>
 	</xsd:annotation>
-	<xsd:include schemaLocation="netex_usageParameter_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_support.xsd"/>
 	<xsd:group name="UsageParameterLuggageRefGroup">
 		<xsd:annotation>
 			<xsd:documentation>USAGE PARAMETER Elements forCELL.Group.</xsd:documentation>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_version.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_version.xsd
index c8d15e6e0..513838a3b 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameterLuggage_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_usageParameterLuggage_version">
-	<xsd:include schemaLocation="netex_usageParameterLuggage_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameter_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterLuggage_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,7 +29,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterLuggage_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterLuggage_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_support.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_support.xsd
index 52cf2e5c5..cf26706d9 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_usageParameterTravel_support">
-	<xsd:include schemaLocation="netex_usageParameter_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,7 +31,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterTravel_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameterTravel_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version.xsd
index 0da484cf9..54bf388dc 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameterTravel_version.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_usageParameterTravel_version">
-	<xsd:include schemaLocation="netex_usageParameterTravel_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_timeStructureFactor_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterTravel_support.xsd"/>
+	<xsd:include schemaLocation="netex_timeStructureFactor_support.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameter_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_mode_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameter_support.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameter_support.xsd
index e31b6f6a7..060cb5e04 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameter_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameter_support.xsd
@@ -26,11 +26,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameter_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameter_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
@@ -58,7 +58,7 @@ Rail transport, Roads and Road transport
 		</xsd:appinfo>
 		<xsd:documentation>NeTEX: USAGE PARAMETER identifier types.</xsd:documentation>
 	</xsd:annotation>
-	<xsd:include schemaLocation="netex_farePrice_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_support.xsd"/>
 	<!-- === USAGE PARAMETER====================================================== -->
 	<xsd:complexType name="usageParameterRefs_RelStructure">
 		<xsd:annotation>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParameter_version.xsd b/xsd/netex_part_3/part3_fares/netex_usageParameter_version.xsd
index 097021a71..99c39f081 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParameter_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParameter_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_usageParameter_version">
-	<xsd:include schemaLocation="netex_usageParameter_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameter_support.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_units-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_farePrice_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_utility/netex_units.xsd"/>
+	<xsd:include schemaLocation="netex_farePrice_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,11 +31,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameter_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_usageParameter_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_usageParametersAll_support.xsd b/xsd/netex_part_3/part3_fares/netex_usageParametersAll_support.xsd
index 343c91782..54632e3ec 100644
--- a/xsd/netex_part_3/part3_fares/netex_usageParametersAll_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_usageParametersAll_support.xsd
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_usageParametersAll_support">
-	<xsd:include schemaLocation="netex_usageParameterBooking_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterAfterSales_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterCharging_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterEligibility_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterEntitlement_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterLuggage_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_usageParameterTravel_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterBooking_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterAfterSales_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterCharging_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterEligibility_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterEntitlement_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterLuggage_support.xsd"/>
+	<xsd:include schemaLocation="netex_usageParameterTravel_support.xsd"/>
 	<!-- ======================================================================= -->
 </xsd:schema>
diff --git a/xsd/netex_part_3/part3_fares/netex_validableElement_support.xsd b/xsd/netex_part_3/part3_fares/netex_validableElement_support.xsd
index a0f5423e5..44442caaa 100644
--- a/xsd/netex_part_3/part3_fares/netex_validableElement_support.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_validableElement_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_validableElement_support">
-	<xsd:include schemaLocation="netex_fareStructure_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructure_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_validableElement_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_validableElement_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_fares/netex_validableElement_version.xsd b/xsd/netex_part_3/part3_fares/netex_validableElement_version.xsd
index d7c959f13..85bf483c0 100644
--- a/xsd/netex_part_3/part3_fares/netex_validableElement_version.xsd
+++ b/xsd/netex_part_3/part3_fares/netex_validableElement_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_validableElement_version">
-	<xsd:include schemaLocation="netex_validableElement_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_fareStructure_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_accessRightParameter_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_validableElement_support.xsd"/>
+	<xsd:include schemaLocation="netex_fareStructure_version.xsd"/>
+	<xsd:include schemaLocation="netex_accessRightParameter_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -30,11 +30,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_validableElement_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_fares}netex_validableElement_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_frames/netex_all_frames_part3.xsd b/xsd/netex_part_3/part3_frames/netex_all_frames_part3.xsd
index 60fc417a1..26456e392 100644
--- a/xsd/netex_part_3/part3_frames/netex_all_frames_part3.xsd
+++ b/xsd/netex_part_3/part3_frames/netex_all_frames_part3.xsd
@@ -3,7 +3,7 @@
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_frames_part1">
 	<!-- ===Dependencies ======================================= -->
 	<!-- =====Frames================================================= -->
-	<xsd:include schemaLocation="netex_fareFrame_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_salesTransactionFrame_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_fareFrame_version.xsd"/>
+	<xsd:include schemaLocation="netex_salesTransactionFrame_version.xsd"/>
 	<!-- ============================================================ -->
 </xsd:schema>
diff --git a/xsd/netex_part_3/part3_frames/netex_fareFrame_version.xsd b/xsd/netex_part_3/part3_frames/netex_fareFrame_version.xsd
index 2925e0a37..2cab47525 100644
--- a/xsd/netex_part_3/part3_frames/netex_fareFrame_version.xsd
+++ b/xsd/netex_part_3/part3_frames/netex_fareFrame_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_fareFrame_version">
-	<xsd:include schemaLocation="../part3_fares/netex_all_objects_part3_fares-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part3_monitoring/netex_all_objects_part3_monitoring-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part3_parkingTariff/netex_all_objects_part3_parking-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_fareZone_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_commonFrame_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_all_objects_part3_fares.xsd"/>
+	<xsd:include schemaLocation="../part3_monitoring/netex_all_objects_part3_monitoring.xsd"/>
+	<xsd:include schemaLocation="../part3_parkingTariff/netex_all_objects_part3_parking.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_tacticalPlanning/netex_fareZone_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_commonFrame_version.xsd"/>
 	<!-- ====  =========================================-->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -30,11 +30,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_frames}netex_fareFrame_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_frames}netex_fareFrame_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>CEN TC278 SG6 and Department for Transport, Great Minster House, 76 Marsham Street, London SW1P 4DR</Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_xxxxx-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_xxxxx.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_frames/netex_salesTransactionFrame_version.xsd b/xsd/netex_part_3/part3_frames/netex_salesTransactionFrame_version.xsd
index 8c60d302e..e2e0e8eeb 100644
--- a/xsd/netex_part_3/part3_frames/netex_salesTransactionFrame_version.xsd
+++ b/xsd/netex_part_3/part3_frames/netex_salesTransactionFrame_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_salesTransactionFrame_version">
-	<xsd:include schemaLocation="../part3_fares/netex_all_objects_part3_fares-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part3_salesTransactions/netex_all_objects_part3_salesTransactions-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_commonFrame_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_all_objects_part3_fares.xsd"/>
+	<xsd:include schemaLocation="../part3_salesTransactions/netex_all_objects_part3_salesTransactions.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_frames/netex_commonFrame_version.xsd"/>
 	<!-- ====  =========================================-->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -37,11 +37,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_frames}netex_salesTransactionFrame_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_frames}netex_salesTransactionFrame_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>CEN TC278 SG9 </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_xxxxx-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ifopt/netex_xxxxx.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_3/part3_monitoring/netex_all_objects_part3_monitoring.xsd b/xsd/netex_part_3/part3_monitoring/netex_all_objects_part3_monitoring.xsd
index e59cb5f32..7058cbd5c 100644
--- a/xsd/netex_part_3/part3_monitoring/netex_all_objects_part3_monitoring.xsd
+++ b/xsd/netex_part_3/part3_monitoring/netex_all_objects_part3_monitoring.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_part3_monitoring">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="netex_monitoredCall_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_monitoredPassingTimes_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_monitoredVehicleJourney_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_monitoredCall_version.xsd"/>
+	<xsd:include schemaLocation="netex_monitoredPassingTimes_version.xsd"/>
+	<xsd:include schemaLocation="netex_monitoredVehicleJourney_support.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_part_3/part3_monitoring/netex_monitoredCall_version.xsd b/xsd/netex_part_3/part3_monitoring/netex_monitoredCall_version.xsd
index 2b489ce99..807bcc306 100644
--- a/xsd/netex_part_3/part3_monitoring/netex_monitoredCall_version.xsd
+++ b/xsd/netex_part_3/part3_monitoring/netex_monitoredCall_version.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_monitoredCall_version">
-	<xsd:include schemaLocation="netex_monitoredPassingTimes_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_monitoredVehicleJourney_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_call_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_monitoredPassingTimes_version.xsd"/>
+	<xsd:include schemaLocation="netex_monitoredVehicleJourney_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_call_version.xsd"/>
 	<!-- ==== CALL =========================================-->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,11 +29,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_monitoring}nnetex_monitoredCall_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_monitoring}nnetex_monitoredCall_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_monitoring/netex_monitoredPassingTimes_version.xsd b/xsd/netex_part_3/part3_monitoring/netex_monitoredPassingTimes_version.xsd
index a161553a8..6b62d35b8 100644
--- a/xsd/netex_part_3/part3_monitoring/netex_monitoredPassingTimes_version.xsd
+++ b/xsd/netex_part_3/part3_monitoring/netex_monitoredPassingTimes_version.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_monitoredPassingTimes_version">
-	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_datedPassingTimes_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_datedPassingTimes_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,11 +29,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_monitoring}nnetex_monitoredPassingTimes_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_monitoring}nnetex_monitoredPassingTimes_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_3/part3_monitoring/netex_monitoredVehicleJourney_support.xsd b/xsd/netex_part_3/part3_monitoring/netex_monitoredVehicleJourney_support.xsd
index b9740b2aa..00a74e275 100644
--- a/xsd/netex_part_3/part3_monitoring/netex_monitoredVehicleJourney_support.xsd
+++ b/xsd/netex_part_3/part3_monitoring/netex_monitoredVehicleJourney_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_monitoredVehicleJourney_support">
-	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_call_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_2/part2_journeyTimes/netex_call_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -27,11 +27,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_monitoring}nnetex_monitoredVehicleJourney_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_monitoring}nnetex_monitoredVehicleJourney_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_parkingTariff/netex_all_objects_part3_parking.xsd b/xsd/netex_part_3/part3_parkingTariff/netex_all_objects_part3_parking.xsd
index 6e64cb0c7..b30a1fe39 100644
--- a/xsd/netex_part_3/part3_parkingTariff/netex_all_objects_part3_parking.xsd
+++ b/xsd/netex_part_3/part3_parkingTariff/netex_all_objects_part3_parking.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_part3_parking">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="netex_parkingTariff_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_parkingTariff_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_parkingTariff_support.xsd"/>
+	<xsd:include schemaLocation="netex_parkingTariff_version.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_support.xsd b/xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_support.xsd
index 4eff21a46..5c98147a2 100644
--- a/xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_support.xsd
+++ b/xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_parkingTariff_support">
-	<xsd:include schemaLocation="../part3_fares/netex_timeStructureFactor_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_parking_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_timeStructureFactor_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_parking_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,7 +28,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part3/part3_parkingTariff}netex_parkingTariff_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part3/part3_parkingTariff}netex_parkingTariff_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_version.xsd b/xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_version.xsd
index bb5f0c8da..cfee8ecd0 100644
--- a/xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_version.xsd
+++ b/xsd/netex_part_3/part3_parkingTariff/netex_parkingTariff_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:netex="http://www.netex.org.uk/netex" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_parkingTariff_version">
-	<xsd:include schemaLocation="netex_parkingTariff_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_parking_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part3_fares/netex_fareStructureElement_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part3_fares/netex_timeStructureFactor_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_parkingTariff_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_part_1/part1_ifopt/netex_ifopt_parking_version.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_fareStructureElement_version.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_timeStructureFactor_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,7 +31,7 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part3/part3_parkingTariff}netex_parkingTariff_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part3/part3_parkingTariff}netex_parkingTariff_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX</Publisher>
 				<Rights>Unclassified
diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_all_objects_part3_salesTransactions.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_all_objects_part3_salesTransactions.xsd
index ca9c85a6f..87d8b23a6 100644
--- a/xsd/netex_part_3/part3_salesTransactions/netex_all_objects_part3_salesTransactions.xsd
+++ b/xsd/netex_part_3/part3_salesTransactions/netex_all_objects_part3_salesTransactions.xsd
@@ -2,14 +2,14 @@
 <!-- edited with XMLSpy v2013 (x64) (http://www.altova.com) by Nicholas JS Knowles (Trapeze Group Limited) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all_objects_part3_salesTransactions">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="netex_salesContract_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_salesContract_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_customerEligibility_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_customerEligibility_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_retailConsortium_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_retailConsortium_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_salesTransaction_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_salesTransaction_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_customerPurchasePackage_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_customerPurchasePackage_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_salesContract_support.xsd"/>
+	<xsd:include schemaLocation="netex_salesContract_version.xsd"/>
+	<xsd:include schemaLocation="netex_customerEligibility_support.xsd"/>
+	<xsd:include schemaLocation="netex_customerEligibility_version.xsd"/>
+	<xsd:include schemaLocation="netex_retailConsortium_support.xsd"/>
+	<xsd:include schemaLocation="netex_retailConsortium_version.xsd"/>
+	<xsd:include schemaLocation="netex_salesTransaction_support.xsd"/>
+	<xsd:include schemaLocation="netex_salesTransaction_version.xsd"/>
+	<xsd:include schemaLocation="netex_customerPurchasePackage_support.xsd"/>
+	<xsd:include schemaLocation="netex_customerPurchasePackage_version.xsd"/>
 </xsd:schema>
diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_support.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_support.xsd
index 7b122bf37..8065cc138 100644
--- a/xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_support.xsd
+++ b/xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_customerEligibility_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_relationship-v1.0.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_relationship.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_salesContract_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_salesContract_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Steam Intellect, London N1 1JS </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
 				 <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_version.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_version.xsd
index ae836f7c8..cb563c330 100644
--- a/xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_version.xsd
+++ b/xsd/netex_part_3/part3_salesTransactions/netex_customerEligibility_version.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_customerEligibility_version">
-	<xsd:include schemaLocation="netex_customerEligibility_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_salesContract_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part3_fares/netex_usageParameterEligibility_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_customerEligibility_support.xsd"/>
+	<xsd:include schemaLocation="netex_salesContract_support.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_usageParameterEligibility_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_responsibility/netex_responsibility_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -42,11 +42,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_salesContract_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_salesContract_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Steam Intellect, London N1 1JS </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_support.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_support.xsd
index 0cf306ad6..99acfb4e3 100644
--- a/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_support.xsd
+++ b/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_customerPurchasePackage_support">
-	<xsd:include schemaLocation="../part3_fares/netex_salesOfferPackage_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part3_fares/netex_accessRightParameter_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_salesOfferPackage_support.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_accessRightParameter_support.xsd"/>
 	<!-- =============================================================== -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -29,11 +29,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransaction}netex_CustomerPurchasePackage_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransaction}netex_CustomerPurchasePackage_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Steam Intellect, London N1 1JS </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version.xsd
index dafaad4ce..ab1083eb7 100644
--- a/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version.xsd
+++ b/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version.xsd
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_customerPurchasePackage_version">
-	<xsd:include schemaLocation="netex_customerPurchasePackage_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_salesTransaction_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_customerPurchasePackage_support.xsd"/>
+	<xsd:include schemaLocation="netex_salesTransaction_support.xsd"/>
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="../part3_fares/netex_geographicStructureFactor_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part3_fares/netex_timeStructureFactor_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part3_fares/netex_fareStructureElement_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part3_fares/netex_salesOfferPackage_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part3_fares/netex_travelDocument_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_geographicStructureFactor_support.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_timeStructureFactor_support.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_fareStructureElement_support.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_salesOfferPackage_version.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_travelDocument_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -33,11 +33,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransaction}netex_salesOfferPackage_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransaction}netex_salesOfferPackage_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Steam Intellect, London N1 1JS </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_support.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_support.xsd
index 1cdc3dcec..9c47425ed 100644
--- a/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_support.xsd
+++ b/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_support.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_retailConsortium_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_organisation_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_securityList_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_organisation_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_securityList_support.xsd"/>
 	<!-- =============================================================== -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -28,11 +28,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_retailConsortium_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_retailConsortium_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_version.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_version.xsd
index 4e2606d2d..fe9c9507a 100644
--- a/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_version.xsd
+++ b/xsd/netex_part_3/part3_salesTransactions/netex_retailConsortium_version.xsd
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_retailConsortium_version">
-	<xsd:include schemaLocation="netex_retailConsortium_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_salesContract_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_organisation_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_securityList_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_address_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_retailConsortium_support.xsd"/>
+	<xsd:include schemaLocation="netex_salesContract_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_organisation_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_securityList_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_equipment_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_address_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -37,11 +37,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_retailConsortium_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_retailConsortium_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
 					<Copyright>CEN, Crown Copyright 2009-2018</Copyright>
diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_salesContract_support.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_salesContract_support.xsd
index 159dfea51..25e5de199 100644
--- a/xsd/netex_part_3/part3_salesTransactions/netex_salesContract_support.xsd
+++ b/xsd/netex_part_3/part3_salesTransactions/netex_salesContract_support.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_salesContract_support">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_securityList_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_loggable_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_securityList_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_loggable_support.xsd"/>
 	<xsd:annotation>
 		<xsd:appinfo>
 			<Metadata xmlns="http://www.govtalk.gov.uk/CM/gms-xs">
@@ -48,11 +48,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_salesContract_support-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_salesContract_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_salesContract_version.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_salesContract_version.xsd
index 645141835..2eb51123a 100644
--- a/xsd/netex_part_3/part3_salesTransactions/netex_salesContract_version.xsd
+++ b/xsd/netex_part_3/part3_salesTransactions/netex_salesContract_version.xsd
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_salesContract_version">
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_loggable_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_retailConsortium_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_salesContract_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_customerEligibility_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_securityList_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_address_version-v1.1.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_facility_support.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_genericFramework/netex_loggable_version.xsd"/>
+	<xsd:include schemaLocation="netex_retailConsortium_support.xsd"/>
+	<xsd:include schemaLocation="netex_salesContract_support.xsd"/>
+	<xsd:include schemaLocation="netex_customerEligibility_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_securityList_version.xsd"/>
+	<xsd:include schemaLocation="../../netex_framework/netex_reusableComponents/netex_address_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -53,11 +53,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_salesContract_version-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_salesContract_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_support.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_support.xsd
index f634860de..ac4850c37 100644
--- a/xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_support.xsd
+++ b/xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_support.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSpy v2008 (http://www.altova.com) by Nicholas Knowles Knowles (Kizoom Ltd) -->
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_salesTransaction_support">
-	<xsd:include schemaLocation="netex_salesContract_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part3_fares/netex_accessRightParameter_support-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_salesContract_support.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_accessRightParameter_support.xsd"/>
 	<!-- =============================================================== -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -42,11 +42,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_salesTransaction_support-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_salesTransaction_support.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_version.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_version.xsd
index 76f8d0d2d..9f4cd7674 100644
--- a/xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_version.xsd
+++ b/xsd/netex_part_3/part3_salesTransactions/netex_salesTransaction_version.xsd
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml/3.2" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_salesTransaction_version">
-	<xsd:include schemaLocation="netex_salesTransaction_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../part3_PiQuery/netex_piRequest_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_salesContract_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../part3_fares/netex_salesOfferPackage_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_customerPurchasePackage_support-v1.1.xsd"/>
+	<xsd:include schemaLocation="netex_salesTransaction_support.xsd"/>
+	<xsd:include schemaLocation="../part3_PiQuery/netex_piRequest_support.xsd"/>
+	<xsd:include schemaLocation="netex_salesContract_version.xsd"/>
+	<xsd:include schemaLocation="../part3_fares/netex_salesOfferPackage_version.xsd"/>
+	<xsd:include schemaLocation="netex_customerPurchasePackage_support.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -44,11 +44,11 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_salesTransaction_version-v1.1.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_part_3/part3_salesTransactions}netex_salesTransaction_version.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom, 109-123 Clifton Street, London EC4A 4LD </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/PATH/netex_prereqfile.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2017</Copyright>
diff --git a/xsd/netex_service/netex_all.xsd b/xsd/netex_service/netex_all.xsd
index 7e41975dd..0a10b6c85 100644
--- a/xsd/netex_service/netex_all.xsd
+++ b/xsd/netex_service/netex_all.xsd
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_all">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="../netex_framework/netex_frames/netex_all_frames_framework-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_frames/netex_all_frames_framework.xsd"/>
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="../netex_part_1/part1_tacticalPlanning/netex_all_objects_part1_tacticalPlanning-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_part_1/netex_all_frames_part1-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_part_1/part1_tacticalPlanning/netex_all_objects_part1_tacticalPlanning.xsd"/>
+	<xsd:include schemaLocation="../netex_part_1/netex_all_frames_part1.xsd"/>
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="../netex_part_2/netex_all_objects_part2-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_part_2/netex_all_frames_part2-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_part_2/netex_all_objects_part2.xsd"/>
+	<xsd:include schemaLocation="../netex_part_2/netex_all_frames_part2.xsd"/>
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="../netex_part_3/part3_fares/netex_all_objects_part3_fares-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_part_3/part3_frames/netex_all_frames_part3-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_filter_frame-v1.0.xsd"/>
-	<xsd:include schemaLocation="netex_filter_object-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_part_3/part3_fares/netex_all_objects_part3_fares.xsd"/>
+	<xsd:include schemaLocation="../netex_part_3/part3_frames/netex_all_frames_part3.xsd"/>
+	<xsd:include schemaLocation="netex_filter_frame.xsd"/>
+	<xsd:include schemaLocation="netex_filter_object.xsd"/>
 	<!-- ===Entities======================================= -->
 	<!-- ===Filters ======================================= -->
 </xsd:schema>
diff --git a/xsd/netex_service/netex_all_filters.xsd b/xsd/netex_service/netex_all_filters.xsd
index 02362f8c5..ef9b9f3ae 100644
--- a/xsd/netex_service/netex_all_filters.xsd
+++ b/xsd/netex_service/netex_all_filters.xsd
@@ -3,7 +3,7 @@
 	<!-- ======================================================================= -->
 	<!-- ======================================================================= -->
 	<!-- ======================================================================= -->
-	<xsd:include schemaLocation="netex_filter_network-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_filter_network.xsd"/>
 	<!--== Requests ===================================================================== -->
 	<!-- ===eGIF/GovTalk Documentation ======================================= -->
 	<xsd:annotation>
@@ -28,15 +28,15 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/ for svc/} for _filters-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/ for svc/} for _filters.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
 				<Relation>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _filter_device-v1.0.xsd</Requires>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _filter_network-v1.0.xsd</Requires>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _filter_prediction-v1.0.xsd</Requires>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _filter_profile-v1.0.xsd</Requires>
-					<Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _filter_traffic_event-v1.0.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _filter_device.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _filter_network.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _filter_prediction.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _filter_profile.xsd</Requires>
+					<Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _filter_traffic_event.xsd</Requires>
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_service/netex_dataObjectRequest_service.xsd b/xsd/netex_service/netex_dataObjectRequest_service.xsd
index d395da0b8..a8a990d79 100644
--- a/xsd/netex_service/netex_dataObjectRequest_service.xsd
+++ b/xsd/netex_service/netex_dataObjectRequest_service.xsd
@@ -2,8 +2,8 @@
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_dataObjectRequest_service">
 	<!-- ===Dependencies ======================================= -->
 	<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="../siri/siri_requests-v2.0.xsd"/>
-	<xsd:include schemaLocation="netex_filter_frame-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_all_objects_framework-v1.0.xsd"/>
+	<xsd:include schemaLocation="netex_filter_frame.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_all_objects_framework.xsd"/>
 	<!-- ===eGIF/GovTalk Documentation ======================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -27,10 +27,10 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_service}netex__dataObjectRequest-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_service}netex__dataObjectRequest.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
-				<Relation><Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _data_object-v1.0.xsd</Requires><Requires>http://www.siri.org.uk/schemas/2.0/xsd/siri/siri_requests-v2.0.xsd</Requires> &gt;
+				<Relation><Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _data_object.xsd</Requires><Requires>http://www.siri.org.uk/schemas/2.0/xsd/siri/siri_requests-v2.0.xsd</Requires> &gt;
 				</Relation>
 				<Rights>Unclassified
  					<Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_service/netex_filter_frame.xsd b/xsd/netex_service/netex_filter_frame.xsd
index 42300e84f..b94a88804 100644
--- a/xsd/netex_service/netex_filter_frame.xsd
+++ b/xsd/netex_service/netex_filter_frame.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_dataObjectRequest_service">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_versionFrame_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_part_1/part1_networkDescription/netex_line_support-v1.1.xsd"/>
-	<xsd:include schemaLocation="netex_filter_object-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_versionFrame_support.xsd"/>
+	<xsd:include schemaLocation="../netex_part_1/part1_networkDescription/netex_line_support.xsd"/>
+	<xsd:include schemaLocation="netex_filter_object.xsd"/>
 	<!-- ===eGIF/GovTalk Documentation ======================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -27,10 +27,10 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_service}netex__dataObjectRequest-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_service}netex__dataObjectRequest.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
-				<Relation><Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _data_object-v1.0.xsd</Requires><Requires>http://www.siri.org.uk/schemas/2.0/xsd/siri/siri_requests-v2.0.xsd</Requires> &gt;
+				<Relation><Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _data_object.xsd</Requires><Requires>http://www.siri.org.uk/schemas/2.0/xsd/siri/siri_requests-v2.0.xsd</Requires> &gt;
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/netex_service/netex_filter_object.xsd b/xsd/netex_service/netex_filter_object.xsd
index f417d92e3..894384d93 100644
--- a/xsd/netex_service/netex_filter_object.xsd
+++ b/xsd/netex_service/netex_filter_object.xsd
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0" id="netex_filter_object">
 	<!-- ===Dependencies ======================================= -->
-	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_utility_types-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_utility_time-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_location_types-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_dataSource_version-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_layer_support-v1.0.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_responsibilitySet_version-v1.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_reusableComponents/netex_availabilityCondition_version-v1.0.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_utility_types.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_utility_time.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_utility/netex_location_types.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_dataSource_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_genericFramework/netex_layer_support.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_responsibilitySet_version.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_reusableComponents/netex_availabilityCondition_version.xsd"/>
 	<!-- ===eGIF/GovTalk Documentation ======================================= -->
 	<xsd:annotation>
 		<xsd:appinfo>
@@ -31,10 +31,10 @@
 					<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
 					<Description>XML schema, W3C Recommendation 2001</Description>
 				</Format>
-				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_service}netex__dataObjectRequest-v1.0.xsd</Identifier>
+				<Identifier>{http://www.netex.org.uk/schemas/1.0/xsd/netex_service}netex__dataObjectRequest.xsd</Identifier>
 				<Language>[ISO 639-2/B] ENG</Language>
 				<Publisher>Kizoom Software Ltd, 16 High Holborn, London WC1V 6BX </Publisher>
-				<Relation><Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _data_object-v1.0.xsd</Requires><Requires>http://www.siri.org.uk/schemas/2.0/xsd/siri/siri_requests-v2.0.xsd</Requires> &gt;
+				<Relation><Requires>http://www.netex.org.uk/schemas/1.0/ for svc/ for _data_object.xsd</Requires><Requires>http://www.siri.org.uk/schemas/2.0/xsd/siri/siri_requests-v2.0.xsd</Requires> &gt;
 				</Relation>
 				<Rights>Unclassified
  <Copyright>CEN, Crown Copyright 2009-2014</Copyright>
diff --git a/xsd/wsdl/siri_all_functionalServices.xsd b/xsd/wsdl/siri_all_functionalServices.xsd
index 72fffadc4..3484b8532 100644
--- a/xsd/wsdl/siri_all_functionalServices.xsd
+++ b/xsd/wsdl/siri_all_functionalServices.xsd
@@ -78,8 +78,8 @@ Rail transport, Roads and road transport.
 	<!-- ======================================================================= -->
 	<!-- ======================================================================= -->
 	<!-- REPLACE THESE PACKAGES WITH OTHER FINCTIONAL SERVICES -->
-	<xsd:import namespace="http://www.netex.org.uk/netex" schemaLocation="../netex_service/netex_dataObjectRequest_service-v1.0.xsd"/>
-	<xsd:import namespace="http://www.netex.org.uk/netex" schemaLocation="../netex_service/netex_all-v1.0.xsd"/>
+	<xsd:import namespace="http://www.netex.org.uk/netex" schemaLocation="../netex_service/netex_dataObjectRequest_service.xsd"/>
+	<xsd:import namespace="http://www.netex.org.uk/netex" schemaLocation="../netex_service/netex_all.xsd"/>
 	<!-- END OF FUNCTIONAL SERVICES -->
 	<!-- ======================================================================= -->
 </xsd:schema>
diff --git a/xsd/ynotation/netex_subThing_support.xsd b/xsd/ynotation/netex_subThing_support.xsd
index 10b4656b3..b31afe57f 100644
--- a/xsd/ynotation/netex_subThing_support.xsd
+++ b/xsd/ynotation/netex_subThing_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns="http://www.netex.org.uk/netex" xmlns:ifopt="http://www.ifopt.org.uk/ifopt" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.1" id="netex_Thing">
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_responsibility_version-v0.4.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_responsibility_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:element name="AncestorARef" type="AncestorARefStructure" substitutionGroup="VersionOfObjectRef">
 		<xsd:annotation>
diff --git a/xsd/ynotation/netex_subThing_version.xsd b/xsd/ynotation/netex_subThing_version.xsd
index c33dec76b..ff8f230eb 100644
--- a/xsd/ynotation/netex_subThing_version.xsd
+++ b/xsd/ynotation/netex_subThing_version.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns="http://www.netex.org.uk/netex" xmlns:ifopt="http://www.ifopt.org.uk/ifopt" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.1" id="netex_subThing">
-	<xsd:include schemaLocation="netex_thing_support-v0.1.xsd"/>
-	<xsd:include schemaLocation="netex_subThing_support-v0.1.xsd"/>
+	<xsd:include schemaLocation="netex_thing_support.xsd"/>
+	<xsd:include schemaLocation="netex_subThing_support.xsd"/>
 	<!-- === NOTATION EXAMPLE E==== =================================================== -->
 	<!-- ======================================================================= -->
 	<!-- ==== ANCESTOR A ========================================================= -->
diff --git a/xsd/ynotation/netex_thing_support.xsd b/xsd/ynotation/netex_thing_support.xsd
index 56c08e7a5..f55798e3e 100644
--- a/xsd/ynotation/netex_thing_support.xsd
+++ b/xsd/ynotation/netex_thing_support.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns="http://www.netex.org.uk/netex" xmlns:ifopt="http://www.ifopt.org.uk/ifopt" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.1" id="netex_Thing">
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_responsibility_version-v0.4.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_responsibility_version.xsd"/>
 	<!-- ======================================================================= -->
 	<xsd:element name="ThingRef" type="ThingRefStructure" substitutionGroup="VersionOfObjectRef">
 		<xsd:annotation>
diff --git a/xsd/ynotation/netex_thing_version.xsd b/xsd/ynotation/netex_thing_version.xsd
index 51533b755..a73bf6a51 100644
--- a/xsd/ynotation/netex_thing_version.xsd
+++ b/xsd/ynotation/netex_thing_version.xsd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:core="http://www.govtalk.gov.uk/core" xmlns="http://www.netex.org.uk/netex" xmlns:ifopt="http://www.ifopt.org.uk/ifopt" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.1" id="netex_Thing">
-	<xsd:include schemaLocation="netex_thing_support-v0.1.xsd"/>
-	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_typeOfValue_version-v0.1.xsd"/>
+	<xsd:include schemaLocation="netex_thing_support.xsd"/>
+	<xsd:include schemaLocation="../netex_framework/netex_responsibility/netex_typeOfValue_version.xsd"/>
 	<!-- === NOTATION EXAMPLE E==== =================================================== -->
 	<!-- ======================================================================= -->
 	<!-- ==== Thing ========================================================= -->