diff --git a/Helperstuff/BuildService/kdesvn.spec.in b/Helperstuff/BuildService/kdesvn.spec.in
index 72dbe4e..d787225 100644
--- a/Helperstuff/BuildService/kdesvn.spec.in
+++ b/Helperstuff/BuildService/kdesvn.spec.in
@@ -95,7 +95,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*/*part*
 %{_datadir}/applications/*
 %{_datadir}/apps/kdesvn/*
-%{_datadir}/apps/kdesvnpart/*
+%{_datadir}/apps/tdesvnpart/*
 %{_datadir}/apps/kconf_update/*
 %{_datadir}/config.kcfg/*
 %{_datadir}/doc/*
diff --git a/cmakemodules/FindKdeLibs.cmake b/cmakemodules/FindKdeLibs.cmake
index 865f582..2083c3f 100644
--- a/cmakemodules/FindKdeLibs.cmake
+++ b/cmakemodules/FindKdeLibs.cmake
@@ -7,7 +7,7 @@ include(FindQt3)
 #  KDE3_INCLUDE_DIR         - the KDE include directory
 #  KDE3_INCLUDE_DIRS        - the KDE and the Qt include directory, for use with INCLUDE_DIRECTORIES()
 #  KDE3_LIB_DIR             - the directory where the KDE libraries are installed, for use with LINK_DIRECTORIES()
-#  QT_AND_KDECORE_LIBS      - this contains both the Qt and the kdecore library
+#  QT_AND_KDECORE_LIBS      - this contains both the Qt and the tdecore library
 #  KDE3_DCOPIDL_EXECUTABLE  - the dcopidl executable
 #  KDE3_DCOPIDL2CPP_EXECUTABLE - the dcopidl2cpp executable
 #  KDE3_KCFGC_EXECUTABLE    - the kconfig_compiler executable
@@ -56,8 +56,8 @@ include(FindQt3)
 #    It creates and installs an appropriate libtool la-file.
 #
 # KDE3_ADD_KDEINIT_EXECUTABLE(name file1 ... fileN )
-#    Create a KDE application in the form of a module loadable via kdeinit.
-#    A library named kdeinit_<name> will be created and a small executable which links to it.
+#    Create a KDE application in the form of a module loadable via tdeinit.
+#    A library named tdeinit_<name> will be created and a small executable which links to it.
 #
 # The option KDE3_ENABLE_FINAL to enable all-in-one compilation is
 # no longer supported.
@@ -122,7 +122,7 @@ ENDIF(KDECONFIG_EXECUTABLE)
 
 
 # at first the KDE include direcory
-# kpassdlg.h comes from kdeui and doesn't exist in KDE4 anymore
+# kpassdlg.h comes from tdeui and doesn't exist in KDE4 anymore
 FIND_PATH(KDE3_INCLUDE_DIR kpassdlg.h
   HINTS
   $ENV{KDEDIR}/include
@@ -139,7 +139,7 @@ FIND_PATH(KDE3_INCLUDE_DIR kpassdlg.h
 # SET(KDE3_INCLUDE_DIR "/usr/include/kde")
 
 #now the KDE library directory
-FIND_LIBRARY(KDE3_KDECORE_LIBRARY NAMES kdecore
+FIND_LIBRARY(KDE3_KDECORE_LIBRARY NAMES tdecore
   HINTS
   $ENV{KDEDIR}/lib
   ${KDE3PREFIX}/lib
@@ -330,7 +330,7 @@ IF (LIB_SUFFIX)
         ${LIB_SEARCH_PATHES})
 ENDIF (LIB_SUFFIX)
 
-FIND_LIBRARY(KDE3_UI_LIBRARY NAMES kdeui
+FIND_LIBRARY(KDE3_UI_LIBRARY NAMES tdeui
   PATHS
   ${LIB_SEARCH_PATHES}
 )
@@ -355,7 +355,7 @@ FIND_LIBRARY(KDE3_WALLET_LIBRARY NAMES kwalletclient
   ${LIB_SEARCH_PATHES}
 )
 
-FIND_LIBRARY(KDE3_KINIT_KDED_LIBRARY NAMES kdeinit_kded
+FIND_LIBRARY(KDE3_KINIT_KDED_LIBRARY NAMES tdeinit_kded
   PATHS
   ${LIB_SEARCH_PATHES}
 )
diff --git a/cmakemodules/KDE3Macros.cmake b/cmakemodules/KDE3Macros.cmake
index 54df342..ebde99e 100644
--- a/cmakemodules/KDE3Macros.cmake
+++ b/cmakemodules/KDE3Macros.cmake
@@ -364,15 +364,15 @@ MACRO(KDE3_ADD_KDEINIT_EXECUTABLE _target_NAME )
 
    IF (KDE3_ENABLE_FINAL)
       KDE3_CREATE_FINAL_FILE(${_target_NAME}_final.cpp ${ARGN})
-      ADD_LIBRARY(kdeinit_${_target_NAME} SHARED  ${_target_NAME}_final.cpp)
+      ADD_LIBRARY(tdeinit_${_target_NAME} SHARED  ${_target_NAME}_final.cpp)
    ELSE (KDE3_ENABLE_FINAL)
-      ADD_LIBRARY(kdeinit_${_target_NAME} SHARED ${ARGN} )
+      ADD_LIBRARY(tdeinit_${_target_NAME} SHARED ${ARGN} )
    ENDIF (KDE3_ENABLE_FINAL)
 
    CONFIGURE_FILE(${KDE3_MODULE_DIR}/trinityinit_dummy.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp)
 
    ADD_EXECUTABLE( ${_target_NAME} ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp )
-   TARGET_LINK_LIBRARIES( ${_target_NAME} kdeinit_${_target_NAME} )
+   TARGET_LINK_LIBRARIES( ${_target_NAME} tdeinit_${_target_NAME} )
 
 ENDMACRO(KDE3_ADD_KDEINIT_EXECUTABLE)
 
diff --git a/doc/en/index.docbook b/doc/en/index.docbook
index 5a0b4ec..6b136ea 100644
--- a/doc/en/index.docbook
+++ b/doc/en/index.docbook
@@ -2276,7 +2276,7 @@ The homepage of that project is <ulink url="http://kdesvn.alwins-world.de/">http
 
 <!--
 List any special requirements for your application here. This should include:
-.Libraries or other software that is not included in kdesupport,
+.Libraries or other software that is not included in tdesupport,
 kdelibs, or kdebase.
 .Hardware requirements like amount of RAM, disk space, graphics card
 capabilities, screen resolution, special expansion cards, etc.
diff --git a/doc/nl/index.docbook b/doc/nl/index.docbook
index 761d96c..ffecdd5 100644
--- a/doc/nl/index.docbook
+++ b/doc/nl/index.docbook
@@ -2119,7 +2119,7 @@ De homepage van het project is <ulink url="http://kdesvn.alwins-world.de/">http:
 
 <!--
 Vermeldt alle speciale benodigheden voor Uw programma hier. This should include:
-.bibiotheken of andere software dat niet is meegeleverd met kdesupport,
+.bibiotheken of andere software dat niet is meegeleverd met tdesupport,
 kdelibs, of kdebase.
 .Hardware benodigheden zoals de hoeveelheid geheugen (RAM), harde schijf ruimte, grafische kaart, scherm resolutie, andere speciale kaarten enz.
 .Operating systemen waarop het programma loopt. Indien Uw programma is ontworpen om alleen op een specifiek OS te werken, (U schreef een bijvoorbeeld een grafische LILO configurator) , meldt deze informatie hier.
diff --git a/kdesvn.spec b/kdesvn.spec
index 350cb89..8c2da4c 100644
--- a/kdesvn.spec
+++ b/kdesvn.spec
@@ -72,7 +72,7 @@ rm -rf $RPM_BUILD_DIR/kdesvn
 %{_libdir}/*/*part*
 %{_datadir}/applications/*
 %{_datadir}/apps/kdesvn/*
-%{_datadir}/apps/kdesvnpart/*
+%{_datadir}/apps/tdesvnpart/*
 %{_datadir}/apps/kconf_update/*
 %{_datadir}/config.kcfg/*
 %{_datadir}/doc/*
diff --git a/kdesvn.spec.in b/kdesvn.spec.in
index 2699dfe..d26dbc7 100644
--- a/kdesvn.spec.in
+++ b/kdesvn.spec.in
@@ -72,7 +72,7 @@ rm -rf $RPM_BUILD_DIR/kdesvn
 %{_libdir}/*/*part*
 %{_datadir}/applications/*
 %{_datadir}/apps/kdesvn/*
-%{_datadir}/apps/kdesvnpart/*
+%{_datadir}/apps/tdesvnpart/*
 %{_datadir}/apps/kconf_update/*
 %{_datadir}/config.kcfg/*
 %{_datadir}/doc/*
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 343300d..3f0705c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -32,26 +32,26 @@ ADD_SUBDIRECTORY(icons)
 
 ADD_EXECUTABLE(kdesvn ${kdesvnsrc})
 
-KDE3_ADD_KPART(kdesvnpart WITH_PREFIX ${partsrc})
-TARGET_LINK_LIBRARIES(kdesvnpart svnfrontend kdesvnhelpers ksvnwidgets settingsdlgs kdesvncfgreader svnqt
+KDE3_ADD_KPART(tdesvnpart WITH_PREFIX ${partsrc})
+TARGET_LINK_LIBRARIES(tdesvnpart svnfrontend kdesvnhelpers ksvnwidgets settingsdlgs kdesvncfgreader svnqt
     ${QT_AND_KDECORE_LIBS} ${KDE3_KIO_LIBRARY} ${KDE3_PART_LIBRARY} ${KDE3_UI_LIBRARY} ${KDE3_WALLET_LIBRARY} )
-SET_TARGET_PROPERTIES(kdesvnpart
+SET_TARGET_PROPERTIES(tdesvnpart
     PROPERTIES
     LINK_FLAGS "${_BASE_LDADD} ${APR_EXTRA_LIBFLAGS} ${APU_EXTRA_LIBFLAGS} ${LINK_NO_UNDEFINED}")
 
 INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/src/svnqt)
 
-KDESVN_GENERATE_LIBTOOL_FILE(kdesvnpart)
+KDESVN_GENERATE_LIBTOOL_FILE(tdesvnpart)
 
 
 TARGET_LINK_LIBRARIES(kdesvnaskpass ${QT_AND_KDECORE_LIBS} ${KDE3_UI_LIBRARY})
 TARGET_LINK_LIBRARIES(kdesvn ${QT_AND_KDECORE_LIBS} ${KDE3_UI_LIBRARY} ${KDE3_PART_LIBRARY} ${KDE3_DCOP_LIBRARY} ${KDE3_KIO_LIBRARY})
 
-INSTALL(TARGETS kdesvn kdesvnaskpass kdesvnpart
+INSTALL(TARGETS kdesvn kdesvnaskpass tdesvnpart
     RUNTIME DESTINATION ${BIN_INSTALL_DIR}
     LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
 
 # the resources
 INSTALL(FILES kdesvnui.rc DESTINATION ${DATA_INSTALL_DIR}/kdesvn)
-INSTALL(FILES kdesvn_part.rc DESTINATION ${DATA_INSTALL_DIR}/kdesvnpart)
+INSTALL(FILES kdesvn_part.rc DESTINATION ${DATA_INSTALL_DIR}/tdesvnpart)
 INSTALL(FILES kdesvn.desktop DESTINATION ${XDG_APPS_DIR})
diff --git a/src/kdesvn.cpp b/src/kdesvn.cpp
index c798416..ae253f6 100644
--- a/src/kdesvn.cpp
+++ b/src/kdesvn.cpp
@@ -138,7 +138,7 @@ kdesvn::kdesvn()
                 KShortcut(),TQT_TQOBJECT(m_part),TQT_SLOT(slotSshAdd()),actionCollection(),"kdesvn_ssh_add");
             tmpAction->setToolTip(i18n("Force add ssh-identities to ssh-agent for future use."));
             tmpAction = new KAction(i18n("Info about kdesvn part"), "kdesvn",
-                        KShortcut(), TQT_TQOBJECT(m_part), TQT_SLOT(showAboutApplication()), actionCollection(), "help_about_kdesvnpart");
+                        KShortcut(), TQT_TQOBJECT(m_part), TQT_SLOT(showAboutApplication()), actionCollection(), "help_about_tdesvnpart");
             tmpAction->setToolTip(i18n("Shows info about the kdesvn plugin not the standalone app."));
 
             /* enable tooltips in statusbar for menu */
diff --git a/src/kdesvn_part.cpp b/src/kdesvn_part.cpp
index 2aa58f4..0c7a271 100644
--- a/src/kdesvn_part.cpp
+++ b/src/kdesvn_part.cpp
@@ -159,7 +159,7 @@ KAboutData* kdesvnPart::createAboutData()
     m_Extratext = TQString(I18N_NOOP("Built with Subversion library: %1\n")).tqarg(svn::Version::linked_version());
     m_Extratext+=TQString(I18N_NOOP("Running Subversion library: %1")).tqarg(svn::Version::running_version());
 
-    KAboutData*about = new KAboutData("kdesvnpart", I18N_NOOP("kdesvn Part"), version, description,
+    KAboutData*about = new KAboutData("tdesvnpart", I18N_NOOP("kdesvn Part"), version, description,
                      KAboutData::License_GPL, "(C) 2005-2007 Rajko Albrecht",0,
                          0, "ral@alwins-world.de");
     about->addAuthor( "Rajko Albrecht", 0, "ral@alwins-world.de" );
@@ -207,10 +207,10 @@ void kdesvnPart::setupActions()
 
     kdDebug()<<"Appname = " << (TQString)kapp->instanceName() << endl;
 
-    KAction * t = KStdAction::preferences(this, TQT_SLOT(slotShowSettings()), actionCollection(),"kdesvnpart_pref");
+    KAction * t = KStdAction::preferences(this, TQT_SLOT(slotShowSettings()), actionCollection(),"tdesvnpart_pref");
     t->setText(i18n("&Configure %1...").tqarg("Kdesvn"));
     if (TQString(kapp->instanceName())!=TQString("kdesvn")) {
-        (void)new KAction(i18n("&About kdesvn part"), "kdesvn", 0, this, TQT_SLOT(showAboutApplication()), actionCollection(), "help_about_kdesvnpart");
+        (void)new KAction(i18n("&About kdesvn part"), "kdesvn", 0, this, TQT_SLOT(showAboutApplication()), actionCollection(), "help_about_tdesvnpart");
         (void)new KAction(i18n("Kdesvn &Handbook"), "help", 0, this, TQT_SLOT(appHelpActivated()), actionCollection(), "help_kdesvn");
         (void)new KAction(i18n("Send Bugreport for kdesvn"), 0, 0, this, TQT_SLOT(reportBug()), actionCollection(), "report_bug");
     }
@@ -344,11 +344,11 @@ void kdesvnPart::appHelpActivated()
  */
 void kdesvnPart::slotShowSettings()
 {
-    if (KConfigDialog::showDialog("kdesvnpart_settings")) {
+    if (KConfigDialog::showDialog("tdesvnpart_settings")) {
         return;
     }
     KConfigDialog *dialog = new KConfigDialog(widget(),
-         "kdesvnpart_settings",
+         "tdesvnpart_settings",
          Kdesvnsettings::self(),
          KDialogBase::IconList);
     dialog->setHelp("setup","kdesvn");
diff --git a/src/kdesvn_part.rc b/src/kdesvn_part.rc
index 5e2eaef..d43ce5f 100644
--- a/src/kdesvn_part.rc
+++ b/src/kdesvn_part.rc
@@ -2,7 +2,7 @@
 <kpartgui name="kdesvn_part" version="17">
 <MenuBar>
   <Menu noMerge="1" name="settings">
-    <Action name="kdesvnpart_pref" />
+    <Action name="tdesvnpart_pref" />
     <Menu name="quicksettings">
      <text>Quick settings</text>
      <Action name="toggle_log_follows" />
@@ -91,7 +91,7 @@
   </Menu>
   <Menu name="help"><text>&amp;Help</text>
    <Separator/>
-   <Action name="help_about_kdesvnpart" />
+   <Action name="help_about_tdesvnpart" />
    <Action name="help_kdesvn" />
    <Action name="report_bug" />
   </Menu>
diff --git a/src/kdesvnui.rc b/src/kdesvnui.rc
index 23fd78e..769432a 100644
--- a/src/kdesvnui.rc
+++ b/src/kdesvnui.rc
@@ -43,7 +43,7 @@
   <Menu noMerge="0" name="help">
       <text>&amp;Help</text>
       <Merge/>
-      <Action name="help_about_kdesvnpart"/>
+      <Action name="help_about_tdesvnpart"/>
   </Menu>
  </MenuBar>
 <ToolBar name="subversionToolBar" noMerge="1">
diff --git a/src/settings/CMakeLists.txt b/src/settings/CMakeLists.txt
index fb1cd60..fd7f1ca 100644
--- a/src/settings/CMakeLists.txt
+++ b/src/settings/CMakeLists.txt
@@ -36,7 +36,7 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/kdesvn_part.kcfg DESTINATION ${KCFG_IN
 
 INSTALL(
     FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/kdesvnpartrc-use-external.upd
+    ${CMAKE_CURRENT_SOURCE_DIR}/tdesvnpartrc-use-external.upd
     DESTINATION
     ${DATA_INSTALL_DIR}/kconf_update
 )
diff --git a/src/settings/kdesvn_part.kcfg b/src/settings/kdesvn_part.kcfg
index 59290ac..e6471c3 100644
--- a/src/settings/kdesvn_part.kcfg
+++ b/src/settings/kdesvn_part.kcfg
@@ -1,6 +1,6 @@
 <!DOCTYPE kcfg SYSTEM "http://www.kde.org/standards/kcfg/1.0/kcfg.dtd">
 <kcfg>
-  <kcfgfile name="kdesvnpartrc" />
+  <kcfgfile name="tdesvnpartrc" />
   <include>tqstring.h</include>
   <group name="general_items" >
     <entry key="case_sensitive_sort" type="Bool" >
diff --git a/src/settings/kdesvnpartrc-use-external.upd b/src/settings/kdesvnpartrc-use-external.upd
index 63a76c6..7e5f964 100644
--- a/src/settings/kdesvnpartrc-use-external.upd
+++ b/src/settings/kdesvnpartrc-use-external.upd
@@ -1,6 +1,6 @@
-# kdesvnpartrc update
+# tdesvnpartrc update
 Id=0.14.0-1
-File=kdesvnpartrc
+File=tdesvnpartrc
 Group=general_items
 Options=overwrite
 Script=kdesvn-use-external-update.sh,sh