diff --git a/contracts/sw.blob/image-writer/etcher/contract.json b/contracts/sw.blob/etcher/contract.json
similarity index 91%
rename from contracts/sw.blob/image-writer/etcher/contract.json
rename to contracts/sw.blob/etcher/contract.json
index f4711bac..c7a383f2 100644
--- a/contracts/sw.blob/image-writer/etcher/contract.json
+++ b/contracts/sw.blob/etcher/contract.json
@@ -1,6 +1,6 @@
 {
   "slug": "etcher",
-  "type": "sw.blob.image-writer",
+  "type": "sw.blob",
   "name": "Etcher for macOS",
   "version": "1",
   "componentVersion": "1.1.2",
diff --git a/contracts/sw.blob/image-writer/download.tpl b/contracts/sw.blob/etcher/download.tpl
similarity index 100%
rename from contracts/sw.blob/image-writer/download.tpl
rename to contracts/sw.blob/etcher/download.tpl
diff --git a/contracts/sw.blob/os-supervisor/supervisor/contract.json b/contracts/sw.blob/supervisor/contract.json
similarity index 85%
rename from contracts/sw.blob/os-supervisor/supervisor/contract.json
rename to contracts/sw.blob/supervisor/contract.json
index 88135ada..fc3ade7e 100644
--- a/contracts/sw.blob/os-supervisor/supervisor/contract.json
+++ b/contracts/sw.blob/supervisor/contract.json
@@ -1,7 +1,7 @@
 {
   "slug": "supervisor",
-  "type": "sw.supervisor",
-  "name": "resin supervisor",
+  "type": "sw.blob",
+  "name": "Resin supervisor",
   "version": "1",
   "componentVersion": "7.5.6",
   "assets": {