diff --git a/kde-tde/convert_existing_kde3_app_to_tde b/kde-tde/convert_existing_kde3_app_to_tde
index 45e6b9d..88b49dc 100755
--- a/kde-tde/convert_existing_kde3_app_to_tde
+++ b/kde-tde/convert_existing_kde3_app_to_tde
@@ -26,6 +26,14 @@ KDESASL|\
 KDESU|\
 KDESVNPART|\
 KDEUI|\
+KDNSSD|\
+KIMPROXY|\
+KIO([^a-zA-Z0-9]|\$)|\
+KPARTS|\
+KSPELL|\
+KSYCOCA|\
+KUNITTEST|\
+KUTILS|\
 (|-l|lib)kdeaccessibility|\
 (|-l|lib)kdeaddons|\
 (|-l|lib)kdeadmin|\
@@ -76,8 +84,8 @@ KCACHE|\
 KDETMP|\
 KDEVARTMP|\
 KDEWM|\
-include/kde|\
-\$\{INCLUDE_INSTALL_DIR\}/kde|\
+include/kde([^\.]|\$)|\
+\$\{INCLUDE_INSTALL_DIR\}/kde([^\.]|\$)|\
 kde-config|\
 KDE_FORK_SLAVES|\
 KDE_HOME_READONLY|\
@@ -196,6 +204,9 @@ KComp|\
 KGlobal|\
 KProcess|\
 KClipboard|\
+Kwallet|\
+KWallet|\
+KWALLET|\
 kcompletionbox|\
 kaboutapplication\.|\
 kaboutdata\.|\
@@ -218,7 +229,12 @@ kabc|\
 (|-l|lib)kabc|\
 makekdewidgets|\
 Categories=Qt;KDE|\
-X-KDE-\
+X-KDE-|\
+kde\.org/tdehotnewstuff|\
+tdevelop[a-z_\-]*@[tk]develop\.org|\
+tdevelop\.org|\
+tdewebdev\.org|\
+\<tdelistr\
 )" |
 tr "\n" "\0" |
 xargs -r0 sed -ri \
@@ -246,6 +262,14 @@ xargs -r0 sed -ri \
  -e "s|([^a-zA-Z0-9]\|^)KDESU|\1TDESU|g" \
  -e "s|([^a-zA-Z0-9]\|^)KDESVNPART|\1TDESVNPART|g" \
  -e "s|([^a-zA-Z0-9]\|^)KDEUI|\1TDEUI|g" \
+ -e "s|([^a-zA-Z0-9]\|^)KDNSSD|\1TDEDNSSD|g" \
+ -e "s|([^a-zA-Z0-9]\|^)KIMPROXY|\1TDEIMPROXY|g" \
+ -e "s|([^a-zA-Z0-9]\|^)KIO([^a-zA-Z0-9]\|\$)|\1TDEIO\2|g" \
+ -e "s|([^a-zA-Z0-9]\|^)KPARTS|\1TDEPARTS|g" \
+ -e "s|([^a-zA-Z0-9]\|^)KSPELL|\1TDESPELL|g" \
+ -e "s|([^a-zA-Z0-9]\|^)KSYCOCA|\1TDESYCOCA|g" \
+ -e "s|([^a-zA-Z0-9]\|^)KUNITTEST|\1TDEUNITTEST|g" \
+ -e "s|([^a-zA-Z0-9]\|^)KUTILS|\1TDEUTILS|g" \
  -e "s|([^a-zA-Z0-9]\|-l\|lib\|^)kdeaccessibility|\1tdeaccessibility|g" \
  -e "s|([^a-zA-Z0-9]\|-l\|lib\|^)kdeaddons|\1tdeaddons|g" \
  -e "s|([^a-zA-Z0-9]\|-l\|lib\|^)kdeadmin|\1tdeadmin|g" \
@@ -296,8 +320,8 @@ xargs -r0 sed -ri \
  -e "s|([^a-zA-Z0-9]\|^)KDETMP|\1TDETMP|g" \
  -e "s|([^a-zA-Z0-9]\|^)KDEVARTMP|\1TDEVARTMP|g" \
  -e "s|([^a-zA-Z0-9]\|^)KDEWM|\1TDEWM|g" \
- -e "s|([^a-zA-Z0-9]\|^)include/kde|\1include/tde|g" \
- -e "s|([^a-zA-Z0-9]\|^)\$\{INCLUDE_INSTALL_DIR\}/kde|\1\${INCLUDE_INSTALL_DIR}/tde|g" \
+ -e "s|([^a-zA-Z0-9]\|^)include/kde([^\.]\|\$)|\1include/tde\2|g" \
+ -e "s|([^a-zA-Z0-9]\|^)\$\{INCLUDE_INSTALL_DIR\}/kde([^\.]\|\$)|\1\${INCLUDE_INSTALL_DIR}/tde\2|g" \
  -e "s|([^a-zA-Z0-9]\|^)kde-config|\1tde-config|g" \
  -e "s|([^a-zA-Z0-9]\|^)KDE_FORK_SLAVES|\1TDE_FORK_SLAVES|g" \
  -e "s|([^a-zA-Z0-9]\|^)KDE_HOME_READONLY|\1TDE_HOME_READONLY|g" \
@@ -422,6 +446,9 @@ xargs -r0 sed -ri \
  -e "s|([^a-zA-Z0-9]\|^)KGlobal|\1TDEGlobal|g" \
  -e "s|([^a-zA-Z0-9]\|^)KProcess|\1TDEProcess|g" \
  -e "s|([^a-zA-Z0-9]\|^)KClipboard|\1TDEClipboard|g" \
+ -e "s|([^a-zA-Z0-9]\|^)Kwallet|\1TDEwallet|g" \
+ -e "s|([^a-zA-Z0-9]\|^)KWallet|\1TDEWallet|g" \
+ -e "s|([^a-zA-Z0-9]\|^)KWALLET|\1TDEWALLET|g" \
  \
  -e "s|([^a-zA-Z0-9]\|^)kcompletionbox|\1tdecompletionbox|g" \
  \
@@ -447,6 +474,16 @@ xargs -r0 sed -ri \
  -e "s|([^a-zA-Z0-9]\|^)makekdewidgets|\1maketdewidgets|g" \
  -e "s|([^a-zA-Z0-9]\|^)Categories=Qt;KDE|\1Categories=Qt;TDE|g" \
  -e "s|([^a-zA-Z0-9]\|^)X-KDE-|\1X-TDE-|g" \
+ \
+ \
+ -e "s|kde\.org/tdehotnewstuff|kde.org/khotnewstuff|g" \
+ -e "s|tdevelop\.org|kdevelop.org|g" \
+ -e "s|tdewebdev\.org|kdewebdev.org|g" \
+ -e "s|t(develop[a-z_\-]*@[tk]develop\.org)|k\1|g" \
+ -e "s|\<tdelistr|klistr|g"
 
-# Rename "kio_*" files to "tdeio_*"
+# Rename files
 find . -name "kio_*" | while read f; do mv "${f}" "${f/kio_/tdeio_}"; done
+find . -name "kio-*" | while read f; do mv "${f}" "${f/kio-/tdeio-}"; done
+find . -name "kio.*" | while read f; do mv "${f}" "${f/kio./tdeio.}"; done
+find . -name "*.kdevelop" | while read f; do mv "${f}" "${f/.kdevelop/.tdevelop}"; done