diff --git a/tde-i18n-ca/docs/tdebase/userguide/Makefile.in b/tde-i18n-ca/docs/tdebase/userguide/Makefile.in
index 3fba4e919a4..7fc31d1441d 100644
--- a/tde-i18n-ca/docs/tdebase/userguide/Makefile.in
+++ b/tde-i18n-ca/docs/tdebase/userguide/Makefile.in
@@ -525,10 +525,10 @@ uninstall-am:
 .NOEXPORT:
 
 #>+ 2
-KDE_DIST=kde-as-root.docbook browser-fine-tuning.docbook accessibility.docbook your-kde-account.docbook programs-controlling.docbook knode-mail-account.png kcontrol.png pdf-files.docbook kde-edutainment.docbook index.docbook the-filemanager.docbook services.png control-center.docbook troubleshooting-network-x.docbook migrator-dictionary.docbook glossary.docbook networking-with-windows.docbook credits-and-license.docbook where-next.docbook amarok.png removable-disks.docbook getting-help.docbook kmouth2.png knode-news-account.png screen-captures.docbook extragear-applications.docbook font-installation.docbook standard-menu-entries.docbook panel-and-desktop.docbook knode-identity.png email.docbook customizing-desktop.docbook knode-start.png playing-audiocds.docbook index.cache.bz2 file-sharing.docbook playing-movies.docbook troubleshooting-no-open.docbook base-kde-applications.docbook kmouth3.png messaging-intro.docbook playing-music.docbook programs-and-documents.docbook usenet.docbook kde-for-admins.docbook kmouth.png kmag.png net-connection-setup.docbook groupware-kontact.docbook internet-shortcuts.docbook burning-cds.docbook creating-graphics.docbook konsole-intro.docbook kmousetool.png windows-how-to.docbook Makefile.in kde-office.docbook printer-setup.docbook under-the-hood.docbook titlebar-menu.png switching-sessions.docbook migrator-applications.docbook konq-sidebar.png printing-from-apps.docbook Makefile.am shared-sessions.docbook 
+KDE_DIST=tde-as-root.docbook browser-fine-tuning.docbook accessibility.docbook your-tde-account.docbook programs-controlling.docbook knode-mail-account.png kcontrol.png pdf-files.docbook tde-edutainment.docbook index.docbook the-filemanager.docbook services.png control-center.docbook troubleshooting-network-x.docbook migrator-dictionary.docbook glossary.docbook networking-with-windows.docbook credits-and-license.docbook where-next.docbook amarok.png removable-disks.docbook getting-help.docbook kmouth2.png knode-news-account.png screen-captures.docbook extragear-applications.docbook font-installation.docbook standard-menu-entries.docbook panel-and-desktop.docbook knode-identity.png email.docbook customizing-desktop.docbook knode-start.png playing-audiocds.docbook index.cache.bz2 file-sharing.docbook playing-movies.docbook troubleshooting-no-open.docbook base-tde-applications.docbook kmouth3.png messaging-intro.docbook playing-music.docbook programs-and-documents.docbook usenet.docbook tde-for-admins.docbook kmouth.png kmag.png net-connection-setup.docbook groupware-kontact.docbook internet-shortcuts.docbook burning-cds.docbook creating-graphics.docbook konsole-intro.docbook kmousetool.png windows-how-to.docbook Makefile.in tde-office.docbook printer-setup.docbook under-the-hood.docbook titlebar-menu.png switching-sessions.docbook migrator-applications.docbook konq-sidebar.png printing-from-apps.docbook Makefile.am shared-sessions.docbook 
 
 #>+ 24
-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook knode-news-account.png kmag.png your-kde-account.docbook kde-edutainment.docbook kmousetool.png getting-help.docbook services.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook kmouth.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook removable-disks.docbook konq-sidebar.png panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook kmouth3.png playing-music.docbook pdf-files.docbook printing-from-apps.docbook kmouth2.png internet-shortcuts.docbook kcontrol.png burning-cds.docbook knode-identity.png troubleshooting-network-x.docbook 
+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) tde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook knode-news-account.png kmag.png your-tde-account.docbook tde-edutainment.docbook kmousetool.png getting-help.docbook services.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook kmouth.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook removable-disks.docbook konq-sidebar.png panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook kmouth3.png playing-music.docbook pdf-files.docbook printing-from-apps.docbook kmouth2.png internet-shortcuts.docbook kcontrol.png burning-cds.docbook knode-identity.png troubleshooting-network-x.docbook 
 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
 
 docs-am: index.cache.bz2
@@ -555,20 +555,20 @@ clean-docs:
 #>+ 13
 install-nls:
 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide
-	@for base in kde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook knode-news-account.png kmag.png your-kde-account.docbook kde-edutainment.docbook kmousetool.png getting-help.docbook services.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook kmouth.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook removable-disks.docbook konq-sidebar.png panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook kmouth3.png playing-music.docbook pdf-files.docbook printing-from-apps.docbook kmouth2.png internet-shortcuts.docbook kcontrol.png burning-cds.docbook knode-identity.png troubleshooting-network-x.docbook ; do \
+	@for base in tde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook knode-news-account.png kmag.png your-tde-account.docbook tde-edutainment.docbook kmousetool.png getting-help.docbook services.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook kmouth.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook removable-disks.docbook konq-sidebar.png panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook kmouth3.png playing-music.docbook pdf-files.docbook printing-from-apps.docbook kmouth2.png internet-shortcuts.docbook kcontrol.png burning-cds.docbook knode-identity.png troubleshooting-network-x.docbook ; do \
 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
 	done
 
 uninstall-nls:
-	for base in kde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook knode-news-account.png kmag.png your-kde-account.docbook kde-edutainment.docbook kmousetool.png getting-help.docbook services.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook kmouth.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook removable-disks.docbook konq-sidebar.png panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook kmouth3.png playing-music.docbook pdf-files.docbook printing-from-apps.docbook kmouth2.png internet-shortcuts.docbook kcontrol.png burning-cds.docbook knode-identity.png troubleshooting-network-x.docbook ; do \
+	for base in tde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook knode-news-account.png kmag.png your-tde-account.docbook tde-edutainment.docbook kmousetool.png getting-help.docbook services.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook kmouth.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook removable-disks.docbook konq-sidebar.png panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook kmouth3.png playing-music.docbook pdf-files.docbook printing-from-apps.docbook kmouth2.png internet-shortcuts.docbook kcontrol.png burning-cds.docbook knode-identity.png troubleshooting-network-x.docbook ; do \
 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
 	done
 
 
 #>+ 5
 distdir-nls:
-	for file in kde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook knode-news-account.png kmag.png your-kde-account.docbook kde-edutainment.docbook kmousetool.png getting-help.docbook services.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook kmouth.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook removable-disks.docbook konq-sidebar.png panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook kmouth3.png playing-music.docbook pdf-files.docbook printing-from-apps.docbook kmouth2.png internet-shortcuts.docbook kcontrol.png burning-cds.docbook knode-identity.png troubleshooting-network-x.docbook ; do \
+	for file in tde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook knode-news-account.png kmag.png your-tde-account.docbook tde-edutainment.docbook kmousetool.png getting-help.docbook services.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook kmouth.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook removable-disks.docbook konq-sidebar.png panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook kmouth3.png playing-music.docbook pdf-files.docbook printing-from-apps.docbook kmouth2.png internet-shortcuts.docbook kcontrol.png burning-cds.docbook knode-identity.png troubleshooting-network-x.docbook ; do \
 	  cp $(srcdir)/$$file $(distdir); \
 	done
 
diff --git a/tde-i18n-ca/docs/tdebase/userguide/base-kde-applications.docbook b/tde-i18n-ca/docs/tdebase/userguide/base-tde-applications.docbook
similarity index 99%
rename from tde-i18n-ca/docs/tdebase/userguide/base-kde-applications.docbook
rename to tde-i18n-ca/docs/tdebase/userguide/base-tde-applications.docbook
index b430e54475b..0bdadf6d20d 100644
--- a/tde-i18n-ca/docs/tdebase/userguide/base-kde-applications.docbook
+++ b/tde-i18n-ca/docs/tdebase/userguide/base-tde-applications.docbook
@@ -593,7 +593,7 @@
 >Oficina</title>
 
 <para
->Inclou totes les aplicacions de l'entorn d'oficina &koffice;. Mireu <xref linkend="kde-office-components"/> per obtenir una llista dels components.</para>
+>Inclou totes les aplicacions de l'entorn d'oficina &koffice;. Mireu <xref linkend="tde-office-components"/> per obtenir una llista dels components.</para>
 
 </sect1>
 
diff --git a/tde-i18n-ca/docs/tdebase/userguide/credits-and-license.docbook b/tde-i18n-ca/docs/tdebase/userguide/credits-and-license.docbook
index e20b5742305..60e9daf9937 100644
--- a/tde-i18n-ca/docs/tdebase/userguide/credits-and-license.docbook
+++ b/tde-i18n-ca/docs/tdebase/userguide/credits-and-license.docbook
@@ -141,7 +141,7 @@
 ></listitem>
 	<listitem
 ><para
->Ha tornat a escriure <xref linkend="kde-edutainment"/>.</para
+>Ha tornat a escriure <xref linkend="tde-edutainment"/>.</para
 ></listitem>
 	<listitem
 ><para
diff --git a/tde-i18n-ca/docs/tdebase/userguide/index.docbook b/tde-i18n-ca/docs/tdebase/userguide/index.docbook
index 9561b34624c..a93be014fd7 100644
--- a/tde-i18n-ca/docs/tdebase/userguide/index.docbook
+++ b/tde-i18n-ca/docs/tdebase/userguide/index.docbook
@@ -15,14 +15,14 @@
   <!ENTITY programs-and-documents SYSTEM "programs-and-documents.docbook">
   <!ENTITY control-center SYSTEM "control-center.docbook">
   <!ENTITY customizing-desktop SYSTEM "customizing-desktop.docbook">
-  <!ENTITY base-kde-applications SYSTEM "base-kde-applications.docbook">
+  <!ENTITY base-tde-applications SYSTEM "base-tde-applications.docbook">
   <!ENTITY removable-disks SYSTEM "removable-disks.docbook">
   <!ENTITY burning-cds SYSTEM "burning-cds.docbook">
   <!ENTITY playing-music SYSTEM "playing-music.docbook">
   <!ENTITY playing-audiocds SYSTEM "playing-audiocds.docbook">
   <!ENTITY playing-movies SYSTEM "playing-movies.docbook">
-  <!ENTITY your-kde-account SYSTEM "your-kde-account.docbook">
-  <!ENTITY kde-as-root SYSTEM "kde-as-root.docbook">
+  <!ENTITY your-tde-account SYSTEM "your-tde-account.docbook">
+  <!ENTITY tde-as-root SYSTEM "tde-as-root.docbook">
   <!ENTITY switching-sessions SYSTEM "switching-sessions.docbook">
   <!ENTITY file-sharing SYSTEM "file-sharing.docbook">
   <!ENTITY networking-with-windows SYSTEM  "networking-with-windows.docbook">
@@ -34,7 +34,7 @@
   <!ENTITY creating-graphics SYSTEM "creating-graphics.docbook">
   <!ENTITY screen-captures SYSTEM "screen-captures.docbook">
   <!ENTITY konsole-intro SYSTEM "konsole-intro.docbook">
-  <!ENTITY kde-edutainment SYSTEM "kde-edutainment.docbook">
+  <!ENTITY tde-edutainment SYSTEM "tde-edutainment.docbook">
   <!ENTITY accessibility SYSTEM "accessibility.docbook">
   <!ENTITY under-the-hood SYSTEM "under-the-hood.docbook">
   <!ENTITY net-connection-setup SYSTEM "net-connection-setup.docbook">
@@ -43,8 +43,8 @@
   <!ENTITY browser-fine-tuning SYSTEM "browser-fine-tuning.docbook">
   <!ENTITY usenet SYSTEM "usenet.docbook">
   <!ENTITY messaging-intro SYSTEM "messaging-intro.docbook">
-  <!ENTITY kde-office SYSTEM "kde-office.docbook">
-  <!ENTITY kde-for-admins SYSTEM "kde-for-admins.docbook">
+  <!ENTITY tde-office SYSTEM "tde-office.docbook">
+  <!ENTITY tde-for-admins SYSTEM "tde-for-admins.docbook">
   <!ENTITY migrator-dictionary SYSTEM "migrator-dictionary.docbook">
   <!ENTITY glossary SYSTEM "glossary.docbook">
   <!ENTITY standard-menu-entries SYSTEM "standard-menu-entries.docbook">
@@ -526,14 +526,14 @@ programs here (and not links to removable media, like CDs).</para>
 <part id="components">
 <title
 >Components de &kde;</title>
-&control-center; &base-kde-applications; &extragear-applications; <chapter id="multimedia"
+&control-center; &base-tde-applications; &extragear-applications; <chapter id="multimedia"
 > <title
 >Multimèdia amb el &kde;</title
 > &removable-disks; &playing-music; &playing-audiocds; &playing-movies; </chapter
 > <chapter id="multiuser-kde"
 > <title
 >&kde; l'escriptori multi usuari</title
-> &your-kde-account; &kde-as-root; &switching-sessions; </chapter
+> &your-tde-account; &tde-as-root; &switching-sessions; </chapter
 > <chapter id="networking"
 > <title
 >Xarxes amb el &kde;</title
@@ -542,7 +542,7 @@ programs here (and not links to removable media, like CDs).</para>
 > <title
 >Gràfics, impressió i fonts</title
 > &printer-setup; &printing-from-apps; &pdf-files; &font-installation; &creating-graphics; </chapter
-> &customizing-desktop; &konsole-intro; &kde-edutainment; &accessibility; &under-the-hood; </part>
+> &customizing-desktop; &konsole-intro; &tde-edutainment; &accessibility; &under-the-hood; </part>
 
 <part id="kde-online">
 <title
@@ -555,9 +555,9 @@ programs here (and not links to removable media, like CDs).</para>
 > &internet-shortcuts; &browser-fine-tuning; </chapter
 > &usenet; &messaging-intro; </part>
 
-&kde-office;
+&tde-office;
 
-&kde-for-admins;
+&tde-for-admins;
 
 <part id="more">
 <title
diff --git a/tde-i18n-ca/docs/tdebase/userguide/kde-as-root.docbook b/tde-i18n-ca/docs/tdebase/userguide/tde-as-root.docbook
similarity index 100%
rename from tde-i18n-ca/docs/tdebase/userguide/kde-as-root.docbook
rename to tde-i18n-ca/docs/tdebase/userguide/tde-as-root.docbook
diff --git a/tde-i18n-ca/docs/tdebase/userguide/kde-edutainment.docbook b/tde-i18n-ca/docs/tdebase/userguide/tde-edutainment.docbook
similarity index 99%
rename from tde-i18n-ca/docs/tdebase/userguide/kde-edutainment.docbook
rename to tde-i18n-ca/docs/tdebase/userguide/tde-edutainment.docbook
index 35f4ad3f70f..9836f3590e7 100644
--- a/tde-i18n-ca/docs/tdebase/userguide/kde-edutainment.docbook
+++ b/tde-i18n-ca/docs/tdebase/userguide/tde-edutainment.docbook
@@ -1,4 +1,4 @@
-<chapter id="kde-edutainment">
+<chapter id="tde-edutainment">
 <!-- Uncomment this and add your name in order to be credited for
 writing this section
 <chapterinfo>
diff --git a/tde-i18n-ca/docs/tdebase/userguide/kde-for-admins.docbook b/tde-i18n-ca/docs/tdebase/userguide/tde-for-admins.docbook
similarity index 99%
rename from tde-i18n-ca/docs/tdebase/userguide/kde-for-admins.docbook
rename to tde-i18n-ca/docs/tdebase/userguide/tde-for-admins.docbook
index c258a0cfb0d..4540cdc3ef0 100644
--- a/tde-i18n-ca/docs/tdebase/userguide/kde-for-admins.docbook
+++ b/tde-i18n-ca/docs/tdebase/userguide/tde-for-admins.docbook
@@ -23,7 +23,7 @@
 <title
 >Interioritats de &kde;</title>
 
-<sect1 id="kde-for-admins-overview">
+<sect1 id="tde-for-admins-overview">
 <title
 >Vista general</title>
 <para
diff --git a/tde-i18n-ca/docs/tdebase/userguide/kde-office.docbook b/tde-i18n-ca/docs/tdebase/userguide/tde-office.docbook
similarity index 97%
rename from tde-i18n-ca/docs/tdebase/userguide/kde-office.docbook
rename to tde-i18n-ca/docs/tdebase/userguide/tde-office.docbook
index 4e34efd4e33..cebd4249ade 100644
--- a/tde-i18n-ca/docs/tdebase/userguide/kde-office.docbook
+++ b/tde-i18n-ca/docs/tdebase/userguide/tde-office.docbook
@@ -1,4 +1,4 @@
-<part id="kde-office">
+<part id="tde-office">
 <partinfo>
 <authorgroup>
 <author
@@ -37,11 +37,11 @@
 <title
 >Oficina</title>
 
-<chapter id="kde-office-introduction">
+<chapter id="tde-office-introduction">
 <title
 >Introducció a KOffice</title>
 
-<sect1 id="kde-office-overview">
+<sect1 id="tde-office-overview">
 <title
 >Vista general</title>
 <para
@@ -67,7 +67,7 @@ state of the application.
 -->
 </sect1>
 
-<sect1 id="kde-office-features">
+<sect1 id="tde-office-features">
 <title
 >Característiques</title>
 <para
@@ -110,7 +110,7 @@ state of the application.
 </itemizedlist>
 </sect1>
 
-<sect1 id="kde-office-fileformat">
+<sect1 id="tde-office-fileformat">
 <title
 >Format de fitxer de document obert OASIS</title>
 <para
@@ -123,17 +123,17 @@ state of the application.
 </chapter>
 
 <!-- comment out for final commit before freeze
-<chapter id="kde-office-embedding">
+<chapter id="tde-office-embedding">
 <title
 >Component Embedding</title>
-<sect1 id="kde-office-kparts">
+<sect1 id="tde-office-kparts">
 <title
 >KParts and &koffice;</title>
 <para
 >To be written</para>
 </sect1>
 
-<sect1 id="kde-office-example">
+<sect1 id="tde-office-example">
 <title
 >Example</title>
 <para
@@ -142,7 +142,7 @@ state of the application.
 </chapter>
 -->
 
-<chapter id="kde-office-components">
+<chapter id="tde-office-components">
 <title
 >Visió general dels components de &koffice;</title>
 
@@ -435,11 +435,11 @@ state of the application.
 
 </chapter>
 
-<chapter id="kde-office-furtherinfo">
+<chapter id="tde-office-furtherinfo">
 
 <title
 >Informació més profunda</title>
-<sect1 id="kde-office-manuals">
+<sect1 id="tde-office-manuals">
 <title
 >Manuals d'aplicació</title>
 <para
@@ -452,7 +452,7 @@ state of the application.
 >.</para>
 </sect1>
 
-<sect1 id="kde-office-internet">
+<sect1 id="tde-office-internet">
 <title
 >Recursos a Internet</title>
 <para
@@ -467,7 +467,7 @@ state of the application.
 >.</para>
 </sect1>
 
-<sect1 id="kde-office-plugininfo">
+<sect1 id="tde-office-plugininfo">
 <title
 >Desenvolupament de connectors</title>
 <para
diff --git a/tde-i18n-ca/docs/tdebase/userguide/your-kde-account.docbook b/tde-i18n-ca/docs/tdebase/userguide/your-tde-account.docbook
similarity index 100%
rename from tde-i18n-ca/docs/tdebase/userguide/your-kde-account.docbook
rename to tde-i18n-ca/docs/tdebase/userguide/your-tde-account.docbook
diff --git a/tde-i18n-da/docs/tdebase/userguide/Makefile.in b/tde-i18n-da/docs/tdebase/userguide/Makefile.in
index 1cea9181333..ba1df3224ae 100644
--- a/tde-i18n-da/docs/tdebase/userguide/Makefile.in
+++ b/tde-i18n-da/docs/tdebase/userguide/Makefile.in
@@ -525,10 +525,10 @@ uninstall-am:
 .NOEXPORT:
 
 #>+ 2
-KDE_DIST=playing-movies.docbook file-sharing.docbook kde-as-root.docbook browser-fine-tuning.docbook troubleshooting-no-open.docbook accessibility.docbook base-kde-applications.docbook your-kde-account.docbook programs-controlling.docbook messaging-intro.docbook playing-music.docbook pdf-files.docbook programs-and-documents.docbook kde-edutainment.docbook index.docbook kde-for-admins.docbook usenet.docbook the-filemanager.docbook net-connection-setup.docbook internet-shortcuts.docbook control-center.docbook groupware-kontact.docbook troubleshooting-network-x.docbook burning-cds.docbook migrator-dictionary.docbook creating-graphics.docbook glossary.docbook konsole-intro.docbook networking-with-windows.docbook credits-and-license.docbook where-next.docbook removable-disks.docbook windows-how-to.docbook getting-help.docbook Makefile.in kde-office.docbook printer-setup.docbook under-the-hood.docbook screen-captures.docbook extragear-applications.docbook font-installation.docbook standard-menu-entries.docbook panel-and-desktop.docbook email.docbook switching-sessions.docbook customizing-desktop.docbook migrator-applications.docbook printing-from-apps.docbook Makefile.am shared-sessions.docbook playing-audiocds.docbook index.cache.bz2 
+KDE_DIST=playing-movies.docbook file-sharing.docbook tde-as-root.docbook browser-fine-tuning.docbook troubleshooting-no-open.docbook accessibility.docbook base-tde-applications.docbook your-tde-account.docbook programs-controlling.docbook messaging-intro.docbook playing-music.docbook pdf-files.docbook programs-and-documents.docbook tde-edutainment.docbook index.docbook tde-for-admins.docbook usenet.docbook the-filemanager.docbook net-connection-setup.docbook internet-shortcuts.docbook control-center.docbook groupware-kontact.docbook troubleshooting-network-x.docbook burning-cds.docbook migrator-dictionary.docbook creating-graphics.docbook glossary.docbook konsole-intro.docbook networking-with-windows.docbook credits-and-license.docbook where-next.docbook removable-disks.docbook windows-how-to.docbook getting-help.docbook Makefile.in tde-office.docbook printer-setup.docbook under-the-hood.docbook screen-captures.docbook extragear-applications.docbook font-installation.docbook standard-menu-entries.docbook panel-and-desktop.docbook email.docbook switching-sessions.docbook customizing-desktop.docbook migrator-applications.docbook printing-from-apps.docbook Makefile.am shared-sessions.docbook playing-audiocds.docbook index.cache.bz2 
 
 #>+ 24
-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-kde-account.docbook kde-edutainment.docbook getting-help.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook removable-disks.docbook panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook troubleshooting-network-x.docbook 
+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) tde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-tde-account.docbook tde-edutainment.docbook getting-help.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook removable-disks.docbook panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook troubleshooting-network-x.docbook 
 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
 
 docs-am: index.cache.bz2
@@ -555,20 +555,20 @@ clean-docs:
 #>+ 13
 install-nls:
 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide
-	@for base in kde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-kde-account.docbook kde-edutainment.docbook getting-help.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook removable-disks.docbook panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook troubleshooting-network-x.docbook ; do \
+	@for base in tde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-tde-account.docbook tde-edutainment.docbook getting-help.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook removable-disks.docbook panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook troubleshooting-network-x.docbook ; do \
 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
 	done
 
 uninstall-nls:
-	for base in kde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-kde-account.docbook kde-edutainment.docbook getting-help.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook removable-disks.docbook panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook troubleshooting-network-x.docbook ; do \
+	for base in tde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-tde-account.docbook tde-edutainment.docbook getting-help.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook removable-disks.docbook panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook troubleshooting-network-x.docbook ; do \
 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
 	done
 
 
 #>+ 5
 distdir-nls:
-	for file in kde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-kde-account.docbook kde-edutainment.docbook getting-help.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook removable-disks.docbook panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook troubleshooting-network-x.docbook ; do \
+	for file in tde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-tde-account.docbook tde-edutainment.docbook getting-help.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook removable-disks.docbook panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook troubleshooting-network-x.docbook ; do \
 	  cp $(srcdir)/$$file $(distdir); \
 	done
 
diff --git a/tde-i18n-da/docs/tdebase/userguide/base-kde-applications.docbook b/tde-i18n-da/docs/tdebase/userguide/base-tde-applications.docbook
similarity index 99%
rename from tde-i18n-da/docs/tdebase/userguide/base-kde-applications.docbook
rename to tde-i18n-da/docs/tdebase/userguide/base-tde-applications.docbook
index b31c2b80121..8bb74d7138c 100644
--- a/tde-i18n-da/docs/tdebase/userguide/base-kde-applications.docbook
+++ b/tde-i18n-da/docs/tdebase/userguide/base-tde-applications.docbook
@@ -591,7 +591,7 @@
 >Kontor</title>
 
 <para
->Dette omfatter alle programmer i &koffice;-suiten. Se <xref linkend="kde-office-components"/> for en oversigt over komponenterne.</para>
+>Dette omfatter alle programmer i &koffice;-suiten. Se <xref linkend="tde-office-components"/> for en oversigt over komponenterne.</para>
 
 </sect1>
 
diff --git a/tde-i18n-da/docs/tdebase/userguide/credits-and-license.docbook b/tde-i18n-da/docs/tdebase/userguide/credits-and-license.docbook
index 294d4bb85b9..a4c0d8bdb0b 100644
--- a/tde-i18n-da/docs/tdebase/userguide/credits-and-license.docbook
+++ b/tde-i18n-da/docs/tdebase/userguide/credits-and-license.docbook
@@ -141,7 +141,7 @@
 ></listitem>
 	<listitem
 ><para
->Genskrev <xref linkend="kde-edutainment"/>.</para
+>Genskrev <xref linkend="tde-edutainment"/>.</para
 ></listitem>
 	<listitem
 ><para
diff --git a/tde-i18n-da/docs/tdebase/userguide/index.docbook b/tde-i18n-da/docs/tdebase/userguide/index.docbook
index 783f77a9b9f..5ede9bb69b1 100644
--- a/tde-i18n-da/docs/tdebase/userguide/index.docbook
+++ b/tde-i18n-da/docs/tdebase/userguide/index.docbook
@@ -15,14 +15,14 @@
   <!ENTITY programs-and-documents SYSTEM "programs-and-documents.docbook">
   <!ENTITY control-center SYSTEM "control-center.docbook">
   <!ENTITY customizing-desktop SYSTEM "customizing-desktop.docbook">
-  <!ENTITY base-kde-applications SYSTEM "base-kde-applications.docbook">
+  <!ENTITY base-tde-applications SYSTEM "base-tde-applications.docbook">
   <!ENTITY removable-disks SYSTEM "removable-disks.docbook">
   <!ENTITY burning-cds SYSTEM "burning-cds.docbook">
   <!ENTITY playing-music SYSTEM "playing-music.docbook">
   <!ENTITY playing-audiocds SYSTEM "playing-audiocds.docbook">
   <!ENTITY playing-movies SYSTEM "playing-movies.docbook">
-  <!ENTITY your-kde-account SYSTEM "your-kde-account.docbook">
-  <!ENTITY kde-as-root SYSTEM "kde-as-root.docbook">
+  <!ENTITY your-tde-account SYSTEM "your-tde-account.docbook">
+  <!ENTITY tde-as-root SYSTEM "tde-as-root.docbook">
   <!ENTITY switching-sessions SYSTEM "switching-sessions.docbook">
   <!ENTITY file-sharing SYSTEM "file-sharing.docbook">
   <!ENTITY networking-with-windows SYSTEM  "networking-with-windows.docbook">
@@ -34,7 +34,7 @@
   <!ENTITY creating-graphics SYSTEM "creating-graphics.docbook">
   <!ENTITY screen-captures SYSTEM "screen-captures.docbook">
   <!ENTITY konsole-intro SYSTEM "konsole-intro.docbook">
-  <!ENTITY kde-edutainment SYSTEM "kde-edutainment.docbook">
+  <!ENTITY tde-edutainment SYSTEM "tde-edutainment.docbook">
   <!ENTITY accessibility SYSTEM "accessibility.docbook">
   <!ENTITY under-the-hood SYSTEM "under-the-hood.docbook">
   <!ENTITY net-connection-setup SYSTEM "net-connection-setup.docbook">
@@ -43,8 +43,8 @@
   <!ENTITY browser-fine-tuning SYSTEM "browser-fine-tuning.docbook">
   <!ENTITY usenet SYSTEM "usenet.docbook">
   <!ENTITY messaging-intro SYSTEM "messaging-intro.docbook">
-  <!ENTITY kde-office SYSTEM "kde-office.docbook">
-  <!ENTITY kde-for-admins SYSTEM "kde-for-admins.docbook">
+  <!ENTITY tde-office SYSTEM "tde-office.docbook">
+  <!ENTITY tde-for-admins SYSTEM "tde-for-admins.docbook">
   <!ENTITY migrator-dictionary SYSTEM "migrator-dictionary.docbook">
   <!ENTITY glossary SYSTEM "glossary.docbook">
   <!ENTITY standard-menu-entries SYSTEM "standard-menu-entries.docbook">
@@ -522,14 +522,14 @@ programs here (and not links to removable media, like CDs).</para>
 <part id="components">
 <title
 >&kde;-komponenter</title>
-&control-center; &base-kde-applications; &extragear-applications; <chapter id="multimedia"
+&control-center; &base-tde-applications; &extragear-applications; <chapter id="multimedia"
 > <title
 >Multimedie med &kde;</title
 > &removable-disks; &playing-music; &playing-audiocds; &playing-movies; </chapter
 > <chapter id="multiuser-kde"
 > <title
 >&kde; Multibruger desktop</title
-> &your-kde-account; &kde-as-root; &switching-sessions; </chapter
+> &your-tde-account; &tde-as-root; &switching-sessions; </chapter
 > <chapter id="networking"
 > <title
 >Netværk med &kde;</title
@@ -538,7 +538,7 @@ programs here (and not links to removable media, like CDs).</para>
 > <title
 >Grafik, udskrift, og skrifttyper</title
 > &printer-setup; &printing-from-apps; &pdf-files; &font-installation; &creating-graphics; </chapter
-> &customizing-desktop; &konsole-intro; &kde-edutainment; &accessibility; &under-the-hood; </part>
+> &customizing-desktop; &konsole-intro; &tde-edutainment; &accessibility; &under-the-hood; </part>
 
 <part id="kde-online">
 <title
@@ -551,9 +551,9 @@ programs here (and not links to removable media, like CDs).</para>
 > &internet-shortcuts; &browser-fine-tuning; </chapter
 > &usenet; &messaging-intro; </part>
 
-&kde-office;
+&tde-office;
 
-&kde-for-admins;
+&tde-for-admins;
 
 <part id="more">
 <title
diff --git a/tde-i18n-da/docs/tdebase/userguide/kde-as-root.docbook b/tde-i18n-da/docs/tdebase/userguide/tde-as-root.docbook
similarity index 100%
rename from tde-i18n-da/docs/tdebase/userguide/kde-as-root.docbook
rename to tde-i18n-da/docs/tdebase/userguide/tde-as-root.docbook
diff --git a/tde-i18n-da/docs/tdebase/userguide/kde-edutainment.docbook b/tde-i18n-da/docs/tdebase/userguide/tde-edutainment.docbook
similarity index 99%
rename from tde-i18n-da/docs/tdebase/userguide/kde-edutainment.docbook
rename to tde-i18n-da/docs/tdebase/userguide/tde-edutainment.docbook
index c63b6774c0d..63c8600f2e6 100644
--- a/tde-i18n-da/docs/tdebase/userguide/kde-edutainment.docbook
+++ b/tde-i18n-da/docs/tdebase/userguide/tde-edutainment.docbook
@@ -1,4 +1,4 @@
-<chapter id="kde-edutainment">
+<chapter id="tde-edutainment">
 <!-- Uncomment this and add your name in order to be credited for
 writing this section
 <chapterinfo>
diff --git a/tde-i18n-da/docs/tdebase/userguide/kde-for-admins.docbook b/tde-i18n-da/docs/tdebase/userguide/tde-for-admins.docbook
similarity index 99%
rename from tde-i18n-da/docs/tdebase/userguide/kde-for-admins.docbook
rename to tde-i18n-da/docs/tdebase/userguide/tde-for-admins.docbook
index 813eaf09a1b..8a4f9af7785 100644
--- a/tde-i18n-da/docs/tdebase/userguide/kde-for-admins.docbook
+++ b/tde-i18n-da/docs/tdebase/userguide/tde-for-admins.docbook
@@ -23,7 +23,7 @@
 <title
 >&kde;'s interne funktioner</title>
 
-<sect1 id="kde-for-admins-overview">
+<sect1 id="tde-for-admins-overview">
 <title
 >Overblik</title>
 <para
diff --git a/tde-i18n-da/docs/tdebase/userguide/kde-office.docbook b/tde-i18n-da/docs/tdebase/userguide/tde-office.docbook
similarity index 96%
rename from tde-i18n-da/docs/tdebase/userguide/kde-office.docbook
rename to tde-i18n-da/docs/tdebase/userguide/tde-office.docbook
index 6f49db34d3e..d805e24c6e1 100644
--- a/tde-i18n-da/docs/tdebase/userguide/kde-office.docbook
+++ b/tde-i18n-da/docs/tdebase/userguide/tde-office.docbook
@@ -1,4 +1,4 @@
-<part id="kde-office">
+<part id="tde-office">
 <partinfo>
 <authorgroup>
 <author
@@ -37,11 +37,11 @@
 <title
 >Kontor</title>
 
-<chapter id="kde-office-introduction">
+<chapter id="tde-office-introduction">
 <title
 >Introduktion til Koffice</title>
 
-<sect1 id="kde-office-overview">
+<sect1 id="tde-office-overview">
 <title
 >Overblik</title>
 <para
@@ -67,7 +67,7 @@ state of the application.
 -->
 </sect1>
 
-<sect1 id="kde-office-features">
+<sect1 id="tde-office-features">
 <title
 >Funktioner</title>
 <para
@@ -110,7 +110,7 @@ state of the application.
 </itemizedlist>
 </sect1>
 
-<sect1 id="kde-office-fileformat">
+<sect1 id="tde-office-fileformat">
 <title
 >Filformatet OASIS OpenDocument</title>
 <para
@@ -123,17 +123,17 @@ state of the application.
 </chapter>
 
 <!-- comment out for final commit before freeze
-<chapter id="kde-office-embedding">
+<chapter id="tde-office-embedding">
 <title
 >Component Embedding</title>
-<sect1 id="kde-office-kparts">
+<sect1 id="tde-office-kparts">
 <title
 >KParts and &koffice;</title>
 <para
 >To be written</para>
 </sect1>
 
-<sect1 id="kde-office-example">
+<sect1 id="tde-office-example">
 <title
 >Example</title>
 <para
@@ -142,7 +142,7 @@ state of the application.
 </chapter>
 -->
 
-<chapter id="kde-office-components">
+<chapter id="tde-office-components">
 <title
 >Oversigt over &koffice; komponenter</title>
 
@@ -435,11 +435,11 @@ state of the application.
 
 </chapter>
 
-<chapter id="kde-office-furtherinfo">
+<chapter id="tde-office-furtherinfo">
 
 <title
 >Yderligere information</title>
-<sect1 id="kde-office-manuals">
+<sect1 id="tde-office-manuals">
 <title
 >Programhåndbøger</title>
 <para
@@ -452,7 +452,7 @@ state of the application.
 >.</para>
 </sect1>
 
-<sect1 id="kde-office-internet">
+<sect1 id="tde-office-internet">
 <title
 >Internetressourcer</title>
 <para
@@ -467,7 +467,7 @@ state of the application.
 ></para>
 </sect1>
 
-<sect1 id="kde-office-plugininfo">
+<sect1 id="tde-office-plugininfo">
 <title
 >Udvikling af plugin</title>
 <para
diff --git a/tde-i18n-da/docs/tdebase/userguide/your-kde-account.docbook b/tde-i18n-da/docs/tdebase/userguide/your-tde-account.docbook
similarity index 100%
rename from tde-i18n-da/docs/tdebase/userguide/your-kde-account.docbook
rename to tde-i18n-da/docs/tdebase/userguide/your-tde-account.docbook
diff --git a/tde-i18n-de/docs/tdebase/userguide/Makefile.in b/tde-i18n-de/docs/tdebase/userguide/Makefile.in
index 7e55c3b7b42..2853f2668af 100644
--- a/tde-i18n-de/docs/tdebase/userguide/Makefile.in
+++ b/tde-i18n-de/docs/tdebase/userguide/Makefile.in
@@ -525,10 +525,10 @@ uninstall-am:
 .NOEXPORT:
 
 #>+ 2
-KDE_DIST=playing-movies.docbook file-sharing.docbook kde-as-root.docbook browser-fine-tuning.docbook troubleshooting-no-open.docbook accessibility.docbook base-kde-applications.docbook your-kde-account.docbook kmouth3.png programs-controlling.docbook messaging-intro.docbook playing-music.docbook pdf-files.docbook programs-and-documents.docbook kde-edutainment.docbook index.docbook kde-for-admins.docbook usenet.docbook kmouth.png the-filemanager.docbook net-connection-setup.docbook internet-shortcuts.docbook control-center.docbook groupware-kontact.docbook troubleshooting-network-x.docbook burning-cds.docbook migrator-dictionary.docbook creating-graphics.docbook glossary.docbook konsole-intro.docbook networking-with-windows.docbook credits-and-license.docbook where-next.docbook removable-disks.docbook windows-how-to.docbook getting-help.docbook Makefile.in kde-office.docbook printer-setup.docbook kmouth2.png under-the-hood.docbook screen-captures.docbook extragear-applications.docbook font-installation.docbook standard-menu-entries.docbook panel-and-desktop.docbook email.docbook switching-sessions.docbook customizing-desktop.docbook migrator-applications.docbook printing-from-apps.docbook Makefile.am shared-sessions.docbook playing-audiocds.docbook index.cache.bz2 
+KDE_DIST=playing-movies.docbook file-sharing.docbook tde-as-root.docbook browser-fine-tuning.docbook troubleshooting-no-open.docbook accessibility.docbook base-tde-applications.docbook your-tde-account.docbook kmouth3.png programs-controlling.docbook messaging-intro.docbook playing-music.docbook pdf-files.docbook programs-and-documents.docbook tde-edutainment.docbook index.docbook tde-for-admins.docbook usenet.docbook kmouth.png the-filemanager.docbook net-connection-setup.docbook internet-shortcuts.docbook control-center.docbook groupware-kontact.docbook troubleshooting-network-x.docbook burning-cds.docbook migrator-dictionary.docbook creating-graphics.docbook glossary.docbook konsole-intro.docbook networking-with-windows.docbook credits-and-license.docbook where-next.docbook removable-disks.docbook windows-how-to.docbook getting-help.docbook Makefile.in tde-office.docbook printer-setup.docbook kmouth2.png under-the-hood.docbook screen-captures.docbook extragear-applications.docbook font-installation.docbook standard-menu-entries.docbook panel-and-desktop.docbook email.docbook switching-sessions.docbook customizing-desktop.docbook migrator-applications.docbook printing-from-apps.docbook Makefile.am shared-sessions.docbook playing-audiocds.docbook index.cache.bz2 
 
 #>+ 24
-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-kde-account.docbook kde-edutainment.docbook getting-help.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook kmouth.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook removable-disks.docbook panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook kmouth3.png playing-music.docbook pdf-files.docbook printing-from-apps.docbook kmouth2.png internet-shortcuts.docbook burning-cds.docbook troubleshooting-network-x.docbook 
+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) tde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-tde-account.docbook tde-edutainment.docbook getting-help.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook kmouth.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook removable-disks.docbook panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook kmouth3.png playing-music.docbook pdf-files.docbook printing-from-apps.docbook kmouth2.png internet-shortcuts.docbook burning-cds.docbook troubleshooting-network-x.docbook 
 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
 
 docs-am: index.cache.bz2
@@ -555,20 +555,20 @@ clean-docs:
 #>+ 13
 install-nls:
 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide
-	@for base in kde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-kde-account.docbook kde-edutainment.docbook getting-help.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook kmouth.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook removable-disks.docbook panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook kmouth3.png playing-music.docbook pdf-files.docbook printing-from-apps.docbook kmouth2.png internet-shortcuts.docbook burning-cds.docbook troubleshooting-network-x.docbook ; do \
+	@for base in tde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-tde-account.docbook tde-edutainment.docbook getting-help.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook kmouth.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook removable-disks.docbook panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook kmouth3.png playing-music.docbook pdf-files.docbook printing-from-apps.docbook kmouth2.png internet-shortcuts.docbook burning-cds.docbook troubleshooting-network-x.docbook ; do \
 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
 	done
 
 uninstall-nls:
-	for base in kde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-kde-account.docbook kde-edutainment.docbook getting-help.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook kmouth.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook removable-disks.docbook panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook kmouth3.png playing-music.docbook pdf-files.docbook printing-from-apps.docbook kmouth2.png internet-shortcuts.docbook burning-cds.docbook troubleshooting-network-x.docbook ; do \
+	for base in tde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-tde-account.docbook tde-edutainment.docbook getting-help.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook kmouth.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook removable-disks.docbook panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook kmouth3.png playing-music.docbook pdf-files.docbook printing-from-apps.docbook kmouth2.png internet-shortcuts.docbook burning-cds.docbook troubleshooting-network-x.docbook ; do \
 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
 	done
 
 
 #>+ 5
 distdir-nls:
-	for file in kde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-kde-account.docbook kde-edutainment.docbook getting-help.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook kmouth.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook removable-disks.docbook panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook kmouth3.png playing-music.docbook pdf-files.docbook printing-from-apps.docbook kmouth2.png internet-shortcuts.docbook burning-cds.docbook troubleshooting-network-x.docbook ; do \
+	for file in tde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-tde-account.docbook tde-edutainment.docbook getting-help.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook kmouth.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook removable-disks.docbook panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook kmouth3.png playing-music.docbook pdf-files.docbook printing-from-apps.docbook kmouth2.png internet-shortcuts.docbook burning-cds.docbook troubleshooting-network-x.docbook ; do \
 	  cp $(srcdir)/$$file $(distdir); \
 	done
 
diff --git a/tde-i18n-de/docs/tdebase/userguide/base-kde-applications.docbook b/tde-i18n-de/docs/tdebase/userguide/base-tde-applications.docbook
similarity index 99%
rename from tde-i18n-de/docs/tdebase/userguide/base-kde-applications.docbook
rename to tde-i18n-de/docs/tdebase/userguide/base-tde-applications.docbook
index fc2c70d0275..5c24e3f9a03 100644
--- a/tde-i18n-de/docs/tdebase/userguide/base-kde-applications.docbook
+++ b/tde-i18n-de/docs/tdebase/userguide/base-tde-applications.docbook
@@ -593,7 +593,7 @@
 >Büro</title>
 
 <para
->Hierunter sind alle Anwendungen des Programmpaketes &koffice; zusammengefasst. Eine Zusammenfassung der Komponenten finden Sie in <xref linkend="kde-office-components"/>.</para>
+>Hierunter sind alle Anwendungen des Programmpaketes &koffice; zusammengefasst. Eine Zusammenfassung der Komponenten finden Sie in <xref linkend="tde-office-components"/>.</para>
 
 </sect1>
 
diff --git a/tde-i18n-de/docs/tdebase/userguide/credits-and-license.docbook b/tde-i18n-de/docs/tdebase/userguide/credits-and-license.docbook
index d9701801242..020066dd12b 100644
--- a/tde-i18n-de/docs/tdebase/userguide/credits-and-license.docbook
+++ b/tde-i18n-de/docs/tdebase/userguide/credits-and-license.docbook
@@ -143,7 +143,7 @@
 ></listitem>
 	<listitem
 ><para
->Autor der Dokumentation <xref linkend="kde-edutainment"/>.</para
+>Autor der Dokumentation <xref linkend="tde-edutainment"/>.</para
 ></listitem>
 	<listitem
 ><para
diff --git a/tde-i18n-de/docs/tdebase/userguide/index.docbook b/tde-i18n-de/docs/tdebase/userguide/index.docbook
index 68d61a39fe3..725a0b472d1 100644
--- a/tde-i18n-de/docs/tdebase/userguide/index.docbook
+++ b/tde-i18n-de/docs/tdebase/userguide/index.docbook
@@ -15,14 +15,14 @@
   <!ENTITY programs-and-documents SYSTEM "programs-and-documents.docbook">
   <!ENTITY control-center SYSTEM "control-center.docbook">
   <!ENTITY customizing-desktop SYSTEM "customizing-desktop.docbook">
-  <!ENTITY base-kde-applications SYSTEM "base-kde-applications.docbook">
+  <!ENTITY base-tde-applications SYSTEM "base-tde-applications.docbook">
   <!ENTITY removable-disks SYSTEM "removable-disks.docbook">
   <!ENTITY burning-cds SYSTEM "burning-cds.docbook">
   <!ENTITY playing-music SYSTEM "playing-music.docbook">
   <!ENTITY playing-audiocds SYSTEM "playing-audiocds.docbook">
   <!ENTITY playing-movies SYSTEM "playing-movies.docbook">
-  <!ENTITY your-kde-account SYSTEM "your-kde-account.docbook">
-  <!ENTITY kde-as-root SYSTEM "kde-as-root.docbook">
+  <!ENTITY your-tde-account SYSTEM "your-tde-account.docbook">
+  <!ENTITY tde-as-root SYSTEM "tde-as-root.docbook">
   <!ENTITY switching-sessions SYSTEM "switching-sessions.docbook">
   <!ENTITY file-sharing SYSTEM "file-sharing.docbook">
   <!ENTITY networking-with-windows SYSTEM  "networking-with-windows.docbook">
@@ -34,7 +34,7 @@
   <!ENTITY creating-graphics SYSTEM "creating-graphics.docbook">
   <!ENTITY screen-captures SYSTEM "screen-captures.docbook">
   <!ENTITY konsole-intro SYSTEM "konsole-intro.docbook">
-  <!ENTITY kde-edutainment SYSTEM "kde-edutainment.docbook">
+  <!ENTITY tde-edutainment SYSTEM "tde-edutainment.docbook">
   <!ENTITY accessibility SYSTEM "accessibility.docbook">
   <!ENTITY under-the-hood SYSTEM "under-the-hood.docbook">
   <!ENTITY net-connection-setup SYSTEM "net-connection-setup.docbook">
@@ -43,8 +43,8 @@
   <!ENTITY browser-fine-tuning SYSTEM "browser-fine-tuning.docbook">
   <!ENTITY usenet SYSTEM "usenet.docbook">
   <!ENTITY messaging-intro SYSTEM "messaging-intro.docbook">
-  <!ENTITY kde-office SYSTEM "kde-office.docbook">
-  <!ENTITY kde-for-admins SYSTEM "kde-for-admins.docbook">
+  <!ENTITY tde-office SYSTEM "tde-office.docbook">
+  <!ENTITY tde-for-admins SYSTEM "tde-for-admins.docbook">
   <!ENTITY migrator-dictionary SYSTEM "migrator-dictionary.docbook">
   <!ENTITY glossary SYSTEM "glossary.docbook">
   <!ENTITY standard-menu-entries SYSTEM "standard-menu-entries.docbook">
@@ -568,14 +568,14 @@ programs here (and not links to removable media, like CDs).</para>
 <part id="components">
 <title
 >Komponenten von &kde;</title>
-&control-center; &base-kde-applications; &extragear-applications; <chapter id="multimedia"
+&control-center; &base-tde-applications; &extragear-applications; <chapter id="multimedia"
 > <title
 >Multimedia unter &kde;</title
 > &removable-disks; &playing-music; &playing-audiocds; &playing-movies; </chapter
 > <chapter id="multiuser-kde"
 > <title
 >&kde;&mdash;Die Arbeitsfläche für Ihr Mehrbenutzersystem</title
-> &your-kde-account; &kde-as-root; &switching-sessions; </chapter
+> &your-tde-account; &tde-as-root; &switching-sessions; </chapter
 > <chapter id="networking"
 > <title
 >Netzwerk unter &kde;</title
@@ -584,7 +584,7 @@ programs here (and not links to removable media, like CDs).</para>
 > <title
 >Grafiken, Drucken und Schriftarten</title
 > &printer-setup; &printing-from-apps; &pdf-files; &font-installation; &creating-graphics; </chapter
-> &customizing-desktop; &konsole-intro; &kde-edutainment; &accessibility; &under-the-hood; </part>
+> &customizing-desktop; &konsole-intro; &tde-edutainment; &accessibility; &under-the-hood; </part>
 
 <part id="kde-online">
 <title
@@ -597,9 +597,9 @@ programs here (and not links to removable media, like CDs).</para>
 > &internet-shortcuts; &browser-fine-tuning; </chapter
 > &usenet; &messaging-intro; </part>
 
-&kde-office;
+&tde-office;
 
-&kde-for-admins;
+&tde-for-admins;
 
 <part id="more">
 <title
diff --git a/tde-i18n-de/docs/tdebase/userguide/kde-as-root.docbook b/tde-i18n-de/docs/tdebase/userguide/tde-as-root.docbook
similarity index 100%
rename from tde-i18n-de/docs/tdebase/userguide/kde-as-root.docbook
rename to tde-i18n-de/docs/tdebase/userguide/tde-as-root.docbook
diff --git a/tde-i18n-de/docs/tdebase/userguide/kde-edutainment.docbook b/tde-i18n-de/docs/tdebase/userguide/tde-edutainment.docbook
similarity index 99%
rename from tde-i18n-de/docs/tdebase/userguide/kde-edutainment.docbook
rename to tde-i18n-de/docs/tdebase/userguide/tde-edutainment.docbook
index 31767df6174..2d213975daf 100644
--- a/tde-i18n-de/docs/tdebase/userguide/kde-edutainment.docbook
+++ b/tde-i18n-de/docs/tdebase/userguide/tde-edutainment.docbook
@@ -1,4 +1,4 @@
-<chapter id="kde-edutainment">
+<chapter id="tde-edutainment">
 <!-- Uncomment this and add your name in order to be credited for
 writing this section
 <chapterinfo>
diff --git a/tde-i18n-de/docs/tdebase/userguide/kde-for-admins.docbook b/tde-i18n-de/docs/tdebase/userguide/tde-for-admins.docbook
similarity index 99%
rename from tde-i18n-de/docs/tdebase/userguide/kde-for-admins.docbook
rename to tde-i18n-de/docs/tdebase/userguide/tde-for-admins.docbook
index a6a22b731a3..7511d41af29 100644
--- a/tde-i18n-de/docs/tdebase/userguide/kde-for-admins.docbook
+++ b/tde-i18n-de/docs/tdebase/userguide/tde-for-admins.docbook
@@ -23,7 +23,7 @@
 <title
 >&kde; Interna</title>
 
-<sect1 id="kde-for-admins-overview">
+<sect1 id="tde-for-admins-overview">
 <title
 >Überblick</title>
 <para
diff --git a/tde-i18n-de/docs/tdebase/userguide/kde-office.docbook b/tde-i18n-de/docs/tdebase/userguide/tde-office.docbook
similarity index 97%
rename from tde-i18n-de/docs/tdebase/userguide/kde-office.docbook
rename to tde-i18n-de/docs/tdebase/userguide/tde-office.docbook
index 3a77dd5876f..db8a4bc24fa 100644
--- a/tde-i18n-de/docs/tdebase/userguide/kde-office.docbook
+++ b/tde-i18n-de/docs/tdebase/userguide/tde-office.docbook
@@ -1,4 +1,4 @@
-<part id="kde-office">
+<part id="tde-office">
 <partinfo>
 <authorgroup>
 <author
@@ -37,11 +37,11 @@
 <title
 >Office</title>
 
-<chapter id="kde-office-introduction">
+<chapter id="tde-office-introduction">
 <title
 >Einführung in KOffice</title>
 
-<sect1 id="kde-office-overview">
+<sect1 id="tde-office-overview">
 <title
 >Übersicht</title>
 <para
@@ -67,7 +67,7 @@ state of the application.
 -->
 </sect1>
 
-<sect1 id="kde-office-features">
+<sect1 id="tde-office-features">
 <title
 >Funktionen</title>
 <para
@@ -110,7 +110,7 @@ state of the application.
 </itemizedlist>
 </sect1>
 
-<sect1 id="kde-office-fileformat">
+<sect1 id="tde-office-fileformat">
 <title
 >OASIS OpenDocument-Dateiformat</title>
 <para
@@ -123,17 +123,17 @@ state of the application.
 </chapter>
 
 <!-- comment out for final commit before freeze
-<chapter id="kde-office-embedding">
+<chapter id="tde-office-embedding">
 <title
 >Component Embedding</title>
-<sect1 id="kde-office-kparts">
+<sect1 id="tde-office-kparts">
 <title
 >KParts and &koffice;</title>
 <para
 >To be written</para>
 </sect1>
 
-<sect1 id="kde-office-example">
+<sect1 id="tde-office-example">
 <title
 >Example</title>
 <para
@@ -142,7 +142,7 @@ state of the application.
 </chapter>
 -->
 
-<chapter id="kde-office-components">
+<chapter id="tde-office-components">
 <title
 >Überblick über die &koffice;-Komponenten</title>
 
@@ -435,11 +435,11 @@ state of the application.
 
 </chapter>
 
-<chapter id="kde-office-furtherinfo">
+<chapter id="tde-office-furtherinfo">
 
 <title
 >Weitere Informationen</title>
-<sect1 id="kde-office-manuals">
+<sect1 id="tde-office-manuals">
 <title
 >Handbücher für die Anwendungen</title>
 <para
@@ -452,7 +452,7 @@ state of the application.
 >.</para>
 </sect1>
 
-<sect1 id="kde-office-internet">
+<sect1 id="tde-office-internet">
 <title
 >Quellen im Internet</title>
 <para
@@ -467,7 +467,7 @@ state of the application.
 > finden können.</para>
 </sect1>
 
-<sect1 id="kde-office-plugininfo">
+<sect1 id="tde-office-plugininfo">
 <title
 >Plugin-Entwicklung</title>
 <para
diff --git a/tde-i18n-de/docs/tdebase/userguide/your-kde-account.docbook b/tde-i18n-de/docs/tdebase/userguide/your-tde-account.docbook
similarity index 100%
rename from tde-i18n-de/docs/tdebase/userguide/your-kde-account.docbook
rename to tde-i18n-de/docs/tdebase/userguide/your-tde-account.docbook
diff --git a/tde-i18n-es/docs/tdebase/userguide/Makefile.in b/tde-i18n-es/docs/tdebase/userguide/Makefile.in
index 72c3decc375..3e75fa61a77 100644
--- a/tde-i18n-es/docs/tdebase/userguide/Makefile.in
+++ b/tde-i18n-es/docs/tdebase/userguide/Makefile.in
@@ -525,10 +525,10 @@ uninstall-am:
 .NOEXPORT:
 
 #>+ 2
-KDE_DIST=rip.png kde-as-root.docbook konq-simple.png browser-fine-tuning.docbook kcalc-systray.png accessibility.docbook your-kde-account.docbook programs-controlling.docbook knode-mail-account.png kcontrol.png kaboodle-icon.png a-window.png pdf-files.docbook amarok-icon.png juk-icon.png kde-edutainment.docbook index.docbook open-file-dialog.png the-filemanager.docbook services.png control-center.docbook troubleshooting-network-x.docbook migrator-dictionary.docbook glossary.docbook networking-with-windows.docbook credits-and-license.docbook where-next.docbook amarok.png removable-disks.docbook oggfolder.png getting-help.docbook noatun.png kmouth2.png knode-news-account.png screen-captures.docbook extragear-applications.docbook font-installation.docbook standard-menu-entries.docbook panel-and-desktop.docbook knode-identity.png email.docbook customizing-desktop.docbook knode-start.png desktop.png playing-audiocds.docbook kaboodle.png index.cache.bz2 file-sharing.docbook playing-movies.docbook troubleshooting-no-open.docbook base-kde-applications.docbook kmouth3.png ripsettings.png messaging-intro.docbook playing-music.docbook programs-and-documents.docbook kppp-wizard.png usenet.docbook kde-for-admins.docbook kmouth.png juk.png kmag.png net-connection-setup.docbook internet-shortcuts.docbook groupware-kontact.docbook burning-cds.docbook creating-graphics.docbook konsole-intro.docbook kmousetool.png windows-how-to.docbook Makefile.in kde-office.docbook printer-setup.docbook kppp-dialer-tab.png under-the-hood.docbook noatun-icon.png titlebar-menu.png switching-sessions.docbook kopete.png migrator-applications.docbook konq-sidebar.png printing-from-apps.docbook Makefile.am shared-sessions.docbook 
+KDE_DIST=rip.png tde-as-root.docbook konq-simple.png browser-fine-tuning.docbook kcalc-systray.png accessibility.docbook your-tde-account.docbook programs-controlling.docbook knode-mail-account.png kcontrol.png kaboodle-icon.png a-window.png pdf-files.docbook amarok-icon.png juk-icon.png tde-edutainment.docbook index.docbook open-file-dialog.png the-filemanager.docbook services.png control-center.docbook troubleshooting-network-x.docbook migrator-dictionary.docbook glossary.docbook networking-with-windows.docbook credits-and-license.docbook where-next.docbook amarok.png removable-disks.docbook oggfolder.png getting-help.docbook noatun.png kmouth2.png knode-news-account.png screen-captures.docbook extragear-applications.docbook font-installation.docbook standard-menu-entries.docbook panel-and-desktop.docbook knode-identity.png email.docbook customizing-desktop.docbook knode-start.png desktop.png playing-audiocds.docbook kaboodle.png index.cache.bz2 file-sharing.docbook playing-movies.docbook troubleshooting-no-open.docbook base-tde-applications.docbook kmouth3.png ripsettings.png messaging-intro.docbook playing-music.docbook programs-and-documents.docbook kppp-wizard.png usenet.docbook tde-for-admins.docbook kmouth.png juk.png kmag.png net-connection-setup.docbook internet-shortcuts.docbook groupware-kontact.docbook burning-cds.docbook creating-graphics.docbook konsole-intro.docbook kmousetool.png windows-how-to.docbook Makefile.in tde-office.docbook printer-setup.docbook kppp-dialer-tab.png under-the-hood.docbook noatun-icon.png titlebar-menu.png switching-sessions.docbook kopete.png migrator-applications.docbook konq-sidebar.png printing-from-apps.docbook Makefile.am shared-sessions.docbook 
 
 #>+ 24
-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kde-as-root.docbook desktop.png accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook knode-news-account.png kmag.png your-kde-account.docbook kde-edutainment.docbook kmousetool.png getting-help.docbook services.png ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook juk-icon.png printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png index.docbook kopete.png font-installation.docbook amarok-icon.png kppp-dialer-tab.png kmouth.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook kcalc-systray.png kaboodle-icon.png removable-disks.docbook konq-sidebar.png konq-simple.png panel-and-desktop.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook noatun-icon.png kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png troubleshooting-network-x.docbook 
+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) tde-as-root.docbook desktop.png accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook knode-news-account.png kmag.png your-tde-account.docbook tde-edutainment.docbook kmousetool.png getting-help.docbook services.png ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook juk-icon.png printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png index.docbook kopete.png font-installation.docbook amarok-icon.png kppp-dialer-tab.png kmouth.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook kcalc-systray.png kaboodle-icon.png removable-disks.docbook konq-sidebar.png konq-simple.png panel-and-desktop.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook noatun-icon.png kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png troubleshooting-network-x.docbook 
 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
 
 docs-am: index.cache.bz2
@@ -555,20 +555,20 @@ clean-docs:
 #>+ 13
 install-nls:
 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide
-	@for base in kde-as-root.docbook desktop.png accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook knode-news-account.png kmag.png your-kde-account.docbook kde-edutainment.docbook kmousetool.png getting-help.docbook services.png ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook juk-icon.png printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png index.docbook kopete.png font-installation.docbook amarok-icon.png kppp-dialer-tab.png kmouth.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook kcalc-systray.png kaboodle-icon.png removable-disks.docbook konq-sidebar.png konq-simple.png panel-and-desktop.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook noatun-icon.png kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png troubleshooting-network-x.docbook ; do \
+	@for base in tde-as-root.docbook desktop.png accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook knode-news-account.png kmag.png your-tde-account.docbook tde-edutainment.docbook kmousetool.png getting-help.docbook services.png ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook juk-icon.png printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png index.docbook kopete.png font-installation.docbook amarok-icon.png kppp-dialer-tab.png kmouth.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook kcalc-systray.png kaboodle-icon.png removable-disks.docbook konq-sidebar.png konq-simple.png panel-and-desktop.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook noatun-icon.png kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png troubleshooting-network-x.docbook ; do \
 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
 	done
 
 uninstall-nls:
-	for base in kde-as-root.docbook desktop.png accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook knode-news-account.png kmag.png your-kde-account.docbook kde-edutainment.docbook kmousetool.png getting-help.docbook services.png ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook juk-icon.png printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png index.docbook kopete.png font-installation.docbook amarok-icon.png kppp-dialer-tab.png kmouth.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook kcalc-systray.png kaboodle-icon.png removable-disks.docbook konq-sidebar.png konq-simple.png panel-and-desktop.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook noatun-icon.png kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png troubleshooting-network-x.docbook ; do \
+	for base in tde-as-root.docbook desktop.png accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook knode-news-account.png kmag.png your-tde-account.docbook tde-edutainment.docbook kmousetool.png getting-help.docbook services.png ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook juk-icon.png printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png index.docbook kopete.png font-installation.docbook amarok-icon.png kppp-dialer-tab.png kmouth.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook kcalc-systray.png kaboodle-icon.png removable-disks.docbook konq-sidebar.png konq-simple.png panel-and-desktop.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook noatun-icon.png kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png troubleshooting-network-x.docbook ; do \
 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
 	done
 
 
 #>+ 5
 distdir-nls:
-	for file in kde-as-root.docbook desktop.png accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook knode-news-account.png kmag.png your-kde-account.docbook kde-edutainment.docbook kmousetool.png getting-help.docbook services.png ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook juk-icon.png printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png index.docbook kopete.png font-installation.docbook amarok-icon.png kppp-dialer-tab.png kmouth.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook kcalc-systray.png kaboodle-icon.png removable-disks.docbook konq-sidebar.png konq-simple.png panel-and-desktop.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook noatun-icon.png kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png troubleshooting-network-x.docbook ; do \
+	for file in tde-as-root.docbook desktop.png accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook knode-news-account.png kmag.png your-tde-account.docbook tde-edutainment.docbook kmousetool.png getting-help.docbook services.png ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook juk-icon.png printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png index.docbook kopete.png font-installation.docbook amarok-icon.png kppp-dialer-tab.png kmouth.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook kcalc-systray.png kaboodle-icon.png removable-disks.docbook konq-sidebar.png konq-simple.png panel-and-desktop.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook noatun-icon.png kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png troubleshooting-network-x.docbook ; do \
 	  cp $(srcdir)/$$file $(distdir); \
 	done
 
diff --git a/tde-i18n-es/docs/tdebase/userguide/base-kde-applications.docbook b/tde-i18n-es/docs/tdebase/userguide/base-tde-applications.docbook
similarity index 99%
rename from tde-i18n-es/docs/tdebase/userguide/base-kde-applications.docbook
rename to tde-i18n-es/docs/tdebase/userguide/base-tde-applications.docbook
index ebde4cbe466..c6240a28f72 100644
--- a/tde-i18n-es/docs/tdebase/userguide/base-kde-applications.docbook
+++ b/tde-i18n-es/docs/tdebase/userguide/base-tde-applications.docbook
@@ -591,7 +591,7 @@
 >Oficina</title>
 
 <para
->Incluye todas las aplicaciones del conjunto &koffice;. Vea <xref linkend="kde-office-components"/> para obtener un resument de los componentes.</para>
+>Incluye todas las aplicaciones del conjunto &koffice;. Vea <xref linkend="tde-office-components"/> para obtener un resument de los componentes.</para>
 
 </sect1>
 
diff --git a/tde-i18n-es/docs/tdebase/userguide/credits-and-license.docbook b/tde-i18n-es/docs/tdebase/userguide/credits-and-license.docbook
index 7c5b60ac1a1..bcb92847b36 100644
--- a/tde-i18n-es/docs/tdebase/userguide/credits-and-license.docbook
+++ b/tde-i18n-es/docs/tdebase/userguide/credits-and-license.docbook
@@ -141,7 +141,7 @@
 ></listitem>
 	<listitem
 ><para
->Reescribió <xref linkend="kde-edutainment"/>.</para
+>Reescribió <xref linkend="tde-edutainment"/>.</para
 ></listitem>
 	<listitem
 ><para
diff --git a/tde-i18n-es/docs/tdebase/userguide/index.docbook b/tde-i18n-es/docs/tdebase/userguide/index.docbook
index 069a18f9c45..39ac6cf376b 100644
--- a/tde-i18n-es/docs/tdebase/userguide/index.docbook
+++ b/tde-i18n-es/docs/tdebase/userguide/index.docbook
@@ -15,14 +15,14 @@
   <!ENTITY programs-and-documents SYSTEM "programs-and-documents.docbook">
   <!ENTITY control-center SYSTEM "control-center.docbook">
   <!ENTITY customizing-desktop SYSTEM "customizing-desktop.docbook">
-  <!ENTITY base-kde-applications SYSTEM "base-kde-applications.docbook">
+  <!ENTITY base-tde-applications SYSTEM "base-tde-applications.docbook">
   <!ENTITY removable-disks SYSTEM "removable-disks.docbook">
   <!ENTITY burning-cds SYSTEM "burning-cds.docbook">
   <!ENTITY playing-music SYSTEM "playing-music.docbook">
   <!ENTITY playing-audiocds SYSTEM "playing-audiocds.docbook">
   <!ENTITY playing-movies SYSTEM "playing-movies.docbook">
-  <!ENTITY your-kde-account SYSTEM "your-kde-account.docbook">
-  <!ENTITY kde-as-root SYSTEM "kde-as-root.docbook">
+  <!ENTITY your-tde-account SYSTEM "your-tde-account.docbook">
+  <!ENTITY tde-as-root SYSTEM "tde-as-root.docbook">
   <!ENTITY switching-sessions SYSTEM "switching-sessions.docbook">
   <!ENTITY file-sharing SYSTEM "file-sharing.docbook">
   <!ENTITY networking-with-windows SYSTEM  "networking-with-windows.docbook">
@@ -34,7 +34,7 @@
   <!ENTITY creating-graphics SYSTEM "creating-graphics.docbook">
   <!ENTITY screen-captures SYSTEM "screen-captures.docbook">
   <!ENTITY konsole-intro SYSTEM "konsole-intro.docbook">
-  <!ENTITY kde-edutainment SYSTEM "kde-edutainment.docbook">
+  <!ENTITY tde-edutainment SYSTEM "tde-edutainment.docbook">
   <!ENTITY accessibility SYSTEM "accessibility.docbook">
   <!ENTITY under-the-hood SYSTEM "under-the-hood.docbook">
   <!ENTITY net-connection-setup SYSTEM "net-connection-setup.docbook">
@@ -43,8 +43,8 @@
   <!ENTITY browser-fine-tuning SYSTEM "browser-fine-tuning.docbook">
   <!ENTITY usenet SYSTEM "usenet.docbook">
   <!ENTITY messaging-intro SYSTEM "messaging-intro.docbook">
-  <!ENTITY kde-office SYSTEM "kde-office.docbook">
-  <!ENTITY kde-for-admins SYSTEM "kde-for-admins.docbook">
+  <!ENTITY tde-office SYSTEM "tde-office.docbook">
+  <!ENTITY tde-for-admins SYSTEM "tde-for-admins.docbook">
   <!ENTITY migrator-dictionary SYSTEM "migrator-dictionary.docbook">
   <!ENTITY glossary SYSTEM "glossary.docbook">
   <!ENTITY standard-menu-entries SYSTEM "standard-menu-entries.docbook">
@@ -538,14 +538,14 @@ programs here (and not links to removable media, like CDs).</para>
 <part id="components">
 <title
 >Componentes de &kde;</title>
-&control-center; &base-kde-applications; &extragear-applications; <chapter id="multimedia"
+&control-center; &base-tde-applications; &extragear-applications; <chapter id="multimedia"
 > <title
 >Multimedia con &kde;</title
 > &removable-disks; &playing-music; &playing-audiocds; &playing-movies; </chapter
 > <chapter id="multiuser-kde"
 > <title
 >&kde;, el escritorio multiusuario</title
-> &your-kde-account; &kde-as-root; &switching-sessions; </chapter
+> &your-tde-account; &tde-as-root; &switching-sessions; </chapter
 > <chapter id="networking"
 > <title
 >Trabajo en red con &kde;</title
@@ -554,7 +554,7 @@ programs here (and not links to removable media, like CDs).</para>
 > <title
 >Graphics, Printing, and Fonts</title
 > &printer-setup; &printing-from-apps; &pdf-files; &font-installation; &creating-graphics; </chapter
-> &customizing-desktop; &konsole-intro; &kde-edutainment; &accessibility; &under-the-hood; </part>
+> &customizing-desktop; &konsole-intro; &tde-edutainment; &accessibility; &under-the-hood; </part>
 
 <part id="kde-online">
 <title
@@ -567,9 +567,9 @@ programs here (and not links to removable media, like CDs).</para>
 > &internet-shortcuts; &browser-fine-tuning; </chapter
 > &usenet; &messaging-intro; </part>
 
-&kde-office;
+&tde-office;
 
-&kde-for-admins;
+&tde-for-admins;
 
 <part id="more">
 <title
diff --git a/tde-i18n-es/docs/tdebase/userguide/kde-as-root.docbook b/tde-i18n-es/docs/tdebase/userguide/tde-as-root.docbook
similarity index 100%
rename from tde-i18n-es/docs/tdebase/userguide/kde-as-root.docbook
rename to tde-i18n-es/docs/tdebase/userguide/tde-as-root.docbook
diff --git a/tde-i18n-es/docs/tdebase/userguide/kde-edutainment.docbook b/tde-i18n-es/docs/tdebase/userguide/tde-edutainment.docbook
similarity index 99%
rename from tde-i18n-es/docs/tdebase/userguide/kde-edutainment.docbook
rename to tde-i18n-es/docs/tdebase/userguide/tde-edutainment.docbook
index 2133d969267..18300fbb40a 100644
--- a/tde-i18n-es/docs/tdebase/userguide/kde-edutainment.docbook
+++ b/tde-i18n-es/docs/tdebase/userguide/tde-edutainment.docbook
@@ -1,4 +1,4 @@
-<chapter id="kde-edutainment">
+<chapter id="tde-edutainment">
 <!-- Uncomment this and add your name in order to be credited for
 writing this section
 <chapterinfo>
diff --git a/tde-i18n-es/docs/tdebase/userguide/kde-for-admins.docbook b/tde-i18n-es/docs/tdebase/userguide/tde-for-admins.docbook
similarity index 99%
rename from tde-i18n-es/docs/tdebase/userguide/kde-for-admins.docbook
rename to tde-i18n-es/docs/tdebase/userguide/tde-for-admins.docbook
index 6fe55375ea6..d539cbf1691 100644
--- a/tde-i18n-es/docs/tdebase/userguide/kde-for-admins.docbook
+++ b/tde-i18n-es/docs/tdebase/userguide/tde-for-admins.docbook
@@ -23,7 +23,7 @@
 <title
 >Interioridades de &kde;</title>
 
-<sect1 id="kde-for-admins-overview">
+<sect1 id="tde-for-admins-overview">
 <title
 >Visión general</title>
 <para
diff --git a/tde-i18n-es/docs/tdebase/userguide/kde-office.docbook b/tde-i18n-es/docs/tdebase/userguide/tde-office.docbook
similarity index 97%
rename from tde-i18n-es/docs/tdebase/userguide/kde-office.docbook
rename to tde-i18n-es/docs/tdebase/userguide/tde-office.docbook
index 85f93fcbd51..7c34cae8d21 100644
--- a/tde-i18n-es/docs/tdebase/userguide/kde-office.docbook
+++ b/tde-i18n-es/docs/tdebase/userguide/tde-office.docbook
@@ -1,4 +1,4 @@
-<part id="kde-office">
+<part id="tde-office">
 <partinfo>
 <authorgroup>
 <author
@@ -37,11 +37,11 @@
 <title
 >Oficina</title>
 
-<chapter id="kde-office-introduction">
+<chapter id="tde-office-introduction">
 <title
 >Introducción a KOffice</title>
 
-<sect1 id="kde-office-overview">
+<sect1 id="tde-office-overview">
 <title
 >Visión general</title>
 <para
@@ -67,7 +67,7 @@ state of the application.
 -->
 </sect1>
 
-<sect1 id="kde-office-features">
+<sect1 id="tde-office-features">
 <title
 >Funcionalidades</title>
 <para
@@ -110,7 +110,7 @@ state of the application.
 </itemizedlist>
 </sect1>
 
-<sect1 id="kde-office-fileformat">
+<sect1 id="tde-office-fileformat">
 <title
 >Formato de archivo de documento abierto OASIS</title>
 <para
@@ -123,17 +123,17 @@ state of the application.
 </chapter>
 
 <!-- comment out for final commit before freeze
-<chapter id="kde-office-embedding">
+<chapter id="tde-office-embedding">
 <title
 >Component Embedding</title>
-<sect1 id="kde-office-kparts">
+<sect1 id="tde-office-kparts">
 <title
 >KParts and &koffice;</title>
 <para
 >To be written</para>
 </sect1>
 
-<sect1 id="kde-office-example">
+<sect1 id="tde-office-example">
 <title
 >Example</title>
 <para
@@ -142,7 +142,7 @@ state of the application.
 </chapter>
 -->
 
-<chapter id="kde-office-components">
+<chapter id="tde-office-components">
 <title
 >Visión general de los componentes de &koffice;</title>
 
@@ -435,11 +435,11 @@ state of the application.
 
 </chapter>
 
-<chapter id="kde-office-furtherinfo">
+<chapter id="tde-office-furtherinfo">
 
 <title
 >Información más profunda</title>
-<sect1 id="kde-office-manuals">
+<sect1 id="tde-office-manuals">
 <title
 >Manuales de las aplicaciones</title>
 <para
@@ -452,7 +452,7 @@ state of the application.
 >.</para>
 </sect1>
 
-<sect1 id="kde-office-internet">
+<sect1 id="tde-office-internet">
 <title
 >Recursos en internet</title>
 <para
@@ -467,7 +467,7 @@ state of the application.
 >.</para>
 </sect1>
 
-<sect1 id="kde-office-plugininfo">
+<sect1 id="tde-office-plugininfo">
 <title
 >Desarrollo de complementos</title>
 <para
diff --git a/tde-i18n-es/docs/tdebase/userguide/your-kde-account.docbook b/tde-i18n-es/docs/tdebase/userguide/your-tde-account.docbook
similarity index 100%
rename from tde-i18n-es/docs/tdebase/userguide/your-kde-account.docbook
rename to tde-i18n-es/docs/tdebase/userguide/your-tde-account.docbook
diff --git a/tde-i18n-et/docs/tdebase/userguide/Makefile.in b/tde-i18n-et/docs/tdebase/userguide/Makefile.in
index 8a52381a937..fc990cfe5a6 100644
--- a/tde-i18n-et/docs/tdebase/userguide/Makefile.in
+++ b/tde-i18n-et/docs/tdebase/userguide/Makefile.in
@@ -525,10 +525,10 @@ uninstall-am:
 .NOEXPORT:
 
 #>+ 2
-KDE_DIST=rip.png kde-as-root.docbook konq-simple.png browser-fine-tuning.docbook accessibility.docbook your-kde-account.docbook programs-controlling.docbook knode-mail-account.png kcontrol.png a-window.png pdf-files.docbook kde-edutainment.docbook index.docbook open-file-dialog.png the-filemanager.docbook services.png control-center.docbook troubleshooting-network-x.docbook migrator-dictionary.docbook glossary.docbook networking-with-windows.docbook credits-and-license.docbook where-next.docbook amarok.png removable-disks.docbook oggfolder.png getting-help.docbook noatun.png kmouth2.png screen-captures.docbook extragear-applications.docbook font-installation.docbook standard-menu-entries.docbook panel-and-desktop.docbook knode-identity.png email.docbook customizing-desktop.docbook knode-start.png desktop.png playing-audiocds.docbook kaboodle.png index.cache.bz2 file-sharing.docbook playing-movies.docbook troubleshooting-no-open.docbook base-kde-applications.docbook kmouth3.png ripsettings.png messaging-intro.docbook playing-music.docbook programs-and-documents.docbook kppp-wizard.png usenet.docbook kde-for-admins.docbook kmouth.png juk.png kmag.png net-connection-setup.docbook internet-shortcuts.docbook groupware-kontact.docbook burning-cds.docbook creating-graphics.docbook konsole-intro.docbook kmousetool.png windows-how-to.docbook Makefile.in kde-office.docbook printer-setup.docbook kppp-dialer-tab.png under-the-hood.docbook titlebar-menu.png switching-sessions.docbook kopete.png migrator-applications.docbook konq-sidebar.png printing-from-apps.docbook Makefile.am shared-sessions.docbook 
+KDE_DIST=rip.png tde-as-root.docbook konq-simple.png browser-fine-tuning.docbook accessibility.docbook your-tde-account.docbook programs-controlling.docbook knode-mail-account.png kcontrol.png a-window.png pdf-files.docbook tde-edutainment.docbook index.docbook open-file-dialog.png the-filemanager.docbook services.png control-center.docbook troubleshooting-network-x.docbook migrator-dictionary.docbook glossary.docbook networking-with-windows.docbook credits-and-license.docbook where-next.docbook amarok.png removable-disks.docbook oggfolder.png getting-help.docbook noatun.png kmouth2.png screen-captures.docbook extragear-applications.docbook font-installation.docbook standard-menu-entries.docbook panel-and-desktop.docbook knode-identity.png email.docbook customizing-desktop.docbook knode-start.png desktop.png playing-audiocds.docbook kaboodle.png index.cache.bz2 file-sharing.docbook playing-movies.docbook troubleshooting-no-open.docbook base-tde-applications.docbook kmouth3.png ripsettings.png messaging-intro.docbook playing-music.docbook programs-and-documents.docbook kppp-wizard.png usenet.docbook tde-for-admins.docbook kmouth.png juk.png kmag.png net-connection-setup.docbook internet-shortcuts.docbook groupware-kontact.docbook burning-cds.docbook creating-graphics.docbook konsole-intro.docbook kmousetool.png windows-how-to.docbook Makefile.in tde-office.docbook printer-setup.docbook kppp-dialer-tab.png under-the-hood.docbook titlebar-menu.png switching-sessions.docbook kopete.png migrator-applications.docbook konq-sidebar.png printing-from-apps.docbook Makefile.am shared-sessions.docbook 
 
 #>+ 24
-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kde-as-root.docbook desktop.png accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook kmag.png your-kde-account.docbook kde-edutainment.docbook kmousetool.png getting-help.docbook services.png ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png index.docbook kopete.png font-installation.docbook kppp-dialer-tab.png kmouth.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook removable-disks.docbook konq-sidebar.png konq-simple.png panel-and-desktop.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png troubleshooting-network-x.docbook 
+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) tde-as-root.docbook desktop.png accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook kmag.png your-tde-account.docbook tde-edutainment.docbook kmousetool.png getting-help.docbook services.png ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png index.docbook kopete.png font-installation.docbook kppp-dialer-tab.png kmouth.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook removable-disks.docbook konq-sidebar.png konq-simple.png panel-and-desktop.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png troubleshooting-network-x.docbook 
 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
 
 docs-am: index.cache.bz2
@@ -555,20 +555,20 @@ clean-docs:
 #>+ 13
 install-nls:
 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide
-	@for base in kde-as-root.docbook desktop.png accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook kmag.png your-kde-account.docbook kde-edutainment.docbook kmousetool.png getting-help.docbook services.png ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png index.docbook kopete.png font-installation.docbook kppp-dialer-tab.png kmouth.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook removable-disks.docbook konq-sidebar.png konq-simple.png panel-and-desktop.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png troubleshooting-network-x.docbook ; do \
+	@for base in tde-as-root.docbook desktop.png accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook kmag.png your-tde-account.docbook tde-edutainment.docbook kmousetool.png getting-help.docbook services.png ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png index.docbook kopete.png font-installation.docbook kppp-dialer-tab.png kmouth.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook removable-disks.docbook konq-sidebar.png konq-simple.png panel-and-desktop.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png troubleshooting-network-x.docbook ; do \
 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
 	done
 
 uninstall-nls:
-	for base in kde-as-root.docbook desktop.png accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook kmag.png your-kde-account.docbook kde-edutainment.docbook kmousetool.png getting-help.docbook services.png ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png index.docbook kopete.png font-installation.docbook kppp-dialer-tab.png kmouth.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook removable-disks.docbook konq-sidebar.png konq-simple.png panel-and-desktop.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png troubleshooting-network-x.docbook ; do \
+	for base in tde-as-root.docbook desktop.png accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook kmag.png your-tde-account.docbook tde-edutainment.docbook kmousetool.png getting-help.docbook services.png ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png index.docbook kopete.png font-installation.docbook kppp-dialer-tab.png kmouth.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook removable-disks.docbook konq-sidebar.png konq-simple.png panel-and-desktop.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png troubleshooting-network-x.docbook ; do \
 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
 	done
 
 
 #>+ 5
 distdir-nls:
-	for file in kde-as-root.docbook desktop.png accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook kmag.png your-kde-account.docbook kde-edutainment.docbook kmousetool.png getting-help.docbook services.png ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png index.docbook kopete.png font-installation.docbook kppp-dialer-tab.png kmouth.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook removable-disks.docbook konq-sidebar.png konq-simple.png panel-and-desktop.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png troubleshooting-network-x.docbook ; do \
+	for file in tde-as-root.docbook desktop.png accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook kmag.png your-tde-account.docbook tde-edutainment.docbook kmousetool.png getting-help.docbook services.png ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png index.docbook kopete.png font-installation.docbook kppp-dialer-tab.png kmouth.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook removable-disks.docbook konq-sidebar.png konq-simple.png panel-and-desktop.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png troubleshooting-network-x.docbook ; do \
 	  cp $(srcdir)/$$file $(distdir); \
 	done
 
diff --git a/tde-i18n-et/docs/tdebase/userguide/base-kde-applications.docbook b/tde-i18n-et/docs/tdebase/userguide/base-tde-applications.docbook
similarity index 99%
rename from tde-i18n-et/docs/tdebase/userguide/base-kde-applications.docbook
rename to tde-i18n-et/docs/tdebase/userguide/base-tde-applications.docbook
index a764be9d2d9..21d8b044225 100644
--- a/tde-i18n-et/docs/tdebase/userguide/base-kde-applications.docbook
+++ b/tde-i18n-et/docs/tdebase/userguide/base-tde-applications.docbook
@@ -595,7 +595,7 @@
 >Kontoritöö</title>
 
 <para
->Selle alla kuuluvad kõik &koffice;'i rakendused. Neist annab ülevaate <xref linkend="kde-office-components"/>.</para>
+>Selle alla kuuluvad kõik &koffice;'i rakendused. Neist annab ülevaate <xref linkend="tde-office-components"/>.</para>
 
 </sect1>
 
diff --git a/tde-i18n-et/docs/tdebase/userguide/credits-and-license.docbook b/tde-i18n-et/docs/tdebase/userguide/credits-and-license.docbook
index d75d0183ce6..5c4d4057c4d 100644
--- a/tde-i18n-et/docs/tdebase/userguide/credits-and-license.docbook
+++ b/tde-i18n-et/docs/tdebase/userguide/credits-and-license.docbook
@@ -141,7 +141,7 @@
 ></listitem>
 	<listitem
 ><para
->Kirjutas ümber <xref linkend="kde-edutainment"/>.</para
+>Kirjutas ümber <xref linkend="tde-edutainment"/>.</para
 ></listitem>
 	<listitem
 ><para
diff --git a/tde-i18n-et/docs/tdebase/userguide/index.docbook b/tde-i18n-et/docs/tdebase/userguide/index.docbook
index 496136414ea..f9b49031633 100644
--- a/tde-i18n-et/docs/tdebase/userguide/index.docbook
+++ b/tde-i18n-et/docs/tdebase/userguide/index.docbook
@@ -15,14 +15,14 @@
   <!ENTITY programs-and-documents SYSTEM "programs-and-documents.docbook">
   <!ENTITY control-center SYSTEM "control-center.docbook">
   <!ENTITY customizing-desktop SYSTEM "customizing-desktop.docbook">
-  <!ENTITY base-kde-applications SYSTEM "base-kde-applications.docbook">
+  <!ENTITY base-tde-applications SYSTEM "base-tde-applications.docbook">
   <!ENTITY removable-disks SYSTEM "removable-disks.docbook">
   <!ENTITY burning-cds SYSTEM "burning-cds.docbook">
   <!ENTITY playing-music SYSTEM "playing-music.docbook">
   <!ENTITY playing-audiocds SYSTEM "playing-audiocds.docbook">
   <!ENTITY playing-movies SYSTEM "playing-movies.docbook">
-  <!ENTITY your-kde-account SYSTEM "your-kde-account.docbook">
-  <!ENTITY kde-as-root SYSTEM "kde-as-root.docbook">
+  <!ENTITY your-tde-account SYSTEM "your-tde-account.docbook">
+  <!ENTITY tde-as-root SYSTEM "tde-as-root.docbook">
   <!ENTITY switching-sessions SYSTEM "switching-sessions.docbook">
   <!ENTITY file-sharing SYSTEM "file-sharing.docbook">
   <!ENTITY networking-with-windows SYSTEM  "networking-with-windows.docbook">
@@ -34,7 +34,7 @@
   <!ENTITY creating-graphics SYSTEM "creating-graphics.docbook">
   <!ENTITY screen-captures SYSTEM "screen-captures.docbook">
   <!ENTITY konsole-intro SYSTEM "konsole-intro.docbook">
-  <!ENTITY kde-edutainment SYSTEM "kde-edutainment.docbook">
+  <!ENTITY tde-edutainment SYSTEM "tde-edutainment.docbook">
   <!ENTITY accessibility SYSTEM "accessibility.docbook">
   <!ENTITY under-the-hood SYSTEM "under-the-hood.docbook">
   <!ENTITY net-connection-setup SYSTEM "net-connection-setup.docbook">
@@ -43,8 +43,8 @@
   <!ENTITY browser-fine-tuning SYSTEM "browser-fine-tuning.docbook">
   <!ENTITY usenet SYSTEM "usenet.docbook">
   <!ENTITY messaging-intro SYSTEM "messaging-intro.docbook">
-  <!ENTITY kde-office SYSTEM "kde-office.docbook">
-  <!ENTITY kde-for-admins SYSTEM "kde-for-admins.docbook">
+  <!ENTITY tde-office SYSTEM "tde-office.docbook">
+  <!ENTITY tde-for-admins SYSTEM "tde-for-admins.docbook">
   <!ENTITY migrator-dictionary SYSTEM "migrator-dictionary.docbook">
   <!ENTITY glossary SYSTEM "glossary.docbook">
   <!ENTITY standard-menu-entries SYSTEM "standard-menu-entries.docbook">
@@ -540,14 +540,14 @@ programs here (and not links to removable media, like CDs).</para>
 <part id="components">
 <title
 >&kde; komponendid</title>
-&control-center; &base-kde-applications; &extragear-applications; <chapter id="multimedia"
+&control-center; &base-tde-applications; &extragear-applications; <chapter id="multimedia"
 > <title
 >&kde; ja multimeedia</title
 > &removable-disks; &playing-music; &playing-audiocds; &playing-movies; </chapter
 > <chapter id="multiuser-kde"
 > <title
 >&kde; kui mitmekasutajatöölaud</title
-> &your-kde-account; &kde-as-root; &switching-sessions; </chapter
+> &your-tde-account; &tde-as-root; &switching-sessions; </chapter
 > <chapter id="networking"
 > <title
 >&kde; ja võrk</title
@@ -556,7 +556,7 @@ programs here (and not links to removable media, like CDs).</para>
 > <title
 >Graafika, trükkimine ja fondid</title
 > &printer-setup; &printing-from-apps; &pdf-files; &font-installation; &creating-graphics; </chapter
-> &customizing-desktop; &konsole-intro; &kde-edutainment; &accessibility; &under-the-hood; </part>
+> &customizing-desktop; &konsole-intro; &tde-edutainment; &accessibility; &under-the-hood; </part>
 
 <part id="kde-online">
 <title
@@ -569,9 +569,9 @@ programs here (and not links to removable media, like CDs).</para>
 > &internet-shortcuts; &browser-fine-tuning; </chapter
 > &usenet; &messaging-intro; </part>
 
-&kde-office;
+&tde-office;
 
-&kde-for-admins;
+&tde-for-admins;
 
 <part id="more">
 <title
diff --git a/tde-i18n-et/docs/tdebase/userguide/kde-as-root.docbook b/tde-i18n-et/docs/tdebase/userguide/tde-as-root.docbook
similarity index 100%
rename from tde-i18n-et/docs/tdebase/userguide/kde-as-root.docbook
rename to tde-i18n-et/docs/tdebase/userguide/tde-as-root.docbook
diff --git a/tde-i18n-et/docs/tdebase/userguide/kde-edutainment.docbook b/tde-i18n-et/docs/tdebase/userguide/tde-edutainment.docbook
similarity index 99%
rename from tde-i18n-et/docs/tdebase/userguide/kde-edutainment.docbook
rename to tde-i18n-et/docs/tdebase/userguide/tde-edutainment.docbook
index 903fe9ca7c1..f2eb238c748 100644
--- a/tde-i18n-et/docs/tdebase/userguide/kde-edutainment.docbook
+++ b/tde-i18n-et/docs/tdebase/userguide/tde-edutainment.docbook
@@ -1,4 +1,4 @@
-<chapter id="kde-edutainment">
+<chapter id="tde-edutainment">
 <!-- Uncomment this and add your name in order to be credited for
 writing this section
 <chapterinfo>
diff --git a/tde-i18n-et/docs/tdebase/userguide/kde-for-admins.docbook b/tde-i18n-et/docs/tdebase/userguide/tde-for-admins.docbook
similarity index 99%
rename from tde-i18n-et/docs/tdebase/userguide/kde-for-admins.docbook
rename to tde-i18n-et/docs/tdebase/userguide/tde-for-admins.docbook
index 492a0da22df..5b2ebe8efc2 100644
--- a/tde-i18n-et/docs/tdebase/userguide/kde-for-admins.docbook
+++ b/tde-i18n-et/docs/tdebase/userguide/tde-for-admins.docbook
@@ -23,7 +23,7 @@
 <title
 >&kde; seestpoolt</title>
 
-<sect1 id="kde-for-admins-overview">
+<sect1 id="tde-for-admins-overview">
 <title
 >Ülevaade</title>
 <para
diff --git a/tde-i18n-et/docs/tdebase/userguide/kde-office.docbook b/tde-i18n-et/docs/tdebase/userguide/tde-office.docbook
similarity index 96%
rename from tde-i18n-et/docs/tdebase/userguide/kde-office.docbook
rename to tde-i18n-et/docs/tdebase/userguide/tde-office.docbook
index 62acbf24d34..42a000a61d2 100644
--- a/tde-i18n-et/docs/tdebase/userguide/kde-office.docbook
+++ b/tde-i18n-et/docs/tdebase/userguide/tde-office.docbook
@@ -1,4 +1,4 @@
-<part id="kde-office">
+<part id="tde-office">
 <partinfo>
 <authorgroup>
 <author
@@ -37,11 +37,11 @@
 <title
 >Kontoritöö</title>
 
-<chapter id="kde-office-introduction">
+<chapter id="tde-office-introduction">
 <title
 >KOffice'i sissejuhatus</title>
 
-<sect1 id="kde-office-overview">
+<sect1 id="tde-office-overview">
 <title
 >Ülevaade</title>
 <para
@@ -67,7 +67,7 @@ state of the application.
 -->
 </sect1>
 
-<sect1 id="kde-office-features">
+<sect1 id="tde-office-features">
 <title
 >Omadused</title>
 <para
@@ -110,7 +110,7 @@ state of the application.
 </itemizedlist>
 </sect1>
 
-<sect1 id="kde-office-fileformat">
+<sect1 id="tde-office-fileformat">
 <title
 >OASIS-e OpenDocument failivorming</title>
 <para
@@ -123,17 +123,17 @@ state of the application.
 </chapter>
 
 <!-- comment out for final commit before freeze
-<chapter id="kde-office-embedding">
+<chapter id="tde-office-embedding">
 <title
 >Component Embedding</title>
-<sect1 id="kde-office-kparts">
+<sect1 id="tde-office-kparts">
 <title
 >KParts and &koffice;</title>
 <para
 >To be written</para>
 </sect1>
 
-<sect1 id="kde-office-example">
+<sect1 id="tde-office-example">
 <title
 >Example</title>
 <para
@@ -142,7 +142,7 @@ state of the application.
 </chapter>
 -->
 
-<chapter id="kde-office-components">
+<chapter id="tde-office-components">
 <title
 >&koffice;'i komponentide ülevaade</title>
 
@@ -435,11 +435,11 @@ state of the application.
 
 </chapter>
 
-<chapter id="kde-office-furtherinfo">
+<chapter id="tde-office-furtherinfo">
 
 <title
 >Edasine info</title>
-<sect1 id="kde-office-manuals">
+<sect1 id="tde-office-manuals">
 <title
 >Rakenduste käsiraamatud</title>
 <para
@@ -452,7 +452,7 @@ state of the application.
 >.</para>
 </sect1>
 
-<sect1 id="kde-office-internet">
+<sect1 id="tde-office-internet">
 <title
 >Intenetiressursid</title>
 <para
@@ -467,7 +467,7 @@ state of the application.
 >.</para>
 </sect1>
 
-<sect1 id="kde-office-plugininfo">
+<sect1 id="tde-office-plugininfo">
 <title
 >Pluginate arendamine</title>
 <para
diff --git a/tde-i18n-et/docs/tdebase/userguide/your-kde-account.docbook b/tde-i18n-et/docs/tdebase/userguide/your-tde-account.docbook
similarity index 100%
rename from tde-i18n-et/docs/tdebase/userguide/your-kde-account.docbook
rename to tde-i18n-et/docs/tdebase/userguide/your-tde-account.docbook
diff --git a/tde-i18n-fr/docs/tdebase/userguide/Makefile.in b/tde-i18n-fr/docs/tdebase/userguide/Makefile.in
index c07ae4a2732..e79dbc55333 100644
--- a/tde-i18n-fr/docs/tdebase/userguide/Makefile.in
+++ b/tde-i18n-fr/docs/tdebase/userguide/Makefile.in
@@ -525,10 +525,10 @@ uninstall-am:
 .NOEXPORT:
 
 #>+ 2
-KDE_DIST=rip.png kde-as-root.docbook konq-simple.png browser-fine-tuning.docbook kcalc-systray.png accessibility.docbook your-kde-account.docbook programs-controlling.docbook knode-mail-account.png kcontrol.png a-window.png pdf-files.docbook kde-edutainment.docbook index.docbook open-file-dialog.png the-filemanager.docbook services.png control-center.docbook troubleshooting-network-x.docbook migrator-dictionary.docbook glossary.docbook networking-with-windows.docbook credits-and-license.docbook where-next.docbook amarok.png removable-disks.docbook oggfolder.png getting-help.docbook noatun.png kmouth2.png knode-news-account.png screen-captures.docbook extragear-applications.docbook font-installation.docbook standard-menu-entries.docbook panel-and-desktop.docbook knode-identity.png email.docbook customizing-desktop.docbook knode-start.png playing-audiocds.docbook kaboodle.png index.cache.bz2 file-sharing.docbook playing-movies.docbook troubleshooting-no-open.docbook base-kde-applications.docbook kmouth3.png ripsettings.png messaging-intro.docbook playing-music.docbook programs-and-documents.docbook kppp-wizard.png usenet.docbook kde-for-admins.docbook kmouth.png juk.png kmag.png net-connection-setup.docbook internet-shortcuts.docbook groupware-kontact.docbook burning-cds.docbook creating-graphics.docbook konsole-intro.docbook kmousetool.png windows-how-to.docbook Makefile.in kde-office.docbook printer-setup.docbook kppp-dialer-tab.png under-the-hood.docbook titlebar-menu.png splash-screen.png switching-sessions.docbook kopete.png migrator-applications.docbook konq-sidebar.png printing-from-apps.docbook Makefile.am shared-sessions.docbook 
+KDE_DIST=rip.png tde-as-root.docbook konq-simple.png browser-fine-tuning.docbook kcalc-systray.png accessibility.docbook your-tde-account.docbook programs-controlling.docbook knode-mail-account.png kcontrol.png a-window.png pdf-files.docbook tde-edutainment.docbook index.docbook open-file-dialog.png the-filemanager.docbook services.png control-center.docbook troubleshooting-network-x.docbook migrator-dictionary.docbook glossary.docbook networking-with-windows.docbook credits-and-license.docbook where-next.docbook amarok.png removable-disks.docbook oggfolder.png getting-help.docbook noatun.png kmouth2.png knode-news-account.png screen-captures.docbook extragear-applications.docbook font-installation.docbook standard-menu-entries.docbook panel-and-desktop.docbook knode-identity.png email.docbook customizing-desktop.docbook knode-start.png playing-audiocds.docbook kaboodle.png index.cache.bz2 file-sharing.docbook playing-movies.docbook troubleshooting-no-open.docbook base-tde-applications.docbook kmouth3.png ripsettings.png messaging-intro.docbook playing-music.docbook programs-and-documents.docbook kppp-wizard.png usenet.docbook tde-for-admins.docbook kmouth.png juk.png kmag.png net-connection-setup.docbook internet-shortcuts.docbook groupware-kontact.docbook burning-cds.docbook creating-graphics.docbook konsole-intro.docbook kmousetool.png windows-how-to.docbook Makefile.in tde-office.docbook printer-setup.docbook kppp-dialer-tab.png under-the-hood.docbook titlebar-menu.png splash-screen.png switching-sessions.docbook kopete.png migrator-applications.docbook konq-sidebar.png printing-from-apps.docbook Makefile.am shared-sessions.docbook 
 
 #>+ 24
-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook knode-news-account.png kmag.png your-kde-account.docbook kde-edutainment.docbook kmousetool.png getting-help.docbook services.png ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png index.docbook kopete.png font-installation.docbook kppp-dialer-tab.png kmouth.png splash-screen.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook kcalc-systray.png removable-disks.docbook konq-sidebar.png konq-simple.png panel-and-desktop.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png troubleshooting-network-x.docbook 
+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) tde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook knode-news-account.png kmag.png your-tde-account.docbook tde-edutainment.docbook kmousetool.png getting-help.docbook services.png ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png index.docbook kopete.png font-installation.docbook kppp-dialer-tab.png kmouth.png splash-screen.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook kcalc-systray.png removable-disks.docbook konq-sidebar.png konq-simple.png panel-and-desktop.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png troubleshooting-network-x.docbook 
 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
 
 docs-am: index.cache.bz2
@@ -555,20 +555,20 @@ clean-docs:
 #>+ 13
 install-nls:
 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide
-	@for base in kde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook knode-news-account.png kmag.png your-kde-account.docbook kde-edutainment.docbook kmousetool.png getting-help.docbook services.png ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png index.docbook kopete.png font-installation.docbook kppp-dialer-tab.png kmouth.png splash-screen.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook kcalc-systray.png removable-disks.docbook konq-sidebar.png konq-simple.png panel-and-desktop.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png troubleshooting-network-x.docbook ; do \
+	@for base in tde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook knode-news-account.png kmag.png your-tde-account.docbook tde-edutainment.docbook kmousetool.png getting-help.docbook services.png ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png index.docbook kopete.png font-installation.docbook kppp-dialer-tab.png kmouth.png splash-screen.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook kcalc-systray.png removable-disks.docbook konq-sidebar.png konq-simple.png panel-and-desktop.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png troubleshooting-network-x.docbook ; do \
 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
 	done
 
 uninstall-nls:
-	for base in kde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook knode-news-account.png kmag.png your-kde-account.docbook kde-edutainment.docbook kmousetool.png getting-help.docbook services.png ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png index.docbook kopete.png font-installation.docbook kppp-dialer-tab.png kmouth.png splash-screen.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook kcalc-systray.png removable-disks.docbook konq-sidebar.png konq-simple.png panel-and-desktop.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png troubleshooting-network-x.docbook ; do \
+	for base in tde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook knode-news-account.png kmag.png your-tde-account.docbook tde-edutainment.docbook kmousetool.png getting-help.docbook services.png ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png index.docbook kopete.png font-installation.docbook kppp-dialer-tab.png kmouth.png splash-screen.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook kcalc-systray.png removable-disks.docbook konq-sidebar.png konq-simple.png panel-and-desktop.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png troubleshooting-network-x.docbook ; do \
 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
 	done
 
 
 #>+ 5
 distdir-nls:
-	for file in kde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook knode-news-account.png kmag.png your-kde-account.docbook kde-edutainment.docbook kmousetool.png getting-help.docbook services.png ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png index.docbook kopete.png font-installation.docbook kppp-dialer-tab.png kmouth.png splash-screen.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook kcalc-systray.png removable-disks.docbook konq-sidebar.png konq-simple.png panel-and-desktop.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png troubleshooting-network-x.docbook ; do \
+	for file in tde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook knode-news-account.png kmag.png your-tde-account.docbook tde-edutainment.docbook kmousetool.png getting-help.docbook services.png ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png index.docbook kopete.png font-installation.docbook kppp-dialer-tab.png kmouth.png splash-screen.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook kcalc-systray.png removable-disks.docbook konq-sidebar.png konq-simple.png panel-and-desktop.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png troubleshooting-network-x.docbook ; do \
 	  cp $(srcdir)/$$file $(distdir); \
 	done
 
diff --git a/tde-i18n-fr/docs/tdebase/userguide/base-kde-applications.docbook b/tde-i18n-fr/docs/tdebase/userguide/base-tde-applications.docbook
similarity index 99%
rename from tde-i18n-fr/docs/tdebase/userguide/base-kde-applications.docbook
rename to tde-i18n-fr/docs/tdebase/userguide/base-tde-applications.docbook
index ea99d2d4b15..6185a799550 100644
--- a/tde-i18n-fr/docs/tdebase/userguide/base-kde-applications.docbook
+++ b/tde-i18n-fr/docs/tdebase/userguide/base-tde-applications.docbook
@@ -605,7 +605,7 @@
 >Bureautique</title>
 
 <para
->Ceci inclut toutes les applications de la suite &koffice;. Voyez <xref linkend="kde-office-components"/> pour un résumé des composants.</para>
+>Ceci inclut toutes les applications de la suite &koffice;. Voyez <xref linkend="tde-office-components"/> pour un résumé des composants.</para>
 
 </sect1>
 
diff --git a/tde-i18n-fr/docs/tdebase/userguide/credits-and-license.docbook b/tde-i18n-fr/docs/tdebase/userguide/credits-and-license.docbook
index fe3b1689245..5404d365f10 100644
--- a/tde-i18n-fr/docs/tdebase/userguide/credits-and-license.docbook
+++ b/tde-i18n-fr/docs/tdebase/userguide/credits-and-license.docbook
@@ -143,7 +143,7 @@
 ></listitem>
 	<listitem
 ><para
->A écrit le <xref linkend="kde-edutainment"/>.</para
+>A écrit le <xref linkend="tde-edutainment"/>.</para
 ></listitem>
 	<listitem
 ><para
diff --git a/tde-i18n-fr/docs/tdebase/userguide/index.docbook b/tde-i18n-fr/docs/tdebase/userguide/index.docbook
index 36180ef380f..6de97a2588c 100644
--- a/tde-i18n-fr/docs/tdebase/userguide/index.docbook
+++ b/tde-i18n-fr/docs/tdebase/userguide/index.docbook
@@ -15,14 +15,14 @@
   <!ENTITY programs-and-documents SYSTEM "programs-and-documents.docbook">
   <!ENTITY control-center SYSTEM "control-center.docbook">
   <!ENTITY customizing-desktop SYSTEM "customizing-desktop.docbook">
-  <!ENTITY base-kde-applications SYSTEM "base-kde-applications.docbook">
+  <!ENTITY base-tde-applications SYSTEM "base-tde-applications.docbook">
   <!ENTITY removable-disks SYSTEM "removable-disks.docbook">
   <!ENTITY burning-cds SYSTEM "burning-cds.docbook">
   <!ENTITY playing-music SYSTEM "playing-music.docbook">
   <!ENTITY playing-audiocds SYSTEM "playing-audiocds.docbook">
   <!ENTITY playing-movies SYSTEM "playing-movies.docbook">
-  <!ENTITY your-kde-account SYSTEM "your-kde-account.docbook">
-  <!ENTITY kde-as-root SYSTEM "kde-as-root.docbook">
+  <!ENTITY your-tde-account SYSTEM "your-tde-account.docbook">
+  <!ENTITY tde-as-root SYSTEM "tde-as-root.docbook">
   <!ENTITY switching-sessions SYSTEM "switching-sessions.docbook">
   <!ENTITY file-sharing SYSTEM "file-sharing.docbook">
   <!ENTITY networking-with-windows SYSTEM  "networking-with-windows.docbook">
@@ -34,7 +34,7 @@
   <!ENTITY creating-graphics SYSTEM "creating-graphics.docbook">
   <!ENTITY screen-captures SYSTEM "screen-captures.docbook">
   <!ENTITY konsole-intro SYSTEM "konsole-intro.docbook">
-  <!ENTITY kde-edutainment SYSTEM "kde-edutainment.docbook">
+  <!ENTITY tde-edutainment SYSTEM "tde-edutainment.docbook">
   <!ENTITY accessibility SYSTEM "accessibility.docbook">
   <!ENTITY under-the-hood SYSTEM "under-the-hood.docbook">
   <!ENTITY net-connection-setup SYSTEM "net-connection-setup.docbook">
@@ -43,8 +43,8 @@
   <!ENTITY browser-fine-tuning SYSTEM "browser-fine-tuning.docbook">
   <!ENTITY usenet SYSTEM "usenet.docbook">
   <!ENTITY messaging-intro SYSTEM "messaging-intro.docbook">
-  <!ENTITY kde-office SYSTEM "kde-office.docbook">
-  <!ENTITY kde-for-admins SYSTEM "kde-for-admins.docbook">
+  <!ENTITY tde-office SYSTEM "tde-office.docbook">
+  <!ENTITY tde-for-admins SYSTEM "tde-for-admins.docbook">
   <!ENTITY migrator-dictionary SYSTEM "migrator-dictionary.docbook">
   <!ENTITY glossary SYSTEM "glossary.docbook">
   <!ENTITY standard-menu-entries SYSTEM "standard-menu-entries.docbook">
@@ -526,14 +526,14 @@ programs here (and not links to removable media, like CDs).</para>
 <part id="components">
 <title
 >Composants de &kde;</title>
-&control-center; &base-kde-applications; &extragear-applications; <chapter id="multimedia"
+&control-center; &base-tde-applications; &extragear-applications; <chapter id="multimedia"
 > <title
 >Multimédia avec &kde;</title
 > &removable-disks; &playing-music; &playing-audiocds; &playing-movies; </chapter
 > <chapter id="multiuser-kde"
 > <title
 >Le bureau multiutilisateur de &kde;</title
-> &your-kde-account; &kde-as-root; &switching-sessions; </chapter
+> &your-tde-account; &tde-as-root; &switching-sessions; </chapter
 > <chapter id="networking"
 > <title
 >Le réseau avec &kde;</title
@@ -542,7 +542,7 @@ programs here (and not links to removable media, like CDs).</para>
 > <title
 >Graphiques, impression et polices de caractères</title
 > &printer-setup; &printing-from-apps; &pdf-files; &font-installation; &creating-graphics; </chapter
-> &customizing-desktop;&konsole-intro; &kde-edutainment; &accessibility; &under-the-hood; </part>
+> &customizing-desktop;&konsole-intro; &tde-edutainment; &accessibility; &under-the-hood; </part>
 
 <part id="kde-online">
 <title
@@ -555,9 +555,9 @@ programs here (and not links to removable media, like CDs).</para>
 > &internet-shortcuts; &browser-fine-tuning; </chapter
 > &usenet; &messaging-intro; </part>
 
-&kde-office;
+&tde-office;
 
-&kde-for-admins;
+&tde-for-admins;
 
 <part id="more">
 <title
diff --git a/tde-i18n-fr/docs/tdebase/userguide/kde-as-root.docbook b/tde-i18n-fr/docs/tdebase/userguide/tde-as-root.docbook
similarity index 100%
rename from tde-i18n-fr/docs/tdebase/userguide/kde-as-root.docbook
rename to tde-i18n-fr/docs/tdebase/userguide/tde-as-root.docbook
diff --git a/tde-i18n-fr/docs/tdebase/userguide/kde-edutainment.docbook b/tde-i18n-fr/docs/tdebase/userguide/tde-edutainment.docbook
similarity index 99%
rename from tde-i18n-fr/docs/tdebase/userguide/kde-edutainment.docbook
rename to tde-i18n-fr/docs/tdebase/userguide/tde-edutainment.docbook
index ef038335d03..7abb61901bc 100644
--- a/tde-i18n-fr/docs/tdebase/userguide/kde-edutainment.docbook
+++ b/tde-i18n-fr/docs/tdebase/userguide/tde-edutainment.docbook
@@ -1,4 +1,4 @@
-<chapter id="kde-edutainment">
+<chapter id="tde-edutainment">
 <!-- Uncomment this and add your name in order to be credited for
 writing this section
 <chapterinfo>
diff --git a/tde-i18n-fr/docs/tdebase/userguide/kde-for-admins.docbook b/tde-i18n-fr/docs/tdebase/userguide/tde-for-admins.docbook
similarity index 99%
rename from tde-i18n-fr/docs/tdebase/userguide/kde-for-admins.docbook
rename to tde-i18n-fr/docs/tdebase/userguide/tde-for-admins.docbook
index 6288ebdd4eb..de676763040 100644
--- a/tde-i18n-fr/docs/tdebase/userguide/kde-for-admins.docbook
+++ b/tde-i18n-fr/docs/tdebase/userguide/tde-for-admins.docbook
@@ -23,7 +23,7 @@
 <title
 >Au cœur de &kde;</title>
 
-<sect1 id="kde-for-admins-overview">
+<sect1 id="tde-for-admins-overview">
 <title
 >Vue d'ensemble</title>
 <para
diff --git a/tde-i18n-fr/docs/tdebase/userguide/kde-office.docbook b/tde-i18n-fr/docs/tdebase/userguide/tde-office.docbook
similarity index 97%
rename from tde-i18n-fr/docs/tdebase/userguide/kde-office.docbook
rename to tde-i18n-fr/docs/tdebase/userguide/tde-office.docbook
index eccadb48aa9..da3e5a21e28 100644
--- a/tde-i18n-fr/docs/tdebase/userguide/kde-office.docbook
+++ b/tde-i18n-fr/docs/tdebase/userguide/tde-office.docbook
@@ -1,4 +1,4 @@
-<part id="kde-office">
+<part id="tde-office">
 <partinfo>
 <authorgroup>
 <author
@@ -37,11 +37,11 @@
 <title
 >&kde; Office</title>
 
-<chapter id="kde-office-introduction">
+<chapter id="tde-office-introduction">
 <title
 >Introduction à KOffice</title>
 
-<sect1 id="kde-office-overview">
+<sect1 id="tde-office-overview">
 <title
 >Vue d'ensemble</title>
 <para
@@ -67,7 +67,7 @@ state of the application.
 -->
 </sect1>
 
-<sect1 id="kde-office-features">
+<sect1 id="tde-office-features">
 <title
 >Fonctionnalités</title>
 <para
@@ -110,7 +110,7 @@ state of the application.
 </itemizedlist>
 </sect1>
 
-<sect1 id="kde-office-fileformat">
+<sect1 id="tde-office-fileformat">
 <title
 >Format de fichiers OASIS OpenDocument</title>
 <para
@@ -123,17 +123,17 @@ state of the application.
 </chapter>
 
 <!-- comment out for final commit before freeze
-<chapter id="kde-office-embedding">
+<chapter id="tde-office-embedding">
 <title
 >Component Embedding</title>
-<sect1 id="kde-office-kparts">
+<sect1 id="tde-office-kparts">
 <title
 >KParts and &koffice;</title>
 <para
 >To be written</para>
 </sect1>
 
-<sect1 id="kde-office-example">
+<sect1 id="tde-office-example">
 <title
 >Example</title>
 <para
@@ -142,7 +142,7 @@ state of the application.
 </chapter>
 -->
 
-<chapter id="kde-office-components">
+<chapter id="tde-office-components">
 <title
 >Vue d'ensemble des composants &koffice;</title>
 
@@ -435,11 +435,11 @@ state of the application.
 
 </chapter>
 
-<chapter id="kde-office-furtherinfo">
+<chapter id="tde-office-furtherinfo">
 
 <title
 >Informations complémentaires</title>
-<sect1 id="kde-office-manuals">
+<sect1 id="tde-office-manuals">
 <title
 >Manuels des applications</title>
 <para
@@ -452,7 +452,7 @@ state of the application.
 >.</para>
 </sect1>
 
-<sect1 id="kde-office-internet">
+<sect1 id="tde-office-internet">
 <title
 >Ressources Internet</title>
 <para
@@ -467,7 +467,7 @@ state of the application.
 ></para>
 </sect1>
 
-<sect1 id="kde-office-plugininfo">
+<sect1 id="tde-office-plugininfo">
 <title
 >Développement de modules externes</title>
 <para
diff --git a/tde-i18n-fr/docs/tdebase/userguide/your-kde-account.docbook b/tde-i18n-fr/docs/tdebase/userguide/your-tde-account.docbook
similarity index 100%
rename from tde-i18n-fr/docs/tdebase/userguide/your-kde-account.docbook
rename to tde-i18n-fr/docs/tdebase/userguide/your-tde-account.docbook
diff --git a/tde-i18n-it/docs/tdebase/userguide/Makefile.in b/tde-i18n-it/docs/tdebase/userguide/Makefile.in
index e5ad7b0190b..b44aa06a96d 100644
--- a/tde-i18n-it/docs/tdebase/userguide/Makefile.in
+++ b/tde-i18n-it/docs/tdebase/userguide/Makefile.in
@@ -525,10 +525,10 @@ uninstall-am:
 .NOEXPORT:
 
 #>+ 2
-KDE_DIST=playing-movies.docbook file-sharing.docbook kde-as-root.docbook browser-fine-tuning.docbook troubleshooting-no-open.docbook accessibility.docbook base-kde-applications.docbook your-kde-account.docbook programs-controlling.docbook messaging-intro.docbook playing-music.docbook pdf-files.docbook programs-and-documents.docbook kde-edutainment.docbook index.docbook kde-for-admins.docbook usenet.docbook the-filemanager.docbook net-connection-setup.docbook internet-shortcuts.docbook control-center.docbook groupware-kontact.docbook troubleshooting-network-x.docbook burning-cds.docbook migrator-dictionary.docbook creating-graphics.docbook glossary.docbook konsole-intro.docbook networking-with-windows.docbook credits-and-license.docbook where-next.docbook removable-disks.docbook windows-how-to.docbook getting-help.docbook Makefile.in kde-office.docbook printer-setup.docbook under-the-hood.docbook screen-captures.docbook extragear-applications.docbook font-installation.docbook standard-menu-entries.docbook panel-and-desktop.docbook email.docbook switching-sessions.docbook customizing-desktop.docbook migrator-applications.docbook printing-from-apps.docbook Makefile.am shared-sessions.docbook playing-audiocds.docbook index.cache.bz2 
+KDE_DIST=playing-movies.docbook file-sharing.docbook tde-as-root.docbook browser-fine-tuning.docbook troubleshooting-no-open.docbook accessibility.docbook base-tde-applications.docbook your-tde-account.docbook programs-controlling.docbook messaging-intro.docbook playing-music.docbook pdf-files.docbook programs-and-documents.docbook tde-edutainment.docbook index.docbook tde-for-admins.docbook usenet.docbook the-filemanager.docbook net-connection-setup.docbook internet-shortcuts.docbook control-center.docbook groupware-kontact.docbook troubleshooting-network-x.docbook burning-cds.docbook migrator-dictionary.docbook creating-graphics.docbook glossary.docbook konsole-intro.docbook networking-with-windows.docbook credits-and-license.docbook where-next.docbook removable-disks.docbook windows-how-to.docbook getting-help.docbook Makefile.in tde-office.docbook printer-setup.docbook under-the-hood.docbook screen-captures.docbook extragear-applications.docbook font-installation.docbook standard-menu-entries.docbook panel-and-desktop.docbook email.docbook switching-sessions.docbook customizing-desktop.docbook migrator-applications.docbook printing-from-apps.docbook Makefile.am shared-sessions.docbook playing-audiocds.docbook index.cache.bz2 
 
 #>+ 24
-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-kde-account.docbook kde-edutainment.docbook getting-help.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook removable-disks.docbook panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook troubleshooting-network-x.docbook 
+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) tde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-tde-account.docbook tde-edutainment.docbook getting-help.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook removable-disks.docbook panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook troubleshooting-network-x.docbook 
 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
 
 docs-am: index.cache.bz2
@@ -555,20 +555,20 @@ clean-docs:
 #>+ 13
 install-nls:
 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide
-	@for base in kde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-kde-account.docbook kde-edutainment.docbook getting-help.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook removable-disks.docbook panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook troubleshooting-network-x.docbook ; do \
+	@for base in tde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-tde-account.docbook tde-edutainment.docbook getting-help.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook removable-disks.docbook panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook troubleshooting-network-x.docbook ; do \
 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
 	done
 
 uninstall-nls:
-	for base in kde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-kde-account.docbook kde-edutainment.docbook getting-help.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook removable-disks.docbook panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook troubleshooting-network-x.docbook ; do \
+	for base in tde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-tde-account.docbook tde-edutainment.docbook getting-help.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook removable-disks.docbook panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook troubleshooting-network-x.docbook ; do \
 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
 	done
 
 
 #>+ 5
 distdir-nls:
-	for file in kde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-kde-account.docbook kde-edutainment.docbook getting-help.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook removable-disks.docbook panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook troubleshooting-network-x.docbook ; do \
+	for file in tde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-tde-account.docbook tde-edutainment.docbook getting-help.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook removable-disks.docbook panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook troubleshooting-network-x.docbook ; do \
 	  cp $(srcdir)/$$file $(distdir); \
 	done
 
diff --git a/tde-i18n-it/docs/tdebase/userguide/base-kde-applications.docbook b/tde-i18n-it/docs/tdebase/userguide/base-tde-applications.docbook
similarity index 99%
rename from tde-i18n-it/docs/tdebase/userguide/base-kde-applications.docbook
rename to tde-i18n-it/docs/tdebase/userguide/base-tde-applications.docbook
index 002528fd7c9..d7314dde407 100644
--- a/tde-i18n-it/docs/tdebase/userguide/base-kde-applications.docbook
+++ b/tde-i18n-it/docs/tdebase/userguide/base-tde-applications.docbook
@@ -589,7 +589,7 @@
 >Ufficio</title>
 
 <para
->Questo include tutte le applicazioni della suite di &koffice;. Vedi <xref linkend="kde-office-components"/> per un sommario dei componenti.</para>
+>Questo include tutte le applicazioni della suite di &koffice;. Vedi <xref linkend="tde-office-components"/> per un sommario dei componenti.</para>
 
 </sect1>
 
diff --git a/tde-i18n-it/docs/tdebase/userguide/credits-and-license.docbook b/tde-i18n-it/docs/tdebase/userguide/credits-and-license.docbook
index 386e8f3f7da..d51bded336b 100644
--- a/tde-i18n-it/docs/tdebase/userguide/credits-and-license.docbook
+++ b/tde-i18n-it/docs/tdebase/userguide/credits-and-license.docbook
@@ -141,7 +141,7 @@
 ></listitem>
 	<listitem
 ><para
->Ha riscritto <xref linkend="kde-edutainment"/>.</para
+>Ha riscritto <xref linkend="tde-edutainment"/>.</para
 ></listitem>
 	<listitem
 ><para
diff --git a/tde-i18n-it/docs/tdebase/userguide/index.docbook b/tde-i18n-it/docs/tdebase/userguide/index.docbook
index 7c6ac78644f..86f9b49a298 100644
--- a/tde-i18n-it/docs/tdebase/userguide/index.docbook
+++ b/tde-i18n-it/docs/tdebase/userguide/index.docbook
@@ -15,14 +15,14 @@
   <!ENTITY programs-and-documents SYSTEM "programs-and-documents.docbook">
   <!ENTITY control-center SYSTEM "control-center.docbook">
   <!ENTITY customizing-desktop SYSTEM "customizing-desktop.docbook">
-  <!ENTITY base-kde-applications SYSTEM "base-kde-applications.docbook">
+  <!ENTITY base-tde-applications SYSTEM "base-tde-applications.docbook">
   <!ENTITY removable-disks SYSTEM "removable-disks.docbook">
   <!ENTITY burning-cds SYSTEM "burning-cds.docbook">
   <!ENTITY playing-music SYSTEM "playing-music.docbook">
   <!ENTITY playing-audiocds SYSTEM "playing-audiocds.docbook">
   <!ENTITY playing-movies SYSTEM "playing-movies.docbook">
-  <!ENTITY your-kde-account SYSTEM "your-kde-account.docbook">
-  <!ENTITY kde-as-root SYSTEM "kde-as-root.docbook">
+  <!ENTITY your-tde-account SYSTEM "your-tde-account.docbook">
+  <!ENTITY tde-as-root SYSTEM "tde-as-root.docbook">
   <!ENTITY switching-sessions SYSTEM "switching-sessions.docbook">
   <!ENTITY file-sharing SYSTEM "file-sharing.docbook">
   <!ENTITY networking-with-windows SYSTEM  "networking-with-windows.docbook">
@@ -34,7 +34,7 @@
   <!ENTITY creating-graphics SYSTEM "creating-graphics.docbook">
   <!ENTITY screen-captures SYSTEM "screen-captures.docbook">
   <!ENTITY konsole-intro SYSTEM "konsole-intro.docbook">
-  <!ENTITY kde-edutainment SYSTEM "kde-edutainment.docbook">
+  <!ENTITY tde-edutainment SYSTEM "tde-edutainment.docbook">
   <!ENTITY accessibility SYSTEM "accessibility.docbook">
   <!ENTITY under-the-hood SYSTEM "under-the-hood.docbook">
   <!ENTITY net-connection-setup SYSTEM "net-connection-setup.docbook">
@@ -43,8 +43,8 @@
   <!ENTITY browser-fine-tuning SYSTEM "browser-fine-tuning.docbook">
   <!ENTITY usenet SYSTEM "usenet.docbook">
   <!ENTITY messaging-intro SYSTEM "messaging-intro.docbook">
-  <!ENTITY kde-office SYSTEM "kde-office.docbook">
-  <!ENTITY kde-for-admins SYSTEM "kde-for-admins.docbook">
+  <!ENTITY tde-office SYSTEM "tde-office.docbook">
+  <!ENTITY tde-for-admins SYSTEM "tde-for-admins.docbook">
   <!ENTITY migrator-dictionary SYSTEM "migrator-dictionary.docbook">
   <!ENTITY glossary SYSTEM "glossary.docbook">
   <!ENTITY standard-menu-entries SYSTEM "standard-menu-entries.docbook">
@@ -538,14 +538,14 @@ programs here (and not links to removable media, like CDs).</para>
 <part id="components">
 <title
 >I componenti di &kde;</title>
-&control-center; &base-kde-applications; &extragear-applications; <chapter id="multimedia"
+&control-center; &base-tde-applications; &extragear-applications; <chapter id="multimedia"
 > <title
 >Multimedia con &kde;</title
 > &removable-disks; &playing-music; &playing-audiocds; &playing-movies; </chapter
 > <chapter id="multiuser-kde"
 > <title
 >&kde;, il desktop multiutente</title
-> &your-kde-account; &kde-as-root; &switching-sessions; </chapter
+> &your-tde-account; &tde-as-root; &switching-sessions; </chapter
 > <chapter id="networking"
 > <title
 >Usare la rete con &kde;</title
@@ -554,7 +554,7 @@ programs here (and not links to removable media, like CDs).</para>
 > <title
 >Grafica, stampa e caratteri</title
 > &printer-setup; &printing-from-apps; &pdf-files; &font-installation; &creating-graphics; </chapter
-> &customizing-desktop; &konsole-intro; &kde-edutainment; &accessibility; &under-the-hood; </part>
+> &customizing-desktop; &konsole-intro; &tde-edutainment; &accessibility; &under-the-hood; </part>
 
 <part id="kde-online">
 <title
@@ -567,9 +567,9 @@ programs here (and not links to removable media, like CDs).</para>
 > &internet-shortcuts; &browser-fine-tuning; </chapter
 > &usenet; &messaging-intro; </part>
 
-&kde-office;
+&tde-office;
 
-&kde-for-admins;
+&tde-for-admins;
 
 <part id="more">
 <title
diff --git a/tde-i18n-it/docs/tdebase/userguide/kde-as-root.docbook b/tde-i18n-it/docs/tdebase/userguide/tde-as-root.docbook
similarity index 100%
rename from tde-i18n-it/docs/tdebase/userguide/kde-as-root.docbook
rename to tde-i18n-it/docs/tdebase/userguide/tde-as-root.docbook
diff --git a/tde-i18n-it/docs/tdebase/userguide/kde-edutainment.docbook b/tde-i18n-it/docs/tdebase/userguide/tde-edutainment.docbook
similarity index 99%
rename from tde-i18n-it/docs/tdebase/userguide/kde-edutainment.docbook
rename to tde-i18n-it/docs/tdebase/userguide/tde-edutainment.docbook
index 0ed19b0496b..36332ff4277 100644
--- a/tde-i18n-it/docs/tdebase/userguide/kde-edutainment.docbook
+++ b/tde-i18n-it/docs/tdebase/userguide/tde-edutainment.docbook
@@ -1,4 +1,4 @@
-<chapter id="kde-edutainment">
+<chapter id="tde-edutainment">
 <!-- Uncomment this and add your name in order to be credited for
 writing this section
 <chapterinfo>
diff --git a/tde-i18n-it/docs/tdebase/userguide/kde-for-admins.docbook b/tde-i18n-it/docs/tdebase/userguide/tde-for-admins.docbook
similarity index 99%
rename from tde-i18n-it/docs/tdebase/userguide/kde-for-admins.docbook
rename to tde-i18n-it/docs/tdebase/userguide/tde-for-admins.docbook
index 07c1d7e32b4..536f442b9c0 100644
--- a/tde-i18n-it/docs/tdebase/userguide/kde-for-admins.docbook
+++ b/tde-i18n-it/docs/tdebase/userguide/tde-for-admins.docbook
@@ -23,7 +23,7 @@
 <title
 >All'interno di &kde; </title>
 
-<sect1 id="kde-for-admins-overview">
+<sect1 id="tde-for-admins-overview">
 <title
 >Panoramica</title>
 <para
diff --git a/tde-i18n-it/docs/tdebase/userguide/kde-office.docbook b/tde-i18n-it/docs/tdebase/userguide/tde-office.docbook
similarity index 97%
rename from tde-i18n-it/docs/tdebase/userguide/kde-office.docbook
rename to tde-i18n-it/docs/tdebase/userguide/tde-office.docbook
index 01f30741d98..50145aec1a9 100644
--- a/tde-i18n-it/docs/tdebase/userguide/kde-office.docbook
+++ b/tde-i18n-it/docs/tdebase/userguide/tde-office.docbook
@@ -1,4 +1,4 @@
-<part id="kde-office">
+<part id="tde-office">
 <partinfo>
 <authorgroup>
 <author
@@ -37,11 +37,11 @@
 <title
 >Ufficio</title>
 
-<chapter id="kde-office-introduction">
+<chapter id="tde-office-introduction">
 <title
 >Introduzione a KOffice</title>
 
-<sect1 id="kde-office-overview">
+<sect1 id="tde-office-overview">
 <title
 >Panoramica</title>
 <para
@@ -67,7 +67,7 @@ state of the application.
 -->
 </sect1>
 
-<sect1 id="kde-office-features">
+<sect1 id="tde-office-features">
 <title
 >Funzionalità</title>
 <para
@@ -110,7 +110,7 @@ state of the application.
 </itemizedlist>
 </sect1>
 
-<sect1 id="kde-office-fileformat">
+<sect1 id="tde-office-fileformat">
 <title
 >Formati di file OpenDocument di OASIS</title>
 <para
@@ -123,17 +123,17 @@ state of the application.
 </chapter>
 
 <!-- comment out for final commit before freeze
-<chapter id="kde-office-embedding">
+<chapter id="tde-office-embedding">
 <title
 >Component Embedding</title>
-<sect1 id="kde-office-kparts">
+<sect1 id="tde-office-kparts">
 <title
 >KParts and &koffice;</title>
 <para
 >To be written</para>
 </sect1>
 
-<sect1 id="kde-office-example">
+<sect1 id="tde-office-example">
 <title
 >Example</title>
 <para
@@ -142,7 +142,7 @@ state of the application.
 </chapter>
 -->
 
-<chapter id="kde-office-components">
+<chapter id="tde-office-components">
 <title
 >Panoramica dei componenti di &koffice;</title>
 
@@ -435,11 +435,11 @@ state of the application.
 
 </chapter>
 
-<chapter id="kde-office-furtherinfo">
+<chapter id="tde-office-furtherinfo">
 
 <title
 >Ulteriori informazioni</title>
-<sect1 id="kde-office-manuals">
+<sect1 id="tde-office-manuals">
 <title
 >Manuali delle applicazioni</title>
 <para
@@ -452,7 +452,7 @@ state of the application.
 >.</para>
 </sect1>
 
-<sect1 id="kde-office-internet">
+<sect1 id="tde-office-internet">
 <title
 >Risorse su Internet</title>
 <para
@@ -467,7 +467,7 @@ state of the application.
 ></para>
 </sect1>
 
-<sect1 id="kde-office-plugininfo">
+<sect1 id="tde-office-plugininfo">
 <title
 >Sviluppo dei plugin</title>
 <para
diff --git a/tde-i18n-it/docs/tdebase/userguide/your-kde-account.docbook b/tde-i18n-it/docs/tdebase/userguide/your-tde-account.docbook
similarity index 100%
rename from tde-i18n-it/docs/tdebase/userguide/your-kde-account.docbook
rename to tde-i18n-it/docs/tdebase/userguide/your-tde-account.docbook
diff --git a/tde-i18n-nl/docs/tdebase/userguide/Makefile.in b/tde-i18n-nl/docs/tdebase/userguide/Makefile.in
index ec3ce2823f5..bef29ad15f9 100644
--- a/tde-i18n-nl/docs/tdebase/userguide/Makefile.in
+++ b/tde-i18n-nl/docs/tdebase/userguide/Makefile.in
@@ -525,10 +525,10 @@ uninstall-am:
 .NOEXPORT:
 
 #>+ 2
-KDE_DIST=installation.docbook history.docbook playing-movies.docbook file-sharing.docbook kde-as-root.docbook browser-fine-tuning.docbook troubleshooting-no-open.docbook accessibility.docbook base-kde-applications.docbook your-kde-account.docbook programs-controlling.docbook messaging-intro.docbook playing-music.docbook about-desktop.docbook pdf-files.docbook intro.docbook programs-and-documents.docbook kde-edutainment.docbook index.docbook kde-for-admins.docbook usenet.docbook the-filemanager.docbook net-connection-setup.docbook internet-shortcuts.docbook control-center.docbook groupware-kontact.docbook troubleshooting-network-x.docbook burning-cds.docbook migrator-dictionary.docbook creating-graphics.docbook getting-started.docbook notices-trademarks.docbook glossary.docbook konsole-intro.docbook networking-with-windows.docbook credits-and-license.docbook where-next.docbook removable-disks.docbook windows-how-to.docbook getting-help.docbook Makefile.in kde-office.docbook printer-setup.docbook under-the-hood.docbook screen-captures.docbook extragear-applications.docbook font-installation.docbook first-impressions.docbook ug-faq.docbook shortcuts.docbook standard-menu-entries.docbook more-help.docbook panel-and-desktop.docbook email.docbook switching-sessions.docbook staff.docbook customizing-desktop.docbook migrator-applications.docbook printing-from-apps.docbook Makefile.am shared-sessions.docbook playing-audiocds.docbook index.cache.bz2 
+KDE_DIST=installation.docbook history.docbook playing-movies.docbook file-sharing.docbook tde-as-root.docbook browser-fine-tuning.docbook troubleshooting-no-open.docbook accessibility.docbook base-tde-applications.docbook your-tde-account.docbook programs-controlling.docbook messaging-intro.docbook playing-music.docbook about-desktop.docbook pdf-files.docbook intro.docbook programs-and-documents.docbook tde-edutainment.docbook index.docbook tde-for-admins.docbook usenet.docbook the-filemanager.docbook net-connection-setup.docbook internet-shortcuts.docbook control-center.docbook groupware-kontact.docbook troubleshooting-network-x.docbook burning-cds.docbook migrator-dictionary.docbook creating-graphics.docbook getting-started.docbook notices-trademarks.docbook glossary.docbook konsole-intro.docbook networking-with-windows.docbook credits-and-license.docbook where-next.docbook removable-disks.docbook windows-how-to.docbook getting-help.docbook Makefile.in tde-office.docbook printer-setup.docbook under-the-hood.docbook screen-captures.docbook extragear-applications.docbook font-installation.docbook first-impressions.docbook ug-faq.docbook shortcuts.docbook standard-menu-entries.docbook more-help.docbook panel-and-desktop.docbook email.docbook switching-sessions.docbook staff.docbook customizing-desktop.docbook migrator-applications.docbook printing-from-apps.docbook Makefile.am shared-sessions.docbook playing-audiocds.docbook index.cache.bz2 
 
 #>+ 24
-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) first-impressions.docbook kde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-kde-account.docbook kde-edutainment.docbook getting-help.docbook intro.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook about-desktop.docbook index.docbook more-help.docbook history.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook shortcuts.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook installation.docbook removable-disks.docbook ug-faq.docbook panel-and-desktop.docbook getting-started.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook notices-trademarks.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook staff.docbook troubleshooting-network-x.docbook 
+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) first-impressions.docbook tde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-tde-account.docbook tde-edutainment.docbook getting-help.docbook intro.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook about-desktop.docbook index.docbook more-help.docbook history.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook shortcuts.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook installation.docbook removable-disks.docbook ug-faq.docbook panel-and-desktop.docbook getting-started.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook notices-trademarks.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook staff.docbook troubleshooting-network-x.docbook 
 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
 
 docs-am: index.cache.bz2
@@ -555,20 +555,20 @@ clean-docs:
 #>+ 13
 install-nls:
 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide
-	@for base in first-impressions.docbook kde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-kde-account.docbook kde-edutainment.docbook getting-help.docbook intro.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook about-desktop.docbook index.docbook more-help.docbook history.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook shortcuts.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook installation.docbook removable-disks.docbook ug-faq.docbook panel-and-desktop.docbook getting-started.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook notices-trademarks.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook staff.docbook troubleshooting-network-x.docbook ; do \
+	@for base in first-impressions.docbook tde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-tde-account.docbook tde-edutainment.docbook getting-help.docbook intro.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook about-desktop.docbook index.docbook more-help.docbook history.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook shortcuts.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook installation.docbook removable-disks.docbook ug-faq.docbook panel-and-desktop.docbook getting-started.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook notices-trademarks.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook staff.docbook troubleshooting-network-x.docbook ; do \
 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
 	done
 
 uninstall-nls:
-	for base in first-impressions.docbook kde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-kde-account.docbook kde-edutainment.docbook getting-help.docbook intro.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook about-desktop.docbook index.docbook more-help.docbook history.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook shortcuts.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook installation.docbook removable-disks.docbook ug-faq.docbook panel-and-desktop.docbook getting-started.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook notices-trademarks.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook staff.docbook troubleshooting-network-x.docbook ; do \
+	for base in first-impressions.docbook tde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-tde-account.docbook tde-edutainment.docbook getting-help.docbook intro.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook about-desktop.docbook index.docbook more-help.docbook history.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook shortcuts.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook installation.docbook removable-disks.docbook ug-faq.docbook panel-and-desktop.docbook getting-started.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook notices-trademarks.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook staff.docbook troubleshooting-network-x.docbook ; do \
 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
 	done
 
 
 #>+ 5
 distdir-nls:
-	for file in first-impressions.docbook kde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-kde-account.docbook kde-edutainment.docbook getting-help.docbook intro.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook about-desktop.docbook index.docbook more-help.docbook history.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook shortcuts.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook installation.docbook removable-disks.docbook ug-faq.docbook panel-and-desktop.docbook getting-started.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook notices-trademarks.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook staff.docbook troubleshooting-network-x.docbook ; do \
+	for file in first-impressions.docbook tde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-tde-account.docbook tde-edutainment.docbook getting-help.docbook intro.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook about-desktop.docbook index.docbook more-help.docbook history.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook shortcuts.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook installation.docbook removable-disks.docbook ug-faq.docbook panel-and-desktop.docbook getting-started.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook notices-trademarks.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook staff.docbook troubleshooting-network-x.docbook ; do \
 	  cp $(srcdir)/$$file $(distdir); \
 	done
 
diff --git a/tde-i18n-nl/docs/tdebase/userguide/base-kde-applications.docbook b/tde-i18n-nl/docs/tdebase/userguide/base-tde-applications.docbook
similarity index 99%
rename from tde-i18n-nl/docs/tdebase/userguide/base-kde-applications.docbook
rename to tde-i18n-nl/docs/tdebase/userguide/base-tde-applications.docbook
index aad3c39bce2..5684e1b56c7 100644
--- a/tde-i18n-nl/docs/tdebase/userguide/base-kde-applications.docbook
+++ b/tde-i18n-nl/docs/tdebase/userguide/base-tde-applications.docbook
@@ -595,7 +595,7 @@
 >Kantoortoepassingen</title>
 
 <para
->Dit omvat alle toepassingen in &koffice;. Zie <xref linkend="kde-office-components"/> voor een samenvatting van de componenten.</para>
+>Dit omvat alle toepassingen in &koffice;. Zie <xref linkend="tde-office-components"/> voor een samenvatting van de componenten.</para>
 
 </sect1>
 
diff --git a/tde-i18n-nl/docs/tdebase/userguide/credits-and-license.docbook b/tde-i18n-nl/docs/tdebase/userguide/credits-and-license.docbook
index 7efd0d0c58b..4e57205fe2c 100644
--- a/tde-i18n-nl/docs/tdebase/userguide/credits-and-license.docbook
+++ b/tde-i18n-nl/docs/tdebase/userguide/credits-and-license.docbook
@@ -141,7 +141,7 @@
 ></listitem>
 	<listitem
 ><para
->Herschreef <xref linkend="kde-edutainment"/>.</para
+>Herschreef <xref linkend="tde-edutainment"/>.</para
 ></listitem>
 	<listitem
 ><para
diff --git a/tde-i18n-nl/docs/tdebase/userguide/index.docbook b/tde-i18n-nl/docs/tdebase/userguide/index.docbook
index abf2f31fdfb..d317b7eca2a 100644
--- a/tde-i18n-nl/docs/tdebase/userguide/index.docbook
+++ b/tde-i18n-nl/docs/tdebase/userguide/index.docbook
@@ -15,14 +15,14 @@
   <!ENTITY programs-and-documents SYSTEM "programs-and-documents.docbook">
   <!ENTITY control-center SYSTEM "control-center.docbook">
   <!ENTITY customizing-desktop SYSTEM "customizing-desktop.docbook">
-  <!ENTITY base-kde-applications SYSTEM "base-kde-applications.docbook">
+  <!ENTITY base-tde-applications SYSTEM "base-tde-applications.docbook">
   <!ENTITY removable-disks SYSTEM "removable-disks.docbook">
   <!ENTITY burning-cds SYSTEM "burning-cds.docbook">
   <!ENTITY playing-music SYSTEM "playing-music.docbook">
   <!ENTITY playing-audiocds SYSTEM "playing-audiocds.docbook">
   <!ENTITY playing-movies SYSTEM "playing-movies.docbook">
-  <!ENTITY your-kde-account SYSTEM "your-kde-account.docbook">
-  <!ENTITY kde-as-root SYSTEM "kde-as-root.docbook">
+  <!ENTITY your-tde-account SYSTEM "your-tde-account.docbook">
+  <!ENTITY tde-as-root SYSTEM "tde-as-root.docbook">
   <!ENTITY switching-sessions SYSTEM "switching-sessions.docbook">
   <!ENTITY file-sharing SYSTEM "file-sharing.docbook">
   <!ENTITY networking-with-windows SYSTEM  "networking-with-windows.docbook">
@@ -34,7 +34,7 @@
   <!ENTITY creating-graphics SYSTEM "creating-graphics.docbook">
   <!ENTITY screen-captures SYSTEM "screen-captures.docbook">
   <!ENTITY konsole-intro SYSTEM "konsole-intro.docbook">
-  <!ENTITY kde-edutainment SYSTEM "kde-edutainment.docbook">
+  <!ENTITY tde-edutainment SYSTEM "tde-edutainment.docbook">
   <!ENTITY accessibility SYSTEM "accessibility.docbook">
   <!ENTITY under-the-hood SYSTEM "under-the-hood.docbook">
   <!ENTITY net-connection-setup SYSTEM "net-connection-setup.docbook">
@@ -43,8 +43,8 @@
   <!ENTITY browser-fine-tuning SYSTEM "browser-fine-tuning.docbook">
   <!ENTITY usenet SYSTEM "usenet.docbook">
   <!ENTITY messaging-intro SYSTEM "messaging-intro.docbook">
-  <!ENTITY kde-office SYSTEM "kde-office.docbook">
-  <!ENTITY kde-for-admins SYSTEM "kde-for-admins.docbook">
+  <!ENTITY tde-office SYSTEM "tde-office.docbook">
+  <!ENTITY tde-for-admins SYSTEM "tde-for-admins.docbook">
   <!ENTITY migrator-dictionary SYSTEM "migrator-dictionary.docbook">
   <!ENTITY glossary SYSTEM "glossary.docbook">
   <!ENTITY standard-menu-entries SYSTEM "standard-menu-entries.docbook">
@@ -534,14 +534,14 @@ programs here (and not links to removable media, like CDs).</para>
 <part id="components">
 <title
 >&kde;-componenten</title>
-&control-center; &base-kde-applications; &extragear-applications; <chapter id="multimedia"
+&control-center; &base-tde-applications; &extragear-applications; <chapter id="multimedia"
 > <title
 >Multimedia met &kde;</title
 > &removable-disks; &playing-music; &playing-audiocds; &playing-movies; </chapter
 > <chapter id="multiuser-kde"
 > <title
 >&kde; het multigebruiker-bureaublad</title
-> &your-kde-account; &kde-as-root; &switching-sessions; </chapter
+> &your-tde-account; &tde-as-root; &switching-sessions; </chapter
 > <chapter id="networking"
 > <title
 >Netwerken met &kde;</title
@@ -550,7 +550,7 @@ programs here (and not links to removable media, like CDs).</para>
 > <title
 >Grafisch, afdrukken en lettertypen</title
 > &printer-setup; &printing-from-apps; &pdf-files; &font-installation; &creating-graphics; </chapter
->&customizing-desktop; &konsole-intro; &kde-edutainment; &accessibility; &under-the-hood; </part>
+>&customizing-desktop; &konsole-intro; &tde-edutainment; &accessibility; &under-the-hood; </part>
 
 <part id="kde-online">
 <title
@@ -563,9 +563,9 @@ programs here (and not links to removable media, like CDs).</para>
 >&internet-shortcuts;&browser-fine-tuning;</chapter
 >&usenet;&messaging-intro; </part>
 
-&kde-office;
+&tde-office;
 
-&kde-for-admins;
+&tde-for-admins;
 
 <part id="more">
 <title
diff --git a/tde-i18n-nl/docs/tdebase/userguide/kde-as-root.docbook b/tde-i18n-nl/docs/tdebase/userguide/tde-as-root.docbook
similarity index 100%
rename from tde-i18n-nl/docs/tdebase/userguide/kde-as-root.docbook
rename to tde-i18n-nl/docs/tdebase/userguide/tde-as-root.docbook
diff --git a/tde-i18n-nl/docs/tdebase/userguide/kde-edutainment.docbook b/tde-i18n-nl/docs/tdebase/userguide/tde-edutainment.docbook
similarity index 99%
rename from tde-i18n-nl/docs/tdebase/userguide/kde-edutainment.docbook
rename to tde-i18n-nl/docs/tdebase/userguide/tde-edutainment.docbook
index 6b30f4fb4d4..c4a1f72be3d 100644
--- a/tde-i18n-nl/docs/tdebase/userguide/kde-edutainment.docbook
+++ b/tde-i18n-nl/docs/tdebase/userguide/tde-edutainment.docbook
@@ -1,4 +1,4 @@
-<chapter id="kde-edutainment">
+<chapter id="tde-edutainment">
 <!-- Uncomment this and add your name in order to be credited for
 writing this section
 <chapterinfo>
diff --git a/tde-i18n-nl/docs/tdebase/userguide/kde-for-admins.docbook b/tde-i18n-nl/docs/tdebase/userguide/tde-for-admins.docbook
similarity index 99%
rename from tde-i18n-nl/docs/tdebase/userguide/kde-for-admins.docbook
rename to tde-i18n-nl/docs/tdebase/userguide/tde-for-admins.docbook
index 9a2e2445d19..2c2dd6db38a 100644
--- a/tde-i18n-nl/docs/tdebase/userguide/kde-for-admins.docbook
+++ b/tde-i18n-nl/docs/tdebase/userguide/tde-for-admins.docbook
@@ -23,7 +23,7 @@
 <title
 >Interne werking van &kde;</title>
 
-<sect1 id="kde-for-admins-overview">
+<sect1 id="tde-for-admins-overview">
 <title
 >Overzicht</title>
 <para
diff --git a/tde-i18n-nl/docs/tdebase/userguide/kde-office.docbook b/tde-i18n-nl/docs/tdebase/userguide/tde-office.docbook
similarity index 97%
rename from tde-i18n-nl/docs/tdebase/userguide/kde-office.docbook
rename to tde-i18n-nl/docs/tdebase/userguide/tde-office.docbook
index 89708720770..5013f6aa5e0 100644
--- a/tde-i18n-nl/docs/tdebase/userguide/kde-office.docbook
+++ b/tde-i18n-nl/docs/tdebase/userguide/tde-office.docbook
@@ -1,4 +1,4 @@
-<part id="kde-office">
+<part id="tde-office">
 <partinfo>
 <authorgroup>
 <author
@@ -37,11 +37,11 @@
 <title
 >Office</title>
 
-<chapter id="kde-office-introduction">
+<chapter id="tde-office-introduction">
 <title
 >Inleiding tot KOffice</title>
 
-<sect1 id="kde-office-overview">
+<sect1 id="tde-office-overview">
 <title
 >Overzicht</title>
 <para
@@ -67,7 +67,7 @@ state of the application.
 -->
 </sect1>
 
-<sect1 id="kde-office-features">
+<sect1 id="tde-office-features">
 <title
 >Functies</title>
 <para
@@ -110,7 +110,7 @@ state of the application.
 </itemizedlist>
 </sect1>
 
-<sect1 id="kde-office-fileformat">
+<sect1 id="tde-office-fileformat">
 <title
 >OASIS OpenDocument bestandsformaat.</title>
 <para
@@ -123,17 +123,17 @@ state of the application.
 </chapter>
 
 <!-- comment out for final commit before freeze
-<chapter id="kde-office-embedding">
+<chapter id="tde-office-embedding">
 <title
 >Component Embedding</title>
-<sect1 id="kde-office-kparts">
+<sect1 id="tde-office-kparts">
 <title
 >KParts and &koffice;</title>
 <para
 >To be written</para>
 </sect1>
 
-<sect1 id="kde-office-example">
+<sect1 id="tde-office-example">
 <title
 >Example</title>
 <para
@@ -142,7 +142,7 @@ state of the application.
 </chapter>
 -->
 
-<chapter id="kde-office-components">
+<chapter id="tde-office-components">
 <title
 >Overzicht van de &koffice;-componenten</title>
 
@@ -435,11 +435,11 @@ state of the application.
 
 </chapter>
 
-<chapter id="kde-office-furtherinfo">
+<chapter id="tde-office-furtherinfo">
 
 <title
 >Meer informatie</title>
-<sect1 id="kde-office-manuals">
+<sect1 id="tde-office-manuals">
 <title
 >Programmahandboeken</title>
 <para
@@ -452,7 +452,7 @@ state of the application.
 >.</para>
 </sect1>
 
-<sect1 id="kde-office-internet">
+<sect1 id="tde-office-internet">
 <title
 >Internetbronnen</title>
 <para
@@ -467,7 +467,7 @@ state of the application.
 >.</para>
 </sect1>
 
-<sect1 id="kde-office-plugininfo">
+<sect1 id="tde-office-plugininfo">
 <title
 >Pluginontwikkeling</title>
 <para
diff --git a/tde-i18n-nl/docs/tdebase/userguide/your-kde-account.docbook b/tde-i18n-nl/docs/tdebase/userguide/your-tde-account.docbook
similarity index 100%
rename from tde-i18n-nl/docs/tdebase/userguide/your-kde-account.docbook
rename to tde-i18n-nl/docs/tdebase/userguide/your-tde-account.docbook
diff --git a/tde-i18n-pl/docs/tdebase/userguide/Makefile.in b/tde-i18n-pl/docs/tdebase/userguide/Makefile.in
index a31e250b25b..5e0ce8ae169 100644
--- a/tde-i18n-pl/docs/tdebase/userguide/Makefile.in
+++ b/tde-i18n-pl/docs/tdebase/userguide/Makefile.in
@@ -525,10 +525,10 @@ uninstall-am:
 .NOEXPORT:
 
 #>+ 2
-KDE_DIST=rip.png kde-as-root.docbook konq-simple.png browser-fine-tuning.docbook kcalc-systray.png accessibility.docbook your-kde-account.docbook programs-controlling.docbook knode-mail-account.png kcontrol.png a-window.png pdf-files.docbook kde-edutainment.docbook index.docbook open-file-dialog.png the-filemanager.docbook services.png control-center.docbook troubleshooting-network-x.docbook migrator-dictionary.docbook glossary.docbook networking-with-windows.docbook credits-and-license.docbook where-next.docbook amarok.png removable-disks.docbook oggfolder.png getting-help.docbook noatun.png kmouth2.png screen-captures.docbook extragear-applications.docbook font-installation.docbook standard-menu-entries.docbook panel-and-desktop.docbook knode-identity.png email.docbook customizing-desktop.docbook knode-start.png desktop.png playing-audiocds.docbook kaboodle.png index.cache.bz2 file-sharing.docbook playing-movies.docbook troubleshooting-no-open.docbook base-kde-applications.docbook kmouth3.png ripsettings.png messaging-intro.docbook playing-music.docbook programs-and-documents.docbook kppp-wizard.png usenet.docbook kde-for-admins.docbook kmouth.png juk.png kmag.png net-connection-setup.docbook internet-shortcuts.docbook groupware-kontact.docbook burning-cds.docbook creating-graphics.docbook konsole-intro.docbook kmousetool.png windows-how-to.docbook Makefile.in kde-office.docbook printer-setup.docbook kppp-dialer-tab.png under-the-hood.docbook titlebar-menu.png switching-sessions.docbook kopete.png migrator-applications.docbook konq-sidebar.png printing-from-apps.docbook Makefile.am shared-sessions.docbook 
+KDE_DIST=rip.png tde-as-root.docbook konq-simple.png browser-fine-tuning.docbook kcalc-systray.png accessibility.docbook your-tde-account.docbook programs-controlling.docbook knode-mail-account.png kcontrol.png a-window.png pdf-files.docbook tde-edutainment.docbook index.docbook open-file-dialog.png the-filemanager.docbook services.png control-center.docbook troubleshooting-network-x.docbook migrator-dictionary.docbook glossary.docbook networking-with-windows.docbook credits-and-license.docbook where-next.docbook amarok.png removable-disks.docbook oggfolder.png getting-help.docbook noatun.png kmouth2.png screen-captures.docbook extragear-applications.docbook font-installation.docbook standard-menu-entries.docbook panel-and-desktop.docbook knode-identity.png email.docbook customizing-desktop.docbook knode-start.png desktop.png playing-audiocds.docbook kaboodle.png index.cache.bz2 file-sharing.docbook playing-movies.docbook troubleshooting-no-open.docbook base-tde-applications.docbook kmouth3.png ripsettings.png messaging-intro.docbook playing-music.docbook programs-and-documents.docbook kppp-wizard.png usenet.docbook tde-for-admins.docbook kmouth.png juk.png kmag.png net-connection-setup.docbook internet-shortcuts.docbook groupware-kontact.docbook burning-cds.docbook creating-graphics.docbook konsole-intro.docbook kmousetool.png windows-how-to.docbook Makefile.in tde-office.docbook printer-setup.docbook kppp-dialer-tab.png under-the-hood.docbook titlebar-menu.png switching-sessions.docbook kopete.png migrator-applications.docbook konq-sidebar.png printing-from-apps.docbook Makefile.am shared-sessions.docbook 
 
 #>+ 24
-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kde-as-root.docbook desktop.png accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook kmag.png your-kde-account.docbook kde-edutainment.docbook kmousetool.png getting-help.docbook services.png ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png index.docbook kopete.png font-installation.docbook kppp-dialer-tab.png kmouth.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook kcalc-systray.png removable-disks.docbook konq-sidebar.png konq-simple.png panel-and-desktop.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png troubleshooting-network-x.docbook 
+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) tde-as-root.docbook desktop.png accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook kmag.png your-tde-account.docbook tde-edutainment.docbook kmousetool.png getting-help.docbook services.png ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png index.docbook kopete.png font-installation.docbook kppp-dialer-tab.png kmouth.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook kcalc-systray.png removable-disks.docbook konq-sidebar.png konq-simple.png panel-and-desktop.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png troubleshooting-network-x.docbook 
 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
 
 docs-am: index.cache.bz2
@@ -555,20 +555,20 @@ clean-docs:
 #>+ 13
 install-nls:
 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide
-	@for base in kde-as-root.docbook desktop.png accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook kmag.png your-kde-account.docbook kde-edutainment.docbook kmousetool.png getting-help.docbook services.png ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png index.docbook kopete.png font-installation.docbook kppp-dialer-tab.png kmouth.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook kcalc-systray.png removable-disks.docbook konq-sidebar.png konq-simple.png panel-and-desktop.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png troubleshooting-network-x.docbook ; do \
+	@for base in tde-as-root.docbook desktop.png accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook kmag.png your-tde-account.docbook tde-edutainment.docbook kmousetool.png getting-help.docbook services.png ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png index.docbook kopete.png font-installation.docbook kppp-dialer-tab.png kmouth.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook kcalc-systray.png removable-disks.docbook konq-sidebar.png konq-simple.png panel-and-desktop.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png troubleshooting-network-x.docbook ; do \
 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
 	done
 
 uninstall-nls:
-	for base in kde-as-root.docbook desktop.png accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook kmag.png your-kde-account.docbook kde-edutainment.docbook kmousetool.png getting-help.docbook services.png ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png index.docbook kopete.png font-installation.docbook kppp-dialer-tab.png kmouth.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook kcalc-systray.png removable-disks.docbook konq-sidebar.png konq-simple.png panel-and-desktop.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png troubleshooting-network-x.docbook ; do \
+	for base in tde-as-root.docbook desktop.png accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook kmag.png your-tde-account.docbook tde-edutainment.docbook kmousetool.png getting-help.docbook services.png ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png index.docbook kopete.png font-installation.docbook kppp-dialer-tab.png kmouth.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook kcalc-systray.png removable-disks.docbook konq-sidebar.png konq-simple.png panel-and-desktop.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png troubleshooting-network-x.docbook ; do \
 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
 	done
 
 
 #>+ 5
 distdir-nls:
-	for file in kde-as-root.docbook desktop.png accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook kmag.png your-kde-account.docbook kde-edutainment.docbook kmousetool.png getting-help.docbook services.png ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png index.docbook kopete.png font-installation.docbook kppp-dialer-tab.png kmouth.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook kcalc-systray.png removable-disks.docbook konq-sidebar.png konq-simple.png panel-and-desktop.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png troubleshooting-network-x.docbook ; do \
+	for file in tde-as-root.docbook desktop.png accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook kmag.png your-tde-account.docbook tde-edutainment.docbook kmousetool.png getting-help.docbook services.png ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png index.docbook kopete.png font-installation.docbook kppp-dialer-tab.png kmouth.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook kcalc-systray.png removable-disks.docbook konq-sidebar.png konq-simple.png panel-and-desktop.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png troubleshooting-network-x.docbook ; do \
 	  cp $(srcdir)/$$file $(distdir); \
 	done
 
diff --git a/tde-i18n-pl/docs/tdebase/userguide/base-kde-applications.docbook b/tde-i18n-pl/docs/tdebase/userguide/base-tde-applications.docbook
similarity index 99%
rename from tde-i18n-pl/docs/tdebase/userguide/base-kde-applications.docbook
rename to tde-i18n-pl/docs/tdebase/userguide/base-tde-applications.docbook
index a7b64928ed6..d58a52c48e6 100644
--- a/tde-i18n-pl/docs/tdebase/userguide/base-kde-applications.docbook
+++ b/tde-i18n-pl/docs/tdebase/userguide/base-tde-applications.docbook
@@ -591,7 +591,7 @@
 >Biuro</title>
 
 <para
->Ta pozycja zawiera wszystkie programy z zestawu &koffice;. Odwiedź <xref linkend="kde-office-components"/>, znajdziesz tam podsumowanie wszystkich komponentów.</para>
+>Ta pozycja zawiera wszystkie programy z zestawu &koffice;. Odwiedź <xref linkend="tde-office-components"/>, znajdziesz tam podsumowanie wszystkich komponentów.</para>
 
 </sect1>
 
diff --git a/tde-i18n-pl/docs/tdebase/userguide/credits-and-license.docbook b/tde-i18n-pl/docs/tdebase/userguide/credits-and-license.docbook
index ef8548f9598..3cdaac4fe98 100644
--- a/tde-i18n-pl/docs/tdebase/userguide/credits-and-license.docbook
+++ b/tde-i18n-pl/docs/tdebase/userguide/credits-and-license.docbook
@@ -141,7 +141,7 @@
 ></listitem>
 	<listitem
 ><para
->Przepisanie <xref linkend="kde-edutainment"/>.</para
+>Przepisanie <xref linkend="tde-edutainment"/>.</para
 ></listitem>
 	<listitem
 ><para
diff --git a/tde-i18n-pl/docs/tdebase/userguide/index.docbook b/tde-i18n-pl/docs/tdebase/userguide/index.docbook
index b49d86d094d..ff3b74966b9 100644
--- a/tde-i18n-pl/docs/tdebase/userguide/index.docbook
+++ b/tde-i18n-pl/docs/tdebase/userguide/index.docbook
@@ -15,14 +15,14 @@
   <!ENTITY programs-and-documents SYSTEM "programs-and-documents.docbook">
   <!ENTITY control-center SYSTEM "control-center.docbook">
   <!ENTITY customizing-desktop SYSTEM "customizing-desktop.docbook">
-  <!ENTITY base-kde-applications SYSTEM "base-kde-applications.docbook">
+  <!ENTITY base-tde-applications SYSTEM "base-tde-applications.docbook">
   <!ENTITY removable-disks SYSTEM "removable-disks.docbook">
   <!ENTITY burning-cds SYSTEM "burning-cds.docbook">
   <!ENTITY playing-music SYSTEM "playing-music.docbook">
   <!ENTITY playing-audiocds SYSTEM "playing-audiocds.docbook">
   <!ENTITY playing-movies SYSTEM "playing-movies.docbook">
-  <!ENTITY your-kde-account SYSTEM "your-kde-account.docbook">
-  <!ENTITY kde-as-root SYSTEM "kde-as-root.docbook">
+  <!ENTITY your-tde-account SYSTEM "your-tde-account.docbook">
+  <!ENTITY tde-as-root SYSTEM "tde-as-root.docbook">
   <!ENTITY switching-sessions SYSTEM "switching-sessions.docbook">
   <!ENTITY file-sharing SYSTEM "file-sharing.docbook">
   <!ENTITY networking-with-windows SYSTEM  "networking-with-windows.docbook">
@@ -34,7 +34,7 @@
   <!ENTITY creating-graphics SYSTEM "creating-graphics.docbook">
   <!ENTITY screen-captures SYSTEM "screen-captures.docbook">
   <!ENTITY konsole-intro SYSTEM "konsole-intro.docbook">
-  <!ENTITY kde-edutainment SYSTEM "kde-edutainment.docbook">
+  <!ENTITY tde-edutainment SYSTEM "tde-edutainment.docbook">
   <!ENTITY accessibility SYSTEM "accessibility.docbook">
   <!ENTITY under-the-hood SYSTEM "under-the-hood.docbook">
   <!ENTITY net-connection-setup SYSTEM "net-connection-setup.docbook">
@@ -43,8 +43,8 @@
   <!ENTITY browser-fine-tuning SYSTEM "browser-fine-tuning.docbook">
   <!ENTITY usenet SYSTEM "usenet.docbook">
   <!ENTITY messaging-intro SYSTEM "messaging-intro.docbook">
-  <!ENTITY kde-office SYSTEM "kde-office.docbook">
-  <!ENTITY kde-for-admins SYSTEM "kde-for-admins.docbook">
+  <!ENTITY tde-office SYSTEM "tde-office.docbook">
+  <!ENTITY tde-for-admins SYSTEM "tde-for-admins.docbook">
   <!ENTITY migrator-dictionary SYSTEM "migrator-dictionary.docbook">
   <!ENTITY glossary SYSTEM "glossary.docbook">
   <!ENTITY standard-menu-entries SYSTEM "standard-menu-entries.docbook">
@@ -612,14 +612,14 @@ programs here (and not links to removable media, like CDs).</para>
 <part id="components">
 <title
 >Składniki &kde;</title>
-&control-center; &base-kde-applications; &extragear-applications; <chapter id="multimedia"
+&control-center; &base-tde-applications; &extragear-applications; <chapter id="multimedia"
 > <title
 >Multimedia w &kde;</title
 > &removable-disks; &playing-music; &playing-audiocds; &playing-movies; </chapter
 > <chapter id="multiuser-kde"
 > <title
 >&kde; dla wielu użytkowników</title
-> &your-kde-account; &kde-as-root; &switching-sessions; </chapter
+> &your-tde-account; &tde-as-root; &switching-sessions; </chapter
 > <chapter id="networking"
 > <title
 >Sieć w &kde;</title
@@ -628,7 +628,7 @@ programs here (and not links to removable media, like CDs).</para>
 > <title
 >Grafika, drukowanie i czcionki</title
 > &printer-setup; &printing-from-apps; &pdf-files; &font-installation; &creating-graphics; </chapter
-> &customizing-desktop; &konsole-intro; &kde-edutainment; &accessibility; &under-the-hood; </part>
+> &customizing-desktop; &konsole-intro; &tde-edutainment; &accessibility; &under-the-hood; </part>
 
 <part id="kde-online">
 <title
@@ -641,9 +641,9 @@ programs here (and not links to removable media, like CDs).</para>
 > &internet-shortcuts; &browser-fine-tuning; </chapter
 > &usenet; &messaging-intro; </part>
 
-&kde-office;
+&tde-office;
 
-&kde-for-admins;
+&tde-for-admins;
 
 <part id="more">
 <title
diff --git a/tde-i18n-pl/docs/tdebase/userguide/kde-as-root.docbook b/tde-i18n-pl/docs/tdebase/userguide/tde-as-root.docbook
similarity index 100%
rename from tde-i18n-pl/docs/tdebase/userguide/kde-as-root.docbook
rename to tde-i18n-pl/docs/tdebase/userguide/tde-as-root.docbook
diff --git a/tde-i18n-pl/docs/tdebase/userguide/kde-edutainment.docbook b/tde-i18n-pl/docs/tdebase/userguide/tde-edutainment.docbook
similarity index 99%
rename from tde-i18n-pl/docs/tdebase/userguide/kde-edutainment.docbook
rename to tde-i18n-pl/docs/tdebase/userguide/tde-edutainment.docbook
index 958bd9ad8ab..d3c7a9b10ab 100644
--- a/tde-i18n-pl/docs/tdebase/userguide/kde-edutainment.docbook
+++ b/tde-i18n-pl/docs/tdebase/userguide/tde-edutainment.docbook
@@ -1,4 +1,4 @@
-<chapter id="kde-edutainment">
+<chapter id="tde-edutainment">
 <!-- Uncomment this and add your name in order to be credited for
 writing this section
 <chapterinfo>
diff --git a/tde-i18n-pl/docs/tdebase/userguide/kde-for-admins.docbook b/tde-i18n-pl/docs/tdebase/userguide/tde-for-admins.docbook
similarity index 99%
rename from tde-i18n-pl/docs/tdebase/userguide/kde-for-admins.docbook
rename to tde-i18n-pl/docs/tdebase/userguide/tde-for-admins.docbook
index 40542dc48a8..7db8991b73c 100644
--- a/tde-i18n-pl/docs/tdebase/userguide/kde-for-admins.docbook
+++ b/tde-i18n-pl/docs/tdebase/userguide/tde-for-admins.docbook
@@ -23,7 +23,7 @@
 <title
 >Wnętrze &kde;</title>
 
-<sect1 id="kde-for-admins-overview">
+<sect1 id="tde-for-admins-overview">
 <title
 >Przegląd</title>
 <para
diff --git a/tde-i18n-pl/docs/tdebase/userguide/kde-office.docbook b/tde-i18n-pl/docs/tdebase/userguide/tde-office.docbook
similarity index 97%
rename from tde-i18n-pl/docs/tdebase/userguide/kde-office.docbook
rename to tde-i18n-pl/docs/tdebase/userguide/tde-office.docbook
index 8f3f9c689b6..db87a91000c 100644
--- a/tde-i18n-pl/docs/tdebase/userguide/kde-office.docbook
+++ b/tde-i18n-pl/docs/tdebase/userguide/tde-office.docbook
@@ -1,4 +1,4 @@
-<part id="kde-office">
+<part id="tde-office">
 <partinfo>
 <authorgroup>
 <author
@@ -37,11 +37,11 @@
 <title
 >Biuro</title>
 
-<chapter id="kde-office-introduction">
+<chapter id="tde-office-introduction">
 <title
 >Wprowadzenie do KOffice</title>
 
-<sect1 id="kde-office-overview">
+<sect1 id="tde-office-overview">
 <title
 >Wstęp</title>
 <para
@@ -67,7 +67,7 @@ state of the application.
 -->
 </sect1>
 
-<sect1 id="kde-office-features">
+<sect1 id="tde-office-features">
 <title
 >Właściwości</title>
 <para
@@ -110,7 +110,7 @@ state of the application.
 </itemizedlist>
 </sect1>
 
-<sect1 id="kde-office-fileformat">
+<sect1 id="tde-office-fileformat">
 <title
 >Format plików OASIS OpenDocument</title>
 <para
@@ -123,17 +123,17 @@ state of the application.
 </chapter>
 
 <!-- comment out for final commit before freeze
-<chapter id="kde-office-embedding">
+<chapter id="tde-office-embedding">
 <title
 >Component Embedding</title>
-<sect1 id="kde-office-kparts">
+<sect1 id="tde-office-kparts">
 <title
 >KParts and &koffice;</title>
 <para
 >To be written</para>
 </sect1>
 
-<sect1 id="kde-office-example">
+<sect1 id="tde-office-example">
 <title
 >Example</title>
 <para
@@ -142,7 +142,7 @@ state of the application.
 </chapter>
 -->
 
-<chapter id="kde-office-components">
+<chapter id="tde-office-components">
 <title
 >Ogólne spojrzenie na komponenty &koffice;</title>
 
@@ -435,11 +435,11 @@ state of the application.
 
 </chapter>
 
-<chapter id="kde-office-furtherinfo">
+<chapter id="tde-office-furtherinfo">
 
 <title
 >Dodatkowe informacje</title>
-<sect1 id="kde-office-manuals">
+<sect1 id="tde-office-manuals">
 <title
 >Podręczniki programów</title>
 <para
@@ -452,7 +452,7 @@ state of the application.
 >.</para>
 </sect1>
 
-<sect1 id="kde-office-internet">
+<sect1 id="tde-office-internet">
 <title
 >Zasoby internetowe</title>
 <para
@@ -467,7 +467,7 @@ state of the application.
 ></para>
 </sect1>
 
-<sect1 id="kde-office-plugininfo">
+<sect1 id="tde-office-plugininfo">
 <title
 >Pisanie wtyczek</title>
 <para
diff --git a/tde-i18n-pl/docs/tdebase/userguide/your-kde-account.docbook b/tde-i18n-pl/docs/tdebase/userguide/your-tde-account.docbook
similarity index 100%
rename from tde-i18n-pl/docs/tdebase/userguide/your-kde-account.docbook
rename to tde-i18n-pl/docs/tdebase/userguide/your-tde-account.docbook
diff --git a/tde-i18n-pt/docs/tdebase/userguide/Makefile.in b/tde-i18n-pt/docs/tdebase/userguide/Makefile.in
index d86958e59d4..f30e5416725 100644
--- a/tde-i18n-pt/docs/tdebase/userguide/Makefile.in
+++ b/tde-i18n-pt/docs/tdebase/userguide/Makefile.in
@@ -525,10 +525,10 @@ uninstall-am:
 .NOEXPORT:
 
 #>+ 2
-KDE_DIST=installation.docbook history.docbook playing-movies.docbook file-sharing.docbook kde-as-root.docbook browser-fine-tuning.docbook troubleshooting-no-open.docbook accessibility.docbook base-kde-applications.docbook your-kde-account.docbook programs-controlling.docbook messaging-intro.docbook playing-music.docbook about-desktop.docbook pdf-files.docbook intro.docbook programs-and-documents.docbook kde-edutainment.docbook index.docbook kde-for-admins.docbook usenet.docbook the-filemanager.docbook net-connection-setup.docbook internet-shortcuts.docbook control-center.docbook groupware-kontact.docbook troubleshooting-network-x.docbook burning-cds.docbook migrator-dictionary.docbook creating-graphics.docbook getting-started.docbook notices-trademarks.docbook glossary.docbook konsole-intro.docbook networking-with-windows.docbook credits-and-license.docbook where-next.docbook removable-disks.docbook windows-how-to.docbook getting-help.docbook Makefile.in kde-office.docbook printer-setup.docbook under-the-hood.docbook screen-captures.docbook extragear-applications.docbook font-installation.docbook first-impressions.docbook ug-faq.docbook shortcuts.docbook standard-menu-entries.docbook more-help.docbook panel-and-desktop.docbook email.docbook switching-sessions.docbook staff.docbook customizing-desktop.docbook migrator-applications.docbook printing-from-apps.docbook Makefile.am shared-sessions.docbook playing-audiocds.docbook index.cache.bz2 
+KDE_DIST=installation.docbook history.docbook playing-movies.docbook file-sharing.docbook tde-as-root.docbook browser-fine-tuning.docbook troubleshooting-no-open.docbook accessibility.docbook base-tde-applications.docbook your-tde-account.docbook programs-controlling.docbook messaging-intro.docbook playing-music.docbook about-desktop.docbook pdf-files.docbook intro.docbook programs-and-documents.docbook tde-edutainment.docbook index.docbook tde-for-admins.docbook usenet.docbook the-filemanager.docbook net-connection-setup.docbook internet-shortcuts.docbook control-center.docbook groupware-kontact.docbook troubleshooting-network-x.docbook burning-cds.docbook migrator-dictionary.docbook creating-graphics.docbook getting-started.docbook notices-trademarks.docbook glossary.docbook konsole-intro.docbook networking-with-windows.docbook credits-and-license.docbook where-next.docbook removable-disks.docbook windows-how-to.docbook getting-help.docbook Makefile.in tde-office.docbook printer-setup.docbook under-the-hood.docbook screen-captures.docbook extragear-applications.docbook font-installation.docbook first-impressions.docbook ug-faq.docbook shortcuts.docbook standard-menu-entries.docbook more-help.docbook panel-and-desktop.docbook email.docbook switching-sessions.docbook staff.docbook customizing-desktop.docbook migrator-applications.docbook printing-from-apps.docbook Makefile.am shared-sessions.docbook playing-audiocds.docbook index.cache.bz2 
 
 #>+ 24
-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) first-impressions.docbook kde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-kde-account.docbook kde-edutainment.docbook getting-help.docbook intro.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook about-desktop.docbook index.docbook more-help.docbook history.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook shortcuts.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook installation.docbook removable-disks.docbook ug-faq.docbook panel-and-desktop.docbook getting-started.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook notices-trademarks.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook staff.docbook troubleshooting-network-x.docbook 
+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) first-impressions.docbook tde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-tde-account.docbook tde-edutainment.docbook getting-help.docbook intro.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook about-desktop.docbook index.docbook more-help.docbook history.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook shortcuts.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook installation.docbook removable-disks.docbook ug-faq.docbook panel-and-desktop.docbook getting-started.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook notices-trademarks.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook staff.docbook troubleshooting-network-x.docbook 
 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
 
 docs-am: index.cache.bz2
@@ -555,20 +555,20 @@ clean-docs:
 #>+ 13
 install-nls:
 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide
-	@for base in first-impressions.docbook kde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-kde-account.docbook kde-edutainment.docbook getting-help.docbook intro.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook about-desktop.docbook index.docbook more-help.docbook history.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook shortcuts.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook installation.docbook removable-disks.docbook ug-faq.docbook panel-and-desktop.docbook getting-started.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook notices-trademarks.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook staff.docbook troubleshooting-network-x.docbook ; do \
+	@for base in first-impressions.docbook tde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-tde-account.docbook tde-edutainment.docbook getting-help.docbook intro.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook about-desktop.docbook index.docbook more-help.docbook history.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook shortcuts.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook installation.docbook removable-disks.docbook ug-faq.docbook panel-and-desktop.docbook getting-started.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook notices-trademarks.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook staff.docbook troubleshooting-network-x.docbook ; do \
 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
 	done
 
 uninstall-nls:
-	for base in first-impressions.docbook kde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-kde-account.docbook kde-edutainment.docbook getting-help.docbook intro.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook about-desktop.docbook index.docbook more-help.docbook history.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook shortcuts.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook installation.docbook removable-disks.docbook ug-faq.docbook panel-and-desktop.docbook getting-started.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook notices-trademarks.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook staff.docbook troubleshooting-network-x.docbook ; do \
+	for base in first-impressions.docbook tde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-tde-account.docbook tde-edutainment.docbook getting-help.docbook intro.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook about-desktop.docbook index.docbook more-help.docbook history.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook shortcuts.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook installation.docbook removable-disks.docbook ug-faq.docbook panel-and-desktop.docbook getting-started.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook notices-trademarks.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook staff.docbook troubleshooting-network-x.docbook ; do \
 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
 	done
 
 
 #>+ 5
 distdir-nls:
-	for file in first-impressions.docbook kde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-kde-account.docbook kde-edutainment.docbook getting-help.docbook intro.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook about-desktop.docbook index.docbook more-help.docbook history.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook shortcuts.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook installation.docbook removable-disks.docbook ug-faq.docbook panel-and-desktop.docbook getting-started.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook notices-trademarks.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook staff.docbook troubleshooting-network-x.docbook ; do \
+	for file in first-impressions.docbook tde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-tde-account.docbook tde-edutainment.docbook getting-help.docbook intro.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook about-desktop.docbook index.docbook more-help.docbook history.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook shortcuts.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook installation.docbook removable-disks.docbook ug-faq.docbook panel-and-desktop.docbook getting-started.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook notices-trademarks.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook staff.docbook troubleshooting-network-x.docbook ; do \
 	  cp $(srcdir)/$$file $(distdir); \
 	done
 
diff --git a/tde-i18n-pt/docs/tdebase/userguide/base-kde-applications.docbook b/tde-i18n-pt/docs/tdebase/userguide/base-tde-applications.docbook
similarity index 99%
rename from tde-i18n-pt/docs/tdebase/userguide/base-kde-applications.docbook
rename to tde-i18n-pt/docs/tdebase/userguide/base-tde-applications.docbook
index b2f8145e65c..30dee14c62a 100644
--- a/tde-i18n-pt/docs/tdebase/userguide/base-kde-applications.docbook
+++ b/tde-i18n-pt/docs/tdebase/userguide/base-tde-applications.docbook
@@ -595,7 +595,7 @@
 >Escritório</title>
 
 <para
->Isto inclui todas as aplicações do pacote do &koffice;. Veja em <xref linkend="kde-office-components"/> um resumo dos componentes.</para>
+>Isto inclui todas as aplicações do pacote do &koffice;. Veja em <xref linkend="tde-office-components"/> um resumo dos componentes.</para>
 
 </sect1>
 
diff --git a/tde-i18n-pt/docs/tdebase/userguide/credits-and-license.docbook b/tde-i18n-pt/docs/tdebase/userguide/credits-and-license.docbook
index bc90c9758b3..0db0cfa090d 100644
--- a/tde-i18n-pt/docs/tdebase/userguide/credits-and-license.docbook
+++ b/tde-i18n-pt/docs/tdebase/userguide/credits-and-license.docbook
@@ -141,7 +141,7 @@
 ></listitem>
 	<listitem
 ><para
->Escreveu de novo o <xref linkend="kde-edutainment"/>.</para
+>Escreveu de novo o <xref linkend="tde-edutainment"/>.</para
 ></listitem>
 	<listitem
 ><para
diff --git a/tde-i18n-pt/docs/tdebase/userguide/index.docbook b/tde-i18n-pt/docs/tdebase/userguide/index.docbook
index 1746caf776d..0465ff80c7a 100644
--- a/tde-i18n-pt/docs/tdebase/userguide/index.docbook
+++ b/tde-i18n-pt/docs/tdebase/userguide/index.docbook
@@ -15,14 +15,14 @@
   <!ENTITY programs-and-documents SYSTEM "programs-and-documents.docbook">
   <!ENTITY control-center SYSTEM "control-center.docbook">
   <!ENTITY customizing-desktop SYSTEM "customizing-desktop.docbook">
-  <!ENTITY base-kde-applications SYSTEM "base-kde-applications.docbook">
+  <!ENTITY base-tde-applications SYSTEM "base-tde-applications.docbook">
   <!ENTITY removable-disks SYSTEM "removable-disks.docbook">
   <!ENTITY burning-cds SYSTEM "burning-cds.docbook">
   <!ENTITY playing-music SYSTEM "playing-music.docbook">
   <!ENTITY playing-audiocds SYSTEM "playing-audiocds.docbook">
   <!ENTITY playing-movies SYSTEM "playing-movies.docbook">
-  <!ENTITY your-kde-account SYSTEM "your-kde-account.docbook">
-  <!ENTITY kde-as-root SYSTEM "kde-as-root.docbook">
+  <!ENTITY your-tde-account SYSTEM "your-tde-account.docbook">
+  <!ENTITY tde-as-root SYSTEM "tde-as-root.docbook">
   <!ENTITY switching-sessions SYSTEM "switching-sessions.docbook">
   <!ENTITY file-sharing SYSTEM "file-sharing.docbook">
   <!ENTITY networking-with-windows SYSTEM  "networking-with-windows.docbook">
@@ -34,7 +34,7 @@
   <!ENTITY creating-graphics SYSTEM "creating-graphics.docbook">
   <!ENTITY screen-captures SYSTEM "screen-captures.docbook">
   <!ENTITY konsole-intro SYSTEM "konsole-intro.docbook">
-  <!ENTITY kde-edutainment SYSTEM "kde-edutainment.docbook">
+  <!ENTITY tde-edutainment SYSTEM "tde-edutainment.docbook">
   <!ENTITY accessibility SYSTEM "accessibility.docbook">
   <!ENTITY under-the-hood SYSTEM "under-the-hood.docbook">
   <!ENTITY net-connection-setup SYSTEM "net-connection-setup.docbook">
@@ -43,8 +43,8 @@
   <!ENTITY browser-fine-tuning SYSTEM "browser-fine-tuning.docbook">
   <!ENTITY usenet SYSTEM "usenet.docbook">
   <!ENTITY messaging-intro SYSTEM "messaging-intro.docbook">
-  <!ENTITY kde-office SYSTEM "kde-office.docbook">
-  <!ENTITY kde-for-admins SYSTEM "kde-for-admins.docbook">
+  <!ENTITY tde-office SYSTEM "tde-office.docbook">
+  <!ENTITY tde-for-admins SYSTEM "tde-for-admins.docbook">
   <!ENTITY migrator-dictionary SYSTEM "migrator-dictionary.docbook">
   <!ENTITY glossary SYSTEM "glossary.docbook">
   <!ENTITY standard-menu-entries SYSTEM "standard-menu-entries.docbook">
@@ -540,14 +540,14 @@ programs here (and not links to removable media, like CDs).</para>
 <part id="components">
 <title
 >Componentes do &kde;</title>
-&control-center; &base-kde-applications; &extragear-applications; <chapter id="multimedia"
+&control-center; &base-tde-applications; &extragear-applications; <chapter id="multimedia"
 > <title
 >Multimédia com o &kde;</title
 > &removable-disks; &playing-music; &playing-audiocds; &playing-movies; </chapter
 > <chapter id="multiuser-kde"
 > <title
 >&kde;, o Ambiente de Trabalho Multi-Utilizador</title
-> &your-kde-account; &kde-as-root; &switching-sessions; </chapter
+> &your-tde-account; &tde-as-root; &switching-sessions; </chapter
 > <chapter id="networking"
 > <title
 >Rede com o &kde;</title
@@ -556,7 +556,7 @@ programs here (and not links to removable media, like CDs).</para>
 > <title
 >Gráficos, Impressões e Tipos de Letra</title
 > &printer-setup; &printing-from-apps; &pdf-files; &font-installation; &creating-graphics; </chapter
-> &customizing-desktop; &konsole-intro; &kde-edutainment; &accessibility; &under-the-hood; </part>
+> &customizing-desktop; &konsole-intro; &tde-edutainment; &accessibility; &under-the-hood; </part>
 
 <part id="kde-online">
 <title
@@ -569,9 +569,9 @@ programs here (and not links to removable media, like CDs).</para>
 > &internet-shortcuts; &browser-fine-tuning; </chapter
 > &usenet; &messaging-intro; </part>
 
-&kde-office;
+&tde-office;
 
-&kde-for-admins;
+&tde-for-admins;
 
 <part id="more">
 <title
diff --git a/tde-i18n-pt/docs/tdebase/userguide/kde-as-root.docbook b/tde-i18n-pt/docs/tdebase/userguide/tde-as-root.docbook
similarity index 100%
rename from tde-i18n-pt/docs/tdebase/userguide/kde-as-root.docbook
rename to tde-i18n-pt/docs/tdebase/userguide/tde-as-root.docbook
diff --git a/tde-i18n-pt/docs/tdebase/userguide/kde-edutainment.docbook b/tde-i18n-pt/docs/tdebase/userguide/tde-edutainment.docbook
similarity index 99%
rename from tde-i18n-pt/docs/tdebase/userguide/kde-edutainment.docbook
rename to tde-i18n-pt/docs/tdebase/userguide/tde-edutainment.docbook
index c7f0c631376..8dd733ccbef 100644
--- a/tde-i18n-pt/docs/tdebase/userguide/kde-edutainment.docbook
+++ b/tde-i18n-pt/docs/tdebase/userguide/tde-edutainment.docbook
@@ -1,4 +1,4 @@
-<chapter id="kde-edutainment">
+<chapter id="tde-edutainment">
 <!-- Uncomment this and add your name in order to be credited for
 writing this section
 <chapterinfo>
diff --git a/tde-i18n-pt/docs/tdebase/userguide/kde-for-admins.docbook b/tde-i18n-pt/docs/tdebase/userguide/tde-for-admins.docbook
similarity index 99%
rename from tde-i18n-pt/docs/tdebase/userguide/kde-for-admins.docbook
rename to tde-i18n-pt/docs/tdebase/userguide/tde-for-admins.docbook
index 2882bf879ef..4369b2ab0d7 100644
--- a/tde-i18n-pt/docs/tdebase/userguide/kde-for-admins.docbook
+++ b/tde-i18n-pt/docs/tdebase/userguide/tde-for-admins.docbook
@@ -23,7 +23,7 @@
 <title
 >Detalhes do &kde;</title>
 
-<sect1 id="kde-for-admins-overview">
+<sect1 id="tde-for-admins-overview">
 <title
 >Introdução</title>
 <para
diff --git a/tde-i18n-pt/docs/tdebase/userguide/kde-office.docbook b/tde-i18n-pt/docs/tdebase/userguide/tde-office.docbook
similarity index 97%
rename from tde-i18n-pt/docs/tdebase/userguide/kde-office.docbook
rename to tde-i18n-pt/docs/tdebase/userguide/tde-office.docbook
index d9ed63dae35..d450a3764e4 100644
--- a/tde-i18n-pt/docs/tdebase/userguide/kde-office.docbook
+++ b/tde-i18n-pt/docs/tdebase/userguide/tde-office.docbook
@@ -1,4 +1,4 @@
-<part id="kde-office">
+<part id="tde-office">
 <partinfo>
 <authorgroup>
 <author
@@ -37,11 +37,11 @@
 <title
 >Escritório</title>
 
-<chapter id="kde-office-introduction">
+<chapter id="tde-office-introduction">
 <title
 >Introdução ao KOffice</title>
 
-<sect1 id="kde-office-overview">
+<sect1 id="tde-office-overview">
 <title
 >Introdução</title>
 <para
@@ -67,7 +67,7 @@ state of the application.
 -->
 </sect1>
 
-<sect1 id="kde-office-features">
+<sect1 id="tde-office-features">
 <title
 >Características</title>
 <para
@@ -110,7 +110,7 @@ state of the application.
 </itemizedlist>
 </sect1>
 
-<sect1 id="kde-office-fileformat">
+<sect1 id="tde-office-fileformat">
 <title
 >Formato de ficheiro OpenDocument da OASIS</title>
 <para
@@ -123,17 +123,17 @@ state of the application.
 </chapter>
 
 <!-- comment out for final commit before freeze
-<chapter id="kde-office-embedding">
+<chapter id="tde-office-embedding">
 <title
 >Component Embedding</title>
-<sect1 id="kde-office-kparts">
+<sect1 id="tde-office-kparts">
 <title
 >KParts and &koffice;</title>
 <para
 >To be written</para>
 </sect1>
 
-<sect1 id="kde-office-example">
+<sect1 id="tde-office-example">
 <title
 >Example</title>
 <para
@@ -142,7 +142,7 @@ state of the application.
 </chapter>
 -->
 
-<chapter id="kde-office-components">
+<chapter id="tde-office-components">
 <title
 >Ideia Geral dos Componentes do &koffice;</title>
 
@@ -435,11 +435,11 @@ state of the application.
 
 </chapter>
 
-<chapter id="kde-office-furtherinfo">
+<chapter id="tde-office-furtherinfo">
 
 <title
 >Mais Informações</title>
-<sect1 id="kde-office-manuals">
+<sect1 id="tde-office-manuals">
 <title
 >Manuais de Aplicações</title>
 <para
@@ -452,7 +452,7 @@ state of the application.
 >.</para>
 </sect1>
 
-<sect1 id="kde-office-internet">
+<sect1 id="tde-office-internet">
 <title
 >Recursos na Internet</title>
 <para
@@ -467,7 +467,7 @@ state of the application.
 ></para>
 </sect1>
 
-<sect1 id="kde-office-plugininfo">
+<sect1 id="tde-office-plugininfo">
 <title
 >Desenvolvimento de 'plugins'</title>
 <para
diff --git a/tde-i18n-pt/docs/tdebase/userguide/your-kde-account.docbook b/tde-i18n-pt/docs/tdebase/userguide/your-tde-account.docbook
similarity index 100%
rename from tde-i18n-pt/docs/tdebase/userguide/your-kde-account.docbook
rename to tde-i18n-pt/docs/tdebase/userguide/your-tde-account.docbook
diff --git a/tde-i18n-pt_BR/docs/tdebase/userguide/Makefile.in b/tde-i18n-pt_BR/docs/tdebase/userguide/Makefile.in
index 23aa38409bc..f4fc7e9fc2b 100644
--- a/tde-i18n-pt_BR/docs/tdebase/userguide/Makefile.in
+++ b/tde-i18n-pt_BR/docs/tdebase/userguide/Makefile.in
@@ -525,10 +525,10 @@ uninstall-am:
 .NOEXPORT:
 
 #>+ 2
-KDE_DIST=playing-movies.docbook file-sharing.docbook kde-as-root.docbook browser-fine-tuning.docbook troubleshooting-no-open.docbook accessibility.docbook base-kde-applications.docbook your-kde-account.docbook programs-controlling.docbook messaging-intro.docbook playing-music.docbook pdf-files.docbook programs-and-documents.docbook kde-edutainment.docbook index.docbook kde-for-admins.docbook usenet.docbook the-filemanager.docbook net-connection-setup.docbook internet-shortcuts.docbook control-center.docbook groupware-kontact.docbook troubleshooting-network-x.docbook burning-cds.docbook migrator-dictionary.docbook creating-graphics.docbook glossary.docbook konsole-intro.docbook networking-with-windows.docbook credits-and-license.docbook where-next.docbook removable-disks.docbook windows-how-to.docbook getting-help.docbook Makefile.in kde-office.docbook printer-setup.docbook under-the-hood.docbook screen-captures.docbook extragear-applications.docbook font-installation.docbook standard-menu-entries.docbook panel-and-desktop.docbook email.docbook switching-sessions.docbook customizing-desktop.docbook migrator-applications.docbook printing-from-apps.docbook Makefile.am shared-sessions.docbook playing-audiocds.docbook index.cache.bz2 
+KDE_DIST=playing-movies.docbook file-sharing.docbook tde-as-root.docbook browser-fine-tuning.docbook troubleshooting-no-open.docbook accessibility.docbook base-tde-applications.docbook your-tde-account.docbook programs-controlling.docbook messaging-intro.docbook playing-music.docbook pdf-files.docbook programs-and-documents.docbook tde-edutainment.docbook index.docbook tde-for-admins.docbook usenet.docbook the-filemanager.docbook net-connection-setup.docbook internet-shortcuts.docbook control-center.docbook groupware-kontact.docbook troubleshooting-network-x.docbook burning-cds.docbook migrator-dictionary.docbook creating-graphics.docbook glossary.docbook konsole-intro.docbook networking-with-windows.docbook credits-and-license.docbook where-next.docbook removable-disks.docbook windows-how-to.docbook getting-help.docbook Makefile.in tde-office.docbook printer-setup.docbook under-the-hood.docbook screen-captures.docbook extragear-applications.docbook font-installation.docbook standard-menu-entries.docbook panel-and-desktop.docbook email.docbook switching-sessions.docbook customizing-desktop.docbook migrator-applications.docbook printing-from-apps.docbook Makefile.am shared-sessions.docbook playing-audiocds.docbook index.cache.bz2 
 
 #>+ 24
-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-kde-account.docbook kde-edutainment.docbook getting-help.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook removable-disks.docbook panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook troubleshooting-network-x.docbook 
+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) tde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-tde-account.docbook tde-edutainment.docbook getting-help.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook removable-disks.docbook panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook troubleshooting-network-x.docbook 
 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
 
 docs-am: index.cache.bz2
@@ -555,20 +555,20 @@ clean-docs:
 #>+ 13
 install-nls:
 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide
-	@for base in kde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-kde-account.docbook kde-edutainment.docbook getting-help.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook removable-disks.docbook panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook troubleshooting-network-x.docbook ; do \
+	@for base in tde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-tde-account.docbook tde-edutainment.docbook getting-help.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook removable-disks.docbook panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook troubleshooting-network-x.docbook ; do \
 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
 	done
 
 uninstall-nls:
-	for base in kde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-kde-account.docbook kde-edutainment.docbook getting-help.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook removable-disks.docbook panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook troubleshooting-network-x.docbook ; do \
+	for base in tde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-tde-account.docbook tde-edutainment.docbook getting-help.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook removable-disks.docbook panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook troubleshooting-network-x.docbook ; do \
 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
 	done
 
 
 #>+ 5
 distdir-nls:
-	for file in kde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-kde-account.docbook kde-edutainment.docbook getting-help.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook removable-disks.docbook panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook troubleshooting-network-x.docbook ; do \
+	for file in tde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-tde-account.docbook tde-edutainment.docbook getting-help.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook removable-disks.docbook panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook troubleshooting-network-x.docbook ; do \
 	  cp $(srcdir)/$$file $(distdir); \
 	done
 
diff --git a/tde-i18n-pt_BR/docs/tdebase/userguide/base-kde-applications.docbook b/tde-i18n-pt_BR/docs/tdebase/userguide/base-tde-applications.docbook
similarity index 99%
rename from tde-i18n-pt_BR/docs/tdebase/userguide/base-kde-applications.docbook
rename to tde-i18n-pt_BR/docs/tdebase/userguide/base-tde-applications.docbook
index 440f50f7ceb..b2b0434bfa0 100644
--- a/tde-i18n-pt_BR/docs/tdebase/userguide/base-kde-applications.docbook
+++ b/tde-i18n-pt_BR/docs/tdebase/userguide/base-tde-applications.docbook
@@ -595,7 +595,7 @@
 >Escritório</title>
 
 <para
->Isto inclui todas as aplicações do pacote do &koffice;. Veja em <xref linkend="kde-office-components"/> um resumo dos componentes.</para>
+>Isto inclui todas as aplicações do pacote do &koffice;. Veja em <xref linkend="tde-office-components"/> um resumo dos componentes.</para>
 
 </sect1>
 
diff --git a/tde-i18n-pt_BR/docs/tdebase/userguide/credits-and-license.docbook b/tde-i18n-pt_BR/docs/tdebase/userguide/credits-and-license.docbook
index 07d3d7bc235..fa14a3147c9 100644
--- a/tde-i18n-pt_BR/docs/tdebase/userguide/credits-and-license.docbook
+++ b/tde-i18n-pt_BR/docs/tdebase/userguide/credits-and-license.docbook
@@ -141,7 +141,7 @@
 ></listitem>
 	<listitem
 ><para
->Escreveu de novo o <xref linkend="kde-edutainment"/>.</para
+>Escreveu de novo o <xref linkend="tde-edutainment"/>.</para
 ></listitem>
 	<listitem
 ><para
diff --git a/tde-i18n-pt_BR/docs/tdebase/userguide/index.docbook b/tde-i18n-pt_BR/docs/tdebase/userguide/index.docbook
index 91896f9c58f..f8eb2f49778 100644
--- a/tde-i18n-pt_BR/docs/tdebase/userguide/index.docbook
+++ b/tde-i18n-pt_BR/docs/tdebase/userguide/index.docbook
@@ -15,14 +15,14 @@
   <!ENTITY programs-and-documents SYSTEM "programs-and-documents.docbook">
   <!ENTITY control-center SYSTEM "control-center.docbook">
   <!ENTITY customizing-desktop SYSTEM "customizing-desktop.docbook">
-  <!ENTITY base-kde-applications SYSTEM "base-kde-applications.docbook">
+  <!ENTITY base-tde-applications SYSTEM "base-tde-applications.docbook">
   <!ENTITY removable-disks SYSTEM "removable-disks.docbook">
   <!ENTITY burning-cds SYSTEM "burning-cds.docbook">
   <!ENTITY playing-music SYSTEM "playing-music.docbook">
   <!ENTITY playing-audiocds SYSTEM "playing-audiocds.docbook">
   <!ENTITY playing-movies SYSTEM "playing-movies.docbook">
-  <!ENTITY your-kde-account SYSTEM "your-kde-account.docbook">
-  <!ENTITY kde-as-root SYSTEM "kde-as-root.docbook">
+  <!ENTITY your-tde-account SYSTEM "your-tde-account.docbook">
+  <!ENTITY tde-as-root SYSTEM "tde-as-root.docbook">
   <!ENTITY switching-sessions SYSTEM "switching-sessions.docbook">
   <!ENTITY file-sharing SYSTEM "file-sharing.docbook">
   <!ENTITY networking-with-windows SYSTEM  "networking-with-windows.docbook">
@@ -34,7 +34,7 @@
   <!ENTITY creating-graphics SYSTEM "creating-graphics.docbook">
   <!ENTITY screen-captures SYSTEM "screen-captures.docbook">
   <!ENTITY konsole-intro SYSTEM "konsole-intro.docbook">
-  <!ENTITY kde-edutainment SYSTEM "kde-edutainment.docbook">
+  <!ENTITY tde-edutainment SYSTEM "tde-edutainment.docbook">
   <!ENTITY accessibility SYSTEM "accessibility.docbook">
   <!ENTITY under-the-hood SYSTEM "under-the-hood.docbook">
   <!ENTITY net-connection-setup SYSTEM "net-connection-setup.docbook">
@@ -43,8 +43,8 @@
   <!ENTITY browser-fine-tuning SYSTEM "browser-fine-tuning.docbook">
   <!ENTITY usenet SYSTEM "usenet.docbook">
   <!ENTITY messaging-intro SYSTEM "messaging-intro.docbook">
-  <!ENTITY kde-office SYSTEM "kde-office.docbook">
-  <!ENTITY kde-for-admins SYSTEM "kde-for-admins.docbook">
+  <!ENTITY tde-office SYSTEM "tde-office.docbook">
+  <!ENTITY tde-for-admins SYSTEM "tde-for-admins.docbook">
   <!ENTITY migrator-dictionary SYSTEM "migrator-dictionary.docbook">
   <!ENTITY glossary SYSTEM "glossary.docbook">
   <!ENTITY standard-menu-entries SYSTEM "standard-menu-entries.docbook">
@@ -540,14 +540,14 @@ programs here (and not links to removable media, like CDs).</para>
 <part id="components">
 <title
 >Componentes do &kde;</title>
-&control-center; &base-kde-applications; &extragear-applications; <chapter id="multimedia"
+&control-center; &base-tde-applications; &extragear-applications; <chapter id="multimedia"
 > <title
 >Multimédia com o &kde;</title
 > &removable-disks; &playing-music; &playing-audiocds; &playing-movies; </chapter
 > <chapter id="multiuser-kde"
 > <title
 >&kde;, o Ambiente de Trabalho Multi-Usuário</title
-> &your-kde-account; &kde-as-root; &switching-sessions; </chapter
+> &your-tde-account; &tde-as-root; &switching-sessions; </chapter
 > <chapter id="networking"
 > <title
 >Rede com o &kde;</title
@@ -556,7 +556,7 @@ programs here (and not links to removable media, like CDs).</para>
 > <title
 >Gráficos, Impressões e Fontes</title
 > &printer-setup; &printing-from-apps; &pdf-files; &font-installation; &creating-graphics; </chapter
-> &customizing-desktop; &konsole-intro; &kde-edutainment; &accessibility; &under-the-hood; </part>
+> &customizing-desktop; &konsole-intro; &tde-edutainment; &accessibility; &under-the-hood; </part>
 
 <part id="kde-online">
 <title
@@ -569,9 +569,9 @@ programs here (and not links to removable media, like CDs).</para>
 > &internet-shortcuts; &browser-fine-tuning; </chapter
 > &usenet; &messaging-intro; </part>
 
-&kde-office;
+&tde-office;
 
-&kde-for-admins;
+&tde-for-admins;
 
 <part id="more">
 <title
diff --git a/tde-i18n-pt_BR/docs/tdebase/userguide/kde-as-root.docbook b/tde-i18n-pt_BR/docs/tdebase/userguide/tde-as-root.docbook
similarity index 100%
rename from tde-i18n-pt_BR/docs/tdebase/userguide/kde-as-root.docbook
rename to tde-i18n-pt_BR/docs/tdebase/userguide/tde-as-root.docbook
diff --git a/tde-i18n-pt_BR/docs/tdebase/userguide/kde-edutainment.docbook b/tde-i18n-pt_BR/docs/tdebase/userguide/tde-edutainment.docbook
similarity index 99%
rename from tde-i18n-pt_BR/docs/tdebase/userguide/kde-edutainment.docbook
rename to tde-i18n-pt_BR/docs/tdebase/userguide/tde-edutainment.docbook
index 169a35c0468..1a609786be4 100644
--- a/tde-i18n-pt_BR/docs/tdebase/userguide/kde-edutainment.docbook
+++ b/tde-i18n-pt_BR/docs/tdebase/userguide/tde-edutainment.docbook
@@ -1,4 +1,4 @@
-<chapter id="kde-edutainment">
+<chapter id="tde-edutainment">
 <!-- Uncomment this and add your name in order to be credited for
 writing this section
 <chapterinfo>
diff --git a/tde-i18n-pt_BR/docs/tdebase/userguide/kde-for-admins.docbook b/tde-i18n-pt_BR/docs/tdebase/userguide/tde-for-admins.docbook
similarity index 99%
rename from tde-i18n-pt_BR/docs/tdebase/userguide/kde-for-admins.docbook
rename to tde-i18n-pt_BR/docs/tdebase/userguide/tde-for-admins.docbook
index 6e7e76a4117..ae40b21acfd 100644
--- a/tde-i18n-pt_BR/docs/tdebase/userguide/kde-for-admins.docbook
+++ b/tde-i18n-pt_BR/docs/tdebase/userguide/tde-for-admins.docbook
@@ -23,7 +23,7 @@
 <title
 >Por dentro do &kde;</title>
 
-<sect1 id="kde-for-admins-overview">
+<sect1 id="tde-for-admins-overview">
 <title
 >Introdução</title>
 <para
diff --git a/tde-i18n-pt_BR/docs/tdebase/userguide/kde-office.docbook b/tde-i18n-pt_BR/docs/tdebase/userguide/tde-office.docbook
similarity index 97%
rename from tde-i18n-pt_BR/docs/tdebase/userguide/kde-office.docbook
rename to tde-i18n-pt_BR/docs/tdebase/userguide/tde-office.docbook
index 150d3bae52c..00209bf4dd8 100644
--- a/tde-i18n-pt_BR/docs/tdebase/userguide/kde-office.docbook
+++ b/tde-i18n-pt_BR/docs/tdebase/userguide/tde-office.docbook
@@ -1,4 +1,4 @@
-<part id="kde-office">
+<part id="tde-office">
 <partinfo>
 <authorgroup>
 <author
@@ -37,11 +37,11 @@
 <title
 >Escritório</title>
 
-<chapter id="kde-office-introduction">
+<chapter id="tde-office-introduction">
 <title
 >Introdução ao KOffice</title>
 
-<sect1 id="kde-office-overview">
+<sect1 id="tde-office-overview">
 <title
 >Introdução</title>
 <para
@@ -67,7 +67,7 @@ state of the application.
 -->
 </sect1>
 
-<sect1 id="kde-office-features">
+<sect1 id="tde-office-features">
 <title
 >Características</title>
 <para
@@ -110,7 +110,7 @@ state of the application.
 </itemizedlist>
 </sect1>
 
-<sect1 id="kde-office-fileformat">
+<sect1 id="tde-office-fileformat">
 <title
 >Formato de arquivo OpenDocument da OASIS</title>
 <para
@@ -123,17 +123,17 @@ state of the application.
 </chapter>
 
 <!-- comment out for final commit before freeze
-<chapter id="kde-office-embedding">
+<chapter id="tde-office-embedding">
 <title
 >Component Embedding</title>
-<sect1 id="kde-office-kparts">
+<sect1 id="tde-office-kparts">
 <title
 >KParts and &koffice;</title>
 <para
 >To be written</para>
 </sect1>
 
-<sect1 id="kde-office-example">
+<sect1 id="tde-office-example">
 <title
 >Example</title>
 <para
@@ -142,7 +142,7 @@ state of the application.
 </chapter>
 -->
 
-<chapter id="kde-office-components">
+<chapter id="tde-office-components">
 <title
 >Idéia Geral dos Componentes do &koffice;</title>
 
@@ -435,11 +435,11 @@ state of the application.
 
 </chapter>
 
-<chapter id="kde-office-furtherinfo">
+<chapter id="tde-office-furtherinfo">
 
 <title
 >Mais Informações</title>
-<sect1 id="kde-office-manuals">
+<sect1 id="tde-office-manuals">
 <title
 >Manuais das Aplicações</title>
 <para
@@ -452,7 +452,7 @@ state of the application.
 >.</para>
 </sect1>
 
-<sect1 id="kde-office-internet">
+<sect1 id="tde-office-internet">
 <title
 >Recursos na Internet</title>
 <para
@@ -467,7 +467,7 @@ state of the application.
 ></para>
 </sect1>
 
-<sect1 id="kde-office-plugininfo">
+<sect1 id="tde-office-plugininfo">
 <title
 >Desenvolvimento de plugins</title>
 <para
diff --git a/tde-i18n-pt_BR/docs/tdebase/userguide/your-kde-account.docbook b/tde-i18n-pt_BR/docs/tdebase/userguide/your-tde-account.docbook
similarity index 100%
rename from tde-i18n-pt_BR/docs/tdebase/userguide/your-kde-account.docbook
rename to tde-i18n-pt_BR/docs/tdebase/userguide/your-tde-account.docbook
diff --git a/tde-i18n-ru/docs/tdebase/userguide/Makefile.in b/tde-i18n-ru/docs/tdebase/userguide/Makefile.in
index 94f80c65cbf..04ae2b5518f 100644
--- a/tde-i18n-ru/docs/tdebase/userguide/Makefile.in
+++ b/tde-i18n-ru/docs/tdebase/userguide/Makefile.in
@@ -525,10 +525,10 @@ uninstall-am:
 .NOEXPORT:
 
 #>+ 2
-KDE_DIST=playing-movies.docbook file-sharing.docbook kde-as-root.docbook browser-fine-tuning.docbook troubleshooting-no-open.docbook accessibility.docbook base-kde-applications.docbook your-kde-account.docbook programs-controlling.docbook messaging-intro.docbook playing-music.docbook pdf-files.docbook programs-and-documents.docbook kde-edutainment.docbook index.docbook kde-for-admins.docbook usenet.docbook the-filemanager.docbook net-connection-setup.docbook internet-shortcuts.docbook control-center.docbook groupware-kontact.docbook troubleshooting-network-x.docbook burning-cds.docbook migrator-dictionary.docbook creating-graphics.docbook glossary.docbook konsole-intro.docbook networking-with-windows.docbook credits-and-license.docbook where-next.docbook removable-disks.docbook windows-how-to.docbook getting-help.docbook Makefile.in kde-office.docbook printer-setup.docbook under-the-hood.docbook screen-captures.docbook extragear-applications.docbook font-installation.docbook standard-menu-entries.docbook panel-and-desktop.docbook email.docbook switching-sessions.docbook customizing-desktop.docbook migrator-applications.docbook printing-from-apps.docbook Makefile.am shared-sessions.docbook playing-audiocds.docbook index.cache.bz2 
+KDE_DIST=playing-movies.docbook file-sharing.docbook tde-as-root.docbook browser-fine-tuning.docbook troubleshooting-no-open.docbook accessibility.docbook base-tde-applications.docbook your-tde-account.docbook programs-controlling.docbook messaging-intro.docbook playing-music.docbook pdf-files.docbook programs-and-documents.docbook tde-edutainment.docbook index.docbook tde-for-admins.docbook usenet.docbook the-filemanager.docbook net-connection-setup.docbook internet-shortcuts.docbook control-center.docbook groupware-kontact.docbook troubleshooting-network-x.docbook burning-cds.docbook migrator-dictionary.docbook creating-graphics.docbook glossary.docbook konsole-intro.docbook networking-with-windows.docbook credits-and-license.docbook where-next.docbook removable-disks.docbook windows-how-to.docbook getting-help.docbook Makefile.in tde-office.docbook printer-setup.docbook under-the-hood.docbook screen-captures.docbook extragear-applications.docbook font-installation.docbook standard-menu-entries.docbook panel-and-desktop.docbook email.docbook switching-sessions.docbook customizing-desktop.docbook migrator-applications.docbook printing-from-apps.docbook Makefile.am shared-sessions.docbook playing-audiocds.docbook index.cache.bz2 
 
 #>+ 24
-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-kde-account.docbook kde-edutainment.docbook getting-help.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook removable-disks.docbook panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook troubleshooting-network-x.docbook 
+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) tde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-tde-account.docbook tde-edutainment.docbook getting-help.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook removable-disks.docbook panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook troubleshooting-network-x.docbook 
 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
 
 docs-am: index.cache.bz2
@@ -555,20 +555,20 @@ clean-docs:
 #>+ 13
 install-nls:
 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide
-	@for base in kde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-kde-account.docbook kde-edutainment.docbook getting-help.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook removable-disks.docbook panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook troubleshooting-network-x.docbook ; do \
+	@for base in tde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-tde-account.docbook tde-edutainment.docbook getting-help.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook removable-disks.docbook panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook troubleshooting-network-x.docbook ; do \
 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
 	done
 
 uninstall-nls:
-	for base in kde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-kde-account.docbook kde-edutainment.docbook getting-help.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook removable-disks.docbook panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook troubleshooting-network-x.docbook ; do \
+	for base in tde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-tde-account.docbook tde-edutainment.docbook getting-help.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook removable-disks.docbook panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook troubleshooting-network-x.docbook ; do \
 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
 	done
 
 
 #>+ 5
 distdir-nls:
-	for file in kde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-kde-account.docbook kde-edutainment.docbook getting-help.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook removable-disks.docbook panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook troubleshooting-network-x.docbook ; do \
+	for file in tde-as-root.docbook accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook under-the-hood.docbook your-tde-account.docbook tde-edutainment.docbook getting-help.docbook file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook programs-and-documents.docbook where-next.docbook playing-audiocds.docbook index.docbook font-installation.docbook extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook removable-disks.docbook panel-and-desktop.docbook konsole-intro.docbook control-center.docbook windows-how-to.docbook screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook playing-music.docbook pdf-files.docbook printing-from-apps.docbook internet-shortcuts.docbook burning-cds.docbook troubleshooting-network-x.docbook ; do \
 	  cp $(srcdir)/$$file $(distdir); \
 	done
 
diff --git a/tde-i18n-ru/docs/tdebase/userguide/base-kde-applications.docbook b/tde-i18n-ru/docs/tdebase/userguide/base-tde-applications.docbook
similarity index 99%
rename from tde-i18n-ru/docs/tdebase/userguide/base-kde-applications.docbook
rename to tde-i18n-ru/docs/tdebase/userguide/base-tde-applications.docbook
index fab68d0db7a..0eff4be6d8a 100644
--- a/tde-i18n-ru/docs/tdebase/userguide/base-kde-applications.docbook
+++ b/tde-i18n-ru/docs/tdebase/userguide/base-tde-applications.docbook
@@ -591,7 +591,7 @@
 >Офисные приложения</title>
 
 <para
->Сюда входят все приложения из состава &koffice;. Они описаны в документе <xref linkend="kde-office-components"/>.</para>
+>Сюда входят все приложения из состава &koffice;. Они описаны в документе <xref linkend="tde-office-components"/>.</para>
 
 </sect1>
 
diff --git a/tde-i18n-ru/docs/tdebase/userguide/credits-and-license.docbook b/tde-i18n-ru/docs/tdebase/userguide/credits-and-license.docbook
index 3481f9fdf0d..75ee85ecec5 100644
--- a/tde-i18n-ru/docs/tdebase/userguide/credits-and-license.docbook
+++ b/tde-i18n-ru/docs/tdebase/userguide/credits-and-license.docbook
@@ -141,7 +141,7 @@
 ></listitem>
 	<listitem
 ><para
->Автор раздела <xref linkend="kde-edutainment"/>.</para
+>Автор раздела <xref linkend="tde-edutainment"/>.</para
 ></listitem>
 	<listitem
 ><para
diff --git a/tde-i18n-ru/docs/tdebase/userguide/index.docbook b/tde-i18n-ru/docs/tdebase/userguide/index.docbook
index 0c6daa0142d..f5fda70790f 100644
--- a/tde-i18n-ru/docs/tdebase/userguide/index.docbook
+++ b/tde-i18n-ru/docs/tdebase/userguide/index.docbook
@@ -15,14 +15,14 @@
   <!ENTITY programs-and-documents SYSTEM "programs-and-documents.docbook">
   <!ENTITY control-center SYSTEM "control-center.docbook">
   <!ENTITY customizing-desktop SYSTEM "customizing-desktop.docbook">
-  <!ENTITY base-kde-applications SYSTEM "base-kde-applications.docbook">
+  <!ENTITY base-tde-applications SYSTEM "base-tde-applications.docbook">
   <!ENTITY removable-disks SYSTEM "removable-disks.docbook">
   <!ENTITY burning-cds SYSTEM "burning-cds.docbook">
   <!ENTITY playing-music SYSTEM "playing-music.docbook">
   <!ENTITY playing-audiocds SYSTEM "playing-audiocds.docbook">
   <!ENTITY playing-movies SYSTEM "playing-movies.docbook">
-  <!ENTITY your-kde-account SYSTEM "your-kde-account.docbook">
-  <!ENTITY kde-as-root SYSTEM "kde-as-root.docbook">
+  <!ENTITY your-tde-account SYSTEM "your-tde-account.docbook">
+  <!ENTITY tde-as-root SYSTEM "tde-as-root.docbook">
   <!ENTITY switching-sessions SYSTEM "switching-sessions.docbook">
   <!ENTITY file-sharing SYSTEM "file-sharing.docbook">
   <!ENTITY networking-with-windows SYSTEM  "networking-with-windows.docbook">
@@ -34,7 +34,7 @@
   <!ENTITY creating-graphics SYSTEM "creating-graphics.docbook">
   <!ENTITY screen-captures SYSTEM "screen-captures.docbook">
   <!ENTITY konsole-intro SYSTEM "konsole-intro.docbook">
-  <!ENTITY kde-edutainment SYSTEM "kde-edutainment.docbook">
+  <!ENTITY tde-edutainment SYSTEM "tde-edutainment.docbook">
   <!ENTITY accessibility SYSTEM "accessibility.docbook">
   <!ENTITY under-the-hood SYSTEM "under-the-hood.docbook">
   <!ENTITY net-connection-setup SYSTEM "net-connection-setup.docbook">
@@ -43,8 +43,8 @@
   <!ENTITY browser-fine-tuning SYSTEM "browser-fine-tuning.docbook">
   <!ENTITY usenet SYSTEM "usenet.docbook">
   <!ENTITY messaging-intro SYSTEM "messaging-intro.docbook">
-  <!ENTITY kde-office SYSTEM "kde-office.docbook">
-  <!ENTITY kde-for-admins SYSTEM "kde-for-admins.docbook">
+  <!ENTITY tde-office SYSTEM "tde-office.docbook">
+  <!ENTITY tde-for-admins SYSTEM "tde-for-admins.docbook">
   <!ENTITY migrator-dictionary SYSTEM "migrator-dictionary.docbook">
   <!ENTITY glossary SYSTEM "glossary.docbook">
   <!ENTITY standard-menu-entries SYSTEM "standard-menu-entries.docbook">
@@ -552,14 +552,14 @@ programs here (and not links to removable media, like CDs).</para>
 <part id="components">
 <title
 >Компоненты &kde;</title>
-&control-center; &base-kde-applications; &extragear-applications; <chapter id="multimedia"
+&control-center; &base-tde-applications; &extragear-applications; <chapter id="multimedia"
 > <title
 >Мультимедиа в &kde;</title
 > &removable-disks; &playing-music; &playing-audiocds; &playing-movies; </chapter
 > <chapter id="multiuser-kde"
 > <title
 >&kde; в многопользовательской системе</title
-> &your-kde-account; &kde-as-root; &switching-sessions; </chapter
+> &your-tde-account; &tde-as-root; &switching-sessions; </chapter
 > <chapter id="networking"
 > <title
 >Работа в сети с &kde;</title
@@ -568,7 +568,7 @@ programs here (and not links to removable media, like CDs).</para>
 > <title
 >Графика, печать и шрифты</title
 > &printer-setup; &printing-from-apps; &pdf-files; &font-installation; &creating-graphics; </chapter
-> &customizing-desktop; &konsole-intro; &kde-edutainment; &accessibility; &under-the-hood; </part>
+> &customizing-desktop; &konsole-intro; &tde-edutainment; &accessibility; &under-the-hood; </part>
 
 <part id="kde-online">
 <title
@@ -581,9 +581,9 @@ programs here (and not links to removable media, like CDs).</para>
 > &internet-shortcuts; &browser-fine-tuning; </chapter
 > &usenet; &messaging-intro; </part>
 
-&kde-office;
+&tde-office;
 
-&kde-for-admins;
+&tde-for-admins;
 
 <part id="more">
 <title
diff --git a/tde-i18n-ru/docs/tdebase/userguide/kde-as-root.docbook b/tde-i18n-ru/docs/tdebase/userguide/tde-as-root.docbook
similarity index 100%
rename from tde-i18n-ru/docs/tdebase/userguide/kde-as-root.docbook
rename to tde-i18n-ru/docs/tdebase/userguide/tde-as-root.docbook
diff --git a/tde-i18n-ru/docs/tdebase/userguide/kde-edutainment.docbook b/tde-i18n-ru/docs/tdebase/userguide/tde-edutainment.docbook
similarity index 99%
rename from tde-i18n-ru/docs/tdebase/userguide/kde-edutainment.docbook
rename to tde-i18n-ru/docs/tdebase/userguide/tde-edutainment.docbook
index 3bf906fbb5e..5306219cd42 100644
--- a/tde-i18n-ru/docs/tdebase/userguide/kde-edutainment.docbook
+++ b/tde-i18n-ru/docs/tdebase/userguide/tde-edutainment.docbook
@@ -1,4 +1,4 @@
-<chapter id="kde-edutainment">
+<chapter id="tde-edutainment">
 <!-- Uncomment this and add your name in order to be credited for
 writing this section
 <chapterinfo>
diff --git a/tde-i18n-ru/docs/tdebase/userguide/kde-for-admins.docbook b/tde-i18n-ru/docs/tdebase/userguide/tde-for-admins.docbook
similarity index 99%
rename from tde-i18n-ru/docs/tdebase/userguide/kde-for-admins.docbook
rename to tde-i18n-ru/docs/tdebase/userguide/tde-for-admins.docbook
index 009ca378a06..9988eb48072 100644
--- a/tde-i18n-ru/docs/tdebase/userguide/kde-for-admins.docbook
+++ b/tde-i18n-ru/docs/tdebase/userguide/tde-for-admins.docbook
@@ -23,7 +23,7 @@
 <title
 >Внутреннее устройство &kde;</title>
 
-<sect1 id="kde-for-admins-overview">
+<sect1 id="tde-for-admins-overview">
 <title
 >Обзор</title>
 <para
diff --git a/tde-i18n-ru/docs/tdebase/userguide/kde-office.docbook b/tde-i18n-ru/docs/tdebase/userguide/tde-office.docbook
similarity index 97%
rename from tde-i18n-ru/docs/tdebase/userguide/kde-office.docbook
rename to tde-i18n-ru/docs/tdebase/userguide/tde-office.docbook
index 6ff6851dffa..0975973f70a 100644
--- a/tde-i18n-ru/docs/tdebase/userguide/kde-office.docbook
+++ b/tde-i18n-ru/docs/tdebase/userguide/tde-office.docbook
@@ -1,4 +1,4 @@
-<part id="kde-office">
+<part id="tde-office">
 <partinfo>
 <authorgroup>
 <author
@@ -37,11 +37,11 @@
 <title
 >Офис</title>
 
-<chapter id="kde-office-introduction">
+<chapter id="tde-office-introduction">
 <title
 >Введение в KOffice</title>
 
-<sect1 id="kde-office-overview">
+<sect1 id="tde-office-overview">
 <title
 >Обзор</title>
 <para
@@ -67,7 +67,7 @@ state of the application.
 -->
 </sect1>
 
-<sect1 id="kde-office-features">
+<sect1 id="tde-office-features">
 <title
 >Возможности</title>
 <para
@@ -110,7 +110,7 @@ state of the application.
 </itemizedlist>
 </sect1>
 
-<sect1 id="kde-office-fileformat">
+<sect1 id="tde-office-fileformat">
 <title
 >Файловый формат OASIS OpenDocument</title>
 <para
@@ -123,17 +123,17 @@ state of the application.
 </chapter>
 
 <!-- comment out for final commit before freeze
-<chapter id="kde-office-embedding">
+<chapter id="tde-office-embedding">
 <title
 >Component Embedding</title>
-<sect1 id="kde-office-kparts">
+<sect1 id="tde-office-kparts">
 <title
 >KParts and &koffice;</title>
 <para
 >To be written</para>
 </sect1>
 
-<sect1 id="kde-office-example">
+<sect1 id="tde-office-example">
 <title
 >Example</title>
 <para
@@ -142,7 +142,7 @@ state of the application.
 </chapter>
 -->
 
-<chapter id="kde-office-components">
+<chapter id="tde-office-components">
 <title
 >Обзор компонентов &koffice;</title>
 
@@ -435,11 +435,11 @@ state of the application.
 
 </chapter>
 
-<chapter id="kde-office-furtherinfo">
+<chapter id="tde-office-furtherinfo">
 
 <title
 >Последующая информация</title>
-<sect1 id="kde-office-manuals">
+<sect1 id="tde-office-manuals">
 <title
 >Руководства приложений</title>
 <para
@@ -452,7 +452,7 @@ state of the application.
 > </para>
 </sect1>
 
-<sect1 id="kde-office-internet">
+<sect1 id="tde-office-internet">
 <title
 >Ресурсы Интернет</title>
 <para
@@ -467,7 +467,7 @@ state of the application.
 ></para>
 </sect1>
 
-<sect1 id="kde-office-plugininfo">
+<sect1 id="tde-office-plugininfo">
 <title
 >Разработка расширений</title>
 <para
diff --git a/tde-i18n-ru/docs/tdebase/userguide/your-kde-account.docbook b/tde-i18n-ru/docs/tdebase/userguide/your-tde-account.docbook
similarity index 100%
rename from tde-i18n-ru/docs/tdebase/userguide/your-kde-account.docbook
rename to tde-i18n-ru/docs/tdebase/userguide/your-tde-account.docbook
diff --git a/tde-i18n-sv/docs/tdebase/userguide/Makefile.in b/tde-i18n-sv/docs/tdebase/userguide/Makefile.in
index d5327214016..7a4837a218b 100644
--- a/tde-i18n-sv/docs/tdebase/userguide/Makefile.in
+++ b/tde-i18n-sv/docs/tdebase/userguide/Makefile.in
@@ -525,10 +525,10 @@ uninstall-am:
 .NOEXPORT:
 
 #>+ 2
-KDE_DIST=rip.png installation.docbook history.docbook kde-as-root.docbook konq-simple.png browser-fine-tuning.docbook accessibility.docbook your-kde-account.docbook programs-controlling.docbook knode-mail-account.png kcontrol.png about-desktop.docbook a-window.png pdf-files.docbook intro.docbook kde-edutainment.docbook index.docbook open-file-dialog.png the-filemanager.docbook services.png control-center.docbook troubleshooting-network-x.docbook migrator-dictionary.docbook getting-started.docbook glossary.docbook networking-with-windows.docbook credits-and-license.docbook where-next.docbook amarok.png removable-disks.docbook oggfolder.png getting-help.docbook noatun.png kmouth2.png knode-news-account.png screen-captures.docbook extragear-applications.docbook font-installation.docbook first-impressions.docbook ug-faq.docbook standard-menu-entries.docbook panel-and-desktop.docbook knode-identity.png email.docbook customizing-desktop.docbook knode-start.png desktop.png playing-audiocds.docbook kaboodle.png index.cache.bz2 file-sharing.docbook playing-movies.docbook troubleshooting-no-open.docbook base-kde-applications.docbook kmouth3.png ripsettings.png messaging-intro.docbook playing-music.docbook programs-and-documents.docbook kppp-wizard.png usenet.docbook kde-for-admins.docbook kmouth.png juk.png kmag.png net-connection-setup.docbook internet-shortcuts.docbook groupware-kontact.docbook burning-cds.docbook creating-graphics.docbook notices-trademarks.docbook konsole-intro.docbook kmousetool.png windows-how-to.docbook Makefile.in kde-office.docbook printer-setup.docbook kppp-dialer-tab.png under-the-hood.docbook titlebar-menu.png more-help.docbook splash-screen.png shortcuts.docbook switching-sessions.docbook staff.docbook kopete.png migrator-applications.docbook konq-sidebar.png printing-from-apps.docbook Makefile.am shared-sessions.docbook 
+KDE_DIST=rip.png installation.docbook history.docbook tde-as-root.docbook konq-simple.png browser-fine-tuning.docbook accessibility.docbook your-tde-account.docbook programs-controlling.docbook knode-mail-account.png kcontrol.png about-desktop.docbook a-window.png pdf-files.docbook intro.docbook tde-edutainment.docbook index.docbook open-file-dialog.png the-filemanager.docbook services.png control-center.docbook troubleshooting-network-x.docbook migrator-dictionary.docbook getting-started.docbook glossary.docbook networking-with-windows.docbook credits-and-license.docbook where-next.docbook amarok.png removable-disks.docbook oggfolder.png getting-help.docbook noatun.png kmouth2.png knode-news-account.png screen-captures.docbook extragear-applications.docbook font-installation.docbook first-impressions.docbook ug-faq.docbook standard-menu-entries.docbook panel-and-desktop.docbook knode-identity.png email.docbook customizing-desktop.docbook knode-start.png desktop.png playing-audiocds.docbook kaboodle.png index.cache.bz2 file-sharing.docbook playing-movies.docbook troubleshooting-no-open.docbook base-tde-applications.docbook kmouth3.png ripsettings.png messaging-intro.docbook playing-music.docbook programs-and-documents.docbook kppp-wizard.png usenet.docbook tde-for-admins.docbook kmouth.png juk.png kmag.png net-connection-setup.docbook internet-shortcuts.docbook groupware-kontact.docbook burning-cds.docbook creating-graphics.docbook notices-trademarks.docbook konsole-intro.docbook kmousetool.png windows-how-to.docbook Makefile.in tde-office.docbook printer-setup.docbook kppp-dialer-tab.png under-the-hood.docbook titlebar-menu.png more-help.docbook splash-screen.png shortcuts.docbook switching-sessions.docbook staff.docbook kopete.png migrator-applications.docbook konq-sidebar.png printing-from-apps.docbook Makefile.am shared-sessions.docbook 
 
 #>+ 24
-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) first-impressions.docbook kde-as-root.docbook desktop.png accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook knode-news-account.png kmag.png your-kde-account.docbook kde-edutainment.docbook kmousetool.png getting-help.docbook services.png intro.docbook ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png about-desktop.docbook index.docbook more-help.docbook kopete.png history.docbook font-installation.docbook kppp-dialer-tab.png kmouth.png splash-screen.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook shortcuts.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook installation.docbook removable-disks.docbook konq-sidebar.png ug-faq.docbook konq-simple.png panel-and-desktop.docbook getting-started.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook notices-trademarks.docbook kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png staff.docbook troubleshooting-network-x.docbook 
+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) first-impressions.docbook tde-as-root.docbook desktop.png accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook knode-news-account.png kmag.png your-tde-account.docbook tde-edutainment.docbook kmousetool.png getting-help.docbook services.png intro.docbook ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png about-desktop.docbook index.docbook more-help.docbook kopete.png history.docbook font-installation.docbook kppp-dialer-tab.png kmouth.png splash-screen.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook shortcuts.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook installation.docbook removable-disks.docbook konq-sidebar.png ug-faq.docbook konq-simple.png panel-and-desktop.docbook getting-started.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook notices-trademarks.docbook kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png staff.docbook troubleshooting-network-x.docbook 
 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
 
 docs-am: index.cache.bz2
@@ -555,20 +555,20 @@ clean-docs:
 #>+ 13
 install-nls:
 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide
-	@for base in first-impressions.docbook kde-as-root.docbook desktop.png accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook knode-news-account.png kmag.png your-kde-account.docbook kde-edutainment.docbook kmousetool.png getting-help.docbook services.png intro.docbook ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png about-desktop.docbook index.docbook more-help.docbook kopete.png history.docbook font-installation.docbook kppp-dialer-tab.png kmouth.png splash-screen.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook shortcuts.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook installation.docbook removable-disks.docbook konq-sidebar.png ug-faq.docbook konq-simple.png panel-and-desktop.docbook getting-started.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook notices-trademarks.docbook kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png staff.docbook troubleshooting-network-x.docbook ; do \
+	@for base in first-impressions.docbook tde-as-root.docbook desktop.png accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook knode-news-account.png kmag.png your-tde-account.docbook tde-edutainment.docbook kmousetool.png getting-help.docbook services.png intro.docbook ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png about-desktop.docbook index.docbook more-help.docbook kopete.png history.docbook font-installation.docbook kppp-dialer-tab.png kmouth.png splash-screen.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook shortcuts.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook installation.docbook removable-disks.docbook konq-sidebar.png ug-faq.docbook konq-simple.png panel-and-desktop.docbook getting-started.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook notices-trademarks.docbook kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png staff.docbook troubleshooting-network-x.docbook ; do \
 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
 	done
 
 uninstall-nls:
-	for base in first-impressions.docbook kde-as-root.docbook desktop.png accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook knode-news-account.png kmag.png your-kde-account.docbook kde-edutainment.docbook kmousetool.png getting-help.docbook services.png intro.docbook ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png about-desktop.docbook index.docbook more-help.docbook kopete.png history.docbook font-installation.docbook kppp-dialer-tab.png kmouth.png splash-screen.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook shortcuts.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook installation.docbook removable-disks.docbook konq-sidebar.png ug-faq.docbook konq-simple.png panel-and-desktop.docbook getting-started.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook notices-trademarks.docbook kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png staff.docbook troubleshooting-network-x.docbook ; do \
+	for base in first-impressions.docbook tde-as-root.docbook desktop.png accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook knode-news-account.png kmag.png your-tde-account.docbook tde-edutainment.docbook kmousetool.png getting-help.docbook services.png intro.docbook ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png about-desktop.docbook index.docbook more-help.docbook kopete.png history.docbook font-installation.docbook kppp-dialer-tab.png kmouth.png splash-screen.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook shortcuts.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook installation.docbook removable-disks.docbook konq-sidebar.png ug-faq.docbook konq-simple.png panel-and-desktop.docbook getting-started.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook notices-trademarks.docbook kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png staff.docbook troubleshooting-network-x.docbook ; do \
 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khelpcenter/userguide/$$base ;\
 	done
 
 
 #>+ 5
 distdir-nls:
-	for file in first-impressions.docbook kde-as-root.docbook desktop.png accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook knode-news-account.png kmag.png your-kde-account.docbook kde-edutainment.docbook kmousetool.png getting-help.docbook services.png intro.docbook ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png about-desktop.docbook index.docbook more-help.docbook kopete.png history.docbook font-installation.docbook kppp-dialer-tab.png kmouth.png splash-screen.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook shortcuts.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook kde-office.docbook kde-for-admins.docbook installation.docbook removable-disks.docbook konq-sidebar.png ug-faq.docbook konq-simple.png panel-and-desktop.docbook getting-started.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-kde-applications.docbook creating-graphics.docbook notices-trademarks.docbook kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png staff.docbook troubleshooting-network-x.docbook ; do \
+	for file in first-impressions.docbook tde-as-root.docbook desktop.png accessibility.docbook networking-with-windows.docbook credits-and-license.docbook glossary.docbook knode-start.png under-the-hood.docbook knode-news-account.png kmag.png your-tde-account.docbook tde-edutainment.docbook kmousetool.png getting-help.docbook services.png intro.docbook ripsettings.png amarok.png knode-mail-account.png file-sharing.docbook usenet.docbook printer-setup.docbook playing-movies.docbook troubleshooting-no-open.docbook switching-sessions.docbook messaging-intro.docbook the-filemanager.docbook groupware-kontact.docbook oggfolder.png titlebar-menu.png programs-and-documents.docbook where-next.docbook playing-audiocds.docbook juk.png about-desktop.docbook index.docbook more-help.docbook kopete.png history.docbook font-installation.docbook kppp-dialer-tab.png kmouth.png splash-screen.png extragear-applications.docbook standard-menu-entries.docbook shared-sessions.docbook migrator-dictionary.docbook browser-fine-tuning.docbook email.docbook shortcuts.docbook programs-controlling.docbook net-connection-setup.docbook migrator-applications.docbook noatun.png customizing-desktop.docbook tde-office.docbook tde-for-admins.docbook installation.docbook removable-disks.docbook konq-sidebar.png ug-faq.docbook konq-simple.png panel-and-desktop.docbook getting-started.docbook rip.png konsole-intro.docbook control-center.docbook windows-how-to.docbook kppp-wizard.png screen-captures.docbook base-tde-applications.docbook creating-graphics.docbook notices-trademarks.docbook kmouth3.png playing-music.docbook pdf-files.docbook a-window.png printing-from-apps.docbook kmouth2.png kaboodle.png internet-shortcuts.docbook kcontrol.png open-file-dialog.png burning-cds.docbook knode-identity.png staff.docbook troubleshooting-network-x.docbook ; do \
 	  cp $(srcdir)/$$file $(distdir); \
 	done
 
diff --git a/tde-i18n-sv/docs/tdebase/userguide/base-kde-applications.docbook b/tde-i18n-sv/docs/tdebase/userguide/base-tde-applications.docbook
similarity index 99%
rename from tde-i18n-sv/docs/tdebase/userguide/base-kde-applications.docbook
rename to tde-i18n-sv/docs/tdebase/userguide/base-tde-applications.docbook
index a9ea302bea8..8bb602f2951 100644
--- a/tde-i18n-sv/docs/tdebase/userguide/base-kde-applications.docbook
+++ b/tde-i18n-sv/docs/tdebase/userguide/base-tde-applications.docbook
@@ -591,7 +591,7 @@
 >Kontor</title>
 
 <para
->Detta omfattar alla program i &koffice;-sviten. Se <xref linkend="kde-office-components"/> för en översikt av komponenterna.</para>
+>Detta omfattar alla program i &koffice;-sviten. Se <xref linkend="tde-office-components"/> för en översikt av komponenterna.</para>
 
 </sect1>
 
diff --git a/tde-i18n-sv/docs/tdebase/userguide/credits-and-license.docbook b/tde-i18n-sv/docs/tdebase/userguide/credits-and-license.docbook
index 2e1b859bf48..dea2c5ffd10 100644
--- a/tde-i18n-sv/docs/tdebase/userguide/credits-and-license.docbook
+++ b/tde-i18n-sv/docs/tdebase/userguide/credits-and-license.docbook
@@ -141,7 +141,7 @@
 ></listitem>
 	<listitem
 ><para
->Skrev om <xref linkend="kde-edutainment"/>.</para
+>Skrev om <xref linkend="tde-edutainment"/>.</para
 ></listitem>
 	<listitem
 ><para
diff --git a/tde-i18n-sv/docs/tdebase/userguide/index.docbook b/tde-i18n-sv/docs/tdebase/userguide/index.docbook
index 4ce25ee12ba..ba0181260b9 100644
--- a/tde-i18n-sv/docs/tdebase/userguide/index.docbook
+++ b/tde-i18n-sv/docs/tdebase/userguide/index.docbook
@@ -15,14 +15,14 @@
   <!ENTITY programs-and-documents SYSTEM "programs-and-documents.docbook">
   <!ENTITY control-center SYSTEM "control-center.docbook">
   <!ENTITY customizing-desktop SYSTEM "customizing-desktop.docbook">
-  <!ENTITY base-kde-applications SYSTEM "base-kde-applications.docbook">
+  <!ENTITY base-tde-applications SYSTEM "base-tde-applications.docbook">
   <!ENTITY removable-disks SYSTEM "removable-disks.docbook">
   <!ENTITY burning-cds SYSTEM "burning-cds.docbook">
   <!ENTITY playing-music SYSTEM "playing-music.docbook">
   <!ENTITY playing-audiocds SYSTEM "playing-audiocds.docbook">
   <!ENTITY playing-movies SYSTEM "playing-movies.docbook">
-  <!ENTITY your-kde-account SYSTEM "your-kde-account.docbook">
-  <!ENTITY kde-as-root SYSTEM "kde-as-root.docbook">
+  <!ENTITY your-tde-account SYSTEM "your-tde-account.docbook">
+  <!ENTITY tde-as-root SYSTEM "tde-as-root.docbook">
   <!ENTITY switching-sessions SYSTEM "switching-sessions.docbook">
   <!ENTITY file-sharing SYSTEM "file-sharing.docbook">
   <!ENTITY networking-with-windows SYSTEM  "networking-with-windows.docbook">
@@ -34,7 +34,7 @@
   <!ENTITY creating-graphics SYSTEM "creating-graphics.docbook">
   <!ENTITY screen-captures SYSTEM "screen-captures.docbook">
   <!ENTITY konsole-intro SYSTEM "konsole-intro.docbook">
-  <!ENTITY kde-edutainment SYSTEM "kde-edutainment.docbook">
+  <!ENTITY tde-edutainment SYSTEM "tde-edutainment.docbook">
   <!ENTITY accessibility SYSTEM "accessibility.docbook">
   <!ENTITY under-the-hood SYSTEM "under-the-hood.docbook">
   <!ENTITY net-connection-setup SYSTEM "net-connection-setup.docbook">
@@ -43,8 +43,8 @@
   <!ENTITY browser-fine-tuning SYSTEM "browser-fine-tuning.docbook">
   <!ENTITY usenet SYSTEM "usenet.docbook">
   <!ENTITY messaging-intro SYSTEM "messaging-intro.docbook">
-  <!ENTITY kde-office SYSTEM "kde-office.docbook">
-  <!ENTITY kde-for-admins SYSTEM "kde-for-admins.docbook">
+  <!ENTITY tde-office SYSTEM "tde-office.docbook">
+  <!ENTITY tde-for-admins SYSTEM "tde-for-admins.docbook">
   <!ENTITY migrator-dictionary SYSTEM "migrator-dictionary.docbook">
   <!ENTITY glossary SYSTEM "glossary.docbook">
   <!ENTITY standard-menu-entries SYSTEM "standard-menu-entries.docbook">
@@ -540,14 +540,14 @@ programs here (and not links to removable media, like CDs).</para>
 <part id="components">
 <title
 >&kde;-komponenter</title>
-&control-center; &base-kde-applications; &extragear-applications; <chapter id="multimedia"
+&control-center; &base-tde-applications; &extragear-applications; <chapter id="multimedia"
 > <title
 >Multimedia med &kde;</title
 > &removable-disks; &playing-music; &playing-audiocds; &playing-movies; </chapter
 > <chapter id="multiuser-kde"
 > <title
 >&kde;, skrivbordet för flera användare</title
-> &your-kde-account; &kde-as-root; &switching-sessions; </chapter
+> &your-tde-account; &tde-as-root; &switching-sessions; </chapter
 > <chapter id="networking"
 > <title
 >Använda nätverk med &kde;</title
@@ -556,7 +556,7 @@ programs here (and not links to removable media, like CDs).</para>
 > <title
 >Grafik, utskrift och teckensnitt</title
 > &printer-setup; &printing-from-apps; &pdf-files; &font-installation; &creating-graphics; </chapter
-> &customizing-desktop; &konsole-intro; &kde-edutainment; &accessibility; &under-the-hood; </part>
+> &customizing-desktop; &konsole-intro; &tde-edutainment; &accessibility; &under-the-hood; </part>
 
 <part id="kde-online">
 <title
@@ -569,9 +569,9 @@ programs here (and not links to removable media, like CDs).</para>
 > &internet-shortcuts; &browser-fine-tuning; </chapter
 > &usenet; &messaging-intro; </part>
 
-&kde-office;
+&tde-office;
 
-&kde-for-admins;
+&tde-for-admins;
 
 <part id="more">
 <title
diff --git a/tde-i18n-sv/docs/tdebase/userguide/kde-as-root.docbook b/tde-i18n-sv/docs/tdebase/userguide/tde-as-root.docbook
similarity index 100%
rename from tde-i18n-sv/docs/tdebase/userguide/kde-as-root.docbook
rename to tde-i18n-sv/docs/tdebase/userguide/tde-as-root.docbook
diff --git a/tde-i18n-sv/docs/tdebase/userguide/kde-edutainment.docbook b/tde-i18n-sv/docs/tdebase/userguide/tde-edutainment.docbook
similarity index 99%
rename from tde-i18n-sv/docs/tdebase/userguide/kde-edutainment.docbook
rename to tde-i18n-sv/docs/tdebase/userguide/tde-edutainment.docbook
index 00d2a0597dd..f1be730504a 100644
--- a/tde-i18n-sv/docs/tdebase/userguide/kde-edutainment.docbook
+++ b/tde-i18n-sv/docs/tdebase/userguide/tde-edutainment.docbook
@@ -1,4 +1,4 @@
-<chapter id="kde-edutainment">
+<chapter id="tde-edutainment">
 <!-- Uncomment this and add your name in order to be credited for
 writing this section
 <chapterinfo>
diff --git a/tde-i18n-sv/docs/tdebase/userguide/kde-for-admins.docbook b/tde-i18n-sv/docs/tdebase/userguide/tde-for-admins.docbook
similarity index 99%
rename from tde-i18n-sv/docs/tdebase/userguide/kde-for-admins.docbook
rename to tde-i18n-sv/docs/tdebase/userguide/tde-for-admins.docbook
index 3ccc32bbad6..af70e2a3b99 100644
--- a/tde-i18n-sv/docs/tdebase/userguide/kde-for-admins.docbook
+++ b/tde-i18n-sv/docs/tdebase/userguide/tde-for-admins.docbook
@@ -23,7 +23,7 @@
 <title
 >&kde;:s interna funktioner</title>
 
-<sect1 id="kde-for-admins-overview">
+<sect1 id="tde-for-admins-overview">
 <title
 >Översikt</title>
 <para
diff --git a/tde-i18n-sv/docs/tdebase/userguide/kde-office.docbook b/tde-i18n-sv/docs/tdebase/userguide/tde-office.docbook
similarity index 96%
rename from tde-i18n-sv/docs/tdebase/userguide/kde-office.docbook
rename to tde-i18n-sv/docs/tdebase/userguide/tde-office.docbook
index dbc784ea583..0e7d7da864c 100644
--- a/tde-i18n-sv/docs/tdebase/userguide/kde-office.docbook
+++ b/tde-i18n-sv/docs/tdebase/userguide/tde-office.docbook
@@ -1,4 +1,4 @@
-<part id="kde-office">
+<part id="tde-office">
 <partinfo>
 <authorgroup>
 <author
@@ -37,11 +37,11 @@
 <title
 >Kontor</title>
 
-<chapter id="kde-office-introduction">
+<chapter id="tde-office-introduction">
 <title
 >Introduktion till Koffice</title>
 
-<sect1 id="kde-office-overview">
+<sect1 id="tde-office-overview">
 <title
 >Översikt</title>
 <para
@@ -67,7 +67,7 @@ state of the application.
 -->
 </sect1>
 
-<sect1 id="kde-office-features">
+<sect1 id="tde-office-features">
 <title
 >Funktioner</title>
 <para
@@ -110,7 +110,7 @@ state of the application.
 </itemizedlist>
 </sect1>
 
-<sect1 id="kde-office-fileformat">
+<sect1 id="tde-office-fileformat">
 <title
 >Filformatet OASIS OpenDocument</title>
 <para
@@ -123,17 +123,17 @@ state of the application.
 </chapter>
 
 <!-- comment out for final commit before freeze
-<chapter id="kde-office-embedding">
+<chapter id="tde-office-embedding">
 <title
 >Component Embedding</title>
-<sect1 id="kde-office-kparts">
+<sect1 id="tde-office-kparts">
 <title
 >KParts and &koffice;</title>
 <para
 >To be written</para>
 </sect1>
 
-<sect1 id="kde-office-example">
+<sect1 id="tde-office-example">
 <title
 >Example</title>
 <para
@@ -142,7 +142,7 @@ state of the application.
 </chapter>
 -->
 
-<chapter id="kde-office-components">
+<chapter id="tde-office-components">
 <title
 >Översikt över &koffice; komponenter</title>
 
@@ -435,11 +435,11 @@ state of the application.
 
 </chapter>
 
-<chapter id="kde-office-furtherinfo">
+<chapter id="tde-office-furtherinfo">
 
 <title
 >Ytterligare information</title>
-<sect1 id="kde-office-manuals">
+<sect1 id="tde-office-manuals">
 <title
 >Programhandböcker</title>
 <para
@@ -452,7 +452,7 @@ state of the application.
 >.</para>
 </sect1>
 
-<sect1 id="kde-office-internet">
+<sect1 id="tde-office-internet">
 <title
 >Internetresurser</title>
 <para
@@ -467,7 +467,7 @@ state of the application.
 ></para>
 </sect1>
 
-<sect1 id="kde-office-plugininfo">
+<sect1 id="tde-office-plugininfo">
 <title
 >Utveckling av insticksprogram</title>
 <para
diff --git a/tde-i18n-sv/docs/tdebase/userguide/your-kde-account.docbook b/tde-i18n-sv/docs/tdebase/userguide/your-tde-account.docbook
similarity index 100%
rename from tde-i18n-sv/docs/tdebase/userguide/your-kde-account.docbook
rename to tde-i18n-sv/docs/tdebase/userguide/your-tde-account.docbook