diff --git a/capplets/file-types/file-types-capplet.c b/capplets/file-types/file-types-capplet.c
index ee275a7c1..d0916961a 100644
--- a/capplets/file-types/file-types-capplet.c
+++ b/capplets/file-types/file-types-capplet.c
@@ -184,7 +184,7 @@ main (int argc, char **argv)
         textdomain (PACKAGE);
 	
 	
-        init_results = gnome_capplet_init ("mime-type-capplet", VERSION, argc, argv, NULL, 0, NULL);
+        init_results = gnome_capplet_init ("file-types-capplet", VERSION, argc, argv, NULL, 0, NULL);
 
 	if (init_results < 0) {
                 exit (0);
diff --git a/capplets/mime-type/mime-type-capplet.c b/capplets/mime-type/mime-type-capplet.c
index 665e60311..8d75d2cf5 100644
--- a/capplets/mime-type/mime-type-capplet.c
+++ b/capplets/mime-type/mime-type-capplet.c
@@ -126,7 +126,7 @@ main (int argc, char **argv)
         bindtextdomain (PACKAGE, GNOMELOCALEDIR);
         textdomain (PACKAGE);
 
-        init_results = gnome_capplet_init("mime-type-capplet", VERSION,
+        init_results = gnome_capplet_init("mime-type", VERSION,
                                           argc, argv, NULL, 0, NULL);
 
 	if (init_results < 0) {
diff --git a/capplets/theme-switcher/Makefile.am b/capplets/theme-switcher/Makefile.am
index 1ebf2bbed..ecbe93081 100644
--- a/capplets/theme-switcher/Makefile.am
+++ b/capplets/theme-switcher/Makefile.am
@@ -4,9 +4,9 @@ INCLUDES = -I. -I$(srcdir) 				\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
 	@CAPPLET_CFLAGS@
 
-bin_PROGRAMS = theme-selector-capplet
+bin_PROGRAMS = gtk-theme-selector-capplet
 
-theme_selector_capplet_SOURCES = \
+gtk_theme_selector_capplet_SOURCES = \
         da.h		\
 	file.c		\
 	globals.c	\
@@ -17,13 +17,13 @@ theme_selector_capplet_SOURCES = \
 	gui.c           \
 	install.c
 
-theme_selector_capplet_LDADD = @CAPPLET_LIBS@
+gtk_theme_selector_capplet_LDADD = @CAPPLET_LIBS@
 
 EXTRA_DIST = \
-	theme-selector.desktop
+	gtk-theme-selector.desktop
 
 sysdir = $(datadir)/control-center/capplets/Advanced
-sys_DATA = theme-selector.desktop
+sys_DATA = gtk-theme-selector.desktop
 
 psysdir = $(datadir)/gnome/apps/Settings/Advanced
-psys_DATA = theme-selector.desktop
+psys_DATA = gtk-theme-selector.desktop
diff --git a/capplets/theme-switcher/gtk-theme-selector.desktop b/capplets/theme-switcher/gtk-theme-selector.desktop
new file mode 100644
index 000000000..818e2b614
--- /dev/null
+++ b/capplets/theme-switcher/gtk-theme-selector.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=Gtk+ Theme Selector
+Comment=Select which gtk+ theme to use
+Exec=gtk-theme-selector-capplet
+Icon=gnome-ccthemes.png
+Terminal=0
+Type=Application
diff --git a/capplets/theme-switcher/main.c b/capplets/theme-switcher/main.c
index c693dca32..3e974f632 100644
--- a/capplets/theme-switcher/main.c
+++ b/capplets/theme-switcher/main.c
@@ -19,7 +19,7 @@ main(int argc, char **argv)
 
   set_tmp_rc();
   child_pid = do_demo(argc, argv);
-  switch (gnome_capplet_init ("theme-switcher-capplet",
+  switch (gnome_capplet_init ("gtk-theme-selector",
 			      THEME_SWITCHER_VERSION, argc, argv, NULL, 0, NULL)) {
   case -1:
 	  exit (1);
diff --git a/capplets/theme-switcher/theme-selector.desktop b/capplets/theme-switcher/theme-selector.desktop
deleted file mode 100644
index 83f5f137f..000000000
--- a/capplets/theme-switcher/theme-selector.desktop
+++ /dev/null
@@ -1,61 +0,0 @@
-[Desktop Entry]
-Name=Theme Selector
-Name[pt_BR]=Seletor de Temas
-Name[ca]=Selector de temes
-Name[cs]=Výbìr tématu
-Name[da]=Temavælger
-Name[de]=Thema auswählen
-Name[el]=ÅðéëïãÝáò ÈåìÜôùí
-Name[es]=Selector de Temas
-Name[et]=Teemad
-Name[fi]=Teemavalitsin
-Name[fr]=Selecteur de thèmes
-Name[gl]=Escoller temas
-Name[hu]=Témaválasztó
-Name[it]=Selettore temi
-Name[ja]=¥Æ¡¼¥Þ¥»¥ì¥¯¥¿
-Name[ko]=Å׸¶ ¼±ÅÃ
-Name[lt]=Temos parinkimas
-Name[no]=Temavelger
-Name[pl]=Wybór motywu
-Name[pt]=Selector de Temas
-Name[ro]=Selector teme
-Name[ru]=ðÅÒÅËÌÀÞÁÔÅÌØ ÔÅÍ
-Name[sl]=Izbirnik Tem
-Name[sv]=Temaväljare
-Name[uk]=÷ÉÂ¦Ò ÔÅÍ
-Name[wa]=Tinmes do scribanne
-Name[zh_TW.Big5]=§G´º¥DÃD
-Name[zh_CN.GB2312]=²¼¾°Ö÷Ìâ
-Comment=Select which desktop theme to use
-Comment[pt_BR]=Selecionar o tema de área de trabalho a usar.
-Comment[ca]=Seleccionar un tema per l'escriptori.
-Comment[cs]=Výbìr tématu pracovní plochy
-Comment[da]=Vælg hvilket skrivebordstema du vil bruge.
-Comment[de]=Desktop-Thema auswählen
-Comment[el]=ÅðéëïãÞ ôïõ èÝìáôïò ôçò åðéöÜíåéáò åñãáóßáò ãéá ÷ñÞóç
-Comment[es]=Seleccionar el tema deseado para el escritorio
-Comment[et]=Töölaua teemade valik
-Comment[fi]=Valitsee käytettävän työpöytäteeman.
-Comment[fr]=Configuration du thème de bureau
-Comment[gl]=Escoller qué tema usar para o escritorio
-Comment[hu]=A GNOME alkalmazások kinézetét meghatározó téma
-Comment[it]=Selezione del tema da usare per il desktop
-Comment[ja]=¥Ç¥¹¥¯¥È¥Ã¥×¥Æ¡¼¥Þ¤ÎÁªÂò
-Comment[ko]=¾î¶² µ¥½ºÅ©Å¾ Å׸¶¸¦ »ç¿ëÇÒ Áö ¼±ÅÃ
-Comment[lt]=Pasirink, kurià darbo aplinkos temà naudoti
-Comment[no]=Velger tema for skrivebordet
-Comment[pl]=Wybór motywu zdobieñ biurka
-Comment[pt]=Selecciona qual o tema a utilizar.
-Comment[ro]=Selectaþi ce temã de desktop folosiþi
-Comment[ru]=÷ÙÂÏÒ ÔÅÍÙ
-Comment[sl]=Nastavite katera namizna tema naj se uporablja.
-Comment[sv]=Välj tema för skrivbordet
-Comment[uk]=÷ÉÂ¦Ò ÔÅÍÉ ÒÏÂÏÞÏÇÏ ÓÔÏÌÁ
-Comment[wa]=Tchwezixhoz les tinmes ki vos voloz po li scribanne
-Comment[zh_TW.Big5]=¿ï¾Ü±z­n¨Ï¥Îªº§G´º¥DÃD
-Comment[zh_CN.GB2312]=Ñ¡ÔñÄúҪʹÓõIJ¼¾°Ö÷Ìâ
-Exec=theme-selector-capplet
-Icon=gnome-ccthemes.png
-Terminal=0
-Type=Application
diff --git a/capplets/ui-properties/main.c b/capplets/ui-properties/main.c
index 4dfbd76f9..b2c1dfbd9 100644
--- a/capplets/ui-properties/main.c
+++ b/capplets/ui-properties/main.c
@@ -196,7 +196,7 @@ main (int argc, char **argv)
 	textdomain (PACKAGE);
 
 	glade_gnome_init ();
-	res = gnome_capplet_init ("ui-properties",
+	res = gnome_capplet_init ("behavior",
 				  VERSION, argc, argv, NULL,
 				  0, NULL);