diff --git a/debian/lenny/tdebase/debian/icons/kdeprint-16.xpm b/debian/lenny/tdebase/debian/icons/tdeprint-16.xpm
similarity index 100%
rename from debian/lenny/tdebase/debian/icons/kdeprint-16.xpm
rename to debian/lenny/tdebase/debian/icons/tdeprint-16.xpm
diff --git a/debian/lenny/tdebase/debian/icons/kdeprint.xpm b/debian/lenny/tdebase/debian/icons/tdeprint.xpm
similarity index 100%
rename from debian/lenny/tdebase/debian/icons/kdeprint.xpm
rename to debian/lenny/tdebase/debian/icons/tdeprint.xpm
diff --git a/debian/lenny/tdebase/debian/icons/kdeprintfax-16.xpm b/debian/lenny/tdebase/debian/icons/tdeprintfax-16.xpm
similarity index 100%
rename from debian/lenny/tdebase/debian/icons/kdeprintfax-16.xpm
rename to debian/lenny/tdebase/debian/icons/tdeprintfax-16.xpm
diff --git a/debian/lenny/tdebase/debian/icons/kdeprintfax.xpm b/debian/lenny/tdebase/debian/icons/tdeprintfax.xpm
similarity index 100%
rename from debian/lenny/tdebase/debian/icons/kdeprintfax.xpm
rename to debian/lenny/tdebase/debian/icons/tdeprintfax.xpm
diff --git a/debian/lenny/tdebase/debian/man/kdeprintfax-trinity.1 b/debian/lenny/tdebase/debian/man/tdeprintfax-trinity.1
similarity index 100%
rename from debian/lenny/tdebase/debian/man/kdeprintfax-trinity.1
rename to debian/lenny/tdebase/debian/man/tdeprintfax-trinity.1
diff --git a/debian/lenny/tdebase/debian/man/kdesu-trinity.1 b/debian/lenny/tdebase/debian/man/tdesu-trinity.1
similarity index 100%
rename from debian/lenny/tdebase/debian/man/kdesu-trinity.1
rename to debian/lenny/tdebase/debian/man/tdesu-trinity.1
diff --git a/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.kdeprint b/debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.tdeprint
similarity index 100%
rename from debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.kdeprint
rename to debian/lenny/tdebase/debian/tdebase-doc-html.doc-base.tdeprint
diff --git a/debian/lenny/tdebase/debian/kdeprint-trinity.install b/debian/lenny/tdebase/debian/tdeprint-trinity.install
similarity index 100%
rename from debian/lenny/tdebase/debian/kdeprint-trinity.install
rename to debian/lenny/tdebase/debian/tdeprint-trinity.install
diff --git a/debian/lenny/tdebase/debian/kdeprint-trinity.lintian b/debian/lenny/tdebase/debian/tdeprint-trinity.lintian
similarity index 100%
rename from debian/lenny/tdebase/debian/kdeprint-trinity.lintian
rename to debian/lenny/tdebase/debian/tdeprint-trinity.lintian
diff --git a/debian/lenny/tdebase/debian/kdeprint-trinity.manpages b/debian/lenny/tdebase/debian/tdeprint-trinity.manpages
similarity index 100%
rename from debian/lenny/tdebase/debian/kdeprint-trinity.manpages
rename to debian/lenny/tdebase/debian/tdeprint-trinity.manpages
diff --git a/debian/lenny/tdebase/debian/kdeprint-trinity.menu b/debian/lenny/tdebase/debian/tdeprint-trinity.menu
similarity index 100%
rename from debian/lenny/tdebase/debian/kdeprint-trinity.menu
rename to debian/lenny/tdebase/debian/tdeprint-trinity.menu
diff --git a/debian/lenny/tdelibs/debian/man/kdeinit-trinity.1 b/debian/lenny/tdelibs/debian/man/tdeinit-trinity.1
similarity index 100%
rename from debian/lenny/tdelibs/debian/man/kdeinit-trinity.1
rename to debian/lenny/tdelibs/debian/man/tdeinit-trinity.1
diff --git a/debian/lenny/tdelibs/debian/man/kdeinit_shutdown-trinity.1 b/debian/lenny/tdelibs/debian/man/tdeinit_shutdown-trinity.1
similarity index 100%
rename from debian/lenny/tdelibs/debian/man/kdeinit_shutdown-trinity.1
rename to debian/lenny/tdelibs/debian/man/tdeinit_shutdown-trinity.1
diff --git a/debian/lenny/tdelibs/debian/man/kdesu_stub-trinity.1 b/debian/lenny/tdelibs/debian/man/tdesu_stub-trinity.1
similarity index 100%
rename from debian/lenny/tdelibs/debian/man/kdesu_stub-trinity.1
rename to debian/lenny/tdelibs/debian/man/tdesu_stub-trinity.1
diff --git a/debian/squeeze/tdebase/debian/icons/kdeprint-16.xpm b/debian/squeeze/tdebase/debian/icons/tdeprint-16.xpm
similarity index 100%
rename from debian/squeeze/tdebase/debian/icons/kdeprint-16.xpm
rename to debian/squeeze/tdebase/debian/icons/tdeprint-16.xpm
diff --git a/debian/squeeze/tdebase/debian/icons/kdeprint.xpm b/debian/squeeze/tdebase/debian/icons/tdeprint.xpm
similarity index 100%
rename from debian/squeeze/tdebase/debian/icons/kdeprint.xpm
rename to debian/squeeze/tdebase/debian/icons/tdeprint.xpm
diff --git a/debian/squeeze/tdebase/debian/icons/kdeprintfax-16.xpm b/debian/squeeze/tdebase/debian/icons/tdeprintfax-16.xpm
similarity index 100%
rename from debian/squeeze/tdebase/debian/icons/kdeprintfax-16.xpm
rename to debian/squeeze/tdebase/debian/icons/tdeprintfax-16.xpm
diff --git a/debian/squeeze/tdebase/debian/icons/kdeprintfax.xpm b/debian/squeeze/tdebase/debian/icons/tdeprintfax.xpm
similarity index 100%
rename from debian/squeeze/tdebase/debian/icons/kdeprintfax.xpm
rename to debian/squeeze/tdebase/debian/icons/tdeprintfax.xpm
diff --git a/debian/squeeze/tdebase/debian/man/kdeprintfax-trinity.1 b/debian/squeeze/tdebase/debian/man/tdeprintfax-trinity.1
similarity index 100%
rename from debian/squeeze/tdebase/debian/man/kdeprintfax-trinity.1
rename to debian/squeeze/tdebase/debian/man/tdeprintfax-trinity.1
diff --git a/debian/squeeze/tdebase/debian/man/kdesu-trinity.1 b/debian/squeeze/tdebase/debian/man/tdesu-trinity.1
similarity index 100%
rename from debian/squeeze/tdebase/debian/man/kdesu-trinity.1
rename to debian/squeeze/tdebase/debian/man/tdesu-trinity.1
diff --git a/debian/squeeze/tdebase/debian/tdebase-doc-html.doc-base.kdeprint b/debian/squeeze/tdebase/debian/tdebase-doc-html.doc-base.tdeprint
similarity index 100%
rename from debian/squeeze/tdebase/debian/tdebase-doc-html.doc-base.kdeprint
rename to debian/squeeze/tdebase/debian/tdebase-doc-html.doc-base.tdeprint
diff --git a/debian/squeeze/tdebase/debian/kdeprint-trinity.install b/debian/squeeze/tdebase/debian/tdeprint-trinity.install
similarity index 100%
rename from debian/squeeze/tdebase/debian/kdeprint-trinity.install
rename to debian/squeeze/tdebase/debian/tdeprint-trinity.install
diff --git a/debian/squeeze/tdebase/debian/kdeprint-trinity.lintian b/debian/squeeze/tdebase/debian/tdeprint-trinity.lintian
similarity index 100%
rename from debian/squeeze/tdebase/debian/kdeprint-trinity.lintian
rename to debian/squeeze/tdebase/debian/tdeprint-trinity.lintian
diff --git a/debian/squeeze/tdebase/debian/kdeprint-trinity.manpages b/debian/squeeze/tdebase/debian/tdeprint-trinity.manpages
similarity index 100%
rename from debian/squeeze/tdebase/debian/kdeprint-trinity.manpages
rename to debian/squeeze/tdebase/debian/tdeprint-trinity.manpages
diff --git a/debian/squeeze/tdebase/debian/kdeprint-trinity.menu b/debian/squeeze/tdebase/debian/tdeprint-trinity.menu
similarity index 100%
rename from debian/squeeze/tdebase/debian/kdeprint-trinity.menu
rename to debian/squeeze/tdebase/debian/tdeprint-trinity.menu
diff --git a/debian/squeeze/tdelibs/debian/man/kdeinit-trinity.1 b/debian/squeeze/tdelibs/debian/man/tdeinit-trinity.1
similarity index 100%
rename from debian/squeeze/tdelibs/debian/man/kdeinit-trinity.1
rename to debian/squeeze/tdelibs/debian/man/tdeinit-trinity.1
diff --git a/debian/squeeze/tdelibs/debian/man/kdeinit_shutdown-trinity.1 b/debian/squeeze/tdelibs/debian/man/tdeinit_shutdown-trinity.1
similarity index 100%
rename from debian/squeeze/tdelibs/debian/man/kdeinit_shutdown-trinity.1
rename to debian/squeeze/tdelibs/debian/man/tdeinit_shutdown-trinity.1
diff --git a/debian/squeeze/tdelibs/debian/man/kdesu_stub-trinity.1 b/debian/squeeze/tdelibs/debian/man/tdesu_stub-trinity.1
similarity index 100%
rename from debian/squeeze/tdelibs/debian/man/kdesu_stub-trinity.1
rename to debian/squeeze/tdelibs/debian/man/tdesu_stub-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/icons/kdeprint-16.xpm b/ubuntu/maverick/tdebase/debian/icons/tdeprint-16.xpm
similarity index 100%
rename from ubuntu/maverick/tdebase/debian/icons/kdeprint-16.xpm
rename to ubuntu/maverick/tdebase/debian/icons/tdeprint-16.xpm
diff --git a/ubuntu/maverick/tdebase/debian/icons/kdeprint.xpm b/ubuntu/maverick/tdebase/debian/icons/tdeprint.xpm
similarity index 100%
rename from ubuntu/maverick/tdebase/debian/icons/kdeprint.xpm
rename to ubuntu/maverick/tdebase/debian/icons/tdeprint.xpm
diff --git a/ubuntu/maverick/tdebase/debian/icons/kdeprintfax-16.xpm b/ubuntu/maverick/tdebase/debian/icons/tdeprintfax-16.xpm
similarity index 100%
rename from ubuntu/maverick/tdebase/debian/icons/kdeprintfax-16.xpm
rename to ubuntu/maverick/tdebase/debian/icons/tdeprintfax-16.xpm
diff --git a/ubuntu/maverick/tdebase/debian/icons/kdeprintfax.xpm b/ubuntu/maverick/tdebase/debian/icons/tdeprintfax.xpm
similarity index 100%
rename from ubuntu/maverick/tdebase/debian/icons/kdeprintfax.xpm
rename to ubuntu/maverick/tdebase/debian/icons/tdeprintfax.xpm
diff --git a/ubuntu/maverick/tdebase/debian/man/kdeprintfax-trinity.1 b/ubuntu/maverick/tdebase/debian/man/tdeprintfax-trinity.1
similarity index 100%
rename from ubuntu/maverick/tdebase/debian/man/kdeprintfax-trinity.1
rename to ubuntu/maverick/tdebase/debian/man/tdeprintfax-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/kdesu-trinity.1 b/ubuntu/maverick/tdebase/debian/man/tdesu-trinity.1
similarity index 100%
rename from ubuntu/maverick/tdebase/debian/man/kdesu-trinity.1
rename to ubuntu/maverick/tdebase/debian/man/tdesu-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_37_hide_kdeprintfax_menu_entry.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_37_hide_tdeprintfax_menu_entry.diff
similarity index 100%
rename from ubuntu/maverick/tdebase/debian/patches/kubuntu_37_hide_kdeprintfax_menu_entry.diff
rename to ubuntu/maverick/tdebase/debian/patches/kubuntu_37_hide_tdeprintfax_menu_entry.diff
diff --git a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kdeprint b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.tdeprint
similarity index 100%
rename from ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kdeprint
rename to ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.tdeprint
diff --git a/ubuntu/maverick/tdebase/debian/kdeprint-trinity.install b/ubuntu/maverick/tdebase/debian/tdeprint-trinity.install
similarity index 100%
rename from ubuntu/maverick/tdebase/debian/kdeprint-trinity.install
rename to ubuntu/maverick/tdebase/debian/tdeprint-trinity.install
diff --git a/ubuntu/maverick/tdebase/debian/kdeprint-trinity.lintian b/ubuntu/maverick/tdebase/debian/tdeprint-trinity.lintian
similarity index 100%
rename from ubuntu/maverick/tdebase/debian/kdeprint-trinity.lintian
rename to ubuntu/maverick/tdebase/debian/tdeprint-trinity.lintian
diff --git a/ubuntu/maverick/tdebase/debian/kdeprint-trinity.manpages b/ubuntu/maverick/tdebase/debian/tdeprint-trinity.manpages
similarity index 100%
rename from ubuntu/maverick/tdebase/debian/kdeprint-trinity.manpages
rename to ubuntu/maverick/tdebase/debian/tdeprint-trinity.manpages
diff --git a/ubuntu/maverick/tdebase/debian/kdeprint-trinity.menu b/ubuntu/maverick/tdebase/debian/tdeprint-trinity.menu
similarity index 100%
rename from ubuntu/maverick/tdebase/debian/kdeprint-trinity.menu
rename to ubuntu/maverick/tdebase/debian/tdeprint-trinity.menu
diff --git a/ubuntu/maverick/tdelibs/debian/man/kdeinit-trinity.1 b/ubuntu/maverick/tdelibs/debian/man/tdeinit-trinity.1
similarity index 100%
rename from ubuntu/maverick/tdelibs/debian/man/kdeinit-trinity.1
rename to ubuntu/maverick/tdelibs/debian/man/tdeinit-trinity.1
diff --git a/ubuntu/maverick/tdelibs/debian/man/kdeinit_shutdown-trinity.1 b/ubuntu/maverick/tdelibs/debian/man/tdeinit_shutdown-trinity.1
similarity index 100%
rename from ubuntu/maverick/tdelibs/debian/man/kdeinit_shutdown-trinity.1
rename to ubuntu/maverick/tdelibs/debian/man/tdeinit_shutdown-trinity.1
diff --git a/ubuntu/maverick/tdelibs/debian/man/kdesu_stub-trinity.1 b/ubuntu/maverick/tdelibs/debian/man/tdesu_stub-trinity.1
similarity index 100%
rename from ubuntu/maverick/tdelibs/debian/man/kdesu_stub-trinity.1
rename to ubuntu/maverick/tdelibs/debian/man/tdesu_stub-trinity.1