diff --git a/CMakeLists.txt b/CMakeLists.txt
index 499b18cc7..b9d179433 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -972,7 +972,7 @@ add_subdirectory( tdeparts )
 add_subdirectory( tdeutils )
 add_subdirectory( tdespell2 )
 add_subdirectory( tdemdi )
-add_subdirectory( kinit )
+add_subdirectory( tdeinit )
 add_subdirectory( tdeprint )
 add_subdirectory( kab )
 add_subdirectory( tderesources )
diff --git a/Makefile.am.in b/Makefile.am.in
index 2ebb4f8c6..30da00c6e 100644
--- a/Makefile.am.in
+++ b/Makefile.am.in
@@ -20,7 +20,7 @@
 
 COMPILE_FIRST = dcop libltdl tdefx tdecore tdeunittest tdeui tdesu kjs tdewallet kio kded kded_post
 COMPILE_BEFORE_doc = kdoctools
-COMPILE_AFTER_tdeparts = tdespell2 tdemdi tdeprint kinit kate interfaces tdecert tdehtml tderandr
+COMPILE_AFTER_tdeparts = tdespell2 tdemdi tdeprint tdeinit kate interfaces tdecert tdehtml tderandr
 COMPILE_AFTER_tdeprint = kate tdehtml
 COMPILE_BEFORE_tdehtml = tdeutils
 COMPILE_BEFORE_kabc = kab tderesources
diff --git a/README b/README
index c96978eb9..c16ab7334 100644
--- a/README
+++ b/README
@@ -81,7 +81,7 @@ Here is an alphabetical list:
     An all purpose extension to the qimgio class that supports various
     image formats.
 
-* kinit
+* tdeinit
     Process launcher, used for fast KDE startup
 
 * kio
diff --git a/tdecore/kcrash.cpp b/tdecore/kcrash.cpp
index 08abe75c7..6fb5e8ff7 100644
--- a/tdecore/kcrash.cpp
+++ b/tdecore/kcrash.cpp
@@ -51,7 +51,7 @@
 #include <tdeapplication.h>
 #include <dcopclient.h>
 
-#include <../kinit/tdelauncher_cmds.h>
+#include <../tdeinit/tdelauncher_cmds.h>
 
 #if defined Q_WS_X11
 #include <X11/Xlib.h>
@@ -337,7 +337,7 @@ void TDECrash::startDirectly( const char* argv[], int )
   }
 }
 
-// From now on this code is copy&pasted from kinit/wrapper.c :
+// From now on this code is copy&pasted from tdeinit/wrapper.c :
 
 extern char **environ;
 
diff --git a/tdecore/tdestartupinfo.cpp b/tdecore/tdestartupinfo.cpp
index 3d798cdc1..731dc8b33 100644
--- a/tdecore/tdestartupinfo.cpp
+++ b/tdecore/tdestartupinfo.cpp
@@ -65,7 +65,7 @@ DEALINGS IN THE SOFTWARE.
 
 static const char* const NET_STARTUP_MSG = "_NET_STARTUP_INFO";
 static const char* const NET_STARTUP_WINDOW = "_NET_STARTUP_ID";
-// DESKTOP_STARTUP_ID is used also in kinit/wrapper.c ,
+// DESKTOP_STARTUP_ID is used also in tdeinit/wrapper.c ,
 // tdesu in both tdelibs and tdebase and who knows where else
 static const char* const NET_STARTUP_ENV = "DESKTOP_STARTUP_ID";
 
diff --git a/kinit/CMakeLists.txt b/tdeinit/CMakeLists.txt
similarity index 99%
rename from kinit/CMakeLists.txt
rename to tdeinit/CMakeLists.txt
index 88be32621..be78311eb 100644
--- a/kinit/CMakeLists.txt
+++ b/tdeinit/CMakeLists.txt
@@ -34,7 +34,7 @@ link_directories(
 set( target tdeinit )
 
 set( ${target}_SRCS
-  kinit.cpp setproctitle.cpp
+  tdeinit.cpp setproctitle.cpp
 )
 
 tde_add_executable( ${target}
diff --git a/kinit/LICENSE.setproctitle b/tdeinit/LICENSE.setproctitle
similarity index 100%
rename from kinit/LICENSE.setproctitle
rename to tdeinit/LICENSE.setproctitle
diff --git a/kinit/Mainpage.dox b/tdeinit/Mainpage.dox
similarity index 100%
rename from kinit/Mainpage.dox
rename to tdeinit/Mainpage.dox
diff --git a/kinit/Makefile.am b/tdeinit/Makefile.am
similarity index 98%
rename from kinit/Makefile.am
rename to tdeinit/Makefile.am
index 3090d041e..85381ccd4 100644
--- a/kinit/Makefile.am
+++ b/tdeinit/Makefile.am
@@ -24,7 +24,7 @@ bin_PROGRAMS = tdeinit tdeinit_wrapper kshell tdeinit_shutdown lnusertemp kwrapp
 
 lib_LTLIBRARIES = 
 tdeinit_LTLIBRARIES = tdelauncher.la
-tdeinit_SOURCES = kinit.cpp setproctitle.cpp
+tdeinit_SOURCES = tdeinit.cpp setproctitle.cpp
 
 # NOTE: We link against all common libraries even if we don't need them ourselves.
 # For the future: examine if condensing the tons of *_LDFLAGS variables
diff --git a/kinit/README b/tdeinit/README
similarity index 100%
rename from kinit/README
rename to tdeinit/README
diff --git a/kinit/README.DCOP b/tdeinit/README.DCOP
similarity index 100%
rename from kinit/README.DCOP
rename to tdeinit/README.DCOP
diff --git a/kinit/README.autostart b/tdeinit/README.autostart
similarity index 100%
rename from kinit/README.autostart
rename to tdeinit/README.autostart
diff --git a/kinit/README.wrapper b/tdeinit/README.wrapper
similarity index 100%
rename from kinit/README.wrapper
rename to tdeinit/README.wrapper
diff --git a/kinit/autostart.cpp b/tdeinit/autostart.cpp
similarity index 100%
rename from kinit/autostart.cpp
rename to tdeinit/autostart.cpp
diff --git a/kinit/autostart.h b/tdeinit/autostart.h
similarity index 100%
rename from kinit/autostart.h
rename to tdeinit/autostart.h
diff --git a/kinit/configure.in.in b/tdeinit/configure.in.in
similarity index 100%
rename from kinit/configure.in.in
rename to tdeinit/configure.in.in
diff --git a/kinit/kwrapper.c b/tdeinit/kwrapper.c
similarity index 100%
rename from kinit/kwrapper.c
rename to tdeinit/kwrapper.c
diff --git a/kinit/lnusertemp.c b/tdeinit/lnusertemp.c
similarity index 100%
rename from kinit/lnusertemp.c
rename to tdeinit/lnusertemp.c
diff --git a/kinit/setproctitle.cpp b/tdeinit/setproctitle.cpp
similarity index 100%
rename from kinit/setproctitle.cpp
rename to tdeinit/setproctitle.cpp
diff --git a/kinit/setproctitle.h b/tdeinit/setproctitle.h
similarity index 100%
rename from kinit/setproctitle.h
rename to tdeinit/setproctitle.h
diff --git a/kinit/shell.c b/tdeinit/shell.c
similarity index 100%
rename from kinit/shell.c
rename to tdeinit/shell.c
diff --git a/kinit/start_tdeinit.c b/tdeinit/start_tdeinit.c
similarity index 100%
rename from kinit/start_tdeinit.c
rename to tdeinit/start_tdeinit.c
diff --git a/kinit/start_tdeinit_wrapper.c b/tdeinit/start_tdeinit_wrapper.c
similarity index 100%
rename from kinit/start_tdeinit_wrapper.c
rename to tdeinit/start_tdeinit_wrapper.c
diff --git a/kinit/tdedostartupconfig.cpp b/tdeinit/tdedostartupconfig.cpp
similarity index 100%
rename from kinit/tdedostartupconfig.cpp
rename to tdeinit/tdedostartupconfig.cpp
diff --git a/kinit/kinit.cpp b/tdeinit/tdeinit.cpp
similarity index 99%
rename from kinit/kinit.cpp
rename to tdeinit/tdeinit.cpp
index b635b63e6..ca0d1dcaf 100644
--- a/kinit/kinit.cpp
+++ b/tdeinit/tdeinit.cpp
@@ -168,7 +168,7 @@ int tdeinit_x_errhandler( Display *, XErrorEvent *err );
 
 /* These are to link libtdeparts even if 'smart' linker is used */
 #include <tdeparts/plugin.h>
-extern "C" KParts::Plugin* _kinit_init_tdeparts() { return new KParts::Plugin(); }
+extern "C" KParts::Plugin* _tdeinit_init_tdeparts() { return new KParts::Plugin(); }
 /* These are to link libtdeio even if 'smart' linker is used */
 #include <tdeio/authinfo.h>
 extern "C" TDEIO::AuthInfo* _tdeioslave_init_kio() { return new TDEIO::AuthInfo(); }
diff --git a/kinit/tdeioslave.cpp b/tdeinit/tdeioslave.cpp
similarity index 100%
rename from kinit/tdeioslave.cpp
rename to tdeinit/tdeioslave.cpp
diff --git a/kinit/tdelauncher.cpp b/tdeinit/tdelauncher.cpp
similarity index 100%
rename from kinit/tdelauncher.cpp
rename to tdeinit/tdelauncher.cpp
diff --git a/kinit/tdelauncher.h b/tdeinit/tdelauncher.h
similarity index 100%
rename from kinit/tdelauncher.h
rename to tdeinit/tdelauncher.h
diff --git a/kinit/tdelauncher_cmds.h b/tdeinit/tdelauncher_cmds.h
similarity index 100%
rename from kinit/tdelauncher_cmds.h
rename to tdeinit/tdelauncher_cmds.h
diff --git a/kinit/tdelauncher_main.cpp b/tdeinit/tdelauncher_main.cpp
similarity index 100%
rename from kinit/tdelauncher_main.cpp
rename to tdeinit/tdelauncher_main.cpp
diff --git a/kinit/tdestartupconfig.cpp b/tdeinit/tdestartupconfig.cpp
similarity index 100%
rename from kinit/tdestartupconfig.cpp
rename to tdeinit/tdestartupconfig.cpp
diff --git a/kinit/tests/Makefile.am b/tdeinit/tests/Makefile.am
similarity index 100%
rename from kinit/tests/Makefile.am
rename to tdeinit/tests/Makefile.am
diff --git a/kinit/tests/tdelaunchertest.cpp b/tdeinit/tests/tdelaunchertest.cpp
similarity index 100%
rename from kinit/tests/tdelaunchertest.cpp
rename to tdeinit/tests/tdelaunchertest.cpp
diff --git a/kinit/wrapper.c b/tdeinit/wrapper.c
similarity index 100%
rename from kinit/wrapper.c
rename to tdeinit/wrapper.c