61 files changed, 55 insertions, 55 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e717aad37..2339436cc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -153,7 +153,7 @@ option( BUILD_KLIPPER "Build klipper" ${BUILD_ALL} )
 option( BUILD_KMENUEDIT "Build kmenuedit" ${BUILD_ALL} )
 option( BUILD_TDEPRINT "Build tdeprint" ${BUILD_ALL} )
 option( BUILD_KPERSONALIZER "Build kpersonalizer" ${BUILD_ALL} )
-option( BUILD_KDEPASSWD "Build kdepasswd" ${BUILD_ALL} )
+option( BUILD_TDEPASSWD "Build tdepasswd" ${BUILD_ALL} )
 option( BUILD_KTIP "Build ktip" ${BUILD_ALL} )
 option( BUILD_KDEEJECT "Build kdeeject" ${BUILD_ALL} )
 option( BUILD_KDIALOG "Build kdialog" ${BUILD_ALL} )
@@ -232,7 +232,7 @@ tde_conditional_add_subdirectory( BUILD_KLIPPER klipper )
 tde_conditional_add_subdirectory( BUILD_KMENUEDIT kmenuedit )
 tde_conditional_add_subdirectory( BUILD_TDEPRINT tdeprint )
 tde_conditional_add_subdirectory( BUILD_KPERSONALIZER kpersonalizer )
-tde_conditional_add_subdirectory( BUILD_KDEPASSWD kdepasswd )
+tde_conditional_add_subdirectory( BUILD_TDEPASSWD tdepasswd )
 tde_conditional_add_subdirectory( BUILD_KTIP ktip )
 tde_conditional_add_subdirectory( BUILD_KDEEJECT kdeeject )
 tde_conditional_add_subdirectory( BUILD_KDIALOG kdialog )
diff --git a/README b/README
index c429c4be9..01e295240 100644
--- a/README
+++ b/README
@@ -114,7 +114,7 @@ libraries. Here is an overview of the directories:
     The KDE session manager (saves program status on login, restarts
     those program at the next login).
 
-* kdepasswd
+* tdepasswd
     A KDE frontend for passwd. Also contains the "Password & User Information" KCM.
 
 * ksplashml
diff --git a/kdepasswd/Makefile.am b/kdepasswd/Makefile.am
deleted file mode 100644
index 3a5c6e626..000000000
--- a/kdepasswd/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-
-SUBDIRS = kcm
-
-bin_PROGRAMS = kdepasswd
-kdepasswd_SOURCES = kdepasswd.cpp passwd.cpp passwddlg.cpp
-kdepasswd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kdepasswd_LDADD = $(LIB_KIO)
-
-METASOURCES =  AUTO
-AM_CPPFLAGS= -I$(top_srcdir)/libkonq $(all_includes)
-noinst_HEADERS = passwd.h passwddlg.h
-
-xdg_apps_DATA = kdepasswd.desktop
-
-messages:
-	$(XGETTEXT) $(kdepasswd_SOURCES)  -o $(podir)/kdepasswd.pot
-
diff --git a/kdepasswd/README b/kdepasswd/README
deleted file mode 100644
index 50bbe54fd..000000000
--- a/kdepasswd/README
+++ /dev/null
@@ -1,3 +0,0 @@
-kdepasswd: A KDE front end to the Unix passwd command.
-
-Please report bugs to Geert Jansen <jansen@kde.org>
diff --git a/kdepasswd/CMakeLists.txt b/tdepasswd/CMakeLists.txt
index 887362b28..c711ea628 100644
--- a/kdepasswd/CMakeLists.txt
+++ b/tdepasswd/CMakeLists.txt
@@ -25,13 +25,13 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kdepasswd.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( FILES tdepasswd.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 
-##### kdepasswd (executable) ####################
+##### tdepasswd (executable) ####################
 
-tde_add_executable( kdepasswd AUTOMOC
-  SOURCES kdepasswd.cpp passwd.cpp passwddlg.cpp
+tde_add_executable( tdepasswd AUTOMOC
+  SOURCES tdepasswd.cpp passwd.cpp passwddlg.cpp
   LINK tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/kdepasswd/LICENSE.readme b/tdepasswd/LICENSE.readme
index 23b7877d0..d3840e950 100644
--- a/kdepasswd/LICENSE.readme
+++ b/tdepasswd/LICENSE.readme
@@ -1,4 +1,4 @@
-kdepasswd - a KDE front end to passwd
+tdepasswd - a KDE front end to passwd
 
 Copyright (c) 1999,2000 by Geert Jansen <jansen@kde.org>
 
diff --git a/tdepasswd/Makefile.am b/tdepasswd/Makefile.am
new file mode 100644
index 000000000..65261086d
--- /dev/null
+++ b/tdepasswd/Makefile.am
@@ -0,0 +1,17 @@
+
+SUBDIRS = kcm
+
+bin_PROGRAMS = tdepasswd
+tdepasswd_SOURCES = tdepasswd.cpp passwd.cpp passwddlg.cpp
+tdepasswd_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+tdepasswd_LDADD = $(LIB_KIO)
+
+METASOURCES =  AUTO
+AM_CPPFLAGS= -I$(top_srcdir)/libkonq $(all_includes)
+noinst_HEADERS = passwd.h passwddlg.h
+
+xdg_apps_DATA = tdepasswd.desktop
+
+messages:
+	$(XGETTEXT) $(tdepasswd_SOURCES)  -o $(podir)/tdepasswd.pot
+
diff --git a/tdepasswd/README b/tdepasswd/README
new file mode 100644
index 000000000..bac44cd6a
--- /dev/null
+++ b/tdepasswd/README
@@ -0,0 +1,3 @@
+tdepasswd: A KDE front end to the Unix passwd command.
+
+Please report bugs to Geert Jansen <jansen@kde.org>
diff --git a/kdepasswd/kcm/CMakeLists.txt b/tdepasswd/kcm/CMakeLists.txt
index 338a4f4cb..338a4f4cb 100644
--- a/kdepasswd/kcm/CMakeLists.txt
+++ b/tdepasswd/kcm/CMakeLists.txt
diff --git a/kdepasswd/kcm/Makefile.am b/tdepasswd/kcm/Makefile.am
index fee3b3cd2..fee3b3cd2 100644
--- a/kdepasswd/kcm/Makefile.am
+++ b/tdepasswd/kcm/Makefile.am
diff --git a/kdepasswd/kcm/README b/tdepasswd/kcm/README
index 467862f48..b6c9f28ef 100644
--- a/kdepasswd/kcm/README
+++ b/tdepasswd/kcm/README
@@ -3,7 +3,7 @@ Thu Jan 29 00:34:49 CET 2004
 Frans Englich <frans.englich@telia.com>
 
 KCM useraccount is a merge of the former tdebase/kcontrol/email 
-and tdeutils/kdepasswd/userinfo/. They existed in KDE 3.1, at least.
+and tdeutils/tdepasswd/userinfo/. They existed in KDE 3.1, at least.
 
 As a bonus, on top of saving the stuff with KEMailSettings it tries 
 also to save the realname to /etc/passwd. This is done via chfn, wrapped 
diff --git a/kdepasswd/kcm/chfacedlg.cpp b/tdepasswd/kcm/chfacedlg.cpp
index 0a3dbfb78..0a3dbfb78 100644
--- a/kdepasswd/kcm/chfacedlg.cpp
+++ b/tdepasswd/kcm/chfacedlg.cpp
diff --git a/kdepasswd/kcm/chfacedlg.h b/tdepasswd/kcm/chfacedlg.h
index f96d50084..f96d50084 100644
--- a/kdepasswd/kcm/chfacedlg.h
+++ b/tdepasswd/kcm/chfacedlg.h
diff --git a/kdepasswd/kcm/chfnprocess.cpp b/tdepasswd/kcm/chfnprocess.cpp
index 56bd546da..72c1599fc 100644
--- a/kdepasswd/kcm/chfnprocess.cpp
+++ b/tdepasswd/kcm/chfnprocess.cpp
@@ -10,7 +10,7 @@
 
 /**
  * @file Change a user's 'finger' information, specifically their full name.
- * derived from kdepasswd.
+ * derived from tdepasswd.
  */
 
 #include <unistd.h>
diff --git a/kdepasswd/kcm/chfnprocess.h b/tdepasswd/kcm/chfnprocess.h
index d29ccc538..d29ccc538 100644
--- a/kdepasswd/kcm/chfnprocess.h
+++ b/tdepasswd/kcm/chfnprocess.h
diff --git a/kdepasswd/kcm/kcm_useraccount.desktop b/tdepasswd/kcm/kcm_useraccount.desktop
index 51c168bd5..51c168bd5 100644
--- a/kdepasswd/kcm/kcm_useraccount.desktop
+++ b/tdepasswd/kcm/kcm_useraccount.desktop
diff --git a/kdepasswd/kcm/kcm_useraccount.kcfg b/tdepasswd/kcm/kcm_useraccount.kcfg
index 549afdb1e..549afdb1e 100644
--- a/kdepasswd/kcm/kcm_useraccount.kcfg
+++ b/tdepasswd/kcm/kcm_useraccount.kcfg
diff --git a/kdepasswd/kcm/kcm_useraccount_pass.kcfg b/tdepasswd/kcm/kcm_useraccount_pass.kcfg
index c76e4a657..c76e4a657 100644
--- a/kdepasswd/kcm/kcm_useraccount_pass.kcfg
+++ b/tdepasswd/kcm/kcm_useraccount_pass.kcfg
diff --git a/kdepasswd/kcm/main.cpp b/tdepasswd/kcm/main.cpp
index 18ecbb445..48478c306 100644
--- a/kdepasswd/kcm/main.cpp
+++ b/tdepasswd/kcm/main.cpp
@@ -108,12 +108,12 @@ KCMUserAccount::KCMUserAccount( TQWidget *parent, const char *name,
 void KCMUserAccount::slotChangePassword()
 {
 	TDEProcess *proc = new TDEProcess;
-	TQString bin = TDEGlobal::dirs()->findExe("kdepasswd");
+	TQString bin = TDEGlobal::dirs()->findExe("tdepasswd");
 	if ( !bin )
 	{
-		kdDebug() << "kcm_useraccount: kdepasswd was not found." << endl;
+		kdDebug() << "kcm_useraccount: tdepasswd was not found." << endl;
 		KMessageBox::sorry ( this, i18n( "A program error occurred: the internal "
-			"program 'kdepasswd' could not be found. You will "
+			"program 'tdepasswd' could not be found. You will "
 			"not be able to change your password."));
 
 		_mw->btnChangePassword->setEnabled(false);
diff --git a/kdepasswd/kcm/main.h b/tdepasswd/kcm/main.h
index 350c42820..350c42820 100644
--- a/kdepasswd/kcm/main.h
+++ b/tdepasswd/kcm/main.h
diff --git a/kdepasswd/kcm/main_widget.ui b/tdepasswd/kcm/main_widget.ui
index b1933f592..b1933f592 100644
--- a/kdepasswd/kcm/main_widget.ui
+++ b/tdepasswd/kcm/main_widget.ui
diff --git a/kdepasswd/kcm/pass.kcfgc b/tdepasswd/kcm/pass.kcfgc
index 21b4bb781..21b4bb781 100644
--- a/kdepasswd/kcm/pass.kcfgc
+++ b/tdepasswd/kcm/pass.kcfgc
diff --git a/kdepasswd/kcm/pics/Apple.png b/tdepasswd/kcm/pics/Apple.png
index b383578bb..b383578bb 100644
--- a/kdepasswd/kcm/pics/Apple.png
+++ b/tdepasswd/kcm/pics/Apple.png
diff --git a/kdepasswd/kcm/pics/BeachBall.png b/tdepasswd/kcm/pics/BeachBall.png
index e8c748332..e8c748332 100644
--- a/kdepasswd/kcm/pics/BeachBall.png
+++ b/tdepasswd/kcm/pics/BeachBall.png
diff --git a/kdepasswd/kcm/pics/Blowfish.png b/tdepasswd/kcm/pics/Blowfish.png
index 51cb16013..51cb16013 100644
--- a/kdepasswd/kcm/pics/Blowfish.png
+++ b/tdepasswd/kcm/pics/Blowfish.png
diff --git a/kdepasswd/kcm/pics/Bug.png b/tdepasswd/kcm/pics/Bug.png
index b431cc138..b431cc138 100644
--- a/kdepasswd/kcm/pics/Bug.png
+++ b/tdepasswd/kcm/pics/Bug.png
diff --git a/kdepasswd/kcm/pics/Butterfly.png b/tdepasswd/kcm/pics/Butterfly.png
index 88012a7ed..88012a7ed 100644
--- a/kdepasswd/kcm/pics/Butterfly.png
+++ b/tdepasswd/kcm/pics/Butterfly.png
diff --git a/kdepasswd/kcm/pics/CMakeLists.txt b/tdepasswd/kcm/pics/CMakeLists.txt
index 1bfe832db..1bfe832db 100644
--- a/kdepasswd/kcm/pics/CMakeLists.txt
+++ b/tdepasswd/kcm/pics/CMakeLists.txt
diff --git a/kdepasswd/kcm/pics/CREDITS b/tdepasswd/kcm/pics/CREDITS
index ccd9126b4..ccd9126b4 100644
--- a/kdepasswd/kcm/pics/CREDITS
+++ b/tdepasswd/kcm/pics/CREDITS
diff --git a/kdepasswd/kcm/pics/Car.png b/tdepasswd/kcm/pics/Car.png
index 95ec0278f..95ec0278f 100644
--- a/kdepasswd/kcm/pics/Car.png
+++ b/tdepasswd/kcm/pics/Car.png
diff --git a/kdepasswd/kcm/pics/Cow.png b/tdepasswd/kcm/pics/Cow.png
index 2f0ced863..2f0ced863 100644
--- a/kdepasswd/kcm/pics/Cow.png
+++ b/tdepasswd/kcm/pics/Cow.png
diff --git a/kdepasswd/kcm/pics/Daemon.png b/tdepasswd/kcm/pics/Daemon.png
index 4bbc42a55..4bbc42a55 100644
--- a/kdepasswd/kcm/pics/Daemon.png
+++ b/tdepasswd/kcm/pics/Daemon.png
diff --git a/kdepasswd/kcm/pics/Dog.png b/tdepasswd/kcm/pics/Dog.png
index 78de93340..78de93340 100644
--- a/kdepasswd/kcm/pics/Dog.png
+++ b/tdepasswd/kcm/pics/Dog.png
diff --git a/kdepasswd/kcm/pics/Elephant.png b/tdepasswd/kcm/pics/Elephant.png
index 8f4b2d2aa..8f4b2d2aa 100644
--- a/kdepasswd/kcm/pics/Elephant.png
+++ b/tdepasswd/kcm/pics/Elephant.png
diff --git a/kdepasswd/kcm/pics/Flower.png b/tdepasswd/kcm/pics/Flower.png
index d414e736c..d414e736c 100644
--- a/kdepasswd/kcm/pics/Flower.png
+++ b/tdepasswd/kcm/pics/Flower.png
diff --git a/kdepasswd/kcm/pics/Frog.png b/tdepasswd/kcm/pics/Frog.png
index 2186975a9..2186975a9 100644
--- a/kdepasswd/kcm/pics/Frog.png
+++ b/tdepasswd/kcm/pics/Frog.png
diff --git a/kdepasswd/kcm/pics/Ghost.png b/tdepasswd/kcm/pics/Ghost.png
index bf95150da..bf95150da 100644
--- a/kdepasswd/kcm/pics/Ghost.png
+++ b/tdepasswd/kcm/pics/Ghost.png
diff --git a/kdepasswd/kcm/pics/Guitar.png b/tdepasswd/kcm/pics/Guitar.png
index 6a315b0c7..6a315b0c7 100644
--- a/kdepasswd/kcm/pics/Guitar.png
+++ b/tdepasswd/kcm/pics/Guitar.png
diff --git a/kdepasswd/kcm/pics/Heart.png b/tdepasswd/kcm/pics/Heart.png
index b41a027e3..b41a027e3 100644
--- a/kdepasswd/kcm/pics/Heart.png
+++ b/tdepasswd/kcm/pics/Heart.png
diff --git a/kdepasswd/kcm/pics/Konqui.png b/tdepasswd/kcm/pics/Konqui.png
index 4db7ae5e3..4db7ae5e3 100644
--- a/kdepasswd/kcm/pics/Konqui.png
+++ b/tdepasswd/kcm/pics/Konqui.png
diff --git a/kdepasswd/kcm/pics/Lion.png b/tdepasswd/kcm/pics/Lion.png
index 373b3f8c8..373b3f8c8 100644
--- a/kdepasswd/kcm/pics/Lion.png
+++ b/tdepasswd/kcm/pics/Lion.png
diff --git a/kdepasswd/kcm/pics/Makefile.am b/tdepasswd/kcm/pics/Makefile.am
index 7c2cca099..7c2cca099 100644
--- a/kdepasswd/kcm/pics/Makefile.am
+++ b/tdepasswd/kcm/pics/Makefile.am
diff --git a/kdepasswd/kcm/pics/Monkey.png b/tdepasswd/kcm/pics/Monkey.png
index 72a241006..72a241006 100644
--- a/kdepasswd/kcm/pics/Monkey.png
+++ b/tdepasswd/kcm/pics/Monkey.png
diff --git a/kdepasswd/kcm/pics/Penguin.png b/tdepasswd/kcm/pics/Penguin.png
index 33ed3619a..33ed3619a 100644
--- a/kdepasswd/kcm/pics/Penguin.png
+++ b/tdepasswd/kcm/pics/Penguin.png
diff --git a/kdepasswd/kcm/pics/Pig.png b/tdepasswd/kcm/pics/Pig.png
index c10a34c7f..c10a34c7f 100644
--- a/kdepasswd/kcm/pics/Pig.png
+++ b/tdepasswd/kcm/pics/Pig.png
diff --git a/kdepasswd/kcm/pics/Rabbit.png b/tdepasswd/kcm/pics/Rabbit.png
index a7c5f3f10..a7c5f3f10 100644
--- a/kdepasswd/kcm/pics/Rabbit.png
+++ b/tdepasswd/kcm/pics/Rabbit.png
diff --git a/kdepasswd/kcm/pics/Ring.png b/tdepasswd/kcm/pics/Ring.png
index 29daf4c63..29daf4c63 100644
--- a/kdepasswd/kcm/pics/Ring.png
+++ b/tdepasswd/kcm/pics/Ring.png
diff --git a/kdepasswd/kcm/pics/Scream.png b/tdepasswd/kcm/pics/Scream.png
index 46abbd2f8..46abbd2f8 100644
--- a/kdepasswd/kcm/pics/Scream.png
+++ b/tdepasswd/kcm/pics/Scream.png
diff --git a/kdepasswd/kcm/pics/Shark.png b/tdepasswd/kcm/pics/Shark.png
index a11a352cb..a11a352cb 100644
--- a/kdepasswd/kcm/pics/Shark.png
+++ b/tdepasswd/kcm/pics/Shark.png
diff --git a/kdepasswd/kcm/pics/Splash.png b/tdepasswd/kcm/pics/Splash.png
index ec8e68a18..ec8e68a18 100644
--- a/kdepasswd/kcm/pics/Splash.png
+++ b/tdepasswd/kcm/pics/Splash.png
diff --git a/kdepasswd/kcm/pics/Star.png b/tdepasswd/kcm/pics/Star.png
index 2b3988860..2b3988860 100644
--- a/kdepasswd/kcm/pics/Star.png
+++ b/tdepasswd/kcm/pics/Star.png
diff --git a/kdepasswd/kcm/pics/Teddybear.png b/tdepasswd/kcm/pics/Teddybear.png
index 823adb56d..823adb56d 100644
--- a/kdepasswd/kcm/pics/Teddybear.png
+++ b/tdepasswd/kcm/pics/Teddybear.png
diff --git a/kdepasswd/kcm/pics/Turtle.png b/tdepasswd/kcm/pics/Turtle.png
index 1eee29591..1eee29591 100644
--- a/kdepasswd/kcm/pics/Turtle.png
+++ b/tdepasswd/kcm/pics/Turtle.png
diff --git a/kdepasswd/kcm/settings.kcfgc b/tdepasswd/kcm/settings.kcfgc
index 772c87a6b..772c87a6b 100644
--- a/kdepasswd/kcm/settings.kcfgc
+++ b/tdepasswd/kcm/settings.kcfgc
diff --git a/kdepasswd/passwd.cpp b/tdepasswd/passwd.cpp
index 9d29333fc..9d29333fc 100644
--- a/kdepasswd/passwd.cpp
+++ b/tdepasswd/passwd.cpp
diff --git a/kdepasswd/passwd.h b/tdepasswd/passwd.h
index a5a75d5ff..a5a75d5ff 100644
--- a/kdepasswd/passwd.h
+++ b/tdepasswd/passwd.h
diff --git a/kdepasswd/passwddlg.cpp b/tdepasswd/passwddlg.cpp
index 7aee3fe52..0406f75b2 100644
--- a/kdepasswd/passwddlg.cpp
+++ b/tdepasswd/passwddlg.cpp
@@ -13,7 +13,7 @@
 #include "passwddlg.h"
 
 
-KDEpasswd1Dialog::KDEpasswd1Dialog()
+TDEpasswd1Dialog::TDEpasswd1Dialog()
     : KPasswordDialog(Password, false, 0)
 {
     setCaption(i18n("Change Password"));
@@ -21,12 +21,12 @@ KDEpasswd1Dialog::KDEpasswd1Dialog()
 }
 
 
-KDEpasswd1Dialog::~KDEpasswd1Dialog()
+TDEpasswd1Dialog::~TDEpasswd1Dialog()
 {
 }
 
 
-bool KDEpasswd1Dialog::checkPassword(const char *password)
+bool TDEpasswd1Dialog::checkPassword(const char *password)
 {
     PasswdProcess proc(0);
 
@@ -66,9 +66,9 @@ bool KDEpasswd1Dialog::checkPassword(const char *password)
 
 
 // static
-int KDEpasswd1Dialog::getPassword(TQCString &password)
+int TDEpasswd1Dialog::getPassword(TQCString &password)
 {
-    KDEpasswd1Dialog *dlg = new KDEpasswd1Dialog();
+    TDEpasswd1Dialog *dlg = new TDEpasswd1Dialog();
     int res = dlg->exec();
     if (res == Accepted)
 	password = dlg->password();
@@ -78,7 +78,7 @@ int KDEpasswd1Dialog::getPassword(TQCString &password)
 
 
 
-KDEpasswd2Dialog::KDEpasswd2Dialog(const char *oldpass, TQCString user)
+TDEpasswd2Dialog::TDEpasswd2Dialog(const char *oldpass, TQCString user)
     : KPasswordDialog(NewPassword, false, 0)
 {
     m_Pass = oldpass;
@@ -92,12 +92,12 @@ KDEpasswd2Dialog::KDEpasswd2Dialog(const char *oldpass, TQCString user)
 }
 
 
-KDEpasswd2Dialog::~KDEpasswd2Dialog()
+TDEpasswd2Dialog::~TDEpasswd2Dialog()
 {
 }
 
 
-bool KDEpasswd2Dialog::checkPassword(const char *password)
+bool TDEpasswd2Dialog::checkPassword(const char *password)
 {
     PasswdProcess proc(m_User);
 
diff --git a/kdepasswd/passwddlg.h b/tdepasswd/passwddlg.h
index 3e81856e9..88d3be2da 100644
--- a/kdepasswd/passwddlg.h
+++ b/tdepasswd/passwddlg.h
@@ -11,14 +11,14 @@
 
 #include <kpassdlg.h>
 
-class KDEpasswd1Dialog
+class TDEpasswd1Dialog
     : public KPasswordDialog
 {
     Q_OBJECT
 
 public:
-    KDEpasswd1Dialog();
-    ~KDEpasswd1Dialog();
+    TDEpasswd1Dialog();
+    ~TDEpasswd1Dialog();
 
     static int getPassword(TQCString &password);
 
@@ -27,14 +27,14 @@ protected:
 };
     
 
-class KDEpasswd2Dialog
+class TDEpasswd2Dialog
     : public KPasswordDialog
 {
     Q_OBJECT
 
 public:
-    KDEpasswd2Dialog(const char *oldpass, TQCString user);
-    ~KDEpasswd2Dialog();
+    TDEpasswd2Dialog(const char *oldpass, TQCString user);
+    ~TDEpasswd2Dialog();
 
 protected:
     bool checkPassword(const char *password);
diff --git a/kdepasswd/kdepasswd.cpp b/tdepasswd/tdepasswd.cpp
index 6f1c38aa3..7df4aaf47 100644
--- a/kdepasswd/kdepasswd.cpp
+++ b/tdepasswd/tdepasswd.cpp
@@ -28,7 +28,7 @@ static TDECmdLineOptions options[] =
 
 int main(int argc, char **argv)
 {
-    TDEAboutData aboutData("kdepasswd", I18N_NOOP("TDE passwd"),
+    TDEAboutData aboutData("tdepasswd", I18N_NOOP("TDE passwd"),
             VERSION, I18N_NOOP("Changes a UNIX password."),
             TDEAboutData::License_Artistic, "Copyright (c) 2000 Geert Jansen");
     aboutData.addAuthor("Geert Jansen", I18N_NOOP("Maintainer"),
@@ -40,7 +40,7 @@ int main(int argc, char **argv)
 
 
     if (!KUniqueApplication::start()) {
-	kdDebug() << "kdepasswd is already running" << endl;
+	kdDebug() << "tdepasswd is already running" << endl;
 	return 0;
     }
 
@@ -54,7 +54,7 @@ int main(int argc, char **argv)
     if (args->count())
 	user = args->arg(0);
 
-    /* You must be able to run "kdepasswd loginName" */
+    /* You must be able to run "tdepasswd loginName" */
     if ( !user.isEmpty() && user!=KUser().loginName().utf8() && !bRoot)
     {
         KMessageBox::sorry(0, i18n("You need to be root to change the password of other users."));
@@ -64,12 +64,12 @@ int main(int argc, char **argv)
     TQCString oldpass;
     if (!bRoot)
     {
-        int result = KDEpasswd1Dialog::getPassword(oldpass);
-        if (result != KDEpasswd1Dialog::Accepted)
+        int result = TDEpasswd1Dialog::getPassword(oldpass);
+        if (result != TDEpasswd1Dialog::Accepted)
 	    return 0;
     }
 
-    KDEpasswd2Dialog *dlg = new KDEpasswd2Dialog(oldpass, user);
+    TDEpasswd2Dialog *dlg = new TDEpasswd2Dialog(oldpass, user);
 
 
     dlg->exec();
diff --git a/kdepasswd/kdepasswd.desktop b/tdepasswd/tdepasswd.desktop
index 98a22b359..5f76f8a85 100644
--- a/kdepasswd/kdepasswd.desktop
+++ b/tdepasswd/tdepasswd.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kdepasswd
+Exec=tdepasswd
 Icon=password
 Type=Application
 Categories=Qt;TDE;Settings;
diff --git a/tdmlib/kgreeterplugin.h b/tdmlib/kgreeterplugin.h
index edf67f141..925828455 100644
--- a/tdmlib/kgreeterplugin.h
+++ b/tdmlib/kgreeterplugin.h
@@ -106,7 +106,7 @@ public:
      * - Unlock: tdm unlock dialog (TODO)
      * - ChangeTok: tdm password change dialog (TODO)
      * - ExUnlock: kdesktop_lock unlock dialog
-     * - ExChangeTok: kdepasswd password change dialog (TODO)
+     * - ExChangeTok: tdepasswd password change dialog (TODO)
      *
      * The Ex* contexts exist within a running session; the talker must know
      * how to obtain the currently logged in user (+ domain/realm, etc.)