diff --git a/comps-f18.xml.in b/comps-f18.xml.in
index 480cf843..2c1e99ae 100644
--- a/comps-f18.xml.in
+++ b/comps-f18.xml.in
@@ -452,8 +452,8 @@
   </group>
   <group>
     <id>xfce-apps</id>
-    <_name>Applications for the XFCE Desktop</_name>
-    <_description>A set of commonly used applications for the XFCE Desktop</_description>
+    <_name>Applications for the Xfce Desktop</_name>
+    <_description>A set of commonly used applications for the Xfce Desktop</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
@@ -489,8 +489,8 @@
   </group>
   <group>
     <id>xfce-extra-plugins</id>
-    <_name>Extra plugins for the XFCE panel</_name>
-    <_description>Extend the functionality of the XFCE panel</_description>
+    <_name>Extra plugins for the Xfce panel</_name>
+    <_description>Extend the functionality of the Xfce panel</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
@@ -518,8 +518,8 @@
   </group>
   <group>
     <id>xfce-media</id>
-    <_name>Multimedia support for XFCE</_name>
-    <_description>Multimedia support for XFCE</_description>
+    <_name>Multimedia support for Xfce</_name>
+    <_description>Multimedia support for Xfce</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
@@ -532,8 +532,8 @@
   </group>
   <group>
     <id>xfce-office</id>
-    <_name>XFCE Office</_name>
-    <_description>Office suite for XFCE</_description>
+    <_name>Xfce Office</_name>
+    <_description>Office suite for Xfce</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
@@ -5731,8 +5731,8 @@
   </group>
   <group>
     <id>xfce-software-development</id>
-    <_name>XFCE Software Development</_name>
-    <_description>Install these packages in order to develop GTK+ and XFCE graphical applications.</_description>
+    <_name>Xfce Software Development</_name>
+    <_description>Install these packages in order to develop GTK+ and Xfce graphical applications.</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
@@ -5826,7 +5826,7 @@
   </environment>
   <environment>
     <id>xfce-desktop</id>
-    <_name>XFCE Desktop</_name>
+    <_name>Xfce Desktop</_name>
     <_description>A lightweight desktop environment that works well on low end machines.</_description>
     <display_order>15</display_order>
     <grouplist>
diff --git a/comps-f19.xml.in b/comps-f19.xml.in
index 23de2395..b040c409 100644
--- a/comps-f19.xml.in
+++ b/comps-f19.xml.in
@@ -465,8 +465,8 @@
   </group>
   <group>
     <id>xfce-apps</id>
-    <_name>Applications for the XFCE Desktop</_name>
-    <_description>A set of commonly used applications for the XFCE Desktop</_description>
+    <_name>Applications for the Xfce Desktop</_name>
+    <_description>A set of commonly used applications for the Xfce Desktop</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
@@ -502,8 +502,8 @@
   </group>
   <group>
     <id>xfce-extra-plugins</id>
-    <_name>Extra plugins for the XFCE panel</_name>
-    <_description>Extend the functionality of the XFCE panel</_description>
+    <_name>Extra plugins for the Xfce panel</_name>
+    <_description>Extend the functionality of the Xfce panel</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
@@ -531,8 +531,8 @@
   </group>
   <group>
     <id>xfce-media</id>
-    <_name>Multimedia support for XFCE</_name>
-    <_description>Multimedia support for XFCE</_description>
+    <_name>Multimedia support for Xfce</_name>
+    <_description>Multimedia support for Xfce</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
@@ -545,8 +545,8 @@
   </group>
   <group>
     <id>xfce-office</id>
-    <_name>XFCE Office</_name>
-    <_description>Office suite for XFCE</_description>
+    <_name>Xfce Office</_name>
+    <_description>Office suite for Xfce</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
@@ -5743,8 +5743,8 @@
   </group>
   <group>
     <id>xfce-software-development</id>
-    <_name>XFCE Software Development</_name>
-    <_description>Install these packages in order to develop GTK+ and XFCE graphical applications.</_description>
+    <_name>Xfce Software Development</_name>
+    <_description>Install these packages in order to develop GTK+ and Xfce graphical applications.</_description>
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
@@ -5838,7 +5838,7 @@
   </environment>
   <environment>
     <id>xfce-desktop</id>
-    <_name>XFCE Desktop</_name>
+    <_name>Xfce Desktop</_name>
     <_description>A lightweight desktop environment that works well on low end machines.</_description>
     <display_order>15</display_order>
     <grouplist>