diff --git a/contracts/hw.device-family/asus-rockchip/contract.json b/contracts/hw.device-family/asus-rockchip/contract.json
new file mode 100644
index 00000000..7d2847f5
--- /dev/null
+++ b/contracts/hw.device-family/asus-rockchip/contract.json
@@ -0,0 +1,10 @@
+{
+  "slug": "asus-rockchip",
+  "version": "1.0.0",
+  "type": "hw.device-family",
+  "aliases": [],
+  "name": "ASUS Tinkerboard Rockchip",
+  "data": {
+    "manufacturedBy": "asus"
+  }
+}
diff --git a/contracts/hw.device-family/tinkerboard/contract.json b/contracts/hw.device-family/tinkerboard/contract.json
deleted file mode 100644
index a2b66879..00000000
--- a/contracts/hw.device-family/tinkerboard/contract.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "slug": "family-tinkerboard",
-  "version": "1.0.0",
-  "type": "hw.device-family",
-  "aliases": [],
-  "name": "Tinkerboard",
-  "data": {
-    "manufacturedBy": "manufacturer-asus"
-  }
-}
diff --git a/contracts/hw.device-family/up-x86/contract.json b/contracts/hw.device-family/up-x86/contract.json
new file mode 100644
index 00000000..7f0508e8
--- /dev/null
+++ b/contracts/hw.device-family/up-x86/contract.json
@@ -0,0 +1,10 @@
+{
+  "slug": "up-x86",
+  "version": "1.0.0",
+  "type": "hw.device-family",
+  "aliases": [],
+  "name": "UP Board x86",
+  "data": {
+    "manufacturedBy": "up"
+  }
+}
diff --git a/contracts/hw.device-family/upboard/contract.json b/contracts/hw.device-family/upboard/contract.json
deleted file mode 100644
index 60d4bcd3..00000000
--- a/contracts/hw.device-family/upboard/contract.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "slug": "family-upboard",
-  "version": "1.0.0",
-  "type": "hw.device-family",
-  "aliases": [],
-  "name": "UP Board",
-  "data": {
-    "manufacturedBy": "manufacturer-aaeon"
-  }
-}
diff --git a/contracts/hw.device-manufacturer/aaeon/contract.json b/contracts/hw.device-manufacturer/aaeon/contract.json
index 264cf12f..49f3100d 100644
--- a/contracts/hw.device-manufacturer/aaeon/contract.json
+++ b/contracts/hw.device-manufacturer/aaeon/contract.json
@@ -1,5 +1,5 @@
 {
-  "slug": "manufacturer-aaeon",
+  "slug": "aaeon",
   "version": "1.0.0",
   "type": "hw.device-manufacturer",
   "aliases": [],
diff --git a/contracts/hw.device-manufacturer/asus/contract.json b/contracts/hw.device-manufacturer/asus/contract.json
index 53461a0f..9998a105 100644
--- a/contracts/hw.device-manufacturer/asus/contract.json
+++ b/contracts/hw.device-manufacturer/asus/contract.json
@@ -1,5 +1,5 @@
 {
-  "slug": "manufacturer-asus",
+  "slug": "asus",
   "version": "1.0.0",
   "type": "hw.device-manufacturer",
   "aliases": [],
diff --git a/contracts/hw.device-manufacturer/up/contract.json b/contracts/hw.device-manufacturer/up/contract.json
new file mode 100644
index 00000000..344e4a72
--- /dev/null
+++ b/contracts/hw.device-manufacturer/up/contract.json
@@ -0,0 +1,8 @@
+{
+  "slug": "up",
+  "version": "1.0.0",
+  "type": "hw.device-manufacturer",
+  "aliases": [],
+  "name": "Up Board",
+  "data": {}
+}
diff --git a/contracts/hw.device-type/asus-tinker-board-s/contract.json b/contracts/hw.device-type/asus-tinker-board-s/contract.json
index 9a4495ef..1ca10d05 100644
--- a/contracts/hw.device-type/asus-tinker-board-s/contract.json
+++ b/contracts/hw.device-type/asus-tinker-board-s/contract.json
@@ -12,7 +12,7 @@
   },
   "data": {
     "arch": "armv7hf",
-    "family": "family-tinkerboard",
+    "family": "asus-rockchip",
     "hdmi": true,
     "led": true,
     "connectivity": {
diff --git a/contracts/hw.device-type/asus-tinker-board/contract.json b/contracts/hw.device-type/asus-tinker-board/contract.json
index f3708e48..f3b7aaeb 100644
--- a/contracts/hw.device-type/asus-tinker-board/contract.json
+++ b/contracts/hw.device-type/asus-tinker-board/contract.json
@@ -12,7 +12,7 @@
   },
   "data": {
     "arch": "armv7hf",
-    "family": "family-tinkerboard",
+    "family": "asus-rockchip",
     "hdmi": true,
     "led": true,
     "connectivity": {
diff --git a/contracts/hw.device-type/up-board/contract.json b/contracts/hw.device-type/up-board/contract.json
index b56e6e93..69b48d0f 100644
--- a/contracts/hw.device-type/up-board/contract.json
+++ b/contracts/hw.device-type/up-board/contract.json
@@ -12,7 +12,7 @@
   },
   "data": {
     "arch": "amd64",
-    "family": "family-upboard",
+    "family": "up-x86",
     "hdmi": true,
     "led": true,
     "connectivity": {
diff --git a/contracts/hw.device-type/up-core-plus/contract.json b/contracts/hw.device-type/up-core-plus/contract.json
index 784b8e18..3c123d39 100644
--- a/contracts/hw.device-type/up-core-plus/contract.json
+++ b/contracts/hw.device-type/up-core-plus/contract.json
@@ -12,7 +12,7 @@
   },
   "data": {
     "arch": "amd64",
-    "family": "family-upboard",
+    "family": "up-x86",
     "hdmi": false,
     "led": false,
     "connectivity": {
diff --git a/contracts/hw.device-type/up-core/contract.json b/contracts/hw.device-type/up-core/contract.json
index 2106c367..c94813c1 100644
--- a/contracts/hw.device-type/up-core/contract.json
+++ b/contracts/hw.device-type/up-core/contract.json
@@ -12,7 +12,7 @@
   },
   "data": {
     "arch": "amd64",
-    "family": "family-upboard",
+    "family": "up-x86",
     "hdmi": true,
     "led": false,
     "connectivity": {
diff --git a/contracts/hw.device-type/up-squared/contract.json b/contracts/hw.device-type/up-squared/contract.json
index 29a7efd8..53c5d9bb 100644
--- a/contracts/hw.device-type/up-squared/contract.json
+++ b/contracts/hw.device-type/up-squared/contract.json
@@ -12,7 +12,7 @@
   },
   "data": {
     "arch": "amd64",
-    "family": "family-upboard",
+    "family": "up-x86",
     "hdmi": true,
     "led": false,
     "connectivity": {