diff --git a/capplets/background/background.desktop.in.in b/capplets/background/background.desktop.in.in
index 1ca11fe06..a6eac8f18 100644
--- a/capplets/background/background.desktop.in.in
+++ b/capplets/background/background.desktop.in.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 _Name=Background
 _Comment=Configuration of the desktop's background
-Exec=gnomecc --run-capplet background-properties
+Exec=gnomecc --run-capplet background-properties-capplet
 Icon=gnome-ccbackground.png
 Terminal=0
 Type=Application
diff --git a/capplets/mouse/Makefile.am b/capplets/mouse/Makefile.am
index 4fe1d0be7..a0d4cb199 100644
--- a/capplets/mouse/Makefile.am
+++ b/capplets/mouse/Makefile.am
@@ -1,8 +1,8 @@
 cappletname = mouse
-bin_PROGRAMS = mouse-properties
+bin_PROGRAMS = mouse-properties-capplet
 
-mouse_properties_LDADD = $(GNOMECC_CAPPLETS_LIBS)
-mouse_properties_SOURCES = \
+mouse_properties_capplet_LDADD = $(GNOMECC_CAPPLETS_LIBS)
+mouse_properties_capplet_SOURCES = \
 	main.c\
 	prefs-widget.c		prefs-widget.h \
 	preferences.c		preferences.h
diff --git a/capplets/mouse/mouse.desktop.in.in b/capplets/mouse/mouse.desktop.in.in
index 4c6a4ddd0..e2b5e35ce 100644
--- a/capplets/mouse/mouse.desktop.in.in
+++ b/capplets/mouse/mouse.desktop.in.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 _Name=Mouse
 _Comment=Mouse Properties
-Exec=mouse-properties
+Exec=mouse-properties-capplet
 Icon=gnome-mouse.png
 Terminal=0
 Type=Application