diff --git a/map_test.go b/map_test.go
index 5ac2607..fbeb444 100644
--- a/map_test.go
+++ b/map_test.go
@@ -27,10 +27,10 @@ var _ = Describe("Map", func() {
 		      "file_url": "https://dl.armbian.com/aml-s9xx-box/archive/Armbian_23.11.1_Aml-s9xx-box_bookworm_current_6.1.63.img.xz",
 		      "file_updated": "2023-11-30T01:14:49Z",
 		      "file_size": "566235552",
-		      "distro_release": "bookworm",
-		      "kernel_branch": "current",
-		      "image_variant": "server",
-		      "preinstalled_application": "",
+		      "distro": "bookworm",
+		      "branch": "current",
+		      "variant": "server",
+		      "file_application": "",
 		      "promoted": "true",
 		      "download_repository": "archive",
 		      "file_extension": "img.xz"
@@ -62,10 +62,10 @@ var _ = Describe("Map", func() {
       "redi_url_torrent": "https://dl.armbian.com/khadas-vim1/Noble_current_xfce.torrent",
       "file_updated": "2025-11-22T15:39:59Z",
       "file_size": "1482867344",
-      "distro_release": "noble",
-      "kernel_branch": "current",
-      "image_variant": "xfce",
-      "preinstalled_application": "",
+      "distro": "noble",
+      "branch": "current",
+      "variant": "xfce",
+      "file_application": "",
       "promoted": "false",
       "download_repository": "archive",
       "file_extension": "img.xz"
@@ -85,10 +85,10 @@ var _ = Describe("Map", func() {
       "redi_url_torrent": "https://dl.armbian.com/khadas-vim1/Noble_current_xfce.torrent",
       "file_updated": "2025-11-22T15:39:59Z",
       "file_size": "1482867344",
-      "distro_release": "noble",
-      "kernel_branch": "current",
-      "image_variant": "xfce",
-      "preinstalled_application": "test",
+      "distro": "noble",
+      "branch": "current",
+      "variant": "xfce",
+      "file_application": "test",
       "promoted": "false",
       "download_repository": "archive",
       "file_extension": "img.xz"
@@ -114,10 +114,10 @@ var _ = Describe("Map", func() {
       "file_url_asc": "asc_test_url_vim4",
       "file_updated": "2023-11-30T01:03:05Z",
       "file_size": "477868032",
-      "distro_release": "bookworm",
-      "kernel_branch": "legacy",
-      "image_variant": "server",
-      "preinstalled_application": "",
+      "distro": "bookworm",
+      "branch": "legacy",
+      "variant": "server",
+      "file_application": "",
       "promoted": "true",
       "download_repository": "archive",
       "file_extension": "oowow.img.xz"
@@ -131,10 +131,10 @@ var _ = Describe("Map", func() {
       "redi_url": "https://dl.armbian.com/uefi-arm64/Bookworm_current_minimal",
       "file_updated": "2024-07-25T18:01:20Z",
       "file_size": "673315888",
-      "distro_release": "bookworm",
-      "kernel_branch": "current",
-      "image_variant": "minimal",
-      "preinstalled_application": "",
+      "distro": "bookworm",
+      "branch": "current",
+      "variant": "minimal",
+      "file_application": "",
       "promoted": "false",
       "download_repository": "archive",
       "file_extension": "img.qcow2"
@@ -148,10 +148,10 @@ var _ = Describe("Map", func() {
       "redi_url": "https://dl.armbian.com/qemu-uboot-arm64/Bookworm_current_minimal",
       "file_updated": "2024-08-09T10:07:43Z",
       "file_size": "314832",
-      "distro_release": "bookworm",
-      "kernel_branch": "current",
-      "image_variant": "minimal",
-      "preinstalled_application": "",
+      "distro": "bookworm",
+      "branch": "current",
+      "variant": "minimal",
+      "file_application": "",
       "promoted": "false",
       "download_repository": "os",
       "file_extension": "boot.bin.xz"