diff --git a/contracts/arch.sw/armel/contract.json b/contracts/arch.sw/armel/contract.json
index b5cc061c..08767067 100644
--- a/contracts/arch.sw/armel/contract.json
+++ b/contracts/arch.sw/armel/contract.json
@@ -3,13 +3,13 @@
   "version": "1",
   "type": "arch.sw",
   "name": "ARM v5",
-  "data": { "arch": "armel" },
+  "arch": "armel",
   "requires": [
     {
-      "type": "hw.device-type",
-      "data": {
-        "arch": "armel"
-      }
+      "or": [
+        { "type": "hw.device-type", "arch": "armel" }
+      ]
     }
-  ]
+  ],
+  "variants": ""
 }
diff --git a/contracts/arch.sw/armhf/contract.json b/contracts/arch.sw/armhf/contract.json
index 39a48fd2..3b1ec147 100644
--- a/contracts/arch.sw/armhf/contract.json
+++ b/contracts/arch.sw/armhf/contract.json
@@ -3,23 +3,14 @@
   "version": "1",
   "type": "arch.sw",
   "name": "ARM Hard Float",
-  "data": { "arch": "armhf" },
+  "arch": "armhf",
   "requires": [
     {
       "or": [
-        {
-          "type": "hw.device-type",
-          "data": {
-            "arch": "armv7hf"
-          }
-        },
-        {
-          "type": "hw.device-type",
-          "data": {
-            "arch": "rpi"
-          }
-        }
+        { "type": "hw.device-type", "arch": "armv7hf" },
+        { "type": "hw.device-type", "arch": "rpi" }
       ]
     }
-  ]
+  ],
+  "variants": ""
 }
diff --git a/contracts/arch.sw/armv7hf/contract.json b/contracts/arch.sw/armv7hf/contract.json
index 9f907917..416f20da 100644
--- a/contracts/arch.sw/armv7hf/contract.json
+++ b/contracts/arch.sw/armv7hf/contract.json
@@ -3,13 +3,13 @@
   "version": "1",
   "type": "arch.sw",
   "name": "ARM v7",
-  "data": { "arch": "armv7hf" },
+  "arch": "armv7hf",
   "requires": [
     {
-      "type": "hw.device-type",
-      "data": {
-        "arch": "armv7hf"
-      }
+      "or": [
+        { "type": "hw.device-type", "arch": "armv7hf" }
+      ]
     }
-  ]
+  ],
+  "variants": ""
 }
diff --git a/contracts/arch.sw/rpi/contract.json b/contracts/arch.sw/rpi/contract.json
index 023c5c1c..67695ef5 100644
--- a/contracts/arch.sw/rpi/contract.json
+++ b/contracts/arch.sw/rpi/contract.json
@@ -3,13 +3,13 @@
   "version": "1",
   "type": "arch.sw",
   "name": "ARM v6",
-  "data": { "arch": "armv6hf" },
+  "arch": "armv6hf",
   "requires": [
     {
-      "type": "hw.device-type",
-      "data": {
-        "arch": "rpi"
-      }
+      "or": [
+        { "type": "hw.device-type", "arch": "rpi" }
+      ]
     }
-  ]
+  ],
+  "variants": ""
 }
diff --git a/contracts/hw.device-type/via-vab820-quad/boot-external.tpl b/contracts/hw.device-type/vab820-quad/boot-external.tpl
similarity index 100%
rename from contracts/hw.device-type/via-vab820-quad/boot-external.tpl
rename to contracts/hw.device-type/vab820-quad/boot-external.tpl
diff --git a/contracts/hw.device-type/via-vab820-quad/boot-internal.tpl b/contracts/hw.device-type/vab820-quad/boot-internal.tpl
similarity index 100%
rename from contracts/hw.device-type/via-vab820-quad/boot-internal.tpl
rename to contracts/hw.device-type/vab820-quad/boot-internal.tpl
diff --git a/contracts/hw.device-type/via-vab820-quad/prepare-network.tpl b/contracts/hw.device-type/vab820-quad/prepare-network.tpl
similarity index 100%
rename from contracts/hw.device-type/via-vab820-quad/prepare-network.tpl
rename to contracts/hw.device-type/vab820-quad/prepare-network.tpl
diff --git a/contracts/hw.device-type/via-vab820-quad/contract.json b/contracts/hw.device-type/via-vab820-quad/contract.json
deleted file mode 100644
index c7d0c4da..00000000
--- a/contracts/hw.device-type/via-vab820-quad/contract.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "slug": "via-vab820-quad",
-  "version": "1",
-  "type": "hw.device-type",
-  "name": "VIA vab820",
-  "data": {
-    "arch": "armv7hf",
-    "hdmi": true,
-    "led": false,
-    "connectivity": {
-      "bluetooth": true
-    },
-    "storage": {
-      "internal": true
-    },
-    "media": {
-      "installation": "sdcard"
-    }
-  }
-}