diff --git a/comps-f19.xml.in b/comps-f19.xml.in
index 8ae97df7..b1454146 100644
--- a/comps-f19.xml.in
+++ b/comps-f19.xml.in
@@ -754,16 +754,16 @@
     </packagelist>
   </group>
   <group>
-    <id>xmonad-gnome</id>
-    <_name>XMonad for GNOME</_name>
-    <_description>XMonad window manager with GNOME</_description>
+    <id>xmonad-mate</id>
+    <_name>XMonad for MATE</_name>
+    <_description>XMonad window manager with MATE</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq>control-center</packagereq>
-      <packagereq>gnome-panel</packagereq>
-      <packagereq>gnome-screensaver</packagereq>
-      <packagereq>xmonad-gnome</packagereq>
+      <packagereq>mate-control-center</packagereq>
+      <packagereq>mate-panel</packagereq>
+      <packagereq>mate-screensaver</packagereq>
+      <packagereq>xmonad-mate</packagereq>
     </packagelist>
   </group>
   <group>
@@ -6319,7 +6319,7 @@
       <groupid>sugar-desktop</groupid>
       <groupid>xfce-desktop</groupid>
       <groupid>xmonad</groupid>
-      <groupid>xmonad-gnome</groupid>
+      <groupid>xmonad-mate</groupid>
     </optionlist>
   </environment>
   <environment>
diff --git a/comps-f20.xml.in b/comps-f20.xml.in
index b04bf6d6..7a21f492 100644
--- a/comps-f20.xml.in
+++ b/comps-f20.xml.in
@@ -749,16 +749,16 @@
     </packagelist>
   </group>
   <group>
-    <id>xmonad-gnome</id>
-    <_name>XMonad for GNOME</_name>
-    <_description>XMonad window manager with GNOME</_description>
+    <id>xmonad-mate</id>
+    <_name>XMonad for MATE</_name>
+    <_description>XMonad window manager with MATE</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq>control-center</packagereq>
-      <packagereq>gnome-panel</packagereq>
-      <packagereq>gnome-screensaver</packagereq>
-      <packagereq>xmonad-gnome</packagereq>
+      <packagereq>mate-control-center</packagereq>
+      <packagereq>mate-panel</packagereq>
+      <packagereq>mate-screensaver</packagereq>
+      <packagereq>xmonad-mate</packagereq>
     </packagelist>
   </group>
   <group>
@@ -6310,7 +6310,7 @@
       <groupid>sugar-desktop</groupid>
       <groupid>xfce-desktop</groupid>
       <groupid>xmonad</groupid>
-      <groupid>xmonad-gnome</groupid>
+      <groupid>xmonad-mate</groupid>
     </optionlist>
   </environment>
   <environment>