From cdfd305e0f096ca08a0238bd0cbb2bfaa2d5d06d Mon Sep 17 00:00:00 2001
From: Achilleas Koutsou <achilleas@koutsou.net>
Date: Mon, 19 Sep 2022 16:51:12 +0200
Subject: [PATCH] test: update format request map and test manifests

---
 ...=> fedora_35-aarch64-iot_commit-boot.json} |  2 +-
 ...fedora_35-aarch64-iot_container-boot.json} |  2 +-
 ...fedora_35-aarch64-iot_installer-boot.json} |  2 +-
 ...arch64-iot_installer_with_users-boot.json} |  2 +-
 ...fedora_35-aarch64-iot_raw_image-boot.json} |  2 +-
 ... => fedora_35-x86_64-iot_commit-boot.json} |  2 +-
 ...dora_35-x86_64-iot_commit_debug-boot.json} |  2 +-
 ... fedora_35-x86_64-iot_container-boot.json} |  2 +-
 ... fedora_35-x86_64-iot_installer-boot.json} |  2 +-
 ...x86_64-iot_installer_with_users-boot.json} |  2 +-
 ... fedora_35-x86_64-iot_raw_image-boot.json} |  2 +-
 ...=> fedora_36-aarch64-iot_commit-boot.json} |  2 +-
 ...fedora_36-aarch64-iot_container-boot.json} |  2 +-
 ...fedora_36-aarch64-iot_installer-boot.json} |  2 +-
 ...arch64-iot_installer_with_users-boot.json} |  2 +-
 ...fedora_36-aarch64-iot_raw_image-boot.json} |  2 +-
 ... => fedora_36-x86_64-iot_commit-boot.json} |  2 +-
 ...dora_36-x86_64-iot_commit_debug-boot.json} |  2 +-
 ... fedora_36-x86_64-iot_container-boot.json} |  2 +-
 ... fedora_36-x86_64-iot_installer-boot.json} |  2 +-
 ...x86_64-iot_installer_with_users-boot.json} |  2 +-
 ... fedora_36-x86_64-iot_raw_image-boot.json} |  2 +-
 ...=> fedora_37-aarch64-iot_commit-boot.json} |  2 +-
 ...fedora_37-aarch64-iot_container-boot.json} |  2 +-
 ...fedora_37-aarch64-iot_installer-boot.json} |  2 +-
 ...arch64-iot_installer_with_users-boot.json} |  2 +-
 ...fedora_37-aarch64-iot_raw_image-boot.json} |  2 +-
 ... => fedora_37-x86_64-iot_commit-boot.json} |  2 +-
 ...dora_37-x86_64-iot_commit_debug-boot.json} |  2 +-
 ... fedora_37-x86_64-iot_container-boot.json} |  2 +-
 ... fedora_37-x86_64-iot_installer-boot.json} |  2 +-
 ...x86_64-iot_installer_with_users-boot.json} |  2 +-
 ... fedora_37-x86_64-iot_raw_image-boot.json} |  2 +-
 ...=> fedora_38-aarch64-iot_commit-boot.json} |  2 +-
 ...fedora_38-aarch64-iot_container-boot.json} |  2 +-
 ...fedora_38-aarch64-iot_installer-boot.json} |  2 +-
 ...arch64-iot_installer_with_users-boot.json} |  2 +-
 ...fedora_38-aarch64-iot_raw_image-boot.json} |  2 +-
 ... => fedora_38-x86_64-iot_commit-boot.json} |  2 +-
 ...dora_38-x86_64-iot_commit_debug-boot.json} |  2 +-
 ... fedora_38-x86_64-iot_container-boot.json} |  2 +-
 ... fedora_38-x86_64-iot_installer-boot.json} |  2 +-
 ...x86_64-iot_installer_with_users-boot.json} |  2 +-
 ... fedora_38-x86_64-iot_raw_image-boot.json} |  2 +-
 .../format-request-map.json                   | 24 +++++++++----------
 45 files changed, 56 insertions(+), 56 deletions(-)
 rename test/data/manifests/{fedora_35-aarch64-fedora_iot_commit-boot.json => fedora_35-aarch64-iot_commit-boot.json} (99%)
 rename test/data/manifests/{fedora_35-aarch64-fedora_iot_container-boot.json => fedora_35-aarch64-iot_container-boot.json} (99%)
 rename test/data/manifests/{fedora_35-aarch64-fedora_iot_installer-boot.json => fedora_35-aarch64-iot_installer-boot.json} (99%)
 rename test/data/manifests/{fedora_35-aarch64-fedora_iot_installer_with_users-boot.json => fedora_35-aarch64-iot_installer_with_users-boot.json} (99%)
 rename test/data/manifests/{fedora_35-aarch64-fedora_iot_raw_image-boot.json => fedora_35-aarch64-iot_raw_image-boot.json} (99%)
 rename test/data/manifests/{fedora_35-x86_64-fedora_iot_commit-boot.json => fedora_35-x86_64-iot_commit-boot.json} (99%)
 rename test/data/manifests/{fedora_35-x86_64-fedora_iot_commit_debug-boot.json => fedora_35-x86_64-iot_commit_debug-boot.json} (99%)
 rename test/data/manifests/{fedora_35-x86_64-fedora_iot_container-boot.json => fedora_35-x86_64-iot_container-boot.json} (99%)
 rename test/data/manifests/{fedora_35-x86_64-fedora_iot_installer-boot.json => fedora_35-x86_64-iot_installer-boot.json} (99%)
 rename test/data/manifests/{fedora_35-x86_64-fedora_iot_installer_with_users-boot.json => fedora_35-x86_64-iot_installer_with_users-boot.json} (99%)
 rename test/data/manifests/{fedora_35-x86_64-fedora_iot_raw_image-boot.json => fedora_35-x86_64-iot_raw_image-boot.json} (99%)
 rename test/data/manifests/{fedora_36-aarch64-fedora_iot_commit-boot.json => fedora_36-aarch64-iot_commit-boot.json} (99%)
 rename test/data/manifests/{fedora_36-aarch64-fedora_iot_container-boot.json => fedora_36-aarch64-iot_container-boot.json} (99%)
 rename test/data/manifests/{fedora_36-aarch64-fedora_iot_installer-boot.json => fedora_36-aarch64-iot_installer-boot.json} (99%)
 rename test/data/manifests/{fedora_36-aarch64-fedora_iot_installer_with_users-boot.json => fedora_36-aarch64-iot_installer_with_users-boot.json} (99%)
 rename test/data/manifests/{fedora_36-aarch64-fedora_iot_raw_image-boot.json => fedora_36-aarch64-iot_raw_image-boot.json} (99%)
 rename test/data/manifests/{fedora_36-x86_64-fedora_iot_commit-boot.json => fedora_36-x86_64-iot_commit-boot.json} (99%)
 rename test/data/manifests/{fedora_36-x86_64-fedora_iot_commit_debug-boot.json => fedora_36-x86_64-iot_commit_debug-boot.json} (99%)
 rename test/data/manifests/{fedora_36-x86_64-fedora_iot_container-boot.json => fedora_36-x86_64-iot_container-boot.json} (99%)
 rename test/data/manifests/{fedora_36-x86_64-fedora_iot_installer-boot.json => fedora_36-x86_64-iot_installer-boot.json} (99%)
 rename test/data/manifests/{fedora_36-x86_64-fedora_iot_installer_with_users-boot.json => fedora_36-x86_64-iot_installer_with_users-boot.json} (99%)
 rename test/data/manifests/{fedora_36-x86_64-fedora_iot_raw_image-boot.json => fedora_36-x86_64-iot_raw_image-boot.json} (99%)
 rename test/data/manifests/{fedora_37-aarch64-fedora_iot_commit-boot.json => fedora_37-aarch64-iot_commit-boot.json} (99%)
 rename test/data/manifests/{fedora_37-aarch64-fedora_iot_container-boot.json => fedora_37-aarch64-iot_container-boot.json} (99%)
 rename test/data/manifests/{fedora_37-aarch64-fedora_iot_installer-boot.json => fedora_37-aarch64-iot_installer-boot.json} (99%)
 rename test/data/manifests/{fedora_37-aarch64-fedora_iot_installer_with_users-boot.json => fedora_37-aarch64-iot_installer_with_users-boot.json} (99%)
 rename test/data/manifests/{fedora_37-aarch64-fedora_iot_raw_image-boot.json => fedora_37-aarch64-iot_raw_image-boot.json} (99%)
 rename test/data/manifests/{fedora_37-x86_64-fedora_iot_commit-boot.json => fedora_37-x86_64-iot_commit-boot.json} (99%)
 rename test/data/manifests/{fedora_37-x86_64-fedora_iot_commit_debug-boot.json => fedora_37-x86_64-iot_commit_debug-boot.json} (99%)
 rename test/data/manifests/{fedora_37-x86_64-fedora_iot_container-boot.json => fedora_37-x86_64-iot_container-boot.json} (99%)
 rename test/data/manifests/{fedora_37-x86_64-fedora_iot_installer-boot.json => fedora_37-x86_64-iot_installer-boot.json} (99%)
 rename test/data/manifests/{fedora_37-x86_64-fedora_iot_installer_with_users-boot.json => fedora_37-x86_64-iot_installer_with_users-boot.json} (99%)
 rename test/data/manifests/{fedora_37-x86_64-fedora_iot_raw_image-boot.json => fedora_37-x86_64-iot_raw_image-boot.json} (99%)
 rename test/data/manifests/{fedora_38-aarch64-fedora_iot_commit-boot.json => fedora_38-aarch64-iot_commit-boot.json} (99%)
 rename test/data/manifests/{fedora_38-aarch64-fedora_iot_container-boot.json => fedora_38-aarch64-iot_container-boot.json} (99%)
 rename test/data/manifests/{fedora_38-aarch64-fedora_iot_installer-boot.json => fedora_38-aarch64-iot_installer-boot.json} (99%)
 rename test/data/manifests/{fedora_38-aarch64-fedora_iot_installer_with_users-boot.json => fedora_38-aarch64-iot_installer_with_users-boot.json} (99%)
 rename test/data/manifests/{fedora_38-aarch64-fedora_iot_raw_image-boot.json => fedora_38-aarch64-iot_raw_image-boot.json} (99%)
 rename test/data/manifests/{fedora_38-x86_64-fedora_iot_commit-boot.json => fedora_38-x86_64-iot_commit-boot.json} (99%)
 rename test/data/manifests/{fedora_38-x86_64-fedora_iot_commit_debug-boot.json => fedora_38-x86_64-iot_commit_debug-boot.json} (99%)
 rename test/data/manifests/{fedora_38-x86_64-fedora_iot_container-boot.json => fedora_38-x86_64-iot_container-boot.json} (99%)
 rename test/data/manifests/{fedora_38-x86_64-fedora_iot_installer-boot.json => fedora_38-x86_64-iot_installer-boot.json} (99%)
 rename test/data/manifests/{fedora_38-x86_64-fedora_iot_installer_with_users-boot.json => fedora_38-x86_64-iot_installer_with_users-boot.json} (99%)
 rename test/data/manifests/{fedora_38-x86_64-fedora_iot_raw_image-boot.json => fedora_38-x86_64-iot_raw_image-boot.json} (99%)

diff --git a/test/data/manifests/fedora_35-aarch64-fedora_iot_commit-boot.json b/test/data/manifests/fedora_35-aarch64-iot_commit-boot.json
similarity index 99%
rename from test/data/manifests/fedora_35-aarch64-fedora_iot_commit-boot.json
rename to test/data/manifests/fedora_35-aarch64-iot_commit-boot.json
index 27cd0945b..42018762b 100644
--- a/test/data/manifests/fedora_35-aarch64-fedora_iot_commit-boot.json
+++ b/test/data/manifests/fedora_35-aarch64-iot_commit-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "fedora-35",
     "arch": "aarch64",
-    "image-type": "fedora-iot-commit",
+    "image-type": "iot-commit",
     "repositories": [
       {
         "name": "fedora",
diff --git a/test/data/manifests/fedora_35-aarch64-fedora_iot_container-boot.json b/test/data/manifests/fedora_35-aarch64-iot_container-boot.json
similarity index 99%
rename from test/data/manifests/fedora_35-aarch64-fedora_iot_container-boot.json
rename to test/data/manifests/fedora_35-aarch64-iot_container-boot.json
index 37a57ec5b..e2c231ff2 100644
--- a/test/data/manifests/fedora_35-aarch64-fedora_iot_container-boot.json
+++ b/test/data/manifests/fedora_35-aarch64-iot_container-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "fedora-35",
     "arch": "aarch64",
-    "image-type": "fedora-iot-container",
+    "image-type": "iot-container",
     "repositories": [
       {
         "name": "fedora",
diff --git a/test/data/manifests/fedora_35-aarch64-fedora_iot_installer-boot.json b/test/data/manifests/fedora_35-aarch64-iot_installer-boot.json
similarity index 99%
rename from test/data/manifests/fedora_35-aarch64-fedora_iot_installer-boot.json
rename to test/data/manifests/fedora_35-aarch64-iot_installer-boot.json
index 21783f391..d23689ba0 100644
--- a/test/data/manifests/fedora_35-aarch64-fedora_iot_installer-boot.json
+++ b/test/data/manifests/fedora_35-aarch64-iot_installer-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "fedora-35",
     "arch": "aarch64",
-    "image-type": "fedora-iot-installer",
+    "image-type": "iot-installer",
     "repositories": [
       {
         "name": "fedora",
diff --git a/test/data/manifests/fedora_35-aarch64-fedora_iot_installer_with_users-boot.json b/test/data/manifests/fedora_35-aarch64-iot_installer_with_users-boot.json
similarity index 99%
rename from test/data/manifests/fedora_35-aarch64-fedora_iot_installer_with_users-boot.json
rename to test/data/manifests/fedora_35-aarch64-iot_installer_with_users-boot.json
index 9568bbd05..bb9b32288 100644
--- a/test/data/manifests/fedora_35-aarch64-fedora_iot_installer_with_users-boot.json
+++ b/test/data/manifests/fedora_35-aarch64-iot_installer_with_users-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "fedora-35",
     "arch": "aarch64",
-    "image-type": "fedora-iot-installer",
+    "image-type": "iot-installer",
     "repositories": [
       {
         "name": "fedora",
diff --git a/test/data/manifests/fedora_35-aarch64-fedora_iot_raw_image-boot.json b/test/data/manifests/fedora_35-aarch64-iot_raw_image-boot.json
similarity index 99%
rename from test/data/manifests/fedora_35-aarch64-fedora_iot_raw_image-boot.json
rename to test/data/manifests/fedora_35-aarch64-iot_raw_image-boot.json
index d73b109cf..ca64e9638 100644
--- a/test/data/manifests/fedora_35-aarch64-fedora_iot_raw_image-boot.json
+++ b/test/data/manifests/fedora_35-aarch64-iot_raw_image-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "fedora-35",
     "arch": "aarch64",
-    "image-type": "fedora-iot-raw-image",
+    "image-type": "iot-raw-image",
     "repositories": [
       {
         "name": "fedora",
diff --git a/test/data/manifests/fedora_35-x86_64-fedora_iot_commit-boot.json b/test/data/manifests/fedora_35-x86_64-iot_commit-boot.json
similarity index 99%
rename from test/data/manifests/fedora_35-x86_64-fedora_iot_commit-boot.json
rename to test/data/manifests/fedora_35-x86_64-iot_commit-boot.json
index 7290450f9..cad63db80 100644
--- a/test/data/manifests/fedora_35-x86_64-fedora_iot_commit-boot.json
+++ b/test/data/manifests/fedora_35-x86_64-iot_commit-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "fedora-35",
     "arch": "x86_64",
-    "image-type": "fedora-iot-commit",
+    "image-type": "iot-commit",
     "repositories": [
       {
         "name": "fedora",
diff --git a/test/data/manifests/fedora_35-x86_64-fedora_iot_commit_debug-boot.json b/test/data/manifests/fedora_35-x86_64-iot_commit_debug-boot.json
similarity index 99%
rename from test/data/manifests/fedora_35-x86_64-fedora_iot_commit_debug-boot.json
rename to test/data/manifests/fedora_35-x86_64-iot_commit_debug-boot.json
index 067a7c0ec..32b091347 100644
--- a/test/data/manifests/fedora_35-x86_64-fedora_iot_commit_debug-boot.json
+++ b/test/data/manifests/fedora_35-x86_64-iot_commit_debug-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "fedora-35",
     "arch": "x86_64",
-    "image-type": "fedora-iot-commit",
+    "image-type": "iot-commit",
     "repositories": [
       {
         "name": "fedora",
diff --git a/test/data/manifests/fedora_35-x86_64-fedora_iot_container-boot.json b/test/data/manifests/fedora_35-x86_64-iot_container-boot.json
similarity index 99%
rename from test/data/manifests/fedora_35-x86_64-fedora_iot_container-boot.json
rename to test/data/manifests/fedora_35-x86_64-iot_container-boot.json
index 95e897a75..ce4586b4e 100644
--- a/test/data/manifests/fedora_35-x86_64-fedora_iot_container-boot.json
+++ b/test/data/manifests/fedora_35-x86_64-iot_container-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "fedora-35",
     "arch": "x86_64",
-    "image-type": "fedora-iot-container",
+    "image-type": "iot-container",
     "repositories": [
       {
         "name": "fedora",
diff --git a/test/data/manifests/fedora_35-x86_64-fedora_iot_installer-boot.json b/test/data/manifests/fedora_35-x86_64-iot_installer-boot.json
similarity index 99%
rename from test/data/manifests/fedora_35-x86_64-fedora_iot_installer-boot.json
rename to test/data/manifests/fedora_35-x86_64-iot_installer-boot.json
index 423b98146..3f233c790 100644
--- a/test/data/manifests/fedora_35-x86_64-fedora_iot_installer-boot.json
+++ b/test/data/manifests/fedora_35-x86_64-iot_installer-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "fedora-35",
     "arch": "x86_64",
-    "image-type": "fedora-iot-installer",
+    "image-type": "iot-installer",
     "repositories": [
       {
         "name": "fedora",
diff --git a/test/data/manifests/fedora_35-x86_64-fedora_iot_installer_with_users-boot.json b/test/data/manifests/fedora_35-x86_64-iot_installer_with_users-boot.json
similarity index 99%
rename from test/data/manifests/fedora_35-x86_64-fedora_iot_installer_with_users-boot.json
rename to test/data/manifests/fedora_35-x86_64-iot_installer_with_users-boot.json
index bce178aa5..d411fa490 100644
--- a/test/data/manifests/fedora_35-x86_64-fedora_iot_installer_with_users-boot.json
+++ b/test/data/manifests/fedora_35-x86_64-iot_installer_with_users-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "fedora-35",
     "arch": "x86_64",
-    "image-type": "fedora-iot-installer",
+    "image-type": "iot-installer",
     "repositories": [
       {
         "name": "fedora",
diff --git a/test/data/manifests/fedora_35-x86_64-fedora_iot_raw_image-boot.json b/test/data/manifests/fedora_35-x86_64-iot_raw_image-boot.json
similarity index 99%
rename from test/data/manifests/fedora_35-x86_64-fedora_iot_raw_image-boot.json
rename to test/data/manifests/fedora_35-x86_64-iot_raw_image-boot.json
index b666e5849..fe439755c 100644
--- a/test/data/manifests/fedora_35-x86_64-fedora_iot_raw_image-boot.json
+++ b/test/data/manifests/fedora_35-x86_64-iot_raw_image-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "fedora-35",
     "arch": "x86_64",
-    "image-type": "fedora-iot-raw-image",
+    "image-type": "iot-raw-image",
     "repositories": [
       {
         "name": "fedora",
diff --git a/test/data/manifests/fedora_36-aarch64-fedora_iot_commit-boot.json b/test/data/manifests/fedora_36-aarch64-iot_commit-boot.json
similarity index 99%
rename from test/data/manifests/fedora_36-aarch64-fedora_iot_commit-boot.json
rename to test/data/manifests/fedora_36-aarch64-iot_commit-boot.json
index b7313fd53..98ffced5d 100644
--- a/test/data/manifests/fedora_36-aarch64-fedora_iot_commit-boot.json
+++ b/test/data/manifests/fedora_36-aarch64-iot_commit-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "fedora-36",
     "arch": "aarch64",
-    "image-type": "fedora-iot-commit",
+    "image-type": "iot-commit",
     "repositories": [
       {
         "name": "fedora",
diff --git a/test/data/manifests/fedora_36-aarch64-fedora_iot_container-boot.json b/test/data/manifests/fedora_36-aarch64-iot_container-boot.json
similarity index 99%
rename from test/data/manifests/fedora_36-aarch64-fedora_iot_container-boot.json
rename to test/data/manifests/fedora_36-aarch64-iot_container-boot.json
index d95a99112..73898f37d 100644
--- a/test/data/manifests/fedora_36-aarch64-fedora_iot_container-boot.json
+++ b/test/data/manifests/fedora_36-aarch64-iot_container-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "fedora-36",
     "arch": "aarch64",
-    "image-type": "fedora-iot-container",
+    "image-type": "iot-container",
     "repositories": [
       {
         "name": "fedora",
diff --git a/test/data/manifests/fedora_36-aarch64-fedora_iot_installer-boot.json b/test/data/manifests/fedora_36-aarch64-iot_installer-boot.json
similarity index 99%
rename from test/data/manifests/fedora_36-aarch64-fedora_iot_installer-boot.json
rename to test/data/manifests/fedora_36-aarch64-iot_installer-boot.json
index 18c137ef2..472727e0e 100644
--- a/test/data/manifests/fedora_36-aarch64-fedora_iot_installer-boot.json
+++ b/test/data/manifests/fedora_36-aarch64-iot_installer-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "fedora-36",
     "arch": "aarch64",
-    "image-type": "fedora-iot-installer",
+    "image-type": "iot-installer",
     "repositories": [
       {
         "name": "fedora",
diff --git a/test/data/manifests/fedora_36-aarch64-fedora_iot_installer_with_users-boot.json b/test/data/manifests/fedora_36-aarch64-iot_installer_with_users-boot.json
similarity index 99%
rename from test/data/manifests/fedora_36-aarch64-fedora_iot_installer_with_users-boot.json
rename to test/data/manifests/fedora_36-aarch64-iot_installer_with_users-boot.json
index e9fa9c6f0..26d0d4745 100644
--- a/test/data/manifests/fedora_36-aarch64-fedora_iot_installer_with_users-boot.json
+++ b/test/data/manifests/fedora_36-aarch64-iot_installer_with_users-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "fedora-36",
     "arch": "aarch64",
-    "image-type": "fedora-iot-installer",
+    "image-type": "iot-installer",
     "repositories": [
       {
         "name": "fedora",
diff --git a/test/data/manifests/fedora_36-aarch64-fedora_iot_raw_image-boot.json b/test/data/manifests/fedora_36-aarch64-iot_raw_image-boot.json
similarity index 99%
rename from test/data/manifests/fedora_36-aarch64-fedora_iot_raw_image-boot.json
rename to test/data/manifests/fedora_36-aarch64-iot_raw_image-boot.json
index f6980dae2..88e495ec0 100644
--- a/test/data/manifests/fedora_36-aarch64-fedora_iot_raw_image-boot.json
+++ b/test/data/manifests/fedora_36-aarch64-iot_raw_image-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "fedora-36",
     "arch": "aarch64",
-    "image-type": "fedora-iot-raw-image",
+    "image-type": "iot-raw-image",
     "repositories": [
       {
         "name": "fedora",
diff --git a/test/data/manifests/fedora_36-x86_64-fedora_iot_commit-boot.json b/test/data/manifests/fedora_36-x86_64-iot_commit-boot.json
similarity index 99%
rename from test/data/manifests/fedora_36-x86_64-fedora_iot_commit-boot.json
rename to test/data/manifests/fedora_36-x86_64-iot_commit-boot.json
index 07edf06a8..f5d16a760 100644
--- a/test/data/manifests/fedora_36-x86_64-fedora_iot_commit-boot.json
+++ b/test/data/manifests/fedora_36-x86_64-iot_commit-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "fedora-36",
     "arch": "x86_64",
-    "image-type": "fedora-iot-commit",
+    "image-type": "iot-commit",
     "repositories": [
       {
         "name": "fedora",
diff --git a/test/data/manifests/fedora_36-x86_64-fedora_iot_commit_debug-boot.json b/test/data/manifests/fedora_36-x86_64-iot_commit_debug-boot.json
similarity index 99%
rename from test/data/manifests/fedora_36-x86_64-fedora_iot_commit_debug-boot.json
rename to test/data/manifests/fedora_36-x86_64-iot_commit_debug-boot.json
index 77646c368..4aaf0718f 100644
--- a/test/data/manifests/fedora_36-x86_64-fedora_iot_commit_debug-boot.json
+++ b/test/data/manifests/fedora_36-x86_64-iot_commit_debug-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "fedora-36",
     "arch": "x86_64",
-    "image-type": "fedora-iot-commit",
+    "image-type": "iot-commit",
     "repositories": [
       {
         "name": "fedora",
diff --git a/test/data/manifests/fedora_36-x86_64-fedora_iot_container-boot.json b/test/data/manifests/fedora_36-x86_64-iot_container-boot.json
similarity index 99%
rename from test/data/manifests/fedora_36-x86_64-fedora_iot_container-boot.json
rename to test/data/manifests/fedora_36-x86_64-iot_container-boot.json
index a1a9ec7b8..d8c1cfbd9 100644
--- a/test/data/manifests/fedora_36-x86_64-fedora_iot_container-boot.json
+++ b/test/data/manifests/fedora_36-x86_64-iot_container-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "fedora-36",
     "arch": "x86_64",
-    "image-type": "fedora-iot-container",
+    "image-type": "iot-container",
     "repositories": [
       {
         "name": "fedora",
diff --git a/test/data/manifests/fedora_36-x86_64-fedora_iot_installer-boot.json b/test/data/manifests/fedora_36-x86_64-iot_installer-boot.json
similarity index 99%
rename from test/data/manifests/fedora_36-x86_64-fedora_iot_installer-boot.json
rename to test/data/manifests/fedora_36-x86_64-iot_installer-boot.json
index 7f2c86ab8..6e0cc5790 100644
--- a/test/data/manifests/fedora_36-x86_64-fedora_iot_installer-boot.json
+++ b/test/data/manifests/fedora_36-x86_64-iot_installer-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "fedora-36",
     "arch": "x86_64",
-    "image-type": "fedora-iot-installer",
+    "image-type": "iot-installer",
     "repositories": [
       {
         "name": "fedora",
diff --git a/test/data/manifests/fedora_36-x86_64-fedora_iot_installer_with_users-boot.json b/test/data/manifests/fedora_36-x86_64-iot_installer_with_users-boot.json
similarity index 99%
rename from test/data/manifests/fedora_36-x86_64-fedora_iot_installer_with_users-boot.json
rename to test/data/manifests/fedora_36-x86_64-iot_installer_with_users-boot.json
index a23e3dad6..21038babf 100644
--- a/test/data/manifests/fedora_36-x86_64-fedora_iot_installer_with_users-boot.json
+++ b/test/data/manifests/fedora_36-x86_64-iot_installer_with_users-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "fedora-36",
     "arch": "x86_64",
-    "image-type": "fedora-iot-installer",
+    "image-type": "iot-installer",
     "repositories": [
       {
         "name": "fedora",
diff --git a/test/data/manifests/fedora_36-x86_64-fedora_iot_raw_image-boot.json b/test/data/manifests/fedora_36-x86_64-iot_raw_image-boot.json
similarity index 99%
rename from test/data/manifests/fedora_36-x86_64-fedora_iot_raw_image-boot.json
rename to test/data/manifests/fedora_36-x86_64-iot_raw_image-boot.json
index b575a4683..6c6b48aea 100644
--- a/test/data/manifests/fedora_36-x86_64-fedora_iot_raw_image-boot.json
+++ b/test/data/manifests/fedora_36-x86_64-iot_raw_image-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "fedora-36",
     "arch": "x86_64",
-    "image-type": "fedora-iot-raw-image",
+    "image-type": "iot-raw-image",
     "repositories": [
       {
         "name": "fedora",
diff --git a/test/data/manifests/fedora_37-aarch64-fedora_iot_commit-boot.json b/test/data/manifests/fedora_37-aarch64-iot_commit-boot.json
similarity index 99%
rename from test/data/manifests/fedora_37-aarch64-fedora_iot_commit-boot.json
rename to test/data/manifests/fedora_37-aarch64-iot_commit-boot.json
index f9d4c7c9e..8c881e4e9 100644
--- a/test/data/manifests/fedora_37-aarch64-fedora_iot_commit-boot.json
+++ b/test/data/manifests/fedora_37-aarch64-iot_commit-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "fedora-37",
     "arch": "aarch64",
-    "image-type": "fedora-iot-commit",
+    "image-type": "iot-commit",
     "repositories": [
       {
         "name": "fedora",
diff --git a/test/data/manifests/fedora_37-aarch64-fedora_iot_container-boot.json b/test/data/manifests/fedora_37-aarch64-iot_container-boot.json
similarity index 99%
rename from test/data/manifests/fedora_37-aarch64-fedora_iot_container-boot.json
rename to test/data/manifests/fedora_37-aarch64-iot_container-boot.json
index 9927edee4..42006edb4 100644
--- a/test/data/manifests/fedora_37-aarch64-fedora_iot_container-boot.json
+++ b/test/data/manifests/fedora_37-aarch64-iot_container-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "fedora-37",
     "arch": "aarch64",
-    "image-type": "fedora-iot-container",
+    "image-type": "iot-container",
     "repositories": [
       {
         "name": "fedora",
diff --git a/test/data/manifests/fedora_37-aarch64-fedora_iot_installer-boot.json b/test/data/manifests/fedora_37-aarch64-iot_installer-boot.json
similarity index 99%
rename from test/data/manifests/fedora_37-aarch64-fedora_iot_installer-boot.json
rename to test/data/manifests/fedora_37-aarch64-iot_installer-boot.json
index 9da2299a5..73b678763 100644
--- a/test/data/manifests/fedora_37-aarch64-fedora_iot_installer-boot.json
+++ b/test/data/manifests/fedora_37-aarch64-iot_installer-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "fedora-37",
     "arch": "aarch64",
-    "image-type": "fedora-iot-installer",
+    "image-type": "iot-installer",
     "repositories": [
       {
         "name": "fedora",
diff --git a/test/data/manifests/fedora_37-aarch64-fedora_iot_installer_with_users-boot.json b/test/data/manifests/fedora_37-aarch64-iot_installer_with_users-boot.json
similarity index 99%
rename from test/data/manifests/fedora_37-aarch64-fedora_iot_installer_with_users-boot.json
rename to test/data/manifests/fedora_37-aarch64-iot_installer_with_users-boot.json
index c0ff4afae..ad3fed41e 100644
--- a/test/data/manifests/fedora_37-aarch64-fedora_iot_installer_with_users-boot.json
+++ b/test/data/manifests/fedora_37-aarch64-iot_installer_with_users-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "fedora-37",
     "arch": "aarch64",
-    "image-type": "fedora-iot-installer",
+    "image-type": "iot-installer",
     "repositories": [
       {
         "name": "fedora",
diff --git a/test/data/manifests/fedora_37-aarch64-fedora_iot_raw_image-boot.json b/test/data/manifests/fedora_37-aarch64-iot_raw_image-boot.json
similarity index 99%
rename from test/data/manifests/fedora_37-aarch64-fedora_iot_raw_image-boot.json
rename to test/data/manifests/fedora_37-aarch64-iot_raw_image-boot.json
index b409bc042..f8ab10432 100644
--- a/test/data/manifests/fedora_37-aarch64-fedora_iot_raw_image-boot.json
+++ b/test/data/manifests/fedora_37-aarch64-iot_raw_image-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "fedora-37",
     "arch": "aarch64",
-    "image-type": "fedora-iot-raw-image",
+    "image-type": "iot-raw-image",
     "repositories": [
       {
         "name": "fedora",
diff --git a/test/data/manifests/fedora_37-x86_64-fedora_iot_commit-boot.json b/test/data/manifests/fedora_37-x86_64-iot_commit-boot.json
similarity index 99%
rename from test/data/manifests/fedora_37-x86_64-fedora_iot_commit-boot.json
rename to test/data/manifests/fedora_37-x86_64-iot_commit-boot.json
index 18ecd78f3..e4cf67ec0 100644
--- a/test/data/manifests/fedora_37-x86_64-fedora_iot_commit-boot.json
+++ b/test/data/manifests/fedora_37-x86_64-iot_commit-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "fedora-37",
     "arch": "x86_64",
-    "image-type": "fedora-iot-commit",
+    "image-type": "iot-commit",
     "repositories": [
       {
         "name": "fedora",
diff --git a/test/data/manifests/fedora_37-x86_64-fedora_iot_commit_debug-boot.json b/test/data/manifests/fedora_37-x86_64-iot_commit_debug-boot.json
similarity index 99%
rename from test/data/manifests/fedora_37-x86_64-fedora_iot_commit_debug-boot.json
rename to test/data/manifests/fedora_37-x86_64-iot_commit_debug-boot.json
index 72e693ed8..7ba582518 100644
--- a/test/data/manifests/fedora_37-x86_64-fedora_iot_commit_debug-boot.json
+++ b/test/data/manifests/fedora_37-x86_64-iot_commit_debug-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "fedora-37",
     "arch": "x86_64",
-    "image-type": "fedora-iot-commit",
+    "image-type": "iot-commit",
     "repositories": [
       {
         "name": "fedora",
diff --git a/test/data/manifests/fedora_37-x86_64-fedora_iot_container-boot.json b/test/data/manifests/fedora_37-x86_64-iot_container-boot.json
similarity index 99%
rename from test/data/manifests/fedora_37-x86_64-fedora_iot_container-boot.json
rename to test/data/manifests/fedora_37-x86_64-iot_container-boot.json
index f6df8924c..e1aa4b2c8 100644
--- a/test/data/manifests/fedora_37-x86_64-fedora_iot_container-boot.json
+++ b/test/data/manifests/fedora_37-x86_64-iot_container-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "fedora-37",
     "arch": "x86_64",
-    "image-type": "fedora-iot-container",
+    "image-type": "iot-container",
     "repositories": [
       {
         "name": "fedora",
diff --git a/test/data/manifests/fedora_37-x86_64-fedora_iot_installer-boot.json b/test/data/manifests/fedora_37-x86_64-iot_installer-boot.json
similarity index 99%
rename from test/data/manifests/fedora_37-x86_64-fedora_iot_installer-boot.json
rename to test/data/manifests/fedora_37-x86_64-iot_installer-boot.json
index 7f556394b..ff7ce8303 100644
--- a/test/data/manifests/fedora_37-x86_64-fedora_iot_installer-boot.json
+++ b/test/data/manifests/fedora_37-x86_64-iot_installer-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "fedora-37",
     "arch": "x86_64",
-    "image-type": "fedora-iot-installer",
+    "image-type": "iot-installer",
     "repositories": [
       {
         "name": "fedora",
diff --git a/test/data/manifests/fedora_37-x86_64-fedora_iot_installer_with_users-boot.json b/test/data/manifests/fedora_37-x86_64-iot_installer_with_users-boot.json
similarity index 99%
rename from test/data/manifests/fedora_37-x86_64-fedora_iot_installer_with_users-boot.json
rename to test/data/manifests/fedora_37-x86_64-iot_installer_with_users-boot.json
index ffbaf4178..1deb4d6e2 100644
--- a/test/data/manifests/fedora_37-x86_64-fedora_iot_installer_with_users-boot.json
+++ b/test/data/manifests/fedora_37-x86_64-iot_installer_with_users-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "fedora-37",
     "arch": "x86_64",
-    "image-type": "fedora-iot-installer",
+    "image-type": "iot-installer",
     "repositories": [
       {
         "name": "fedora",
diff --git a/test/data/manifests/fedora_37-x86_64-fedora_iot_raw_image-boot.json b/test/data/manifests/fedora_37-x86_64-iot_raw_image-boot.json
similarity index 99%
rename from test/data/manifests/fedora_37-x86_64-fedora_iot_raw_image-boot.json
rename to test/data/manifests/fedora_37-x86_64-iot_raw_image-boot.json
index 93d3c1904..16d363241 100644
--- a/test/data/manifests/fedora_37-x86_64-fedora_iot_raw_image-boot.json
+++ b/test/data/manifests/fedora_37-x86_64-iot_raw_image-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "fedora-37",
     "arch": "x86_64",
-    "image-type": "fedora-iot-raw-image",
+    "image-type": "iot-raw-image",
     "repositories": [
       {
         "name": "fedora",
diff --git a/test/data/manifests/fedora_38-aarch64-fedora_iot_commit-boot.json b/test/data/manifests/fedora_38-aarch64-iot_commit-boot.json
similarity index 99%
rename from test/data/manifests/fedora_38-aarch64-fedora_iot_commit-boot.json
rename to test/data/manifests/fedora_38-aarch64-iot_commit-boot.json
index 06bb7b679..b7e2e3eb5 100644
--- a/test/data/manifests/fedora_38-aarch64-fedora_iot_commit-boot.json
+++ b/test/data/manifests/fedora_38-aarch64-iot_commit-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "fedora-38",
     "arch": "aarch64",
-    "image-type": "fedora-iot-commit",
+    "image-type": "iot-commit",
     "repositories": [
       {
         "name": "fedora",
diff --git a/test/data/manifests/fedora_38-aarch64-fedora_iot_container-boot.json b/test/data/manifests/fedora_38-aarch64-iot_container-boot.json
similarity index 99%
rename from test/data/manifests/fedora_38-aarch64-fedora_iot_container-boot.json
rename to test/data/manifests/fedora_38-aarch64-iot_container-boot.json
index 886ec64c3..1dc8f182c 100644
--- a/test/data/manifests/fedora_38-aarch64-fedora_iot_container-boot.json
+++ b/test/data/manifests/fedora_38-aarch64-iot_container-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "fedora-38",
     "arch": "aarch64",
-    "image-type": "fedora-iot-container",
+    "image-type": "iot-container",
     "repositories": [
       {
         "name": "fedora",
diff --git a/test/data/manifests/fedora_38-aarch64-fedora_iot_installer-boot.json b/test/data/manifests/fedora_38-aarch64-iot_installer-boot.json
similarity index 99%
rename from test/data/manifests/fedora_38-aarch64-fedora_iot_installer-boot.json
rename to test/data/manifests/fedora_38-aarch64-iot_installer-boot.json
index de4c95ad1..b195f29ec 100644
--- a/test/data/manifests/fedora_38-aarch64-fedora_iot_installer-boot.json
+++ b/test/data/manifests/fedora_38-aarch64-iot_installer-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "fedora-38",
     "arch": "aarch64",
-    "image-type": "fedora-iot-installer",
+    "image-type": "iot-installer",
     "repositories": [
       {
         "name": "fedora",
diff --git a/test/data/manifests/fedora_38-aarch64-fedora_iot_installer_with_users-boot.json b/test/data/manifests/fedora_38-aarch64-iot_installer_with_users-boot.json
similarity index 99%
rename from test/data/manifests/fedora_38-aarch64-fedora_iot_installer_with_users-boot.json
rename to test/data/manifests/fedora_38-aarch64-iot_installer_with_users-boot.json
index dfa5a4e60..03d9963b3 100644
--- a/test/data/manifests/fedora_38-aarch64-fedora_iot_installer_with_users-boot.json
+++ b/test/data/manifests/fedora_38-aarch64-iot_installer_with_users-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "fedora-38",
     "arch": "aarch64",
-    "image-type": "fedora-iot-installer",
+    "image-type": "iot-installer",
     "repositories": [
       {
         "name": "fedora",
diff --git a/test/data/manifests/fedora_38-aarch64-fedora_iot_raw_image-boot.json b/test/data/manifests/fedora_38-aarch64-iot_raw_image-boot.json
similarity index 99%
rename from test/data/manifests/fedora_38-aarch64-fedora_iot_raw_image-boot.json
rename to test/data/manifests/fedora_38-aarch64-iot_raw_image-boot.json
index 138bc4813..baddae70a 100644
--- a/test/data/manifests/fedora_38-aarch64-fedora_iot_raw_image-boot.json
+++ b/test/data/manifests/fedora_38-aarch64-iot_raw_image-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "fedora-38",
     "arch": "aarch64",
-    "image-type": "fedora-iot-raw-image",
+    "image-type": "iot-raw-image",
     "repositories": [
       {
         "name": "fedora",
diff --git a/test/data/manifests/fedora_38-x86_64-fedora_iot_commit-boot.json b/test/data/manifests/fedora_38-x86_64-iot_commit-boot.json
similarity index 99%
rename from test/data/manifests/fedora_38-x86_64-fedora_iot_commit-boot.json
rename to test/data/manifests/fedora_38-x86_64-iot_commit-boot.json
index 4e954b8d0..f4c8e1fe1 100644
--- a/test/data/manifests/fedora_38-x86_64-fedora_iot_commit-boot.json
+++ b/test/data/manifests/fedora_38-x86_64-iot_commit-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "fedora-38",
     "arch": "x86_64",
-    "image-type": "fedora-iot-commit",
+    "image-type": "iot-commit",
     "repositories": [
       {
         "name": "fedora",
diff --git a/test/data/manifests/fedora_38-x86_64-fedora_iot_commit_debug-boot.json b/test/data/manifests/fedora_38-x86_64-iot_commit_debug-boot.json
similarity index 99%
rename from test/data/manifests/fedora_38-x86_64-fedora_iot_commit_debug-boot.json
rename to test/data/manifests/fedora_38-x86_64-iot_commit_debug-boot.json
index f3f6f401b..5d9b738fe 100644
--- a/test/data/manifests/fedora_38-x86_64-fedora_iot_commit_debug-boot.json
+++ b/test/data/manifests/fedora_38-x86_64-iot_commit_debug-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "fedora-38",
     "arch": "x86_64",
-    "image-type": "fedora-iot-commit",
+    "image-type": "iot-commit",
     "repositories": [
       {
         "name": "fedora",
diff --git a/test/data/manifests/fedora_38-x86_64-fedora_iot_container-boot.json b/test/data/manifests/fedora_38-x86_64-iot_container-boot.json
similarity index 99%
rename from test/data/manifests/fedora_38-x86_64-fedora_iot_container-boot.json
rename to test/data/manifests/fedora_38-x86_64-iot_container-boot.json
index 51113dae0..315f5ef6b 100644
--- a/test/data/manifests/fedora_38-x86_64-fedora_iot_container-boot.json
+++ b/test/data/manifests/fedora_38-x86_64-iot_container-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "fedora-38",
     "arch": "x86_64",
-    "image-type": "fedora-iot-container",
+    "image-type": "iot-container",
     "repositories": [
       {
         "name": "fedora",
diff --git a/test/data/manifests/fedora_38-x86_64-fedora_iot_installer-boot.json b/test/data/manifests/fedora_38-x86_64-iot_installer-boot.json
similarity index 99%
rename from test/data/manifests/fedora_38-x86_64-fedora_iot_installer-boot.json
rename to test/data/manifests/fedora_38-x86_64-iot_installer-boot.json
index 3d1c0c11e..1b3c8f8af 100644
--- a/test/data/manifests/fedora_38-x86_64-fedora_iot_installer-boot.json
+++ b/test/data/manifests/fedora_38-x86_64-iot_installer-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "fedora-38",
     "arch": "x86_64",
-    "image-type": "fedora-iot-installer",
+    "image-type": "iot-installer",
     "repositories": [
       {
         "name": "fedora",
diff --git a/test/data/manifests/fedora_38-x86_64-fedora_iot_installer_with_users-boot.json b/test/data/manifests/fedora_38-x86_64-iot_installer_with_users-boot.json
similarity index 99%
rename from test/data/manifests/fedora_38-x86_64-fedora_iot_installer_with_users-boot.json
rename to test/data/manifests/fedora_38-x86_64-iot_installer_with_users-boot.json
index af062730e..67130cc86 100644
--- a/test/data/manifests/fedora_38-x86_64-fedora_iot_installer_with_users-boot.json
+++ b/test/data/manifests/fedora_38-x86_64-iot_installer_with_users-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "fedora-38",
     "arch": "x86_64",
-    "image-type": "fedora-iot-installer",
+    "image-type": "iot-installer",
     "repositories": [
       {
         "name": "fedora",
diff --git a/test/data/manifests/fedora_38-x86_64-fedora_iot_raw_image-boot.json b/test/data/manifests/fedora_38-x86_64-iot_raw_image-boot.json
similarity index 99%
rename from test/data/manifests/fedora_38-x86_64-fedora_iot_raw_image-boot.json
rename to test/data/manifests/fedora_38-x86_64-iot_raw_image-boot.json
index 1165403d4..194b1fdde 100644
--- a/test/data/manifests/fedora_38-x86_64-fedora_iot_raw_image-boot.json
+++ b/test/data/manifests/fedora_38-x86_64-iot_raw_image-boot.json
@@ -2,7 +2,7 @@
   "compose-request": {
     "distro": "fedora-38",
     "arch": "x86_64",
-    "image-type": "fedora-iot-raw-image",
+    "image-type": "iot-raw-image",
     "repositories": [
       {
         "name": "fedora",
diff --git a/tools/test-case-generators/format-request-map.json b/tools/test-case-generators/format-request-map.json
index 314e8ec62..a2eb04360 100644
--- a/tools/test-case-generators/format-request-map.json
+++ b/tools/test-case-generators/format-request-map.json
@@ -240,22 +240,22 @@
     "no-image-info": true,
     "overrides": {}
   },
-  "fedora-iot-commit": {
+  "iot-commit": {
     "compose-request": {
       "distro": "",
       "arch": "",
-      "image-type": "fedora-iot-commit",
+      "image-type": "iot-commit",
       "repositories": [],
       "filename": "commit.tar",
       "blueprint": {}
     },
     "overrides": {}
   },
-  "fedora-iot-commit-debug": {
+  "iot-commit-debug": {
     "compose-request": {
       "distro": "",
       "arch": "",
-      "image-type": "fedora-iot-commit",
+      "image-type": "iot-commit",
       "repositories": [],
       "filename": "commit.tar",
       "blueprint": {
@@ -271,22 +271,22 @@
       "x86_64"
     ]
   },
-  "fedora-iot-container": {
+  "iot-container": {
     "compose-request": {
       "distro": "",
       "arch": "",
-      "image-type": "fedora-iot-container",
+      "image-type": "iot-container",
       "repositories": [],
       "filename": "container.tar",
       "blueprint": {}
     },
     "overrides": {}
   },
-  "fedora-iot-installer": {
+  "iot-installer": {
     "compose-request": {
       "distro": "",
       "arch": "",
-      "image-type": "fedora-iot-installer",
+      "image-type": "iot-installer",
       "repositories": [],
       "filename": "installer.iso",
       "ostree": {
@@ -299,11 +299,11 @@
     "no-image-info": true,
     "overrides": {}
   },
-  "fedora-iot-installer-with-users": {
+  "iot-installer-with-users": {
     "compose-request": {
       "distro": "",
       "arch": "",
-      "image-type": "fedora-iot-installer",
+      "image-type": "iot-installer",
       "repositories": [],
       "filename": "installer.iso",
       "ostree": {
@@ -345,11 +345,11 @@
     "no-image-info": true,
     "overrides": {}
   },
-  "fedora-iot-raw-image": {
+  "iot-raw-image": {
     "compose-request": {
       "distro": "",
       "arch": "",
-      "image-type": "fedora-iot-raw-image",
+      "image-type": "iot-raw-image",
       "repositories": [],
       "filename": "image.raw.xz",
       "ostree": {