diff --git a/configure.py b/configure.py
index d75cd0f..fa8212c 100644
--- a/configure.py
+++ b/configure.py
@@ -395,7 +395,7 @@ def discoverKDE3 ():
         incSearchPaths = []
 
         try:
-            kdeSearchPaths.append (os.environ ["KDEDIR"])
+            kdeSearchPaths.append (os.environ ["TDEDIR"])
         except:
             pass
         kdeSearchPaths.append (os.path.join ("/opt", "trinity"))
diff --git a/doc/switches.html b/doc/switches.html
index 21e5a6a..1af4b51 100644
--- a/doc/switches.html
+++ b/doc/switches.html
@@ -140,7 +140,7 @@ is split into two pieces by default to reduce memory consumption. Values for 'j'
 The top level directory under which trinity/libs and trinity/include are located (these paths can also
 be specified independently see -n and -o) On SuSE distributions, this is typically /opt/trinity. On
 Red Hat and Mandrake, this is typically /usr. configure.py will find the typical locations automatically.
-configure .py will use the KDEDIR environment variable value if it is defined and the -k switch is NOT used.
+configure .py will use the TDEDIR environment variable value if it is defined and the -k switch is NOT used.
 </dd>
 <hr>
 <dt><b>-n KDE library files</b></dt>
diff --git a/extra/kde310/kpanelmenu.h b/extra/kde310/kpanelmenu.h
index 5a36b02..a2800b8 100644
--- a/extra/kde310/kpanelmenu.h
+++ b/extra/kde310/kpanelmenu.h
@@ -46,7 +46,7 @@ class KPanelMenuPrivate;
  * Finally, you also have to provide a desktop file describing your dynamic menu. The
  * relevant entries are: Name, Comment, Icon and X-KDE-Library (which contains the
  * library name without any extension). This desktop file has to be installed in
- * $KDEDIR/share/apps/kicker/menuext/.
+ * $TDEDIR/share/apps/kicker/menuext/.
  *
  * @short Base class to build dynamically loaded menu entries for the K-menu, or the panel.
  * @author The kicker maintainer, Michael Goffioul <goffioul@imec.be>
diff --git a/extra/kde311/kpanelmenu.h b/extra/kde311/kpanelmenu.h
index 26c200a..d7c78fe 100644
--- a/extra/kde311/kpanelmenu.h
+++ b/extra/kde311/kpanelmenu.h
@@ -46,7 +46,7 @@ class KPanelMenuPrivate;
  * Finally, you also have to provide a desktop file describing your dynamic menu. The
  * relevant entries are: Name, Comment, Icon and X-KDE-Library (which contains the
  * library name without any extension). This desktop file has to be installed in
- * $KDEDIR/share/apps/kicker/menuext/.
+ * $TDEDIR/share/apps/kicker/menuext/.
  *
  * @short Base class to build dynamically loaded menu entries for the K-menu, or the panel.
  * @author The kicker maintainer, Michael Goffioul <goffioul@imec.be>
diff --git a/extra/kde312/kpanelmenu.h b/extra/kde312/kpanelmenu.h
index 5a36b02..a2800b8 100644
--- a/extra/kde312/kpanelmenu.h
+++ b/extra/kde312/kpanelmenu.h
@@ -46,7 +46,7 @@ class KPanelMenuPrivate;
  * Finally, you also have to provide a desktop file describing your dynamic menu. The
  * relevant entries are: Name, Comment, Icon and X-KDE-Library (which contains the
  * library name without any extension). This desktop file has to be installed in
- * $KDEDIR/share/apps/kicker/menuext/.
+ * $TDEDIR/share/apps/kicker/menuext/.
  *
  * @short Base class to build dynamically loaded menu entries for the K-menu, or the panel.
  * @author The kicker maintainer, Michael Goffioul <goffioul@imec.be>
diff --git a/extra/kde313/kpanelmenu.h b/extra/kde313/kpanelmenu.h
index 5a36b02..a2800b8 100644
--- a/extra/kde313/kpanelmenu.h
+++ b/extra/kde313/kpanelmenu.h
@@ -46,7 +46,7 @@ class KPanelMenuPrivate;
  * Finally, you also have to provide a desktop file describing your dynamic menu. The
  * relevant entries are: Name, Comment, Icon and X-KDE-Library (which contains the
  * library name without any extension). This desktop file has to be installed in
- * $KDEDIR/share/apps/kicker/menuext/.
+ * $TDEDIR/share/apps/kicker/menuext/.
  *
  * @short Base class to build dynamically loaded menu entries for the K-menu, or the panel.
  * @author The kicker maintainer, Michael Goffioul <goffioul@imec.be>
diff --git a/extra/kde314/kpanelmenu.h b/extra/kde314/kpanelmenu.h
index 9db548f..afa3232 100644
--- a/extra/kde314/kpanelmenu.h
+++ b/extra/kde314/kpanelmenu.h
@@ -46,7 +46,7 @@ class KPanelMenuPrivate;
  * Finally, you also have to provide a desktop file describing your dynamic menu. The
  * relevant entries are: Name, Comment, Icon and X-KDE-Library (which contains the
  * library name without any extension). This desktop file has to be installed in
- * $KDEDIR/share/apps/kicker/menuext/.
+ * $TDEDIR/share/apps/kicker/menuext/.
  *
  * @short Base class to build dynamically loaded menu entries for the K-menu, or the panel.
  * @author The kicker maintainer, Michael Goffioul <goffioul@imec.be>
diff --git a/extra/kde315/kpanelmenu.h b/extra/kde315/kpanelmenu.h
index 9db548f..afa3232 100644
--- a/extra/kde315/kpanelmenu.h
+++ b/extra/kde315/kpanelmenu.h
@@ -46,7 +46,7 @@ class KPanelMenuPrivate;
  * Finally, you also have to provide a desktop file describing your dynamic menu. The
  * relevant entries are: Name, Comment, Icon and X-KDE-Library (which contains the
  * library name without any extension). This desktop file has to be installed in
- * $KDEDIR/share/apps/kicker/menuext/.
+ * $TDEDIR/share/apps/kicker/menuext/.
  *
  * @short Base class to build dynamically loaded menu entries for the K-menu, or the panel.
  * @author The kicker maintainer, Michael Goffioul <goffioul@imec.be>
diff --git a/extra/kde320/kpanelmenu.h b/extra/kde320/kpanelmenu.h
index bdd3182..aabed8d 100644
--- a/extra/kde320/kpanelmenu.h
+++ b/extra/kde320/kpanelmenu.h
@@ -46,7 +46,7 @@ class KPanelMenuPrivate;
  * Finally, you also have to provide a desktop file describing your dynamic menu. The
  * relevant entries are: Name, Comment, Icon and X-KDE-Library (which contains the
  * library name without any extension). This desktop file has to be installed in
- * $KDEDIR/share/apps/kicker/menuext/.
+ * $TDEDIR/share/apps/kicker/menuext/.
  *
  * @short Base class to build dynamically loaded menu entries for the K-menu, or the panel.
  * @author The kicker maintainer, Michael Goffioul <goffioul@imec.be>
diff --git a/extra/kde321/kpanelmenu.h b/extra/kde321/kpanelmenu.h
index bdd3182..aabed8d 100644
--- a/extra/kde321/kpanelmenu.h
+++ b/extra/kde321/kpanelmenu.h
@@ -46,7 +46,7 @@ class KPanelMenuPrivate;
  * Finally, you also have to provide a desktop file describing your dynamic menu. The
  * relevant entries are: Name, Comment, Icon and X-KDE-Library (which contains the
  * library name without any extension). This desktop file has to be installed in
- * $KDEDIR/share/apps/kicker/menuext/.
+ * $TDEDIR/share/apps/kicker/menuext/.
  *
  * @short Base class to build dynamically loaded menu entries for the K-menu, or the panel.
  * @author The kicker maintainer, Michael Goffioul <goffioul@imec.be>
diff --git a/extra/kde322/kpanelmenu.h b/extra/kde322/kpanelmenu.h
index bdd3182..aabed8d 100644
--- a/extra/kde322/kpanelmenu.h
+++ b/extra/kde322/kpanelmenu.h
@@ -46,7 +46,7 @@ class KPanelMenuPrivate;
  * Finally, you also have to provide a desktop file describing your dynamic menu. The
  * relevant entries are: Name, Comment, Icon and X-KDE-Library (which contains the
  * library name without any extension). This desktop file has to be installed in
- * $KDEDIR/share/apps/kicker/menuext/.
+ * $TDEDIR/share/apps/kicker/menuext/.
  *
  * @short Base class to build dynamically loaded menu entries for the K-menu, or the panel.
  * @author The kicker maintainer, Michael Goffioul <goffioul@imec.be>
diff --git a/extra/kde323/kpanelmenu.h b/extra/kde323/kpanelmenu.h
index bdd3182..aabed8d 100644
--- a/extra/kde323/kpanelmenu.h
+++ b/extra/kde323/kpanelmenu.h
@@ -46,7 +46,7 @@ class KPanelMenuPrivate;
  * Finally, you also have to provide a desktop file describing your dynamic menu. The
  * relevant entries are: Name, Comment, Icon and X-KDE-Library (which contains the
  * library name without any extension). This desktop file has to be installed in
- * $KDEDIR/share/apps/kicker/menuext/.
+ * $TDEDIR/share/apps/kicker/menuext/.
  *
  * @short Base class to build dynamically loaded menu entries for the K-menu, or the panel.
  * @author The kicker maintainer, Michael Goffioul <goffioul@imec.be>
diff --git a/extra/kde330/kpanelmenu.h b/extra/kde330/kpanelmenu.h
index 0938475..074b8c7 100644
--- a/extra/kde330/kpanelmenu.h
+++ b/extra/kde330/kpanelmenu.h
@@ -44,7 +44,7 @@ class KPanelMenuPrivate;
  * Finally, you also have to provide a desktop file describing your dynamic menu. The
  * relevant entries are: Name, Comment, Icon and X-KDE-Library (which contains the
  * library name without any extension). This desktop file has to be installed in
- * $KDEDIR/share/apps/kicker/menuext/.
+ * $TDEDIR/share/apps/kicker/menuext/.
  *
  * @short Base class to build dynamically loaded menu entries for the K-menu, or the panel.
  * @author The kicker maintainer, Michael Goffioul <tdeprint@swing.be>
diff --git a/extra/kde331/kpanelmenu.h b/extra/kde331/kpanelmenu.h
index 0938475..074b8c7 100644
--- a/extra/kde331/kpanelmenu.h
+++ b/extra/kde331/kpanelmenu.h
@@ -44,7 +44,7 @@ class KPanelMenuPrivate;
  * Finally, you also have to provide a desktop file describing your dynamic menu. The
  * relevant entries are: Name, Comment, Icon and X-KDE-Library (which contains the
  * library name without any extension). This desktop file has to be installed in
- * $KDEDIR/share/apps/kicker/menuext/.
+ * $TDEDIR/share/apps/kicker/menuext/.
  *
  * @short Base class to build dynamically loaded menu entries for the K-menu, or the panel.
  * @author The kicker maintainer, Michael Goffioul <tdeprint@swing.be>
diff --git a/extra/kde332/kpanelmenu.h b/extra/kde332/kpanelmenu.h
index 0938475..074b8c7 100644
--- a/extra/kde332/kpanelmenu.h
+++ b/extra/kde332/kpanelmenu.h
@@ -44,7 +44,7 @@ class KPanelMenuPrivate;
  * Finally, you also have to provide a desktop file describing your dynamic menu. The
  * relevant entries are: Name, Comment, Icon and X-KDE-Library (which contains the
  * library name without any extension). This desktop file has to be installed in
- * $KDEDIR/share/apps/kicker/menuext/.
+ * $TDEDIR/share/apps/kicker/menuext/.
  *
  * @short Base class to build dynamically loaded menu entries for the K-menu, or the panel.
  * @author The kicker maintainer, Michael Goffioul <tdeprint@swing.be>
diff --git a/extra/kde340/kpanelmenu.h b/extra/kde340/kpanelmenu.h
index 3e33239..42b5c9a 100644
--- a/extra/kde340/kpanelmenu.h
+++ b/extra/kde340/kpanelmenu.h
@@ -46,7 +46,7 @@ class KPanelMenuPrivate;
  * Finally, you also have to provide a desktop file describing your dynamic menu. The
  * relevant entries are: Name, Comment, Icon and X-KDE-Library (which contains the
  * library name without any extension). This desktop file has to be installed in
- * $KDEDIR/share/apps/kicker/menuext/.
+ * $TDEDIR/share/apps/kicker/menuext/.
  *
  * @author The kicker maintainers, Michael Goffioul <tdeprint@swing.be>
  */
diff --git a/extra/kde341/kpanelmenu.h b/extra/kde341/kpanelmenu.h
index 3e33239..42b5c9a 100644
--- a/extra/kde341/kpanelmenu.h
+++ b/extra/kde341/kpanelmenu.h
@@ -46,7 +46,7 @@ class KPanelMenuPrivate;
  * Finally, you also have to provide a desktop file describing your dynamic menu. The
  * relevant entries are: Name, Comment, Icon and X-KDE-Library (which contains the
  * library name without any extension). This desktop file has to be installed in
- * $KDEDIR/share/apps/kicker/menuext/.
+ * $TDEDIR/share/apps/kicker/menuext/.
  *
  * @author The kicker maintainers, Michael Goffioul <tdeprint@swing.be>
  */
diff --git a/extra/kde342/kpanelmenu.h b/extra/kde342/kpanelmenu.h
index 3e33239..42b5c9a 100644
--- a/extra/kde342/kpanelmenu.h
+++ b/extra/kde342/kpanelmenu.h
@@ -46,7 +46,7 @@ class KPanelMenuPrivate;
  * Finally, you also have to provide a desktop file describing your dynamic menu. The
  * relevant entries are: Name, Comment, Icon and X-KDE-Library (which contains the
  * library name without any extension). This desktop file has to be installed in
- * $KDEDIR/share/apps/kicker/menuext/.
+ * $TDEDIR/share/apps/kicker/menuext/.
  *
  * @author The kicker maintainers, Michael Goffioul <tdeprint@swing.be>
  */
diff --git a/extra/kde343/kpanelmenu.h b/extra/kde343/kpanelmenu.h
index 3e33239..42b5c9a 100644
--- a/extra/kde343/kpanelmenu.h
+++ b/extra/kde343/kpanelmenu.h
@@ -46,7 +46,7 @@ class KPanelMenuPrivate;
  * Finally, you also have to provide a desktop file describing your dynamic menu. The
  * relevant entries are: Name, Comment, Icon and X-KDE-Library (which contains the
  * library name without any extension). This desktop file has to be installed in
- * $KDEDIR/share/apps/kicker/menuext/.
+ * $TDEDIR/share/apps/kicker/menuext/.
  *
  * @author The kicker maintainers, Michael Goffioul <tdeprint@swing.be>
  */
diff --git a/extra/kde350/kpanelmenu.h b/extra/kde350/kpanelmenu.h
index 3e33239..42b5c9a 100644
--- a/extra/kde350/kpanelmenu.h
+++ b/extra/kde350/kpanelmenu.h
@@ -46,7 +46,7 @@ class KPanelMenuPrivate;
  * Finally, you also have to provide a desktop file describing your dynamic menu. The
  * relevant entries are: Name, Comment, Icon and X-KDE-Library (which contains the
  * library name without any extension). This desktop file has to be installed in
- * $KDEDIR/share/apps/kicker/menuext/.
+ * $TDEDIR/share/apps/kicker/menuext/.
  *
  * @author The kicker maintainers, Michael Goffioul <tdeprint@swing.be>
  */
diff --git a/extra/kde351/kpanelmenu.h b/extra/kde351/kpanelmenu.h
index 3e33239..42b5c9a 100644
--- a/extra/kde351/kpanelmenu.h
+++ b/extra/kde351/kpanelmenu.h
@@ -46,7 +46,7 @@ class KPanelMenuPrivate;
  * Finally, you also have to provide a desktop file describing your dynamic menu. The
  * relevant entries are: Name, Comment, Icon and X-KDE-Library (which contains the
  * library name without any extension). This desktop file has to be installed in
- * $KDEDIR/share/apps/kicker/menuext/.
+ * $TDEDIR/share/apps/kicker/menuext/.
  *
  * @author The kicker maintainers, Michael Goffioul <tdeprint@swing.be>
  */
diff --git a/extra/kde352/kpanelmenu.h b/extra/kde352/kpanelmenu.h
index 3e33239..42b5c9a 100644
--- a/extra/kde352/kpanelmenu.h
+++ b/extra/kde352/kpanelmenu.h
@@ -46,7 +46,7 @@ class KPanelMenuPrivate;
  * Finally, you also have to provide a desktop file describing your dynamic menu. The
  * relevant entries are: Name, Comment, Icon and X-KDE-Library (which contains the
  * library name without any extension). This desktop file has to be installed in
- * $KDEDIR/share/apps/kicker/menuext/.
+ * $TDEDIR/share/apps/kicker/menuext/.
  *
  * @author The kicker maintainers, Michael Goffioul <tdeprint@swing.be>
  */
diff --git a/extra/kde353/kpanelmenu.h b/extra/kde353/kpanelmenu.h
index 3e33239..42b5c9a 100644
--- a/extra/kde353/kpanelmenu.h
+++ b/extra/kde353/kpanelmenu.h
@@ -46,7 +46,7 @@ class KPanelMenuPrivate;
  * Finally, you also have to provide a desktop file describing your dynamic menu. The
  * relevant entries are: Name, Comment, Icon and X-KDE-Library (which contains the
  * library name without any extension). This desktop file has to be installed in
- * $KDEDIR/share/apps/kicker/menuext/.
+ * $TDEDIR/share/apps/kicker/menuext/.
  *
  * @author The kicker maintainers, Michael Goffioul <tdeprint@swing.be>
  */
diff --git a/pytde350.prj b/pytde350.prj
index 8a3924f..7e61a32 100644
--- a/pytde350.prj
+++ b/pytde350.prj
@@ -52,7 +52,7 @@ import     = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
 importpath = $IMP
 sipslot    = callBackObj callBackSlot dcopClient
 include    = ../extra/kde350/dcop
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP
 define     = "KDE_DEPRECATED", ""
 define     = "DCOP_EXPORT", ""
 
@@ -77,7 +77,7 @@ import     = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
 import     = dcop
 importpath = $IMP
 include    =
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -ltdecore -ldcopcmodule
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdecore -ldcopcmodule
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
 sipslot    = pObjSlot psMethodSlot kaccel kglobalaccel
@@ -109,7 +109,7 @@ importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
 include    = ../tdecore @KDE_INCLUDEPATH@/tdesu
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -ltdecore -ltdesu -ldcopcmodule -ltdecorecmodule
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdecore -ltdesu -ldcopcmodule -ltdecorecmodule
 
 retain
 
@@ -129,7 +129,7 @@ importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
 include    = ../tdecore @KDE_INCLUDEPATH@/tdeprint
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -ltdefx -ltdeui -ltdecore -ltdecorecmodule -ldcopcmodule
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdefx -ltdeui -ltdecore -ltdecorecmodule -ldcopcmodule
 define     = "TDEFX_EXPORT", ""
 
 retain
@@ -152,7 +152,7 @@ import     = tdecore
 import     = tdefx
 importpath = $IMP
 include    =  ../dcop ../tdecore  ../pythonize ../pykpanelapplet
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
              -ldcopcmodule -ltdecorecmodule -ltqt-mt -ltdefx -ltdefxcmodule -lpythonize
 amend      = * ctor parent /TransferThis/
 amend      = KDockMainWindow all parent /TransferThis/
@@ -185,7 +185,7 @@ importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
 include    = ../extra/kde350/kio @KDE_INCLUDEPATH@/kio ../tdecore
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -lkio -ltdeui -ltdecore -ldcopcmodule\
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkio -ltdeui -ltdecore -ldcopcmodule\
              -ltdecorecmodule -ltdeuicmodule
 sipslot    =
 define     = "\(KIO::filesize_t\)\-1", "-1"
@@ -211,7 +211,7 @@ import     = tdefxmod.sip
 import     = tdeuimod.sip
 import     = kiomod.sip
 importpath = $IMP
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lkresources
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lkresources
 define     = "KDE_DEPRECATED", ""
 define     = "KRESOURCES_EXPORT", ""
 
@@ -234,7 +234,7 @@ import     = tdeuimod.sip
 import     = kiomod.sip
 import     = kresourcesmod.sip
 importpath = $IMP
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lkabc
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lkabc
 define     = "KDE_DEPRECATED", ""
 define     = "KABC_EXPORT", ""
 define     = "typedef enum", "enum"
@@ -261,7 +261,7 @@ import     = tdeuimod.sip
 //import     = kpartsmod.sip
 importpath = $IMP
 include    =  ../dcop ../tdecore  ../tdeui ../pythonize ../pykpanelapplet
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
              -ldcopcmodule -ltdecorecmodule -ltqt-mt -ltdefx -ltdefxcmodule -lpythonize -ltdeuicmodule\
              -lkutils
 define     = "class\ KMultiTabBarButton\ \*", "KMultiTabBarButton *"
@@ -288,7 +288,7 @@ importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
 include    = @KDE_INCLUDEPATH@/kio  ../tdecore  ../kio
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -lkio -ltdeui -ltdecore -ldcopcmodule\
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkio -ltdeui -ltdecore -ldcopcmodule\
              -ltdecorecmodule -ltdeuicmodule -lkiocmodule
 
 retain
@@ -312,7 +312,7 @@ importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
 include    = @KDE_INCLUDEPATH@/kparts  @KDE_INCLUDEPATH@/kio  ../tdecore ../kio
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -lkparts -ltdeui -ltdecore -lkio -ltdeuicmodule\
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkparts -ltdeui -ltdecore -lkio -ltdeuicmodule\
              -ltdecorecmodule -lkiocmodule -ldcopcmodule -lkiocmodule
 
 retain
@@ -339,7 +339,7 @@ amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
 include    = @KDE_INCLUDEPATH@/khtml @KDE_INCLUDEPATH@/dom  @KDE_INCLUDEPATH@/kparts\
              @KDE_INCLUDEPATH@/kio ../tdecore ../kio
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeui -lkhtml -lkparts -ltdecore -lkio\
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeui -lkhtml -lkparts -ltdecore -lkio\
             -ltdeuicmodule -ltdecorecmodule -lkiocmodule -lkpartscmodule -ldcopcmodule
 
 define     = "KHTML_EXPORT", ""
@@ -367,7 +367,7 @@ retain
 //             ../tdecore  ../kio
 //amend      = * ctor parent /TransferThis/
 //amend      = * all parent /Transfer/
-//libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -lkjs -ltdeui -ltdecore -lkio -lkhtml\
+//libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkjs -ltdeui -ltdecore -lkio -lkhtml\
 //             -ltdeuicmodule -ltdecorecmodule -lkhtmlcmodule -lkiocmodule -ldcopcmodule
 
 //retain
@@ -392,7 +392,7 @@ include    = ../tdecore  @KDE_INCLUDEPATH@/kio
 amend      = * ctor parent /TransferThis/        const KGuiItem& nullGuiItem (TQString::null);
 
 amend      = * all parent /Transfer/
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -lkspell -ltdeui -ltdecore -lkio\
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkspell -ltdeui -ltdecore -lkio\
              -ltdecorecmodule -ltdeuicmodule -lkfilecmodule -ldcopcmodule
 sipslot    = obj slot kspell
 
@@ -422,7 +422,7 @@ importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
 include    = ../tdecore @KDE_INCLUDEPATH@/tdeprint
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeprint -ltdecore -ltdecorecmodule\
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeprint -ltdecore -ltdecorecmodule\
              -ldcopcmodule -ltdeui -ltdeuicmodule
 define     = "TDEPRINT_EXPORT", ""
 retain
@@ -448,7 +448,7 @@ importpath = $IMP
 ignore     = kmdiiterator.h kmdilistiterator.h kmdinulliterator.h
 
 include    =  ../dcop ../tdecore  ../tdeui ../pythonize ../pykpanelapplet
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
              -ldcopcmodule -ltdecorecmodule -ltqt-mt -ltdefx -ltdefxcmodule -lpythonize -ltdeuicmodule\
              -lkmdi
 define     = "QT_VERSION", "301"
@@ -476,7 +476,7 @@ retain
 ////import     = kpartsmod.sip
 //importpath = $IMP
 //include    =  ../dcop ../tdecore  ../tdeui ../pythonize ../pykpanelapplet
-//libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
+//libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
 //             -ldcopcmodule -ltdecorecmodule -ltqt-mt -ltdefx -ltdefxcmodule -lpythonize -ltdeuicmodule\
 //             -lkspell2
 //
diff --git a/pytde351.prj b/pytde351.prj
index 9c496b7..91de287 100644
--- a/pytde351.prj
+++ b/pytde351.prj
@@ -52,7 +52,7 @@ import     = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
 importpath = $IMP
 sipslot    = callBackObj callBackSlot dcopClient
 include    = ../extra/kde351/dcop
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP
 define     = "KDE_DEPRECATED", ""
 define     = "DCOP_EXPORT", ""
 
@@ -77,7 +77,7 @@ import     = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
 import     = dcop
 importpath = $IMP
 include    =
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -ltdecore -ldcopcmodule
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdecore -ldcopcmodule
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
 sipslot    = pObjSlot psMethodSlot kaccel kglobalaccel
@@ -109,7 +109,7 @@ importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
 include    = ../tdecore @KDE_INCLUDEPATH@/tdesu
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -ltdecore -ltdesu -ldcopcmodule -ltdecorecmodule
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdecore -ltdesu -ldcopcmodule -ltdecorecmodule
 
 retain
 
@@ -129,7 +129,7 @@ importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
 include    = ../tdecore @KDE_INCLUDEPATH@/tdeprint
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -ltdefx -ltdeui -ltdecore -ltdecorecmodule -ldcopcmodule
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdefx -ltdeui -ltdecore -ltdecorecmodule -ldcopcmodule
 define     = "TDEFX_EXPORT", ""
 
 retain
@@ -152,7 +152,7 @@ import     = tdecore
 import     = tdefx
 importpath = $IMP
 include    =  ../dcop ../tdecore  ../pythonize ../pykpanelapplet
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
              -ldcopcmodule -ltdecorecmodule -ltqt-mt -ltdefx -ltdefxcmodule -lpythonize
 amend      = * ctor parent /TransferThis/
 amend      = KDockMainWindow all parent /TransferThis/
@@ -185,7 +185,7 @@ importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
 include    = ../extra/kde351/kio @KDE_INCLUDEPATH@/kio ../tdecore
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -lkio -ltdeui -ltdecore -ldcopcmodule\
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkio -ltdeui -ltdecore -ldcopcmodule\
              -ltdecorecmodule -ltdeuicmodule
 sipslot    =
 define     = "\(KIO::filesize_t\)\-1", "-1"
@@ -211,7 +211,7 @@ import     = tdefxmod.sip
 import     = tdeuimod.sip
 import     = kiomod.sip
 importpath = $IMP
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lkresources
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lkresources
 define     = "KDE_DEPRECATED", ""
 define     = "KRESOURCES_EXPORT", ""
 
@@ -234,7 +234,7 @@ import     = tdeuimod.sip
 import     = kiomod.sip
 import     = kresourcesmod.sip
 importpath = $IMP
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lkabc -lkabc_file
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lkabc -lkabc_file
 define     = "KDE_DEPRECATED", ""
 define     = "KABC_EXPORT", ""
 define     = "typedef enum", "enum"
@@ -261,7 +261,7 @@ import     = tdeuimod.sip
 //import     = kpartsmod.sip
 importpath = $IMP
 include    =  ../dcop ../tdecore  ../tdeui ../pythonize ../pykpanelapplet
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
              -ldcopcmodule -ltdecorecmodule -ltqt-mt -ltdefx -ltdefxcmodule -lpythonize -ltdeuicmodule\
              -lkutils
 define     = "class\ KMultiTabBarButton\ \*", "KMultiTabBarButton *"
@@ -288,7 +288,7 @@ importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
 include    = @KDE_INCLUDEPATH@/kio  ../tdecore  ../kio
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -lkio -ltdeui -ltdecore -ldcopcmodule\
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkio -ltdeui -ltdecore -ldcopcmodule\
              -ltdecorecmodule -ltdeuicmodule -lkiocmodule
 
 retain
@@ -312,7 +312,7 @@ importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
 include    = @KDE_INCLUDEPATH@/kparts  @KDE_INCLUDEPATH@/kio  ../tdecore ../kio
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -lkparts -ltdeui -ltdecore -lkio -ltdeuicmodule\
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkparts -ltdeui -ltdecore -lkio -ltdeuicmodule\
              -ltdecorecmodule -lkiocmodule -ldcopcmodule -lkiocmodule
 
 retain
@@ -339,7 +339,7 @@ amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
 include    = @KDE_INCLUDEPATH@/khtml @KDE_INCLUDEPATH@/dom  @KDE_INCLUDEPATH@/kparts\
              @KDE_INCLUDEPATH@/kio ../tdecore ../kio
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeui -lkhtml -lkparts -ltdecore -lkio\
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeui -lkhtml -lkparts -ltdecore -lkio\
             -ltdeuicmodule -ltdecorecmodule -lkiocmodule -lkpartscmodule -ldcopcmodule
 
 define     = "KHTML_EXPORT", ""
@@ -367,7 +367,7 @@ retain
 //             ../tdecore  ../kio
 //amend      = * ctor parent /TransferThis/
 //amend      = * all parent /Transfer/
-//libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -lkjs -ltdeui -ltdecore -lkio -lkhtml\
+//libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkjs -ltdeui -ltdecore -lkio -lkhtml\
 //             -ltdeuicmodule -ltdecorecmodule -lkhtmlcmodule -lkiocmodule -ldcopcmodule
 
 //retain
@@ -392,7 +392,7 @@ include    = ../tdecore  @KDE_INCLUDEPATH@/kio
 amend      = * ctor parent /TransferThis/        const KGuiItem& nullGuiItem (TQString::null);
 
 amend      = * all parent /Transfer/
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -lkspell -ltdeui -ltdecore -lkio\
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkspell -ltdeui -ltdecore -lkio\
              -ltdecorecmodule -ltdeuicmodule -lkfilecmodule -ldcopcmodule
 sipslot    = obj slot kspell
 
@@ -422,7 +422,7 @@ importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
 include    = ../tdecore @KDE_INCLUDEPATH@/tdeprint
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeprint -ltdecore -ltdecorecmodule\
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeprint -ltdecore -ltdecorecmodule\
              -ldcopcmodule -ltdeui -ltdeuicmodule
 define     = "TDEPRINT_EXPORT", ""
 retain
@@ -448,7 +448,7 @@ importpath = $IMP
 ignore     = kmdiiterator.h kmdilistiterator.h kmdinulliterator.h
 
 include    =  ../dcop ../tdecore  ../tdeui ../pythonize ../pykpanelapplet
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
              -ldcopcmodule -ltdecorecmodule -ltqt-mt -ltdefx -ltdefxcmodule -lpythonize -ltdeuicmodule\
              -lkmdi
 define     = "QT_VERSION", "301"
@@ -476,7 +476,7 @@ retain
 ////import     = kpartsmod.sip
 //importpath = $IMP
 //include    =  ../dcop ../tdecore  ../tdeui ../pythonize ../pykpanelapplet
-//libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
+//libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
 //             -ldcopcmodule -ltdecorecmodule -ltqt-mt -ltdefx -ltdefxcmodule -lpythonize -ltdeuicmodule\
 //             -lkspell2
 //
diff --git a/pytde352.prj b/pytde352.prj
index ebf02c5..93f6b52 100644
--- a/pytde352.prj
+++ b/pytde352.prj
@@ -52,7 +52,7 @@ import     = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
 importpath = $IMP
 sipslot    = callBackObj callBackSlot dcopClient
 include    = ../extra/kde352/dcop
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP
 define     = "KDE_DEPRECATED", ""
 define     = "DCOP_EXPORT", ""
 
@@ -77,7 +77,7 @@ import     = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
 import     = dcop
 importpath = $IMP
 include    =
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -ltdecore -ldcopcmodule
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdecore -ldcopcmodule
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
 sipslot    = pObjSlot psMethodSlot kaccel kglobalaccel
@@ -109,7 +109,7 @@ importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
 include    = ../tdecore @KDE_INCLUDEPATH@/tdesu
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -ltdecore -ltdesu -ldcopcmodule -ltdecorecmodule
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdecore -ltdesu -ldcopcmodule -ltdecorecmodule
 
 retain
 
@@ -129,7 +129,7 @@ importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
 include    = ../tdecore @KDE_INCLUDEPATH@/tdeprint
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -ltdefx -ltdeui -ltdecore -ltdecorecmodule -ldcopcmodule
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdefx -ltdeui -ltdecore -ltdecorecmodule -ldcopcmodule
 define     = "TDEFX_EXPORT", ""
 
 retain
@@ -152,7 +152,7 @@ import     = tdecore
 import     = tdefx
 importpath = $IMP
 include    =  ../dcop ../tdecore  ../pythonize ../pykpanelapplet
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
              -ldcopcmodule -ltdecorecmodule -ltqt-mt -ltdefx -ltdefxcmodule -lpythonize
 amend      = * ctor parent /TransferThis/
 amend      = KDockMainWindow all parent /TransferThis/
@@ -185,7 +185,7 @@ importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
 include    = ../extra/kde352/kio @KDE_INCLUDEPATH@/kio ../tdecore
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -lkio -ltdeui -ltdecore -ldcopcmodule\
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkio -ltdeui -ltdecore -ldcopcmodule\
              -ltdecorecmodule -ltdeuicmodule
 sipslot    =
 define     = "\(KIO::filesize_t\)\-1", "-1"
@@ -211,7 +211,7 @@ import     = tdefxmod.sip
 import     = tdeuimod.sip
 import     = kiomod.sip
 importpath = $IMP
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lkresources
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lkresources
 define     = "KDE_DEPRECATED", ""
 define     = "KRESOURCES_EXPORT", ""
 
@@ -234,7 +234,7 @@ import     = tdeuimod.sip
 import     = kiomod.sip
 import     = kresourcesmod.sip
 importpath = $IMP
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lkabc -lkabc_file
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lkabc -lkabc_file
 define     = "KDE_DEPRECATED", ""
 define     = "KABC_EXPORT", ""
 define     = "typedef enum", "enum"
@@ -261,7 +261,7 @@ import     = tdeuimod.sip
 //import     = kpartsmod.sip
 importpath = $IMP
 include    =  ../dcop ../tdecore  ../tdeui ../pythonize ../pykpanelapplet
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
              -ldcopcmodule -ltdecorecmodule -ltqt-mt -ltdefx -ltdefxcmodule -lpythonize -ltdeuicmodule\
              -lkutils
 define     = "class\ KMultiTabBarButton\ \*", "KMultiTabBarButton *"
@@ -288,7 +288,7 @@ importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
 include    = @KDE_INCLUDEPATH@/kio  ../tdecore  ../kio
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -lkio -ltdeui -ltdecore -ldcopcmodule\
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkio -ltdeui -ltdecore -ldcopcmodule\
              -ltdecorecmodule -ltdeuicmodule -lkiocmodule
 
 retain
@@ -312,7 +312,7 @@ importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
 include    = @KDE_INCLUDEPATH@/kparts  @KDE_INCLUDEPATH@/kio  ../tdecore ../kio
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -lkparts -ltdeui -ltdecore -lkio -ltdeuicmodule\
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkparts -ltdeui -ltdecore -lkio -ltdeuicmodule\
              -ltdecorecmodule -lkiocmodule -ldcopcmodule -lkiocmodule
 
 retain
@@ -339,7 +339,7 @@ amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
 include    = @KDE_INCLUDEPATH@/khtml @KDE_INCLUDEPATH@/dom  @KDE_INCLUDEPATH@/kparts\
              @KDE_INCLUDEPATH@/kio ../tdecore ../kio
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeui -lkhtml -lkparts -ltdecore -lkio\
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeui -lkhtml -lkparts -ltdecore -lkio\
             -ltdeuicmodule -ltdecorecmodule -lkiocmodule -lkpartscmodule -ldcopcmodule
 
 define     = "KHTML_EXPORT", ""
@@ -367,7 +367,7 @@ retain
 //             ../tdecore  ../kio
 //amend      = * ctor parent /TransferThis/
 //amend      = * all parent /Transfer/
-//libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -lkjs -ltdeui -ltdecore -lkio -lkhtml\
+//libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkjs -ltdeui -ltdecore -lkio -lkhtml\
 //             -ltdeuicmodule -ltdecorecmodule -lkhtmlcmodule -lkiocmodule -ldcopcmodule
 
 //retain
@@ -392,7 +392,7 @@ include    = ../tdecore  @KDE_INCLUDEPATH@/kio
 amend      = * ctor parent /TransferThis/        const KGuiItem& nullGuiItem (TQString::null);
 
 amend      = * all parent /Transfer/
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -lkspell -ltdeui -ltdecore -lkio\
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkspell -ltdeui -ltdecore -lkio\
              -ltdecorecmodule -ltdeuicmodule -lkfilecmodule -ldcopcmodule
 sipslot    = obj slot kspell
 
@@ -422,7 +422,7 @@ importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
 include    = ../tdecore @KDE_INCLUDEPATH@/tdeprint
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeprint -ltdecore -ltdecorecmodule\
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeprint -ltdecore -ltdecorecmodule\
              -ldcopcmodule -ltdeui -ltdeuicmodule
 define     = "TDEPRINT_EXPORT", ""
 retain
@@ -448,7 +448,7 @@ importpath = $IMP
 ignore     = kmdiiterator.h kmdilistiterator.h kmdinulliterator.h
 
 include    =  ../dcop ../tdecore  ../tdeui ../pythonize ../pykpanelapplet
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
              -ldcopcmodule -ltdecorecmodule -ltqt-mt -ltdefx -ltdefxcmodule -lpythonize -ltdeuicmodule\
              -lkmdi
 define     = "QT_VERSION", "301"
@@ -476,7 +476,7 @@ retain
 ////import     = kpartsmod.sip
 //importpath = $IMP
 //include    =  ../dcop ../tdecore  ../tdeui ../pythonize ../pykpanelapplet
-//libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
+//libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
 //             -ldcopcmodule -ltdecorecmodule -ltqt-mt -ltdefx -ltdefxcmodule -lpythonize -ltdeuicmodule\
 //             -lkspell2
 //
diff --git a/pytde353.prj b/pytde353.prj
index 50e318f..b1f9bde 100644
--- a/pytde353.prj
+++ b/pytde353.prj
@@ -52,7 +52,7 @@ import     = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
 importpath = $IMP
 sipslot    = callBackObj callBackSlot dcopClient
 include    = ../extra/kde353/dcop
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP
 define     = "KDE_DEPRECATED", ""
 define     = "DCOP_EXPORT", ""
 
@@ -77,7 +77,7 @@ import     = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11)
 import     = dcop
 importpath = $IMP
 include    =
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -ltdecore -ldcopcmodule
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdecore -ldcopcmodule
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
 sipslot    = pObjSlot psMethodSlot kaccel kglobalaccel
@@ -109,7 +109,7 @@ importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
 include    = ../tdecore @KDE_INCLUDEPATH@/tdesu
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -ltdecore -ltdesu -ldcopcmodule -ltdecorecmodule
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdecore -ltdesu -ldcopcmodule -ltdecorecmodule
 
 retain
 
@@ -129,7 +129,7 @@ importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
 include    = ../tdecore @KDE_INCLUDEPATH@/tdeprint
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -ltdefx -ltdeui -ltdecore -ltdecorecmodule -ldcopcmodule
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdefx -ltdeui -ltdecore -ltdecorecmodule -ldcopcmodule
 define     = "TDEFX_EXPORT", ""
 
 retain
@@ -152,7 +152,7 @@ import     = tdecore
 import     = tdefx
 importpath = $IMP
 include    =  ../dcop ../tdecore  ../pythonize ../pykpanelapplet
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
              -ldcopcmodule -ltdecorecmodule -ltqt-mt -ltdefx -ltdefxcmodule -lpythonize
 amend      = * ctor parent /TransferThis/
 amend      = KDockMainWindow all parent /TransferThis/
@@ -185,7 +185,7 @@ importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
 include    = ../extra/kde353/kio @KDE_INCLUDEPATH@/kio ../tdecore
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -lkio -ltdeui -ltdecore -ldcopcmodule\
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkio -ltdeui -ltdecore -ldcopcmodule\
              -ltdecorecmodule -ltdeuicmodule
 sipslot    =
 define     = "\(KIO::filesize_t\)\-1", "-1"
@@ -211,7 +211,7 @@ import     = tdefxmod.sip
 import     = tdeuimod.sip
 import     = kiomod.sip
 importpath = $IMP
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lkresources
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lkresources
 define     = "KDE_DEPRECATED", ""
 define     = "KRESOURCES_EXPORT", ""
 
@@ -234,7 +234,7 @@ import     = tdeuimod.sip
 import     = kiomod.sip
 import     = kresourcesmod.sip
 importpath = $IMP
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lkabc -lkabc_file
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lkabc -lkabc_file
 define     = "KDE_DEPRECATED", ""
 define     = "KABC_EXPORT", ""
 define     = "typedef enum", "enum"
@@ -261,7 +261,7 @@ import     = tdeuimod.sip
 //import     = kpartsmod.sip
 importpath = $IMP
 include    =  ../dcop ../tdecore  ../tdeui ../pythonize ../pykpanelapplet
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
              -ldcopcmodule -ltdecorecmodule -ltqt-mt -ltdefx -ltdefxcmodule -lpythonize -ltdeuicmodule\
              -lkutils
 define     = "class\ KMultiTabBarButton\ \*", "KMultiTabBarButton *"
@@ -288,7 +288,7 @@ importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
 include    = @KDE_INCLUDEPATH@/kio  ../tdecore  ../kio
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -lkio -ltdeui -ltdecore -ldcopcmodule\
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkio -ltdeui -ltdecore -ldcopcmodule\
              -ltdecorecmodule -ltdeuicmodule -lkiocmodule
 
 retain
@@ -312,7 +312,7 @@ importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
 include    = @KDE_INCLUDEPATH@/kparts  @KDE_INCLUDEPATH@/kio  ../tdecore ../kio
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -lkparts -ltdeui -ltdecore -lkio -ltdeuicmodule\
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkparts -ltdeui -ltdecore -lkio -ltdeuicmodule\
              -ltdecorecmodule -lkiocmodule -ldcopcmodule -lkiocmodule
 
 retain
@@ -339,7 +339,7 @@ amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
 include    = @KDE_INCLUDEPATH@/khtml @KDE_INCLUDEPATH@/dom  @KDE_INCLUDEPATH@/kparts\
              @KDE_INCLUDEPATH@/kio ../tdecore ../kio
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeui -lkhtml -lkparts -ltdecore -lkio\
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeui -lkhtml -lkparts -ltdecore -lkio\
             -ltdeuicmodule -ltdecorecmodule -lkiocmodule -lkpartscmodule -ldcopcmodule
 
 define     = "KHTML_EXPORT", ""
@@ -367,7 +367,7 @@ retain
 //             ../tdecore  ../kio
 //amend      = * ctor parent /TransferThis/
 //amend      = * all parent /Transfer/
-//libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -lkjs -ltdeui -ltdecore -lkio -lkhtml\
+//libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkjs -ltdeui -ltdecore -lkio -lkhtml\
 //             -ltdeuicmodule -ltdecorecmodule -lkhtmlcmodule -lkiocmodule -ldcopcmodule
 
 //retain
@@ -392,7 +392,7 @@ include    = ../tdecore  @KDE_INCLUDEPATH@/kio
 amend      = * ctor parent /TransferThis/        const KGuiItem& nullGuiItem (TQString::null);
 
 amend      = * all parent /Transfer/
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -lkspell -ltdeui -ltdecore -lkio\
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -lkspell -ltdeui -ltdecore -lkio\
              -ltdecorecmodule -ltdeuicmodule -lkfilecmodule -ldcopcmodule
 sipslot    = obj slot kspell
 
@@ -422,7 +422,7 @@ importpath = $IMP
 amend      = * ctor parent /TransferThis/
 amend      = * all parent /Transfer/
 include    = ../tdecore @KDE_INCLUDEPATH@/tdeprint
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeprint -ltdecore -ltdecorecmodule\
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeprint -ltdecore -ltdecorecmodule\
              -ldcopcmodule -ltdeui -ltdeuicmodule
 define     = "TDEPRINT_EXPORT", ""
 retain
@@ -448,7 +448,7 @@ importpath = $IMP
 ignore     = kmdiiterator.h kmdilistiterator.h kmdinulliterator.h
 
 include    =  ../dcop ../tdecore  ../tdeui ../pythonize ../pykpanelapplet
-libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
+libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
              -ldcopcmodule -ltdecorecmodule -ltqt-mt -ltdefx -ltdefxcmodule -lpythonize -ltdeuicmodule\
              -lkmdi
 define     = "QT_VERSION", "301"
@@ -476,7 +476,7 @@ retain
 ////import     = kpartsmod.sip
 //importpath = $IMP
 //include    =  ../dcop ../tdecore  ../tdeui ../pythonize ../pykpanelapplet
-//libs       =  -L@BL_KDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
+//libs       =  -L@BL_TDEDIR@ -lsip -lqtcmodule -lqtxmlcmodule -lDCOP -ltdecore -ltdeui\
 //             -ldcopcmodule -ltdecorecmodule -ltqt-mt -ltdefx -ltdefxcmodule -lpythonize -ltdeuicmodule\
 //             -lkspell2
 //
diff --git a/templates/annotated/menuapp3.py b/templates/annotated/menuapp3.py
index bcea5e1..ce6eb27 100644
--- a/templates/annotated/menuapp3.py
+++ b/templates/annotated/menuapp3.py
@@ -63,7 +63,7 @@ class MainWin (KMainWindow):
         # menuapp2.py. Otherwise, the menuapp2 and menuapp3
         # are identical  'createGUI' expects to find 'menuapp3ui.rc'
         # either in the directory menuapp3.py is run from, or
-        # in $KDEDIR/apps/menuapp3/
+        # in $TDEDIR/apps/menuapp3/
         self.createGUI ()
 
         # Create the status bar
@@ -87,7 +87,7 @@ class MainWin (KMainWindow):
         # The standard actions only need to specify the slot
         # where the code for the action is located
 
-        # Because the XMLGUI mechanism parses $KDEDIR/config/ui/ui_standards.rc
+        # Because the XMLGUI mechanism parses $TDEDIR/config/ui/ui_standards.rc
         # before parsing and merging menuapp3ui.rc, it actually isn't
         # necessary to list KStdAction actions in menuapp3.rc. THE XMLGUI
         # code will create menu/toolbar items and place them *automatically*