diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 34f/vecto_vehicle-completed_heavyBus_34f.xml b/Generic Vehicles/Declaration Mode/CompletedBus 34f/vecto_vehicle-completed_heavyBus_34f.xml
index 1b2de97d2f5970371d617c77f8ed014c7defe0c9..263d916f179b9c37a3894c1ce933b0a3211d4104 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 34f/vecto_vehicle-completed_heavyBus_34f.xml	
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 34f/vecto_vehicle-completed_heavyBus_34f.xml	
@@ -7,7 +7,7 @@
 		<VIN>VEH-1234567890</VIN>
 		<Date>2020-01-09T11:00:00Z</Date>
 		<LegislativeClass>M3</LegislativeClass>
-		<RegisteredClass>II+III</RegisteredClass>
+		<ClassBus>II+III</ClassBus>
 		<VehicleCode>CB</VehicleCode>
 		<CurbMassChassis>19400</CurbMassChassis>
 		<TechnicalPermissibleMaximumLadenMass>25000</TechnicalPermissibleMaximumLadenMass>
@@ -63,7 +63,7 @@
 							<PassengerAC>2-stage</PassengerAC>
 						</CompressorType>
 						<AuxiliaryHeaterPower>30000</AuxiliaryHeaterPower>
-						<DoubleGlasing>true</DoubleGlasing>
+						<DoubleGlazing>true</DoubleGlazing>
 						<HeatPump>false</HeatPump>
 						<AdjustableAuxiliaryHeater>true</AdjustableAuxiliaryHeater>
 						<SeparateAirDistributionDucts>true</SeparateAirDistributionDucts>
diff --git a/Generic Vehicles/Declaration Mode/CompletedBus 39a/vecto_vehicle-completed_heavyBus_39a.xml b/Generic Vehicles/Declaration Mode/CompletedBus 39a/vecto_vehicle-completed_heavyBus_39a.xml
index a616f10f32be31a39960290950788f60d35399bc..ec94637358436fcc56164f29b2b1e9b40c3fc483 100644
--- a/Generic Vehicles/Declaration Mode/CompletedBus 39a/vecto_vehicle-completed_heavyBus_39a.xml	
+++ b/Generic Vehicles/Declaration Mode/CompletedBus 39a/vecto_vehicle-completed_heavyBus_39a.xml	
@@ -7,7 +7,7 @@
 		<VIN>VEH-1234567890</VIN>
 		<Date>2020-01-09T11:00:00Z</Date>
 		<LegislativeClass>M3</LegislativeClass>
-		<RegisteredClass>II</RegisteredClass>
+		<ClassBus>II</ClassBus>
 		<VehicleCode>CG</VehicleCode>
 		<CurbMassChassis>19000</CurbMassChassis>
 		<TechnicalPermissibleMaximumLadenMass>37000</TechnicalPermissibleMaximumLadenMass>
@@ -63,7 +63,7 @@
 							<PassengerAC>3-stage</PassengerAC>
 						</CompressorType>
 						<AuxiliaryHeaterPower>15000</AuxiliaryHeaterPower>
-						<DoubleGlasing>true</DoubleGlasing>
+						<DoubleGlazing>true</DoubleGlazing>
 						<HeatPump>false</HeatPump>
 						<AdjustableAuxiliaryHeater>false</AdjustableAuxiliaryHeater>
 						<SeparateAirDistributionDucts>false</SeparateAirDistributionDucts>