diff --git a/kjsembed/kjscmd.desktop b/kjsembed/kjscmd.desktop
index a500a1b0..49063bb7 100644
--- a/kjsembed/kjscmd.desktop
+++ b/kjsembed/kjscmd.desktop
@@ -7,5 +7,5 @@ Icon=konsole
 Terminal=false
 X-DCOP-ServiceType=Multi
 Categories=Qt;TDE;Development;Debugger;
-InitialPreference=10
+X-TDE-InitialPreference=10
 
diff --git a/kjsembed/plugins/customobject_plugin.desktop b/kjsembed/plugins/customobject_plugin.desktop
index 5a319cc6..19ab7b83 100644
--- a/kjsembed/plugins/customobject_plugin.desktop
+++ b/kjsembed/plugins/customobject_plugin.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
 Name=MyCustomObject
-ServiceTypes=JSBindingPlugin/Binding
+X-TDE-ServiceTypes=JSBindingPlugin/Binding
 Type=Service
 X-TDE-Library=libcustomobjectplugin
diff --git a/kjsembed/plugins/customqobject_plugin.desktop b/kjsembed/plugins/customqobject_plugin.desktop
index e4ef7ac1..2d9d17fe 100644
--- a/kjsembed/plugins/customqobject_plugin.desktop
+++ b/kjsembed/plugins/customqobject_plugin.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
 Name=MyCustomTQObject
-ServiceTypes=JSBindingPlugin/Binding
+X-TDE-ServiceTypes=JSBindingPlugin/Binding
 Type=Service
 X-TDE-Library=libcustomqobjectplugin
diff --git a/kjsembed/plugins/imagefx_plugin.desktop b/kjsembed/plugins/imagefx_plugin.desktop
index 1bec93e3..ee5b2365 100644
--- a/kjsembed/plugins/imagefx_plugin.desktop
+++ b/kjsembed/plugins/imagefx_plugin.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
 Name=ImageFX
-ServiceTypes=JSBindingPlugin/Binding
+X-TDE-ServiceTypes=JSBindingPlugin/Binding
 Type=Service
 X-TDE-Library=libimagefxplugin
diff --git a/kjsembed/plugins/qprocess_plugin.desktop b/kjsembed/plugins/qprocess_plugin.desktop
index 64bd0b72..d9fd01a4 100644
--- a/kjsembed/plugins/qprocess_plugin.desktop
+++ b/kjsembed/plugins/qprocess_plugin.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
 Name=Process
-ServiceTypes=JSBindingPlugin/Binding
+X-TDE-ServiceTypes=JSBindingPlugin/Binding
 Type=Service
 X-TDE-Library=libqprocessplugin
diff --git a/kjsembed/plugins/tdefileitem_plugin.desktop b/kjsembed/plugins/tdefileitem_plugin.desktop
index f5f91552..cfad2e25 100644
--- a/kjsembed/plugins/tdefileitem_plugin.desktop
+++ b/kjsembed/plugins/tdefileitem_plugin.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
 Name=KFileItem
-ServiceTypes=JSBindingPlugin/Binding
+X-TDE-ServiceTypes=JSBindingPlugin/Binding
 Type=Service
 X-TDE-Library=libfileitemplugin
diff --git a/kjsembed/tdescript/javascript.desktop b/kjsembed/tdescript/javascript.desktop
index 1d612975..49acdbcf 100644
--- a/kjsembed/tdescript/javascript.desktop
+++ b/kjsembed/tdescript/javascript.desktop
@@ -3,5 +3,5 @@ Name=KJSEmbed Script Runner
 Type=Service
 X-TDE-Library=libjavascript
 X-TDE-Script-Runner=JavaScript/kjs
-ServiceTypes=KScriptRunner/KScriptRunner
+X-TDE-ServiceTypes=KScriptRunner/KScriptRunner
 Comment=Javascript scripts from inside the application.
diff --git a/tdejava/koala/test/kbase/kbase.desktop b/tdejava/koala/test/kbase/kbase.desktop
index caf223fe..c9596ef0 100644
--- a/tdejava/koala/test/kbase/kbase.desktop
+++ b/tdejava/koala/test/kbase/kbase.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Exec=java -cp ".:/home/duke/src/qt-2.2.1java/javalib:.." KBase KBase -caption "%c" %i %m
 Icon=kbase.xpm
-DocPath=kbase/index.html
+X-DocPath=kbase/index.html
 Comment=
 Comment[de]=
 Terminal=false
diff --git a/xparts/mozilla/kmozilla.desktop b/xparts/mozilla/kmozilla.desktop
index 16b79c92..63012abe 100644
--- a/xparts/mozilla/kmozilla.desktop
+++ b/xparts/mozilla/kmozilla.desktop
@@ -5,5 +5,5 @@ Comment=Embeddable HTML viewing component
 MimeType=text/html;text/xml;
 Icon=konqueror
 Name=KMOZILLA
-ServiceTypes=KParts/ReadOnlyPart,Browser/View
+X-TDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View
 X-TDE-Library=libkmozillapart
diff --git a/xparts/xpart_notepad/xp_notepad.desktop b/xparts/xpart_notepad/xp_notepad.desktop
index 2a802b6f..301a6ffd 100644
--- a/xparts/xpart_notepad/xp_notepad.desktop
+++ b/xparts/xpart_notepad/xp_notepad.desktop
@@ -5,5 +5,5 @@ Comment=XPart Notepad Editor
 Icon=
 Name=XNotepad (XPart example)
 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++;text/x-diff;
-ServiceTypes=KParts/ReadOnlyPart
+X-TDE-ServiceTypes=KParts/ReadOnlyPart
 X-TDE-Library=libxp_notepadpart