diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/ToHash/vecto_engine-input.xml b/VectoCommon/VectoHashingTest/Testdata/XML/ToHash/vecto_engine-input.xml
index 499da0ab5c91f552b0c4f37269874cbba10c07b5..bddaa440a132d6bc154c7916c68599e2a7f82aaa 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/ToHash/vecto_engine-input.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/ToHash/vecto_engine-input.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v0.8"
-													xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v0.8"
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
+													xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0"
 													xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="1.0"
 													xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-													xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v0.8 ../XSD/VectoComponent.xsd">
+													xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0 ../XSD/VectoComponent.xsd">
 	<tns:Engine>
 		<Data>
 			<Manufacturer>Generic Engine Manufacturer</Manufacturer>
 			<Model>Generic 40t Long Haul Truck Engine</Model>
-			<TechnicalReportId>ENG-gooZah3D</TechnicalReportId>
+			<CertificationNumber>ENG-gooZah3D</CertificationNumber>
 			<Date>2017-02-15T11:00:00Z</Date>
 			<AppVersion>VectoEngine x.y</AppVersion>
 			<Displacement>12730</Displacement>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/ToHash/vecto_engine-input_emptyDate.xml b/VectoCommon/VectoHashingTest/Testdata/XML/ToHash/vecto_engine-input_emptyDate.xml
index c6c2ed39f178c5c9ef4a002814ea962f527c05c8..00b318754177696dacdb56707b2ea2f934b97b3b 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/ToHash/vecto_engine-input_emptyDate.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/ToHash/vecto_engine-input_emptyDate.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v0.8"
-													xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v0.8"
-													xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="1.0"
-													xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-													xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v0.8 ../XSD/VectoComponent.xsd">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
+                           xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0"
+                           xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="1.0"
+                           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                           xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0 ../XSD/VectoComponent.xsd">
 	<tns:Engine>
 		<Data>
 			<Manufacturer>Generic Engine Manufacturer</Manufacturer>
 			<Model>Generic 40t Long Haul Truck Engine</Model>
-			<TechnicalReportId>ENG-gooZah3D</TechnicalReportId>
+			<CertificationNumber>ENG-gooZah3D</CertificationNumber>
 			<Date></Date>
 			<AppVersion>VectoEngine x.y</AppVersion>
 			<Displacement>12730</Displacement>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/ToHash/vecto_engine_withid-input.xml b/VectoCommon/VectoHashingTest/Testdata/XML/ToHash/vecto_engine_withid-input.xml
index d036f868bacc680a1a9ff1e27617f1bff306413e..01d05a1eb4ca444032e794e078f6717b90940155 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/ToHash/vecto_engine_withid-input.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/ToHash/vecto_engine_withid-input.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v0.8"
-													xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v0.8"
-													xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="1.0"
-													xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-													xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v0.8 ../XSD/VectoComponent.xsd">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
+                           xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0"
+                           xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="1.0"
+                           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                           xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0 ../XSD/VectoComponent.xsd">
 	<tns:Engine>
 		<Data id="foobartest">
 			<Manufacturer>Generic Engine Manufacturer</Manufacturer>
 			<Model>Generic 40t Long Haul Truck Engine</Model>
-			<TechnicalReportId>ENG-gooZah3D</TechnicalReportId>
+			<CertificationNumber>ENG-gooZah3D</CertificationNumber>
 			<Date>2017-02-15T11:00:00Z</Date>
 			<AppVersion>VectoEngine x.y</AppVersion>
 			<Displacement>12730</Displacement>
diff --git a/VectoCommon/VectoHashingTest/Testdata/XML/ToHash/vecto_gearbox-input.xml b/VectoCommon/VectoHashingTest/Testdata/XML/ToHash/vecto_gearbox-input.xml
index 0f0883a338b57330b53420d6df79e48c70402415..5ecea04888621f775166215b9cb687028fbc0ea8 100644
--- a/VectoCommon/VectoHashingTest/Testdata/XML/ToHash/vecto_gearbox-input.xml
+++ b/VectoCommon/VectoHashingTest/Testdata/XML/ToHash/vecto_gearbox-input.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v0.8" xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v0.8" xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v0.8 ../XSD/VectoComponent.xsd">
+<tns:VectoInputDeclaration xmlns="urn:tugraz:ivt:VectoAPI:DeclarationDefinitions:v1.0"
+													 xmlns:tns="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0"
+													 xmlns:di="http://www.w3.org/2000/09/xmldsig#" schemaVersion="1.0"
+													 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+													 xsi:schemaLocation="urn:tugraz:ivt:VectoAPI:DeclarationComponent:v1.0 ../XSD/VectoComponent.xsd">
 	<tns:Gearbox>
 		<Data>
 			<Manufacturer>Generic Gearbox Manufacturer</Manufacturer>
 			<Model>Generic 40t Long Haul Truck Gearbox</Model>
-			<TechnicalReportId>GBX-vi2Oak2N</TechnicalReportId>
+			<CertificationNumber>GBX-vi2Oak2N</CertificationNumber>
 			<Date>2017-01-11T11:00:00Z</Date>
 			<AppVersion>3.0.1</AppVersion>
 			<TransmissionType>AMT</TransmissionType>