58 files changed, 81 insertions, 81 deletions
diff --git a/doc/faq/panel.docbook b/doc/faq/panel.docbook
index bfb2a1c7d..aa58c0ff2 100644
--- a/doc/faq/panel.docbook
+++ b/doc/faq/panel.docbook
@@ -45,7 +45,7 @@ select Menus, then inside the TDE Menu grouping, select the TDE Menu button icon
 User modifications to the &kmenu; are stored in
 <filename>$<envar>HOME</envar>/.config/menus/applications-kmenuedit.menu</filename>.
 Try moving this file out of the way and then issuing the
-command <userinput><command>kbuildsycoca</command>
+command <userinput><command>tdebuildsycoca</command>
 <option>--noincremental</option></userinput>. This should restore you to the
 default system menus. If that is the case you'll have to recreate your customized menu.
 </para>
diff --git a/doc/glossary/index.docbook b/doc/glossary/index.docbook
index f8b7d46c2..b06708a1a 100644
--- a/doc/glossary/index.docbook
+++ b/doc/glossary/index.docbook
@@ -48,7 +48,7 @@ Slave</glossseealso>
 				configuration cache which, for example, guarantees fast access to the menu
 				entries.</para>
 				<glossseealso 
-otherterm="gloss-kbuildsycoca"><application>KBuildSycoca</application></glossseealso>
+otherterm="gloss-tdebuildsycoca"><application>KBuildSycoca</application></glossseealso>
 			</glossdef>
 		</glossentry>
 	</glossdiv>
@@ -80,7 +80,7 @@ otherterm="gloss-kbuildsycoca"><application>KBuildSycoca</application></glosssee
 
 	<glossdiv id="glossdiv-applications">
 		<title>Applications</title>
-		<glossentry id="gloss-kbuildsycoca">
+		<glossentry id="gloss-tdebuildsycoca">
 			<glossterm><application>KBuildSycoca</application></glossterm>
 			<glossdef><para><application>KBuildSycoca</application> is a command line 
 program and regenerates the
diff --git a/doc/glossary/tdeprintingglossary.docbook b/doc/glossary/tdeprintingglossary.docbook
index 2cc77e57f..731c26b56 100644
--- a/doc/glossary/tdeprintingglossary.docbook
+++ b/doc/glossary/tdeprintingglossary.docbook
@@ -1127,7 +1127,7 @@ now.
                         </glossdef>
                 </glossentry>
 
-                <glossentry id="gloss-printkioslave">
+                <glossentry id="gloss-printtdeioslave">
                         <glossterm>print:/ KIO Slave</glossterm>
                         <glossdef><para>You can use a syntax of "print:/..." to get quick access
 				to TDEPrint resources. Typing "print:/manager" as a Konqueror URL
diff --git a/doc/kcontrol/filemanager/index.docbook b/doc/kcontrol/filemanager/index.docbook
index 26cc11ac5..110f3177f 100644
--- a/doc/kcontrol/filemanager/index.docbook
+++ b/doc/kcontrol/filemanager/index.docbook
@@ -155,7 +155,7 @@ download.</para>
 <screenshot>
   <screeninfo>Download Dialog Box</screeninfo>
   <mediaobject>
-  <imageobject><imagedata fileref="kfileman2.png"
+  <imageobject><imagedata fileref="tdefileman2.png"
  format="PNG"/></imageobject>
   <textobject> <phrase>Download Dialog Box</phrase> </textobject>
   <caption>
@@ -173,7 +173,7 @@ together under a single dialog box.</para>
 <screenshot>
   <screeninfo>Download Dialog Box</screeninfo>
   <mediaobject>
-  <imageobject><imagedata fileref="kfileman1.png"
+  <imageobject><imagedata fileref="tdefileman1.png"
  format="PNG"/></imageobject>
   <textobject><phrase>Download Dialog Box</phrase></textobject>
   <caption>
diff --git a/doc/kcontrol/filemanager/kfileman1.png b/doc/kcontrol/filemanager/tdefileman1.png
index 0505d604d..0505d604d 100644
--- a/doc/kcontrol/filemanager/kfileman1.png
+++ b/doc/kcontrol/filemanager/tdefileman1.png
diff --git a/doc/kcontrol/filemanager/kfileman2.png b/doc/kcontrol/filemanager/tdefileman2.png
index 6c8d17d75..6c8d17d75 100644
--- a/doc/kcontrol/filemanager/kfileman2.png
+++ b/doc/kcontrol/filemanager/tdefileman2.png
diff --git a/doc/kcontrol/index.docbook b/doc/kcontrol/index.docbook
index 0c8926797..f55b3e8e4 100644
--- a/doc/kcontrol/index.docbook
+++ b/doc/kcontrol/index.docbook
@@ -308,7 +308,7 @@ the control center.
 <title>Running Individual Modules</title>
 
 <para>
-You can run individual modules without running kcontrol using the command <command>kcmshell</command> from &konsole;. Type <userinput> <command>kcmshell</command><option> --list</option></userinput> to see a list of the available &kcontrolcenter; modules. You can also access individual &kcontrolcenter; modules through adding the <guilabel>Preferences</guilabel> button to either &kicker; or the &kmenu; through their respective configuration dialogs.
+You can run individual modules without running kcontrol using the command <command>tdecmshell</command> from &konsole;. Type <userinput> <command>tdecmshell</command><option> --list</option></userinput> to see a list of the available &kcontrolcenter; modules. You can also access individual &kcontrolcenter; modules through adding the <guilabel>Preferences</guilabel> button to either &kicker; or the &kmenu; through their respective configuration dialogs.
 </para>
 
 </sect1>
diff --git a/doc/kcontrol/proxy/index.docbook b/doc/kcontrol/proxy/index.docbook
index c69d27bc3..63a154eaa 100644
--- a/doc/kcontrol/proxy/index.docbook
+++ b/doc/kcontrol/proxy/index.docbook
@@ -172,7 +172,7 @@ ask for a username or password if it needs to.</para>
 <para>The other option is <guilabel>Use automatic login</guilabel>.
 Select this option if you have already set up a login entry for your
 proxy server in the
-<filename>$<envar>TDEDIR</envar>/share/config/kionetrc</filename>
+<filename>$<envar>TDEDIR</envar>/share/config/tdeionetrc</filename>
 file.</para>
 
 </sect2>
diff --git a/doc/kicker/index.docbook b/doc/kicker/index.docbook
index 3645669d2..07c242b3d 100644
--- a/doc/kicker/index.docbook
+++ b/doc/kicker/index.docbook
@@ -2346,7 +2346,7 @@ Why is my <guisubmenu>Settings</guisubmenu> menu not working?
 <answer>
 <para>
 Your menu entries may be mixed up for some reason. Simply run
-<command>kbuildsycoca</command> on a commandline.
+<command>tdebuildsycoca</command> on a commandline.
 </para>
 </answer>
 </qandaentry>
diff --git a/doc/konqueror/browser.docbook b/doc/konqueror/browser.docbook
index 2c1e0fa17..c6c8ecbb2 100644
--- a/doc/konqueror/browser.docbook
+++ b/doc/konqueror/browser.docbook
@@ -446,15 +446,15 @@ just add a key line
 <screen><userinput>
 OverridenPorts=CommaSeparatedListOfAllowedPorts
 </userinput></screen>
-to <filename>$TDEDIR/share/config/kio_httprc
+to <filename>$TDEDIR/share/config/tdeio_httprc
 </filename> or 
-<filename>~/.trinity/share/config/kio_httprc</filename>.</para>
+<filename>~/.trinity/share/config/tdeio_httprc</filename>.</para>
 <para>For example
 <screen><userinput>OverridenPorts=23,15
 </userinput></screen> 
 (it should not include any embedded spaces).</para>
 <para>&konqueror; will reject the following ports (the list is hardcoded in 
-<filename>tdelibs/kio/kio/job.cpp</filename>):</para>
+<filename>tdelibs/tdeio/tdeio/job.cpp</filename>):</para>
 <para>
  1, 7, 9, 11, 13, 15, 17, 19,
  20, 21, 22, 23, 25, 37, 42, 43,
diff --git a/doc/ksplashml/index.docbook b/doc/ksplashml/index.docbook
index a3abb27c8..df1c5f884 100644
--- a/doc/ksplashml/index.docbook
+++ b/doc/ksplashml/index.docbook
@@ -1084,7 +1084,7 @@ appropriate plugin.</para>
 #include &lt;qwidget.h&gt;
 
 #include &lt;kapplication.h&gt;
-#include &lt;kconfig.h&gt;
+#include &lt;tdeconfig.h&gt;
 #include &lt;kdebug.h&gt;
 #include &lt;kdialogbase.h&gt;
 #include &lt;kgenericfactory.h&gt;
diff --git a/doc/kxkb/index.docbook b/doc/kxkb/index.docbook
index f41d181b1..88e858fe8 100644
--- a/doc/kxkb/index.docbook
+++ b/doc/kxkb/index.docbook
@@ -83,7 +83,7 @@ list.</para>
 configuration by selecting <guimenuitem>Configure...</guimenuitem> or
 by opening <application>Control Center</application> and selecting
 Localization/Keyboard Layout. Alternatively, you can start it by
-typing <command>kcmshell keyboard_layout</command> in a
+typing <command>tdecmshell keyboard_layout</command> in a
 terminal.</para>
 
 </sect1>
diff --git a/doc/kioslave/CMakeLists.txt b/doc/tdeioslave/CMakeLists.txt
index da80330c8..5446ddbea 100644
--- a/doc/kioslave/CMakeLists.txt
+++ b/doc/tdeioslave/CMakeLists.txt
@@ -9,4 +9,4 @@
 #
 #################################################
 
-tde_create_handbook( DESTINATION kioslave )
+tde_create_handbook( DESTINATION tdeioslave )
diff --git a/doc/kioslave/Makefile.am b/doc/tdeioslave/Makefile.am
index 085981d9b..085981d9b 100644
--- a/doc/kioslave/Makefile.am
+++ b/doc/tdeioslave/Makefile.am
diff --git a/doc/kioslave/bzip.docbook b/doc/tdeioslave/bzip.docbook
index 9a3dc90cb..e4e7d1bff 100644
--- a/doc/kioslave/bzip.docbook
+++ b/doc/tdeioslave/bzip.docbook
@@ -11,19 +11,19 @@
 used today, having been replaced with bzip2, which offers much better
 compression.</para>
 
-<para>The bzip kioslave is not directly usable, and is intended for use
-as a filter.  For example, the tar kioslave can filter a file through
-the bzip kioslave, in order to display the contents of a <literal
+<para>The bzip tdeioslave is not directly usable, and is intended for use
+as a filter.  For example, the tar tdeioslave can filter a file through
+the bzip tdeioslave, in order to display the contents of a <literal
 role="extension">tar.bz</literal> file directly in a &konqueror;
 window.</para>
 
 <para>If you click on a file compressed with a <literal
-role="extension">bz</literal> extension in &konqueror;, this kioslave is
+role="extension">bz</literal> extension in &konqueror;, this tdeioslave is
 used to uncompress it and display it as a normal (uncompressed)
 file.</para>
 
 <para>If you are a developer, and would like to use the bzip filter,
-you can find documentation on using kioslaves at <ulink
+you can find documentation on using tdeioslaves at <ulink
 url="http://developer.kde.org">http://developer.kde.org</ulink></para>
 
 </article>
diff --git a/doc/kioslave/bzip2.docbook b/doc/tdeioslave/bzip2.docbook
index 9551632a5..ecc2b2e29 100644
--- a/doc/kioslave/bzip2.docbook
+++ b/doc/tdeioslave/bzip2.docbook
@@ -9,18 +9,18 @@
 
 <para>Bzip2 is a compression program</para>
 
-<para>The bzip2 kioslave is not directly usable, and is intended for use
-as a filter.  For example, the tar kioslave can filter a file through
-the bzip2 kioslave, in order to display the contents of a <literal
+<para>The bzip2 tdeioslave is not directly usable, and is intended for use
+as a filter.  For example, the tar tdeioslave can filter a file through
+the bzip2 tdeioslave, in order to display the contents of a <literal
 role="extension">tar.bz2</literal> file directly in a &konqueror;
 window.</para>
 
 <para>If you click on a file compressed with a <literal
-role="extension">.bz2</literal> in &konqueror;, this kioslave is used to
+role="extension">.bz2</literal> in &konqueror;, this tdeioslave is used to
 uncompress it and display it as a normal (uncompressed) file.</para>
 
 <para>If you are a developer, and would like to use the bzip2 filter,
-you can find documentation on using kioslaves at <ulink
+you can find documentation on using tdeioslaves at <ulink
 url="http://developer.kde.org">http://developer.kde.org</ulink></para>
 
 <para> See the manual: <ulink url="man:/bzip2">bzip2</ulink>.
diff --git a/doc/kioslave/cgi.docbook b/doc/tdeioslave/cgi.docbook
index 5df94da13..5df94da13 100644
--- a/doc/kioslave/cgi.docbook
+++ b/doc/tdeioslave/cgi.docbook
diff --git a/doc/kioslave/data.docbook b/doc/tdeioslave/data.docbook
index ca0e4e9a5..ca0e4e9a5 100644
--- a/doc/kioslave/data.docbook
+++ b/doc/tdeioslave/data.docbook
diff --git a/doc/kioslave/file.docbook b/doc/tdeioslave/file.docbook
index 6d19b0436..6d19b0436 100644
--- a/doc/kioslave/file.docbook
+++ b/doc/tdeioslave/file.docbook
diff --git a/doc/kioslave/finger.docbook b/doc/tdeioslave/finger.docbook
index 27b278c48..b3678fc4d 100644
--- a/doc/kioslave/finger.docbook
+++ b/doc/tdeioslave/finger.docbook
@@ -24,7 +24,7 @@ you may find that you get no useful answer for most people.</para>
 hold such information as <acronym>PGP</acronym> keys, the fact they are
 on vacation, and all sorts of information.</para>
 
-<para>Use the finger kioslave like this:
+<para>Use the finger tdeioslave like this:
 <userinput>finger://<replaceable>username</replaceable>@<replaceable>hostname</replaceable></userinput></para>
 
 <para> See the manual: <ulink url="man:/finger">finger</ulink>.
diff --git a/doc/kioslave/fish.docbook b/doc/tdeioslave/fish.docbook
index 5063abd04..577199e8b 100644
--- a/doc/kioslave/fish.docbook
+++ b/doc/tdeioslave/fish.docbook
@@ -14,7 +14,7 @@
 
 <para>Allows you to access another computer's files using the SEcure Shell (<acronym>SSH</acronym>) protocol.  The remote computer needs to be running the <acronym>SSH</acronym> daemon, but the remainder of the protocol uses standard commandline tools as discussed below.</para>
 
-<para>You can use the fish kioslave like this:
+<para>You can use the fish tdeioslave like this:
 <userinput>fish://<replaceable>hostname</replaceable></userinput> or <userinput>fish://<replaceable>username</replaceable>@<replaceable>hostname</replaceable></userinput>.</para>
 
 <note><para>You need to use double forward slashes.</para></note>
diff --git a/doc/kioslave/floppy.docbook b/doc/tdeioslave/floppy.docbook
index 5a75ba25c..5a75ba25c 100644
--- a/doc/kioslave/floppy.docbook
+++ b/doc/tdeioslave/floppy.docbook
diff --git a/doc/kioslave/ftp.docbook b/doc/tdeioslave/ftp.docbook
index eb9e7056c..eb9e7056c 100644
--- a/doc/kioslave/ftp.docbook
+++ b/doc/tdeioslave/ftp.docbook
diff --git a/doc/kioslave/gopher.docbook b/doc/tdeioslave/gopher.docbook
index 29e418faf..29e418faf 100644
--- a/doc/kioslave/gopher.docbook
+++ b/doc/tdeioslave/gopher.docbook
diff --git a/doc/kioslave/gzip.docbook b/doc/tdeioslave/gzip.docbook
index 906f0d654..03a6b9964 100644
--- a/doc/kioslave/gzip.docbook
+++ b/doc/tdeioslave/gzip.docbook
@@ -9,19 +9,19 @@
 
 <para><command>gzip</command> is a compression program</para>
 
-<para>The gzip kioslave is not directly usable, and is intended for use
-as a filter.  For example, the tar kioslave can filter a file through
-the gzip kioslave, in order to display the contents of a <literal
+<para>The gzip tdeioslave is not directly usable, and is intended for use
+as a filter.  For example, the tar tdeioslave can filter a file through
+the gzip tdeioslave, in order to display the contents of a <literal
 role="extension">tar.gz</literal> file directly in a &konqueror;
 window.</para>
 
 <para>If you click on a file compressed with a <literal
-role="extension">gz</literal> extension in &konqueror;, this kioslave is
+role="extension">gz</literal> extension in &konqueror;, this tdeioslave is
 used to uncompress it and display it as a normal (uncompressed)
 file.</para>
 
 <para>If you are a developer, and would like to use the gzip filter, you
-can find documentation on using kioslaves at <ulink
+can find documentation on using tdeioslaves at <ulink
 url="http://developer.kde.org">http://developer.kde.org</ulink></para>
 
 <para> See the manual: <ulink url="man:/gzip">gzip</ulink>.
diff --git a/doc/kioslave/help.docbook b/doc/tdeioslave/help.docbook
index 43b806de8..43b806de8 100644
--- a/doc/kioslave/help.docbook
+++ b/doc/tdeioslave/help.docbook
diff --git a/doc/kioslave/http.docbook b/doc/tdeioslave/http.docbook
index d7cde38a2..535370b66 100644
--- a/doc/kioslave/http.docbook
+++ b/doc/tdeioslave/http.docbook
@@ -11,11 +11,11 @@
 <emphasis>H</emphasis>yper<emphasis>T</emphasis>ext
 <emphasis>T</emphasis>ransfer <emphasis>P</emphasis>rotocol.</para>
 
-<para>The http kioslave is used by all &tde; applications to handle
+<para>The http tdeioslave is used by all &tde; applications to handle
 connections to http servers, that is, web servers.  The most common
 usage is to view web pages in the &konqueror; web browser.</para>
 
-<para>You can use the http kioslave in &konqueror; by giving it a
+<para>You can use the http tdeioslave in &konqueror; by giving it a
 <acronym>URL</acronym>.  
 <userinput>http://<replaceable>www.kde.org</replaceable></userinput>.</para>
 
diff --git a/doc/kioslave/https.docbook b/doc/tdeioslave/https.docbook
index 38772f5dc..bbaa1b0a3 100644
--- a/doc/kioslave/https.docbook
+++ b/doc/tdeioslave/https.docbook
@@ -8,7 +8,7 @@
 </articleinfo>
 <para>
 HTTPS is 
-<ulink url="help:/kioslave/http.html">HTTP</ulink>
+<ulink url="help:/tdeioslave/http.html">HTTP</ulink>
  encapsulated in an SSL/TLS stream.
 </para>
 <para>
diff --git a/doc/kioslave/imap.docbook b/doc/tdeioslave/imap.docbook
index e34c1e4e9..8778877ce 100644
--- a/doc/kioslave/imap.docbook
+++ b/doc/tdeioslave/imap.docbook
@@ -19,7 +19,7 @@ everywhere. Messages can be stored on the server, retrieved from there or
 moved between folders.</para>
 
 <para>This plugin is currently mainly used by KMail, but you can also use it
-in any other KDE application that uses kioslave plugins.</para>
+in any other KDE application that uses tdeioslave plugins.</para>
 
 <para>For example in &konqueror;, simply type
 <userinput>imap://[email protected]/</userinput> to get your IMAP
diff --git a/doc/kioslave/imaps.docbook b/doc/tdeioslave/imaps.docbook
index d5f8e7b6f..fc046944c 100644
--- a/doc/kioslave/imaps.docbook
+++ b/doc/tdeioslave/imaps.docbook
@@ -11,7 +11,7 @@
  
 </articleinfo>
 
-<para>IMAPS is the <ulink url="help:/kioslave/imap.html">IMAP</ulink> protocol
+<para>IMAPS is the <ulink url="help:/tdeioslave/imap.html">IMAP</ulink> protocol
 encrypted via SSL.</para>
 
 </article>
diff --git a/doc/kioslave/index.docbook b/doc/tdeioslave/index.docbook
index 8a9672a5a..8a9672a5a 100644
--- a/doc/kioslave/index.docbook
+++ b/doc/tdeioslave/index.docbook
diff --git a/doc/kioslave/info.docbook b/doc/tdeioslave/info.docbook
index 1ea645c33..1ea645c33 100644
--- a/doc/kioslave/info.docbook
+++ b/doc/tdeioslave/info.docbook
diff --git a/doc/kioslave/lan.docbook b/doc/tdeioslave/lan.docbook
index c494b5767..ad75ce385 100644
--- a/doc/kioslave/lan.docbook
+++ b/doc/tdeioslave/lan.docbook
@@ -12,7 +12,7 @@ This protocol is intended to provide a kind of <quote>network
 neighborhood</quote> but only relying on the TCP/IP protocol stack and with 
 the ability to use other protocols than just <acronym>SMB</acronym>.</para>
 
-<para>The lan kioslave can use &FTP;, &HTTP;, <acronym>SMB</acronym>, 
+<para>The lan tdeioslave can use &FTP;, &HTTP;, <acronym>SMB</acronym>, 
 <acronym>NFS</acronym>, and <acronym>FISH</acronym></para>
 
 <para>It must first be configured in &kcontrol;, 
diff --git a/doc/kioslave/ldap.docbook b/doc/tdeioslave/ldap.docbook
index ff23339c3..48515751d 100644
--- a/doc/kioslave/ldap.docbook
+++ b/doc/tdeioslave/ldap.docbook
@@ -11,7 +11,7 @@
 protocol.  It provides access to an X.500 directory, or to a stand-alone
 <acronym>LDAP</acronym> server.</para>
 
-<para>You can use the ldap kioslave as follows:</para>
+<para>You can use the ldap tdeioslave as follows:</para>
 
 <para><userinput>ldap://host:port/ou=People,o=where,c=de??sub</userinput>
 for a subtree-query</para>
diff --git a/doc/kioslave/mac.docbook b/doc/tdeioslave/mac.docbook
index a0ea6d691..a0ea6d691 100644
--- a/doc/kioslave/mac.docbook
+++ b/doc/tdeioslave/mac.docbook
diff --git a/doc/kioslave/mailto.docbook b/doc/tdeioslave/mailto.docbook
index 3603aea8d..ac7fddd46 100644
--- a/doc/kioslave/mailto.docbook
+++ b/doc/tdeioslave/mailto.docbook
@@ -6,7 +6,7 @@
 <!-- TRANS:ROLES_OF_TRANSLATORS -->
 </authorgroup>
 </articleinfo>
-<para>The mailto kioslave is used when you click on a mailto link in an
+<para>The mailto tdeioslave is used when you click on a mailto link in an
 <acronym>HTML</acronym> page.  &konqueror; will open the preferred mail
 client you have configured, with a composer window.  Any information
 supplied in the <acronym>URL</acronym> will be filled in for you.</para>
diff --git a/doc/kioslave/man.docbook b/doc/tdeioslave/man.docbook
index 8f3324ff1..8f3324ff1 100644
--- a/doc/kioslave/man.docbook
+++ b/doc/tdeioslave/man.docbook
diff --git a/doc/kioslave/mrml.docbook b/doc/tdeioslave/mrml.docbook
index 6dcde8bd6..6dcde8bd6 100644
--- a/doc/kioslave/mrml.docbook
+++ b/doc/tdeioslave/mrml.docbook
diff --git a/doc/kioslave/news.docbook b/doc/tdeioslave/news.docbook
index c56e3a8e0..d13f2b715 100644
--- a/doc/kioslave/news.docbook
+++ b/doc/tdeioslave/news.docbook
@@ -8,7 +8,7 @@
 </articleinfo>
 
 
-<para>The news kioslave is used when you click on a news link on a web
+<para>The news tdeioslave is used when you click on a news link on a web
 page.  It will open &knode;, and if the group referred to in the news
 link is available from your server, it will subscribe you to the group, in
 the first available account you have configured in &knode;</para>
diff --git a/doc/kioslave/nfs.docbook b/doc/tdeioslave/nfs.docbook
index bbe9bb625..bbe9bb625 100644
--- a/doc/kioslave/nfs.docbook
+++ b/doc/tdeioslave/nfs.docbook
diff --git a/doc/kioslave/nntp.docbook b/doc/tdeioslave/nntp.docbook
index 7f213d2c4..20de8e952 100644
--- a/doc/kioslave/nntp.docbook
+++ b/doc/tdeioslave/nntp.docbook
@@ -6,10 +6,10 @@
 <!-- TRANS:ROLES_OF_TRANSLATORS -->
 </authorgroup>
 </articleinfo>
-<para>The nntp kioslave accesses <acronym>NNTP</acronym> servers
+<para>The nntp tdeioslave accesses <acronym>NNTP</acronym> servers
 directly.</para>
 
-<para>This kioslave can not be used with servers that do not implement
+<para>This tdeioslave can not be used with servers that do not implement
 the <command>GROUP</command> command, including some versions of the
 popular <application>INN</application> news server which is often used
 by <acronym>ISP</acronym>s.  It does work with
@@ -17,7 +17,7 @@ by <acronym>ISP</acronym>s.  It does work with
 offline cache of news articles on their own hard drive or within their
 <acronym>LAN</acronym>.</para>
 
-<para>You can use the nntp kioslave by typing
+<para>You can use the nntp tdeioslave by typing
 <userinput>nntp://yourserver/groupname</userinput> into the &konqueror;
 <acronym>URL</acronym> bar.</para>
 
diff --git a/doc/kioslave/pop3.docbook b/doc/tdeioslave/pop3.docbook
index 1c956a1cd..1c956a1cd 100644
--- a/doc/kioslave/pop3.docbook
+++ b/doc/tdeioslave/pop3.docbook
diff --git a/doc/kioslave/pop3s.docbook b/doc/tdeioslave/pop3s.docbook
index 856709e80..856709e80 100644
--- a/doc/kioslave/pop3s.docbook
+++ b/doc/tdeioslave/pop3s.docbook
diff --git a/doc/kioslave/print.docbook b/doc/tdeioslave/print.docbook
index 2af8dc134..fa102c3af 100644
--- a/doc/kioslave/print.docbook
+++ b/doc/tdeioslave/print.docbook
@@ -54,7 +54,7 @@ and a short explanation of what they represent:</para>
 
 <varlistentry>
 <term><userinput>print:/ </userinput> (&ie; the root of 
-print-kioslave)</term>
+print-tdeioslave)</term>
 <listitem>
 <para>  virtual root for browsing your print subsystem.
         It displays subfolders <quote>Classes</quote>,
diff --git a/doc/kioslave/rlan.docbook b/doc/tdeioslave/rlan.docbook
index b0d358aa0..b0d358aa0 100644
--- a/doc/kioslave/rlan.docbook
+++ b/doc/tdeioslave/rlan.docbook
diff --git a/doc/kioslave/rlogin.docbook b/doc/tdeioslave/rlogin.docbook
index 5568eeade..54e834e9f 100644
--- a/doc/kioslave/rlogin.docbook
+++ b/doc/tdeioslave/rlogin.docbook
@@ -9,14 +9,14 @@
 <para>Using &konqueror; you can start up an <command>rlogin</command>
 session with a server hosting the rlogin service.</para>
 
-<para>To use this kioslave feature, in the &konqueror;
+<para>To use this tdeioslave feature, in the &konqueror;
 <acronym>URL</acronym> bar, type
 <userinput>rlogin:/host_to_connect_to</userinput></para>
 
 <para>This will initialize &konsole; with an <command>rlogin</command>
 session, prompting you for your password.</para>
 
-<para>The <command>rlogin</command> kioslave uses the username of the
+<para>The <command>rlogin</command> tdeioslave uses the username of the
 account you are currently using in &tde;.</para>
 
 <para>After you have successfully entered your password, you can begin
diff --git a/doc/kioslave/sftp.docbook b/doc/tdeioslave/sftp.docbook
index ff2770a47..ff2770a47 100644
--- a/doc/kioslave/sftp.docbook
+++ b/doc/tdeioslave/sftp.docbook
diff --git a/doc/kioslave/smb.docbook b/doc/tdeioslave/smb.docbook
index 716db415f..ef7e9ac98 100644
--- a/doc/kioslave/smb.docbook
+++ b/doc/tdeioslave/smb.docbook
@@ -41,7 +41,7 @@ You can set your default user name and password in the &kcontrol; in
 <menuchoice><guisubmenu>Network</guisubmenu><guimenuitem>Windows
 Shares</guimenuitem></menuchoice>.  This is especially useful if you are a
 member of a &Windows; <acronym>NT</acronym> domain. There you can also set your
-workgroup name, but in most cases this is not required.  The kioslave will ask for your username and password if a default is not set.
+workgroup name, but in most cases this is not required.  The tdeioslave will ask for your username and password if a default is not set.
 </para>
 
 <para>
diff --git a/doc/kioslave/smtp.docbook b/doc/tdeioslave/smtp.docbook
index 2aa2c7dbf..2aa2c7dbf 100644
--- a/doc/kioslave/smtp.docbook
+++ b/doc/tdeioslave/smtp.docbook
diff --git a/doc/kioslave/tar.docbook b/doc/tdeioslave/tar.docbook
index 8a5405198..8a5405198 100644
--- a/doc/kioslave/tar.docbook
+++ b/doc/tdeioslave/tar.docbook
diff --git a/doc/kioslave/telnet.docbook b/doc/tdeioslave/telnet.docbook
index 9d2131e84..9d2131e84 100644
--- a/doc/kioslave/telnet.docbook
+++ b/doc/tdeioslave/telnet.docbook
diff --git a/doc/kioslave/thumbnail.docbook b/doc/tdeioslave/thumbnail.docbook
index 8ad0393b9..fb07fe5ac 100644
--- a/doc/kioslave/thumbnail.docbook
+++ b/doc/tdeioslave/thumbnail.docbook
@@ -6,23 +6,23 @@
 <!-- TRANS:ROLES_OF_TRANSLATORS -->
 </authorgroup>
 </articleinfo>
-<para>The thumbnail kioslave is used by &tde; for network transparent
+<para>The thumbnail tdeioslave is used by &tde; for network transparent
 and persistent generation of thumbnails.</para>
 
-<para>The thumbnail kioslave uses plugins to generate the actual
+<para>The thumbnail tdeioslave uses plugins to generate the actual
 thumbnails.  You can enable viewing of these thumbnails from the
 <menuchoice><guimenu>View</guimenu>
 <guisubmenu>Preview</guisubmenu></menuchoice> submenu, available in
 &konqueror; in file manager mode.</para>
 
-<para>The thumbnail kioslave is not directly useful to a user, but if
+<para>The thumbnail tdeioslave is not directly useful to a user, but if
 you are a developer, you can use it within your own applications to
 create file previews.</para>
 
 <para>See the documentation in the sources for more information.  You
 will find these at
-<filename>$<envar>TDEDIR</envar>/include/kio/thumbcreator.h</filename> or
+<filename>$<envar>TDEDIR</envar>/include/tdeio/thumbcreator.h</filename> or
 in the source folder <filename
-class="directory">tdebase/kioslave/thumbnail</filename></para>
+class="directory">tdebase/tdeioslave/thumbnail</filename></para>
 
 </article>
diff --git a/doc/kioslave/webdav.docbook b/doc/tdeioslave/webdav.docbook
index d549384f2..8f46546b0 100644
--- a/doc/kioslave/webdav.docbook
+++ b/doc/tdeioslave/webdav.docbook
@@ -13,7 +13,7 @@
 <emphasis>A</emphasis>uthoring and <emphasis>V</emphasis>ersioning
 protocol for the World Wide Web. It allows for easy management of
 documents and scripts on a <ulink
-url="help:/kioslave/webdav.html">http</ulink> server, and has
+url="help:/tdeioslave/webdav.html">http</ulink> server, and has
 additional features designed to simplify version management amongst
 multiple authors.</para>
 
@@ -60,6 +60,6 @@ such as the author.</para>
 <para>To take advantage of these additional capabilities, you will need an
 application which supports them. No application currently supports them 
 through
-this kioslave.</para>
+this tdeioslave.</para>
 
 </article>
diff --git a/doc/kioslave/webdavs.docbook b/doc/tdeioslave/webdavs.docbook
index edbd635e6..23dde138c 100644
--- a/doc/kioslave/webdavs.docbook
+++ b/doc/tdeioslave/webdavs.docbook
@@ -11,7 +11,7 @@
 
 </articleinfo>
 
-<para>WebDAVS is the <ulink url="help:/kioslave/webdav.html">WebDAV</ulink> protocol
+<para>WebDAVS is the <ulink url="help:/tdeioslave/webdav.html">WebDAV</ulink> protocol
 encrypted via SSL.</para>
 
 </article>
diff --git a/doc/tdeprint/highlights.docbook b/doc/tdeprint/highlights.docbook
index 4e8a0af91..840247afa 100644
--- a/doc/tdeprint/highlights.docbook
+++ b/doc/tdeprint/highlights.docbook
@@ -369,7 +369,7 @@ functions that were provided by <application>qtcups</application> and
 <para>Instead of <command>qtcups</command> you can now use the
 <command>kprinter</command> command.  And in place of
 <command>kups</command> you will probably use
-<command>kcmshell printers</command> from now on.
+<command>tdecmshell printers</command> from now on.
 </para>
 
 <para>The &tdeprint; module for &CUPS; also lets you fully administer
diff --git a/doc/tdeprint/tech-overview.docbook b/doc/tdeprint/tech-overview.docbook
index 79179b4fc..51e7cc988 100644
--- a/doc/tdeprint/tech-overview.docbook
+++ b/doc/tdeprint/tech-overview.docbook
@@ -220,7 +220,7 @@ you switch to other parts of the &kcontrol;</para></listitem>
 
 <listitem><para>from a command line (&konsole; or
 mini-<acronym>CLI</acronym>) type <userinput>
-<command>kcmshell</command> <option>printers</option></userinput>.
+<command>tdecmshell</command> <option>printers</option></userinput>.
 This opens just the &tdeprint; part of &kcontrol; to change your settings
 </para></listitem>
 </itemizedlist>
diff --git a/doc/userguide/groupware-kontact.docbook b/doc/userguide/groupware-kontact.docbook
index 8a1b81c00..66de1113a 100644
--- a/doc/userguide/groupware-kontact.docbook
+++ b/doc/userguide/groupware-kontact.docbook
@@ -335,7 +335,7 @@ slow data updates.</para>
 
 <para>Now we have to tell &kontact; to use <acronym>IMAP</acronym> as the
 data source for it's various components. From the &kmenu;, choose
-<guimenuitem>Run command</guimenuitem>, run <userinput><command>kcmshell
+<guimenuitem>Run command</guimenuitem>, run <userinput><command>tdecmshell
 tderesources</command></userinput>. In the combo box select
 <guilabel>Contacts</guilabel>, then press the <guibutton>Add...</guibutton>
 button, and choose <guilabel>Addressbook on IMAP Server via KMail</guilabel>. Then select that new line and
diff --git a/doc/userguide/tde-for-admins.docbook b/doc/userguide/tde-for-admins.docbook
index 872191714..665f3c287 100644
--- a/doc/userguide/tde-for-admins.docbook
+++ b/doc/userguide/tde-for-admins.docbook
@@ -830,7 +830,7 @@ Running...</computeroutput>. The arguments after <command>tdeinit</command>
 are the names of additional processes to be started.  The <token>+</token>
 indicates that <command>tdeinit</command> needs to wait till the process has
 finished.  <command>tdeinit</command> also starts
-<command>dcopserver</command>, <command>klauncher</command> and
+<command>dcopserver</command>, <command>tdelauncher</command> and
 <command>kded</command>.</para>
 
 <para>The second of the two lines asks <command>tdeinit</command> to start
@@ -871,11 +871,11 @@ needed</para>
 </varlistentry>
 
 <varlistentry>
-<term><command>klauncher</command></term>
+<term><command>tdelauncher</command></term>
 <listitem><para>Program launch (this is <emphasis>not</emphasis> the
 <keycombo action="simul">&Alt;<keycap>F2</keycap>
 </keycombo>dialog!)</para>
-<para>See <xref linkend="klauncher"/> for more information.</para>
+<para>See <xref linkend="tdelauncher"/> for more information.</para>
 </listitem>
 </varlistentry>
 
@@ -916,7 +916,7 @@ to see the actual program name:</para>
 <computeroutput>
 waba     23184  0.2  2.1 23428 11124 ?	S    21:41   0:00 tdeinit: Running...
 waba     23187  0.1  2.1 23200 11124 ?	S    21:41   0:00 tdeinit: dcopserver --nosid
-waba     23189  0.2  2.4 25136 12496 ?	S    21:41   0:00 tdeinit: klauncher
+waba     23189  0.2  2.4 25136 12496 ?	S    21:41   0:00 tdeinit: tdelauncher
 waba     23192  0.7  2.8 25596 14772 ?	S    21:41   0:00 tdeinit: kded
 waba     23203  0.8  3.4 31516 17892 ?	S    21:41   0:00 tdeinit:
 knotify
@@ -928,7 +928,7 @@ master <command>tdeinit</command> process. The other processes listed are
 programs started as <acronym>KLM</acronym>s.</para>
 
 <para>When <command>tdeinit</command> starts for the first time it will
-launch <command>dcopserver</command>, <command>klauncher</command>, and
+launch <command>dcopserver</command>, <command>tdelauncher</command>, and
 <command>kded</command>, as well as any additional programs specified on its
 command line in the <command>starttde</command> script, normally
 <command>kcminit</command> and <command>knotify</command>.</para>
@@ -980,7 +980,7 @@ applications or services via the <varname>X-TDE-Init</varname> line:</para>
 <programlisting>
 [Desktop Entry]
 Encoding=UTF-8
-Exec=kcmshell energy
+Exec=tdecmshell energy
 Icon=energy_star
 Type=Application
 X-TDE-Library=energy
@@ -999,21 +999,21 @@ startup problems.</para>
 
 </sect2>
 
-<sect2 id="klauncher">
-<title><command>klauncher</command></title>
+<sect2 id="tdelauncher">
+<title><command>tdelauncher</command></title>
 
-<para><command>klauncher</command> is a daemon which is responsible for
+<para><command>tdelauncher</command> is a daemon which is responsible for
 service activation within &tde;. It operates in close connection with the
 <command>tdeinit</command> master process to start new processes. &tde;
-applications communicate with <command>klauncher</command> over &DCOP; in
+applications communicate with <command>tdelauncher</command> over &DCOP; in
 order to start new applications or services.</para>
 
 <para>Best known from the error message: <computeroutput><errortext>
 KLauncher could not be reached via DCOP </errortext></computeroutput> which
 either indicates a serious problem with the <command>dcopserver</command> or
-that <command>klauncher</command> crashed.</para>
+that <command>tdelauncher</command> crashed.</para>
 
-<para><command>klauncher</command> can be restarted by restarting
+<para><command>tdelauncher</command> can be restarted by restarting
 <command>tdeinit</command> from a console window. Make sure that
 $<envar>HOME</envar>, $<envar>DISPLAY</envar> and the various
 $<envar>TDEDIR(S)</envar> are set correctly when doing so!</para>
@@ -1190,7 +1190,7 @@ on a multi-head system.</para>
 <listitem><para>Set this variable to spawn
 <acronym>KIO</acronym>-slaves directly from the application process
 itself. By default <acronym>KIO</acronym>-slaves are spawned using
-<command>klauncher</command>/<command>tdeinit</command>. This option is
+<command>tdelauncher</command>/<command>tdeinit</command>. This option is
 useful if the <acronym>KIO</acronym>-slave should run in the same
 environment as the application. This can be the case with
 <application>Clearcase</application>.</para>
@@ -1323,7 +1323,7 @@ output of <command>top</command> and <command>ps</command>. Use
 <computeroutput>
 bastian  26061  0.0  2.2 24284 11492 ?       S    21:27   0:00 tdeinit: Running...
 bastian  26064  0.0  2.2 24036 11524 ?       S    21:27   0:00 tdeinit: dcopserver
-bastian  26066  0.1  2.5 26056 12988 ?       S    21:27   0:00 tdeinit: klauncher
+bastian  26066  0.1  2.5 26056 12988 ?       S    21:27   0:00 tdeinit: tdelauncher
 bastian  26069  0.4  3.2 27356 16744 ?       S    21:27   0:00 tdeinit: kded
 bastian  26161  0.2  2.7 25344 14096 ?       S    21:27   0:00 tdeinit: ksmserver
 bastian  26179  1.1  3.4 29716 17812 ?       S    21:27   0:00 tdeinit: kicker
@@ -1619,7 +1619,7 @@ class="directory">/opt/trinity/share/config/SuSE/default/</filename></para></lis
 </sect2>
 </sect1>
 
-<sect1 id="kde-menu">
+<sect1 id="tde-menu">
 <title>&tde; Menu</title>
 
 <sect2 id="how-it-works">
@@ -1824,7 +1824,7 @@ class="directory">$<envar>HOME</envar>/.trinity/share/applnk</filename>
 <para><application>KSycoca</application> caches menu structure and
 information about all available applications. You can rebuild the
 database with
-<userinput><command>kbuildsycoca</command></userinput>. The database
+<userinput><command>tdebuildsycoca</command></userinput>. The database
 which is built lives in <filename
 class="directory">/var/tmp/tdecache-${<envar>USER</envar>}/tdesycoca</filename>.
 It is automatically updated by <application>KDED</application>,
@@ -2281,13 +2281,13 @@ as part of the <guilabel>Configure Konqueror</guilabel> dialog in
 &konqueror;</para>
 
 <para>Individual configuration modules can be started with
-<command>kcmshell</command> <replaceable>module</replaceable></para>
+<command>tdecmshell</command> <replaceable>module</replaceable></para>
 
 <para>To start the Proxy module use:</para>
 <itemizedlist>
-<listitem><para><command>kcmshell</command>
+<listitem><para><command>tdecmshell</command>
 <filename>tde-proxy.desktop</filename></para></listitem>
-<listitem><para><command>kcmshell</command> proxy</para></listitem>
+<listitem><para><command>tdecmshell</command> proxy</para></listitem>
 </itemizedlist>
 
 <para><note><para>Not all applications use configuration modules, often the
@@ -2306,14 +2306,14 @@ class="directory">$<envar>TDEDIR</envar>/share/applications/tde</filename>
 and are sorted under the hidden <guimenu>Settings-Modules</guimenu> menu by
 the <filename>kde-settings.menu</filename>, included from
 <filename>kde-essential.menu</filename></para>
-<screen><userinput><command>kbuildsycoca</command> <option>--menutest</option> 2&gt; /dev/null | <command>grep</command> Settings-Modules</userinput></screen>
+<screen><userinput><command>tdebuildsycoca</command> <option>--menutest</option> 2&gt; /dev/null | <command>grep</command> Settings-Modules</userinput></screen>
 </listitem>
 <listitem>
 <para>Application specific modules normally have a <literal role="extension">.desktop</literal> file under
 <filename>$<envar>TDEDIR</envar>/share/applnk/.hidden</filename> which
 corresponds to the hidden .hidden menu, included as a result of
 <markup>&lt;KDELegacyDirs/&gt;</markup></para>
-<screen><userinput><command>kbuildsycoca</command> <option>--menutest</option> 2&gt; /dev/null | <command>grep</command> .hidden</userinput></screen>
+<screen><userinput><command>tdebuildsycoca</command> <option>--menutest</option> 2&gt; /dev/null | <command>grep</command> .hidden</userinput></screen>
 </listitem>
 <listitem><para>In &tde; 3.3 it is possible to edit the Control Center with
 <application>kcontroledit</application>.
@@ -2481,7 +2481,7 @@ konsole-8954
 <para>One &konsole; is running with a <acronym>PID</acronym> of 8954.</para>
 
 <screen><prompt>&percnt; </prompt><userinput><command>dcop</command><option> konsole-8954</option></userinput>
-KBookmarkManager-.../share/apps/kfile/bookmarks.xml
+KBookmarkManager-.../share/apps/tdefile/bookmarks.xml
 KBookmarkManager-.../share/apps/konqueror/bookmarks.xml
 KBookmarkNotifier
 KDebug