diff --git a/kfilereplace/kfilereplace.desktop b/kfilereplace/kfilereplace.desktop
index 0e01c478..e656566f 100644
--- a/kfilereplace/kfilereplace.desktop
+++ b/kfilereplace/kfilereplace.desktop
@@ -52,4 +52,4 @@ GenericName[uk]=Засіб пошуку та заміни
 GenericName[zh_CN]=搜索替换工具
 GenericName[zh_HK]=搜尋及取代工具
 GenericName[zh_TW]=搜尋及取代工具
-Categories=Qt;KDE;Utility;X-KDE-Utilities-File;
+Categories=Qt;TDE;Utility;X-TDE-Utilities-File;
diff --git a/kfilereplace/kfilereplacepart.desktop b/kfilereplace/kfilereplacepart.desktop
index 388f6579..f8c01e3e 100644
--- a/kfilereplace/kfilereplacepart.desktop
+++ b/kfilereplace/kfilereplacepart.desktop
@@ -3,7 +3,7 @@ Type=Service
 MimeType=inode/directory
 Icon=kfilereplace.png
 ServiceTypes=KParts/ReadOnlyPart
-X-KDE-Library=libkfilereplacepart
+X-TDE-Library=libkfilereplacepart
 Comment=A batch search and replace tool
 Comment[bg]=Търсене и замяна във фонов режим
 Comment[ca]=Una eina per a la cerca i substitució per lots
diff --git a/kimagemapeditor/kimagemapeditor.desktop b/kimagemapeditor/kimagemapeditor.desktop
index 263c7536..77bda30e 100644
--- a/kimagemapeditor/kimagemapeditor.desktop
+++ b/kimagemapeditor/kimagemapeditor.desktop
@@ -52,4 +52,4 @@ GenericName[uk]=Редактор карт зображень HTML
 GenericName[zh_CN]=HTML 图像映射编辑器
 GenericName[zh_HK]=HTML 影像地圖編輯器
 GenericName[zh_TW]=HTML 影像地圖編輯器
-Categories=Qt;KDE;Development;WebDevelopment;
+Categories=Qt;TDE;Development;WebDevelopment;
diff --git a/kimagemapeditor/kimagemapeditorpart.desktop b/kimagemapeditor/kimagemapeditorpart.desktop
index 758b510a..6c0240a7 100644
--- a/kimagemapeditor/kimagemapeditorpart.desktop
+++ b/kimagemapeditor/kimagemapeditorpart.desktop
@@ -3,7 +3,7 @@ Type=Service
 MimeType=text/html
 Icon=kimagemapeditor
 ServiceTypes=KParts/ReadWritePart
-X-KDE-Library=libkimagemapeditor
+X-TDE-Library=libkimagemapeditor
 Comment=An HTML imagemap editor
 Comment[bg]=Редактор на маркирания на изображения за HTML
 Comment[ca]=Un editor de mapes d'imatge HTML
diff --git a/klinkstatus/src/klinkstatus.desktop b/klinkstatus/src/klinkstatus.desktop
index bb1cdbd0..c9dc308a 100644
--- a/klinkstatus/src/klinkstatus.desktop
+++ b/klinkstatus/src/klinkstatus.desktop
@@ -50,5 +50,5 @@ GenericName[uk]=Перевірка посилань
 GenericName[zh_CN]=链接检查器
 GenericName[zh_HK]=連結檢查程式
 GenericName[zh_TW]=連結檢查程式
-Categories=Qt;KDE;Development;WebDevelopment;
+Categories=Qt;TDE;Development;WebDevelopment;
 
diff --git a/klinkstatus/src/klinkstatus_part.desktop b/klinkstatus/src/klinkstatus_part.desktop
index 9515bbfa..d8a27422 100644
--- a/klinkstatus/src/klinkstatus_part.desktop
+++ b/klinkstatus/src/klinkstatus_part.desktop
@@ -13,5 +13,5 @@ Name[tg]=Қисми KLinkStatus
 Icon=klinkstatus
 MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
 ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart
-X-KDE-Library=libklinkstatuspart
+X-TDE-Library=libklinkstatuspart
 Type=Service
diff --git a/kommander/editor/kmdr-editor.desktop b/kommander/editor/kmdr-editor.desktop
index cdef1c5c..619dc89c 100644
--- a/kommander/editor/kmdr-editor.desktop
+++ b/kommander/editor/kmdr-editor.desktop
@@ -126,4 +126,4 @@ Comment[zh_HK]=動態對話盒編輯器
 Comment[zh_TW]=動態對話盒編輯器
 MimeType=application/x-kommander;
 DocPath=kommander/index.html
-Categories=Qt;KDE;Development;
+Categories=Qt;TDE;Development;
diff --git a/kommander/part/kommander_part.desktop b/kommander/part/kommander_part.desktop
index 38e47dbf..b735f759 100644
--- a/kommander/part/kommander_part.desktop
+++ b/kommander/part/kommander_part.desktop
@@ -11,5 +11,5 @@ Name[sv]=Kommander-delprogram
 Name[zh_TW]=Kommander 部件
 MimeType=application/x-kommander;
 ServiceTypes=KParts/ReadOnlyPart
-X-KDE-Library=libkommander_part
+X-TDE-Library=libkommander_part
 Type=Service
diff --git a/kommander/x-kommander.desktop b/kommander/x-kommander.desktop
index 45c94003..ae09d809 100644
--- a/kommander/x-kommander.desktop
+++ b/kommander/x-kommander.desktop
@@ -47,9 +47,9 @@ Icon=widget_doc
 Type=MimeType
 MimeType=application/x-kommander
 Patterns=*.kmdr;
-X-KDE-IsAlso=application/x-executable-script
+X-TDE-IsAlso=application/x-executable-script
 
-[Property::X-KDE-text]
+[Property::X-TDE-text]
 Type=bool
 Value=true
 
diff --git a/kxsldbg/kxsldbg.desktop b/kxsldbg/kxsldbg.desktop
index 8ab7ad9e..53a26b6c 100644
--- a/kxsldbg/kxsldbg.desktop
+++ b/kxsldbg/kxsldbg.desktop
@@ -50,4 +50,4 @@ Icon=kxsldbg
 Type=Application
 DocPath=kxsldbg/index.html
 Terminal=false
-Categories=Qt;KDE;Development;WebDevelopment;
+Categories=Qt;TDE;Development;WebDevelopment;
diff --git a/kxsldbg/kxsldbgpart/kxsldbg_part.desktop b/kxsldbg/kxsldbgpart/kxsldbg_part.desktop
index 229c6cad..6f12f1aa 100644
--- a/kxsldbg/kxsldbgpart/kxsldbg_part.desktop
+++ b/kxsldbg/kxsldbgpart/kxsldbg_part.desktop
@@ -11,5 +11,5 @@ Name[ta]=KXsldbg பகுதி
 Name[tg]=Қисми KXsldbg
 MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
 ServiceTypes=KParts/ReadOnlyPart
-X-KDE-Library=libkxsldbgpart
+X-TDE-Library=libkxsldbgpart
 Type=Service
diff --git a/quanta/components/debugger/dbgp/quantadebuggerdbgp.desktop b/quanta/components/debugger/dbgp/quantadebuggerdbgp.desktop
index 3bebcf06..cbcf7816 100644
--- a/quanta/components/debugger/dbgp/quantadebuggerdbgp.desktop
+++ b/quanta/components/debugger/dbgp/quantadebuggerdbgp.desktop
@@ -41,4 +41,4 @@ Comment[zh_HK]=DBGp 除錯器外掛程式，請參閱 http://xdebug.org
 Comment[zh_TW]=DBGp 除錯器外掛程式，請參閱 http://xdebug.org
 Icon=kdbg
 ServiceTypes=Quanta/Debugger
-X-KDE-Library=quantadebuggerdbgp
+X-TDE-Library=quantadebuggerdbgp
diff --git a/quanta/components/debugger/gubed/quantadebuggergubed.desktop b/quanta/components/debugger/gubed/quantadebuggergubed.desktop
index d2020cb7..1e9b2024 100644
--- a/quanta/components/debugger/gubed/quantadebuggergubed.desktop
+++ b/quanta/components/debugger/gubed/quantadebuggergubed.desktop
@@ -45,4 +45,4 @@ Comment[zh_HK]=Quanta 對於 Gubed PHP 除錯器的通訊外掛程式, 請參閱
 Comment[zh_TW]=Quanta 對於 Gubed PHP 除錯器的通訊外掛程式, 請參閱 http://gubed.sf.net
 Icon=kdbg
 ServiceTypes=Quanta/Debugger
-X-KDE-Library=quantadebuggergubed
+X-TDE-Library=quantadebuggergubed
diff --git a/quanta/components/debugger/interfaces/quantadebugger.desktop b/quanta/components/debugger/interfaces/quantadebugger.desktop
index 9b833186..0c5d5bbf 100644
--- a/quanta/components/debugger/interfaces/quantadebugger.desktop
+++ b/quanta/components/debugger/interfaces/quantadebugger.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=ServiceType
-X-KDE-ServiceType=TQuanta/Debugger
+X-TDE-ServiceType=TQuanta/Debugger
 Comment=A Quanta Debugger plugin
 Comment[bg]=Приставка на Quanta за дебъгване
 Comment[br]=Ul lugent dizraener Quanta
diff --git a/quanta/src/quanta.desktop b/quanta/src/quanta.desktop
index dcf8fbda..8ca35e59 100644
--- a/quanta/src/quanta.desktop
+++ b/quanta/src/quanta.desktop
@@ -92,4 +92,4 @@ Comment[uk]=Середовище веб-розробки
 Comment[zh_CN]=Web 开发环境
 Comment[zh_HK]=網頁開發環境
 Comment[zh_TW]=網頁開發環境
-Categories=Qt;KDE;Development;WebDevelopment;
+Categories=Qt;TDE;Development;WebDevelopment;
diff --git a/quanta/src/quanta_be.desktop b/quanta/src/quanta_be.desktop
index 46578125..2d0f2aa9 100644
--- a/quanta/src/quanta_be.desktop
+++ b/quanta/src/quanta_be.desktop
@@ -91,4 +91,4 @@ Comment[uk]=Середовище веб-розробки
 Comment[zh_CN]=Web 开发环境
 Comment[zh_HK]=網頁開發環境
 Comment[zh_TW]=網頁開發環境
-Categories=Qt;KDE;Development;
+Categories=Qt;TDE;Development;
diff --git a/quanta/src/x-webprj.desktop b/quanta/src/x-webprj.desktop
index 510b4778..b2ccdf0e 100644
--- a/quanta/src/x-webprj.desktop
+++ b/quanta/src/x-webprj.desktop
@@ -46,6 +46,6 @@ Type=MimeType
 MimeType=application/x-webprj
 Patterns=*.webprj
 
-[Property::X-KDE-text]
+[Property::X-TDE-text]
 Type=bool
 Value=true
diff --git a/quanta/utility/quantacommon.cpp b/quanta/utility/quantacommon.cpp
index 7eb8402d..4a1d61f5 100644
--- a/quanta/utility/quantacommon.cpp
+++ b/quanta/utility/quantacommon.cpp
@@ -327,7 +327,7 @@ bool QuantaCommon::checkMimeGroup(const KURL& url, const TQString& group)
           status = true;
    } else
    {
-     TQVariant v = mime->property("X-KDE-text");
+     TQVariant v = mime->property("X-TDE-text");
      if (v.isValid())
          status = v.toBool();
    }