diff --git a/doc/klinkstatus/index.docbook b/doc/klinkstatus/index.docbook
index 33dbbd7d..d8945444 100644
--- a/doc/klinkstatus/index.docbook
+++ b/doc/klinkstatus/index.docbook
@@ -430,7 +430,7 @@ application -->
 <title>Requirements</title>
 
 List any special requirements for your application here. This should include:
-.Libraries or other software that is not included in kdesupport,
+.Libraries or other software that is not included in tdesupport,
 kdelibs, or kdebase.
 .Hardware requirements like amount of RAM, disk space, graphics card
 capabilities, screen resolution, special expansion cards, etc.
diff --git a/doc/kommander/extending.docbook b/doc/kommander/extending.docbook
index a5b38b05..380fc46e 100644
--- a/doc/kommander/extending.docbook
+++ b/doc/kommander/extending.docbook
@@ -351,7 +351,7 @@ libtool --mode=compile g++ -$KDEDIR/include -IQTDIR/include \
 libtool --mode=compile g++ -$KDEDIR/include -IQTDIR/include \
    -I. -fPIC -c mykomplugin.cpp
 
-libtool --mode=link g++ -shared -L$KDEDIR/lib -lkdeui -lkommanderwidget \
+libtool --mode=link g++ -shared -L$KDEDIR/lib -ltdeui -lkommanderwidget \
    -lkommanderplugin komlineedit.cppkomlineedit.o mykomplugin.o 
    -o libmykomplugin.so
 </screen>
diff --git a/doc/kommander/installation.docbook b/doc/kommander/installation.docbook
index 707df7a0..f91f57ad 100644
--- a/doc/kommander/installation.docbook
+++ b/doc/kommander/installation.docbook
@@ -21,7 +21,7 @@ application -->
 
 <!--
 List any special requirements for your application here. This should include:
-.Libraries or other software that is not included in kdesupport,
+.Libraries or other software that is not included in tdesupport,
 kdelibs, or kdebase.
 .Hardware requirements like amount of RAM, disk space, graphics card
 capabilities, screen resolution, special expansion cards, etc.
diff --git a/kfilereplace/Makefile.am b/kfilereplace/Makefile.am
index 461e5d8d..d758e866 100644
--- a/kfilereplace/Makefile.am
+++ b/kfilereplace/Makefile.am
@@ -21,7 +21,7 @@ libkfilereplacepart_la_SOURCES = kfilereplacepart.cpp kfilereplaceview.cpp \
 	knewprojectdlgs.ui koptionsdlg.cpp koptionsdlgs.ui kfilereplacelib.cpp report.cpp \
 	commandengine.cpp configurationclasses.cpp
 				  
-libkfilereplacepart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -lDCOP
+libkfilereplacepart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -lDCOP
 libkfilereplacepart_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KHTML)
 
 messages: rc.cpp
@@ -38,6 +38,6 @@ partrc_DATA = kfilereplacepartui.rc
 shellrcdir = $(kde_datadir)/kfilereplace
 shellrc_DATA = kfilereplaceui.rc
 bin_PROGRAMS = kfilereplace
-kfilereplace_LDFLAGS = $(KDE_RPATH) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -lDCOP
+kfilereplace_LDFLAGS = $(KDE_RPATH) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -lDCOP
 kfilereplace_LDADD = $(LIB_KPARTS)
 kfilereplace_SOURCES = kfilereplace.cpp main.cpp
diff --git a/kimagemapeditor/Makefile.am b/kimagemapeditor/Makefile.am
index 70b22fd6..3103375b 100644
--- a/kimagemapeditor/Makefile.am
+++ b/kimagemapeditor/Makefile.am
@@ -38,10 +38,10 @@ noinst_HEADERS = \
         kimeshell.h
 
 
-libkimagemapeditor_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -lDCOP
+libkimagemapeditor_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -lDCOP
 libkimagemapeditor_la_LIBADD = libkimagemapeditorcommon.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KHTML)
 
-kimagemapeditor_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -lDCOP
+kimagemapeditor_LDFLAGS = $(all_libraries) $(KDE_RPATH) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -lDCOP
 kimagemapeditor_LDADD = libkimagemapeditorcommon.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KHTML)
 
 # set the include path for X, qt and KDE
diff --git a/klinkstatus/src/ui/klshistorycombo.cpp b/klinkstatus/src/ui/klshistorycombo.cpp
index 7ca1e533..89e622ef 100644
--- a/klinkstatus/src/ui/klshistorycombo.cpp
+++ b/klinkstatus/src/ui/klshistorycombo.cpp
@@ -129,7 +129,7 @@ void KLSHistoryCombo::selectWord(TQKeyEvent *e)
     int pos_old = pos;
     int count = 0;
 
-    // TODO: make these a parameter when in kdelibs/kdeui...
+    // TODO: make these a parameter when in kdelibs/tdeui...
     TQValueList<TQChar> chars;
     chars << TQChar('/') << TQChar('.') << TQChar('?') << TQChar('#') << TQChar(':');
     bool allow_space_break = true;
diff --git a/kommander/editor/Makefile.am b/kommander/editor/Makefile.am
index 3f312704..530d4ab6 100644
--- a/kommander/editor/Makefile.am
+++ b/kommander/editor/Makefile.am
@@ -7,7 +7,7 @@ bin_PROGRAMS = kmdr-editor
 AM_CPPFLAGS = -I$(top_srcdir)/kommander/widget -I$(top_srcdir)/kommander/widgets -I$(top_srcdir)/kommander/plugin -I$(top_srcdir)/kommander/factory -Ishared -Iinterfaces -Ipics $(all_includes)
 
 # the library search path.
-kmdr_editor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS)
+kmdr_editor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS)
 
 # the libraries to link against.
 kmdr_editor_LDADD = $(top_builddir)/kommander/factory/libkommanderfactory.la \
diff --git a/kommander/executor/Makefile.am b/kommander/executor/Makefile.am
index f5aa4119..64048f4c 100644
--- a/kommander/executor/Makefile.am
+++ b/kommander/executor/Makefile.am
@@ -3,7 +3,7 @@ bin_PROGRAMS = kmdr-executor
 noinst_LTLIBRARIES = libinstance.la
 
 libinstance_la_SOURCES = instance.cpp  dcopkommanderif.skel
-libinstance_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+libinstance_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 
 kmdr_executor_SOURCES = main.cpp
@@ -20,6 +20,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/kommander/plugin -I$(top_srcdir)/kommander/widgets
 METASOURCES = AUTO
 
 # the library search path.
-kmdr_executor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kmdr_executor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 noinst_HEADERS =  dcopkommanderif.h
diff --git a/kommander/kommander-editor.kdevelop b/kommander/kommander-editor.kdevelop
index 41a05352..d239f61c 100644
--- a/kommander/kommander-editor.kdevelop
+++ b/kommander/kommander-editor.kdevelop
@@ -193,7 +193,7 @@
       <globalcwd>/data/development/build/kde-3.5/kdewebdev/</globalcwd>
       <useglobalprogram>true</useglobalprogram>
       <autoinstall>false</autoinstall>
-      <autokdesu>false</autokdesu>
+      <autotdesu>false</autotdesu>
     </run>
   </kdevautoproject>
   <cppsupportpart>
diff --git a/kommander/kommander.kdevelop b/kommander/kommander.kdevelop
index fd3ed8c8..da60a05a 100644
--- a/kommander/kommander.kdevelop
+++ b/kommander/kommander.kdevelop
@@ -173,7 +173,7 @@
       <customdirectory>/</customdirectory>
       <autocompile>true</autocompile>
       <autoinstall>false</autoinstall>
-      <autokdesu>false</autokdesu>
+      <autotdesu>false</autotdesu>
       <globaldebugarguments>/data/development/quanta/eric/editor-poc.kmdr</globaldebugarguments>
       <globalcwd>/data/development/build/kde-3.5/kdewebdev/</globalcwd>
       <useglobalprogram>true</useglobalprogram>
diff --git a/kommander/part/Makefile.am b/kommander/part/Makefile.am
index 7e65e9bc..6d44bc04 100644
--- a/kommander/part/Makefile.am
+++ b/kommander/part/Makefile.am
@@ -1,7 +1,7 @@
 INCLUDES = -I$(top_srcdir)/kommander/executor -I$(top_srcdir)/kommander/factory $(all_includes)
 METASOURCES = AUTO
 kde_module_LTLIBRARIES = libkommander_part.la
-libkommander_part_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -lDCOP -L../../kommander/plugin/.libs -lkommanderplugin
+libkommander_part_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -lDCOP -L../../kommander/plugin/.libs -lkommanderplugin
 libkommander_part_la_LIBADD = $(top_builddir)/kommander/executor/libinstance.la $(top_builddir)/kommander/widget/libkommanderwidget.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KHTML)
 kde_services_DATA = kommander_part.desktop
 libkommander_part_la_SOURCES = kommander_part.cpp
diff --git a/kommander/pluginmanager/Makefile.am b/kommander/pluginmanager/Makefile.am
index 59041582..0882358d 100644
--- a/kommander/pluginmanager/Makefile.am
+++ b/kommander/pluginmanager/Makefile.am
@@ -13,6 +13,6 @@ INCLUDES = -I$(top_srcdir)/kommander/factory $(all_includes)
 METASOURCES = AUTO
 
 # the library search path.
-kmdr_plugins_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kmdr_plugins_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 noinst_HEADERS = mainwindow.h pluginmanager.h
diff --git a/kommander/widgets/Makefile.am b/kommander/widgets/Makefile.am
index 179db6e8..60759960 100644
--- a/kommander/widgets/Makefile.am
+++ b/kommander/widgets/Makefile.am
@@ -4,7 +4,7 @@ lib_LTLIBRARIES = libkommanderwidgets.la
 INCLUDES = -I$(top_srcdir)/kommander/widget -I$(top_srcdir)/kommander/factory -I$(top_srcdir)/kommander/plugin $(all_includes)
 
 # the library search path.
-#widgets_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+#widgets_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 libkommanderwidgets_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined
 
 # the libraries to link against.
diff --git a/kxsldbg/Makefile.am b/kxsldbg/Makefile.am
index 41c0d34c..4959adc7 100644
--- a/kxsldbg/Makefile.am
+++ b/kxsldbg/Makefile.am
@@ -21,7 +21,7 @@ xsldbg_DEPENDENCIES  = kxsldbgpart/libxsldbg/libxsldbg.la
 xsldbg_LDADD = kxsldbgpart/libxsldbg/libxsldbg.la $(LIBXSLT_LIBS) $(LIBXML_LIBS) $(LIB_KDEUI)
 #
 # the library search path.
-xsldbg_LDFLAGS = $(all_libraries) $(XSLDBG_EXTRA_LIBS) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+xsldbg_LDFLAGS = $(all_libraries) $(XSLDBG_EXTRA_LIBS) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 # These paths are KDE specific. Use them:
 # kde_appsdir         Where your application's menu entry (.desktop) should go to.
@@ -50,7 +50,7 @@ INCLUDES= $(LIBXML_CFLAGS)  $(LIBXSLT_CFLAGS) $(all_includes)
 METASOURCES = AUTO
 
 # the application source, library search path, and link libraries
-kxsldbg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+kxsldbg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 # this is where the shell's XML-GUI resource file goes
 shellrcdir   = $(kde_datadir)/kxsldbg
diff --git a/kxsldbg/kxsldbgpart/Makefile.am b/kxsldbg/kxsldbgpart/Makefile.am
index ebbd1da6..40812810 100644
--- a/kxsldbg/kxsldbgpart/Makefile.am
+++ b/kxsldbg/kxsldbgpart/Makefile.am
@@ -1,7 +1,7 @@
 noinst_LTLIBRARIES = libkxsldbgcommon.la
 libkxsldbgcommon_la_SOURCES = xsldbgwalkspeedimpl.cpp xsldbgtemplatesimpl.cpp xsldbgtemplatelistitem.cpp xsldbgsourcesimpl.cpp xsldbgoutputview.cpp xsldbglocalvariablesimpl.cpp xsldbglocallistitem.cpp xsldbglistitem.cpp xsldbginspector.cpp xsldbgglobalvariablesimpl.cpp xsldbggloballistitem.cpp xsldbgentitiesimpl.cpp xsldbgdoc.cpp xsldbgdialogbase.cpp xsldbgdebugger.cpp xsldbgconfigimpl.cpp xsldbgcallstackimpl.cpp xsldbgbreakpointsimpl.cpp xsldbgbreakpointlistitem.cpp qxsldbgdoc.cpp kxsldbg_part.cpp kxsldbg_partif.skel xsldbgwalkspeed.ui xsldbgtemplates.ui xsldbgsources.ui xsldbgmsgdialog.ui xsldbglocalvariables.ui xsldbgglobalvariables.ui xsldbgentities.ui xsldbgconfig.ui xsldbgcallstack.ui xsldbgbreakpoints.ui
 libkxsldbgcommon_la_METASOURCES = AUTO
-libkxsldbgcommon_la_LDFLAGS = $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -lDCOP -lktexteditor
+libkxsldbgcommon_la_LDFLAGS = $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -lDCOP -lktexteditor
 libkxsldbgcommon_la_LIBADD  =  libxsldbg/libxsldbg.la libqtnotfier/libqtnotfier.la 
 
 noinst_HEADERS = kxsldbg_part.h qxsldbgdoc.h xsldbgbreakpointlistitem.h xsldbgbreakpointsimpl.h xsldbgcallstackimpl.h xsldbgconfigimpl.h xsldbgdebugger.h xsldbgdialogbase.h xsldbgdoc.h xsldbgdocmap.h xsldbgentitiesimpl.h xsldbggloballistitem.h xsldbgglobalvariablesimpl.h xsldbginspector.h xsldbglistitem.h xsldbglocallistitem.h xsldbglocalvariablesimpl.h xsldbgmsgdialogimpl.h xsldbgoutputview.h xsldbgsourcesimpl.h xsldbgtemplatelistitem.h xsldbgtemplatesimpl.h xsldbgwalkspeedimpl.h
@@ -15,7 +15,7 @@ SUBDIRS = libqtnotfier libxsldbg
 INCLUDES = $(XSLDBG_CFLAGS) -I.. $(all_includes)
 
 
-libkxsldbgpart_la_LDFLAGS = -module $(KDE_PLUGIN) -lkatepartinterfaces $(all_libraries)  $(XSLDBG_EXTRA_LIBS)-lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -lDCOP
+libkxsldbgpart_la_LDFLAGS = -module $(KDE_PLUGIN) -lkatepartinterfaces $(all_libraries)  $(XSLDBG_EXTRA_LIBS)-ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -lDCOP
 libkxsldbgpart_la_LIBADD  =  libkxsldbgcommon.la $(LIB_KPARTS)
 
 
diff --git a/lib/compatibility/kmdi/qextmdi/kdelibs_export.h b/lib/compatibility/kmdi/qextmdi/kdelibs_export.h
index c46b5005..f93d852e 100644
--- a/lib/compatibility/kmdi/qextmdi/kdelibs_export.h
+++ b/lib/compatibility/kmdi/qextmdi/kdelibs_export.h
@@ -68,7 +68,7 @@
 
 #endif /*_KDELIBS_EXPORT_H*/
 
-/* workaround for kdecore: stupid tqmoc's grammar doesn't accept two macros
+/* workaround for tdecore: stupid tqmoc's grammar doesn't accept two macros
    between 'class' keyword and <classname>: */
 #ifdef KDE_DEPRECATED
 # ifndef KDECORE_EXPORT_DEPRECATED
diff --git a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp
index f196d1a0..fa3394ad 100644
--- a/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp
+++ b/lib/compatibility/kmdi/qextmdi/kmdidockcontainer.cpp
@@ -36,7 +36,7 @@
 #include <kconfig.h>
 #include <klocale.h>
 
-//TODO: Well, this is already defined in kdeui/kdockwidget.cpp
+//TODO: Well, this is already defined in tdeui/kdockwidget.cpp
 static const char* const kmdi_not_close_xpm[] =
     {
         "5 5 2 1",
diff --git a/quanta/components/debugger/dbgp/Makefile.am b/quanta/components/debugger/dbgp/Makefile.am
index 0e74d5ad..da7bf880 100644
--- a/quanta/components/debugger/dbgp/Makefile.am
+++ b/quanta/components/debugger/dbgp/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = quantadebuggerdbgp.la
 
 quantadebuggerdbgp_la_SOURCES = quantadebuggerdbgp.cpp dbgpsettingss.ui \
 	dbgpsettings.cpp dbgpnetwork.cpp qbytearrayfifo.cpp
-quantadebuggerdbgp_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -lDCOP -lktexteditor
+quantadebuggerdbgp_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -lDCOP -lktexteditor
 quantadebuggerdbgp_la_LIBADD = ../interfaces/libdebuggerinterface.la $(LIB_KPARTS)
 kde_services_DATA =  quantadebuggerdbgp.desktop
 
diff --git a/quanta/components/debugger/gubed/CMakeLists.txt b/quanta/components/debugger/gubed/CMakeLists.txt
index 077fdb4f..b528b30a 100644
--- a/quanta/components/debugger/gubed/CMakeLists.txt
+++ b/quanta/components/debugger/gubed/CMakeLists.txt
@@ -32,6 +32,6 @@ install( FILES quantadebuggergubed.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 tde_add_kpart( quantadebuggergubed AUTOMOC
   SOURCES
     gubedsettingss.ui quantadebuggergubed.cpp gubedsettings.cpp
-  LINK debuggerinterface-static kdeui-shared
+  LINK debuggerinterface-static tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/quanta/components/debugger/gubed/Makefile.am b/quanta/components/debugger/gubed/Makefile.am
index 01708be7..9c2aebc0 100644
--- a/quanta/components/debugger/gubed/Makefile.am
+++ b/quanta/components/debugger/gubed/Makefile.am
@@ -3,7 +3,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = quantadebuggergubed.la
 
 quantadebuggergubed_la_SOURCES = gubedsettingss.ui quantadebuggergubed.cpp  gubedsettings.cpp
-quantadebuggergubed_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -lDCOP -lktexteditor
+quantadebuggergubed_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -lDCOP -lktexteditor
 quantadebuggergubed_la_LIBADD = ../interfaces/libdebuggerinterface.la $(LIB_KPARTS)
 kde_services_DATA =  quantadebuggergubed.desktop
 
diff --git a/quanta/data/templates/pages/docbook/kde-doc-template.docbook b/quanta/data/templates/pages/docbook/kde-doc-template.docbook
index 65a5773c..bb98a30f 100644
--- a/quanta/data/templates/pages/docbook/kde-doc-template.docbook
+++ b/quanta/data/templates/pages/docbook/kde-doc-template.docbook
@@ -502,7 +502,7 @@ application -->
 
 <!--
 List any special requirements for your application here. This should include:
-.Libraries or other software that is not included in kdesupport,
+.Libraries or other software that is not included in tdesupport,
 kdelibs, or kdebase.
 .Hardware requirements like amount of RAM, disk space, graphics card
 capabilities, screen resolution, special expansion cards, etc.
diff --git a/quanta/quanta.kdevelop b/quanta/quanta.kdevelop
index da6c2c61..547eb5bd 100644
--- a/quanta/quanta.kdevelop
+++ b/quanta/quanta.kdevelop
@@ -56,7 +56,7 @@
       <customdirectory>/</customdirectory>
       <autocompile>true</autocompile>
       <autoinstall>false</autoinstall>
-      <autokdesu>false</autokdesu>
+      <autotdesu>false</autotdesu>
       <globaldebugarguments/>
       <globalcwd>/data/development/build/kde-3.5/kdewebdev</globalcwd>
       <useglobalprogram>true</useglobalprogram>
diff --git a/quanta/src/Makefile.am b/quanta/src/Makefile.am
index 64e6c2c9..c8773aad 100644
--- a/quanta/src/Makefile.am
+++ b/quanta/src/Makefile.am
@@ -30,7 +30,7 @@ quanta_LDADD = $(top_builddir)/quanta/project/libproject.la \
 	$(top_builddir)/quanta/utility/libutility.la \
 	$(top_builddir)/lib/libquantamodule.la \
 	-lkatepartinterfaces $(LIB_KNEWSTUFF) $(LIB_KAFKA) $(LIB_CVSSERVICE)  \
-	$(LIB_KMDI) $(LIBXML_LIBS) $(LIBXSLT_LIBS) $(LIB_KABC) $(LIB_KSPELL) $(LIB_KHTML) -lX11 -lkdefx
+	$(LIB_KMDI) $(LIBXML_LIBS) $(LIBXSLT_LIBS) $(LIB_KABC) $(LIB_KSPELL) $(LIB_KHTML) -lX11 -ltdefx
 #       $(top_builddir)/lib/compatibility/libcompat.la
 
 AM_CPPFLAGS = -I$(top_srcdir)/quanta/dialogs \
@@ -64,7 +64,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/quanta/dialogs \
 quanta_METASOURCES = AUTO
 
 # the library search path.
-quanta_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -lX11
+quanta_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lX11
 
 # this is where the kdelnk file will go
 xdg_apps_DATA = quanta.desktop