diff --git a/configure.py b/configure.py
index b4d6809..3ef3964 100644
--- a/configure.py
+++ b/configure.py
@@ -333,13 +333,13 @@ def getKDEVersion (versFile):
     while not ok and l:
         wl = string.split(l)
         if len(wl) == 3 and wl[0] == "#define":
-            if wl[1] == "KDE_VERSION_MAJOR":
+            if wl[1] == "TDE_VERSION_MAJOR":
                 major = string.strip (wl[2])
 
-            if wl[1] == "KDE_VERSION_MINOR":
+            if wl[1] == "TDE_VERSION_MINOR":
                 minor = string.strip (wl[2])
 
-            if wl[1] == "KDE_VERSION_RELEASE":
+            if wl[1] == "TDE_VERSION_RELEASE":
                 micro = string.strip (wl[2])
 
         if major and minor and micro:
diff --git a/sip/kfile/kfiledetailview.sip b/sip/kfile/kfiledetailview.sip
index 0528e3d..6aa2953 100644
--- a/sip/kfile/kfiledetailview.sip
+++ b/sip/kfile/kfiledetailview.sip
@@ -135,13 +135,13 @@ private:
     static sipStringTypeClassMap map[] = {
         {sipName_KApplicationPropsPlugin, &sipClass_KApplicationPropsPlugin},
         {sipName_KApplicationPropsPlugin, &sipClass_KApplicationPropsPlugin},
-#if KDE_VERSION < 310
+#if TDE_VERSION < 310
 //        {sipName_KApplicationTree,        &sipClass_KApplicationTree},
 #endif
         {sipName_KBindingPropsPlugin,     &sipClass_KBindingPropsPlugin},
         {sipName_KBindingPropsPlugin,     &sipClass_KBindingPropsPlugin},
         {sipName_KCombiView,              &sipClass_KCombiView},
-#if KDE_VERSION >= 0x030100
+#if TDE_VERSION >= 0x030100
         {sipName_KCustomMenuEditor,       &sipClass_KCustomMenuEditor},
 #endif
         {sipName_KDevicePropsPlugin,      &sipClass_KDevicePropsPlugin},
@@ -149,7 +149,7 @@ private:
         {sipName_KDirOperator,            &sipClass_KDirOperator},
         {sipName_KDirSelectDialog,        &sipClass_KDirSelectDialog},
         {sipName_KDirSize,                &sipClass_KDirSize},
-#if KDE_VERSION >= 0x030100
+#if TDE_VERSION >= 0x030100
         {sipName_KDiskFreeSp,             &sipClass_KDiskFreeSp},
 #endif
         {sipName_KExecPropsPlugin,        &sipClass_KExecPropsPlugin},
@@ -163,7 +163,7 @@ private:
         {sipName_KFilePreview,            &sipClass_KFilePreview},
         {sipName_KFilePropsPlugin,        &sipClass_KFilePropsPlugin},
         {sipName_KFilePropsPlugin,        &sipClass_KFilePropsPlugin},
-#if KDE_VERSION >= 0x030100
+#if TDE_VERSION >= 0x030100
         {sipName_KFileSharePropsPlugin,   &sipClass_KFileSharePropsPlugin},
 #endif
         {sipName_KFileTreeBranch,         &sipClass_KFileTreeBranch},
@@ -174,10 +174,10 @@ private:
         {sipName_KIconCanvas,             &sipClass_KIconCanvas},
         {sipName_KIconDialog,             &sipClass_KIconDialog},
         {sipName_KImageFilePreview,       &sipClass_KImageFilePreview},
-#if KDE_VERSION >= 0x030100
+#if TDE_VERSION >= 0x030100
         {sipName_KNotifyDialog,           &sipClass_KNotifyDialog},
         {sipName_KNotifyWidget,           &sipClass_KNotify_KNotifyWidget},
-#if KDE_VERSION < 0x030200
+#if TDE_VERSION < 0x030200
         {sipName_KNotifyWidgetBase,       &sipClass_KNotifyWidgetBase},
 #endif
 #endif
diff --git a/sip/kio/ksycoca.sip b/sip/kio/ksycoca.sip
index 32c960d..959fde8 100644
--- a/sip/kio/ksycoca.sip
+++ b/sip/kio/ksycoca.sip
@@ -112,7 +112,7 @@ protected:
         {sipName_ChmodJob,                &sipClass_KIO_ChmodJob},
         {sipName_Connection,              &sipClass_KIO_Connection},
         {sipName_CopyJob,                 &sipClass_KIO_CopyJob},
-#if KDE_VERSION >= 0x030100
+#if TDE_VERSION >= 0x030100
         {sipName_DavJob,                  &sipClass_KIO_DavJob},
 #endif
         {sipName_DefaultProgress,         &sipClass_KIO_DefaultProgress},
@@ -141,7 +141,7 @@ protected:
         {sipName_KURIFilterPlugin,        &sipClass_KURIFilterPlugin},
         {sipName_KURLCompletion,          &sipClass_KURLCompletion},
         {sipName_ListJob,                 &sipClass_KIO_ListJob},
-#if KDE_VERSION >= 0x030100
+#if TDE_VERSION >= 0x030100
         {sipName_MetaInfoJob,             &sipClass_KIO_MetaInfoJob},
 #endif        
         {sipName_MimetypeJob,             &sipClass_KIO_MimetypeJob},
diff --git a/sip/kparts/part.sip b/sip/kparts/part.sip
index 3a61655..cddc3c5 100644
--- a/sip/kparts/part.sip
+++ b/sip/kparts/part.sip
@@ -92,7 +92,7 @@ protected:
         {sipName_BrowserRun,              &sipClass_KParts_BrowserRun},
         {sipName_Factory,                 &sipClass_KParts_Factory},
         {sipName_HistoryProvider,         &sipClass_KParts_HistoryProvider},
-#if KDE_VERSION >= 0x030100
+#if TDE_VERSION >= 0x030100
         {sipName_LiveConnectExtension,    &sipClass_KParts_LiveConnectExtension},
 #endif
         {sipName_MainWindow,              &sipClass_KParts_MainWindow},
diff --git a/sip/tdecore/kaccel.sip b/sip/tdecore/kaccel.sip
index 301aba2..7b34881 100644
--- a/sip/tdecore/kaccel.sip
+++ b/sip/tdecore/kaccel.sip
@@ -122,7 +122,7 @@ public:
         {sipName_KAsyncIO,                &sipClass_KAsyncIO},
         {sipName_KAudioPlayer,            &sipClass_KAudioPlayer},
         {sipName_KBufferedIO,             &sipClass_KBufferedIO},
-#if KDE_VERSION >= 0x030100
+#if TDE_VERSION >= 0x030100
         {sipName_KClipboardSynchronizer,  &sipClass_KClipboardSynchronizer},
 #endif
         {sipName_KCompletion,             &sipClass_KCompletion},
diff --git a/sip/tdeui/kaboutapplication.sip b/sip/tdeui/kaboutapplication.sip
index 10f479b..c7dfb8d 100644
--- a/sip/tdeui/kaboutapplication.sip
+++ b/sip/tdeui/kaboutapplication.sip
@@ -74,7 +74,7 @@ protected:
         {sipName_KCompletionBox,          &sipClass_KCompletionBox},
         {sipName_KContextMenuManager,     &sipClass_KContextMenuManager},
         {sipName_KDateInternalMonthPicker,&sipClass_KDateInternalMonthPicker},
-#if KDE_VERSION >= 0x030100
+#if TDE_VERSION >= 0x030100
         {sipName_KDateInternalWeekSelector,&sipClass_KDateInternalWeekSelector},
 #endif
         {sipName_KDateInternalYearSelector,&sipClass_KDateInternalYearSelector},
@@ -96,7 +96,7 @@ protected:
         {sipName_KDockWidgetHeader,       &sipClass_KDockWidgetHeader},
         {sipName_KDockWidgetHeaderDrag,   &sipClass_KDockWidgetHeaderDrag},
 //        {sipName_KDockWindow,             &sipClass_KDockWindow},
-#if KDE_VERSION >= 0x030100
+#if TDE_VERSION >= 0x030100
         {sipName_KDoubleSpinBox,          &sipClass_KDoubleSpinBox},
         {sipName_KDoubleValidator,        &sipClass_KDoubleValidator},
 #endif
@@ -141,7 +141,7 @@ protected:
         {sipName_KPanelAppMenu,           &sipClass_KPanelAppMenu},
         {sipName_KPanelExtension,         &sipClass_KPanelExtension},
         {sipName_KPanelMenu,              &sipClass_KPanelMenu},
-#if KDE_VERSION >= 0x030100
+#if TDE_VERSION >= 0x030100
         {sipName_KPassivePopup,           &sipClass_KPassivePopup},
 #endif
         {sipName_KPasswordDialog,         &sipClass_KPasswordDialog},
@@ -169,12 +169,12 @@ protected:
         {sipName_KSystemTray,             &sipClass_KSystemTray},
         {sipName_KTabCtl,                 &sipClass_KTabCtl},
         {sipName_KTextBrowser,            &sipClass_KTextBrowser},
-#if KDE_VERSION >= 0x030100
+#if TDE_VERSION >= 0x030100
         {sipName_KTextEdit,               &sipClass_KTextEdit},
 #endif
         {sipName_KTipDialog,              &sipClass_KTipDialog},
         {sipName_KToggleAction,           &sipClass_KToggleAction},
-#if KDE_VERSION >= 0x030100
+#if TDE_VERSION >= 0x030100
         {sipName_KToggleToolBarAction,    &sipClass_KToggleToolBarAction},
 #endif
         {sipName_KToolBar,                &sipClass_KToolBar},
@@ -184,7 +184,7 @@ protected:
         {sipName_KToolBarSeparator,       &sipClass_KToolBarSeparator},
         {sipName_KURLLabel,               &sipClass_KURLLabel},
         {sipName_KValueSelector,          &sipClass_KValueSelector},
-#if KDE_VERSION >= 0x030100
+#if TDE_VERSION >= 0x030100
         {sipName_KWidgetAction,           &sipClass_KWidgetAction},
         {sipName_KWindowInfo,             &sipClass_KWindowInfo},
 #endif