diff --git a/NEWS b/NEWS
index ca87f2e..058836f 100644
--- a/NEWS
+++ b/NEWS
@@ -3,7 +3,7 @@ kommando (0.5.1-1) unstable; urgency=low
   * Kommando is now a kded module. This means that there is no kommando binary
     and kommando is configured through kcontrol.
 
-  * To start and stop kommando, go to kcontrol > KDE Components > Service Manager
+  * To start and stop kommando, go to kcontrol > TDE Components > Service Manager
     and choose start and stop and wether kommando should start with kde.
 
   * To configure kommando, go to kcontrol > Desktop > kommando
diff --git a/README b/README
index 31e1edc..bb57e81 100644
--- a/README
+++ b/README
@@ -41,11 +41,11 @@ to hide it use "hide" instead of show and if you are lazy you can just use "togg
 DCOP Calls are most useful, if you try to invoke Kommando through an external application, that is only able to start execute console commands.
 
 KNOWN ISSUES/ PLANNED FEATURES:
- - Kommando does not respect the screen border and kicker, so if you invoke it close to one of both, some buttons will be obscured (on my KDE 3.5 box this problem does not exist anymore, but there are some graphics artifacts in the background image)
+ - Kommando does not respect the screen border and kicker, so if you invoke it close to one of both, some buttons will be obscured (on my TDE 3.5 box this problem does not exist anymore, but there are some graphics artifacts in the background image)
 
 A final statement?
 
 Yes, if you have any suggestions/enhancements/criticism or found a nasty bug please let me know!
 the_docter@gmx.net
 
-Thanks for using Kommando ;-)
\ No newline at end of file
+Thanks for using Kommando ;-)
diff --git a/doc/en/index.docbook b/doc/en/index.docbook
index 5ce98bc..524ebbb 100644
--- a/doc/en/index.docbook
+++ b/doc/en/index.docbook
@@ -23,7 +23,7 @@ with lots of help from: Eric Bischoff ebisch@cybercable.tm.fr
 and Frederik Fouvry fouvry@sfs.nphil.uni-tuebingen.de
 of the KDE DocBook team.
 
-You may freely use this template for writing any sort of KDE documentation.
+You may freely use this template for writing any sort of TDE documentation.
 If you have any changes or improvements, please let us know.
 
 Remember:
@@ -89,11 +89,11 @@ ever want.
 </abstract>
 
 <!-- This is a set of Keywords for indexing by search engines.
-Please at least include KDE, the KDE package it is in, the name
+Please at least include TDE, the TDE package it is in, the name
  of your application, and a few relevant keywords. -->
 
 <keywordset>
-<keyword>KDE</keyword>
+<keyword>TDE</keyword>
 <keyword>Kommando</keyword>
 <keyword>nothing</keyword>
 <keyword>nothing else</keyword>
@@ -108,7 +108,7 @@ document, and if there is no ID, the name of the generated HTML files will vary
 from time to time making it hard to manage for maintainers and for the CVS
 system. Any chapter labelled (OPTIONAL) may be left out at the author's
 discretion. Other chapters should not be left out in order to maintain a
-consistent documentation style across all KDE apps. -->
+consistent documentation style across all TDE apps. -->
 
 <chapter id="introduction">
 <title>Introduction</title>
@@ -230,7 +230,7 @@ or menu bars. -->
 <title>The <guimenu>Help</guimenu> Menu</title>
 
 <!-- Assuming you have a standard help menu (help, what's this, about -->
-<!-- &kommando;, about KDE) then the documentation is already written. -->
+<!-- &kommando;, about TDE) then the documentation is already written. -->
 <!-- The following entity is valid anywhere that a variablelist is -->
 <!-- valid.  -->
 
@@ -427,7 +427,7 @@ installed.</para>
 
 <!-- Include credits for the programmers, documentation writers, and
 contributors here. The license for your software should then be included below
-the credits with a reference to the appropriate license file included in the KDE
+the credits with a reference to the appropriate license file included in the TDE
 distribution. -->
 
 <title>Credits and License</title>
@@ -441,7 +441,7 @@ Program copyright 2005 Daniel Stöckel <email>the_docter@gmx.net</email>
 <para>
 Contributors:
 <itemizedlist>
-<listitem><para>Kontqui the KDE Dragon <email>konqui@kde.org</email></para>
+<listitem><para>Konqui the KDE Dragon <email>konqui@kde.org</email></para>
 </listitem>
 <listitem><para>Tux the Linux Penguin <email>tux@linux.org</email></para>
 </listitem>
@@ -476,7 +476,7 @@ Documentation copyright 2005 Daniel Stöckel <email>the_docter@gmx.net</email>
 <title>How to obtain &kommando;</title>
 
 <!-- This first entity contains boiler plate for applications that are
-part of KDE CVS.  You should remove it if you are releasing your
+part of TDE CVS.  You should remove it if you are releasing your
 application --> 
 
 &install.intro.documentation;
diff --git a/doc/man/kommando.1 b/doc/man/kommando.1
index 06945fc..8d7c76c 100644
--- a/doc/man/kommando.1
+++ b/doc/man/kommando.1
@@ -4,9 +4,9 @@
 Qt: \- kommando
 .SH SYNOPSIS
 .B kommando
-[\fIQt-options\fR] [\fIKDE-options\fR]
+[\fIQt-options\fR] [\fITDE-options\fR]
 .SH DESCRIPTION
-A wheelmenu for KDE powerusers which pops up and gives easy access to start some favorite programs with the mouse.
+A wheelmenu for TDE powerusers which pops up and gives easy access to start some favorite programs with the mouse.
 .br
 Kommando is configured by a xml-based file format in ~/.kde/share/apps/kommando/kommandorc which can be edited manually or through kommando configuration interface. If no kommandorc-file is found, the configuration interface will appear on program start. In kommando 0.3 the configuration file was ~/.kommandorc
 .br
@@ -20,7 +20,7 @@ Show help about options
 Show Qt specific options
 .TP
 \fB\-\-help\-kde\fR
-Show KDE specific options
+Show TDE specific options
 .TP
 \fB\-\-help\-all\fR
 Show all options
@@ -98,7 +98,7 @@ disable XIM
 .TP
 \fB\-\-reverse\fR
 mirrors the whole layout of widgets
-.SS "KDE options:"
+.SS "TDE options:"
 .TP
 \fB\-\-caption\fR <caption>
 Use 'caption' as name in the titlebar
diff --git a/src/kcmkommando.cpp b/src/kcmkommando.cpp
index 6decdb5..4bd597f 100644
--- a/src/kcmkommando.cpp
+++ b/src/kcmkommando.cpp
@@ -31,7 +31,7 @@
 #include "configuration.h"
 
 static const char description[] =
-    I18N_NOOP("A wheelmenu for KDE powerusers");
+    I18N_NOOP("A wheelmenu for TDE powerusers");
 
 static const char version[] = "0.5.2";
 
diff --git a/src/kommandod.desktop b/src/kommandod.desktop
index c403f0c..44930ad 100644
--- a/src/kommandod.desktop
+++ b/src/kommandod.desktop
@@ -10,4 +10,4 @@ X-TDE-Kded-autoload=true
 X-TDE-Kded-load-on-demand=false
 
 Name=Kommando
-Comment=A WheelMenu for KDE
+Comment=A WheelMenu for TDE