diff --git a/kexi/doc/dev/TODO-Kexi-js b/kexi/doc/dev/TODO-Kexi-js
index 677dd3ea4..880c0d138 100644
--- a/kexi/doc/dev/TODO-Kexi-js
+++ b/kexi/doc/dev/TODO-Kexi-js
@@ -164,7 +164,7 @@ MOST RECENT TODO:
 
 TODO: improve security for password information in .kexis files
 TODO: for .kexis files' conenction data - if password attr. is not present - ask for password
-IDEA: integrate password information in .kexis files with KWallet
+IDEA: integrate password information in .kexis files with TDEWallet
 
 
 TODO: Put Connection::dropTable() and Conenction::dropQuery() INSIDE TRANSACTION!!!!!!!
@@ -723,7 +723,7 @@ TODO:::::::
 	jstaniek	dipesh: it's only within your example project...
 	dipesh	therefore column( col )->readOnly() crashes...
 
-reuse KWallet http://events.kde.org/info/kastle/presentations/tdewallet-kastle-2003.ps
+reuse TDEWallet http://events.kde.org/info/kastle/presentations/tdewallet-kastle-2003.ps
 
 === Interesting features ===
 - Add random names/surnames generator: http://www.ruf.rice.edu/~pound/
diff --git a/kexi/main/startup/KexiStartup.cpp b/kexi/main/startup/KexiStartup.cpp
index 6e2ecc800..d54a9d129 100644
--- a/kexi/main/startup/KexiStartup.cpp
+++ b/kexi/main/startup/KexiStartup.cpp
@@ -381,7 +381,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/)
 		m_action = Exit;
 	}
 
-//TODO: add option for non-gui; integrate with KWallet; 
+//TODO: add option for non-gui; integrate with TDEWallet; 
 //      move to static KexiProject method
 	if (!fileDriverSelected && !cdata.driverName.isEmpty() && cdata.password.isEmpty()) {