diff --git a/CMakeLists.txt b/CMakeLists.txt
index d7504dc58..f94cd3c03 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -171,7 +171,7 @@ option( BUILD_STARTTDE "Build starttde" ${BUILD_ALL} )
 option( BUILD_KFIND "Build kfind" ${BUILD_ALL} )
 option( BUILD_DRKONQI "Build drkonqi" ${BUILD_ALL} )
 option( BUILD_KDCOP "Build kdcop" ${BUILD_ALL} )
-option( BUILD_KDEBUGDIALOG "Build kdebugdialog" ${BUILD_ALL} )
+option( BUILD_TDEDEBUGDIALOG "Build tdedebugdialog" ${BUILD_ALL} )
 option( BUILD_KNETATTACH "Build knetattach" ${BUILD_ALL} )
 option( BUILD_KPAGER "Build kpager" ${BUILD_ALL} )
 option( BUILD_KAPPFINDER "Build kappfinder" ${BUILD_ALL} )
@@ -250,7 +250,7 @@ tde_conditional_add_subdirectory( BUILD_KSPLASHML ksplashml )
 tde_conditional_add_subdirectory( BUILD_KFIND kfind )
 tde_conditional_add_subdirectory( BUILD_DRKONQI drkonqi )
 tde_conditional_add_subdirectory( BUILD_KDCOP kdcop )
-tde_conditional_add_subdirectory( BUILD_KDEBUGDIALOG kdebugdialog )
+tde_conditional_add_subdirectory( BUILD_TDEDEBUGDIALOG tdedebugdialog )
 tde_conditional_add_subdirectory( BUILD_KNETATTACH knetattach )
 tde_conditional_add_subdirectory( BUILD_KPAGER kpager )
 tde_conditional_add_subdirectory( BUILD_KAPPFINDER kappfinder )
diff --git a/README b/README
index 01e295240..69ebefbdb 100644
--- a/README
+++ b/README
@@ -47,7 +47,7 @@ libraries. Here is an overview of the directories:
 * kdcop
     GUI app to browse for DCOP interfaces, can also execute them.
 
-* kdebugdialog
+* tdedebugdialog
     Allows you to specify which debug messages you want to see.
 
 * tdeprint
diff --git a/doc/kdebugdialog/CMakeLists.txt b/doc/tdedebugdialog/CMakeLists.txt
similarity index 84%
rename from doc/kdebugdialog/CMakeLists.txt
rename to doc/tdedebugdialog/CMakeLists.txt
index 3f3ce3cf2..d83bc9162 100644
--- a/doc/kdebugdialog/CMakeLists.txt
+++ b/doc/tdedebugdialog/CMakeLists.txt
@@ -9,4 +9,4 @@
 #
 #################################################
 
-tde_create_handbook( DESTINATION kdebugdialog )
+tde_create_handbook( DESTINATION tdedebugdialog )
diff --git a/doc/kdebugdialog/Makefile.am b/doc/tdedebugdialog/Makefile.am
similarity index 100%
rename from doc/kdebugdialog/Makefile.am
rename to doc/tdedebugdialog/Makefile.am
diff --git a/doc/kdebugdialog/index.docbook b/doc/tdedebugdialog/index.docbook
similarity index 89%
rename from doc/kdebugdialog/index.docbook
rename to doc/tdedebugdialog/index.docbook
index fefe25ce9..e23d599af 100644
--- a/doc/kdebugdialog/index.docbook
+++ b/doc/tdedebugdialog/index.docbook
@@ -1,8 +1,8 @@
 <?xml version="1.0" ?>
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN"
 "dtd/kdex.dtd" [
-  <!ENTITY kdebugdialog "<application>KDebugDialog</application>">
-  <!ENTITY kappname "&kdebugdialog;">
+  <!ENTITY tdedebugdialog "<application>TDEDebugDialog</application>">
+  <!ENTITY kappname "&tdedebugdialog;">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE" > <!-- change language only here -->
   
@@ -11,7 +11,7 @@
 
 <book lang="&language;">
 <bookinfo>
-<title>The &kdebugdialog; Handbook</title>
+<title>The &tdedebugdialog; Handbook</title>
 
 <authorgroup>
 <author>&David.Faure; &David.Faure.mail;</author>
@@ -22,22 +22,22 @@
 <releaseinfo>0.03.00</releaseinfo>
 
 <abstract>
-<para>This document describes &kdebugdialog;.</para>
+<para>This document describes &tdedebugdialog;.</para>
 </abstract>
 
 <keywordset>
 <keyword>KDE</keyword>
-<keyword>KDebugdialog</keyword>
+<keyword>TDEDebugdialog</keyword>
 </keywordset>
 </bookinfo>
 
 <chapter id="Introduction">
-<title>What is KDebugDialog?</title>
+<title>What is TDEDebugDialog?</title>
 
 <para>It is a dialog box for managing diagnostic messages at runtime.
 </para>
 
-<para>If you simply start <command>kdebugdialog</command>, you will
+<para>If you simply start <command>tdedebugdialog</command>, you will
 see a list of <quote>areas</quote>, that can be disabled or enabled. A
 <function>kdDebug(area)</function> call in the code will show
 something in the debug output only if the area is enabled.</para>
@@ -60,7 +60,7 @@ the syntax start-end. Thus a valid entry could be:
 </varlistentry>
 </variablelist>
 
-<para>If you start <command>kdebugdialog</command>
+<para>If you start <command>tdedebugdialog</command>
 <option>--fullmode</option>, then for every severity level you can
 define separately what should be done with the diagnostic messages of
 that level, and the same for each debug area.</para>
@@ -116,7 +116,7 @@ your entries apply immediately and are saved in
 ones are restored.</para>
 
 <para>Credits to Kalle Dalheimer for the original version of
-&kdebugdialog;</para>
+&tdedebugdialog;</para>
 
 </chapter>
 
diff --git a/doc/userguide/credits-and-license.docbook b/doc/userguide/credits-and-license.docbook
index cc1872d2e..b4395aed1 100644
--- a/doc/userguide/credits-and-license.docbook
+++ b/doc/userguide/credits-and-license.docbook
@@ -105,7 +105,7 @@ The &tde; Team thanks and acknowledges the original &kde; contributors of this g
 <itemizedlist>
 <listitem><para>Wrote <xref linkend="configuring-toolbars"/>.</para>
 </listitem>
-<listitem><para>Wrote <xref linkend="kdebugdialog" />.</para>
+<listitem><para>Wrote <xref linkend="tdedebugdialog" />.</para>
 </listitem>
 </itemizedlist>
 
diff --git a/doc/userguide/under-the-hood.docbook b/doc/userguide/under-the-hood.docbook
index 62ab1a5ec..6757cc8d9 100644
--- a/doc/userguide/under-the-hood.docbook
+++ b/doc/userguide/under-the-hood.docbook
@@ -385,17 +385,17 @@ window.</para></listitem>
 
 </sect1>
 
-<sect1 id="kdebugdialog">
+<sect1 id="tdedebugdialog">
 
-<title>&kdebugdialog;  - Controlling &tde;'s Debugging Output</title>
+<title>&tdedebugdialog;  - Controlling &tde;'s Debugging Output</title>
 
-<sect2 id="kdebugdialog-basic-usage">
+<sect2 id="tdedebugdialog-basic-usage">
 <title>Basic Usage</title>
 
-<para>&kdebugdialog; is not in the &kmenu; by default. You will need to run
+<para>&tdedebugdialog; is not in the &kmenu; by default. You will need to run
 it from the shell or from the mini-CLI <!-- link to CLI, for sure --> with
-the command <userinput><command>kdebugdialog</command></userinput>.
-&kdebugdialog; pops up a window with a long list of debugging areas. Each
+the command <userinput><command>tdedebugdialog</command></userinput>.
+&tdedebugdialog; pops up a window with a long list of debugging areas. Each
 area has a checkbox that you can check or uncheck <!-- perhaps
 select/deselect --> in order to enable or disable debugging output for
 that part of &tde;.</para>
@@ -416,13 +416,13 @@ buttons which will cause &tde; to produce a mountain of debugging output, or
 very little.</para>
 </sect2>
 
-<sect2 id="kdebugdialog-fullmode">
-<title>KDebugDialog in full mode</title>
+<sect2 id="tdedebugdialog-fullmode">
+<title>TDEDebugDialog in full mode</title>
 
-<!-- this text partly taken from the kdebugdialog handbook -->
+<!-- this text partly taken from the tdedebugdialog handbook -->
 
-<para>In full mode, which is what you get when you start kdebugdialog as
-<userinput><command>kdebugdialog</command>
+<para>In full mode, which is what you get when you start tdedebugdialog as
+<userinput><command>tdedebugdialog</command>
 <option>--fullmode</option></userinput>, the same list of debugging areas
 as in plain mode is available, but you can select only one at a time from a
 drop-down <!-- combo? --> box. You may then  independently set the output
diff --git a/kdebugdialog/Makefile.am b/kdebugdialog/Makefile.am
deleted file mode 100644
index 9d5a6e257..000000000
--- a/kdebugdialog/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-## Makefile.am of kdebugdialog
-
-INCLUDES=	$(all_includes)
-
-####### Files
-
-bin_PROGRAMS = kdebugdialog
-
-kdebugdialog_SOURCES = main.cpp kabstractdebugdialog.cpp kdebugdialog.cpp tdelistdebugdialog.cpp
-kdebugdialog_METASOURCES = AUTO
-kdebugdialog_LDFLAGS =       $(all_libraries) $(KDE_RPATH)
-kdebugdialog_LDADD   =       $(LIB_TDEUI)
-
-messages:
-	$(XGETTEXT) *.cpp -o $(podir)/kdebugdialog.pot	
-
diff --git a/r14-xdg-update b/r14-xdg-update
index 87d6044cb..92de967bc 100644
--- a/r14-xdg-update
+++ b/r14-xdg-update
@@ -68,7 +68,7 @@ Log () {
 # Main script:
 
 SCRIPT_NAME="`basename \`readlink -f $0\``"
-SCRIPT_VERSION=201401010
+SCRIPT_VERSION=201401050
 
 # Allow forced execution of this script regardless of the kdeglobals setting
 # and allow passing a user home directory as a positional parameter.
@@ -652,6 +652,12 @@ if [ "$R14_VERSION" -lt "201309150" ]; then
     cp -a $PROFILE_DIR/share/config/kpowersaverc $PROFILE_DIR/share/config/tdepowersaverc 2>/dev/null
   fi
 fi
+if [ "$R14_VERSION" -lt "201401050" ]; then
+  if [ ! -f $PROFILE_DIR/share/config/tdedebugdialogrc ] && [ -f $PROFILE_DIR/share/config/kdebugdialogrc ]; then
+    Log "  kdebugdialog->tdedebugdialog"
+    cp -a $PROFILE_DIR/share/config/kdebugdialogrc $PROFILE_DIR/share/config/tdedebugdialogrc 2>/dev/null
+  fi
+fi
 
 # Disable some features new to R14, otherwise users will see an unfamiliar desktop.
 if [ "$R14_VERSION" -lt "201309150" ]; then
diff --git a/kdebugdialog/CMakeLists.txt b/tdedebugdialog/CMakeLists.txt
similarity index 77%
rename from kdebugdialog/CMakeLists.txt
rename to tdedebugdialog/CMakeLists.txt
index f6eccd0fe..001d5e72c 100644
--- a/kdebugdialog/CMakeLists.txt
+++ b/tdedebugdialog/CMakeLists.txt
@@ -21,11 +21,11 @@ link_directories(
 )
 
 
-##### kdebugdialog (executable) #################
+##### tdedebugdialog (executable) #################
 
-tde_add_executable( kdebugdialog AUTOMOC
+tde_add_executable( tdedebugdialog AUTOMOC
   SOURCES
-    main.cpp kabstractdebugdialog.cpp kdebugdialog.cpp
+    main.cpp kabstractdebugdialog.cpp tdedebugdialog.cpp
     tdelistdebugdialog.cpp
   LINK tdeui-shared
   DESTINATION ${BIN_INSTALL_DIR}
diff --git a/tdedebugdialog/Makefile.am b/tdedebugdialog/Makefile.am
new file mode 100644
index 000000000..d6249afae
--- /dev/null
+++ b/tdedebugdialog/Makefile.am
@@ -0,0 +1,16 @@
+## Makefile.am of tdedebugdialog
+
+INCLUDES=	$(all_includes)
+
+####### Files
+
+bin_PROGRAMS = tdedebugdialog
+
+tdedebugdialog_SOURCES = main.cpp kabstractdebugdialog.cpp tdedebugdialog.cpp tdelistdebugdialog.cpp
+tdedebugdialog_METASOURCES = AUTO
+tdedebugdialog_LDFLAGS =       $(all_libraries) $(KDE_RPATH)
+tdedebugdialog_LDADD   =       $(LIB_TDEUI)
+
+messages:
+	$(XGETTEXT) *.cpp -o $(podir)/tdedebugdialog.pot	
+
diff --git a/kdebugdialog/README b/tdedebugdialog/README
similarity index 96%
rename from kdebugdialog/README
rename to tdedebugdialog/README
index 59c9fcd9f..2ee51ae79 100644
--- a/kdebugdialog/README
+++ b/tdedebugdialog/README
@@ -1,4 +1,4 @@
-kdebugdialog
+tdedebugdialog
 ------------
 
 In --fullmode, you can choose to dump debug output to a file.
diff --git a/kdebugdialog/kabstractdebugdialog.cpp b/tdedebugdialog/kabstractdebugdialog.cpp
similarity index 100%
rename from kdebugdialog/kabstractdebugdialog.cpp
rename to tdedebugdialog/kabstractdebugdialog.cpp
diff --git a/kdebugdialog/kabstractdebugdialog.h b/tdedebugdialog/kabstractdebugdialog.h
similarity index 100%
rename from kdebugdialog/kabstractdebugdialog.h
rename to tdedebugdialog/kabstractdebugdialog.h
diff --git a/kdebugdialog/main.cpp b/tdedebugdialog/main.cpp
similarity index 96%
rename from kdebugdialog/main.cpp
rename to tdedebugdialog/main.cpp
index b70d7d0e1..f1c463dce 100644
--- a/kdebugdialog/main.cpp
+++ b/tdedebugdialog/main.cpp
@@ -17,7 +17,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "kdebugdialog.h"
+#include "tdedebugdialog.h"
 #include "tdelistdebugdialog.h"
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
@@ -77,7 +77,7 @@ static TDECmdLineOptions options[] =
 
 int main(int argc, char ** argv)
 {
-  TDEAboutData data( "kdebugdialog", I18N_NOOP( "KDebugDialog"),
+  TDEAboutData data( "tdedebugdialog", I18N_NOOP( "TDEDebugDialog"),
     "1.0", I18N_NOOP("A dialog box for setting preferences for debug output"),
     TDEAboutData::License_GPL, "(c) 2009,2010, Timothy Pearson <kb9vqf@pearsoncomputing.net>");
   data.addAuthor("Timothy Pearson", I18N_NOOP("Maintainer"), "kb9vqf@pearsoncomputing.net");
@@ -91,7 +91,7 @@ int main(int argc, char ** argv)
   TQStringList areaList ( readAreaList() );
   KAbstractDebugDialog * dialog;
   if (args->isSet("fullmode"))
-      dialog = new KDebugDialog(areaList, 0L);
+      dialog = new TDEDebugDialog(areaList, 0L);
   else
   {
       TDEListDebugDialog * listdialog = new TDEListDebugDialog(areaList, 0L);
diff --git a/kdebugdialog/kdebugdialog.cpp b/tdedebugdialog/tdedebugdialog.cpp
similarity index 96%
rename from kdebugdialog/kdebugdialog.cpp
rename to tdedebugdialog/tdedebugdialog.cpp
index fc80bd486..d63fac78b 100644
--- a/kdebugdialog/kdebugdialog.cpp
+++ b/tdedebugdialog/tdedebugdialog.cpp
@@ -38,9 +38,9 @@
 #include <tdeapplication.h>
 #include <dcopclient.h>
 
-#include "kdebugdialog.h"
+#include "tdedebugdialog.h"
 
-KDebugDialog::KDebugDialog( TQStringList areaList, TQWidget *parent, const char *name, bool modal )
+TDEDebugDialog::TDEDebugDialog( TQStringList areaList, TQWidget *parent, const char *name, bool modal )
   : KAbstractDebugDialog( parent, name, modal )
 {
   setCaption(i18n("Debug Settings"));
@@ -189,11 +189,11 @@ KDebugDialog::KDebugDialog( TQStringList areaList, TQWidget *parent, const char
   resize( 300, height() );
 }
 
-KDebugDialog::~KDebugDialog()
+TDEDebugDialog::~TDEDebugDialog()
 {
 }
 
-void KDebugDialog::slotDebugAreaChanged( const TQString & text )
+void TDEDebugDialog::slotDebugAreaChanged( const TQString & text )
 {
   // Save settings from previous page
   if ( text != "0 initial" ) // except on first call
@@ -227,7 +227,7 @@ void KDebugDialog::slotDebugAreaChanged( const TQString & text )
   slotDestinationChanged(0);
 }
 
-void KDebugDialog::save()
+void TDEDebugDialog::save()
 {
   pConfig->writeEntry( "InfoOutput", pInfoCombo->currentItem() );
   pConfig->writePathEntry( "InfoFilename", pInfoFile->text() );
@@ -250,11 +250,11 @@ void KDebugDialog::save()
   }
 }
 
-void KDebugDialog::slotDestinationChanged(int) {
+void TDEDebugDialog::slotDestinationChanged(int) {
     pInfoFile->setEnabled(pInfoCombo->currentItem() == 0);
     pWarnFile->setEnabled(pWarnCombo->currentItem() == 0);
     pErrorFile->setEnabled(pErrorCombo->currentItem() == 0);
     pFatalFile->setEnabled(pFatalCombo->currentItem() == 0);
 }
 
-#include "kdebugdialog.moc"
+#include "tdedebugdialog.moc"
diff --git a/kdebugdialog/kdebugdialog.h b/tdedebugdialog/tdedebugdialog.h
similarity index 87%
rename from kdebugdialog/kdebugdialog.h
rename to tdedebugdialog/tdedebugdialog.h
index eabe46429..dec300018 100644
--- a/kdebugdialog/kdebugdialog.h
+++ b/tdedebugdialog/tdedebugdialog.h
@@ -16,8 +16,8 @@
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA 02110-1301, USA.
 */
-#ifndef _KDEBUGDIALOG
-#define _KDEBUGDIALOG
+#ifndef _TDEDEBUGDIALOG
+#define _TDEDEBUGDIALOG
 
 #include "kabstractdebugdialog.h"
 
@@ -37,13 +37,13 @@ class TDEConfig;
  *
  * @author Kalle Dalheimer (kalle@kde.org)
  */
-class KDebugDialog : public KAbstractDebugDialog
+class TDEDebugDialog : public KAbstractDebugDialog
 {
   Q_OBJECT
 
 public:
-  KDebugDialog( TQStringList areaList, TQWidget *parent=0, const char *name=0, bool modal=true );
-  virtual ~KDebugDialog();
+  TDEDebugDialog( TQStringList areaList, TQWidget *parent=0, const char *name=0, bool modal=true );
+  virtual ~TDEDebugDialog();
 
   void save();
 
@@ -86,8 +86,8 @@ private:
 
 private:
   // Disallow assignment and copy-construction
-  KDebugDialog( const KDebugDialog& );
-  KDebugDialog& operator= ( const KDebugDialog& );
+  TDEDebugDialog( const TDEDebugDialog& );
+  TDEDebugDialog& operator= ( const TDEDebugDialog& );
 };
 
 #endif
diff --git a/kdebugdialog/tdelistdebugdialog.cpp b/tdedebugdialog/tdelistdebugdialog.cpp
similarity index 100%
rename from kdebugdialog/tdelistdebugdialog.cpp
rename to tdedebugdialog/tdelistdebugdialog.cpp
diff --git a/kdebugdialog/tdelistdebugdialog.h b/tdedebugdialog/tdelistdebugdialog.h
similarity index 99%
rename from kdebugdialog/tdelistdebugdialog.h
rename to tdedebugdialog/tdelistdebugdialog.h
index d0da5c10b..92e68d2be 100644
--- a/kdebugdialog/tdelistdebugdialog.h
+++ b/tdedebugdialog/tdelistdebugdialog.h
@@ -30,7 +30,7 @@ class KLineEdit;
 
 /**
  * Control debug output of TDE applications
- * This dialog offers a reduced functionality compared to the full KDebugDialog
+ * This dialog offers a reduced functionality compared to the full TDEDebugDialog
  * class, but allows to set debug output on or off to several areas much more easily.
  *
  * @author David Faure <faure@kde.org>
diff --git a/tdeioslave/sftp/DEBUGGING b/tdeioslave/sftp/DEBUGGING
index 89ae8fe18..8e15c91d4 100644
--- a/tdeioslave/sftp/DEBUGGING
+++ b/tdeioslave/sftp/DEBUGGING
@@ -1,7 +1,7 @@
 DEBUGGING
 
 The best way to debug this slave is to send debug info to a
-file using 'kdebugDialog --fullmode'. Then you can 'tail -f' the file to 
+file using 'tdedebugDialog --fullmode'. Then you can 'tail -f' the file to 
 see debug messages in real-time.
 
 I also suggest getting the openssh source and recompiling sftp-server to