diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4315f08..86919ef 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,7 +24,7 @@ build-image:
   extends: .build-image
   parallel:
     matrix:
-      - TIER: [minimal, tier-1, tier-x]
+      - TIER: [minimal, standard, tier-x]
   variables:
     EXTRA_ARGS: "--security-opt=label=disable --cap-add=all --build-arg MANIFEST=fedora-$TIER.yaml"
   rules:
diff --git a/README.md b/README.md
index 4d82095..4c2d4bd 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ podman build --security-opt=label=disable --cap-add=all \
   --device /dev/fuse -t localhost/fedora-bootc .
 ```
 
-See the `Containerfile` for more details. This builds the default `tier-1` image.
+See the `Containerfile` for more details. This builds the default `standard` image.
 
 ## Fedora versions
 
@@ -58,7 +58,7 @@ It is planned to rework and improve this in the future, especially
 to support smaller custom images. For more on this, see
 [this tracker issue](https://gitlab.com/fedora/bootc/tracker/-/issues/32).
 
-- **tier-1**: This image is the default, what is published as
+- **standard**: This image is the default, what is published as
   https://quay.io/repository/fedora/fedora-bootc
 - **minimal**: This content set is more of a convenient centralization point for CI
   and curation around a package set that is intended as a starting point fror
@@ -69,7 +69,7 @@ to support smaller custom images. For more on this, see
   To build this, pass `--build-arg=MANIFEST=fedora-tier-x.yaml` to the build
   command above.
 
-**tier-1** inherits from **tier-x** and **tier-x** in turn inherit from **minimal**.
+**standard** inherits from **tier-x** and **tier-x** in turn inherit from **minimal**.
 
 All non-trivial changes to **minimal** and **tier-x** should be ACKed by at least
 one stakeholder of each Fedora variant WGs.
diff --git a/fedora-bootc.yaml b/fedora-bootc.yaml
index 11763a0..e8251b2 100644
--- a/fedora-bootc.yaml
+++ b/fedora-bootc.yaml
@@ -4,4 +4,4 @@ metadata:
 
 include:
   - fedora-generic.yaml
-  - tier-1/manifest.yaml
+  - standard/manifest.yaml
diff --git a/fedora-tier-1.yaml b/fedora-standard.yaml
similarity index 100%
rename from fedora-tier-1.yaml
rename to fedora-standard.yaml
diff --git a/tier-1/autoupdates.yaml b/standard/autoupdates.yaml
similarity index 100%
rename from tier-1/autoupdates.yaml
rename to standard/autoupdates.yaml
diff --git a/tier-1/bootc-generic-growpart b/standard/bootc-generic-growpart
similarity index 100%
rename from tier-1/bootc-generic-growpart
rename to standard/bootc-generic-growpart
diff --git a/tier-1/bootc-generic-growpart.service b/standard/bootc-generic-growpart.service
similarity index 100%
rename from tier-1/bootc-generic-growpart.service
rename to standard/bootc-generic-growpart.service
diff --git a/tier-1/coreos-user-experience.yaml b/standard/coreos-user-experience.yaml
similarity index 100%
rename from tier-1/coreos-user-experience.yaml
rename to standard/coreos-user-experience.yaml
diff --git a/tier-1/generic-growfs.yaml b/standard/generic-growfs.yaml
similarity index 100%
rename from tier-1/generic-growfs.yaml
rename to standard/generic-growfs.yaml
diff --git a/tier-1/initramfs-full.yaml b/standard/initramfs-full.yaml
similarity index 54%
rename from tier-1/initramfs-full.yaml
rename to standard/initramfs-full.yaml
index 2c55a83..b84a498 100644
--- a/tier-1/initramfs-full.yaml
+++ b/standard/initramfs-full.yaml
@@ -1,8 +1,8 @@
-# Configuration for the "tier-1" initramfs
+# Configuration for the initramfs
 postprocess:
   - |
     #!/usr/bin/env bash
     mkdir -p /usr/lib/dracut/dracut.conf.d
-    cat > /usr/lib/dracut/dracut.conf.d/30-bootc-tier-1.conf << 'EOF'
+    cat > /usr/lib/dracut/dracut.conf.d/30-bootc-standard.conf << 'EOF'
     add_dracutmodules+=" lvm crypt fips "
     EOF
diff --git a/tier-1/manifest.yaml b/standard/manifest.yaml
similarity index 100%
rename from tier-1/manifest.yaml
rename to standard/manifest.yaml
diff --git a/tier-1/networking-tools.yaml b/standard/networking-tools.yaml
similarity index 100%
rename from tier-1/networking-tools.yaml
rename to standard/networking-tools.yaml
diff --git a/tier-1/persistent-journal.yaml b/standard/persistent-journal.yaml
similarity index 100%
rename from tier-1/persistent-journal.yaml
rename to standard/persistent-journal.yaml
diff --git a/tier-1/system-configuration.yaml b/standard/system-configuration.yaml
similarity index 100%
rename from tier-1/system-configuration.yaml
rename to standard/system-configuration.yaml