Index: development/integratietest/tbx-new/tbx-lade-veel-extras.txt
===================================================================
diff -u -r781 -r782
--- development/integratietest/tbx-new/tbx-lade-veel-extras.txt	(.../tbx-lade-veel-extras.txt)	(revision 781)
+++ development/integratietest/tbx-new/tbx-lade-veel-extras.txt	(.../tbx-lade-veel-extras.txt)	(revision 782)
@@ -12,16 +12,6 @@
     },
     {
       "__type": "NameValue:#VHServices",
-      "Name": "Data.Heeftopvullijstlinks",
-      "Value": "true"
-    },
-    {
-      "__type": "NameValue:#VHServices",
-      "Name": "Data.Heeftopvullijstrechts",
-      "Value": "true"
-    },
-    {
-      "__type": "NameValue:#VHServices",
       "Name": "Data.Heeftzijstabilisering",
       "Value": "false"
     },
@@ -117,6 +107,16 @@
     },
     {
       "__type": "NameValue:#VHServices",
+      "Name": "Data.Kenmerken.Heeftopvullijstlinks",
+      "Value": "true"
+    },
+    {
+      "__type": "NameValue:#VHServices",
+      "Name": "Data.Kenmerken.Heeftopvullijstrechts",
+      "Value": "true"
+    },
+    {
+      "__type": "NameValue:#VHServices",
       "Name": "Data.Kenmerken.Variant",
       "Value": "TBX"
     },
Index: development/integratietest/tbx-new/tbx-DMZ-lade.txt
===================================================================
diff -u -r781 -r782
--- development/integratietest/tbx-new/tbx-DMZ-lade.txt	(.../tbx-DMZ-lade.txt)	(revision 781)
+++ development/integratietest/tbx-new/tbx-DMZ-lade.txt	(.../tbx-DMZ-lade.txt)	(revision 782)
@@ -12,16 +12,6 @@
     },
     {
       "__type": "NameValue:#VHServices",
-      "Name": "Data.Heeftopvullijstlinks",
-      "Value": "false"
-    },
-    {
-      "__type": "NameValue:#VHServices",
-      "Name": "Data.Heeftopvullijstrechts",
-      "Value": "false"
-    },
-    {
-      "__type": "NameValue:#VHServices",
       "Name": "Data.Heeftzijstabilisering",
       "Value": "false"
     },
@@ -117,6 +107,16 @@
     },
     {
       "__type": "NameValue:#VHServices",
+      "Name": "Data.Kenmerken.Heeftopvullijstlinks",
+      "Value": "false"
+    },
+    {
+      "__type": "NameValue:#VHServices",
+      "Name": "Data.Kenmerken.Heeftopvullijstrechts",
+      "Value": "false"
+    },
+    {
+      "__type": "NameValue:#VHServices",
       "Name": "Data.Kenmerken.Variant",
       "Value": "TBX"
     },
Index: development/integratietest/tbx-new/tbx-sifon-lade-enkele-uitsparing.txt
===================================================================
diff -u -r781 -r782
--- development/integratietest/tbx-new/tbx-sifon-lade-enkele-uitsparing.txt	(.../tbx-sifon-lade-enkele-uitsparing.txt)	(revision 781)
+++ development/integratietest/tbx-new/tbx-sifon-lade-enkele-uitsparing.txt	(.../tbx-sifon-lade-enkele-uitsparing.txt)	(revision 782)
@@ -12,16 +12,6 @@
     },
     {
       "__type": "NameValue:#VHServices",
-      "Name": "Data.Heeftopvullijstlinks",
-      "Value": "false"
-    },
-    {
-      "__type": "NameValue:#VHServices",
-      "Name": "Data.Heeftopvullijstrechts",
-      "Value": "false"
-    },
-    {
-      "__type": "NameValue:#VHServices",
       "Name": "Data.Heeftzijstabilisering",
       "Value": "false"
     },
@@ -117,6 +107,16 @@
     },
     {
       "__type": "NameValue:#VHServices",
+      "Name": "Data.Kenmerken.Heeftopvullijstlinks",
+      "Value": "false"
+    },
+    {
+      "__type": "NameValue:#VHServices",
+      "Name": "Data.Kenmerken.Heeftopvullijstrechts",
+      "Value": "false"
+    },
+    {
+      "__type": "NameValue:#VHServices",
       "Name": "Data.Kenmerken.Variant",
       "Value": "TBX"
     },
Index: development/integratietest/tbx-new/tbx-spoelbak-lade-DMS.txt
===================================================================
diff -u -r781 -r782
--- development/integratietest/tbx-new/tbx-spoelbak-lade-DMS.txt	(.../tbx-spoelbak-lade-DMS.txt)	(revision 781)
+++ development/integratietest/tbx-new/tbx-spoelbak-lade-DMS.txt	(.../tbx-spoelbak-lade-DMS.txt)	(revision 782)
@@ -12,16 +12,6 @@
     },
     {
       "__type": "NameValue:#VHServices",
-      "Name": "Data.Heeftopvullijstlinks",
-      "Value": "false"
-    },
-    {
-      "__type": "NameValue:#VHServices",
-      "Name": "Data.Heeftopvullijstrechts",
-      "Value": "false"
-    },
-    {
-      "__type": "NameValue:#VHServices",
       "Name": "Data.Heeftzijstabilisering",
       "Value": "false"
     },
@@ -117,6 +107,16 @@
     },
     {
       "__type": "NameValue:#VHServices",
+      "Name": "Data.Kenmerken.Heeftopvullijstlinks",
+      "Value": "false"
+    },
+    {
+      "__type": "NameValue:#VHServices",
+      "Name": "Data.Kenmerken.Heeftopvullijstrechts",
+      "Value": "false"
+    },
+    {
+      "__type": "NameValue:#VHServices",
       "Name": "Data.Kenmerken.Variant",
       "Value": "TBX"
     },
Index: development/integratietest/tbx-new/tbx-lade-niet-meeleveren.txt
===================================================================
diff -u -r781 -r782
--- development/integratietest/tbx-new/tbx-lade-niet-meeleveren.txt	(.../tbx-lade-niet-meeleveren.txt)	(revision 781)
+++ development/integratietest/tbx-new/tbx-lade-niet-meeleveren.txt	(.../tbx-lade-niet-meeleveren.txt)	(revision 782)
@@ -12,16 +12,6 @@
     },
     {
       "__type": "NameValue:#VHServices",
-      "Name": "Data.Heeftopvullijstlinks",
-      "Value": "false"
-    },
-    {
-      "__type": "NameValue:#VHServices",
-      "Name": "Data.Heeftopvullijstrechts",
-      "Value": "false"
-    },
-    {
-      "__type": "NameValue:#VHServices",
       "Name": "Data.Heeftzijstabilisering",
       "Value": "false"
     },
@@ -117,6 +107,16 @@
     },
     {
       "__type": "NameValue:#VHServices",
+      "Name": "Data.Kenmerken.Heeftopvullijstlinks",
+      "Value": "false"
+    },
+    {
+      "__type": "NameValue:#VHServices",
+      "Name": "Data.Kenmerken.Heeftopvullijstrechts",
+      "Value": "false"
+    },
+    {
+      "__type": "NameValue:#VHServices",
       "Name": "Data.Kenmerken.Variant",
       "Value": "TBX"
     },
Index: development/integratietest/tbx-new/tbx-standaard-lade.txt
===================================================================
diff -u -r781 -r782
--- development/integratietest/tbx-new/tbx-standaard-lade.txt	(.../tbx-standaard-lade.txt)	(revision 781)
+++ development/integratietest/tbx-new/tbx-standaard-lade.txt	(.../tbx-standaard-lade.txt)	(revision 782)
@@ -12,16 +12,6 @@
     },
     {
       "__type": "NameValue:#VHServices",
-      "Name": "Data.Heeftopvullijstlinks",
-      "Value": "false"
-    },
-    {
-      "__type": "NameValue:#VHServices",
-      "Name": "Data.Heeftopvullijstrechts",
-      "Value": "false"
-    },
-    {
-      "__type": "NameValue:#VHServices",
       "Name": "Data.Heeftzijstabilisering",
       "Value": "false"
     },
@@ -117,6 +107,16 @@
     },
     {
       "__type": "NameValue:#VHServices",
+      "Name": "Data.Kenmerken.Heeftopvullijstlinks",
+      "Value": "false"
+    },
+    {
+      "__type": "NameValue:#VHServices",
+      "Name": "Data.Kenmerken.Heeftopvullijstrechts",
+      "Value": "false"
+    },
+    {
+      "__type": "NameValue:#VHServices",
       "Name": "Data.Kenmerken.Variant",
       "Value": "TBX"
     },
Index: development/integratietest/tbx-new/tbx-sifon-lade-type3-enkele-uitsparing.txt
===================================================================
diff -u -r781 -r782
--- development/integratietest/tbx-new/tbx-sifon-lade-type3-enkele-uitsparing.txt	(.../tbx-sifon-lade-type3-enkele-uitsparing.txt)	(revision 781)
+++ development/integratietest/tbx-new/tbx-sifon-lade-type3-enkele-uitsparing.txt	(.../tbx-sifon-lade-type3-enkele-uitsparing.txt)	(revision 782)
@@ -12,16 +12,6 @@
     },
     {
       "__type": "NameValue:#VHServices",
-      "Name": "Data.Heeftopvullijstlinks",
-      "Value": "false"
-    },
-    {
-      "__type": "NameValue:#VHServices",
-      "Name": "Data.Heeftopvullijstrechts",
-      "Value": "false"
-    },
-    {
-      "__type": "NameValue:#VHServices",
       "Name": "Data.Heeftzijstabilisering",
       "Value": "false"
     },
@@ -117,6 +107,16 @@
     },
     {
       "__type": "NameValue:#VHServices",
+      "Name": "Data.Kenmerken.Heeftopvullijstlinks",
+      "Value": "false"
+    },
+    {
+      "__type": "NameValue:#VHServices",
+      "Name": "Data.Kenmerken.Heeftopvullijstrechts",
+      "Value": "false"
+    },
+    {
+      "__type": "NameValue:#VHServices",
       "Name": "Data.Kenmerken.Variant",
       "Value": "TBX"
     },
Index: development/integratietest/tbx-new/tbx-lade-verlaagde-rug.txt
===================================================================
diff -u -r781 -r782
--- development/integratietest/tbx-new/tbx-lade-verlaagde-rug.txt	(.../tbx-lade-verlaagde-rug.txt)	(revision 781)
+++ development/integratietest/tbx-new/tbx-lade-verlaagde-rug.txt	(.../tbx-lade-verlaagde-rug.txt)	(revision 782)
@@ -12,16 +12,6 @@
     },
     {
       "__type": "NameValue:#VHServices",
-      "Name": "Data.Heeftopvullijstlinks",
-      "Value": "false"
-    },
-    {
-      "__type": "NameValue:#VHServices",
-      "Name": "Data.Heeftopvullijstrechts",
-      "Value": "false"
-    },
-    {
-      "__type": "NameValue:#VHServices",
       "Name": "Data.Heeftzijstabilisering",
       "Value": "false"
     },
@@ -117,6 +107,16 @@
     },
     {
       "__type": "NameValue:#VHServices",
+      "Name": "Data.Kenmerken.Heeftopvullijstlinks",
+      "Value": "false"
+    },
+    {
+      "__type": "NameValue:#VHServices",
+      "Name": "Data.Kenmerken.Heeftopvullijstrechts",
+      "Value": "false"
+    },
+    {
+      "__type": "NameValue:#VHServices",
       "Name": "Data.Kenmerken.Variant",
       "Value": "TBX"
     },
Index: development/integratietest/tbx-new/tbx-standaard-binnenlade.txt
===================================================================
diff -u -r781 -r782
--- development/integratietest/tbx-new/tbx-standaard-binnenlade.txt	(.../tbx-standaard-binnenlade.txt)	(revision 781)
+++ development/integratietest/tbx-new/tbx-standaard-binnenlade.txt	(.../tbx-standaard-binnenlade.txt)	(revision 782)
@@ -12,16 +12,6 @@
     },
     {
       "__type": "NameValue:#VHServices",
-      "Name": "Data.Heeftopvullijstlinks",
-      "Value": "false"
-    },
-    {
-      "__type": "NameValue:#VHServices",
-      "Name": "Data.Heeftopvullijstrechts",
-      "Value": "false"
-    },
-    {
-      "__type": "NameValue:#VHServices",
       "Name": "Data.Heeftzijstabilisering",
       "Value": "false"
     },
@@ -117,6 +107,16 @@
     },
     {
       "__type": "NameValue:#VHServices",
+      "Name": "Data.Kenmerken.Heeftopvullijstlinks",
+      "Value": "false"
+    },
+    {
+      "__type": "NameValue:#VHServices",
+      "Name": "Data.Kenmerken.Heeftopvullijstrechts",
+      "Value": "false"
+    },
+    {
+      "__type": "NameValue:#VHServices",
       "Name": "Data.Kenmerken.Variant",
       "Value": "TBX"
     },
Index: development/integratietest/tbx-new/tbx-spoelbak-lade.txt
===================================================================
diff -u -r781 -r782
--- development/integratietest/tbx-new/tbx-spoelbak-lade.txt	(.../tbx-spoelbak-lade.txt)	(revision 781)
+++ development/integratietest/tbx-new/tbx-spoelbak-lade.txt	(.../tbx-spoelbak-lade.txt)	(revision 782)
@@ -12,16 +12,6 @@
     },
     {
       "__type": "NameValue:#VHServices",
-      "Name": "Data.Heeftopvullijstlinks",
-      "Value": "false"
-    },
-    {
-      "__type": "NameValue:#VHServices",
-      "Name": "Data.Heeftopvullijstrechts",
-      "Value": "false"
-    },
-    {
-      "__type": "NameValue:#VHServices",
       "Name": "Data.Heeftzijstabilisering",
       "Value": "false"
     },
@@ -117,6 +107,16 @@
     },
     {
       "__type": "NameValue:#VHServices",
+      "Name": "Data.Kenmerken.Heeftopvullijstlinks",
+      "Value": "false"
+    },
+    {
+      "__type": "NameValue:#VHServices",
+      "Name": "Data.Kenmerken.Heeftopvullijstrechts",
+      "Value": "false"
+    },
+    {
+      "__type": "NameValue:#VHServices",
       "Name": "Data.Kenmerken.Variant",
       "Value": "TBX"
     },
Index: development/integratietest/tbx-new/tbx-sifon-lade-type3-dubbele-uitsparing.txt
===================================================================
diff -u -r781 -r782
--- development/integratietest/tbx-new/tbx-sifon-lade-type3-dubbele-uitsparing.txt	(.../tbx-sifon-lade-type3-dubbele-uitsparing.txt)	(revision 781)
+++ development/integratietest/tbx-new/tbx-sifon-lade-type3-dubbele-uitsparing.txt	(.../tbx-sifon-lade-type3-dubbele-uitsparing.txt)	(revision 782)
@@ -12,16 +12,6 @@
     },
     {
       "__type": "NameValue:#VHServices",
-      "Name": "Data.Heeftopvullijstlinks",
-      "Value": "false"
-    },
-    {
-      "__type": "NameValue:#VHServices",
-      "Name": "Data.Heeftopvullijstrechts",
-      "Value": "false"
-    },
-    {
-      "__type": "NameValue:#VHServices",
       "Name": "Data.Heeftzijstabilisering",
       "Value": "false"
     },
@@ -117,6 +107,16 @@
     },
     {
       "__type": "NameValue:#VHServices",
+      "Name": "Data.Kenmerken.Heeftopvullijstlinks",
+      "Value": "false"
+    },
+    {
+      "__type": "NameValue:#VHServices",
+      "Name": "Data.Kenmerken.Heeftopvullijstrechts",
+      "Value": "false"
+    },
+    {
+      "__type": "NameValue:#VHServices",
       "Name": "Data.Kenmerken.Variant",
       "Value": "TBX"
     },