diff --git a/kabc/addresslineedit.cpp b/kabc/addresslineedit.cpp
index cd6820fcd..a61e7a5c9 100644
--- a/kabc/addresslineedit.cpp
+++ b/kabc/addresslineedit.cpp
@@ -32,7 +32,7 @@
 #include <tqevent.h>
 #include <tqdragobject.h>
 
-#include <kcompletionbox.h>
+#include <tdecompletionbox.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
 #include <kstandarddirs.h>
diff --git a/tdehtml/rendering/render_form.cpp b/tdehtml/rendering/render_form.cpp
index 2309ff5d7..89f38a7b2 100644
--- a/tdehtml/rendering/render_form.cpp
+++ b/tdehtml/rendering/render_form.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include <kcompletionbox.h>
+#include <tdecompletionbox.h>
 #include <kcursor.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
diff --git a/tdeio/tdefile/tdefiledialog.cpp b/tdeio/tdefile/tdefiledialog.cpp
index ad0b20456..ed50ae49b 100644
--- a/tdeio/tdefile/tdefiledialog.cpp
+++ b/tdeio/tdefile/tdefiledialog.cpp
@@ -47,7 +47,7 @@
 #include <kapplication.h>
 #include <kcharsets.h>
 #include <kcmdlineargs.h>
-#include <kcompletionbox.h>
+#include <tdecompletionbox.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
diff --git a/tdeui/CMakeLists.txt b/tdeui/CMakeLists.txt
index 68edcc4e7..b8e11ed32 100644
--- a/tdeui/CMakeLists.txt
+++ b/tdeui/CMakeLists.txt
@@ -66,7 +66,7 @@ install( FILES
     kedittoolbar.h kdockwidget.h kanimwidget.h
     krootpixmap.h kaboutkde.h kaboutapplication.h
     kpanelapplet.h kpushbutton.h kdcopactionproxy.h kcolorcombo.h
-    kpanelextension.h kcompletionbox.h ksqueezedtextlabel.h
+    kpanelextension.h tdecompletionbox.h ksqueezedtextlabel.h
     kcommand.h twindowlistmenu.h tdefontcombo.h tdeaccelgen.h ktip.h
     kdatewidget.h karrowbutton.h kguiitem.h kstdguiitem.h
     kstringvalidator.h twindowinfo.h
@@ -129,7 +129,7 @@ set( ${target}_SRCS
   kanimwidget.cpp krootpixmap.cpp kaboutkde.cpp
   kaboutapplication.cpp kpanelapplet.cpp kdcopactionproxy.cpp
   kcolorcombo.cpp kpushbutton.cpp kpanelextension.cpp
-  kcompletionbox.cpp ksqueezedtextlabel.cpp tdecmodule.cpp
+  tdecompletionbox.cpp ksqueezedtextlabel.cpp tdecmodule.cpp
   kcommand.cpp twindowlistmenu.cpp tdefontcombo.cpp ktip.cpp
   kdatewidget.cpp karrowbutton.cpp tdemainwindowiface.cpp
   tdemainwindowiface.skel kguiitem.cpp kstdguiitem.cpp
diff --git a/tdeui/MAINTAINERS b/tdeui/MAINTAINERS
index 1b981e334..4e22d00a0 100644
--- a/tdeui/MAINTAINERS
+++ b/tdeui/MAINTAINERS
@@ -23,7 +23,7 @@ kcolordialog.cpp	Waldo Bastian <bastian@kde.org>
 kcolordrag.cpp
 kcombobox.cpp   	Dawit Alemayehu <adawit@kde.org>, Carsten Pfeiffer <pfeiffer@kde.org>
 kcommand.cpp		Werner Trobin <trobin@kde.org>
-kcompletionbox.cpp	Carsten Pfeiffer <pfeiffer@kde.org>
+tdecompletionbox.cpp	Carsten Pfeiffer <pfeiffer@kde.org>
 kcursor.cpp		Carsten Pfeiffer <pfeiffer@kde.org>
 kdatepicker.cpp
 kdatetbl.cpp
diff --git a/tdeui/Makefile.am b/tdeui/Makefile.am
index 5da7403fc..4a1b472ff 100644
--- a/tdeui/Makefile.am
+++ b/tdeui/Makefile.am
@@ -63,7 +63,7 @@ include_HEADERS = kprogressbox.h kprogress.h kcolordlg.h \
 		kedittoolbar.h kdockwidget.h kanimwidget.h \
 		krootpixmap.h kaboutkde.h kaboutapplication.h \
 		kpanelapplet.h kpushbutton.h kdcopactionproxy.h kcolorcombo.h \
-		kpanelextension.h kcompletionbox.h ksqueezedtextlabel.h \
+		kpanelextension.h tdecompletionbox.h ksqueezedtextlabel.h \
 		kcommand.h twindowlistmenu.h tdefontcombo.h tdeaccelgen.h ktip.h \
 		kdatewidget.h karrowbutton.h kguiitem.h kstdguiitem.h \
 		kstringvalidator.h twindowinfo.h \
@@ -110,7 +110,7 @@ libtdeui_la_SOURCES = \
 		kanimwidget.cpp krootpixmap.cpp kaboutkde.cpp \
 		kaboutapplication.cpp kpanelapplet.cpp kdcopactionproxy.cpp \
 		kcolorcombo.cpp kpushbutton.cpp kpanelextension.cpp \
-		kcompletionbox.cpp ksqueezedtextlabel.cpp tdecmodule.cpp \
+		tdecompletionbox.cpp ksqueezedtextlabel.cpp tdecmodule.cpp \
 		kcommand.cpp twindowlistmenu.cpp tdefontcombo.cpp ktip.cpp \
 		kdatewidget.cpp karrowbutton.cpp tdemainwindowiface.cpp \
                 tdemainwindowiface.skel kguiitem.cpp kstdguiitem.cpp \
diff --git a/tdeui/kcombobox.cpp b/tdeui/kcombobox.cpp
index c79284717..3ddb4390b 100644
--- a/tdeui/kcombobox.cpp
+++ b/tdeui/kcombobox.cpp
@@ -25,7 +25,7 @@
 #include <tqpopupmenu.h>
 #include <tqapplication.h>
 
-#include <kcompletionbox.h>
+#include <tdecompletionbox.h>
 #include <kcursor.h>
 #include <kiconloader.h>
 #include <kicontheme.h>
diff --git a/tdeui/klineedit.cpp b/tdeui/klineedit.cpp
index 66230b4a9..4e11f5fa3 100644
--- a/tdeui/klineedit.cpp
+++ b/tdeui/klineedit.cpp
@@ -36,7 +36,7 @@
 #include <tdestdaccel.h>
 #include <tdepopupmenu.h>
 #include <kdebug.h>
-#include <kcompletionbox.h>
+#include <tdecompletionbox.h>
 #include <kurl.h>
 #include <kurldrag.h>
 #include <kiconloader.h>
diff --git a/tdeui/kcompletionbox.cpp b/tdeui/tdecompletionbox.cpp
similarity index 99%
rename from tdeui/kcompletionbox.cpp
rename to tdeui/tdecompletionbox.cpp
index 2dd4e9ccf..53a8c71fb 100644
--- a/tdeui/kcompletionbox.cpp
+++ b/tdeui/tdecompletionbox.cpp
@@ -31,7 +31,7 @@
 #include <knotifyclient.h>
 #include <kglobalsettings.h>
 
-#include "kcompletionbox.h"
+#include "tdecompletionbox.h"
 
 class TDECompletionBox::TDECompletionBoxPrivate
 {
@@ -559,4 +559,4 @@ bool TDECompletionBox::activateOnSelect() const
 void TDECompletionBox::virtual_hook( int id, void* data )
 { TDEListBox::virtual_hook( id, data ); }
 
-#include "kcompletionbox.moc"
+#include "tdecompletionbox.moc"
diff --git a/tdeui/kcompletionbox.h b/tdeui/tdecompletionbox.h
similarity index 100%
rename from tdeui/kcompletionbox.h
rename to tdeui/tdecompletionbox.h
diff --git a/tdeui/tests/klineedittest.cpp b/tdeui/tests/klineedittest.cpp
index cfb4160d2..5146b7d15 100644
--- a/tdeui/tests/klineedittest.cpp
+++ b/tdeui/tests/klineedittest.cpp
@@ -12,7 +12,7 @@
 #include <klocale.h>
 #include <klineedit.h>
 #include <kglobalsettings.h>
-#include <kcompletionbox.h>
+#include <tdecompletionbox.h>
 
 #include "klineedittest.h"
 
diff --git a/win/pro_files/tdeui/tdeui.pro b/win/pro_files/tdeui/tdeui.pro
index f4bde24ec..29924203c 100644
--- a/win/pro_files/tdeui/tdeui.pro
+++ b/win/pro_files/tdeui/tdeui.pro
@@ -37,7 +37,7 @@ kcolordialog.cpp \
 kcolordrag.cpp \
 kcombobox.cpp \
 kcommand.cpp \
-kcompletionbox.cpp \
+tdecompletionbox.cpp \
 tdeconfigdialog.cpp \
 kcursor.cpp \
 kdatepicker.cpp \