diff --git a/docs/reference/api/Makefile.am b/docs/reference/api/Makefile.am
index 0c6c3866..413bc63b 100644
--- a/docs/reference/api/Makefile.am
+++ b/docs/reference/api/Makefile.am
@@ -54,9 +54,9 @@ expand_content_files = \
 	$(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Location.xml \
 	$(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Firmware.xml \
 	$(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Contacts.xml \
-	$(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Cdma.xml \
-	$(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.3gpp.xml \
-	$(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.3gpp.Ussd.xml \
+	$(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.ModemCdma.xml \
+	$(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.xml \
+	$(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.xml \
 	$(top_builddir)/libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Simple.xml \
 	$(NULL)
 
diff --git a/docs/reference/api/mm-docs.xml b/docs/reference/api/mm-docs.xml
index 06e80565..dd8c7843 100644
--- a/docs/reference/api/mm-docs.xml
+++ b/docs/reference/api/mm-docs.xml
@@ -110,12 +110,12 @@
       </section>
       <section>
         <title>3GPP specific</title>
-        <xi:include href="../../../libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.3gpp.xml"/>
-        <xi:include href="../../../libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.3gpp.Ussd.xml"/>
+        <xi:include href="../../../libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.xml"/>
+        <xi:include href="../../../libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.xml"/>
       </section>
       <section>
         <title>CDMA specific</title>
-        <xi:include href="../../../libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Cdma.xml"/>
+        <xi:include href="../../../libmm-common/mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.ModemCdma.xml"/>
       </section>
       <section>
         <title>Other</title>
diff --git a/libmm-common/Makefile.am b/libmm-common/Makefile.am
index 9f329f40..9a78853d 100644
--- a/libmm-common/Makefile.am
+++ b/libmm-common/Makefile.am
@@ -29,9 +29,9 @@ GENERATED_DOC = \
 	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Location.xml \
 	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Firmware.xml \
 	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Contacts.xml \
-	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Cdma.xml \
-	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.3gpp.xml \
-	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.3gpp.Ussd.xml \
+	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.ModemCdma.xml \
+	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.xml \
+	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.xml \
 	mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Simple.xml
 
 # Enum types
@@ -95,9 +95,9 @@ mm_gdbus_modem_deps = \
 	$(top_srcdir)/new/org.freedesktop.ModemManager1.Modem.Location.xml \
 	$(top_srcdir)/new/org.freedesktop.ModemManager1.Modem.Firmware.xml \
 	$(top_srcdir)/new/org.freedesktop.ModemManager1.Modem.Contacts.xml \
-	$(top_srcdir)/new/org.freedesktop.ModemManager1.Modem.Cdma.xml \
-	$(top_srcdir)/new/org.freedesktop.ModemManager1.Modem.3gpp.xml \
-	$(top_srcdir)/new/org.freedesktop.ModemManager1.Modem.3gpp.Ussd.xml \
+	$(top_srcdir)/new/org.freedesktop.ModemManager1.Modem.ModemCdma.xml \
+	$(top_srcdir)/new/org.freedesktop.ModemManager1.Modem.Modem3gpp.xml \
+	$(top_srcdir)/new/org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.xml \
 	$(top_srcdir)/new/org.freedesktop.ModemManager1.Modem.Simple.xml
 $(mm_gdbus_modem_generated): $(mm_gdbus_modem_deps)
 	$(AM_V_GEN) gdbus-codegen \
@@ -106,6 +106,9 @@ $(mm_gdbus_modem_generated): $(mm_gdbus_modem_deps)
 		--generate-docbook mm-gdbus-doc \
 		--generate-c-code mm-gdbus-modem \
 		--c-generate-object-manager \
+		--annotate "org.freedesktop.ModemManager1.Modem.ModemCdma" org.gtk.GDBus.C.Name ModemCdma \
+		--annotate "org.freedesktop.ModemManager1.Modem.Modem3gpp" org.gtk.GDBus.C.Name Modem3gpp \
+		--annotate "org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd" org.gtk.GDBus.C.Name Modem3gppUssd \
 		$^ \
 		$(NULL)
 
diff --git a/new/all.xml b/new/all.xml
index c6b3e4b8..83a90c25 100644
--- a/new/all.xml
+++ b/new/all.xml
@@ -7,9 +7,9 @@
   <xi:include href="org.freedesktop.ModemManager1.Bearer.xml"/>
   <xi:include href="org.freedesktop.ModemManager1.Sms.xml"/>
   <xi:include href="org.freedesktop.ModemManager1.Modem.xml"/>
-  <xi:include href="org.freedesktop.ModemManager1.Modem.3gpp.xml"/>
-  <xi:include href="org.freedesktop.ModemManager1.Modem.3gpp.Ussd.xml"/>
-  <xi:include href="org.freedesktop.ModemManager1.Modem.Cdma.xml"/>
+  <xi:include href="org.freedesktop.ModemManager1.Modem.Modem3gpp.xml"/>
+  <xi:include href="org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.xml"/>
+  <xi:include href="org.freedesktop.ModemManager1.Modem.ModemCdma.xml"/>
   <xi:include href="org.freedesktop.ModemManager1.Modem.Messaging.xml"/>
   <xi:include href="org.freedesktop.ModemManager1.Modem.Location.xml"/>
   <xi:include href="org.freedesktop.ModemManager1.Modem.Firmware.xml"/>
diff --git a/new/org.freedesktop.ModemManager1.Modem.3gpp.Ussd.xml b/new/org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.xml
similarity index 93%
rename from new/org.freedesktop.ModemManager1.Modem.3gpp.Ussd.xml
rename to new/org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.xml
index 76d5b44e..f7159969 100644
--- a/new/org.freedesktop.ModemManager1.Modem.3gpp.Ussd.xml
+++ b/new/org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.xml
@@ -12,12 +12,12 @@
 <node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
 
   <!--
-      org.freedesktop.ModemManager1.Modem.3gpp.Ussd:
+      org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd:
       @short_description: The ModemManager 3GPP USSD interface.
 
       This interface provides access to actions based on the USSD protocol.
   -->
-  <interface name="org.freedesktop.ModemManager1.Modem.3gpp.Ussd">
+  <interface name="org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd">
 
     <!--
         Initiate:
@@ -43,7 +43,7 @@
 
         Respond to a USSD request that is either initiated by the mobile network,
         or that is awaiting further input after
-        <link linkend="gdbus-method-org-freedesktop-ModemManager1-Modem-3gpp-Ussd.Initiate">Initiate()</link>
+        <link linkend="gdbus-method-org-freedesktop-ModemManager1-Modem-Modem3gpp-Ussd.Initiate">Initiate()</link>
         was called.
     -->
     <method name="Respond">
@@ -82,7 +82,7 @@
 
         Contains any pending network-initiated request for a response. Client
         should call
-        <link linkend="gdbus-method-org-freedesktop-ModemManager1-Modem-3gpp-Ussd.Respond">Respond()</link>
+        <link linkend="gdbus-method-org-freedesktop-ModemManager1-Modem-Modem3gpp-Ussd.Respond">Respond()</link>
         with the appropriate response to this request.
 
         When no USSD session is active, or when there is no pending
diff --git a/new/org.freedesktop.ModemManager1.Modem.3gpp.xml b/new/org.freedesktop.ModemManager1.Modem.Modem3gpp.xml
similarity index 97%
rename from new/org.freedesktop.ModemManager1.Modem.3gpp.xml
rename to new/org.freedesktop.ModemManager1.Modem.Modem3gpp.xml
index e3830fb4..46d47236 100644
--- a/new/org.freedesktop.ModemManager1.Modem.3gpp.xml
+++ b/new/org.freedesktop.ModemManager1.Modem.Modem3gpp.xml
@@ -12,13 +12,13 @@
 <node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
 
   <!--
-      org.freedesktop.ModemManager1.Modem.3gpp:
+      org.freedesktop.ModemManager1.Modem.Modem3gpp:
       @short_description: The ModemManager 3GPP interface.
 
       This interface provides access to specific actions that may be performed
       in modems with 3GPP capabilities.
   -->
-  <interface name="org.freedesktop.ModemManager1.Modem.3gpp">
+  <interface name="org.freedesktop.ModemManager1.Modem.Modem3gpp">
 
     <!--
         Register:
@@ -140,4 +140,3 @@
 
   </interface>
 </node>
-
diff --git a/new/org.freedesktop.ModemManager1.Modem.Cdma.xml b/new/org.freedesktop.ModemManager1.Modem.ModemCdma.xml
similarity index 97%
rename from new/org.freedesktop.ModemManager1.Modem.Cdma.xml
rename to new/org.freedesktop.ModemManager1.Modem.ModemCdma.xml
index ebe3924b..4705704a 100644
--- a/new/org.freedesktop.ModemManager1.Modem.Cdma.xml
+++ b/new/org.freedesktop.ModemManager1.Modem.ModemCdma.xml
@@ -12,13 +12,13 @@
 <node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
 
   <!--
-      org.freedesktop.ModemManager1.Modem.Cdma:
+      org.freedesktop.ModemManager1.Modem.ModemCdma:
       @short_description: The ModemManager CDMA interface.
 
       This interface provides access to specific actions that may be performed
       in modems with CDMA capabilities.
   -->
-  <interface name="org.freedesktop.ModemManager1.Modem.Cdma">
+  <interface name="org.freedesktop.ModemManager1.Modem.ModemCdma">
 
     <!--
         Activate: