Rename a number of libraries and executables to avoid conflicts with KDE4

417 files changed, 449 insertions, 449 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 564d7539..4739fdeb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,10 +48,10 @@ option( WITH_ARTS "Enable aRts support" OFF )
 
 ##### options comments ##########################
 
-# WITH_XSCREENSAVER affects kscreensaver
-# WITH_LIBART       affects kscreensaver
-# WITH_OPENGL       affects kscreensaver
-# WITH_ARTS         affects kscreensaver
+# WITH_XSCREENSAVER affects tdescreensaver
+# WITH_LIBART       affects tdescreensaver
+# WITH_OPENGL       affects tdescreensaver
+# WITH_ARTS         affects tdescreensaver
 
 # NOTE: These flags control which screensavers are compiled/installed.
 
@@ -61,7 +61,7 @@ option( BUILD_ALL "Build all" OFF )
 option( BUILD_EMOTICONS "Build emoticons" ${BUILD_ALL} )
 option( BUILD_ICEWM_THEMES "Build icewm-themes" ${BUILD_ALL} )
 option( BUILD_ICON_THEMES "Build icon themes" ${BUILD_ALL} )
-option( BUILD_KSCREENSAVER "Build kscreensaver" ${BUILD_ALL} )
+option( BUILD_KSCREENSAVER "Build tdescreensaver" ${BUILD_ALL} )
 option( BUILD_TWIN_STYLES "Build twin styles" ${BUILD_ALL} )
 option( BUILD_KWORLDCLOCK "Build kworldclock" ${BUILD_ALL} )
 option( BUILD_SOUNDS "Build sounds" ${BUILD_ALL} )
@@ -88,7 +88,7 @@ set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" )
 tde_conditional_add_subdirectory( BUILD_EMOTICONS emoticons )
 tde_conditional_add_subdirectory( BUILD_ICEWM_THEMES icewm-themes )
 tde_conditional_add_subdirectory( BUILD_ICON_THEMES IconThemes )
-tde_conditional_add_subdirectory( BUILD_KSCREENSAVER kscreensaver )
+tde_conditional_add_subdirectory( BUILD_KSCREENSAVER tdescreensaver )
 tde_conditional_add_subdirectory( BUILD_TWIN_STYLES twin-styles )
 tde_conditional_add_subdirectory( BUILD_KWORLDCLOCK kworldclock )
 tde_conditional_add_subdirectory( BUILD_SOUNDS sounds )
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 67c8e337..ba243bb1 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -24,43 +24,43 @@ endif( )
 
 
 if( BUILD_KSCREENSAVER )
-  # limits.h (kscreensaver/kdesavers) 
+  # limits.h (tdescreensaver/kdesavers) 
   check_include_file_cxx( limits HAVE_NUMERIC_LIMITS )
   
-  # memory.h (kscreensaver/xsavers) 
+  # memory.h (tdescreensaver/xsavers) 
   check_include_file( memory.h HAVE_MEMORY_H )
 
-  # X11/dirent.h (kscreensaver/xsavers)
+  # X11/dirent.h (tdescreensaver/xsavers)
   check_include_file( X11/dirent.h HAVE_DIRENT_H )
 
-  # sys/ndir.h (kscreensaver/xsavers)
+  # sys/ndir.h (tdescreensaver/xsavers)
   check_include_file( sys/ndir.h HAVE_SYS_NDIR_H )
 
-  # sys/dir.h (kscreensaver/xsavers)
+  # sys/dir.h (tdescreensaver/xsavers)
   check_include_file( sys/dir.h HAVE_SYS_DIR_H )
 
-  # ndir.h (kscreensaver/xsavers)
+  # ndir.h (tdescreensaver/xsavers)
   check_include_file( ndir.h HAVE_NDIR_H )
   
-  # OpenGL(kscreensaver/kdesavers)
+  # OpenGL(tdescreensaver/kdesavers)
   if( WITH_OPENGL )
     find_package( OpenGL REQUIRED )
     if( NOT OPENGL_FOUND )
       tde_message_fatal( "OpenGL is required, but was not found on your system" )
     endif( NOT OPENGL_FOUND )
     
-	# for kscreensaver/xsavers
+	# for tdescreensaver/xsavers
 	set( HAVE_GL ${OPENGL_FOUND} )
     
-	# GL/xmesa.h (kscreensaver/xsavers)
+	# GL/xmesa.h (tdescreensaver/xsavers)
     check_include_file( GL/xmesa.h HAVE_GL_XMESA_H )
 
-    # GL/glut.h (kscreensaver/xsavers)
+    # GL/glut.h (tdescreensaver/xsavers)
     check_include_file( GL/glut.h HAVE_GL_XMESA_H )
 
   endif( WITH_OPENGL )
   
-  # libart(kscreensaver/kdesavers)
+  # libart(tdescreensaver/kdesavers)
   if( WITH_LIBART )
     pkg_search_module( LIBART libart libart_lgpl libart-2.0 )
     if( NOT LIBART_FOUND )
@@ -68,7 +68,7 @@ if( BUILD_KSCREENSAVER )
     endif( NOT LIBART_FOUND  )
   endif( WITH_LIBART )
   
-  # arts(kscreensaver/kdesavers)
+  # arts(tdescreensaver/kdesavers)
   if( WITH_ARTS )
     pkg_search_module( ARTS arts )
     if( NOT ARTS_FOUND )
@@ -76,7 +76,7 @@ if( BUILD_KSCREENSAVER )
     endif( )
   endif( WITH_ARTS )
   
-  # xscreensavers(kscreensaver/kxsconfig)
+  # xscreensavers(tdescreensaver/kxsconfig)
   if( WITH_XSCREENSAVER )
     find_package( X11 )
     if( NOT X11_FOUND OR NOT X11_Xt_FOUND )
diff --git a/IconThemes/kdeclassic/16x16/apps/kmid.png b/IconThemes/kdeclassic/16x16/apps/tdemid.png
index b5221e39..b5221e39 100644
--- a/IconThemes/kdeclassic/16x16/apps/kmid.png
+++ b/IconThemes/kdeclassic/16x16/apps/tdemid.png
diff --git a/IconThemes/kdeclassic/16x16/apps/kmidi.png b/IconThemes/kdeclassic/16x16/apps/tdemidi.png
index 843408a3..843408a3 100644
--- a/IconThemes/kdeclassic/16x16/apps/kmidi.png
+++ b/IconThemes/kdeclassic/16x16/apps/tdemidi.png
diff --git a/IconThemes/kdeclassic/16x16/apps/kscreensaver.png b/IconThemes/kdeclassic/16x16/apps/tdescreensaver.png
index 512a7169..512a7169 100644
--- a/IconThemes/kdeclassic/16x16/apps/kscreensaver.png
+++ b/IconThemes/kdeclassic/16x16/apps/tdescreensaver.png
diff --git a/IconThemes/kdeclassic/16x16/mimetypes/kmultiple.png b/IconThemes/kdeclassic/16x16/mimetypes/tdemultiple.png
index 06d7b2d8..06d7b2d8 100644
--- a/IconThemes/kdeclassic/16x16/mimetypes/kmultiple.png
+++ b/IconThemes/kdeclassic/16x16/mimetypes/tdemultiple.png
diff --git a/IconThemes/kdeclassic/22x22/actions/khtml_kget.png b/IconThemes/kdeclassic/22x22/actions/tdehtml_kget.png
index cd432b7e..cd432b7e 100644
--- a/IconThemes/kdeclassic/22x22/actions/khtml_kget.png
+++ b/IconThemes/kdeclassic/22x22/actions/tdehtml_kget.png
diff --git a/IconThemes/kdeclassic/32x32/apps/kmid.png b/IconThemes/kdeclassic/32x32/apps/tdemid.png
index 8d127bdd..8d127bdd 100644
--- a/IconThemes/kdeclassic/32x32/apps/kmid.png
+++ b/IconThemes/kdeclassic/32x32/apps/tdemid.png
diff --git a/IconThemes/kdeclassic/32x32/apps/kmidi.png b/IconThemes/kdeclassic/32x32/apps/tdemidi.png
index 8fa7a285..8fa7a285 100644
--- a/IconThemes/kdeclassic/32x32/apps/kmidi.png
+++ b/IconThemes/kdeclassic/32x32/apps/tdemidi.png
diff --git a/IconThemes/kdeclassic/32x32/apps/kscreensaver.png b/IconThemes/kdeclassic/32x32/apps/tdescreensaver.png
index 16767702..16767702 100644
--- a/IconThemes/kdeclassic/32x32/apps/kscreensaver.png
+++ b/IconThemes/kdeclassic/32x32/apps/tdescreensaver.png
diff --git a/IconThemes/kdeclassic/32x32/mimetypes/kmultiple.png b/IconThemes/kdeclassic/32x32/mimetypes/tdemultiple.png
index 69388012..69388012 100644
--- a/IconThemes/kdeclassic/32x32/mimetypes/kmultiple.png
+++ b/IconThemes/kdeclassic/32x32/mimetypes/tdemultiple.png
diff --git a/IconThemes/kdeclassic/48x48/apps/kmid.png b/IconThemes/kdeclassic/48x48/apps/tdemid.png
index b59861d8..b59861d8 100644
--- a/IconThemes/kdeclassic/48x48/apps/kmid.png
+++ b/IconThemes/kdeclassic/48x48/apps/tdemid.png
diff --git a/IconThemes/kdeclassic/48x48/apps/kmidi.png b/IconThemes/kdeclassic/48x48/apps/tdemidi.png
index 39f4e23f..39f4e23f 100644
--- a/IconThemes/kdeclassic/48x48/apps/kmidi.png
+++ b/IconThemes/kdeclassic/48x48/apps/tdemidi.png
diff --git a/IconThemes/kdeclassic/48x48/apps/kscreensaver.png b/IconThemes/kdeclassic/48x48/apps/tdescreensaver.png
index 4dcb33fb..4dcb33fb 100644
--- a/IconThemes/kdeclassic/48x48/apps/kscreensaver.png
+++ b/IconThemes/kdeclassic/48x48/apps/tdescreensaver.png
diff --git a/IconThemes/kdeclassic/48x48/mimetypes/kmultiple.png b/IconThemes/kdeclassic/48x48/mimetypes/tdemultiple.png
index 07e53a18..07e53a18 100644
--- a/IconThemes/kdeclassic/48x48/mimetypes/kmultiple.png
+++ b/IconThemes/kdeclassic/48x48/mimetypes/tdemultiple.png
diff --git a/IconThemes/kids/16x16/apps/kscreensaver.png b/IconThemes/kids/16x16/apps/tdescreensaver.png
index ed3e9e41..ed3e9e41 100644
--- a/IconThemes/kids/16x16/apps/kscreensaver.png
+++ b/IconThemes/kids/16x16/apps/tdescreensaver.png
diff --git a/IconThemes/kids/22x22/apps/kscreensaver.png b/IconThemes/kids/22x22/apps/tdescreensaver.png
index 7f254f52..7f254f52 100644
--- a/IconThemes/kids/22x22/apps/kscreensaver.png
+++ b/IconThemes/kids/22x22/apps/tdescreensaver.png
diff --git a/IconThemes/kids/32x32/apps/kscreensaver.png b/IconThemes/kids/32x32/apps/tdescreensaver.png
index ea04c212..ea04c212 100644
--- a/IconThemes/kids/32x32/apps/kscreensaver.png
+++ b/IconThemes/kids/32x32/apps/tdescreensaver.png
diff --git a/IconThemes/kids/48x48/apps/kscreensaver.png b/IconThemes/kids/48x48/apps/tdescreensaver.png
index be881478..be881478 100644
--- a/IconThemes/kids/48x48/apps/kscreensaver.png
+++ b/IconThemes/kids/48x48/apps/tdescreensaver.png
diff --git a/IconThemes/kids/64x64/apps/kscreensaver.png b/IconThemes/kids/64x64/apps/tdescreensaver.png
index 11d07ddb..11d07ddb 100644
--- a/IconThemes/kids/64x64/apps/kscreensaver.png
+++ b/IconThemes/kids/64x64/apps/tdescreensaver.png
diff --git a/IconThemes/locolor/16x16/apps/kmid.png b/IconThemes/locolor/16x16/apps/tdemid.png
index b5221e39..b5221e39 100644
--- a/IconThemes/locolor/16x16/apps/kmid.png
+++ b/IconThemes/locolor/16x16/apps/tdemid.png
diff --git a/IconThemes/locolor/16x16/apps/kmidi.png b/IconThemes/locolor/16x16/apps/tdemidi.png
index 843408a3..843408a3 100644
--- a/IconThemes/locolor/16x16/apps/kmidi.png
+++ b/IconThemes/locolor/16x16/apps/tdemidi.png
diff --git a/IconThemes/locolor/16x16/apps/kscreensaver.png b/IconThemes/locolor/16x16/apps/tdescreensaver.png
index 9a7de8b8..9a7de8b8 100644
--- a/IconThemes/locolor/16x16/apps/kscreensaver.png
+++ b/IconThemes/locolor/16x16/apps/tdescreensaver.png
diff --git a/IconThemes/locolor/16x16/mimetypes/kmultiple.png b/IconThemes/locolor/16x16/mimetypes/tdemultiple.png
index 92f7e815..92f7e815 100644
--- a/IconThemes/locolor/16x16/mimetypes/kmultiple.png
+++ b/IconThemes/locolor/16x16/mimetypes/tdemultiple.png
diff --git a/IconThemes/locolor/32x32/apps/kmid.png b/IconThemes/locolor/32x32/apps/tdemid.png
index 1232976c..1232976c 100644
--- a/IconThemes/locolor/32x32/apps/kmid.png
+++ b/IconThemes/locolor/32x32/apps/tdemid.png
diff --git a/IconThemes/locolor/32x32/apps/kmidi.png b/IconThemes/locolor/32x32/apps/tdemidi.png
index 97eabc8c..97eabc8c 100644
--- a/IconThemes/locolor/32x32/apps/kmidi.png
+++ b/IconThemes/locolor/32x32/apps/tdemidi.png
diff --git a/IconThemes/locolor/32x32/apps/kscreensaver.png b/IconThemes/locolor/32x32/apps/tdescreensaver.png
index c04cc193..c04cc193 100644
--- a/IconThemes/locolor/32x32/apps/kscreensaver.png
+++ b/IconThemes/locolor/32x32/apps/tdescreensaver.png
diff --git a/IconThemes/locolor/32x32/mimetypes/kmultiple.png b/IconThemes/locolor/32x32/mimetypes/tdemultiple.png
index 4c92f6d7..4c92f6d7 100644
--- a/IconThemes/locolor/32x32/mimetypes/kmultiple.png
+++ b/IconThemes/locolor/32x32/mimetypes/tdemultiple.png
diff --git a/IconThemes/slick/16x16/actions/khtml_kget.png b/IconThemes/slick/16x16/actions/tdehtml_kget.png
index 4875dacf..4875dacf 100644
--- a/IconThemes/slick/16x16/actions/khtml_kget.png
+++ b/IconThemes/slick/16x16/actions/tdehtml_kget.png
diff --git a/IconThemes/slick/16x16/apps/kscreensaver.png b/IconThemes/slick/16x16/apps/tdescreensaver.png
index 10471075..10471075 100644
--- a/IconThemes/slick/16x16/apps/kscreensaver.png
+++ b/IconThemes/slick/16x16/apps/tdescreensaver.png
diff --git a/IconThemes/slick/16x16/mimetypes/kmultiple.png b/IconThemes/slick/16x16/mimetypes/tdemultiple.png
index 92ef857f..92ef857f 100644
--- a/IconThemes/slick/16x16/mimetypes/kmultiple.png
+++ b/IconThemes/slick/16x16/mimetypes/tdemultiple.png
diff --git a/IconThemes/slick/22x22/actions/khtml_kget.png b/IconThemes/slick/22x22/actions/tdehtml_kget.png
index 69d57b86..69d57b86 100644
--- a/IconThemes/slick/22x22/actions/khtml_kget.png
+++ b/IconThemes/slick/22x22/actions/tdehtml_kget.png
diff --git a/IconThemes/slick/22x22/apps/kwalletmanager.png b/IconThemes/slick/22x22/apps/tdewalletmanager.png
index 3d056b6f..3d056b6f 100644
--- a/IconThemes/slick/22x22/apps/kwalletmanager.png
+++ b/IconThemes/slick/22x22/apps/tdewalletmanager.png
diff --git a/IconThemes/slick/22x22/mimetypes/kmultiple.png b/IconThemes/slick/22x22/mimetypes/tdemultiple.png
index 485cc80d..485cc80d 100644
--- a/IconThemes/slick/22x22/mimetypes/kmultiple.png
+++ b/IconThemes/slick/22x22/mimetypes/tdemultiple.png
diff --git a/IconThemes/slick/32x32/actions/khtml_kget.png b/IconThemes/slick/32x32/actions/tdehtml_kget.png
index 5cb66552..5cb66552 100644
--- a/IconThemes/slick/32x32/actions/khtml_kget.png
+++ b/IconThemes/slick/32x32/actions/tdehtml_kget.png
diff --git a/IconThemes/slick/32x32/apps/kscreensaver.png b/IconThemes/slick/32x32/apps/tdescreensaver.png
index bf14c72c..bf14c72c 100644
--- a/IconThemes/slick/32x32/apps/kscreensaver.png
+++ b/IconThemes/slick/32x32/apps/tdescreensaver.png
diff --git a/IconThemes/slick/32x32/mimetypes/kmultiple.png b/IconThemes/slick/32x32/mimetypes/tdemultiple.png
index 1b23017b..1b23017b 100644
--- a/IconThemes/slick/32x32/mimetypes/kmultiple.png
+++ b/IconThemes/slick/32x32/mimetypes/tdemultiple.png
diff --git a/IconThemes/slick/48x48/apps/kscreensaver.png b/IconThemes/slick/48x48/apps/tdescreensaver.png
index 3d85dab3..3d85dab3 100644
--- a/IconThemes/slick/48x48/apps/kscreensaver.png
+++ b/IconThemes/slick/48x48/apps/tdescreensaver.png
diff --git a/IconThemes/slick/48x48/mimetypes/kmultiple.png b/IconThemes/slick/48x48/mimetypes/tdemultiple.png
index 4cb9e2ca..4cb9e2ca 100644
--- a/IconThemes/slick/48x48/mimetypes/kmultiple.png
+++ b/IconThemes/slick/48x48/mimetypes/tdemultiple.png
diff --git a/IconThemes/slick/64x64/mimetypes/kmultiple.png b/IconThemes/slick/64x64/mimetypes/tdemultiple.png
index 104dac37..104dac37 100644
--- a/IconThemes/slick/64x64/mimetypes/kmultiple.png
+++ b/IconThemes/slick/64x64/mimetypes/tdemultiple.png
diff --git a/kscreensaver/kpartsaver/Makefile.am b/kscreensaver/kpartsaver/Makefile.am
deleted file mode 100644
index 48546bac..00000000
--- a/kscreensaver/kpartsaver/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-bin_PROGRAMS = kpartsaver.kss
-INCLUDES = $(all_includes)
-
-kpartsaver_kss_SOURCES = kpartsaver.cpp configwidget.ui
-kpartsaver_kss_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-kpartsaver_kss_LDADD = $(LIB_KFILE) $(LIB_KPARTS) -lkscreensaver
-
-METASOURCES = AUTO
-
-desktop_DATA = kpartsaver.desktop
-desktopdir = $(kde_appsdir)/System/ScreenSavers
-
-messages: rc.cpp
-	$(XGETTEXT) *.cpp -o $(podir)/kpartsaver.pot
diff --git a/kscreensaver/CMakeLists.txt b/tdescreensaver/CMakeLists.txt
index 31538e9c..a600db48 100644
--- a/kscreensaver/CMakeLists.txt
+++ b/tdescreensaver/CMakeLists.txt
@@ -10,7 +10,7 @@
 #################################################
 
 add_subdirectory( kdesavers )
-add_subdirectory( kpartsaver)
+add_subdirectory( tdepartsaver)
 add_subdirectory( krootbacking )
 if( WITH_XSCREENSAVER )
   add_subdirectory( kxsconfig )
diff --git a/kscreensaver/Makefile.am b/tdescreensaver/Makefile.am
index dbd2f867..1aec0efb 100644
--- a/kscreensaver/Makefile.am
+++ b/tdescreensaver/Makefile.am
@@ -6,7 +6,7 @@ if COMPILE_X11_KSAVERS
 XSAVERS_SUBDIR = xsavers
 endif
 
-SUBDIRS = kdesavers kpartsaver krootbacking $(KXSCONFIG_SUBDIR) $(XSAVERS_SUBDIR)
+SUBDIRS = kdesavers tdepartsaver krootbacking $(KXSCONFIG_SUBDIR) $(XSAVERS_SUBDIR)
 
 messages:
 	$(EXTRACTRC) kdesavers/*.ui > rc.cpp
diff --git a/kscreensaver/configure.in.bot b/tdescreensaver/configure.in.bot
index 8d4e595b..8d4e595b 100644
--- a/kscreensaver/configure.in.bot
+++ b/tdescreensaver/configure.in.bot
diff --git a/kscreensaver/configure.in.in b/tdescreensaver/configure.in.in
index 08629422..08629422 100644
--- a/kscreensaver/configure.in.in
+++ b/tdescreensaver/configure.in.in
diff --git a/kscreensaver/kdesavers/CMakeLists.txt b/tdescreensaver/kdesavers/CMakeLists.txt
index 6cfcf03b..f2e3f027 100644
--- a/kscreensaver/kdesavers/CMakeLists.txt
+++ b/tdescreensaver/kdesavers/CMakeLists.txt
@@ -129,7 +129,7 @@ list( APPEND SCREENSAVERS ${NORMAL_SCREENSAVERS} )
 foreach( saver ${SCREENSAVERS} )
   tde_add_executable( ${saver}.kss AUTOMOC
     SOURCES ${${saver}_SOURCES}
-    LINK kscreensaver-shared tdeui-shared ${${saver}_LINK}
+    LINK tdescreensaver-shared tdeui-shared ${${saver}_LINK}
     DESTINATION ${BIN_INSTALL_DIR}
   )
   install( FILES ${${saver}_DESKTOP} 
@@ -139,7 +139,7 @@ endforeach( saver ${SCREENSAVERS} )
 ##### install various data ######################
 
 install( FILES image.png kscience.png particle.png
-    DESTINATION ${DATA_INSTALL_DIR}/kscreensaver )
+    DESTINATION ${DATA_INSTALL_DIR}/tdescreensaver )
 
 # Actually the only screensaver tha uses this data is kfiresaver 
 add_subdirectory( data )
diff --git a/kscreensaver/kdesavers/Euphoria.cpp b/tdescreensaver/kdesavers/Euphoria.cpp
index 7f69e34e..304aaeee 100644
--- a/kscreensaver/kdesavers/Euphoria.cpp
+++ b/tdescreensaver/kdesavers/Euphoria.cpp
@@ -893,7 +893,7 @@ void EuphoriaWidget::setDefaults(int which)
 #include <kconfig.h>
 
 
-// libkscreensaver interface
+// libtdescreensaver interface
 extern "C"
 {
     KDE_EXPORT const char* kss_applicationName = "keuphoria.kss";
diff --git a/kscreensaver/kdesavers/Euphoria.h b/tdescreensaver/kdesavers/Euphoria.h
index 40959139..26fdf27b 100644
--- a/kscreensaver/kdesavers/Euphoria.h
+++ b/tdescreensaver/kdesavers/Euphoria.h
@@ -106,7 +106,7 @@ private:
 
 #ifndef UNIT_TEST
 #include <tqdialog.h>
-#include <kscreensaver.h>
+#include <tdescreensaver.h>
 
 
 class KEuphoriaScreenSaver : public KScreenSaver
diff --git a/kscreensaver/kdesavers/EuphoriaTexture.h b/tdescreensaver/kdesavers/EuphoriaTexture.h
index 5a6962b4..5a6962b4 100644
--- a/kscreensaver/kdesavers/EuphoriaTexture.h
+++ b/tdescreensaver/kdesavers/EuphoriaTexture.h
diff --git a/kscreensaver/kdesavers/Flux.cpp b/tdescreensaver/kdesavers/Flux.cpp
index d401b782..0ee9c0d3 100644
--- a/kscreensaver/kdesavers/Flux.cpp
+++ b/tdescreensaver/kdesavers/Flux.cpp
@@ -777,7 +777,7 @@ void FluxWidget::updateParameters()
 #include <kconfig.h>
 
 
-// libkscreensaver interface
+// libtdescreensaver interface
 extern "C"
 {
     KDE_EXPORT const char* kss_applicationName = "kflux.kss";
diff --git a/kscreensaver/kdesavers/Flux.h b/tdescreensaver/kdesavers/Flux.h
index bd7fd32e..f1a98780 100644
--- a/kscreensaver/kdesavers/Flux.h
+++ b/tdescreensaver/kdesavers/Flux.h
@@ -94,7 +94,7 @@ private:
 
 #ifndef UNIT_TEST
 #include <kdialogbase.h>
-#include <kscreensaver.h>
+#include <tdescreensaver.h>
 
 
 class KFluxScreenSaver : public KScreenSaver
diff --git a/kscreensaver/kdesavers/KBanner.desktop b/tdescreensaver/kdesavers/KBanner.desktop
index 29f6bbad..afcc1d26 100644
--- a/kscreensaver/kdesavers/KBanner.desktop
+++ b/tdescreensaver/kdesavers/KBanner.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=kbanner.kss
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=Setup;InWindow;Root;
 X-TDE-Category=Banners & Pictures
@@ -124,7 +124,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kbanner.kss -window-id %w
diff --git a/kscreensaver/kdesavers/KBlob.desktop b/tdescreensaver/kdesavers/KBlob.desktop
index f5127a90..e1343fef 100644
--- a/kscreensaver/kdesavers/KBlob.desktop
+++ b/tdescreensaver/kdesavers/KBlob.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=kblob.kss
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=Setup;InWindow;Root;
 X-TDE-Category=Visit to Flatland
@@ -108,7 +108,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kblob.kss -window-id %w
diff --git a/kscreensaver/kdesavers/KClock.desktop b/tdescreensaver/kdesavers/KClock.desktop
index b6c35887..c22d68c9 100644
--- a/kscreensaver/kdesavers/KClock.desktop
+++ b/tdescreensaver/kdesavers/KClock.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=kclock.kss
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=Setup;InWindow;Root;
 X-TDE-Category=Miscellaneous
@@ -133,7 +133,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kclock.kss -window-id %w
diff --git a/kscreensaver/kdesavers/KEuphoria.desktop b/tdescreensaver/kdesavers/KEuphoria.desktop
index e01fac37..4be782b1 100644
--- a/kscreensaver/kdesavers/KEuphoria.desktop
+++ b/tdescreensaver/kdesavers/KEuphoria.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=keuphoria.kss
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=Setup;InWindow;Root;
 X-TDE-Category=OpenGL Screen Savers
@@ -114,7 +114,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=keuphoria.kss -window-id %w
diff --git a/kscreensaver/kdesavers/KFiresaver.desktop b/tdescreensaver/kdesavers/KFiresaver.desktop
index 783b195b..f640ec4f 100644
--- a/kscreensaver/kdesavers/KFiresaver.desktop
+++ b/tdescreensaver/kdesavers/KFiresaver.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=kfiresaver.kss
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=Setup;InWindow;Root;
 X-TDE-Category=OpenGL Screen Savers
@@ -114,7 +114,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kfiresaver.kss -window-id %w
diff --git a/kscreensaver/kdesavers/KFlux.desktop b/tdescreensaver/kdesavers/KFlux.desktop
index 2464ad8b..9ba427d7 100644
--- a/kscreensaver/kdesavers/KFlux.desktop
+++ b/tdescreensaver/kdesavers/KFlux.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=kflux.kss
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=Setup;InWindow;Root;
 X-TDE-Category=OpenGL Screen Savers
@@ -105,7 +105,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kflux.kss -window-id %w
diff --git a/kscreensaver/kdesavers/KFountain.desktop b/tdescreensaver/kdesavers/KFountain.desktop
index 32291090..81d89a00 100644
--- a/kscreensaver/kdesavers/KFountain.desktop
+++ b/tdescreensaver/kdesavers/KFountain.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=kfountain.kss
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=Setup;InWindow;Root;
 X-TDE-Category=OpenGL Screen Savers
@@ -130,7 +130,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kfountain.kss -window-id %w
diff --git a/kscreensaver/kdesavers/KGravity.desktop b/tdescreensaver/kdesavers/KGravity.desktop
index 6865b4fa..312797d7 100644
--- a/kscreensaver/kdesavers/KGravity.desktop
+++ b/tdescreensaver/kdesavers/KGravity.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=kgravity.kss
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=Setup;InWindow;Root;
 X-TDE-Category=OpenGL Screen Savers
@@ -134,7 +134,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kgravity.kss -window-id %w
diff --git a/kscreensaver/kdesavers/KLines-saver.desktop b/tdescreensaver/kdesavers/KLines-saver.desktop
index d0d945e1..581c23a6 100644
--- a/kscreensaver/kdesavers/KLines-saver.desktop
+++ b/tdescreensaver/kdesavers/KLines-saver.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=klines.kss
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=Setup;InWindow;Root;
 X-TDE-Category=Flying Things
@@ -135,7 +135,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=klines.kss -window-id %w
diff --git a/kscreensaver/kdesavers/KLorenz.desktop b/tdescreensaver/kdesavers/KLorenz.desktop
index 2e506edc..109b8d98 100644
--- a/kscreensaver/kdesavers/KLorenz.desktop
+++ b/tdescreensaver/kdesavers/KLorenz.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=klorenz.kss
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=Setup;InWindow;Root;
 X-TDE-Category=Gadgets & Simulations
@@ -125,7 +125,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=klorenz.kss -window-id %w
diff --git a/kscreensaver/kdesavers/KPendulum.desktop b/tdescreensaver/kdesavers/KPendulum.desktop
index ac3107e8..c53fd21b 100644
--- a/kscreensaver/kdesavers/KPendulum.desktop
+++ b/tdescreensaver/kdesavers/KPendulum.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=kpendulum.kss
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=Setup;InWindow;Root;
 X-TDE-Category=OpenGL Screen Savers
@@ -102,7 +102,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kpendulum.kss -window-id %w
diff --git a/kscreensaver/kdesavers/KPolygon.desktop b/tdescreensaver/kdesavers/KPolygon.desktop
index 76375316..0c95f749 100644
--- a/kscreensaver/kdesavers/KPolygon.desktop
+++ b/tdescreensaver/kdesavers/KPolygon.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=kpolygon.kss
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=Setup;InWindow;Root;
 X-TDE-Category=Rapid Motion
@@ -132,7 +132,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kpolygon.kss -window-id %w
diff --git a/kscreensaver/kdesavers/KRotation.desktop b/tdescreensaver/kdesavers/KRotation.desktop
index fb447461..d4fa0d40 100644
--- a/kscreensaver/kdesavers/KRotation.desktop
+++ b/tdescreensaver/kdesavers/KRotation.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=krotation.kss
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=Setup;InWindow;Root;
 X-TDE-Category=OpenGL Screen Savers
@@ -102,7 +102,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=krotation.kss -window-id %w
diff --git a/kscreensaver/kdesavers/KScience.desktop b/tdescreensaver/kdesavers/KScience.desktop
index f5d81f9b..7f25ee25 100644
--- a/kscreensaver/kdesavers/KScience.desktop
+++ b/tdescreensaver/kdesavers/KScience.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=kscience.kss
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=Setup;InWindow;Root;
 X-TDE-Category=Desktop Distortions
@@ -135,7 +135,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kscience.kss -window-id %w
diff --git a/kscreensaver/kdesavers/KSlideshow.desktop b/tdescreensaver/kdesavers/KSlideshow.desktop
index 59670bc6..64e5c55e 100644
--- a/kscreensaver/kdesavers/KSlideshow.desktop
+++ b/tdescreensaver/kdesavers/KSlideshow.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=kslideshow.kss
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=Setup;InWindow;Root;
 X-TDE-Category=Banners & Pictures
@@ -131,7 +131,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kslideshow.kss -window-id %w
diff --git a/kscreensaver/kdesavers/KSolarWinds.desktop b/tdescreensaver/kdesavers/KSolarWinds.desktop
index a642fd07..bf4484c0 100644
--- a/kscreensaver/kdesavers/KSolarWinds.desktop
+++ b/tdescreensaver/kdesavers/KSolarWinds.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=ksolarwinds.kss
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=Setup;InWindow;Root;
 X-TDE-Category=OpenGL Screen Savers
@@ -124,7 +124,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=ksolarwinds.kss -window-id %w
diff --git a/kscreensaver/kdesavers/KVm.desktop b/tdescreensaver/kdesavers/KVm.desktop
index 65abfd4c..c359d28a 100644
--- a/kscreensaver/kdesavers/KVm.desktop
+++ b/tdescreensaver/kdesavers/KVm.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=kvm.kss
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=Setup;InWindow;Root;
 X-TDE-Category=Gadgets & Simulations
@@ -134,7 +134,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kvm.kss -window-id %w
diff --git a/kscreensaver/kdesavers/KWave.desktop b/tdescreensaver/kdesavers/KWave.desktop
index 1049ac44..85c5ec05 100644
--- a/kscreensaver/kdesavers/KWave.desktop
+++ b/tdescreensaver/kdesavers/KWave.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=kwave.kss
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=Setup;InWindow;Root;
 X-TDE-Category=OpenGL Screen Savers
@@ -132,7 +132,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kwave.kss -window-id %w
diff --git a/kscreensaver/kdesavers/Makefile.am b/tdescreensaver/kdesavers/Makefile.am
index f5901663..80f52098 100644
--- a/kscreensaver/kdesavers/Makefile.am
+++ b/tdescreensaver/kdesavers/Makefile.am
@@ -1,5 +1,5 @@
 # $Id$
-# Makefile.am for kscreensaver.
+# Makefile.am for tdescreensaver.
 #
 
 SUBDIRS = . data
@@ -7,8 +7,8 @@ SUBDIRS = . data
 AM_CPPFLAGS = -UQT_NO_ASCII_CAST
 
 INCLUDES = $(all_includes) $(GLINC) $(LIBART_CFLAGS)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-AM_LDADD = $(LIB_TDEUI) -lkscreensaver
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+AM_LDADD = $(LIB_TDEUI) -ltdescreensaver
 
 if COMPILE_X11_KSAVERS
 X11_KSAVERS = kscience.kss
@@ -90,7 +90,7 @@ noinst_HEADERS = banner.h polygon.h slideshow.h lines.h\
 ########## Meta objects ##########
 
 pics_DATA = kscience.png particle.png image.png
-picsdir = $(kde_datadir)/kscreensaver
+picsdir = $(kde_datadir)/tdescreensaver
 
 if COMPILE_LIBART_KSAVERS
 desktop_DATA = KBanner.desktop KPolygon.desktop \
diff --git a/kscreensaver/kdesavers/README b/tdescreensaver/kdesavers/README
index 694adefd..f735323a 100644
--- a/kscreensaver/kdesavers/README
+++ b/tdescreensaver/kdesavers/README
@@ -1,3 +1,3 @@
-These are native KDE screensavers using the libkscreensaver library.
+These are native KDE screensavers using the libtdescreensaver library.
 If you are writing a screensaver for KDE use these as references rather
 than the ported savers.
diff --git a/kscreensaver/kdesavers/SolarWinds.cpp b/tdescreensaver/kdesavers/SolarWinds.cpp
index b464a8de..c55fe531 100644
--- a/kscreensaver/kdesavers/SolarWinds.cpp
+++ b/tdescreensaver/kdesavers/SolarWinds.cpp
@@ -591,7 +591,7 @@ void SWindsWidget::setDefaults(int which)
 #include <kconfig.h>
 
 
-// libkscreensaver interface
+// libtdescreensaver interface
 extern "C"
 {
     KDE_EXPORT const char* kss_applicationName = "ksolarwinds.kss";
diff --git a/kscreensaver/kdesavers/SolarWinds.h b/tdescreensaver/kdesavers/SolarWinds.h
index 1ad445d4..c8a7688a 100644
--- a/kscreensaver/kdesavers/SolarWinds.h
+++ b/tdescreensaver/kdesavers/SolarWinds.h
@@ -85,7 +85,7 @@ private:
 
 #ifndef UNIT_TEST
 #include <kdialogbase.h>
-#include <kscreensaver.h>
+#include <tdescreensaver.h>
 
 
 class KSWindsScreenSaver : public KScreenSaver
diff --git a/kscreensaver/kdesavers/banner.cpp b/tdescreensaver/kdesavers/banner.cpp
index a1672b27..5e907c25 100644
--- a/kscreensaver/kdesavers/banner.cpp
+++ b/tdescreensaver/kdesavers/banner.cpp
@@ -6,7 +6,7 @@
 //
 // layout management added 1998/04/19 by Mario Weilguni <[email protected]>
 // clock function and color cycling added 2000/01/09 by Alexander Neundorf <[email protected]>
-// 2001/03/04 Converted to use libkscreensaver by Martin R. Jones
+// 2001/03/04 Converted to use libtdescreensaver by Martin R. Jones
 // 2002/04/07 Added random vertical position of text,
 //		changed horizontal step size to reduce jerkyness,
 //		text will return to right margin immediately (and not be drawn half a screen width off-screen)
@@ -37,7 +37,7 @@
 #include "banner.h"
 #include "banner.moc"
 
-// libkscreensaver interface
+// libtdescreensaver interface
 extern "C"
 {
     KDE_EXPORT const char *kss_applicationName = "kbanner.kss";
diff --git a/kscreensaver/kdesavers/banner.h b/tdescreensaver/kdesavers/banner.h
index 37f10aba..6b953e58 100644
--- a/kscreensaver/kdesavers/banner.h
+++ b/tdescreensaver/kdesavers/banner.h
@@ -10,7 +10,7 @@
 
 #include <tqtimer.h>
 
-#include <kscreensaver.h>
+#include <tdescreensaver.h>
 #include <kdialogbase.h>
 
 #define SATURATION 150
diff --git a/kscreensaver/kdesavers/blob.cpp b/tdescreensaver/kdesavers/blob.cpp
index 4b116744..763cf10c 100644
--- a/kscreensaver/kdesavers/blob.cpp
+++ b/tdescreensaver/kdesavers/blob.cpp
@@ -44,7 +44,7 @@
 #define SMALLRAND(a)	(int)(rnd->getLong(a)+1)
 
 
-// libkscreensaver interface
+// libtdescreensaver interface
 extern "C"
 {
     KDE_EXPORT const char *kss_applicationName = "kblob.kss";
diff --git a/kscreensaver/kdesavers/blob.h b/tdescreensaver/kdesavers/blob.h
index 5e5fb97c..e8b8f839 100644
--- a/kscreensaver/kdesavers/blob.h
+++ b/tdescreensaver/kdesavers/blob.h
@@ -12,7 +12,7 @@
 #include <tqptrlist.h>
 
 #include <kdialogbase.h>
-#include <kscreensaver.h>
+#include <tdescreensaver.h>
 
 #define RAMP		64
 #define SPEED		10
diff --git a/kscreensaver/kdesavers/data/CMakeLists.txt b/tdescreensaver/kdesavers/data/CMakeLists.txt
index c9718d9a..c9718d9a 100644
--- a/kscreensaver/kdesavers/data/CMakeLists.txt
+++ b/tdescreensaver/kdesavers/data/CMakeLists.txt
diff --git a/kscreensaver/kdesavers/data/Makefile.am b/tdescreensaver/kdesavers/data/Makefile.am
index 2882f34c..2882f34c 100644
--- a/kscreensaver/kdesavers/data/Makefile.am
+++ b/tdescreensaver/kdesavers/data/Makefile.am
diff --git a/kscreensaver/kdesavers/data/kfs_debris.ogg b/tdescreensaver/kdesavers/data/kfs_debris.ogg
index f1265ec2..f1265ec2 100644
--- a/kscreensaver/kdesavers/data/kfs_debris.ogg
+++ b/tdescreensaver/kdesavers/data/kfs_debris.ogg
diff --git a/kscreensaver/kdesavers/data/kfs_explode.ogg b/tdescreensaver/kdesavers/data/kfs_explode.ogg
index 3eda0ef0..3eda0ef0 100644
--- a/kscreensaver/kdesavers/data/kfs_explode.ogg
+++ b/tdescreensaver/kdesavers/data/kfs_explode.ogg
diff --git a/kscreensaver/kdesavers/data/kfs_kde.png b/tdescreensaver/kdesavers/data/kfs_kde.png
index 33f53b33..33f53b33 100644
--- a/kscreensaver/kdesavers/data/kfs_kde.png
+++ b/tdescreensaver/kdesavers/data/kfs_kde.png
diff --git a/kscreensaver/kdesavers/data/kfs_letters.desc b/tdescreensaver/kdesavers/data/kfs_letters.desc
index 186a1b8d..186a1b8d 100644
--- a/kscreensaver/kdesavers/data/kfs_letters.desc
+++ b/tdescreensaver/kdesavers/data/kfs_letters.desc
diff --git a/kscreensaver/kdesavers/data/kfs_letters1.png b/tdescreensaver/kdesavers/data/kfs_letters1.png
index 2f6678ba..2f6678ba 100644
--- a/kscreensaver/kdesavers/data/kfs_letters1.png
+++ b/tdescreensaver/kdesavers/data/kfs_letters1.png
diff --git a/kscreensaver/kdesavers/data/kfs_letters2.png b/tdescreensaver/kdesavers/data/kfs_letters2.png
index 8d0442ac..8d0442ac 100644
--- a/kscreensaver/kdesavers/data/kfs_letters2.png
+++ b/tdescreensaver/kdesavers/data/kfs_letters2.png
diff --git a/kscreensaver/kdesavers/data/kfs_particle.png b/tdescreensaver/kdesavers/data/kfs_particle.png
index d6294dc3..d6294dc3 100644
--- a/kscreensaver/kdesavers/data/kfs_particle.png
+++ b/tdescreensaver/kdesavers/data/kfs_particle.png
diff --git a/kscreensaver/kdesavers/data/kfs_particle_diastar.png b/tdescreensaver/kdesavers/data/kfs_particle_diastar.png
index 6f645ddb..6f645ddb 100644
--- a/kscreensaver/kdesavers/data/kfs_particle_diastar.png
+++ b/tdescreensaver/kdesavers/data/kfs_particle_diastar.png
diff --git a/kscreensaver/kdesavers/data/kfs_particle_flare.png b/tdescreensaver/kdesavers/data/kfs_particle_flare.png
index 4a4fdcb5..4a4fdcb5 100644
--- a/kscreensaver/kdesavers/data/kfs_particle_flare.png
+++ b/tdescreensaver/kdesavers/data/kfs_particle_flare.png
diff --git a/kscreensaver/kdesavers/data/kfs_tux.png b/tdescreensaver/kdesavers/data/kfs_tux.png
index 99f3465e..99f3465e 100644
--- a/kscreensaver/kdesavers/data/kfs_tux.png
+++ b/tdescreensaver/kdesavers/data/kfs_tux.png
diff --git a/kscreensaver/kdesavers/firesaver.ChangeLog b/tdescreensaver/kdesavers/firesaver.ChangeLog
index 24c41b2d..80461e62 100644
--- a/kscreensaver/kdesavers/firesaver.ChangeLog
+++ b/tdescreensaver/kdesavers/firesaver.ChangeLog
@@ -99,7 +99,7 @@
 	explosion (normal particles reach level 1, splitters reach 2).
 
 	* name syntax: converted filenames to match the style of the ones
-	in tdeartwork/kscreensaver/kdesavers.
+	in tdeartwork/tdescreensaver/kdesavers.
 
 	* merging: merged some file's content to lower the number of files
 	before initial import.
diff --git a/kscreensaver/kdesavers/firesaver.cpp b/tdescreensaver/kdesavers/firesaver.cpp
index ad6b83ac..71954242 100644
--- a/kscreensaver/kdesavers/firesaver.cpp
+++ b/tdescreensaver/kdesavers/firesaver.cpp
@@ -41,7 +41,7 @@
 /* Factory code for KScreensaver begins *here* *\
 \*                                             */
 
-#include <kscreensaver.h>
+#include <tdescreensaver.h>
 #include <kdialogbase.h>
 
 class KFireSaverKSS : public KScreenSaver
diff --git a/kscreensaver/kdesavers/firesaver.h b/tdescreensaver/kdesavers/firesaver.h
index 8a34c5e9..8a34c5e9 100644
--- a/kscreensaver/kdesavers/firesaver.h
+++ b/tdescreensaver/kdesavers/firesaver.h
diff --git a/kscreensaver/kdesavers/firesaverparticle.cpp b/tdescreensaver/kdesavers/firesaverparticle.cpp
index 421115a7..421115a7 100644
--- a/kscreensaver/kdesavers/firesaverparticle.cpp
+++ b/tdescreensaver/kdesavers/firesaverparticle.cpp
diff --git a/kscreensaver/kdesavers/firesaverparticle.h b/tdescreensaver/kdesavers/firesaverparticle.h
index e539adec..e539adec 100644
--- a/kscreensaver/kdesavers/firesaverparticle.h
+++ b/tdescreensaver/kdesavers/firesaverparticle.h
diff --git a/kscreensaver/kdesavers/firesaversetup.ui b/tdescreensaver/kdesavers/firesaversetup.ui
index 3a3f3536..3a3f3536 100644
--- a/kscreensaver/kdesavers/firesaversetup.ui
+++ b/tdescreensaver/kdesavers/firesaversetup.ui
diff --git a/kscreensaver/kdesavers/firesaversetup.ui.h b/tdescreensaver/kdesavers/firesaversetup.ui.h
index da8ed42a..da8ed42a 100644
--- a/kscreensaver/kdesavers/firesaversetup.ui.h
+++ b/tdescreensaver/kdesavers/firesaversetup.ui.h
diff --git a/kscreensaver/kdesavers/firesaverwriter.cpp b/tdescreensaver/kdesavers/firesaverwriter.cpp
index ff78fc5e..ff78fc5e 100644
--- a/kscreensaver/kdesavers/firesaverwriter.cpp
+++ b/tdescreensaver/kdesavers/firesaverwriter.cpp
diff --git a/kscreensaver/kdesavers/firesaverwriter.h b/tdescreensaver/kdesavers/firesaverwriter.h
index e93f65be..e93f65be 100644
--- a/kscreensaver/kdesavers/firesaverwriter.h
+++ b/tdescreensaver/kdesavers/firesaverwriter.h
diff --git a/kscreensaver/kdesavers/fountain.cpp b/tdescreensaver/kdesavers/fountain.cpp
index 125be143..7e4c13f8 100644
--- a/kscreensaver/kdesavers/fountain.cpp
+++ b/tdescreensaver/kdesavers/fountain.cpp
@@ -34,7 +34,7 @@
 #include <kstandarddirs.h>
 #include <math.h>
 #include <kmessagebox.h>
-// libkscreensaver interface
+// libtdescreensaver interface
 extern "C"
 {
 	KDE_EXPORT const char *kss_applicationName = "kfountain.kss";
@@ -222,8 +222,8 @@ bool Fountain::loadParticle()
     bool Status = TRUE;
 	TQImage buf;
 
-    kdDebug() << "Loading: " << locate("data", "kscreensaver/particle.png") << endl;
- if (buf.load( locate("data", "kscreensaver/particle.png") ) )
+    kdDebug() << "Loading: " << locate("data", "tdescreensaver/particle.png") << endl;
+ if (buf.load( locate("data", "tdescreensaver/particle.png") ) )
 
         {
 		tex = convertToGLFormat(buf);  // flipped 32bit RGBA
diff --git a/kscreensaver/kdesavers/fountain.h b/tdescreensaver/kdesavers/fountain.h
index 8ddd3821..492680ff 100644
--- a/kscreensaver/kdesavers/fountain.h
+++ b/tdescreensaver/kdesavers/fountain.h
@@ -23,7 +23,7 @@
 #include <GL/glu.h>
 #include <GL/gl.h>
 #endif
-#include <kscreensaver.h>
+#include <tdescreensaver.h>
 #include <tqtimer.h>
 #include <tqimage.h>
 #include "fountaincfg.h"
diff --git a/kscreensaver/kdesavers/fountaincfg.ui b/tdescreensaver/kdesavers/fountaincfg.ui
index 3b5eacd7..3b5eacd7 100644
--- a/kscreensaver/kdesavers/fountaincfg.ui
+++ b/tdescreensaver/kdesavers/fountaincfg.ui
diff --git a/kscreensaver/kdesavers/gravity.cpp b/tdescreensaver/kdesavers/gravity.cpp
index 1f51a5a7..8c0accc1 100644
--- a/kscreensaver/kdesavers/gravity.cpp
+++ b/tdescreensaver/kdesavers/gravity.cpp
@@ -33,7 +33,7 @@
 #include <kstandarddirs.h>
 #include <math.h>
 #include <kmessagebox.h>
-// libkscreensaver interface
+// libtdescreensaver interface
 extern "C"
 {
 	KDE_EXPORT const char *kss_applicationName = "kgravity.kss";
@@ -210,8 +210,8 @@ bool Gravity::loadParticle()
     bool Status = TRUE;
 	TQImage buf;
 
-    kdDebug() << "Loading: " << locate("data", "kscreensaver/particle.png") << endl;
- if (buf.load( locate("data", "kscreensaver/particle.png") ) )
+    kdDebug() << "Loading: " << locate("data", "tdescreensaver/particle.png") << endl;
+ if (buf.load( locate("data", "tdescreensaver/particle.png") ) )
 
         {
 		tex = convertToGLFormat(buf);  // flipped 32bit RGBA
diff --git a/kscreensaver/kdesavers/gravity.h b/tdescreensaver/kdesavers/gravity.h
index 0a1130bb..2d44ea64 100644
--- a/kscreensaver/kdesavers/gravity.h
+++ b/tdescreensaver/kdesavers/gravity.h
@@ -23,7 +23,7 @@
 #include <GL/glu.h>
 #include <GL/gl.h>
 #endif
-#include <kscreensaver.h>
+#include <tdescreensaver.h>
 #include <tqtimer.h>
 #include <tqimage.h>
 #include "gravitycfg.h"
diff --git a/kscreensaver/kdesavers/gravitycfg.ui b/tdescreensaver/kdesavers/gravitycfg.ui
index 2d809c1f..2d809c1f 100644
--- a/kscreensaver/kdesavers/gravitycfg.ui
+++ b/tdescreensaver/kdesavers/gravitycfg.ui
diff --git a/kscreensaver/kdesavers/image.png b/tdescreensaver/kdesavers/image.png
index 859645da..859645da 100644
--- a/kscreensaver/kdesavers/image.png
+++ b/tdescreensaver/kdesavers/image.png
diff --git a/kscreensaver/kdesavers/kclock.cpp b/tdescreensaver/kdesavers/kclock.cpp
index 5201f222..5201f222 100644
--- a/kscreensaver/kdesavers/kclock.cpp
+++ b/tdescreensaver/kdesavers/kclock.cpp
diff --git a/kscreensaver/kdesavers/kclock.h b/tdescreensaver/kdesavers/kclock.h
index 1ec0103d..d0c19e34 100644
--- a/kscreensaver/kdesavers/kclock.h
+++ b/tdescreensaver/kdesavers/kclock.h
@@ -12,7 +12,7 @@
 
 #include <tqtimer.h>
 #include <kdialogbase.h>
-#include <kscreensaver.h>
+#include <tdescreensaver.h>
 
 
 class KClockPainter
diff --git a/kscreensaver/kdesavers/kscience.png b/tdescreensaver/kdesavers/kscience.png
index 19de5909..19de5909 100644
--- a/kscreensaver/kdesavers/kscience.png
+++ b/tdescreensaver/kdesavers/kscience.png
diff --git a/kscreensaver/kdesavers/kvm.cpp b/tdescreensaver/kdesavers/kvm.cpp
index fbbfdd31..3ba233fa 100644
--- a/kscreensaver/kdesavers/kvm.cpp
+++ b/tdescreensaver/kdesavers/kvm.cpp
@@ -58,7 +58,7 @@
 #define CHAR_HEIGHT 22
 
 
-// libkscreensaver interface
+// libtdescreensaver interface
 extern "C"
 {
     KDE_EXPORT const char *kss_applicationName = "kvm.kss";
diff --git a/kscreensaver/kdesavers/kvm.h b/tdescreensaver/kdesavers/kvm.h
index 7ab58577..eb68d3a4 100644
--- a/kscreensaver/kdesavers/kvm.h
+++ b/tdescreensaver/kdesavers/kvm.h
@@ -10,7 +10,7 @@
 #include <tqptrlist.h>
 
 #include <kdialogbase.h>
-#include <kscreensaver.h>
+#include <tdescreensaver.h>
 
 extern "C" {
 #include "vm.h"
diff --git a/kscreensaver/kdesavers/lines.cpp b/tdescreensaver/kdesavers/lines.cpp
index d66f5a43..a2692217 100644
--- a/kscreensaver/kdesavers/lines.cpp
+++ b/tdescreensaver/kdesavers/lines.cpp
@@ -6,7 +6,7 @@
 // mailto:[email protected]
 //
 // layout management added 1998/04/19 by Mario Weilguni <[email protected]>
-// 2001/03/04 Converted to libkscreensaver by Martin R. Jones
+// 2001/03/04 Converted to libtdescreensaver by Martin R. Jones
 
 #include <config.h>
 #include <stdlib.h>
@@ -30,7 +30,7 @@
 
 #define MAXLENGTH	256
 
-// libkscreensaver interface
+// libtdescreensaver interface
 extern "C"
 {
     KDE_EXPORT const char *kss_applicationName = "klines.kss";
diff --git a/kscreensaver/kdesavers/lines.h b/tdescreensaver/kdesavers/lines.h
index 7dd11200..f169dc7c 100644
--- a/kscreensaver/kdesavers/lines.h
+++ b/tdescreensaver/kdesavers/lines.h
@@ -13,7 +13,7 @@
 
 #include <kdialogbase.h>
 #include <krandomsequence.h>
-#include <kscreensaver.h>
+#include <tdescreensaver.h>
 
 class KColorButton;
 
diff --git a/kscreensaver/kdesavers/lorenz.cpp b/tdescreensaver/kdesavers/lorenz.cpp
index e4e5f63c..91e6bbfc 100644
--- a/kscreensaver/kdesavers/lorenz.cpp
+++ b/tdescreensaver/kdesavers/lorenz.cpp
@@ -26,7 +26,7 @@
 #include "lorenz.h"
 #include "lorenz.moc"
 
-// libkscreensaver interface
+// libtdescreensaver interface
 extern "C"
 {
     KDE_EXPORT const char *kss_applicationName = "klorenz.kss";
diff --git a/kscreensaver/kdesavers/lorenz.h b/tdescreensaver/kdesavers/lorenz.h
index 5dfa6388..e0b43b31 100644
--- a/kscreensaver/kdesavers/lorenz.h
+++ b/tdescreensaver/kdesavers/lorenz.h
@@ -13,7 +13,7 @@
 
 #include <tqtimer.h>
 #include <tqcolor.h>
-#include <kscreensaver.h>
+#include <tdescreensaver.h>
 #include <kdialogbase.h>
 
 // See lorenz.cpp for this private class
diff --git a/kscreensaver/kdesavers/particle.png b/tdescreensaver/kdesavers/particle.png
index a777c822..a777c822 100644
--- a/kscreensaver/kdesavers/particle.png
+++ b/tdescreensaver/kdesavers/particle.png
diff --git a/kscreensaver/kdesavers/pendulum.cpp b/tdescreensaver/kdesavers/pendulum.cpp
index a355e029..d1889877 100644
--- a/kscreensaver/kdesavers/pendulum.cpp
+++ b/tdescreensaver/kdesavers/pendulum.cpp
@@ -49,15 +49,15 @@
 
 #define KPENDULUM_VERSION "1.1"
 
-// libkscreensaver interface
+// libtdescreensaver interface
 extern "C"
 {
-   /// application name for libkscreensaver interface
+   /// application name for libtdescreensaver interface
    KDE_EXPORT const char *kss_applicationName = "kpendulum.kss";
-   /// application description for libkscreensaver interface
+   /// application description for libtdescreensaver interface
    KDE_EXPORT const char *kss_description = I18N_NOOP("Simulation of\
  a two-part pendulum");
-   /// application version for libkscreensaver interface
+   /// application version for libtdescreensaver interface
    KDE_EXPORT const char *kss_version = KPENDULUM_VERSION;
 
    /// function to create screen saver object
diff --git a/kscreensaver/kdesavers/pendulum.h b/tdescreensaver/kdesavers/pendulum.h
index 05998d9f..815e2455 100644
--- a/kscreensaver/kdesavers/pendulum.h
+++ b/tdescreensaver/kdesavers/pendulum.h
@@ -23,7 +23,7 @@
 #include <GL/glu.h>
 #include <GL/gl.h>
 // KDE headers
-#include <kscreensaver.h>
+#include <tdescreensaver.h>
 
 #include "vec3.h"
 #include "rkodesolver.h"
diff --git a/kscreensaver/kdesavers/pendulumcfg.ui b/tdescreensaver/kdesavers/pendulumcfg.ui
index 4fa13d4f..4fa13d4f 100644
--- a/kscreensaver/kdesavers/pendulumcfg.ui
+++ b/tdescreensaver/kdesavers/pendulumcfg.ui
diff --git a/kscreensaver/kdesavers/polygon.cpp b/tdescreensaver/kdesavers/polygon.cpp
index 2358f90a..a28cd34c 100644
--- a/kscreensaver/kdesavers/polygon.cpp
+++ b/tdescreensaver/kdesavers/polygon.cpp
@@ -5,7 +5,7 @@
 // Copyright (c)  Martin R. Jones 1996
 //
 // layout management added 1998/04/19 by Mario Weilguni <[email protected]>
-// 2001/03/04 Converted to libkscreensaver by Martin R. Jones
+// 2001/03/04 Converted to libtdescreensaver by Martin R. Jones
 
 #include <config.h>
 #include <stdlib.h>
@@ -28,7 +28,7 @@
 #define MAXLENGTH	65
 #define MAXVERTICES	19
 
-// libkscreensaver interface
+// libtdescreensaver interface
 extern "C"
 {
     KDE_EXPORT const char *kss_applicationName = "kpolygon.kss";
diff --git a/kscreensaver/kdesavers/polygon.h b/tdescreensaver/kdesavers/polygon.h
index cd6889ce..86c9d2aa 100644
--- a/kscreensaver/kdesavers/polygon.h
+++ b/tdescreensaver/kdesavers/polygon.h
@@ -12,7 +12,7 @@
 #include <tqptrlist.h>
 
 #include <kdialogbase.h>
-#include <kscreensaver.h>
+#include <tdescreensaver.h>
 #include <krandomsequence.h>
 
 class kPolygonSaver : public KScreenSaver
diff --git a/kscreensaver/kdesavers/rkodesolver.cpp b/tdescreensaver/kdesavers/rkodesolver.cpp
index 2127a110..2127a110 100644
--- a/kscreensaver/kdesavers/rkodesolver.cpp
+++ b/tdescreensaver/kdesavers/rkodesolver.cpp
diff --git a/kscreensaver/kdesavers/rkodesolver.h b/tdescreensaver/kdesavers/rkodesolver.h
index d1f9d556..d1f9d556 100644
--- a/kscreensaver/kdesavers/rkodesolver.h
+++ b/tdescreensaver/kdesavers/rkodesolver.h
diff --git a/kscreensaver/kdesavers/rotation.cpp b/tdescreensaver/kdesavers/rotation.cpp
index 9958bd81..fb38b71f 100644
--- a/kscreensaver/kdesavers/rotation.cpp
+++ b/tdescreensaver/kdesavers/rotation.cpp
@@ -50,15 +50,15 @@
 /** Version number of this screen saver */
 #define KROTATION_VERSION "1.1"
 
-// libkscreensaver interface
+// libtdescreensaver interface
 extern "C"
 {
-   /** application name for the libkscreensaver interface */
+   /** application name for the libtdescreensaver interface */
    KDE_EXPORT const char *kss_applicationName = "krotation.kss";
-   /** application description for the libkscreensaver interface */
+   /** application description for the libtdescreensaver interface */
    KDE_EXPORT const char *kss_description =
    I18N_NOOP("Simulation of a force free rotating asymmetric body");
-   /** application version for the libkscreensaver interface */
+   /** application version for the libtdescreensaver interface */
    KDE_EXPORT const char *kss_version = KROTATION_VERSION;
 
    /** function to create screen saver object */
diff --git a/kscreensaver/kdesavers/rotation.h b/tdescreensaver/kdesavers/rotation.h
index 0ae46469..c4dde402 100644
--- a/kscreensaver/kdesavers/rotation.h
+++ b/tdescreensaver/kdesavers/rotation.h
@@ -20,7 +20,7 @@
 #include <GL/glu.h>
 #include <GL/gl.h>
 // KDE headers
-#include <kscreensaver.h>
+#include <tdescreensaver.h>
 
 #include "vec3.h"
 #include "rkodesolver.h"
diff --git a/kscreensaver/kdesavers/rotationcfg.ui b/tdescreensaver/kdesavers/rotationcfg.ui
index 7bfca1aa..7bfca1aa 100644
--- a/kscreensaver/kdesavers/rotationcfg.ui
+++ b/tdescreensaver/kdesavers/rotationcfg.ui
diff --git a/kscreensaver/kdesavers/science.cpp b/tdescreensaver/kdesavers/science.cpp
index efa860d9..1eea3262 100644
--- a/kscreensaver/kdesavers/science.cpp
+++ b/tdescreensaver/kdesavers/science.cpp
@@ -51,7 +51,7 @@
 #undef Below
 
 
-// libkscreensaver interface
+// libtdescreensaver interface
 extern "C"
 {
     KDE_EXPORT const char *kss_applicationName = "kscience.kss";
@@ -971,7 +971,7 @@ KScienceSetup::KScienceSetup(  TQWidget *parent, const char *name )
 	// preview
 	preview = new KPreviewWidget( main );
 	preview->setFixedSize( 220, 170 );
-	TQPixmap p( locate("data", "kscreensaver/pics/kscience.png") );
+	TQPixmap p( locate("data", "tdescreensaver/pics/kscience.png") );
 	if( p.isNull() )
 		preview->setBackgroundColor( black );
 	else
diff --git a/kscreensaver/kdesavers/science.h b/tdescreensaver/kdesavers/science.h
index d0a050dd..eb894053 100644
--- a/kscreensaver/kdesavers/science.h
+++ b/tdescreensaver/kdesavers/science.h
@@ -11,7 +11,7 @@
 #include <tqrect.h>
 #include <tqtimer.h>
 #include <kdialogbase.h>
-#include <kscreensaver.h>
+#include <tdescreensaver.h>
 
 class TQSlider;
 class TQCheckBox;
diff --git a/kscreensaver/kdesavers/slideshow.cpp b/tdescreensaver/kdesavers/slideshow.cpp
index a3179b5f..ea216991 100644
--- a/kscreensaver/kdesavers/slideshow.cpp
+++ b/tdescreensaver/kdesavers/slideshow.cpp
@@ -6,7 +6,7 @@
  *
  * This code is under GPL
  *
- * 2001/03/04 Converted to libkscreensaver by Martin R. Jones.
+ * 2001/03/04 Converted to libtdescreensaver by Martin R. Jones.
  */
 
 
@@ -50,7 +50,7 @@ static const char version[] = SLIDESHOW_VERSION;
 static const char description[] = I18N_NOOP("KSlideshow");
 
 
-// libkscreensaver interface
+// libtdescreensaver interface
 extern "C"
 {
     KDE_EXPORT const char *kss_applicationName = "kslideshow.kss";
diff --git a/kscreensaver/kdesavers/slideshow.h b/tdescreensaver/kdesavers/slideshow.h
index 208f83bc..6d20315b 100644
--- a/kscreensaver/kdesavers/slideshow.h
+++ b/tdescreensaver/kdesavers/slideshow.h
@@ -14,7 +14,7 @@
 #include <tqpainter.h>
 #include <tqimage.h>
 
-#include <kscreensaver.h>
+#include <tdescreensaver.h>
 #include <kdialogbase.h>
 
 #include "slideshowcfg.h"
diff --git a/kscreensaver/kdesavers/slideshowcfg.ui b/tdescreensaver/kdesavers/slideshowcfg.ui
index e63dbd55..e63dbd55 100644
--- a/kscreensaver/kdesavers/slideshowcfg.ui
+++ b/tdescreensaver/kdesavers/slideshowcfg.ui
diff --git a/kscreensaver/kdesavers/sspreviewarea.cpp b/tdescreensaver/kdesavers/sspreviewarea.cpp
index 2b8b3c65..2b8b3c65 100644
--- a/kscreensaver/kdesavers/sspreviewarea.cpp
+++ b/tdescreensaver/kdesavers/sspreviewarea.cpp
diff --git a/kscreensaver/kdesavers/sspreviewarea.h b/tdescreensaver/kdesavers/sspreviewarea.h
index ab36c4b8..ab36c4b8 100644
--- a/kscreensaver/kdesavers/sspreviewarea.h
+++ b/tdescreensaver/kdesavers/sspreviewarea.h
diff --git a/kscreensaver/kdesavers/vec3.cpp b/tdescreensaver/kdesavers/vec3.cpp
index c66730e5..c66730e5 100644
--- a/kscreensaver/kdesavers/vec3.cpp
+++ b/tdescreensaver/kdesavers/vec3.cpp
diff --git a/kscreensaver/kdesavers/vec3.h b/tdescreensaver/kdesavers/vec3.h
index 62aeb8ed..62aeb8ed 100644
--- a/kscreensaver/kdesavers/vec3.h
+++ b/tdescreensaver/kdesavers/vec3.h
diff --git a/kscreensaver/kdesavers/vm.c b/tdescreensaver/kdesavers/vm.c
index 6d4a1af2..6d4a1af2 100644
--- a/kscreensaver/kdesavers/vm.c
+++ b/tdescreensaver/kdesavers/vm.c
diff --git a/kscreensaver/kdesavers/vm.h b/tdescreensaver/kdesavers/vm.h
index dc64d241..dc64d241 100644
--- a/kscreensaver/kdesavers/vm.h
+++ b/tdescreensaver/kdesavers/vm.h
diff --git a/kscreensaver/kdesavers/vm.xbm b/tdescreensaver/kdesavers/vm.xbm
index 3d6e84cd..3d6e84cd 100644
--- a/kscreensaver/kdesavers/vm.xbm
+++ b/tdescreensaver/kdesavers/vm.xbm
diff --git a/kscreensaver/kdesavers/vm.xpm b/tdescreensaver/kdesavers/vm.xpm
index 8d00a5b3..8d00a5b3 100644
--- a/kscreensaver/kdesavers/vm.xpm
+++ b/tdescreensaver/kdesavers/vm.xpm
diff --git a/kscreensaver/kdesavers/vm_random.c b/tdescreensaver/kdesavers/vm_random.c
index ea0cd96a..ea0cd96a 100644
--- a/kscreensaver/kdesavers/vm_random.c
+++ b/tdescreensaver/kdesavers/vm_random.c
diff --git a/kscreensaver/kdesavers/vm_random.h b/tdescreensaver/kdesavers/vm_random.h
index 1aa5e937..1aa5e937 100644
--- a/kscreensaver/kdesavers/vm_random.h
+++ b/tdescreensaver/kdesavers/vm_random.h
diff --git a/kscreensaver/kdesavers/wave.cpp b/tdescreensaver/kdesavers/wave.cpp
index f2f03544..67357f89 100644
--- a/kscreensaver/kdesavers/wave.cpp
+++ b/tdescreensaver/kdesavers/wave.cpp
@@ -34,7 +34,7 @@
 #ifndef GLU_NURBS_TEXTURE_COORD
 #define GLU_NURBS_TEXTURE_COORD            100168
 #endif
-// libkscreensaver interface
+// libtdescreensaver interface
 
 extern "C"
 {
@@ -292,8 +292,8 @@ bool Wave::LoadGLTextures()
     bool Status = TRUE;
 
 	TQImage buf; // = TQPixmap::grabWindow ( 0 ).convertToImage();
-   kdDebug() << "Loading: " << locate("data", "kscreensaver/image.png") << endl;
- if (buf.load( locate("data", "kscreensaver/image.png") ) )
+   kdDebug() << "Loading: " << locate("data", "tdescreensaver/image.png") << endl;
+ if (buf.load( locate("data", "tdescreensaver/image.png") ) )
 
         {
                 tex = convertToGLFormat(buf);  // flipped 32bit RGBA
diff --git a/kscreensaver/kdesavers/wave.h b/tdescreensaver/kdesavers/wave.h
index 7d1c2e1a..363e8ddd 100644
--- a/kscreensaver/kdesavers/wave.h
+++ b/tdescreensaver/kdesavers/wave.h
@@ -23,7 +23,7 @@
 #include <GL/glu.h>
 #include <GL/gl.h>
 #endif
-#include <kscreensaver.h>
+#include <tdescreensaver.h>
 #include <tqtimer.h>
 #include <tqimage.h>
 #include "wavecfg.h"
diff --git a/kscreensaver/kdesavers/wavecfg.ui b/tdescreensaver/kdesavers/wavecfg.ui
index 9ad24416..9ad24416 100644
--- a/kscreensaver/kdesavers/wavecfg.ui
+++ b/tdescreensaver/kdesavers/wavecfg.ui
diff --git a/kscreensaver/krootbacking/CMakeLists.txt b/tdescreensaver/krootbacking/CMakeLists.txt
index bedfa71e..bedfa71e 100644
--- a/kscreensaver/krootbacking/CMakeLists.txt
+++ b/tdescreensaver/krootbacking/CMakeLists.txt
diff --git a/kscreensaver/krootbacking/Makefile.am b/tdescreensaver/krootbacking/Makefile.am
index 4f4d3e3d..4f4d3e3d 100644
--- a/kscreensaver/krootbacking/Makefile.am
+++ b/tdescreensaver/krootbacking/Makefile.am
diff --git a/kscreensaver/krootbacking/xscreensaver-getimage b/tdescreensaver/krootbacking/xscreensaver-getimage
index 4745ac1b..4745ac1b 100644
--- a/kscreensaver/krootbacking/xscreensaver-getimage
+++ b/tdescreensaver/krootbacking/xscreensaver-getimage
diff --git a/kscreensaver/krootbacking/xscreensaver-getimage-file b/tdescreensaver/krootbacking/xscreensaver-getimage-file
index ae1b0e9d..ae1b0e9d 100644
--- a/kscreensaver/krootbacking/xscreensaver-getimage-file
+++ b/tdescreensaver/krootbacking/xscreensaver-getimage-file
diff --git a/kscreensaver/kxsconfig/CMakeLists.txt b/tdescreensaver/kxsconfig/CMakeLists.txt
index 99f44e54..99f44e54 100644
--- a/kscreensaver/kxsconfig/CMakeLists.txt
+++ b/tdescreensaver/kxsconfig/CMakeLists.txt
diff --git a/kscreensaver/kxsconfig/Makefile.am b/tdescreensaver/kxsconfig/Makefile.am
index 16eb66aa..e0b89f67 100644
--- a/kscreensaver/kxsconfig/Makefile.am
+++ b/tdescreensaver/kxsconfig/Makefile.am
@@ -1,10 +1,10 @@
-## Makefile.am of tdebase/kscreensaver/kxsconfig
+## Makefile.am of tdebase/tdescreensaver/kxsconfig
 
 INCLUDES = $(all_includes)
-kxsconfig_LDFLAGS  = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kxsconfig_LDFLAGS  = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kxsconfig_LDADD    = $(LIB_KIO) -lXt
 
-kxsrun_LDFLAGS  = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kxsrun_LDFLAGS  = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 kxsrun_LDADD    = $(LIB_KIO)
 
 EXTRA_DIST = ScreenSavers hacks.pot
diff --git a/kscreensaver/kxsconfig/README b/tdescreensaver/kxsconfig/README
index 3d009305..3d009305 100644
--- a/kscreensaver/kxsconfig/README
+++ b/tdescreensaver/kxsconfig/README
diff --git a/kscreensaver/kxsconfig/ScreenSavers/abstractile.desktop b/tdescreensaver/kxsconfig/ScreenSavers/abstractile.desktop
index 340115ef..0fecee39 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/abstractile.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/abstractile.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=abstractile
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=InWindow,Root,Setup
 Name=Abstractile
diff --git a/kscreensaver/kxsconfig/ScreenSavers/anemone.desktop b/tdescreensaver/kxsconfig/ScreenSavers/anemone.desktop
index 1c07beba..fd00df0d 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/anemone.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/anemone.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=anemone
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/anemotaxis.desktop b/tdescreensaver/kxsconfig/ScreenSavers/anemotaxis.desktop
index 738a069d..1ce51307 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/anemotaxis.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/anemotaxis.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=anemotaxis
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=InWindow,Root,Setup;
 X-TDE-Category=Visit to Flatland
diff --git a/kscreensaver/kxsconfig/ScreenSavers/ant.desktop b/tdescreensaver/kxsconfig/ScreenSavers/ant.desktop
index c539bac2..9e3a6c78 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/ant.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/ant.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=ant
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
@@ -129,7 +129,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun ant -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/antinspect.desktop b/tdescreensaver/kxsconfig/ScreenSavers/antinspect.desktop
index 322f15f6..79f53546 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/antinspect.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/antinspect.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=antinspect
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/antmaze.desktop b/tdescreensaver/kxsconfig/ScreenSavers/antmaze.desktop
index f4c63353..61a88d9a 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/antmaze.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/antmaze.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=antmaze
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=InWindow,Root,Setup
 Name=AntMaze
diff --git a/kscreensaver/kxsconfig/ScreenSavers/antspotlight.desktop b/tdescreensaver/kxsconfig/ScreenSavers/antspotlight.desktop
index 2c8d2e6e..3dbbdcf7 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/antspotlight.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/antspotlight.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=antspotlight
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/apollonian.desktop b/tdescreensaver/kxsconfig/ScreenSavers/apollonian.desktop
index a7fe846a..41171f00 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/apollonian.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/apollonian.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=apollonian
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/apple2.desktop b/tdescreensaver/kxsconfig/ScreenSavers/apple2.desktop
index 85577435..b9f38063 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/apple2.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/apple2.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=apple2
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/atlantis.desktop b/tdescreensaver/kxsconfig/ScreenSavers/atlantis.desktop
index 528f1e7f..4e82a1f3 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/atlantis.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/atlantis.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=atlantis
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
@@ -102,7 +102,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun atlantis -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/attraction.desktop b/tdescreensaver/kxsconfig/ScreenSavers/attraction.desktop
index e77b89f2..6e29b084 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/attraction.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/attraction.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=attraction
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=Setup;InWindow;Root;
@@ -132,7 +132,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun attraction -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/atunnel.desktop b/tdescreensaver/kxsconfig/ScreenSavers/atunnel.desktop
index 58b516be..f6afb414 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/atunnel.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/atunnel.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=atunnel
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/barcode.desktop b/tdescreensaver/kxsconfig/ScreenSavers/barcode.desktop
index ecaa218f..00d06317 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/barcode.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/barcode.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=barcode
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/blaster.desktop b/tdescreensaver/kxsconfig/ScreenSavers/blaster.desktop
index 415a1d11..e05189e5 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/blaster.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/blaster.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=blaster
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/blinkbox.desktop b/tdescreensaver/kxsconfig/ScreenSavers/blinkbox.desktop
index 859f3c7d..c80a0ed6 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/blinkbox.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/blinkbox.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=blinkbox
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/blitspin.desktop b/tdescreensaver/kxsconfig/ScreenSavers/blitspin.desktop
index 234cd4a9..b5e0d2ec 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/blitspin.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/blitspin.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=blitspin
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/blocktube.desktop b/tdescreensaver/kxsconfig/ScreenSavers/blocktube.desktop
index b444f197..e7614e8f 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/blocktube.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/blocktube.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=blocktube
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/boing.desktop b/tdescreensaver/kxsconfig/ScreenSavers/boing.desktop
index eab58407..bc8f76c8 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/boing.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/boing.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=boing
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=InWindow,Root,Setup
 Name=Boing
diff --git a/kscreensaver/kxsconfig/ScreenSavers/bouboule.desktop b/tdescreensaver/kxsconfig/ScreenSavers/bouboule.desktop
index d03ac6e2..28ed4152 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/bouboule.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/bouboule.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=bouboule
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=Setup;InWindow;Root;
@@ -103,7 +103,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun bouboule -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/bouncingcow.desktop b/tdescreensaver/kxsconfig/ScreenSavers/bouncingcow.desktop
index 80942540..13961a05 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/bouncingcow.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/bouncingcow.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=bouncingcow
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/boxed.desktop b/tdescreensaver/kxsconfig/ScreenSavers/boxed.desktop
index b1f4e7c9..afb2fa32 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/boxed.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/boxed.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=boxed
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/boxfit.desktop b/tdescreensaver/kxsconfig/ScreenSavers/boxfit.desktop
index 162847a4..11ddeaf7 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/boxfit.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/boxfit.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=boxfit
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=InWindow,Root,Setup
 Name=BoxFit
diff --git a/kscreensaver/kxsconfig/ScreenSavers/braid.desktop b/tdescreensaver/kxsconfig/ScreenSavers/braid.desktop
index 0d7cdb1b..fdd91238 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/braid.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/braid.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=braid
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
@@ -118,7 +118,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun braid -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/bsod.desktop b/tdescreensaver/kxsconfig/ScreenSavers/bsod.desktop
index c61a3219..5635cf70 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/bsod.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/bsod.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=bsod
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/bubble3d.desktop b/tdescreensaver/kxsconfig/ScreenSavers/bubble3d.desktop
index 25cad866..f554ff3d 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/bubble3d.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/bubble3d.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=bubble3d
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
@@ -130,7 +130,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun bubble3d -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/bubbles.desktop b/tdescreensaver/kxsconfig/ScreenSavers/bubbles.desktop
index 05520e1e..45ce25be 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/bubbles.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/bubbles.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=bubbles
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
@@ -130,7 +130,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun bubbles -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/bumps.desktop b/tdescreensaver/kxsconfig/ScreenSavers/bumps.desktop
index b846345b..a2c21869 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/bumps.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/bumps.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=bumps
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/cage.desktop b/tdescreensaver/kxsconfig/ScreenSavers/cage.desktop
index 8455e3ea..156aed2f 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/cage.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/cage.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=cage
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
@@ -130,7 +130,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun cage -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/carousel.desktop b/tdescreensaver/kxsconfig/ScreenSavers/carousel.desktop
index 39858ad3..021a71fe 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/carousel.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/carousel.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=carousel
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=InWindow,Root,Setup
 Name=Carousel
diff --git a/kscreensaver/kxsconfig/ScreenSavers/ccurve.desktop b/tdescreensaver/kxsconfig/ScreenSavers/ccurve.desktop
index c83e2106..85f95125 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/ccurve.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/ccurve.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=ccurve
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/celtic.desktop b/tdescreensaver/kxsconfig/ScreenSavers/celtic.desktop
index 11ad8618..0aa61b74 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/celtic.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/celtic.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=celtic
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=InWindow,Root,Setup
 Name=Celtic
diff --git a/kscreensaver/kxsconfig/ScreenSavers/circuit.desktop b/tdescreensaver/kxsconfig/ScreenSavers/circuit.desktop
index 869d6965..67dbb424 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/circuit.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/circuit.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=circuit
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/cloudlife.desktop b/tdescreensaver/kxsconfig/ScreenSavers/cloudlife.desktop
index ea4f2fe9..9bf34348 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/cloudlife.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/cloudlife.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=cloudlife
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/compass.desktop b/tdescreensaver/kxsconfig/ScreenSavers/compass.desktop
index 3ecd3890..672c44b1 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/compass.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/compass.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=compass
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
@@ -134,7 +134,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun compass -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/coral.desktop b/tdescreensaver/kxsconfig/ScreenSavers/coral.desktop
index 2fbf62ba..372a9906 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/coral.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/coral.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=coral
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=Setup;InWindow;Root;
@@ -127,7 +127,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun coral -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/crackberg.desktop b/tdescreensaver/kxsconfig/ScreenSavers/crackberg.desktop
index a2ca3815..c212facf 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/crackberg.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/crackberg.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=crackberg
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=InWindow,Root,Setup
 Name=Crackberg
diff --git a/kscreensaver/kxsconfig/ScreenSavers/critical.desktop b/tdescreensaver/kxsconfig/ScreenSavers/critical.desktop
index 8e5680a7..9f6406a4 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/critical.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/critical.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=critical
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/crystal.desktop b/tdescreensaver/kxsconfig/ScreenSavers/crystal.desktop
index dcdba5f4..f4e19c5f 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/crystal.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/crystal.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=crystal
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=Setup;InWindow;Root;
@@ -132,7 +132,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun crystal -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/cube21.desktop b/tdescreensaver/kxsconfig/ScreenSavers/cube21.desktop
index a3463eb2..3d5ae00a 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/cube21.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/cube21.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=cube21
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=InWindow,Root,Setup
 Name=Cube 21
diff --git a/kscreensaver/kxsconfig/ScreenSavers/cubenetic.desktop b/tdescreensaver/kxsconfig/ScreenSavers/cubenetic.desktop
index f64c2e26..6a41938d 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/cubenetic.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/cubenetic.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=cubenetic
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/cubestorm.desktop b/tdescreensaver/kxsconfig/ScreenSavers/cubestorm.desktop
index 85da86dc..5900085e 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/cubestorm.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/cubestorm.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=cubestorm
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/cubicgrid.desktop b/tdescreensaver/kxsconfig/ScreenSavers/cubicgrid.desktop
index 701689bc..185c1b34 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/cubicgrid.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/cubicgrid.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Exec=cubicgrid
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=InWindow,Root,Setup
 Name=CubicGrid
diff --git a/kscreensaver/kxsconfig/ScreenSavers/cwaves.desktop b/tdescreensaver/kxsconfig/ScreenSavers/cwaves.desktop
index 8871bb19..eb473b85 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/cwaves.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/cwaves.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=cwaves
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=InWindow,Root,Setup
 Name=CWaves
diff --git a/kscreensaver/kxsconfig/ScreenSavers/cynosure.desktop b/tdescreensaver/kxsconfig/ScreenSavers/cynosure.desktop
index 28469b51..6dfb1385 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/cynosure.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/cynosure.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=cynosure
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
@@ -102,7 +102,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun cynosure -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/dangerball.desktop b/tdescreensaver/kxsconfig/ScreenSavers/dangerball.desktop
index 62f7e514..a8657193 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/dangerball.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/dangerball.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=dangerball
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/decayscreen.desktop b/tdescreensaver/kxsconfig/ScreenSavers/decayscreen.desktop
index 52616d12..575a0b2d 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/decayscreen.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/decayscreen.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=decayscreen
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/deco.desktop b/tdescreensaver/kxsconfig/ScreenSavers/deco.desktop
index 8578d0fb..3481832d 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/deco.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/deco.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=deco
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/deluxe.desktop b/tdescreensaver/kxsconfig/ScreenSavers/deluxe.desktop
index 5c103a38..729d8a72 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/deluxe.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/deluxe.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=deluxe
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/demon.desktop b/tdescreensaver/kxsconfig/ScreenSavers/demon.desktop
index 3719585f..c0e47951 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/demon.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/demon.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=demon
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/discrete.desktop b/tdescreensaver/kxsconfig/ScreenSavers/discrete.desktop
index 6a89fe84..14013970 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/discrete.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/discrete.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=discrete
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/distort.desktop b/tdescreensaver/kxsconfig/ScreenSavers/distort.desktop
index bebc348b..9ce460d7 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/distort.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/distort.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=distort
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/drift.desktop b/tdescreensaver/kxsconfig/ScreenSavers/drift.desktop
index 0bd0f5d9..e8a3fb30 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/drift.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/drift.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=drift
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
@@ -121,7 +121,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun drift -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/endgame.desktop b/tdescreensaver/kxsconfig/ScreenSavers/endgame.desktop
index 4b8ef071..940ea28b 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/endgame.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/endgame.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=endgame
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/engine.desktop b/tdescreensaver/kxsconfig/ScreenSavers/engine.desktop
index 8eefec5f..96979df2 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/engine.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/engine.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=engine
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/epicycle.desktop b/tdescreensaver/kxsconfig/ScreenSavers/epicycle.desktop
index 36ef64f3..55ada41b 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/epicycle.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/epicycle.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=epicycle
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/eruption.desktop b/tdescreensaver/kxsconfig/ScreenSavers/eruption.desktop
index 92372825..e9eb6f72 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/eruption.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/eruption.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=eruption
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/euler2d.desktop b/tdescreensaver/kxsconfig/ScreenSavers/euler2d.desktop
index 6044b3e7..1cf55673 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/euler2d.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/euler2d.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=euler2d
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/extrusion.desktop b/tdescreensaver/kxsconfig/ScreenSavers/extrusion.desktop
index c7ee2e5c..7a6d7f6e 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/extrusion.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/extrusion.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=extrusion
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/fadeplot.desktop b/tdescreensaver/kxsconfig/ScreenSavers/fadeplot.desktop
index 90d58f7a..cc825063 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/fadeplot.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/fadeplot.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=fadeplot
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=Setup;InWindow;Root;
@@ -118,7 +118,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun fadeplot -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/fiberlamp.desktop b/tdescreensaver/kxsconfig/ScreenSavers/fiberlamp.desktop
index e3fcf4a3..c954f2b3 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/fiberlamp.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/fiberlamp.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=fiberlamp
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=InWindow,Root,Setup
 Name=Fiberlamp
diff --git a/kscreensaver/kxsconfig/ScreenSavers/fireworkx.desktop b/tdescreensaver/kxsconfig/ScreenSavers/fireworkx.desktop
index 7e34d0d8..a97e2952 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/fireworkx.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/fireworkx.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=fireworkx
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=InWindow,Root,Setup
 X-TDE-Category=Gadgets & Simulations
diff --git a/kscreensaver/kxsconfig/ScreenSavers/flag.desktop b/tdescreensaver/kxsconfig/ScreenSavers/flag.desktop
index 2310cfb4..c89cf959 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/flag.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/flag.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=flag
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
@@ -133,7 +133,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun flag -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/flame.desktop b/tdescreensaver/kxsconfig/ScreenSavers/flame.desktop
index ae35ccc0..7b907a4c 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/flame.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/flame.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=flame
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=Setup;InWindow;Root;
@@ -133,7 +133,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun flame -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/flipflop.desktop b/tdescreensaver/kxsconfig/ScreenSavers/flipflop.desktop
index f8917af4..acd19da8 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/flipflop.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/flipflop.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=flipflop
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/flipscreen3d.desktop b/tdescreensaver/kxsconfig/ScreenSavers/flipscreen3d.desktop
index eab3be3c..788779e0 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/flipscreen3d.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/flipscreen3d.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=flipscreen3d
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/fliptext.desktop b/tdescreensaver/kxsconfig/ScreenSavers/fliptext.desktop
index 7bd73f8d..3a5fdd29 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/fliptext.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/fliptext.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=fliptext
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=InWindow,Root,Setup
 Name=FlipText
diff --git a/kscreensaver/kxsconfig/ScreenSavers/flow.desktop b/tdescreensaver/kxsconfig/ScreenSavers/flow.desktop
index 3be47646..0a3050be 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/flow.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/flow.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=flow
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=Setup;InWindow;Root;
@@ -129,7 +129,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun flow -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/fluidballs.desktop b/tdescreensaver/kxsconfig/ScreenSavers/fluidballs.desktop
index 6c8ae460..250c1665 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/fluidballs.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/fluidballs.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=fluidballs
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/flurry.desktop b/tdescreensaver/kxsconfig/ScreenSavers/flurry.desktop
index 1f42b9ef..112c013b 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/flurry.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/flurry.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=flurry
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/flyingtoasters.desktop b/tdescreensaver/kxsconfig/ScreenSavers/flyingtoasters.desktop
index 55f2f209..fe9118e9 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/flyingtoasters.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/flyingtoasters.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=flyingtoasters
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/fontglide.desktop b/tdescreensaver/kxsconfig/ScreenSavers/fontglide.desktop
index 2bdfed89..3bc4b44c 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/fontglide.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/fontglide.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=fontglide
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/forest.desktop b/tdescreensaver/kxsconfig/ScreenSavers/forest.desktop
index 32fe013b..3c154efb 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/forest.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/forest.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=forest
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=Setup;InWindow;Root;
@@ -134,7 +134,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun forest -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/fuzzyflakes.desktop b/tdescreensaver/kxsconfig/ScreenSavers/fuzzyflakes.desktop
index a6269ea5..e766620e 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/fuzzyflakes.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/fuzzyflakes.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=fuzzyflakes
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/galaxy.desktop b/tdescreensaver/kxsconfig/ScreenSavers/galaxy.desktop
index 133995bc..18789c85 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/galaxy.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/galaxy.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=galaxy
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
@@ -131,7 +131,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun galaxy -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/gears.desktop b/tdescreensaver/kxsconfig/ScreenSavers/gears.desktop
index d0209f9b..eaa8865c 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/gears.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/gears.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=gears
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=Setup;InWindow;Root;
@@ -129,7 +129,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun gears -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/gflux.desktop b/tdescreensaver/kxsconfig/ScreenSavers/gflux.desktop
index 59e854a6..436ea3c9 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/gflux.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/gflux.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=gflux
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/glblur.desktop b/tdescreensaver/kxsconfig/ScreenSavers/glblur.desktop
index d8c2e45c..d5126887 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/glblur.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/glblur.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=glblur
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/glcells.desktop b/tdescreensaver/kxsconfig/ScreenSavers/glcells.desktop
index 04778a57..468b712d 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/glcells.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/glcells.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=glcells
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=InWindow,Root,Setup
 Name=GLCells
diff --git a/kscreensaver/kxsconfig/ScreenSavers/gleidescope.desktop b/tdescreensaver/kxsconfig/ScreenSavers/gleidescope.desktop
index 49b7adbf..e2e62571 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/gleidescope.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/gleidescope.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=gleidescope
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/glforestfire.desktop b/tdescreensaver/kxsconfig/ScreenSavers/glforestfire.desktop
index 504a1d2c..fb7651c3 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/glforestfire.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/glforestfire.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=glforestfire
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/glhanoi.desktop b/tdescreensaver/kxsconfig/ScreenSavers/glhanoi.desktop
index c06eb4ec..449050b6 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/glhanoi.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/glhanoi.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=glhanoi
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=InWindow,Root,Setup
 Name=GLHanoi
diff --git a/kscreensaver/kxsconfig/ScreenSavers/glknots.desktop b/tdescreensaver/kxsconfig/ScreenSavers/glknots.desktop
index 092cdd88..31a84397 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/glknots.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/glknots.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=glknots
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/glmatrix.desktop b/tdescreensaver/kxsconfig/ScreenSavers/glmatrix.desktop
index 3baadc48..20c58d04 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/glmatrix.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/glmatrix.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=glmatrix
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/glplanet.desktop b/tdescreensaver/kxsconfig/ScreenSavers/glplanet.desktop
index 59bcc996..2930501a 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/glplanet.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/glplanet.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=glplanet
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
@@ -126,7 +126,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun glplanet -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/glschool.desktop b/tdescreensaver/kxsconfig/ScreenSavers/glschool.desktop
index 8e0eaf17..3983b491 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/glschool.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/glschool.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=glschool
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=InWindow,Root,Setup
 Name=glschool
diff --git a/kscreensaver/kxsconfig/ScreenSavers/glslideshow.desktop b/tdescreensaver/kxsconfig/ScreenSavers/glslideshow.desktop
index 8c6e2233..70478d54 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/glslideshow.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/glslideshow.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=glslideshow
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/glsnake.desktop b/tdescreensaver/kxsconfig/ScreenSavers/glsnake.desktop
index 08cd615a..5fec3cf8 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/glsnake.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/glsnake.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=glsnake
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/gltext.desktop b/tdescreensaver/kxsconfig/ScreenSavers/gltext.desktop
index dcc24c50..80a5c9ab 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/gltext.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/gltext.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=gltext
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/goop.desktop b/tdescreensaver/kxsconfig/ScreenSavers/goop.desktop
index 08203149..417e3ca7 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/goop.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/goop.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=goop
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
@@ -98,7 +98,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun goop -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/grav.desktop b/tdescreensaver/kxsconfig/ScreenSavers/grav.desktop
index 3710681c..f1fbe04d 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/grav.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/grav.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=grav
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=Setup;InWindow;Root;
@@ -130,7 +130,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun grav -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/greynetic.desktop b/tdescreensaver/kxsconfig/ScreenSavers/greynetic.desktop
index 7ad003ba..fe1bb7dd 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/greynetic.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/greynetic.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=greynetic
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
@@ -107,7 +107,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun greynetic -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/halftone.desktop b/tdescreensaver/kxsconfig/ScreenSavers/halftone.desktop
index c7de8bb7..13bd1df0 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/halftone.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/halftone.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=halftone
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/halo.desktop b/tdescreensaver/kxsconfig/ScreenSavers/halo.desktop
index 127e34a3..0c53eb01 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/halo.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/halo.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=halo
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/helix.desktop b/tdescreensaver/kxsconfig/ScreenSavers/helix.desktop
index baf74b38..80b5892e 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/helix.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/helix.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=helix
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/hopalong.desktop b/tdescreensaver/kxsconfig/ScreenSavers/hopalong.desktop
index b70ab79e..dbf32f14 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/hopalong.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/hopalong.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=hopalong
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
@@ -97,7 +97,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun hopalong -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/hyperball.desktop b/tdescreensaver/kxsconfig/ScreenSavers/hyperball.desktop
index 2174f83f..c99130ce 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/hyperball.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/hyperball.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=hyperball
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/hypercube.desktop b/tdescreensaver/kxsconfig/ScreenSavers/hypercube.desktop
index 04f44777..fff07c9b 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/hypercube.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/hypercube.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=hypercube
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
@@ -126,7 +126,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun hypercube -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/hypertorus.desktop b/tdescreensaver/kxsconfig/ScreenSavers/hypertorus.desktop
index b5d075bc..863f2fd2 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/hypertorus.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/hypertorus.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=hypertorus
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/hypnowheel.desktop b/tdescreensaver/kxsconfig/ScreenSavers/hypnowheel.desktop
index f2540f0b..fb06233a 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/hypnowheel.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/hypnowheel.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Exec=hypnowheel
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=InWindow,Root,Setup
 Name=Hypnowheel
diff --git a/kscreensaver/kxsconfig/ScreenSavers/ifs.desktop b/tdescreensaver/kxsconfig/ScreenSavers/ifs.desktop
index 2e1e6a6a..e271c5fd 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/ifs.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/ifs.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=ifs
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Action=InWindow;Root;Setup
@@ -127,7 +127,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun ifs -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/imsmap.desktop b/tdescreensaver/kxsconfig/ScreenSavers/imsmap.desktop
index 09fdf91b..bd0d3dc9 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/imsmap.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/imsmap.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=imsmap
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Action=InWindow;Root;Setup
@@ -132,7 +132,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun imsmap -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/interaggregate.desktop b/tdescreensaver/kxsconfig/ScreenSavers/interaggregate.desktop
index 534198b4..030d14aa 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/interaggregate.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/interaggregate.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=interaggregate
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=InWindow,Root,Setup
 Name=Interaggregate
diff --git a/kscreensaver/kxsconfig/ScreenSavers/interference.desktop b/tdescreensaver/kxsconfig/ScreenSavers/interference.desktop
index 42c48c54..d9cfef0e 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/interference.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/interference.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=interference
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=Setup;InWindow;Root;
@@ -129,7 +129,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun interference -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/intermomentary.desktop b/tdescreensaver/kxsconfig/ScreenSavers/intermomentary.desktop
index 5a4876ef..200919b1 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/intermomentary.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/intermomentary.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=intermomentary
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=InWindow,Root,Setup
 Name=Intermomentary
diff --git a/kscreensaver/kxsconfig/ScreenSavers/jigglypuff.desktop b/tdescreensaver/kxsconfig/ScreenSavers/jigglypuff.desktop
index b7b5981f..86d585b1 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/jigglypuff.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/jigglypuff.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=jigglypuff
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/jigsaw.desktop b/tdescreensaver/kxsconfig/ScreenSavers/jigsaw.desktop
index 984ef66d..eddd213e 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/jigsaw.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/jigsaw.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=jigsaw
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/juggle.desktop b/tdescreensaver/kxsconfig/ScreenSavers/juggle.desktop
index 7176d13d..d77e3f1e 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/juggle.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/juggle.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=juggle
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/juggler3d.desktop b/tdescreensaver/kxsconfig/ScreenSavers/juggler3d.desktop
index 1504ca0a..d304c883 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/juggler3d.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/juggler3d.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=juggler3d
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=InWindow,Root,Setup
 Name=Juggler3D
diff --git a/kscreensaver/kxsconfig/ScreenSavers/julia.desktop b/tdescreensaver/kxsconfig/ScreenSavers/julia.desktop
index 1c86bab8..01867d22 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/julia.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/julia.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=julia
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
@@ -92,7 +92,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun julia -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/kaleidescope.desktop b/tdescreensaver/kxsconfig/ScreenSavers/kaleidescope.desktop
index d564ef21..f87f4e54 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/kaleidescope.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/kaleidescope.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=kaleidescope
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
@@ -128,7 +128,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun kaleidescope -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/klein.desktop b/tdescreensaver/kxsconfig/ScreenSavers/klein.desktop
index 974f58bc..1f5abd95 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/klein.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/klein.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=klein
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/kumppa.desktop b/tdescreensaver/kxsconfig/ScreenSavers/kumppa.desktop
index 70609f8d..8094bad9 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/kumppa.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/kumppa.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=kumppa
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
@@ -87,7 +87,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun kumppa -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/lament.desktop b/tdescreensaver/kxsconfig/ScreenSavers/lament.desktop
index cb81b4df..70963aa2 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/lament.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/lament.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=lament
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
@@ -112,7 +112,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun lament -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/laser.desktop b/tdescreensaver/kxsconfig/ScreenSavers/laser.desktop
index 8ee1e985..539471f3 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/laser.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/laser.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=laser
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=Setup;InWindow;Root;
@@ -107,7 +107,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun laser -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/lavalite.desktop b/tdescreensaver/kxsconfig/ScreenSavers/lavalite.desktop
index c2e5c59f..ee7a29d2 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/lavalite.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/lavalite.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=lavalite
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/lcdscrub.desktop b/tdescreensaver/kxsconfig/ScreenSavers/lcdscrub.desktop
index 354f98f8..0ecbf629 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/lcdscrub.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/lcdscrub.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Exec=lcdscrub
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=InWindow,Root,Setup
 Name=LCDscrub
diff --git a/kscreensaver/kxsconfig/ScreenSavers/lightning.desktop b/tdescreensaver/kxsconfig/ScreenSavers/lightning.desktop
index 02d36bd8..d3fc2ef6 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/lightning.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/lightning.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=lightning
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
@@ -131,7 +131,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun lightning -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/lisa.desktop b/tdescreensaver/kxsconfig/ScreenSavers/lisa.desktop
index f2edf8ad..06be1eac 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/lisa.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/lisa.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=lisa
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/lissie.desktop b/tdescreensaver/kxsconfig/ScreenSavers/lissie.desktop
index 2eded713..490964bf 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/lissie.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/lissie.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=lissie
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=Setup;InWindow;Root;
@@ -97,7 +97,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun lissie -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/lmorph.desktop b/tdescreensaver/kxsconfig/ScreenSavers/lmorph.desktop
index 5b6629b4..f7aac636 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/lmorph.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/lmorph.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=lmorph
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
@@ -128,7 +128,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun lmorph -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/lockward.desktop b/tdescreensaver/kxsconfig/ScreenSavers/lockward.desktop
index 44f69769..2bac4bb7 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/lockward.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/lockward.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=lockward
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=InWindow,Root,Setup
 Name=Lockward
diff --git a/kscreensaver/kxsconfig/ScreenSavers/loop.desktop b/tdescreensaver/kxsconfig/ScreenSavers/loop.desktop
index 3cfba42a..d463b0bc 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/loop.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/loop.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=loop
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/m6502.desktop b/tdescreensaver/kxsconfig/ScreenSavers/m6502.desktop
index 208e9ca8..ba0f77be 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/m6502.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/m6502.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=m6502
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=InWindow,Root,Setup
 Name=M6502
diff --git a/kscreensaver/kxsconfig/ScreenSavers/maze.desktop b/tdescreensaver/kxsconfig/ScreenSavers/maze.desktop
index 15a874fc..0ab2931e 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/maze.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/maze.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=maze
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/memscroller.desktop b/tdescreensaver/kxsconfig/ScreenSavers/memscroller.desktop
index 83f3ce4e..de588968 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/memscroller.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/memscroller.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=memscroller
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=InWindow,Root,Setup;
 X-TDE-Category=Banners & Pictures
diff --git a/kscreensaver/kxsconfig/ScreenSavers/menger.desktop b/tdescreensaver/kxsconfig/ScreenSavers/menger.desktop
index 7c590295..d65d80db 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/menger.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/menger.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=menger
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/metaballs.desktop b/tdescreensaver/kxsconfig/ScreenSavers/metaballs.desktop
index 4b9e5516..058c85ba 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/metaballs.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/metaballs.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=metaballs
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/mirrorblob.desktop b/tdescreensaver/kxsconfig/ScreenSavers/mirrorblob.desktop
index 00379b0e..6b95ec71 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/mirrorblob.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/mirrorblob.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=mirrorblob
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/mismunch.desktop b/tdescreensaver/kxsconfig/ScreenSavers/mismunch.desktop
index 196b7df6..d59f6d27 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/mismunch.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/mismunch.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=mismunch
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/moebius.desktop b/tdescreensaver/kxsconfig/ScreenSavers/moebius.desktop
index fece0ce9..d8fb1613 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/moebius.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/moebius.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=moebius
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
@@ -106,7 +106,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun moebius -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/moebiusgears.desktop b/tdescreensaver/kxsconfig/ScreenSavers/moebiusgears.desktop
index 6fad6341..2dde208b 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/moebiusgears.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/moebiusgears.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=moebiusgears
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=InWindow,Root,Setup
 Name=MoebiusGears
diff --git a/kscreensaver/kxsconfig/ScreenSavers/moire.desktop b/tdescreensaver/kxsconfig/ScreenSavers/moire.desktop
index 396f365e..c64e48b6 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/moire.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/moire.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=moire
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/moire2.desktop b/tdescreensaver/kxsconfig/ScreenSavers/moire2.desktop
index 84853ffb..d17f43b1 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/moire2.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/moire2.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=moire2
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/molecule.desktop b/tdescreensaver/kxsconfig/ScreenSavers/molecule.desktop
index e17e39df..dc454830 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/molecule.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/molecule.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=molecule
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/morph3d.desktop b/tdescreensaver/kxsconfig/ScreenSavers/morph3d.desktop
index 207e02c2..4d035c6e 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/morph3d.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/morph3d.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=morph3d
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/mountain.desktop b/tdescreensaver/kxsconfig/ScreenSavers/mountain.desktop
index 769a3fa9..10e03039 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/mountain.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/mountain.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=mountain
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/munch.desktop b/tdescreensaver/kxsconfig/ScreenSavers/munch.desktop
index 760bf4cf..7ce9dd43 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/munch.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/munch.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=munch
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/nerverot.desktop b/tdescreensaver/kxsconfig/ScreenSavers/nerverot.desktop
index defd9e03..f3007efd 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/nerverot.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/nerverot.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=nerverot
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/noof.desktop b/tdescreensaver/kxsconfig/ScreenSavers/noof.desktop
index 271b552e..d63b91a3 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/noof.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/noof.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=noof
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/noseguy.desktop b/tdescreensaver/kxsconfig/ScreenSavers/noseguy.desktop
index aab3b319..2aa060aa 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/noseguy.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/noseguy.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=noseguy
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/pacman.desktop b/tdescreensaver/kxsconfig/ScreenSavers/pacman.desktop
index db7220e6..a5ab084d 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/pacman.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/pacman.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=pacman
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/pedal.desktop b/tdescreensaver/kxsconfig/ScreenSavers/pedal.desktop
index 622c83dd..69a0780b 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/pedal.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/pedal.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=pedal
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/penetrate.desktop b/tdescreensaver/kxsconfig/ScreenSavers/penetrate.desktop
index 1c7458b1..54b6bfd2 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/penetrate.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/penetrate.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=penetrate
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/penrose.desktop b/tdescreensaver/kxsconfig/ScreenSavers/penrose.desktop
index fbba0869..431740a7 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/penrose.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/penrose.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=penrose
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=Setup;InWindow;Root;
@@ -90,7 +90,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun penrose -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/petri.desktop b/tdescreensaver/kxsconfig/ScreenSavers/petri.desktop
index 25550331..e7c79de7 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/petri.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/petri.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=petri
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/phosphor.desktop b/tdescreensaver/kxsconfig/ScreenSavers/phosphor.desktop
index 8e2c46b1..1380399d 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/phosphor.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/phosphor.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=phosphor
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
@@ -127,7 +127,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun phosphor -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/photopile.desktop b/tdescreensaver/kxsconfig/ScreenSavers/photopile.desktop
index f53c61f9..9addfbe8 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/photopile.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/photopile.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Exec=photopile
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=InWindow,Root,Setup
 Name=Photopile
diff --git a/kscreensaver/kxsconfig/ScreenSavers/piecewise.desktop b/tdescreensaver/kxsconfig/ScreenSavers/piecewise.desktop
index b332cf4f..80c8e15d 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/piecewise.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/piecewise.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=piecewise
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/pinion.desktop b/tdescreensaver/kxsconfig/ScreenSavers/pinion.desktop
index 1ff71363..2047ee40 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/pinion.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/pinion.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=pinion
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=InWindow,Root,Setup
 Name=Pinion
diff --git a/kscreensaver/kxsconfig/ScreenSavers/pipes.desktop b/tdescreensaver/kxsconfig/ScreenSavers/pipes.desktop
index 19f39d5c..e4bfae45 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/pipes.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/pipes.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=pipes
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
@@ -132,7 +132,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun pipes -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/pixmaps.desktop b/tdescreensaver/kxsconfig/ScreenSavers/pixmaps.desktop
index dedf9811..237cb746 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/pixmaps.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/pixmaps.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=pixmaps
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/polyhedra.desktop b/tdescreensaver/kxsconfig/ScreenSavers/polyhedra.desktop
index ecb178b2..8a22f9d4 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/polyhedra.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/polyhedra.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=polyhedra
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/polyominoes.desktop b/tdescreensaver/kxsconfig/ScreenSavers/polyominoes.desktop
index e9009b6f..7f551d49 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/polyominoes.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/polyominoes.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=polyominoes
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/polytopes.desktop b/tdescreensaver/kxsconfig/ScreenSavers/polytopes.desktop
index d322eada..81c42987 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/polytopes.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/polytopes.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=polytopes
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/pong.desktop b/tdescreensaver/kxsconfig/ScreenSavers/pong.desktop
index 33c998f5..969f50e1 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/pong.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/pong.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=pong
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/popsquares.desktop b/tdescreensaver/kxsconfig/ScreenSavers/popsquares.desktop
index 1777e05c..b9b3682c 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/popsquares.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/popsquares.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=popsquares
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/providence.desktop b/tdescreensaver/kxsconfig/ScreenSavers/providence.desktop
index 2065c92a..5f1c3c10 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/providence.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/providence.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=providence
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/pulsar.desktop b/tdescreensaver/kxsconfig/ScreenSavers/pulsar.desktop
index 78e0b805..e0572d4c 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/pulsar.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/pulsar.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=pulsar
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
@@ -110,7 +110,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun pulsar -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/pyro.desktop b/tdescreensaver/kxsconfig/ScreenSavers/pyro.desktop
index 3e1f21a8..8d23b0b3 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/pyro.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/pyro.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=pyro
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/qix.desktop b/tdescreensaver/kxsconfig/ScreenSavers/qix.desktop
index f1a7c6fe..ea4dce9d 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/qix.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/qix.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=qix
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/queens.desktop b/tdescreensaver/kxsconfig/ScreenSavers/queens.desktop
index 6e90edae..56d92015 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/queens.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/queens.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=queens
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/rd-bomb.desktop b/tdescreensaver/kxsconfig/ScreenSavers/rd-bomb.desktop
index 2a9f90de..8195f857 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/rd-bomb.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/rd-bomb.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=rd-bomb
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/ripples.desktop b/tdescreensaver/kxsconfig/ScreenSavers/ripples.desktop
index 64ed27b3..9b6cebc0 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/ripples.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/ripples.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=ripples
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/rocks.desktop b/tdescreensaver/kxsconfig/ScreenSavers/rocks.desktop
index 1dc3bcf8..95ce1b81 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/rocks.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/rocks.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=rocks
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/rorschach.desktop b/tdescreensaver/kxsconfig/ScreenSavers/rorschach.desktop
index 15a7453b..ef483d6b 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/rorschach.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/rorschach.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=rorschach
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/rotor.desktop b/tdescreensaver/kxsconfig/ScreenSavers/rotor.desktop
index c6055709..4158f7b9 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/rotor.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/rotor.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=rotor
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/rotzoomer.desktop b/tdescreensaver/kxsconfig/ScreenSavers/rotzoomer.desktop
index 3388fe16..86f09bad 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/rotzoomer.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/rotzoomer.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=rotzoomer
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/rubik.desktop b/tdescreensaver/kxsconfig/ScreenSavers/rubik.desktop
index 57127f35..9e252612 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/rubik.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/rubik.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=rubik
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
@@ -129,7 +129,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun rubik -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/sballs.desktop b/tdescreensaver/kxsconfig/ScreenSavers/sballs.desktop
index 996fdf8e..310df622 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/sballs.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/sballs.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=sballs
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/shadebobs.desktop b/tdescreensaver/kxsconfig/ScreenSavers/shadebobs.desktop
index 4ba89a65..8c036597 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/shadebobs.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/shadebobs.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=shadebobs
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/sierpinski.desktop b/tdescreensaver/kxsconfig/ScreenSavers/sierpinski.desktop
index 7dc575f2..70273575 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/sierpinski.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/sierpinski.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=sierpinski
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/sierpinski3d.desktop b/tdescreensaver/kxsconfig/ScreenSavers/sierpinski3d.desktop
index be4d0a66..f317d9c9 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/sierpinski3d.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/sierpinski3d.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=sierpinski3d
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/skytentacles.desktop b/tdescreensaver/kxsconfig/ScreenSavers/skytentacles.desktop
index 88e1ead2..1eeb9631 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/skytentacles.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/skytentacles.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Exec=skytentacles
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=InWindow,Root,Setup
 Name=SkyTentacles
diff --git a/kscreensaver/kxsconfig/ScreenSavers/slidescreen.desktop b/tdescreensaver/kxsconfig/ScreenSavers/slidescreen.desktop
index 1f638bdd..86a6d465 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/slidescreen.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/slidescreen.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=slidescreen
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/slip.desktop b/tdescreensaver/kxsconfig/ScreenSavers/slip.desktop
index 9e96d6d0..d761d2c6 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/slip.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/slip.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=slip
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=Setup;InWindow;Root;
@@ -114,7 +114,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun slip -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/sonar.desktop b/tdescreensaver/kxsconfig/ScreenSavers/sonar.desktop
index 857bcf92..6b8f0aea 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/sonar.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/sonar.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=sonar
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
@@ -102,7 +102,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun sonar -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/speedmine.desktop b/tdescreensaver/kxsconfig/ScreenSavers/speedmine.desktop
index d2f59dc8..053c36c4 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/speedmine.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/speedmine.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=speedmine
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/sphere.desktop b/tdescreensaver/kxsconfig/ScreenSavers/sphere.desktop
index 90bc37aa..d0a5feb8 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/sphere.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/sphere.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=sphere
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/spheremonics.desktop b/tdescreensaver/kxsconfig/ScreenSavers/spheremonics.desktop
index 65732ab3..7769cc53 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/spheremonics.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/spheremonics.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=spheremonics
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/spiral.desktop b/tdescreensaver/kxsconfig/ScreenSavers/spiral.desktop
index 974bd743..43a50bf3 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/spiral.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/spiral.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=spiral
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/spotlight.desktop b/tdescreensaver/kxsconfig/ScreenSavers/spotlight.desktop
index 57d05b2e..79250736 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/spotlight.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/spotlight.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=spotlight
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/sproingies.desktop b/tdescreensaver/kxsconfig/ScreenSavers/sproingies.desktop
index 01cd5bfe..14a50be2 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/sproingies.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/sproingies.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=sproingies
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
@@ -98,7 +98,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun sproingies -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/squiral.desktop b/tdescreensaver/kxsconfig/ScreenSavers/squiral.desktop
index b6f282a5..ae4e005a 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/squiral.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/squiral.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=squiral
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/stairs.desktop b/tdescreensaver/kxsconfig/ScreenSavers/stairs.desktop
index 96bf1d20..097fc82b 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/stairs.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/stairs.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=stairs
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
@@ -132,7 +132,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun stairs -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/starfish.desktop b/tdescreensaver/kxsconfig/ScreenSavers/starfish.desktop
index de0f5196..48e606d5 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/starfish.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/starfish.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=starfish
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
@@ -126,7 +126,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun starfish -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/starwars.desktop b/tdescreensaver/kxsconfig/ScreenSavers/starwars.desktop
index 6d067abb..4992c52e 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/starwars.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/starwars.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=starwars
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/stonerview.desktop b/tdescreensaver/kxsconfig/ScreenSavers/stonerview.desktop
index 05b10374..7f308d90 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/stonerview.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/stonerview.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=stonerview
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/strange.desktop b/tdescreensaver/kxsconfig/ScreenSavers/strange.desktop
index 6ba76780..68617aaa 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/strange.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/strange.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=strange
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
@@ -131,7 +131,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun strange -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/substrate.desktop b/tdescreensaver/kxsconfig/ScreenSavers/substrate.desktop
index cda5e5c9..78f19dd1 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/substrate.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/substrate.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=substrate
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=InWindow,Root,Setup
 Name=Substrate
diff --git a/kscreensaver/kxsconfig/ScreenSavers/superquadrics.desktop b/tdescreensaver/kxsconfig/ScreenSavers/superquadrics.desktop
index b6f23edc..7d821a46 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/superquadrics.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/superquadrics.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=superquadrics
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
@@ -115,7 +115,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun superquadrics -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/swirl.desktop b/tdescreensaver/kxsconfig/ScreenSavers/swirl.desktop
index a0d3fd42..1e0c194d 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/swirl.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/swirl.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=swirl
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
@@ -125,7 +125,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun swirl -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/t3d.desktop b/tdescreensaver/kxsconfig/ScreenSavers/t3d.desktop
index 43867d6a..1af41768 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/t3d.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/t3d.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=t3d
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
@@ -131,7 +131,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun t3d -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/tangram.desktop b/tdescreensaver/kxsconfig/ScreenSavers/tangram.desktop
index 6bacde91..3a5ed370 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/tangram.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/tangram.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=tangram
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=InWindow,Root,Setup
 Name=Tangram
diff --git a/kscreensaver/kxsconfig/ScreenSavers/thornbird.desktop b/tdescreensaver/kxsconfig/ScreenSavers/thornbird.desktop
index 292c8652..d3e06e1f 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/thornbird.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/thornbird.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=thornbird
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/timetunnel.desktop b/tdescreensaver/kxsconfig/ScreenSavers/timetunnel.desktop
index 887f5277..9b5fbbdc 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/timetunnel.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/timetunnel.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=timetunnel
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=InWindow,Root,Setup
 Name=Timetunnel
diff --git a/kscreensaver/kxsconfig/ScreenSavers/topblock.desktop b/tdescreensaver/kxsconfig/ScreenSavers/topblock.desktop
index 84fd27f0..20fc3370 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/topblock.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/topblock.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=topblock
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=InWindow,Root,Setup
 Name=topBlock
diff --git a/kscreensaver/kxsconfig/ScreenSavers/triangle.desktop b/tdescreensaver/kxsconfig/ScreenSavers/triangle.desktop
index 586c3b96..3ea40420 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/triangle.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/triangle.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=triangle
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
@@ -131,7 +131,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun triangle -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/truchet.desktop b/tdescreensaver/kxsconfig/ScreenSavers/truchet.desktop
index bf0fd1d3..a1c5c731 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/truchet.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/truchet.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=truchet
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/twang.desktop b/tdescreensaver/kxsconfig/ScreenSavers/twang.desktop
index 84bb75e7..2c6b21e3 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/twang.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/twang.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=twang
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/vermiculate.desktop b/tdescreensaver/kxsconfig/ScreenSavers/vermiculate.desktop
index 184de0f5..62324317 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/vermiculate.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/vermiculate.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=vermiculate
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/vidwhacker.desktop b/tdescreensaver/kxsconfig/ScreenSavers/vidwhacker.desktop
index 4c7b6dd8..03d47b48 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/vidwhacker.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/vidwhacker.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=vidwhacker
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
@@ -103,7 +103,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun vidwhacker -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/vines.desktop b/tdescreensaver/kxsconfig/ScreenSavers/vines.desktop
index ef5dbea1..db725e5a 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/vines.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/vines.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=vines
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
@@ -122,7 +122,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun vines -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/voronoi.desktop b/tdescreensaver/kxsconfig/ScreenSavers/voronoi.desktop
index ba305fc2..b14a70c9 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/voronoi.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/voronoi.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=voronoi
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=InWindow,Root,Setup
 Name=Voronoi
diff --git a/kscreensaver/kxsconfig/ScreenSavers/wander.desktop b/tdescreensaver/kxsconfig/ScreenSavers/wander.desktop
index 704510f1..9bbb669e 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/wander.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/wander.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=wander
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/webcollage.desktop b/tdescreensaver/kxsconfig/ScreenSavers/webcollage.desktop
index a5ad9c46..eba65609 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/webcollage.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/webcollage.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=webcollage
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
@@ -115,7 +115,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun webcollage -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/whirlwindwarp.desktop b/tdescreensaver/kxsconfig/ScreenSavers/whirlwindwarp.desktop
index 4abaa0e6..c4862b64 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/whirlwindwarp.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/whirlwindwarp.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=whirlwindwarp
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/whirlygig.desktop b/tdescreensaver/kxsconfig/ScreenSavers/whirlygig.desktop
index b68351bd..021e080a 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/whirlygig.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/whirlygig.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=whirlygig
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/worm.desktop b/tdescreensaver/kxsconfig/ScreenSavers/worm.desktop
index f4d5c0ab..266faa6b 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/worm.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/worm.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=worm
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
@@ -131,7 +131,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun worm -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/wormhole.desktop b/tdescreensaver/kxsconfig/ScreenSavers/wormhole.desktop
index 3ab000ef..6dbd6a84 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/wormhole.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/wormhole.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=wormhole
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/xanalogtv.desktop b/tdescreensaver/kxsconfig/ScreenSavers/xanalogtv.desktop
index e1247871..7a54197c 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/xanalogtv.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/xanalogtv.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=xanalogtv
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow,Root,Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/xflame.desktop b/tdescreensaver/kxsconfig/ScreenSavers/xflame.desktop
index 598e79ea..4389f275 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/xflame.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/xflame.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=xflame
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
@@ -120,7 +120,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun xflame -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/xjack.desktop b/tdescreensaver/kxsconfig/ScreenSavers/xjack.desktop
index 36f56e99..309a2d6c 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/xjack.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/xjack.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=xjack
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
@@ -94,7 +94,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun xjack -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/xlyap.desktop b/tdescreensaver/kxsconfig/ScreenSavers/xlyap.desktop
index 6f37a09c..1237627f 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/xlyap.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/xlyap.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=xlyap
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/xmatrix.desktop b/tdescreensaver/kxsconfig/ScreenSavers/xmatrix.desktop
index 5ff25658..188b1ede 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/xmatrix.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/xmatrix.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=xmatrix
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
@@ -117,7 +117,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun xmatrix -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/xrayswarm.desktop b/tdescreensaver/kxsconfig/ScreenSavers/xrayswarm.desktop
index 95a88848..23dd238f 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/xrayswarm.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/xrayswarm.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=xrayswarm
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/xscreensaver.template b/tdescreensaver/kxsconfig/ScreenSavers/xscreensaver.template
index 6a091882..d7689927 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/xscreensaver.template
+++ b/tdescreensaver/kxsconfig/ScreenSavers/xscreensaver.template
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Exec=@NAME@
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=InWindow,Root,Setup
 Name=@LABEL@
diff --git a/kscreensaver/kxsconfig/ScreenSavers/xspirograph.desktop b/tdescreensaver/kxsconfig/ScreenSavers/xspirograph.desktop
index fdf81130..469df6e4 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/xspirograph.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/xspirograph.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=xspirograph
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/xsublim.desktop b/tdescreensaver/kxsconfig/ScreenSavers/xsublim.desktop
index 7bf80f4b..7ab42ab8 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/xsublim.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/xsublim.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=xsublim
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
@@ -100,7 +100,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kxsrun xsublim -- -window-id %w
diff --git a/kscreensaver/kxsconfig/ScreenSavers/xteevee.desktop b/tdescreensaver/kxsconfig/ScreenSavers/xteevee.desktop
index 35862509..6d7e3c47 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/xteevee.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/xteevee.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=xteevee
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/ScreenSavers/zoom.desktop b/tdescreensaver/kxsconfig/ScreenSavers/zoom.desktop
index 4bf6a083..8d15ad9c 100644
--- a/kscreensaver/kxsconfig/ScreenSavers/zoom.desktop
+++ b/tdescreensaver/kxsconfig/ScreenSavers/zoom.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=zoom
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 
 Actions=InWindow;Root;Setup;
diff --git a/kscreensaver/kxsconfig/XScreenSaver_ad.h b/tdescreensaver/kxsconfig/XScreenSaver_ad.h
index 42452482..42452482 100644
--- a/kscreensaver/kxsconfig/XScreenSaver_ad.h
+++ b/tdescreensaver/kxsconfig/XScreenSaver_ad.h
diff --git a/kscreensaver/kxsconfig/configure.in.bot b/tdescreensaver/kxsconfig/configure.in.bot
index d35afee0..d35afee0 100644
--- a/kscreensaver/kxsconfig/configure.in.bot
+++ b/tdescreensaver/kxsconfig/configure.in.bot
diff --git a/kscreensaver/kxsconfig/configure.in.in b/tdescreensaver/kxsconfig/configure.in.in
index ede852c7..ede852c7 100644
--- a/kscreensaver/kxsconfig/configure.in.in
+++ b/tdescreensaver/kxsconfig/configure.in.in
diff --git a/kscreensaver/kxsconfig/hacks.pot b/tdescreensaver/kxsconfig/hacks.pot
index e73681a1..e73681a1 100644
--- a/kscreensaver/kxsconfig/hacks.pot
+++ b/tdescreensaver/kxsconfig/hacks.pot
diff --git a/kscreensaver/kxsconfig/kxsconfig.cpp b/tdescreensaver/kxsconfig/kxsconfig.cpp
index dbe3ea91..dbe3ea91 100644
--- a/kscreensaver/kxsconfig/kxsconfig.cpp
+++ b/tdescreensaver/kxsconfig/kxsconfig.cpp
diff --git a/kscreensaver/kxsconfig/kxsconfig.h b/tdescreensaver/kxsconfig/kxsconfig.h
index daf3c9f8..daf3c9f8 100644
--- a/kscreensaver/kxsconfig/kxsconfig.h
+++ b/tdescreensaver/kxsconfig/kxsconfig.h
diff --git a/kscreensaver/kxsconfig/kxscontrol.cpp b/tdescreensaver/kxsconfig/kxscontrol.cpp
index 08f9b55c..08f9b55c 100644
--- a/kscreensaver/kxsconfig/kxscontrol.cpp
+++ b/tdescreensaver/kxsconfig/kxscontrol.cpp
diff --git a/kscreensaver/kxsconfig/kxscontrol.h b/tdescreensaver/kxsconfig/kxscontrol.h
index acd1a664..acd1a664 100644
--- a/kscreensaver/kxsconfig/kxscontrol.h
+++ b/tdescreensaver/kxsconfig/kxscontrol.h
diff --git a/kscreensaver/kxsconfig/kxsitem.cpp b/tdescreensaver/kxsconfig/kxsitem.cpp
index 96e20758..96e20758 100644
--- a/kscreensaver/kxsconfig/kxsitem.cpp
+++ b/tdescreensaver/kxsconfig/kxsitem.cpp
diff --git a/kscreensaver/kxsconfig/kxsitem.h b/tdescreensaver/kxsconfig/kxsitem.h
index 9e4bed3e..9e4bed3e 100644
--- a/kscreensaver/kxsconfig/kxsitem.h
+++ b/tdescreensaver/kxsconfig/kxsitem.h
diff --git a/kscreensaver/kxsconfig/kxsrun.cpp b/tdescreensaver/kxsconfig/kxsrun.cpp
index 6ffa1b15..6ffa1b15 100644
--- a/kscreensaver/kxsconfig/kxsrun.cpp
+++ b/tdescreensaver/kxsconfig/kxsrun.cpp
diff --git a/kscreensaver/kxsconfig/kxsxml.cpp b/tdescreensaver/kxsconfig/kxsxml.cpp
index 6ea0c7b7..6ea0c7b7 100644
--- a/kscreensaver/kxsconfig/kxsxml.cpp
+++ b/tdescreensaver/kxsconfig/kxsxml.cpp
diff --git a/kscreensaver/kxsconfig/kxsxml.h b/tdescreensaver/kxsconfig/kxsxml.h
index 4f02a33c..4f02a33c 100644
--- a/kscreensaver/kxsconfig/kxsxml.h
+++ b/tdescreensaver/kxsconfig/kxsxml.h
diff --git a/kscreensaver/kxsconfig/update_hacks.sh b/tdescreensaver/kxsconfig/update_hacks.sh
index 2f88d1f2..2f88d1f2 100755
--- a/kscreensaver/kxsconfig/update_hacks.sh
+++ b/tdescreensaver/kxsconfig/update_hacks.sh
diff --git a/kscreensaver/kpartsaver/CMakeLists.txt b/tdescreensaver/tdepartsaver/CMakeLists.txt
index b546c5d1..e4259969 100644
--- a/kscreensaver/kpartsaver/CMakeLists.txt
+++ b/tdescreensaver/tdepartsaver/CMakeLists.txt
@@ -21,13 +21,13 @@ link_directories(
 
 ##### desktop files #############################
 
-install( FILES kpartsaver.desktop 
+install( FILES tdepartsaver.desktop 
     DESTINATION ${APPS_INSTALL_DIR}/System/ScreenSavers )
 
 ##### kpart_cde ##################################
 
-tde_add_executable( kpartsaver.kss AUTOMOC
-  SOURCES kpartsaver.cpp configwidget.ui
-  LINK kscreensaver-shared kio-shared
+tde_add_executable( tdepartsaver.kss AUTOMOC
+  SOURCES tdepartsaver.cpp configwidget.ui
+  LINK tdescreensaver-shared kio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/tdescreensaver/tdepartsaver/Makefile.am b/tdescreensaver/tdepartsaver/Makefile.am
new file mode 100644
index 00000000..0e759e7e
--- /dev/null
+++ b/tdescreensaver/tdepartsaver/Makefile.am
@@ -0,0 +1,14 @@
+bin_PROGRAMS = tdepartsaver.kss
+INCLUDES = $(all_includes)
+
+tdepartsaver_kss_SOURCES = tdepartsaver.cpp configwidget.ui
+tdepartsaver_kss_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdepartsaver_kss_LDADD = $(LIB_KFILE) $(LIB_KPARTS) -ltdescreensaver
+
+METASOURCES = AUTO
+
+desktop_DATA = tdepartsaver.desktop
+desktopdir = $(kde_appsdir)/System/ScreenSavers
+
+messages: rc.cpp
+	$(XGETTEXT) *.cpp -o $(podir)/tdepartsaver.pot
diff --git a/kscreensaver/kpartsaver/configwidget.ui b/tdescreensaver/tdepartsaver/configwidget.ui
index a246d8f4..a246d8f4 100644
--- a/kscreensaver/kpartsaver/configwidget.ui
+++ b/tdescreensaver/tdepartsaver/configwidget.ui
diff --git a/kscreensaver/kpartsaver/kpartsaver.cpp b/tdescreensaver/tdepartsaver/tdepartsaver.cpp
index aa4b63e7..a2c0cc40 100644
--- a/kscreensaver/kpartsaver/kpartsaver.cpp
+++ b/tdescreensaver/tdepartsaver/tdepartsaver.cpp
@@ -39,16 +39,16 @@
 #include <kconfig.h>
 #include <kfiledialog.h>
 #include <kurl.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <ktrader.h>
 #include <kio/jobclasses.h>
 #include <kio/job.h>
 #include <kmimetype.h>
 
-#include <kscreensaver.h>
+#include <tdescreensaver.h>
 
 #include "configwidget.h"
-#include "kpartsaver.h"
+#include "tdepartsaver.h"
 #include <kiconloader.h>
 
 
@@ -58,20 +58,20 @@ bool g_inited = false;
 
 extern "C"
 {
-    KDE_EXPORT const char *kss_applicationName = "kpartsaver";
+    KDE_EXPORT const char *kss_applicationName = "tdepartsaver";
     KDE_EXPORT const char *kss_description = I18N_NOOP( "KPart Screen Saver" );
     KDE_EXPORT const char *kss_version = "1.0";
 
     KDE_EXPORT KScreenSaver *kss_create( WId d )
     {
-        TDEGlobal::locale()->insertCatalogue("kpartsaver");
+        TDEGlobal::locale()->insertCatalogue("tdepartsaver");
         return new KPartSaver( d );
     }
 
     KDE_EXPORT TQDialog *kss_setup()
     {
         kdDebug() << "kss_setup" << endl;
-        TDEGlobal::locale()->insertCatalogue("kpartsaver");
+        TDEGlobal::locale()->insertCatalogue("tdepartsaver");
         return new SaverConfig;
     }
 }
@@ -170,7 +170,7 @@ bool KPartSaver::openURL( KURL url )
     // find mime type
     TQString mime = KMimeType::findByURL( url )->name();
 
-    // find fitting kparts
+    // find fitting tdeparts
     KTrader::OfferList offers;
     offers = KTrader::self()->query( mime, "'KParts/ReadOnlyPart' in ServiceTypes" );
     if( offers.count()==0 ) {
@@ -384,4 +384,4 @@ void SaverConfig::down()
     }
 }
 
-#include "kpartsaver.moc"
+#include "tdepartsaver.moc"
diff --git a/kscreensaver/kpartsaver/kpartsaver.desktop b/tdescreensaver/tdepartsaver/tdepartsaver.desktop
index dd934e12..82564b1c 100644
--- a/kscreensaver/kpartsaver/kpartsaver.desktop
+++ b/tdescreensaver/tdepartsaver/tdepartsaver.desktop
@@ -57,12 +57,12 @@ Name[zh_TW]=媒體螢幕保護程式
 Name[zu]=Umgcini Wesikrini Somculo
 
 Type=Application
-Exec=kpartsaver.kss
-Icon=kscreensaver
+Exec=tdepartsaver.kss
+Icon=tdescreensaver
 Actions=Setup;InWindow;Root;
 
 [Desktop Action Setup]
-Exec=kpartsaver.kss -setup
+Exec=tdepartsaver.kss -setup
 Name=Setup...
 Name[af]=Opstelling...
 Name[bg]=Настройки...
@@ -128,10 +128,10 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
-Exec=kpartsaver.kss -window-id %w
+Exec=tdepartsaver.kss -window-id %w
 Name=Display in Specified Window
 Name[bg]=Стартиране в избран прозорец
 Name[br]=Diskwel er prenestr spisaet
@@ -189,7 +189,7 @@ Name[zh_TW]=在指定的視窗中顯示
 NoDisplay=true
 
 [Desktop Action Root]
-Exec=kpartsaver.kss -root
+Exec=tdepartsaver.kss -root
 Name=Display in Root Window
 Name[bg]=Стартиране в главния прозорец
 Name[br]=Diskwel er prenestr gwrizienn
diff --git a/kscreensaver/kpartsaver/kpartsaver.h b/tdescreensaver/tdepartsaver/tdepartsaver.h
index 8784f0b1..5c53e773 100644
--- a/kscreensaver/kpartsaver/kpartsaver.h
+++ b/tdescreensaver/tdepartsaver/tdepartsaver.h
@@ -37,13 +37,13 @@
 #include <kconfig.h>
 #include <kfiledialog.h>
 #include <kurl.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <ktrader.h>
 #include <kio/jobclasses.h>
 #include <kio/job.h>
 #include <kmimetype.h>
 
-#include <kscreensaver.h>
+#include <tdescreensaver.h>
 
 #include "configwidget.h"
 
diff --git a/kscreensaver/xsavers/CMakeLists.txt b/tdescreensaver/xsavers/CMakeLists.txt
index e636ac18..e636ac18 100644
--- a/kscreensaver/xsavers/CMakeLists.txt
+++ b/tdescreensaver/xsavers/CMakeLists.txt
diff --git a/kscreensaver/xsavers/KSpace.desktop b/tdescreensaver/xsavers/KSpace.desktop
index 195d49ad..40d91dda 100644
--- a/kscreensaver/xsavers/KSpace.desktop
+++ b/tdescreensaver/xsavers/KSpace.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=kspace.kss
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=Setup;InWindow;Root;
 X-TDE-Category=OpenGL Screen Savers
@@ -131,7 +131,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kspace.kss -window-id %w
diff --git a/kscreensaver/xsavers/KSwarm.desktop b/tdescreensaver/xsavers/KSwarm.desktop
index eb156a85..b9ba1b38 100644
--- a/kscreensaver/xsavers/KSwarm.desktop
+++ b/tdescreensaver/xsavers/KSwarm.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=kswarm.kss
-Icon=kscreensaver
+Icon=tdescreensaver
 Type=Application
 Actions=Setup;InWindow;Root;
 X-TDE-Category=Flying Things
@@ -126,7 +126,7 @@ Name[xh]=Iyacwangciswa...
 Name[zh_CN]=设置...
 Name[zh_TW]=設定...
 Name[zu]=Iyalungiselela...
-Icon=kscreensaver
+Icon=tdescreensaver
 
 [Desktop Action InWindow]
 Exec=kswarm.kss -window-id %w
diff --git a/kscreensaver/xsavers/Makefile.am b/tdescreensaver/xsavers/Makefile.am
index b5451c7a..6510fd32 100644
--- a/kscreensaver/xsavers/Makefile.am
+++ b/tdescreensaver/xsavers/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = -UQT_NO_ASCII_CAST -DQT_CLEAN_NAMESPACE
 
 INCLUDES = $(all_includes) $(GLINC)
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 if COMPILE_GL_XSAVERS
 GL_XSAVERS=kspace.kss
diff --git a/kscreensaver/xsavers/demowin.cpp b/tdescreensaver/xsavers/demowin.cpp
index 893885be..893885be 100644
--- a/kscreensaver/xsavers/demowin.cpp
+++ b/tdescreensaver/xsavers/demowin.cpp
diff --git a/kscreensaver/xsavers/demowin.h b/tdescreensaver/xsavers/demowin.h
index 6a09b7c3..6a09b7c3 100644
--- a/kscreensaver/xsavers/demowin.h
+++ b/tdescreensaver/xsavers/demowin.h
diff --git a/kscreensaver/xsavers/helpers.cpp b/tdescreensaver/xsavers/helpers.cpp
index e55cf98c..e55cf98c 100644
--- a/kscreensaver/xsavers/helpers.cpp
+++ b/tdescreensaver/xsavers/helpers.cpp
diff --git a/kscreensaver/xsavers/helpers.h b/tdescreensaver/xsavers/helpers.h
index e4125709..e4125709 100644
--- a/kscreensaver/xsavers/helpers.h
+++ b/tdescreensaver/xsavers/helpers.h
diff --git a/kscreensaver/xsavers/main.cpp b/tdescreensaver/xsavers/main.cpp
index d7f76dcd..d7f76dcd 100644
--- a/kscreensaver/xsavers/main.cpp
+++ b/tdescreensaver/xsavers/main.cpp
diff --git a/kscreensaver/xsavers/mode.h b/tdescreensaver/xsavers/mode.h
index c2bc7f1d..c2bc7f1d 100644
--- a/kscreensaver/xsavers/mode.h
+++ b/tdescreensaver/xsavers/mode.h
diff --git a/kscreensaver/xsavers/saver.cpp b/tdescreensaver/xsavers/saver.cpp
index 1c11fd73..1c11fd73 100644
--- a/kscreensaver/xsavers/saver.cpp
+++ b/tdescreensaver/xsavers/saver.cpp
diff --git a/kscreensaver/xsavers/saver.h b/tdescreensaver/xsavers/saver.h
index 598808bc..598808bc 100644
--- a/kscreensaver/xsavers/saver.h
+++ b/tdescreensaver/xsavers/saver.h
diff --git a/kscreensaver/xsavers/space.cpp b/tdescreensaver/xsavers/space.cpp
index a15dd171..a15dd171 100644
--- a/kscreensaver/xsavers/space.cpp
+++ b/tdescreensaver/xsavers/space.cpp
diff --git a/kscreensaver/xsavers/space.h b/tdescreensaver/xsavers/space.h
index 2b0cc1ef..2b0cc1ef 100644
--- a/kscreensaver/xsavers/space.h
+++ b/tdescreensaver/xsavers/space.h
diff --git a/kscreensaver/xsavers/swarm.cpp b/tdescreensaver/xsavers/swarm.cpp
index 0707abc6..b81920ba 100644
--- a/kscreensaver/xsavers/swarm.cpp
+++ b/tdescreensaver/xsavers/swarm.cpp
@@ -7,7 +7,7 @@
  * 31-Aug-90: Adapted from xswarm by Jeff Butterworth. ([email protected])
  */
 
-/* Ported to kscreensaver:
+/* Ported to tdescreensaver:
    July 1997, Emanuel Pirker <[email protected]>
    Contact me in case of problems, not the original author!
    Last revised: 10-Jul-97
@@ -414,6 +414,6 @@ void kSwarmSetup::slotOk()
 void kSwarmSetup::slotHelp()
 {
 	KMessageBox::information(this,
-			     i18n("Swarm\n\nCopyright (c) 1991 by Patrick J. Naughton\n\nPorted to kscreensaver by Emanuel Pirker."),
+			     i18n("Swarm\n\nCopyright (c) 1991 by Patrick J. Naughton\n\nPorted to tdescreensaver by Emanuel Pirker."),
 			     i18n("About Swarm"));
 }
diff --git a/kscreensaver/xsavers/swarm.h b/tdescreensaver/xsavers/swarm.h
index d8cca36c..d8cca36c 100644
--- a/kscreensaver/xsavers/swarm.h
+++ b/tdescreensaver/xsavers/swarm.h
diff --git a/kscreensaver/xsavers/xlock.cpp b/tdescreensaver/xsavers/xlock.cpp
index 7b826158..7b826158 100644
--- a/kscreensaver/xsavers/xlock.cpp
+++ b/tdescreensaver/xsavers/xlock.cpp
diff --git a/kscreensaver/xsavers/xlock.h b/tdescreensaver/xsavers/xlock.h
index 77530a9f..77530a9f 100644
--- a/kscreensaver/xsavers/xlock.h
+++ b/tdescreensaver/xsavers/xlock.h
diff --git a/kscreensaver/xsavers/xlockmore.h b/tdescreensaver/xsavers/xlockmore.h
index 277783ae..277783ae 100644
--- a/kscreensaver/xsavers/xlockmore.h
+++ b/tdescreensaver/xsavers/xlockmore.h
diff --git a/kscreensaver/xsavers/xs_colors.c b/tdescreensaver/xsavers/xs_colors.c
index 82dab33b..2c77cf22 100644
--- a/kscreensaver/xsavers/xs_colors.c
+++ b/tdescreensaver/xsavers/xs_colors.c
@@ -443,12 +443,12 @@ complain (int wanted_colors, int got_colors,
   if (wanted_writable && !got_writable)
     fprintf(stderr,
 	    "%s: wanted %d writable colors; got %d read-only colors.\n",
-	    "colors (kscreensaver)", wanted_colors, got_colors);
+	    "colors (tdescreensaver)", wanted_colors, got_colors);
 
   else if (wanted_colors > (got_colors + 10))
     /* don't bother complaining if we're within ten pixels. */
     fprintf(stderr, "%s: wanted %d%s colors; got %d.\n",
-	    "colors (kscreensaver)", wanted_colors, (got_writable ? " writable" : ""),
+	    "colors (tdescreensaver)", wanted_colors, (got_writable ? " writable" : ""),
 	    got_colors);
 }
 
diff --git a/kscreensaver/xsavers/xs_colors.h b/tdescreensaver/xsavers/xs_colors.h
index 61421cf5..61421cf5 100644
--- a/kscreensaver/xsavers/xs_colors.h
+++ b/tdescreensaver/xsavers/xs_colors.h
diff --git a/kscreensaver/xsavers/xs_hsv.c b/tdescreensaver/xsavers/xs_hsv.c
index 51385d00..51385d00 100644
--- a/kscreensaver/xsavers/xs_hsv.c
+++ b/tdescreensaver/xsavers/xs_hsv.c
diff --git a/kscreensaver/xsavers/xs_hsv.h b/tdescreensaver/xsavers/xs_hsv.h
index e0fdfb0f..e0fdfb0f 100644
--- a/kscreensaver/xsavers/xs_hsv.h
+++ b/tdescreensaver/xsavers/xs_hsv.h
diff --git a/kscreensaver/xsavers/xs_utils.h b/tdescreensaver/xsavers/xs_utils.h
index 284bb86d..284bb86d 100644
--- a/kscreensaver/xsavers/xs_utils.h
+++ b/tdescreensaver/xsavers/xs_utils.h
diff --git a/kscreensaver/xsavers/xs_visual.c b/tdescreensaver/xsavers/xs_visual.c
index ff20374a..bc8d31f7 100644
--- a/kscreensaver/xsavers/xs_visual.c
+++ b/tdescreensaver/xsavers/xs_visual.c
@@ -79,7 +79,7 @@ get_visual (Screen *screen, const char *string, Bool prefer_writable_cells,
   else if (1 == sscanf (v, " 0x%lx %c", &id, &c)) vclass = SPECIFIC_VISUAL;
   else
     {
-      fprintf (stderr, "%s: unrecognized visual \"%s\".\n", "kscreensaver", v);
+      fprintf (stderr, "%s: unrecognized visual \"%s\".\n", "tdescreensaver", v);
       vclass = DEFAULT_VISUAL;
     }
 
@@ -91,7 +91,7 @@ get_visual (Screen *screen, const char *string, Bool prefer_writable_cells,
     {
       result = pick_mono_visual (screen);
       if (!result && verbose_p)
-	fprintf (stderr, "%s: no monochrome visuals.\n", "kscreensaver");
+	fprintf (stderr, "%s: no monochrome visuals.\n", "tdescreensaver");
     }
   else if (vclass == GRAY_VISUAL)
     {
@@ -103,7 +103,7 @@ get_visual (Screen *screen, const char *string, Bool prefer_writable_cells,
 	result = pick_best_visual_of_class (screen, GrayScale);
       if (!result && verbose_p)
 	fprintf (stderr, "%s: no GrayScale or StaticGray visuals.\n",
-		 "kscreensaver");
+		 "tdescreensaver");
     }
   else if (vclass == COLOR_VISUAL)
     {
@@ -124,13 +124,13 @@ get_visual (Screen *screen, const char *string, Bool prefer_writable_cells,
 	result = pick_best_visual (screen, prefer_writable_cells, True);
 
       if (!result && verbose_p)
-	fprintf (stderr, "%s: no color visuals.\n", "kscreensaver");
+	fprintf (stderr, "%s: no color visuals.\n", "tdescreensaver");
     }
   else if (vclass == SPECIFIC_VISUAL)
     {
       result = id_to_visual (screen, id);
       if (!result && verbose_p)
-	fprintf (stderr, "%s: no visual with id 0x%x.\n", "kscreensaver",
+	fprintf (stderr, "%s: no visual with id 0x%x.\n", "tdescreensaver",
 		 (unsigned int) id);
     }
   else
@@ -139,7 +139,7 @@ get_visual (Screen *screen, const char *string, Bool prefer_writable_cells,
       if (visual)
 	result = visual;
       else if (verbose_p)
-	fprintf (stderr, "%s: no visual of class %s.\n", "kscreensaver", v);
+	fprintf (stderr, "%s: no visual of class %s.\n", "tdescreensaver", v);
     }
 
   if (v) free (v);
diff --git a/kscreensaver/xsavers/xs_visual.h b/tdescreensaver/xsavers/xs_visual.h
index 2a0b3534..2a0b3534 100644
--- a/kscreensaver/xsavers/xs_visual.h
+++ b/tdescreensaver/xsavers/xs_visual.h
diff --git a/kscreensaver/xsavers/xs_yarandom.h b/tdescreensaver/xsavers/xs_yarandom.h
index f803d23c..f803d23c 100644
--- a/kscreensaver/xsavers/xs_yarandom.h
+++ b/tdescreensaver/xsavers/xs_yarandom.h