diff --git a/fedora-install-fedora.ks b/fedora-install-fedora.ks
index cbc5bbc..ff0a40f 100644
--- a/fedora-install-fedora.ks
+++ b/fedora-install-fedora.ks
@@ -15,7 +15,6 @@ repo --name=fedora-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorl
 
 
 # Package manifest for the compose.  Uses repo group metadata to translate groups.
-# (@base is added by default unless you add --nobase to %packages)
 # (default groups for the configured repos are added by --default)
 %packages --default
 # core
@@ -26,7 +25,7 @@ dracut-*
 
 ## common stuff
 @x-server
-@base
+@standard
 @core
 @dial-up
 @fonts
diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index 0810a99..7e96d11 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -24,7 +24,7 @@ repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?rep
 
 %packages
 @base-x
-@base
+@standard
 @core
 @fonts
 @input-methods
diff --git a/fedora-live-desktop.ks b/fedora-live-desktop.ks
index df29467..9e2018d 100644
--- a/fedora-live-desktop.ks
+++ b/fedora-live-desktop.ks
@@ -16,7 +16,7 @@ part / --size 4096
 # desktop image at some point.  We won't touch this one for now.
 nss-mdns
 
-# This one needs to be kicked out of @base
+# This one needs to be kicked out of @standard
 -smartmontools
 
 # The gnome-shell team does not want extensions in the default spin;
diff --git a/fedora-live-mini.ks b/fedora-live-mini.ks
index 7d48921..13fac47 100644
--- a/fedora-live-mini.ks
+++ b/fedora-live-mini.ks
@@ -19,7 +19,7 @@ repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?rep
 
 %packages
 @base-x
-@base
+@standard
 @core
 @hardware-support
 kernel
diff --git a/fedora-livecd-kde.ks b/fedora-livecd-kde.ks
index a867ea3..b613362 100644
--- a/fedora-livecd-kde.ks
+++ b/fedora-livecd-kde.ks
@@ -63,7 +63,7 @@ wqy-microhei-fonts	# a compact CJK font, to replace:
 -ibus*
 -iok
 
-# save some space (from @base)
+# save some space (from @standard)
 -make
 
 # save space (it pulls in gdisk/udisks2/libicu)
diff --git a/fedora-virt-server.ks.in b/fedora-virt-server.ks.in
index 24375be..d77529b 100644
--- a/fedora-virt-server.ks.in
+++ b/fedora-virt-server.ks.in
@@ -46,7 +46,7 @@ part / --size=550 --grow --fstype=ext4
 part swap --recommended
 
 %packages
-@base
+@standard
 %end
 
 #