diff --git a/kcontrol/kfontinst/dbus/org.kde.fontinst.xml b/kcontrol/kfontinst/dbus/org.kde.fontinst.xml
index 8319cd51..5c731977 100644
--- a/kcontrol/kfontinst/dbus/org.kde.fontinst.xml
+++ b/kcontrol/kfontinst/dbus/org.kde.fontinst.xml
@@ -4,8 +4,8 @@
     <signal name="fontList">
       <arg name="pid" type="i" direction="out"/>
       <arg name="families" type="a(ba(sa(utba(ssi))))" direction="out"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out1" value="const QList&lt;KFI::Families&gt; &amp;"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="const QList&lt;KFI::Families&gt; &amp;"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out1" value="const QList&lt;KFI::Families&gt; &amp;"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="const QList&lt;KFI::Families&gt; &amp;"/>
     </signal>
     <signal name="status">
       <arg name="pid" type="i" direction="out"/>
@@ -14,29 +14,29 @@
     <signal name="fontStat">
       <arg name="pid" type="i" direction="out"/>
       <arg name="family" type="(sa(utba(ssi)))" direction="out"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out1" value="const KFI::Family &amp;"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="const KFI::Family &amp;"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out1" value="const KFI::Family &amp;"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="const KFI::Family &amp;"/>
     </signal>
     <signal name="fontsAdded">
       <arg name="families" type="(ba(sa(utba(ssi))))" direction="out"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="const KFI::Families &amp;"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="const KFI::Families &amp;"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="const KFI::Families &amp;"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="const KFI::Families &amp;"/>
     </signal>
     <signal name="fontsRemoved">
       <arg name="families" type="(ba(sa(utba(ssi))))" direction="out"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="const KFI::Families &amp;"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="const KFI::Families &amp;"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="const KFI::Families &amp;"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="const KFI::Families &amp;"/>
     </signal>
     <method name="list">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QList&lt;KFI::Families&gt;"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QList&lt;KFI::Families&gt;"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QList&lt;KFI::Families&gt;"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QList&lt;KFI::Families&gt;"/>
       <arg name="folders" type="i" direction="in"/>
       <arg name="pid" type="i" direction="in"/>
       <annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
     </method>
     <method name="stat">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="KFI::Family"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="KFI::Family"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="KFI::Family"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="KFI::Family"/>
       <arg name="name" type="s" direction="in"/>
       <arg name="folders" type="i" direction="in"/>
       <arg name="pid" type="i" direction="in"/>
diff --git a/kpasswdserver/org.kde.KPasswdServer.xml b/kpasswdserver/org.kde.KPasswdServer.xml
index fbb590ec..c2c6bc1e 100644
--- a/kpasswdserver/org.kde.KPasswdServer.xml
+++ b/kpasswdserver/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/kuiserver/org.kde.kuiserver.xml b/kuiserver/org.kde.kuiserver.xml
index 7d465bc4..aaa4c455 100644
--- a/kuiserver/org.kde.kuiserver.xml
+++ b/kuiserver/org.kde.kuiserver.xml
@@ -21,7 +21,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/kwin/org.kde.KWin.xml b/kwin/org.kde.KWin.xml
index 68053a8e..defb3a7c 100644
--- a/kwin/org.kde.KWin.xml
+++ b/kwin/org.kde.KWin.xml
@@ -71,7 +71,7 @@
 <!-- @deprecated, @todo remove KDE5     -->
     <method name="decorationSupportedColors">
       <arg type="ai" direction="out"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QList&lt;int>"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QList&lt;int>"/>
     </method>
     <method name="stopActivity">
       <arg type="s" direction="in"/>
diff --git a/plasma/generic/dataengines/activities/org.kde.ActivityManager.ActivityRanking.xml b/plasma/generic/dataengines/activities/org.kde.ActivityManager.ActivityRanking.xml
index 11374014..7eacc8be 100644
--- a/plasma/generic/dataengines/activities/org.kde.ActivityManager.ActivityRanking.xml
+++ b/plasma/generic/dataengines/activities/org.kde.ActivityManager.ActivityRanking.xml
@@ -8,7 +8,7 @@
 
       <method name="activities">
           <arg type="a(sd)" direction="out" />
-          <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="ActivityDataList" />
+          <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="ActivityDataList" />
       </method>
 
       <method name="test">
@@ -17,7 +17,7 @@
       <signal name="rankingChanged">
           <arg name="topActivities" type="as" direction="out" />
           <arg name="activities" type="a(sd)" direction="out" />
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="ActivityDataList" />
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="ActivityDataList" />
       </signal>
 
   </interface>
diff --git a/plasma/generic/dataengines/notifications/org.freedesktop.Notifications.xml b/plasma/generic/dataengines/notifications/org.freedesktop.Notifications.xml
index 8ddb421c..62345f2b 100644
--- a/plasma/generic/dataengines/notifications/org.freedesktop.Notifications.xml
+++ b/plasma/generic/dataengines/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/plasma/generic/dataengines/nowplaying/playerinterface/mpris/org.freedesktop.MediaPlayer.player.xml b/plasma/generic/dataengines/nowplaying/playerinterface/mpris/org.freedesktop.MediaPlayer.player.xml
index 302c3830..f0da808a 100644
--- a/plasma/generic/dataengines/nowplaying/playerinterface/mpris/org.freedesktop.MediaPlayer.player.xml
+++ b/plasma/generic/dataengines/nowplaying/playerinterface/mpris/org.freedesktop.MediaPlayer.player.xml
@@ -26,12 +26,12 @@
 
     <method name="GetStatus">
         <arg type="(iiii)" direction="out"/>
-        <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MprisDBusStatus" />
+        <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="MprisDBusStatus" />
     </method>
 
     <method name="GetMetadata">
         <arg type="a{sv}" direction="out"/>
-        <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
+        <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
     </method>
 
     <method name="GetCaps">
@@ -56,12 +56,12 @@
 
     <signal name="TrackChange">
         <arg type="a{sv}"/>
-        <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QVariantMap"/>
+        <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QVariantMap"/>
     </signal>
 
     <signal name="StatusChange">
         <arg type="(iiii)"/>
-        <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MprisDBusStatus"/>
+        <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="MprisDBusStatus"/>
     </signal>
 
     <signal name="CapsChange">
diff --git a/plasma/generic/dataengines/nowplaying/playerinterface/mpris/org.freedesktop.MediaPlayer.root.xml b/plasma/generic/dataengines/nowplaying/playerinterface/mpris/org.freedesktop.MediaPlayer.root.xml
index aa93e4bd..6448a1b8 100644
--- a/plasma/generic/dataengines/nowplaying/playerinterface/mpris/org.freedesktop.MediaPlayer.root.xml
+++ b/plasma/generic/dataengines/nowplaying/playerinterface/mpris/org.freedesktop.MediaPlayer.root.xml
@@ -13,7 +13,7 @@
 
         <method name="MprisVersion">
             <arg type="(qq)" direction="out"/>
-            <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MprisDBusVersion"/>
+            <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="MprisDBusVersion"/>
         </method>
     </interface>
 </node>
diff --git a/plasma/generic/dataengines/nowplaying/playerinterface/mpris/org.freedesktop.MediaPlayer.tracklist.xml b/plasma/generic/dataengines/nowplaying/playerinterface/mpris/org.freedesktop.MediaPlayer.tracklist.xml
index e8cb127b..fe0c8b1d 100644
--- a/plasma/generic/dataengines/nowplaying/playerinterface/mpris/org.freedesktop.MediaPlayer.tracklist.xml
+++ b/plasma/generic/dataengines/nowplaying/playerinterface/mpris/org.freedesktop.MediaPlayer.tracklist.xml
@@ -7,7 +7,7 @@
     <method name="GetMetadata">
         <arg type="i" direction="in" />
         <arg type="a{sv}" direction="out" />
-        <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
+        <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantMap"/>
     </method>
 
     <method name="GetCurrentTrack">
diff --git a/powerdevil/daemon/org.kde.Solid.PowerManagement.xml b/powerdevil/daemon/org.kde.Solid.PowerManagement.xml
index e097dfce..6977bd04 100644
--- a/powerdevil/daemon/org.kde.Solid.PowerManagement.xml
+++ b/powerdevil/daemon/org.kde.Solid.PowerManagement.xml
@@ -27,7 +27,7 @@
 
     <!--<method name="getSupportedSuspendMethods">
       <arg type="a{sv}" direction="out" />
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QVariantMap" />
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QVariantMap" />
     </method>-->
 
     <!--<signal name="DPMSconfigUpdated">