diff --git a/README.md b/README.md
index 8205f2b..3919ad4 100644
--- a/README.md
+++ b/README.md
@@ -188,7 +188,7 @@ Make a PR similar to
 ```
 sed -i "s/41/42/g" *.repo comps-sync.py
 sed -i "s/releasever: 41/releasever: 42/" common.yaml
-sed -i "s/# - fedora-41/# - fedora-42/" fedora-*.yaml
+sed -i "s/# - fedora-41/# - fedora-42/" *.yaml
 mv fedora-41.repo fedora-42.repo
 mv fedora-41-updates.repo fedora-42-updates.repo
 sed -i "s/42/42/g" README.md
@@ -200,8 +200,8 @@ sed -i "s/41/42/g" README.md
 ```
 rm fedora-rawhide.repo
 sed -i "/- fedora-rawhide/d" fedora-*.yaml
-sed -i "s/# - fedora-41/- fedora-41/" fedora-*.yaml
-sed -i "s/ref: fedora\/rawhide/ref: fedora\/41/" fedora-*.yaml
+sed -i "s/# - fedora-41/- fedora-41/" *.yaml
+sed -i "s/ref: fedora\/rawhide/ref: fedora\/41/" *.yaml
 ```
 
 ## Historical references
diff --git a/fedora-base.yaml b/base.yaml
similarity index 100%
rename from fedora-base.yaml
rename to base.yaml
diff --git a/budgie-desktop-pkgs.yaml b/budgie-atomic-packages.yaml
similarity index 100%
rename from budgie-desktop-pkgs.yaml
rename to budgie-atomic-packages.yaml
diff --git a/cinnamon-desktop-pkgs.yaml b/cinnamon-atomic-packages.yaml
similarity index 100%
rename from cinnamon-desktop-pkgs.yaml
rename to cinnamon-atomic-packages.yaml
diff --git a/fedora-cinnamon.yaml b/cinnamon-atomic.yaml
similarity index 92%
rename from fedora-cinnamon.yaml
rename to cinnamon-atomic.yaml
index 0485db7..05ef3de 100644
--- a/fedora-cinnamon.yaml
+++ b/cinnamon-atomic.yaml
@@ -1,6 +1,6 @@
 include:
   - common.yaml
-  - cinnamon-desktop-pkgs.yaml
+  - cinnamon-atomic-packages.yaml
 
 ref: fedora/rawhide/${basearch}/cinnamon
 rojig:
diff --git a/comps-sync.py b/comps-sync.py
index b3708bb..5632afb 100755
--- a/comps-sync.py
+++ b/comps-sync.py
@@ -118,7 +118,7 @@ def compare_comps_manifest_package_lists(comps_group_pkgs, manifest_packages):
 
     return comps_unknown, pkgs_added
 
-def update_manifests_from_groups(comps, groups, path, desktop, save, comps_exclude_list, comps_exclude_list_all):
+def update_manifests_from_groups(comps, groups, path, variant, save, comps_exclude_list, comps_exclude_list_all):
     manifest_packages = load_packages_from_manifest(path)
 
     comps_group_pkgs = {}
@@ -131,10 +131,10 @@ def update_manifests_from_groups(comps, groups, path, desktop, save, comps_exclu
     n_manifest_new = len(comps_unknown)
     n_comps_new = len(pkgs_added)
 
-    if desktop == "common":
+    if variant == "common":
         print(f'Syncing common packages:\t+{n_comps_new}, -{n_manifest_new}')
     else:
-        print(f'Syncing packages for {desktop}:\t+{n_comps_new}, -{n_manifest_new}')
+        print(f'Syncing packages for {variant}:\t+{n_comps_new}, -{n_manifest_new}')
     if n_manifest_new != 0:
         for (pkg, arch) in sorted(comps_unknown, key = lambda x: x[0]):
             manifest_packages[arch].remove(pkg)
@@ -191,24 +191,24 @@ def main():
 
     ret += update_manifests_from_groups(comps, groups, 'common-packages.yaml', "common", args.save, comps_exclude_list, comps_exclude_list_all)
 
-    # List of comps groups used for each desktop
-    desktops_comps_groups = {
-        "gnome": ["gnome-desktop", "base-x"],
-        "kde": ["kde-desktop", "base-graphical"],
-        "kde-mobile": ["kde-mobile", "kde-mobile-apps", "base-graphical"],
-        "xfce": ["xfce-desktop", "xfce-apps", "xfce-extra-plugins", "base-x"],
-        "lxqt": ["lxqt-desktop", "base-graphical"],
-        "deepin": ["deepin-desktop", "base-x"],
-        "mate": ["mate-desktop", "base-x"],
-        "sway": ["swaywm", "swaywm-extended", "base-graphical"],
-        "cinnamon": ["cinnamon-desktop", "base-x"],
-        "budgie": ["budgie-desktop", "budgie-desktop-apps", "base-x"]
+    # List of comps groups used for each variant
+    variant_comps_groups = {
+        "budgie-atomic": ["budgie-desktop", "budgie-desktop-apps", "base-x"],
+        "cinnamon-atomic": ["cinnamon-desktop", "base-x"],
+        "deepin-atomic": ["deepin-desktop", "base-x"],
+        "kinoite": ["kde-desktop", "base-graphical"],
+        "kinoite-mobile": ["kde-mobile", "kde-mobile-apps", "base-graphical"],
+        "lxqt-atomic": ["lxqt-desktop", "base-graphical"],
+        "mate-atomic": ["mate-desktop", "base-x"],
+        "silverblue": ["gnome-desktop", "base-x"],
+        "sway-atomic": ["swaywm", "swaywm-extended", "base-graphical"],
+        "xfce-atomic": ["xfce-desktop", "xfce-apps", "xfce-extra-plugins", "base-x"],
     }
 
-    # Generate treefiles for all desktops
-    for desktop, groups in desktops_comps_groups.items():
+    # Generate treefiles for all variants
+    for variant, groups in variant_comps_groups.items():
         print()
-        ret += update_manifests_from_groups(comps, groups, f'{desktop}-desktop-pkgs.yaml', desktop, args.save, comps_desktop_exclude_list, comps_exclude_list_all)
+        ret += update_manifests_from_groups(comps, groups, f'{variant}-packages.yaml', variant, args.save, comps_desktop_exclude_list, comps_exclude_list_all)
 
     if not args.save and ret != 0:
         sys.exit(1)
diff --git a/deepin-desktop-pkgs.yaml b/deepin-atomic-packages.yaml
similarity index 100%
rename from deepin-desktop-pkgs.yaml
rename to deepin-atomic-packages.yaml
diff --git a/fedora-deepin.yaml b/deepin-atomic.yaml
similarity index 93%
rename from fedora-deepin.yaml
rename to deepin-atomic.yaml
index 80e8eb9..0498455 100644
--- a/fedora-deepin.yaml
+++ b/deepin-atomic.yaml
@@ -1,6 +1,6 @@
 include:
   - common.yaml
-  - deepin-desktop-pkgs.yaml
+  - deepin-atomic-packages.yaml
 
 ref: fedora/rawhide/${basearch}/deepin
 rojig:
diff --git a/justfile b/justfile
index e4b1a3f..cafa8c6 100644
--- a/justfile
+++ b/justfile
@@ -52,7 +52,7 @@ sync:
     fi
 
     default_variant={{default_variant}}
-    version="$(rpm-ostree compose tree --print-only --repo=repo fedora-${default_variant}.yaml | jq -r '."mutate-os-release"')"
+    version="$(rpm-ostree compose tree --print-only --repo=repo ${default_variant}.yaml | jq -r '."mutate-os-release"')"
     ./comps-sync.py --save fedora-comps/comps-f${version}.xml.in
 
 # Sync the manifests with the content of the comps groups
@@ -70,7 +70,7 @@ comps-sync:
     fi
 
     default_variant={{default_variant}}
-    version="$(rpm-ostree compose tree --print-only --repo=repo fedora-${default_variant}.yaml | jq -r '."mutate-os-release"')"
+    version="$(rpm-ostree compose tree --print-only --repo=repo ${default_variant}.yaml | jq -r '."mutate-os-release"')"
     ./comps-sync.py --save fedora-comps/comps-f${version}.xml.in
 
 # Check if the manifests are in sync with the content of the comps groups
@@ -88,7 +88,7 @@ comps-sync-check:
     fi
 
     default_variant={{default_variant}}
-    version="$(rpm-ostree compose tree --print-only --repo=repo fedora-${default_variant}.yaml | jq -r '."mutate-os-release"')"
+    version="$(rpm-ostree compose tree --print-only --repo=repo ${default_variant}.yaml | jq -r '."mutate-os-release"')"
     ./comps-sync.py fedora-comps/comps-f${version}.xml.in
 
 # Output the processed manifest for a given variant (defaults to Silverblue)
@@ -104,7 +104,7 @@ manifest variant=default_variant:
         exit 1
     fi
 
-    rpm-ostree compose tree --print-only --repo=repo fedora-{{variant}}.yaml
+    rpm-ostree compose tree --print-only --repo=repo {{variant}}.yaml
 
 # Perform dependency resolution for a given variant (defaults to Silverblue)
 compose-dry-run variant=default_variant:
@@ -118,7 +118,7 @@ compose-dry-run variant=default_variant:
         popd > /dev/null || exit 1
     fi
 
-    rpm-ostree compose tree --unified-core --repo=repo --dry-run fedora-{{variant}}.yaml
+    rpm-ostree compose tree --unified-core --repo=repo --dry-run {{variant}}.yaml
 
 # Alias/shortcut for compose-image command
 compose variant=default_variant: (compose-image variant)
@@ -151,7 +151,7 @@ compose-legacy variant=default_variant:
     timestamp="$(date --iso-8601=sec)"
     echo "${buildid}" > .buildid
 
-    version="$(rpm-ostree compose tree --print-only --repo=repo fedora-${variant}.yaml | jq -r '."mutate-os-release"')"
+    version="$(rpm-ostree compose tree --print-only --repo=repo ${variant}.yaml | jq -r '."mutate-os-release"')"
     echo "Composing ${variant_pretty} ${version}.${buildid} ..."
 
     ARGS="--repo=repo --cachedir=cache"
@@ -166,7 +166,7 @@ compose-legacy variant=default_variant:
 
     ${CMD} compose tree ${ARGS} \
         --add-metadata-string="version=${variant_pretty} ${version}.${buildid}" \
-        "fedora-${variant}.yaml" \
+        "${variant}.yaml" \
             |& tee "logs/${variant}_${version}_${buildid}.${timestamp}.log"
 
     if [[ ${EUID} -ne 0 ]]; then
@@ -203,7 +203,7 @@ compose-image variant=default_variant:
     timestamp="$(date --iso-8601=sec)"
     echo "${buildid}" > .buildid
 
-    version="$(rpm-ostree compose tree --print-only --repo=repo fedora-${variant}.yaml | jq -r '."mutate-os-release"')"
+    version="$(rpm-ostree compose tree --print-only --repo=repo ${variant}.yaml | jq -r '."mutate-os-release"')"
     echo "Composing ${variant_pretty} ${version}.${buildid} ..."
 
     ARGS="--cachedir=cache --initialize"
@@ -218,8 +218,8 @@ compose-image variant=default_variant:
 
     ${CMD} compose image ${ARGS} \
          --label="quay.expires-after=4w" \
-        "fedora-${variant}.yaml" \
-        "fedora-${variant}.ociarchive"
+        "${variant}.yaml" \
+        "${variant}.ociarchive"
 
 # Clean up everything
 clean-all:
@@ -270,7 +270,7 @@ lorax variant=default_variant:
         popd > /dev/null || exit 1
     fi
 
-    version_number="$(rpm-ostree compose tree --print-only --repo=repo fedora-${variant}.yaml | jq -r '."mutate-os-release"')"
+    version_number="$(rpm-ostree compose tree --print-only --repo=repo ${variant}.yaml | jq -r '."mutate-os-release"')"
     if [[ "$(git rev-parse --abbrev-ref HEAD)" == "main" ]] || [[ -f "fedora-rawhide.repo" ]]; then
         version_pretty="Rawhide"
         version="rawhide"
@@ -363,7 +363,7 @@ upload-container variant=default_variant:
     if [[ "$(git rev-parse --abbrev-ref HEAD)" == "main" ]] || [[ -f "fedora-rawhide.repo" ]]; then
         version="rawhide"
     else
-        version="$(rpm-ostree compose tree --print-only --repo=repo fedora-${variant}.yaml | jq -r '."mutate-os-release"')"
+        version="$(rpm-ostree compose tree --print-only --repo=repo ${variant}.yaml | jq -r '."mutate-os-release"')"
     fi
 
     image="quay.io/fedora-ostree-desktops/${variant}"
@@ -384,7 +384,8 @@ upload-container variant=default_variant:
 
     skopeo login --username "${CI_REGISTRY_USER}" --password "${CI_REGISTRY_PASSWORD}" quay.io
     # Copy fully versioned tag (major version, build date/id, git commit)
-    skopeo copy --retry-times 3 "oci-archive:fedora-${variant}.ociarchive" "docker://${image}:${version}.${buildid}.${git_commit}"
+    skopeo copy --retry-times 3 "oci-archive:${variant}.ociarchive" "docker://${image}:${version}.${buildid}.${git_commit}"
+
     # Update "un-versioned" tag (only major version)
     skopeo copy --retry-times 3 "docker://${image}:${version}.${buildid}.${git_commit}" "docker://${image}:${version}"
     if [[ "${variant}" == "kinoite-nightly" ]]; then
diff --git a/kde-mobile-desktop-pkgs.yaml b/kinoite-mobile-packages.yaml
similarity index 100%
rename from kde-mobile-desktop-pkgs.yaml
rename to kinoite-mobile-packages.yaml
diff --git a/fedora-kinoite-mobile.yaml b/kinoite-mobile.yaml
similarity index 97%
rename from fedora-kinoite-mobile.yaml
rename to kinoite-mobile.yaml
index 4204005..f449b87 100644
--- a/fedora-kinoite-mobile.yaml
+++ b/kinoite-mobile.yaml
@@ -1,6 +1,6 @@
 include:
   - common.yaml
-  - kde-mobile-desktop-pkgs.yaml
+  - kinoite-mobile-packages.yaml
 
 ref: fedora/rawhide/${basearch}/kinoite-mobile
 rojig:
diff --git a/kde-desktop-pkgs.yaml b/kinoite-packages.yaml
similarity index 100%
rename from kde-desktop-pkgs.yaml
rename to kinoite-packages.yaml
diff --git a/fedora-kinoite.yaml b/kinoite.yaml
similarity index 98%
rename from fedora-kinoite.yaml
rename to kinoite.yaml
index a2dfd9e..b1f4624 100644
--- a/fedora-kinoite.yaml
+++ b/kinoite.yaml
@@ -1,6 +1,6 @@
 include:
   - common.yaml
-  - kde-desktop-pkgs.yaml
+  - kinoite-packages.yaml
 
 ref: fedora/rawhide/${basearch}/kinoite
 rojig:
diff --git a/fedora-lazurite.yaml b/lazurite.yaml
similarity index 94%
rename from fedora-lazurite.yaml
rename to lazurite.yaml
index 9c40215..cc9bf41 100644
--- a/fedora-lazurite.yaml
+++ b/lazurite.yaml
@@ -1,6 +1,6 @@
 include:
   - common.yaml
-  - lxqt-desktop-pkgs.yaml
+  - lxqt-atomic-packages.yaml
 
 ref: fedora/rawhide/${basearch}/lazurite
 rojig:
diff --git a/lxqt-desktop-pkgs.yaml b/lxqt-atomic-packages.yaml
similarity index 100%
rename from lxqt-desktop-pkgs.yaml
rename to lxqt-atomic-packages.yaml
diff --git a/mate-desktop-pkgs.yaml b/mate-atomic-packages.yaml
similarity index 100%
rename from mate-desktop-pkgs.yaml
rename to mate-atomic-packages.yaml
diff --git a/fedora-mate.yaml b/mate-atomic.yaml
similarity index 93%
rename from fedora-mate.yaml
rename to mate-atomic.yaml
index 1059ac8..4fd935b 100644
--- a/fedora-mate.yaml
+++ b/mate-atomic.yaml
@@ -1,6 +1,6 @@
 include:
   - common.yaml
-  - mate-desktop-pkgs.yaml
+  - mate-atomic-packages.yaml
 
 ref: fedora/rawhide/${basearch}/mate
 rojig:
diff --git a/fedora-onyx.yaml b/onyx.yaml
similarity index 95%
rename from fedora-onyx.yaml
rename to onyx.yaml
index b449751..0396dbc 100644
--- a/fedora-onyx.yaml
+++ b/onyx.yaml
@@ -1,6 +1,6 @@
 include:
   - common.yaml
-  - budgie-desktop-pkgs.yaml
+  - budgie-atomic-packages.yaml
 
 ref: fedora/rawhide/${basearch}/onyx
 rojig:
diff --git a/fedora-sericea.yaml b/sericea.yaml
similarity index 94%
rename from fedora-sericea.yaml
rename to sericea.yaml
index 0ecf7f8..d996a79 100644
--- a/fedora-sericea.yaml
+++ b/sericea.yaml
@@ -1,6 +1,6 @@
 include:
   - common.yaml
-  - sway-desktop-pkgs.yaml
+  - sway-atomic-packages.yaml
 
 ref: fedora/rawhide/${basearch}/sericea
 rojig:
diff --git a/gnome-desktop-pkgs.yaml b/silverblue-packages.yaml
similarity index 100%
rename from gnome-desktop-pkgs.yaml
rename to silverblue-packages.yaml
diff --git a/fedora-silverblue.yaml b/silverblue.yaml
similarity index 97%
rename from fedora-silverblue.yaml
rename to silverblue.yaml
index 4232aa8..fc0d1c0 100644
--- a/fedora-silverblue.yaml
+++ b/silverblue.yaml
@@ -1,6 +1,6 @@
 include:
   - common.yaml
-  - gnome-desktop-pkgs.yaml
+  - silverblue-packages.yaml
 
 ref: fedora/rawhide/${basearch}/silverblue
 rojig:
diff --git a/sway-desktop-pkgs.yaml b/sway-atomic-packages.yaml
similarity index 100%
rename from sway-desktop-pkgs.yaml
rename to sway-atomic-packages.yaml
diff --git a/fedora-vauxite.yaml b/vauxite.yaml
similarity index 93%
rename from fedora-vauxite.yaml
rename to vauxite.yaml
index 28734bc..1219e66 100644
--- a/fedora-vauxite.yaml
+++ b/vauxite.yaml
@@ -1,6 +1,6 @@
 include:
   - common.yaml
-  - xfce-desktop-pkgs.yaml
+  - xfce-atomic-packages.yaml
 
 ref: fedora/rawhide/${basearch}/vauxite
 rojig:
diff --git a/xfce-desktop-pkgs.yaml b/xfce-atomic-packages.yaml
similarity index 100%
rename from xfce-desktop-pkgs.yaml
rename to xfce-atomic-packages.yaml