diff --git a/doc/tdewallet/index.docbook b/doc/tdewallet/index.docbook
index c2c1af7..fe422d6 100644
--- a/doc/tdewallet/index.docbook
+++ b/doc/tdewallet/index.docbook
@@ -42,7 +42,8 @@ passwords.</para>
 
 <keywordset>
 <keyword>KDE</keyword>
-<keyword>Kwallet</keyword>
+<keyword>TDE</keyword>
+<keyword>TDEWallet</keyword>
 <keyword>passwords</keyword>
 <keyword>forms</keyword>
 </keywordset>
diff --git a/tdewallet/allyourbase.cpp b/tdewallet/allyourbase.cpp
index b131110..bc132b0 100644
--- a/tdewallet/allyourbase.cpp
+++ b/tdewallet/allyourbase.cpp
@@ -185,7 +185,7 @@ bool TDEWalletItem::acceptDrop(const TQMimeSource *mime) const {
 static bool decodeEntry(TDEWallet::Wallet *_wallet, TQDataStream& ds) {
 	TQ_UINT32 magic;
 	ds >> magic;
-	if (magic != KWALLETENTRYMAGIC) {
+	if (magic != TDEWALLETENTRYMAGIC) {
 		kdDebug() << "bad magic" << endl;
 		return false;
 	}
@@ -210,7 +210,7 @@ static bool decodeEntry(TDEWallet::Wallet *_wallet, TQDataStream& ds) {
 static bool decodeFolder(TDEWallet::Wallet *_wallet, TQDataStream& ds) {
 	TQ_UINT32 magic;
 	ds >> magic;
-	if (magic != KWALLETFOLDERMAGIC) {
+	if (magic != TDEWALLETFOLDERMAGIC) {
 		kdDebug() << "bad magic" << endl;
 		return false;
 	}
@@ -446,9 +446,9 @@ void TDEWalletEntryList::itemDropped(TQDropEvent *e, TQListViewItem *item) {
 			//check magic to discover mime type
 			TQ_UINT32 magic;
 			(*ds) >> magic;
-			if (magic == KWALLETENTRYMAGIC) {
+			if (magic == TDEWALLETENTRYMAGIC) {
 				isEntry = true;
-			} else if (magic == KWALLETFOLDERMAGIC) {
+			} else if (magic == TDEWALLETFOLDERMAGIC) {
 				isEntry = false;
 			} else {
 				kdDebug() << "bad magic" << endl;
@@ -711,7 +711,7 @@ TQDragObject *TDEWalletEntryList::dragObject() {
 		sd = new TDEWalletEntryDrag(viewport(), "TDEWallet Entry Drag");
 		TQByteArray a;
 		TQDataStream ds(a, IO_WriteOnly);
-		ds << KWALLETENTRYMAGIC;
+		ds << TDEWALLETENTRYMAGIC;
 		ds << *ei;
 		sd->setEncodedData(a);
 	} else if (i->rtti() == TDEWalletFolderItemClass) {
@@ -723,7 +723,7 @@ TQDragObject *TDEWalletEntryList::dragObject() {
 		TQByteArray a;
 		TQDataStream ds(a, IO_WriteOnly);
 
-		ds << KWALLETFOLDERMAGIC;
+		ds << TDEWALLETFOLDERMAGIC;
 		ds << *fi;
 		sd->setEncodedData(a);
 	}
diff --git a/tdewallet/allyourbase.h b/tdewallet/allyourbase.h
index d035cdb..e5e78ee 100644
--- a/tdewallet/allyourbase.h
+++ b/tdewallet/allyourbase.h
@@ -27,8 +27,8 @@
 #include <kiconloader.h>
 #include <kicontheme.h>
 
-#define KWALLETENTRYMAGIC ((TQ_UINT32) 0x6B776C65)
-#define KWALLETFOLDERMAGIC ((TQ_UINT32) 0x6B776C66)
+#define TDEWALLETENTRYMAGIC ((TQ_UINT32) 0x6B776C65)
+#define TDEWALLETFOLDERMAGIC ((TQ_UINT32) 0x6B776C66)
 
 enum TDEWalletListItemClasses {
 	TDEWalletFolderItemClass = 1000,
diff --git a/tdewallet/konfigurator/konfigurator.h b/tdewallet/konfigurator/konfigurator.h
index 159e629..3e29dd4 100644
--- a/tdewallet/konfigurator/konfigurator.h
+++ b/tdewallet/konfigurator/konfigurator.h
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
  */
 
-#ifndef _KWALLETKONFIGURATOR_H
-#define _KWALLETKONFIGURATOR_H
+#ifndef _TDEWALLETKONFIGURATOR_H
+#define _TDEWALLETKONFIGURATOR_H
 
 #include <tdecmodule.h>
 
diff --git a/tdewallet/konfigurator/tdewalletmanager_show.desktop b/tdewallet/konfigurator/tdewalletmanager_show.desktop
index eed2ed4..4081fdf 100644
--- a/tdewallet/konfigurator/tdewalletmanager_show.desktop
+++ b/tdewallet/konfigurator/tdewalletmanager_show.desktop
@@ -53,7 +53,7 @@ Name[uz@cyrillic]=Қопчиқ бошқариш воситаси
 Name[zh_CN]=钱包管理工具
 Name[zh_TW]=錢包管理工具
 Exec=tdewalletmanager --show %u
-MimeType=application/x-kde-wallet
+MimeType=application/x-tde-wallet
 InitialPreference=6
 Icon=tdewalletmanager
 Type=Service
diff --git a/tdewallet/main.cpp b/tdewallet/main.cpp
index 863e7e8..bd66c37 100644
--- a/tdewallet/main.cpp
+++ b/tdewallet/main.cpp
@@ -88,7 +88,7 @@ int main(int argc, char **argv) {
 		KMimeType::Ptr ptr;
 		if (TQFile::exists(fn) &&
 			(ptr = KMimeType::findByFileContent(fn)) &&
-			ptr->is("application/x-kde-wallet")) {
+			ptr->is("application/x-tde-wallet")) {
 			wm.openWalletFile(fn);
 		} else {
 			wm.openWallet(args->arg(i));
diff --git a/tdewallet/tdewalleteditor.h b/tdewallet/tdewalleteditor.h
index dcd9811..4000bb2 100644
--- a/tdewallet/tdewalleteditor.h
+++ b/tdewallet/tdewalleteditor.h
@@ -18,8 +18,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef KWALLETEDITOR_H
-#define KWALLETEDITOR_H
+#ifndef TDEWALLETEDITOR_H
+#define TDEWALLETEDITOR_H
 
 #include "walletwidget.h"
 #include <tdewallet.h>
diff --git a/tdewallet/tdewalletmanager.desktop b/tdewallet/tdewalletmanager.desktop
index 7a5d4dc..6eb7409 100644
--- a/tdewallet/tdewalletmanager.desktop
+++ b/tdewallet/tdewalletmanager.desktop
@@ -53,7 +53,7 @@ Name[uz@cyrillic]=Қопчиқ бошқариш воситаси
 Name[zh_CN]=钱包管理工具
 Name[zh_TW]=錢包管理工具
 Exec=tdewalletmanager %u
-MimeType=application/x-kde-wallet;
+MimeType=application/x-tde-wallet;
 InitialPreference=6
 Icon=tdewalletmanager
 Type=Application
diff --git a/tdewallet/tdewalletmanager.h b/tdewallet/tdewalletmanager.h
index 3d36a80..081c6bb 100644
--- a/tdewallet/tdewalletmanager.h
+++ b/tdewallet/tdewalletmanager.h
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef KWALLETMANAGER_H
-#define KWALLETMANAGER_H
+#ifndef TDEWALLETMANAGER_H
+#define TDEWALLETMANAGER_H
 
 #include <tdemainwindow.h>
 #include <dcopobject.h>
diff --git a/tdewallet/tdewalletpopup.h b/tdewallet/tdewalletpopup.h
index 0c9470c..2b4ba86 100644
--- a/tdewallet/tdewalletpopup.h
+++ b/tdewallet/tdewalletpopup.h
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef KWALLETPOPUP_H
-#define KWALLETPOPUP_H
+#ifndef TDEWALLETPOPUP_H
+#define TDEWALLETPOPUP_H
 
 #include <tdepopupmenu.h>
 #include <tqmap.h>