diff --git a/kdoctools/customization/kde-chunk-online.xsl b/kdoctools/customization/kde-chunk-online.xsl
index bd6371c6b..5bcae5f59 100644
--- a/kdoctools/customization/kde-chunk-online.xsl
+++ b/kdoctools/customization/kde-chunk-online.xsl
@@ -8,7 +8,7 @@
 <xsl:include href="kde-style.xsl"/>
 <xsl:output encoding="utf-8"/>
 
-<xsl:variable name="KDE_VERSION">1.13</xsl:variable> 
+<xsl:variable name="TDE_VERSION">1.13</xsl:variable> 
 
 <xsl:template name="make-relative-filename">
   <xsl:param name="base.dir" select="'./'"/>
@@ -64,7 +64,7 @@
 
 <xsl:template name="user.head.content">
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> 
-   <meta name="GENERATOR" content="KDE XSL Stylesheet V{$KDE_VERSION} using libxslt"/>
+   <meta name="GENERATOR" content="KDE XSL Stylesheet V{$TDE_VERSION} using libxslt"/>
 </xsl:template>
 
 <!-- try with olinks: it nearly works --><!--
diff --git a/kdoctools/customization/kde-chunk.xsl b/kdoctools/customization/kde-chunk.xsl
index a0fa63b01..6a6ec38a0 100644
--- a/kdoctools/customization/kde-chunk.xsl
+++ b/kdoctools/customization/kde-chunk.xsl
@@ -7,7 +7,7 @@
 <xsl:include href="kde-ttlpg.xsl"/>
 <xsl:include href="kde-style.xsl"/>
 
-<xsl:variable name="KDE_VERSION">1.13</xsl:variable> 
+<xsl:variable name="TDE_VERSION">1.13</xsl:variable> 
 
 <xsl:template name="make-relative-filename">
   <xsl:param name="base.dir" select="'./'"/>
@@ -84,7 +84,7 @@ set       toc,title
 
 <xsl:template name="user.head.content">
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> 
-   <meta name="GENERATOR" content="KDE XSL Stylesheet V{$KDE_VERSION} using libxslt"/>
+   <meta name="GENERATOR" content="KDE XSL Stylesheet V{$TDE_VERSION} using libxslt"/>
 </xsl:template>
 
 <!-- try with olinks: it nearly works --><!--
diff --git a/kdoctools/customization/kde-nochunk.xsl b/kdoctools/customization/kde-nochunk.xsl
index 6ab909828..bd249a603 100644
--- a/kdoctools/customization/kde-nochunk.xsl
+++ b/kdoctools/customization/kde-nochunk.xsl
@@ -7,7 +7,7 @@
 <xsl:include href="kde-ttlpg.xsl"/>
 <xsl:include href="kde-style.xsl"/>
 
-<xsl:variable name="KDE_VERSION">1.13</xsl:variable> 
+<xsl:variable name="TDE_VERSION">1.13</xsl:variable> 
 
 <xsl:param name="using.chunker">0</xsl:param>
 <xsl:param name="chunk.first.sections" select="0"/>
@@ -42,7 +42,7 @@
 
 <xsl:template name="user.head.content">
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> 
-   <meta name="GENERATOR" content="KDE XSL Stylesheet V{$KDE_VERSION} using libxslt"/>
+   <meta name="GENERATOR" content="KDE XSL Stylesheet V{$TDE_VERSION} using libxslt"/>
 </xsl:template>
 
 <!-- try with olinks: it nearly works --><!--
diff --git a/kdoctools/customization/kde-web.xsl b/kdoctools/customization/kde-web.xsl
index f85648a39..938f442d1 100644
--- a/kdoctools/customization/kde-web.xsl
+++ b/kdoctools/customization/kde-web.xsl
@@ -7,7 +7,7 @@
 <xsl:include href="kde-ttlpg.xsl"/>
 <xsl:include href="kde-style.xsl"/>
 
-<xsl:variable name="KDE_VERSION">1.13</xsl:variable> 
+<xsl:variable name="TDE_VERSION">1.13</xsl:variable> 
 
 <xsl:template name="make-relative-filename">
   <xsl:param name="base.dir" select="'./'"/>
@@ -63,7 +63,7 @@
 
 <xsl:template name="user.head.content">
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> 
-   <meta name="GENERATOR" content="KDE XSL Stylesheet V{$KDE_VERSION} using libxslt"/>
+   <meta name="GENERATOR" content="KDE XSL Stylesheet V{$TDE_VERSION} using libxslt"/>
 </xsl:template>
 
 <!-- try with olinks: it nearly works --><!--
diff --git a/khtml/khtmlview.cpp b/khtml/khtmlview.cpp
index c895df5f6..80f031fe2 100644
--- a/khtml/khtmlview.cpp
+++ b/khtml/khtmlview.cpp
@@ -2788,7 +2788,7 @@ void KHTMLView::print(bool quick)
         viewport()->setCursor( tqwaitCursor ); // only viewport(), no TQApplication::, otherwise we get the busy cursor in tdeprint's dialogs
         // set up KPrinter
         printer->setFullPage(false);
-        printer->setCreator(TQString("KDE %1.%2.%3 HTML Library").arg(KDE_VERSION_MAJOR).arg(KDE_VERSION_MINOR).arg(KDE_VERSION_RELEASE));
+        printer->setCreator(TQString("KDE %1.%2.%3 HTML Library").arg(TDE_VERSION_MAJOR).arg(TDE_VERSION_MINOR).arg(TDE_VERSION_RELEASE));
         printer->setDocName(docname);
 
         TQPainter *p = new TQPainter;
diff --git a/kimgio/eps.cpp b/kimgio/eps.cpp
index e4308b0f7..a2770cc75 100644
--- a/kimgio/eps.cpp
+++ b/kimgio/eps.cpp
@@ -251,7 +251,7 @@ KDE_EXPORT void kimgio_eps_write( TQImageIO *imageio )
   TQPainter p;
 
   // making some definitions (papersize, output to file, filename):
-  psOut.setCreator( "KDE " KDE_VERSION_STRING  );
+  psOut.setCreator( "KDE " TDE_VERSION_STRING  );
   psOut.setOutputToFile( true );
 
   // Extension must be .eps so that Qt generates EPS file
diff --git a/kio/kio/kprotocolmanager.cpp b/kio/kio/kprotocolmanager.cpp
index 40aa7b236..9d24886da 100644
--- a/kio/kio/kprotocolmanager.cpp
+++ b/kio/kio/kprotocolmanager.cpp
@@ -73,7 +73,7 @@ KProtocolManagerPrivate::~KProtocolManagerPrivate()
 // DEFAULT USERAGENT STRING
 #define CFG_DEFAULT_UAGENT(X) \
 TQString("Mozilla/5.0 (compatible; Konqueror/%1.%2%3) KHTML/%4.%5.%6 (like Gecko)") \
-        .arg(KDE_VERSION_MAJOR).arg(KDE_VERSION_MINOR).arg(X).arg(KDE_VERSION_MAJOR).arg(KDE_VERSION_MINOR).arg(KDE_VERSION_RELEASE)
+        .arg(TDE_VERSION_MAJOR).arg(TDE_VERSION_MINOR).arg(X).arg(TDE_VERSION_MAJOR).arg(TDE_VERSION_MINOR).arg(TDE_VERSION_RELEASE)
 
 void KProtocolManager::reparseConfiguration()
 {
diff --git a/tdecore/kcmdlineargs.cpp b/tdecore/kcmdlineargs.cpp
index 10793b739..f6b308b93 100644
--- a/tdecore/kcmdlineargs.cpp
+++ b/tdecore/kcmdlineargs.cpp
@@ -594,7 +594,7 @@ KCmdLineArgs::parseAllArgs()
                    (::qstrcmp(option, "v") == 0))
          {
             printQ( TQString("Qt: %1\n").arg(qVersion()));
-            printQ( TQString("KDE: %1\n").arg(KDE_VERSION_STRING));
+            printQ( TQString("KDE: %1\n").arg(TDE_VERSION_STRING));
             printQ( TQString("%1: %2\n").
       arg(about->programName()).arg(about->version()));
             exit(0);
diff --git a/tdecore/kde-config.cpp.cmake b/tdecore/kde-config.cpp.cmake
index 867e43789..1f093fa91 100644
--- a/tdecore/kde-config.cpp.cmake
+++ b/tdecore/kde-config.cpp.cmake
@@ -156,7 +156,7 @@ int main(int argc, char **argv)
 
     if (args->isSet("version"))
     {
-        printf("%s\n", KDE_VERSION_STRING);
+        printf("%s\n", TDE_VERSION_STRING);
         return 0;
     }
 
diff --git a/tdecore/kde-config.cpp.in b/tdecore/kde-config.cpp.in
index ec9f24133..2f56483cd 100644
--- a/tdecore/kde-config.cpp.in
+++ b/tdecore/kde-config.cpp.in
@@ -156,7 +156,7 @@ int main(int argc, char **argv)
 
     if (args->isSet("version"))
     {
-        printf("%s\n", KDE_VERSION_STRING);
+        printf("%s\n", TDE_VERSION_STRING);
         return 0;
     }
 
diff --git a/tdecore/kdeversion.cpp b/tdecore/kdeversion.cpp
index 807618244..8ff80a6bb 100644
--- a/tdecore/kdeversion.cpp
+++ b/tdecore/kdeversion.cpp
@@ -21,26 +21,26 @@
 
 unsigned int KDE::version()
 {
-    return KDE_VERSION;
+    return TDE_VERSION;
 }
 
 unsigned int KDE::versionMajor()
 {
-    return KDE_VERSION_MAJOR;
+    return TDE_VERSION_MAJOR;
 }
 
 unsigned int KDE::versionMinor()
 {
-    return KDE_VERSION_MINOR;
+    return TDE_VERSION_MINOR;
 }
 
 unsigned int KDE::versionRelease()
 {
-    return KDE_VERSION_RELEASE;
+    return TDE_VERSION_RELEASE;
 }
 
 const char *KDE::versionString()
 {
-    return KDE_VERSION_STRING;
+    return TDE_VERSION_STRING;
 }
 
diff --git a/tdecore/kdeversion.h b/tdecore/kdeversion.h
index 22027fb4f..1d087bb4c 100644
--- a/tdecore/kdeversion.h
+++ b/tdecore/kdeversion.h
@@ -17,21 +17,21 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef _KDE_VERSION_H_
-#define _KDE_VERSION_H_
+#ifndef _TDE_VERSION_H_
+#define _TDE_VERSION_H_
 
 #include "kdelibs_export.h"
 
-#define KDE_VERSION_STRING "3.5.13"
-#define KDE_VERSION_MAJOR 3
-#define KDE_VERSION_MINOR 5
-#define KDE_VERSION_RELEASE 13
+#define TDE_VERSION_STRING "3.5.13"
+#define TDE_VERSION_MAJOR 3
+#define TDE_VERSION_MINOR 5
+#define TDE_VERSION_RELEASE 13
 #define KDE_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c))
 
-#define KDE_VERSION \
-  KDE_MAKE_VERSION(KDE_VERSION_MAJOR,KDE_VERSION_MINOR,KDE_VERSION_RELEASE)
+#define TDE_VERSION \
+  KDE_MAKE_VERSION(TDE_VERSION_MAJOR,TDE_VERSION_MINOR,TDE_VERSION_RELEASE)
 
-#define KDE_IS_VERSION(a,b,c) ( KDE_VERSION >= KDE_MAKE_VERSION(a,b,c) )
+#define KDE_IS_VERSION(a,b,c) ( TDE_VERSION >= KDE_MAKE_VERSION(a,b,c) )
 
 /**
  * Namespace for general KDE functions.
@@ -39,7 +39,7 @@
 namespace KDE
 {
     /**
-     * Returns the encoded number of KDE's version, see the KDE_VERSION macro.
+     * Returns the encoded number of KDE's version, see the TDE_VERSION macro.
      * In contrary to that macro this function returns the number of the actully
      * installed KDE version, not the number of the KDE version that was
      * installed when the program was compiled.
@@ -76,4 +76,4 @@ namespace KDE
     TDECORE_EXPORT const char *versionString();
 }
 
-#endif // _KDE_VERSION_H_
+#endif // _TDE_VERSION_H_
diff --git a/tdeui/kaboutdialog.cpp b/tdeui/kaboutdialog.cpp
index b4587dda5..e67d46840 100644
--- a/tdeui/kaboutdialog.cpp
+++ b/tdeui/kaboutdialog.cpp
@@ -702,7 +702,7 @@ void KAboutContainerBase::setProduct( const TQString &appName,
     kdDebug(291) << "no kapp" << endl;
 
   const TQString msg1 = i18n("%1 %2 (Using Trinity %3)").arg(appName).arg(version).
-    arg(TQString::fromLatin1(KDE_VERSION_STRING));
+    arg(TQString::fromLatin1(TDE_VERSION_STRING));
   const TQString msg2 = !year.isEmpty() ? i18n("%1 %2, %3").arg('©').arg(year).
     arg(author) : TQString::fromLatin1("");
 
diff --git a/tdeui/kaboutkde.cpp b/tdeui/kaboutkde.cpp
index b520e8380..7ac9b7193 100644
--- a/tdeui/kaboutkde.cpp
+++ b/tdeui/kaboutkde.cpp
@@ -77,7 +77,7 @@ KAboutKDE::KAboutKDE( TQWidget *parent, const char *name, bool modal )
     "<br><br>Thank you very much in advance for your support!");
   setHelp( TQString::tqfromLatin1("khelpcenter/main.html"), TQString::null );
   setTitle(i18n("Trinity Desktop Environment. Release %1").
-	   arg(TQString::tqfromLatin1(KDE_VERSION_STRING)) );
+	   arg(TQString::tqfromLatin1(TDE_VERSION_STRING)) );
   addTextPage( i18n("About Trinity","&About"), text1, true );
   addTextPage( i18n("&Report Bugs or Wishes"), text2, true );
   addTextPage( i18n("&Join the Trinity Team"), text3, true );
diff --git a/tdeui/kbugreport.cpp b/tdeui/kbugreport.cpp
index 0e0f6450d..e06e05c64 100644
--- a/tdeui/kbugreport.cpp
+++ b/tdeui/kbugreport.cpp
@@ -179,7 +179,7 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const KAboutData *aboutD
       m_strVersion = m_aboutData->version();
   else
       m_strVersion = i18n("no version set (programmer error!)");
-  d->kde_version = TQString::tqfromLatin1( KDE_VERSION_STRING );
+  d->kde_version = TQString::tqfromLatin1( TDE_VERSION_STRING );
   d->kde_version += ", " + TQString::tqfromLatin1( KDE_DISTRIBUTION_TEXT );
   if ( !d->submitBugButton )
       m_strVersion += " " + d->kde_version;