diff --git a/interfaces/kmediaplayer/kmediaplayeradaptor_p.h b/interfaces/kmediaplayer/kmediaplayeradaptor_p.h
index 60f049a2..4e82c157 100644
--- a/interfaces/kmediaplayer/kmediaplayeradaptor_p.h
+++ b/interfaces/kmediaplayer/kmediaplayeradaptor_p.h
@@ -36,13 +36,13 @@ class KMediaPlayerAdaptor: public QDBusAbstractAdaptor
 "      <arg direction=\"in\" type=\"x\" name=\"msec\" />"
 "    </method>"
 "    <property access=\"read\" type=\"b\" name=\"seekable\" >"
-"      <annotation value=\"isSeekable\" name=\"com.trolltech.QtDBus.propertyGetter\" />"
+"      <annotation value=\"isSeekable\" name=\"org.qtproject.QtDBus.propertyGetter\" />"
 "    </property>"
 "    <property access=\"read\" type=\"x\" name=\"position\" />"
 "    <property access=\"read\" type=\"b\" name=\"hasLength\" />"
 "    <property access=\"read\" type=\"x\" name=\"length\" />"
 "    <property access=\"readwrite\" type=\"b\" name=\"looping\" >"
-"      <annotation value=\"isLooping\" name=\"com.trolltech.QtDBus.propertyGetter\" />"
+"      <annotation value=\"isLooping\" name=\"org.qtproject.QtDBus.propertyGetter\" />"
 "    </property>"
 "    <property access=\"readwrite\" type=\"i\" name=\"state\" />"
 "  </interface>"
diff --git a/interfaces/kmediaplayer/org.kde.KMediaPlayer.xml b/interfaces/kmediaplayer/org.kde.KMediaPlayer.xml
index 40b11c46..6da6e8d6 100644
--- a/interfaces/kmediaplayer/org.kde.KMediaPlayer.xml
+++ b/interfaces/kmediaplayer/org.kde.KMediaPlayer.xml
@@ -13,13 +13,13 @@
       <arg name="msec" type="x" direction="in"/>
     </method>
     <property name="seekable" type="b" access="read">
-      <annotation name="com.trolltech.QtDBus.propertyGetter" value="isSeekable"/>
+      <annotation name="org.qtproject.QtDBus.propertyGetter" value="isSeekable"/>
     </property>
     <property name="position" type="x" access="read"/>
     <property name="hasLength" type="b" access="read"/>
     <property name="length" type="x" access="read"/>
     <property name="looping" type="b" access="readwrite">
-      <annotation name="com.trolltech.QtDBus.propertyGetter" value="isLooping"/>
+      <annotation name="org.qtproject.QtDBus.propertyGetter" value="isLooping"/>
     </property>
     <property name="state" type="i" access="readwrite"/>
   </interface>
diff --git a/kdeui/notifications/org.freedesktop.Notifications.xml b/kdeui/notifications/org.freedesktop.Notifications.xml
index 8ddb421c..62345f2b 100644
--- a/kdeui/notifications/org.freedesktop.Notifications.xml
+++ b/kdeui/notifications/org.freedesktop.Notifications.xml
@@ -10,7 +10,7 @@
       <arg name="action_key" type="s" direction="out"/>
     </signal>
     <method name="Notify">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In6" value="QVariantMap"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In6" value="QVariantMap"/>
       <arg type="u" direction="out"/>
       <arg name="app_name" type="s" direction="in"/>
       <arg name="replaces_id" type="u" direction="in"/>
diff --git a/kdeui/notifications/org.kde.StatusNotifierItem.xml b/kdeui/notifications/org.kde.StatusNotifierItem.xml
index 82c427d0..466646fc 100644
--- a/kdeui/notifications/org.kde.StatusNotifierItem.xml
+++ b/kdeui/notifications/org.kde.StatusNotifierItem.xml
@@ -20,13 +20,13 @@
 
     <!--struct containing width, height and image data-->
     <property name="IconPixmap" type="(iiay)" access="read">
-      <annotation name="com.trolltech.QtDBus.QtTypeName" value="KDbusImageVector"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName" value="KDbusImageVector"/>
     </property>
 
     <property name="OverlayIconName" type="s" access="read"/>
 
     <property name="OverlayIconPixmap" type="(iiay)" access="read">
-      <annotation name="com.trolltech.QtDBus.QtTypeName" value="KDbusImageVector"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName" value="KDbusImageVector"/>
     </property>
 
 
@@ -35,7 +35,7 @@
 
     <!--same definition as image-->
     <property name="AttentionIconPixmap" type="(iiay)" access="read">
-      <annotation name="com.trolltech.QtDBus.QtTypeName" value="KDbusImageVector"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName" value="KDbusImageVector"/>
     </property>
 
     <property name="AttentionMovieName" type="s" access="read"/>
@@ -46,7 +46,7 @@
 
     <!--(iiay) is an image-->
     <property name="ToolTip" type="(s(iiay)ss)" access="read">
-      <annotation name="com.trolltech.QtDBus.QtTypeName" value="KDbusToolTipStruct"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName" value="KDbusToolTipStruct"/>
     </property>
 
 
diff --git a/kdeui/notifications/org.kde.StatusNotifierWatcher.xml b/kdeui/notifications/org.kde.StatusNotifierWatcher.xml
index dd45dc9c..2eb1a7a0 100644
--- a/kdeui/notifications/org.kde.StatusNotifierWatcher.xml
+++ b/kdeui/notifications/org.kde.StatusNotifierWatcher.xml
@@ -15,7 +15,7 @@
     <!-- properties -->
 
     <property name="RegisteredStatusNotifierItems" type="as" access="read">
-       <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QStringList"/>
+       <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QStringList"/>
     </property>
 
     <property name="IsStatusNotifierHostRegistered" type="b" access="read"/>
diff --git a/kdeui/shortcuts/org.kde.KGlobalAccel.xml b/kdeui/shortcuts/org.kde.KGlobalAccel.xml
index 87465511..45e0af77 100644
--- a/kdeui/shortcuts/org.kde.KGlobalAccel.xml
+++ b/kdeui/shortcuts/org.kde.KGlobalAccel.xml
@@ -5,18 +5,18 @@
     <signal name="yourShortcutGotChanged">
       <arg name="actionId" type="as" direction="out"/>
       <arg name="newKeys" type="ai" direction="out"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="QList&lt;int&gt;"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QList&lt;int&gt;"/>
     </signal>
     <method name="allComponents">
       <arg type="ao" direction="out"/>
     </method>
     <method name="allMainComponents">
       <arg type="aas" direction="out"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QList&lt;QStringList&gt;"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QList&lt;QStringList&gt;"/>
     </method>
     <method name="allActionsForComponent">
       <arg type="aas" direction="out"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QList&lt;QStringList&gt;"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QList&lt;QStringList&gt;"/>
       <arg name="actionId" type="as" direction="in"/>
     </method>
     <method name="action">
@@ -29,26 +29,26 @@
     </method>
     <method name="shortcut">
       <arg type="ai" direction="out"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QList&lt;int&gt;"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QList&lt;int&gt;"/>
       <arg name="actionId" type="as" direction="in"/>
     </method>
     <method name="defaultShortcut">
       <arg type="ai" direction="out"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QList&lt;int&gt;"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QList&lt;int&gt;"/>
       <arg name="actionId" type="as" direction="in"/>
     </method>
     <method name="setShortcut">
       <arg type="ai" direction="out"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QList&lt;int&gt;"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QList&lt;int&gt;"/>
       <arg name="actionId" type="as" direction="in"/>
       <arg name="keys" type="ai" direction="in"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="QList&lt;int&gt;"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QList&lt;int&gt;"/>
       <arg name="flags" type="u" direction="in"/>
     </method>
     <method name="setForeignShortcut">
       <arg name="actionId" type="as" direction="in"/>
       <arg name="keys" type="ai" direction="in"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="QList&lt;int&gt;"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QList&lt;int&gt;"/>
     </method>
     <method name="setInactive">
       <arg name="actionId" type="as" direction="in"/>
@@ -65,7 +65,7 @@
     </method>
     <method name="getGlobalShortcutsByKey">
       <arg type="a(ssssssaiai)" direction="out"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QList&lt;KGlobalShortcutInfo&gt;"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QList&lt;KGlobalShortcutInfo&gt;"/>
       <arg name="key" type="i" direction="in"/>
     </method>
     <method name="isGlobalShortcutAvailable">
diff --git a/kdeui/shortcuts/org.kde.kglobalaccel.Component.xml b/kdeui/shortcuts/org.kde.kglobalaccel.Component.xml
index ec21201c..5a172cc8 100644
--- a/kdeui/shortcuts/org.kde.kglobalaccel.Component.xml
+++ b/kdeui/shortcuts/org.kde.kglobalaccel.Component.xml
@@ -24,12 +24,12 @@
     </method>
     <method name="allShortcutInfos">
       <arg type="a(ssssssaiai)" direction="out"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QList&lt;KGlobalShortcutInfo&gt;"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QList&lt;KGlobalShortcutInfo&gt;"/>
       <arg name="context" type="s" direction="in"/>
     </method>
     <method name="allShortcutInfos">
       <arg type="a(ssssssaiai)" direction="out"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QList&lt;KGlobalShortcutInfo&gt;"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QList&lt;KGlobalShortcutInfo&gt;"/>
     </method>
     <method name="getShortcutContexts">
       <arg type="as" direction="out"/>
diff --git a/kdeui/util/org.kde.KWallet.xml b/kdeui/util/org.kde.KWallet.xml
index 548c2f82..ec4bd6e9 100644
--- a/kdeui/util/org.kde.KWallet.xml
+++ b/kdeui/util/org.kde.KWallet.xml
@@ -156,7 +156,7 @@
     </method>
     <method name="readEntryList">
       <arg type="a{sv}" direction="out"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
       <arg name="handle" type="i" direction="in"/>
       <arg name="folder" type="s" direction="in"/>
       <arg name="key" type="s" direction="in"/>
@@ -164,7 +164,7 @@
     </method>
     <method name="readMapList">
       <arg type="a{sv}" direction="out"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
       <arg name="handle" type="i" direction="in"/>
       <arg name="folder" type="s" direction="in"/>
       <arg name="key" type="s" direction="in"/>
@@ -172,7 +172,7 @@
     </method>
     <method name="readPasswordList">
       <arg type="a{sv}" direction="out"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
       <arg name="handle" type="i" direction="in"/>
       <arg name="folder" type="s" direction="in"/>
       <arg name="key" type="s" direction="in"/>
diff --git a/kio/kio/org.kde.KPasswdServer.xml b/kio/kio/org.kde.KPasswdServer.xml
index fbb590ec..c2c6bc1e 100644
--- a/kio/kio/org.kde.KPasswdServer.xml
+++ b/kio/kio/org.kde.KPasswdServer.xml
@@ -5,13 +5,13 @@
       <arg type="x" name="requestId" />
       <arg type="x" name="seqNr" />
       <arg type="(ysssssssssbbbba{s(siv)})" name="info" />
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In2" value="KIO::AuthInfo" />
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In2" value="KIO::AuthInfo" />
     </signal>
     <signal name="queryAuthInfoAsyncResult" >
       <arg type="x" name="requestId" />
       <arg type="x" name="seqNr" />
       <arg type="(ysssssssssbbbba{s(siv)})" name="info" />
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In2" value="KIO::AuthInfo" />
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In2" value="KIO::AuthInfo" />
     </signal>
     <method name="checkAuthInfo" >
       <arg direction="out" type="ay" />
@@ -30,14 +30,14 @@
     <method name="checkAuthInfoAsync" >
       <arg direction="out" type="x" />
       <arg direction="in" type="(ysssssssssbbbba{s(siv)})" name="info" />
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="KIO::AuthInfo" />
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="KIO::AuthInfo" />
       <arg direction="in" type="x" name="windowId" />
       <arg direction="in" type="x" name="usertime" />
     </method>
     <method name="queryAuthInfoAsync" >
       <arg direction="out" type="x" />
       <arg direction="in" type="(ysssssssssbbbba{s(siv)})" name="info" />
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="KIO::AuthInfo" />
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="KIO::AuthInfo" />
       <arg direction="in" type="s" name="errorMsg" />
       <arg direction="in" type="x" name="windowId" />
       <arg direction="in" type="x" name="seqNr" />
@@ -49,7 +49,7 @@
     </method>
     <method name="addAuthInfo" >
       <arg direction="in" type="(ysssssssssbbbba{s(siv)})" name="info" />
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="KIO::AuthInfo" />
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="KIO::AuthInfo" />
       <arg direction="in" type="x" name="windowId" />
     </method>
     <method name="removeAuthInfo" >
diff --git a/kio/kio/org.kde.kuiserver.xml b/kio/kio/org.kde.kuiserver.xml
index 75ad12f9..a4996cbf 100644
--- a/kio/kio/org.kde.kuiserver.xml
+++ b/kio/kio/org.kde.kuiserver.xml
@@ -17,7 +17,7 @@
 
 <signal name="jobUrlsChanged">
     <arg type="as" direction="out"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QList&lt;QString&gt;"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QList&lt;QString&gt;"/>
 </signal>
 
   </interface>
diff --git a/solid/solid/backends/udisks2/dbus/manager.xml b/solid/solid/backends/udisks2/dbus/manager.xml
index 8f25cb68..910680f7 100644
--- a/solid/solid/backends/udisks2/dbus/manager.xml
+++ b/solid/solid/backends/udisks2/dbus/manager.xml
@@ -4,13 +4,13 @@
   <interface name="org.freedesktop.DBus.ObjectManager">
     <method name="GetManagedObjects">
       <arg type="a{oa{sa{sv}}}" name="object_paths_interfaces_and_properties" direction="out">
-        <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="DBUSManagerStruct"/>
+        <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="DBUSManagerStruct"/>
       </arg>
     </method>
     <signal name="InterfacesAdded">
       <arg type="o" name="object_path"/>
       <arg type="a{sa{sv}}" name="interfaces_and_properties">
-        <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="QVariantMapMap"/>
+        <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantMapMap"/>
       </arg>
     </signal>
     <signal name="InterfacesRemoved">