8 files changed, 16 insertions, 16 deletions
diff --git a/parts/appwizard/common/admin.kdevtemplate b/parts/appwizard/common/admin.kdevtemplate
index 67172eda..73573b47 100644
--- a/parts/appwizard/common/admin.kdevtemplate
+++ b/parts/appwizard/common/admin.kdevtemplate
@@ -1,5 +1,5 @@
 [ADMIN]
 Type=install archive
-Source=%{kdevelop}/template-common/admin.tar.gz
+Source=%{tdevelop}/template-common/admin.tar.gz
 Dest=%{dest}
 Process=false
diff --git a/parts/appwizard/common/dockbook.kdevtemplate b/parts/appwizard/common/dockbook.kdevtemplate
index a6cacf95..d07da4e6 100644
--- a/parts/appwizard/common/dockbook.kdevtemplate
+++ b/parts/appwizard/common/dockbook.kdevtemplate
@@ -45,19 +45,19 @@ Option=INSTALL_DOCS
 
 [DOCSMAKEFILE.AM1]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-Makefile.am
 Dest=%{dest}/doc/Makefile.am
 Option=INSTALL_DOCS
 
 [DOCSMAKEFILE.AM2]
 Type=install
-Source=%{kdevelop}/template-common/kde-doc-en-Makefile.am
+Source=%{tdevelop}/template-common/kde-doc-en-Makefile.am
 Dest=%{dest}/doc/en/Makefile.am
 Option=INSTALL_DOCS
 
 [DOCS]
 Type=install
-Source=%{kdevelop}/template-common/kde-index.docbook
+Source=%{tdevelop}/template-common/kde-index.docbook
 Dest=%{dest}/doc/en/index.docbook
 Option=INSTALL_DOCS
 
diff --git a/parts/appwizard/common/gnome2.kdevtemplate b/parts/appwizard/common/gnome2.kdevtemplate
index 02f631bf..ce4e3f3d 100644
--- a/parts/appwizard/common/gnome2.kdevtemplate
+++ b/parts/appwizard/common/gnome2.kdevtemplate
@@ -1,5 +1,5 @@
 [GNOME2]
 Type=install archive
-Source=%{kdevelop}/template-common/gnome2.tar.gz
+Source=%{tdevelop}/template-common/gnome2.tar.gz
 Dest=%{dest}
 
diff --git a/parts/appwizard/common/gnu.kdevtemplate b/parts/appwizard/common/gnu.kdevtemplate
index 29e75291..e1876440 100644
--- a/parts/appwizard/common/gnu.kdevtemplate
+++ b/parts/appwizard/common/gnu.kdevtemplate
@@ -1,5 +1,5 @@
 [GNU]
 Type=install archive
-Source=%{kdevelop}/template-common/gnu.tar.gz
+Source=%{tdevelop}/template-common/gnu.tar.gz
 Dest=%{dest}
 
diff --git a/parts/appwizard/common/incadmin.kdevtemplate b/parts/appwizard/common/incadmin.kdevtemplate
index c94c2be5..d7fbfb61 100644
--- a/parts/appwizard/common/incadmin.kdevtemplate
+++ b/parts/appwizard/common/incadmin.kdevtemplate
@@ -1,5 +1,5 @@
 [INCADMIN]
 Type=install archive
-Source=%{kdevelop}/template-common/incadmin.tar.gz
+Source=%{tdevelop}/template-common/incadmin.tar.gz
 Dest=%{dest}
 Process=false
diff --git a/parts/appwizard/common/kde-index.docbook b/parts/appwizard/common/kde-index.docbook
index 80031f00..aacd7a48 100644
--- a/parts/appwizard/common/kde-index.docbook
+++ b/parts/appwizard/common/kde-index.docbook
@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
   <!ENTITY %{APPNAMELC} "<application>%{APPNAME} %{VERSION}</application>">
   <!ENTITY kappname "&%{APPNAMELC};"><!-- Do *not* replace kappname-->
-  <!ENTITY package "kde-module"><!-- kdebase, kdeadmin, etc -->
+  <!ENTITY package "kde-module"><!-- tdebase, tdeadmin, etc -->
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE"><!-- change language only here -->
   
@@ -489,7 +489,7 @@ application -->
 <!--
 List any special requirements for your application here. This should include:
 .Libraries or other software that is not included in tdesupport,
-kdelibs, or kdebase.
+tdelibs, or tdebase.
 .Hardware requirements like amount of RAM, disk space, graphics card
 capabilities, screen resolution, special expansion cards, etc.
 .Operating systems the app will run on. If your app is designed only for a
diff --git a/parts/appwizard/common/scons.kdevtemplate b/parts/appwizard/common/scons.kdevtemplate
index 7cf03e0b..84ed350f 100644
--- a/parts/appwizard/common/scons.kdevtemplate
+++ b/parts/appwizard/common/scons.kdevtemplate
@@ -1,5 +1,5 @@
 [SCONS]
 Type=install archive
-Source=%{kdevelop}/template-common/scons.tar.gz
+Source=%{tdevelop}/template-common/scons.tar.gz
 Dest=%{dest}
 Process=false
diff --git a/parts/appwizard/common/scons/admin/kde.py b/parts/appwizard/common/scons/admin/kde.py
index 491acca8..494aaf27 100644
--- a/parts/appwizard/common/scons/admin/kde.py
+++ b/parts/appwizard/common/scons/admin/kde.py
@@ -35,7 +35,7 @@ def detect_kde(env):
 	libdir      = env['ARGS'].get('libdir', None)
 	libsuffix   = env['ARGS'].get('libsuffix', '')
 	kdeincludes = env['ARGS'].get('kdeincludes', None)
-	kdelibs     = env['ARGS'].get('kdelibs', None)
+	tdelibs     = env['ARGS'].get('tdelibs', None)
 	qtincludes  = env['ARGS'].get('qtincludes', None)
 	qtlibs      = env['ARGS'].get('qtlibs', None)
 
@@ -50,7 +50,7 @@ def detect_kde(env):
 	else:
 		print RED+"kde-config was NOT found in your PATH"+NORMAL
 		print "Make sure kde is installed properly"
-		print "(missing package kdebase-devel?)"
+		print "(missing package tdebase-devel?)"
 		env.Exit(1)
 	env['KDEDIR'] = os.popen('kde-config -prefix').read().strip()
 
@@ -193,9 +193,9 @@ def detect_kde(env):
 
 	## kde libs and includes
 	env['KDEINCLUDEPATH']=kdeincludes
-	if not kdelibs:
-		kdelibs=os.popen('kde-config --expandvars --install lib').read().strip()
-	env['KDELIBPATH']=kdelibs
+	if not tdelibs:
+		tdelibs=os.popen('kde-config --expandvars --install lib').read().strip()
+	env['KDELIBPATH']=tdelibs
 
 	## qt libs and includes
 	env['QTINCLUDEPATH']=qtincludes
@@ -216,7 +216,7 @@ def generate(env):
 """+BOLD+"""* libsuffix  """+NORMAL+""": suffix of libraries on amd64, ie: 64, 32
 """+BOLD+"""* kdeincludes"""+NORMAL+""": path to the kde includes (/usr/include/kde on debian, ...)
 """+BOLD+"""* qtincludes """+NORMAL+""": same punishment, for qt includes (/usr/include/qt on debian, ...)
-"""+BOLD+"""* kdelibs    """+NORMAL+""": path to the kde libs, for linking the programs
+"""+BOLD+"""* tdelibs    """+NORMAL+""": path to the kde libs, for linking the programs
 """+BOLD+"""* qtlibs     """+NORMAL+""": same punishment, for qt libraries
 ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 """+NORMAL