diff --git a/src/daemon/budgie-daemon.desktop.in b/src/daemon/budgie-daemon.desktop.in
index dd144db..00c7126 100644
--- a/src/daemon/budgie-daemon.desktop.in
+++ b/src/daemon/budgie-daemon.desktop.in
@@ -1,13 +1,13 @@
 [Desktop Entry]
 Type=Application
 Name=Budgie Background Services
 Comment=Budgie Background Services
 Exec=budgie-daemon
 Terminal=false
 Categories=GNOME;GTK;System;Core;
 NoDisplay=true
 StartupNotify=true
 X-GNOME-AutoRestart=true
 X-GNOME-Autostart-Notify=true
 X-GNOME-Autostart-Phase=Desktop
-OnlyShowIn=Budgie
+OnlyShowIn=X-Budgie;
diff --git a/src/panel/budgie-panel.desktop.in b/src/panel/budgie-panel.desktop.in
index 3582d2c..5006b70 100644
--- a/src/panel/budgie-panel.desktop.in
+++ b/src/panel/budgie-panel.desktop.in
@@ -1,14 +1,14 @@
 [Desktop Entry]
 Type=Application
 _Name=Budgie Panel
 _Comment=Launch other applications and provide various utilities to manage windows, show the time, etc.
 Exec=budgie-panel
 Terminal=false
 Categories=GNOME;GTK;System;Core;
 NoDisplay=true
 StartupNotify=true
 X-GNOME-AutoRestart=false
 X-GNOME-Autostart-Notify=true
 X-GNOME-Autostart-Phase=Panel
 X-GNOME-Provides=panel
-OnlyShowIn=Budgie;
+OnlyShowIn=X-Budgie;
diff --git a/src/polkit/budgie-polkit.desktop.in b/src/polkit/budgie-polkit.desktop.in
index 17be847..7ac38b4 100644
--- a/src/polkit/budgie-polkit.desktop.in
+++ b/src/polkit/budgie-polkit.desktop.in
@@ -1,13 +1,13 @@
 [Desktop Entry]
 Type=Application
 Name=Budgie PolicyKit UI
 Comment=Budgie PolicyKit Authorisation UI
 Exec=budgie-polkit-dialog
 Terminal=false
 Categories=GNOME;GTK;System;Core;
 NoDisplay=true
 StartupNotify=true
 X-GNOME-AutoRestart=true
 X-GNOME-Autostart-Notify=true
 X-GNOME-Autostart-Phase=Desktop
-OnlyShowIn=Budgie
+OnlyShowIn=X-Budgie;
diff --git a/src/session/budgie-desktop-nm-applet.desktop.in b/src/session/budgie-desktop-nm-applet.desktop.in
index 8e84c59..b037700 100644
--- a/src/session/budgie-desktop-nm-applet.desktop.in
+++ b/src/session/budgie-desktop-nm-applet.desktop.in
@@ -1,14 +1,14 @@
 [Desktop Entry]
 Name=Network (Budgie Desktop)
 Comment=Manage your network connections
 Icon=nm-device-wireless
 Exec=nm-applet
 TryExec=nm-applet
 Terminal=false
 Type=Application
 NoDisplay=true
-OnlyShowIn=Budgie;
+OnlyShowIn=X-Budgie;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=NetworkManager
 X-GNOME-Bugzilla-Component=nm-applet
 X-GNOME-UsesNotifications=true
diff --git a/src/session/budgie-desktop-screensaver.desktop.in b/src/session/budgie-desktop-screensaver.desktop.in
index 490f97d..49f265c 100644
--- a/src/session/budgie-desktop-screensaver.desktop.in
+++ b/src/session/budgie-desktop-screensaver.desktop.in
@@ -1,14 +1,14 @@
 [Desktop Entry]
 Type=Application
 Name=Screensaver (Budgie Desktop)
 Comment=Launch screensaver and locker program
 Icon=preferences-desktop-screensaver
 Exec=gnome-screensaver
 TryExec=gnome-screensaver
-OnlyShowIn=Budgie;
+OnlyShowIn=X-Budgie;
 NoDisplay=true
 X-GNOME-Autostart-Phase=Application
 X-GNOME-Autostart-Notify=true
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-screensaver
 X-GNOME-Bugzilla-Component=general
diff --git a/src/session/budgie-desktop.desktop.in.in b/src/session/budgie-desktop.desktop.in.in
index 76ed710..8529ab4 100644
--- a/src/session/budgie-desktop.desktop.in.in
+++ b/src/session/budgie-desktop.desktop.in.in
@@ -1,8 +1,8 @@
 [Desktop Entry]
 _Name=Budgie Desktop
 _Comment=This session logs you into the Budgie Desktop
 Exec=@prefix@/bin/budgie-desktop
 TryExec=@prefix@/bin/budgie-desktop
 Icon=
 Type=Application
-DesktopNames=Budgie;GNOME
+DesktopNames=X-Budgie;GNOME
diff --git a/src/session/budgie-desktop.session.in.in b/src/session/budgie-desktop.session.in.in
index 5ef08ef..ff70f57 100644
--- a/src/session/budgie-desktop.session.in.in
+++ b/src/session/budgie-desktop.session.in.in
@@ -1,4 +1,4 @@
 [GNOME Session]
 _Name=Budgie Desktop
 RequiredComponents=@SESSION_COMPONENTS@;
-DesktopName=Budgie Desktop
+DesktopName=X-Budgie
diff --git a/src/wm/budgie-wm.desktop.in b/src/wm/budgie-wm.desktop.in
index 8cab306..737bff3 100644
--- a/src/wm/budgie-wm.desktop.in
+++ b/src/wm/budgie-wm.desktop.in
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Type=Application
 Name=Budgie Window Manager
 Exec=budgie-wm
 NoDisplay=true
 X-GNOME-WMSettingsModule=metacity
 X-GNOME-WMName=Budgie
 X-GnomeWMSettingsLibrary=metacity
 X-GNOME-Autostart-Phase=WindowManager
 X-GNOME-Provides=windowmanager
 X-GNOME-Autostart-Notify=true
-OnlyShowIn=Budgie;
+OnlyShowIn=X-Budgie;