diff --git a/test/test-frames/landis+gyr_ultraheat_t230.norm.xml b/test/test-frames/landis+gyr_ultraheat_t230.norm.xml
index d30f1cd..7030986 100644
--- a/test/test-frames/landis+gyr_ultraheat_t230.norm.xml
+++ b/test/test-frames/landis+gyr_ultraheat_t230.norm.xml
@@ -16,7 +16,7 @@
         <Function>Instantaneous value</Function>
         <StorageNumber>0</StorageNumber>
         <Unit>s</Unit>
-        <Quantity>Averaging Duration</Quantity>
+        <Quantity>Actuality Duration</Quantity>
         <Value>4.000000</Value>
     </DataRecord>
 
diff --git a/test/test-frames/metrona_ultraheat_xs.norm.xml b/test/test-frames/metrona_ultraheat_xs.norm.xml
index 82423fe..55779d2 100644
--- a/test/test-frames/metrona_ultraheat_xs.norm.xml
+++ b/test/test-frames/metrona_ultraheat_xs.norm.xml
@@ -16,7 +16,7 @@
         <Function>Instantaneous value</Function>
         <StorageNumber>0</StorageNumber>
         <Unit>s</Unit>
-        <Quantity>Averaging Duration</Quantity>
+        <Quantity>Actuality Duration</Quantity>
         <Value>4.000000</Value>
     </DataRecord>
 
diff --git a/test/test-frames/minol_minocal_wr3.norm.xml b/test/test-frames/minol_minocal_wr3.norm.xml
index 19ddead..6db5492 100644
--- a/test/test-frames/minol_minocal_wr3.norm.xml
+++ b/test/test-frames/minol_minocal_wr3.norm.xml
@@ -132,7 +132,7 @@
         <Tariff>0</Tariff>
         <Device>1</Device>
         <Unit></Unit>
-        <Quantity>Device type</Quantity>
+        <Quantity>Medium</Quantity>
         <Value>7.000000</Value>
     </DataRecord>
 
@@ -182,7 +182,7 @@
         <Tariff>0</Tariff>
         <Device>2</Device>
         <Unit></Unit>
-        <Quantity>Device type</Quantity>
+        <Quantity>Medium</Quantity>
         <Value>7.000000</Value>
     </DataRecord>
 
diff --git a/test/test-frames/siemens_water.norm.xml b/test/test-frames/siemens_water.norm.xml
index 895a7a5..a49f1d3 100644
--- a/test/test-frames/siemens_water.norm.xml
+++ b/test/test-frames/siemens_water.norm.xml
@@ -56,7 +56,7 @@
         <Function>Instantaneous value</Function>
         <StorageNumber>0</StorageNumber>
         <Unit></Unit>
-        <Quantity>Device type</Quantity>
+        <Quantity>Model / Version</Quantity>
         <Value>2173253517322.000000</Value>
     </DataRecord>
 
diff --git a/test/test-frames/siemens_wfh21.norm.xml b/test/test-frames/siemens_wfh21.norm.xml
index afd7f9f..cac68af 100644
--- a/test/test-frames/siemens_wfh21.norm.xml
+++ b/test/test-frames/siemens_wfh21.norm.xml
@@ -56,7 +56,7 @@
         <Function>Instantaneous value</Function>
         <StorageNumber>0</StorageNumber>
         <Unit></Unit>
-        <Quantity>Device type</Quantity>
+        <Quantity>Model / Version</Quantity>
         <Value>2173253517322.000000</Value>
     </DataRecord>