diff --git a/fedora-arm-kde.ks b/fedora-arm-kde.ks
index a6e06c0..8e39df7 100644
--- a/fedora-arm-kde.ks
+++ b/fedora-arm-kde.ks
@@ -1,6 +1,6 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
-%include fedora-kde-packages.ks
+%include fedora-kde-common.ks
 
 part / --size=5690 --fstype ext4
 
diff --git a/fedora-arm-lxde.ks b/fedora-arm-lxde.ks
index 28a4a74..83bd119 100644
--- a/fedora-arm-lxde.ks
+++ b/fedora-arm-lxde.ks
@@ -1,6 +1,6 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
-%include fedora-lxde-packages.ks
+%include fedora-lxde-common.ks
 
 %post
 echo -n "Enabling initial-setup gui mode on startup"
diff --git a/fedora-arm-mate.ks b/fedora-arm-mate.ks
index d436ac1..f781c34 100644
--- a/fedora-arm-mate.ks
+++ b/fedora-arm-mate.ks
@@ -1,6 +1,6 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
-%include fedora-mate-packages.ks
+%include fedora-mate-common.ks
 
 part / --size=5500 --fstype ext4
 
diff --git a/fedora-arm-soas.ks b/fedora-arm-soas.ks
index 3d87a0b..065d5ac 100644
--- a/fedora-arm-soas.ks
+++ b/fedora-arm-soas.ks
@@ -1,6 +1,6 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
-%include fedora-soas-packages.ks
+%include fedora-soas-common.ks
 
 %post
 echo -n "Enabling initial-setup gui mode on startup"
diff --git a/fedora-arm-workstation.ks b/fedora-arm-workstation.ks
index 80ae822..5275e98 100644
--- a/fedora-arm-workstation.ks
+++ b/fedora-arm-workstation.ks
@@ -1,6 +1,6 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
-%include fedora-workstation-packages.ks
+%include fedora-workstation-common.ks
 
 part / --size=5500 --fstype ext4
 
diff --git a/fedora-arm-xfce.ks b/fedora-arm-xfce.ks
index 281fc5e..c55e299 100644
--- a/fedora-arm-xfce.ks
+++ b/fedora-arm-xfce.ks
@@ -1,6 +1,6 @@
 %include fedora-arm-base.ks
 %include fedora-arm-xbase.ks
-%include fedora-xfce-packages.ks
+%include fedora-xfce-common.ks
 
 part / --size=4000 --fstype ext4
 
diff --git a/fedora-cinnamon-packages.ks b/fedora-cinnamon-common.ks
similarity index 94%
rename from fedora-cinnamon-packages.ks
rename to fedora-cinnamon-common.ks
index d035fa1..8767a63 100644
--- a/fedora-cinnamon-packages.ks
+++ b/fedora-cinnamon-common.ks
@@ -1,4 +1,4 @@
-# fedora-cinnamon-packages.ks
+# fedora-cinnamon-common.ks
 #
 # Description:
 # - Fedora package set for the Cinnamon Desktop Environment
diff --git a/fedora-kde-packages.ks b/fedora-kde-common.ks
similarity index 100%
rename from fedora-kde-packages.ks
rename to fedora-kde-common.ks
diff --git a/fedora-live-cinnamon.ks b/fedora-live-cinnamon.ks
index e41f4ad..c85890c 100644
--- a/fedora-live-cinnamon.ks
+++ b/fedora-live-cinnamon.ks
@@ -8,7 +8,7 @@
 
 %include fedora-live-base.ks
 %include fedora-live-minimization.ks
-%include fedora-cinnamon-packages.ks
+%include fedora-cinnamon-common.ks
 
 part / --size=6144
 
diff --git a/fedora-live-kde-base.ks b/fedora-live-kde-base.ks
index 4819a2f..3934d85 100644
--- a/fedora-live-kde-base.ks
+++ b/fedora-live-kde-base.ks
@@ -3,7 +3,7 @@
 # mailto:kde@lists.fedoraproject.org
 
 %include fedora-live-base.ks
-%include fedora-kde-packages.ks
+%include fedora-kde-common.ks
 
 %post
 
diff --git a/fedora-live-lxde.ks b/fedora-live-lxde.ks
index 9fe8a30..da3b5f2 100644
--- a/fedora-live-lxde.ks
+++ b/fedora-live-lxde.ks
@@ -8,7 +8,7 @@
 
 %include fedora-live-base.ks
 %include fedora-live-minimization.ks
-%include fedora-lxde-packages.ks
+%include fedora-lxde-common.ks
 
 %post
 # LXDE and LXDM configuration
diff --git a/fedora-live-mate_compiz.ks b/fedora-live-mate_compiz.ks
index 664ef9e..d6af944 100644
--- a/fedora-live-mate_compiz.ks
+++ b/fedora-live-mate_compiz.ks
@@ -4,7 +4,7 @@
 # mailto:desktop@lists.fedoraproject.org
 
 %include fedora-live-base.ks
-%include fedora-mate-packages.ks
+%include fedora-mate-common.ks
 %include fedora-live-minimization.ks
 
 part / --size 6144
diff --git a/fedora-live-soas.ks b/fedora-live-soas.ks
index 3830ee4..50ff1ae 100644
--- a/fedora-live-soas.ks
+++ b/fedora-live-soas.ks
@@ -10,7 +10,7 @@
 
 %include fedora-live-base.ks
 %include fedora-live-minimization.ks
-%include fedora-soas-packages.ks
+%include fedora-soas-common.ks
 
 firewall --enabled --service=mdns,presence
 
diff --git a/fedora-live-workstation.ks b/fedora-live-workstation.ks
index 3d4ade2..62f6403 100644
--- a/fedora-live-workstation.ks
+++ b/fedora-live-workstation.ks
@@ -3,7 +3,7 @@
 # mailto:desktop@lists.fedoraproject.org
 
 %include fedora-live-base.ks
-%include fedora-workstation-packages.ks
+%include fedora-workstation-common.ks
 %include snippets/packagekit-cached-metadata.ks
 
 part / --size 6656
diff --git a/fedora-live-xfce.ks b/fedora-live-xfce.ks
index de13dc0..c971a22 100644
--- a/fedora-live-xfce.ks
+++ b/fedora-live-xfce.ks
@@ -11,7 +11,7 @@
 
 %include fedora-live-base.ks
 %include fedora-live-minimization.ks
-%include fedora-xfce-packages.ks
+%include fedora-xfce-common.ks
 
 %post
 # xfce configuration
diff --git a/fedora-lxde-packages.ks b/fedora-lxde-common.ks
similarity index 100%
rename from fedora-lxde-packages.ks
rename to fedora-lxde-common.ks
diff --git a/fedora-mate-packages.ks b/fedora-mate-common.ks
similarity index 100%
rename from fedora-mate-packages.ks
rename to fedora-mate-common.ks
diff --git a/fedora-soas-packages.ks b/fedora-soas-common.ks
similarity index 100%
rename from fedora-soas-packages.ks
rename to fedora-soas-common.ks
diff --git a/fedora-workstation-packages.ks b/fedora-workstation-common.ks
similarity index 100%
rename from fedora-workstation-packages.ks
rename to fedora-workstation-common.ks
diff --git a/fedora-xfce-packages.ks b/fedora-xfce-common.ks
similarity index 100%
rename from fedora-xfce-packages.ks
rename to fedora-xfce-common.ks