diff --git a/ChangeLog.package b/ChangeLog.package
index 5df0642..4f6edf2 100644
--- a/ChangeLog.package
+++ b/ChangeLog.package
@@ -1125,7 +1125,7 @@ Wed Sep 22 12:59:10 CEST 2004 - dkukawka@suse.de
 Mon Sep 20 19:55:37 CEST 2004 - trenn@suse.de
 
 - changes from l.lunak@suse.cz to faster start kpowersave through
-  kdeinit
+  tdeinit
 
 -------------------------------------------------------------------
 Tue Aug 31 14:11:02 CEST 2004 - trenn@suse.de
diff --git a/Doxyfile b/Doxyfile
index 828ed66..7478454 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -126,7 +126,7 @@ EXCLUDE                = ./src/kpowersave_dummy.cpp \
                          ./src/suspend_Dialog.h \
                          ./src/info_Dialog.h \
                          ./src/configure_Dialog.h \
-                         ./src/kdeinit_kpowersave.cpp
+                         ./src/tdeinit_kpowersave.cpp
 EXCLUDE_SYMLINKS       = NO
 EXCLUDE_PATTERNS       = *.tqmoc.cpp \
                          *_dummy.* \
diff --git a/doc/doxy/changelog.dox b/doc/doxy/changelog.dox
index b1a797d..154db13 100644
--- a/doc/doxy/changelog.dox
+++ b/doc/doxy/changelog.dox
@@ -625,7 +625,7 @@
 *	- do not poll for scheme changes -> only update on right mouse click
 *
 *	Mon Sep 20 19:55:37 CEST 2004 - trenn@suse.de
-*	- changes from l.lunak@suse.cz to faster start kpowersave through kdeinit
+*	- changes from l.lunak@suse.cz to faster start kpowersave through tdeinit
 *	
 *	Tue Aug 31 14:11:02 CEST 2004 - trenn@suse.de
 *	- disk<->ram typo which prevented suspend2ram to be enabled correctly
diff --git a/kpowersave.kdevelop b/kpowersave.kdevelop
index d248441..9cf9aa0 100644
--- a/kpowersave.kdevelop
+++ b/kpowersave.kdevelop
@@ -44,7 +44,7 @@
       <globalcwd>.</globalcwd>
       <useglobalprogram>false</useglobalprogram>
       <autoinstall>false</autoinstall>
-      <autokdesu>false</autokdesu>
+      <autotdesu>false</autotdesu>
     </run>
     <configurations>
       <optimized>
diff --git a/packaging/mandriva.2007.1.kpowersave.spec b/packaging/mandriva.2007.1.kpowersave.spec
index a42e249..67441ea 100644
--- a/packaging/mandriva.2007.1.kpowersave.spec
+++ b/packaging/mandriva.2007.1.kpowersave.spec
@@ -14,7 +14,7 @@ Url: 		http://powersave.sourceforge.net/
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: 	hal-devel, libdbus-qt-1-devel, kdelibs-devel
 %ifarch x86_64
-BuildRequires:  lib64qt3-devel, lib64qt3-static-devel lib64gamin-1_0-devel lib64art_lgpl2-devel lib64kdecore4-devel
+BuildRequires:  lib64qt3-devel, lib64qt3-static-devel lib64gamin-1_0-devel lib64art_lgpl2-devel lib64tdecore4-devel
 %else
 BuildRequires:  libqt3-devel libqt3-static-devel libgamin-1_0-devel libart_lgpl2-devel libtdecore4-devel
 %endif
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3bddbfe..41cad7d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -34,9 +34,9 @@ install( FILES eventsrc DESTINATION ${DATA_INSTALL_DIR}/kpowersave )
 install( FILES config/kpowersaverc_default RENAME kpowersaverc DESTINATION ${CONFIG_INSTALL_DIR} )
 
 
-##### kpowersave (kdeinit) ######################
+##### kpowersave (tdeinit) ######################
 
-tde_add_kdeinit_executable( kpowersave AUTOMOC
+tde_add_tdeinit_executable( kpowersave AUTOMOC
   SOURCES
     dummy.cpp autodimm.cpp autosuspend.cpp
     blacklistedit_Dialog.ui blacklisteditdialog.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index a4d826f..0315ff0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -40,7 +40,7 @@ KDE_ICON = kpowersave
 
 bin_PROGRAMS =
 lib_LTLIBRARIES =
-kdeinit_LTLIBRARIES = kpowersave.la
+tdeinit_LTLIBRARIES = kpowersave.la
 
 # the application source, library search path, and link libraries
 kpowersave_la_SOURCES =                                 \
diff --git a/src/kpowersave.cpp b/src/kpowersave.cpp
index 5b873cc..fbbfc17 100644
--- a/src/kpowersave.cpp
+++ b/src/kpowersave.cpp
@@ -510,7 +510,7 @@ void kpowersave::updateTooltip(){
 /*!
  * \b TQT_SLOT to starts the Yast2-power-management module. This called by the menuentry
  * with ID \ref YAST_MODULE_MENU_ID, named "Start YaST2 Power Management Module".
- * It create a new KProcess and execute "/sbin/yast2 power-management" with kdesu.
+ * It create a new KProcess and execute "/sbin/yast2 power-management" with tdesu.
  */
 void kpowersave::do_config(){
 	kdDebugFuncIn(trace);
@@ -519,7 +519,7 @@ void kpowersave::do_config(){
 	delete yast2;
 
 	yast2 = new KProcess;
-	*yast2 << "kdesu" << "--nonewdcop" << "/sbin/yast2" << "power-management";
+	*yast2 << "tdesu" << "--nonewdcop" << "/sbin/yast2" << "power-management";
 
 	connect(yast2, TQT_SIGNAL(processExited(KProcess *)),
 	         TQT_SLOT(slotConfigProcessExited(KProcess *)));
@@ -648,7 +648,7 @@ void kpowersave::observeConfigDlg(){
 }
 
 /*!
- * \b TQT_SLOT which called from \ref do_config() if the 'kdesu yast2' KProcess exited.
+ * \b TQT_SLOT which called from \ref do_config() if the 'tdesu yast2' KProcess exited.
  * This function control the return value and display if needed a errormessage on failure.
  */
 void kpowersave::slotConfigProcessExited(KProcess *proc){