diff --git a/gtk/a11y/atspi/Accessible.xml b/gtk/a11y/atspi/Accessible.xml
index a274cdb902..b081bfdb4d 100644
--- a/gtk/a11y/atspi/Accessible.xml
+++ b/gtk/a11y/atspi/Accessible.xml
@@ -7,7 +7,7 @@
   <property name="Description" type="s" access="read"/>
 
   <property name="Parent" type="(so)" access="read">
-    <annotation name="com.trolltech.QtDBus.QtTypeName" value="QSpiObjectReference"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName" value="QSpiObjectReference"/>
   </property>
 
   <property name="ChildCount" type="i" access="read"/>
@@ -19,12 +19,12 @@
   <method name="GetChildAtIndex">
     <arg direction="in" name="index" type="i"/>
     <arg direction="out" type="(so)"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiObjectReference"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QSpiObjectReference"/>
   </method>
 
   <method name="GetChildren">
     <arg direction="out" type="a(so)"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiObjectReferenceArray"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QSpiObjectReferenceArray"/>
   </method>
 
   <method name="GetIndexInParent">
@@ -33,7 +33,7 @@
 
   <method name="GetRelationSet">
     <arg direction="out" type="a(ua(so))"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiRelationArray"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QSpiRelationArray"/>
   </method>
 
   <method name="GetRole">
@@ -50,17 +50,17 @@
 
   <method name="GetState">
     <arg direction="out" type="au"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiIntList"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QSpiIntList"/>
   </method>
 
   <method name="GetAttributes">
     <arg direction="out" type="a{ss}"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiAttributeSet"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QSpiAttributeSet"/>
   </method>
 
   <method name="GetApplication">
     <arg direction="out" type="(so)"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiObjectReference"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QSpiObjectReference"/>
   </method>
 
   <method name="GetInterfaces">
diff --git a/gtk/a11y/atspi/Action.xml b/gtk/a11y/atspi/Action.xml
index 0f5aa850bd..16267008c7 100644
--- a/gtk/a11y/atspi/Action.xml
+++ b/gtk/a11y/atspi/Action.xml
@@ -26,7 +26,7 @@
 
   <method name="GetActions">
     <arg direction="out" type="a(sss)"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiActionArray"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QSpiActionArray"/>
   </method>
 
   <method name="DoAction">
diff --git a/gtk/a11y/atspi/Cache.xml b/gtk/a11y/atspi/Cache.xml
index e693b54cdb..ce06ba472b 100644
--- a/gtk/a11y/atspi/Cache.xml
+++ b/gtk/a11y/atspi/Cache.xml
@@ -3,18 +3,18 @@
 <interface name="org.a11y.atspi.Cache">
 
   <method name="GetItems">
-    <arg name="nodes" type="a((so)(so)iiassusau)" direction="out"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiAccessibleCacheArray"/>
+    <arg direction="out" name="nodes" type="a((so)(so)iiassusau)"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QSpiAccessibleCacheArray"/>
   </method>
 
   <signal name="AddAccessible">
-    <arg name="nodeAdded" type="((so)(so)iiassusau)"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiAccessibleCacheItem"/>
+    <arg direction="in" name="nodeAdded" type="((so)(so)iiassusau)"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiAccessibleCacheItem"/>
   </signal>
 
   <signal name="RemoveAccessible">
-    <arg name="nodeRemoved" type="(so)"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiObjectReference"/>
+    <arg direction="in" name="nodeRemoved" type="(so)"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiObjectReference"/>
   </signal>
 
 </interface>
diff --git a/gtk/a11y/atspi/Collection.xml b/gtk/a11y/atspi/Collection.xml
index 7b39776a0a..a6dff74afd 100644
--- a/gtk/a11y/atspi/Collection.xml
+++ b/gtk/a11y/atspi/Collection.xml
@@ -4,44 +4,44 @@
 
   <method name="GetMatches">
     <arg direction="in" name="rule" type="(auuasuauusub)"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="QSpiMatchRule"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiMatchRule"/>
     <arg direction="in" name="sortby" type="u"/>
     <arg direction="in" name="count" type="i"/>
     <arg direction="in" name="traverse" type="b"/>
     <arg direction="out" type="a(so)"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiReferenceSet"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QSpiReferenceSet"/>
   </method>
 
   <method name="GetMatchesTo">
     <arg direction="in" name="current_object" type="o"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiObjectReference"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiObjectReference"/>
     <arg direction="in" name="rule" type="(auuasuauusub)"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="QSpiMatchRule"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QSpiMatchRule"/>
     <arg direction="in" name="sortby" type="u"/>
     <arg direction="in" name="tree" type="u"/>
     <arg direction="in" name="limit_scope" type="b"/>
     <arg direction="in" name="count" type="i"/>
     <arg direction="in" name="traverse" type="b"/>
     <arg direction="out" type="a(so)"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiReferenceSet"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QSpiReferenceSet"/>
   </method>
 
   <method name="GetMatchesFrom">
     <arg direction="in" name="current_object" type="o"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiObjectReference"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiObjectReference"/>
     <arg direction="in" name="rule" type="(auuasuauusub)"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="QSpiMatchRule"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QSpiMatchRule"/>
     <arg direction="in" name="sortby" type="u"/>
     <arg direction="in" name="tree" type="u"/>
     <arg direction="in" name="count" type="i"/>
     <arg direction="in" name="traverse" type="b"/>
     <arg direction="out" type="a(so)"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiReferenceSet"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QSpiReferenceSet"/>
   </method>
 
   <method name="GetActiveDescendant">
     <arg direction="out" type="(so)"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiReferenceSet"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QSpiReferenceSet"/>
   </method>
 
 </interface>
diff --git a/gtk/a11y/atspi/Component.xml b/gtk/a11y/atspi/Component.xml
index c1258d27c6..94056ff9bb 100644
--- a/gtk/a11y/atspi/Component.xml
+++ b/gtk/a11y/atspi/Component.xml
@@ -14,13 +14,13 @@
     <arg direction="in" name="y" type="i"/>
     <arg direction="in" name="coord_type" type="u"/>
     <arg direction="out" type="(so)"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiObjectReference"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QSpiObjectReference"/>
   </method>
 
   <method name="GetExtents">
     <arg direction="in" name="coord_type" type="u"/>
     <arg direction="out" type="(iiii)"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiRect"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QSpiRect"/>
   </method>
 
   <method name="GetPosition">
diff --git a/gtk/a11y/atspi/DeviceEventController.xml b/gtk/a11y/atspi/DeviceEventController.xml
index 0af9aac27f..460e79a53a 100644
--- a/gtk/a11y/atspi/DeviceEventController.xml
+++ b/gtk/a11y/atspi/DeviceEventController.xml
@@ -4,24 +4,20 @@
 
   <method name="RegisterKeystrokeListener">
     <arg direction="in" name="listener" type="o"/>
-    <arg direction="in" name="keys" type="a(iisi)">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="QSpiKeyTypeArray"/>
-    </arg>
+    <arg direction="in" name="keys" type="a(iisi)"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QSpiKeyTypeArray"/>
     <arg direction="in" name="mask" type="u"/>
-    <arg direction="in" name="type" type="au">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In3" value="QSpiEventTypeArray"/>
-    </arg>
-    <arg direction="in" name="mode" type="(bbb)">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In4" value="QSpiEventMode"/>
-    </arg>
+    <arg direction="in" name="type" type="au"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.In3" value="QSpiEventTypeArray"/>
+    <arg direction="in" name="mode" type="(bbb)"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.In4" value="QSpiEventMode"/>
     <arg direction="out" type="b"/>
   </method>
 
   <method name="DeregisterKeystrokeListener">
     <arg direction="in" name="listener" type="o"/>
-    <arg direction="in" name="keys" type="a(iisi)">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="QSpiKeyTypeArray"/>
-    </arg>
+    <arg direction="in" name="keys" type="a(iisi)"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QSpiKeyTypeArray"/>
     <arg direction="in" name="mask" type="u"/>
     <arg direction="in" name="type" type="u"/>
   </method>
@@ -52,12 +48,12 @@
   <method name="NotifyListenersSync">
     <arg direction="in" name="event" type="(uiuuisb)"/>
     <arg direction="out" type="b"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiDeviceEvent"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiDeviceEvent"/>
   </method>
 
   <method name="NotifyListenersAsync">
     <arg direction="in" name="event" type="(uiuuisb)"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiDeviceEvent"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiDeviceEvent"/>
   </method>
 
 </interface>
diff --git a/gtk/a11y/atspi/DeviceEventListener.xml b/gtk/a11y/atspi/DeviceEventListener.xml
index a6dd3b60c8..2c72973065 100644
--- a/gtk/a11y/atspi/DeviceEventListener.xml
+++ b/gtk/a11y/atspi/DeviceEventListener.xml
@@ -4,7 +4,7 @@
 
   <method name="NotifyEvent">
     <arg direction="in" name="event" type="(uiuuisb)"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiDeviceEvent"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiDeviceEvent"/>
     <arg direction="out" type="b"/>
   </method>
 
diff --git a/gtk/a11y/atspi/Document.xml b/gtk/a11y/atspi/Document.xml
index d12a3060ca..a82eb9861e 100644
--- a/gtk/a11y/atspi/Document.xml
+++ b/gtk/a11y/atspi/Document.xml
@@ -17,7 +17,7 @@
 
   <method name="GetAttributes">
     <arg direction="out" type="{ss}"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiAttrubutes"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QSpiAttributeSet"/>
   </method>
 
 </interface>
diff --git a/gtk/a11y/atspi/Event.xml b/gtk/a11y/atspi/Event.xml
index fac67deb05..361435883e 100644
--- a/gtk/a11y/atspi/Event.xml
+++ b/gtk/a11y/atspi/Event.xml
@@ -3,190 +3,190 @@
 
 <interface name="org.a11y.atspi.Event.Object">
 	<signal name="PropertyChange"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="BoundsChanged"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="LinkSelected"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="StateChanged"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="ChildrenChanged"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="VisibleDataChanged"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="SelectionChanged"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="ModelChanged"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="ActiveDescendantChanged"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="RowInserted"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="RowReordered"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="RowDeleted"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="ColumnInserted"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="ColumnReordered"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="ColumnDeleted"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="TextBoundsChanged"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="TextSelectionChanged"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="TextChanged"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="TextAttributesChanged"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="TextCaretMoved"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="AttributesChanged"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 </interface>
 
 <interface name="org.a11y.atspi.Event.Window">
 	<signal name="PropertyChange"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="Minimize"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="Maximize"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="Restore"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="Close"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="Create"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="Reparent"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="DesktopCreate"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="DesktopDestroy"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="Destroy"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="Activate"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="Deactivate"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="Raise"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="Lower"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="Move"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="Resize"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="Shade"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="uUshade"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="Restyle"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 </interface>
 
 <interface name="org.a11y.atspi.Event.Mouse">
 	<signal name="Abs"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="Rel"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="Button"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 </interface>
 
 <interface name="org.a11y.atspi.Event.Keyboard">
 	<signal name="Modifiers"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 </interface>
 
 <interface name="org.a11y.atspi.Event.Terminal">
 	<signal name="LineChanged"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="ColumncountChanged"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="LinecountChanged"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="ApplicationChanged"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="CharwidthChanged"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 </interface>
 
 <interface name="org.a11y.atspi.Event.Document">
 	<signal name="LoadComplete"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="Reload"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="LoadStopped"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="ContentChanged"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="AttributesChanged"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 	<signal name="PageChanged"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 </interface>
 
 <interface name="org.a11y.atspi.Event.Focus">
 	<signal name="Focus"><arg direction="in" type="(suuv)"/>
-          <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
         </signal>
 </interface>
 
diff --git a/gtk/a11y/atspi/Hyperlink.xml b/gtk/a11y/atspi/Hyperlink.xml
index 75f809931f..80d5777dc7 100644
--- a/gtk/a11y/atspi/Hyperlink.xml
+++ b/gtk/a11y/atspi/Hyperlink.xml
@@ -11,7 +11,7 @@
   <method name="GetObject">
     <arg direction="in" name="i" type="i"/>
     <arg direction="out" type="(so)"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiObjectReference"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QSpiObjectReference"/>
   </method>
 
   <method name="GetURI">
diff --git a/gtk/a11y/atspi/Hypertext.xml b/gtk/a11y/atspi/Hypertext.xml
index 18a3b342a8..79b52776ed 100644
--- a/gtk/a11y/atspi/Hypertext.xml
+++ b/gtk/a11y/atspi/Hypertext.xml
@@ -9,7 +9,7 @@
   <method name="GetLink">
     <arg direction="in" name="linkIndex" type="i"/>
     <arg direction="out" type="(so)"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiObjectReference"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QSpiObjectReference"/>
   </method>
 
   <method name="GetLinkIndex">
diff --git a/gtk/a11y/atspi/Image.xml b/gtk/a11y/atspi/Image.xml
index 43536ee956..1dd72f196e 100644
--- a/gtk/a11y/atspi/Image.xml
+++ b/gtk/a11y/atspi/Image.xml
@@ -9,7 +9,7 @@
   <method name="GetImageExtents">
     <arg direction="in" name="coordType" type="u"/>
     <arg direction="out" type="(iiii)"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiRect"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QSpiRect"/>
   </method>
 
   <method name="GetImagePosition">
diff --git a/gtk/a11y/atspi/Registry.xml b/gtk/a11y/atspi/Registry.xml
index a3ab93c3c2..760332857b 100644
--- a/gtk/a11y/atspi/Registry.xml
+++ b/gtk/a11y/atspi/Registry.xml
@@ -13,8 +13,8 @@
   </method>
 
   <method name="GetRegisteredEvents">
-    <arg direction="out" name="events" type="a(ss)">
-    </arg>
+    <arg direction="out" name="events" type="a(ss)"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QSpiEventListenerArray"/>
   </method>
 
   <signal name="EventListenerRegistered">
diff --git a/gtk/a11y/atspi/Selection.xml b/gtk/a11y/atspi/Selection.xml
index 2e1918757a..7b0ad214ce 100644
--- a/gtk/a11y/atspi/Selection.xml
+++ b/gtk/a11y/atspi/Selection.xml
@@ -7,7 +7,7 @@
   <method name="GetSelectedChild">
     <arg direction="in" name="selectedChildIndex" type="i"/>
     <arg direction="out" type="(so)"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiObjectReference"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QSpiObjectReference"/>
   </method>
 
   <method name="SelectChild">
diff --git a/gtk/a11y/atspi/Socket.xml b/gtk/a11y/atspi/Socket.xml
index 8da9948833..f9ac76d2c8 100644
--- a/gtk/a11y/atspi/Socket.xml
+++ b/gtk/a11y/atspi/Socket.xml
@@ -3,24 +3,20 @@
 <interface name="org.a11y.atspi.Socket">
 
   <method name="Embed">
-    <arg direction="in" name="plug" type="(so)">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiObjectReference"/>
-    </arg>
-    <arg direction="out" name="socket" type="(so)">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiObjectReference"/>
-    </arg>
+    <arg direction="in" name="plug" type="(so)"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiObjectReference"/>
+    <arg direction="out" name="socket" type="(so)"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QSpiObjectReference"/>
   </method>
 
   <method name="Unembed">
-    <arg direction="in" name="plug" type="(so)">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiObjectReference"/>
-    </arg>
+    <arg direction="in" name="plug" type="(so)"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiObjectReference"/>
   </method>
 
   <signal name="Available">
-    <arg direction="in" name="socket" type="(so)">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="QSpiObjectReference"/>
-    </arg>
+    <arg direction="in" name="socket" type="(so)"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiObjectReference"/>
   </signal>
 
 </interface>
diff --git a/gtk/a11y/atspi/Table.xml b/gtk/a11y/atspi/Table.xml
index 181acaa6af..3b3598910e 100644
--- a/gtk/a11y/atspi/Table.xml
+++ b/gtk/a11y/atspi/Table.xml
@@ -7,11 +7,11 @@
   <property name="NColumns" type="i" access="read"/>
 
   <property name="Caption" type="(so)" access="read">
-    <annotation name="com.trolltech.QtDBus.QtTypeName" value="QSpiObjectReference"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName" value="QSpiObjectReference"/>
   </property>
 
   <property name="Summary" type="(so)" access="read">
-    <annotation name="com.trolltech.QtDBus.QtTypeName" value="QSpiObjectReference"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName" value="QSpiObjectReference"/>
   </property>
 
   <property name="NSelectedRows" type="i" access="read"/>
@@ -22,7 +22,7 @@
     <arg direction="in" name="row" type="i"/>
     <arg direction="in" name="column" type="i"/>
     <arg direction="out" type="(so)"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiObjectReference"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QSpiObjectReference"/>
   </method>
 
   <method name="GetIndexAt">
@@ -66,23 +66,23 @@
   <method name="GetRowHeader">
     <arg direction="in" name="row" type="i"/>
     <arg direction="out" type="(so)"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiObjectReference"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QSpiObjectReference"/>
   </method>
 
   <method name="GetColumnHeader">
     <arg direction="in" name="column" type="i"/>
     <arg direction="out" type="(so)"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiObjectReference"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QSpiObjectReference"/>
   </method>
 
   <method name="GetSelectedRows">
     <arg direction="out" type="ai"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiIntList"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QSpiIntList"/>
   </method>
 
   <method name="GetSelectedColumns">
     <arg direction="out" type="ai"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiIntList"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QSpiIntList"/>
   </method>
 
   <method name="IsRowSelected">
diff --git a/gtk/a11y/atspi/TableCell.xml b/gtk/a11y/atspi/TableCell.xml
index c60a074fd4..2b647a6d2c 100644
--- a/gtk/a11y/atspi/TableCell.xml
+++ b/gtk/a11y/atspi/TableCell.xml
@@ -4,11 +4,15 @@
 
   <property access="read" name="ColumnSpan" type="i" />
 
-  <property access="read" name="Position" type="(ii)" />
+  <property access="read" name="Position" type="(ii)">
+    <annotation name="org.qtproject.QtDBus.QtTypeName" value="QPoint"/>
+  </property>
 
   <property access="read" name="RowSpan" type="i" />
 
-  <property access="read" name="Table" type="(so)" />
+  <property access="read" name="Table" type="(so)">
+    <annotation name="org.qtproject.QtDBus.QtTypeName" value="QSpiObjectReference"/>
+  </property>
 
   <method name="GetRowColumnSpan">
     <arg direction="out" type="b" />
diff --git a/gtk/a11y/atspi/Text.xml b/gtk/a11y/atspi/Text.xml
index 313131e6f8..fe9f44b796 100644
--- a/gtk/a11y/atspi/Text.xml
+++ b/gtk/a11y/atspi/Text.xml
@@ -65,12 +65,12 @@
     <arg direction="out" type="a{ss}"/>
     <arg direction="out" name="startOffset" type="i"/>
     <arg direction="out" name="endOffset" type="i"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiAttributeSet"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QSpiAttributeSet"/>
   </method>
 
   <method name="GetDefaultAttributes">
     <arg direction="out" type="a{ss}"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiAttributeSet"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QSpiAttributeSet"/>
   </method>
 
   <method name="GetCharacterExtents">
@@ -136,7 +136,7 @@
     <arg direction="in" name="xClipType" type="u"/>
     <arg direction="in" name="yClipType" type="u"/>
     <arg direction="out" type="a(iisv)"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiRangeList"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QSpiRangeList"/>
   </method>
 
   <method name="GetAttributeRun">
@@ -145,11 +145,12 @@
     <arg direction="out" type="a{ss}"/>
     <arg direction="out" name="startOffset" type="i"/>
     <arg direction="out" name="endOffset" type="i"/>
-    <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="QSpiAttributeSet"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QSpiAttributeSet"/>
   </method>
 
   <method name="GetDefaultAttributeSet">
     <arg direction="out" type="a{ss}"/>
+    <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QSpiAttributeSet"/>
   </method>
 
   <method name="ScrollSubstringTo">