diff --git a/introspection/all.xml b/introspection/all.xml
index dd30b574..0533e14c 100644
--- a/introspection/all.xml
+++ b/introspection/all.xml
@@ -23,19 +23,19 @@
       Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p>
   </tp:license>
 
-  <xi:include href="mm-manager.xml"/>
-  <xi:include href="mm-modem.xml"/>
-  <xi:include href="mm-modem-simple.xml"/>
-  <xi:include href="mm-modem-location.xml"/>
-  <xi:include href="mm-modem-cdma.xml"/>
-  <xi:include href="mm-modem-gsm.xml"/>
-  <xi:include href="mm-modem-gsm-card.xml"/>
-  <xi:include href="mm-modem-gsm-contacts.xml"/>
-  <xi:include href="mm-modem-gsm-network.xml"/>
-  <xi:include href="mm-modem-gsm-sms.xml"/>
-  <xi:include href="mm-modem-gsm-hso.xml"/>
-  <xi:include href="mm-modem-gsm-ussd.xml"/>
-  <xi:include href="mm-properties-changed.xml"/>
+  <xi:include href="org.freedesktop.ModemManager.xml"/>
+  <xi:include href="org.freedesktop.ModemManager.Modem.xml"/>
+  <xi:include href="org.freedesktop.ModemManager.Modem.Simple.xml"/>
+  <xi:include href="org.freedesktop.ModemManager.Modem.Location.xml"/>
+  <xi:include href="org.freedesktop.ModemManager.Modem.Cdma"/>
+  <xi:include href="org.freedesktop.ModemManager.Modem.Gsm"/>
+  <xi:include href="org.freedesktop.ModemManager.Gsm.Card.xml"/>
+  <xi:include href="org.freedesktop.ModemManager.Gsm.Contacts.xml"/>
+  <xi:include href="org.freedesktop.ModemManager.Gsm.Network.xml"/>
+  <xi:include href="org.freedesktop.ModemManager.Gsm.SMS.xml"/>
+  <xi:include href="org.freedesktop.ModemManager.Gsm.Hso.xml"/>
+  <xi:include href="org.freedesktop.ModemManager.Gsm.Ussd.xml"/>
+  <xi:include href="org.freedesktop.DBus.Properties.xml"/>
 
   <xi:include href="mm-serial-error.xml"/>
   <xi:include href="mm-modem-error.xml"/>
diff --git a/introspection/mm-modem-cdma.xml b/introspection/mm-modem-cdma.xml
deleted file mode 100644
index bf91c0c9..00000000
--- a/introspection/mm-modem-cdma.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-  <interface name="org.freedesktop.ModemManager.Modem.Cdma">
-
-    <method name="GetSignalQuality">
-      <tp:docstring>
-	Get the current signal quality.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_modem_cdma_get_signal_quality"/>
-      <arg name="quality" type="u" direction="out">
-	<tp:docstring>
-	  Signal quality (percent).
-	</tp:docstring>
-      </arg>
-    </method>
-
-    <method name="GetEsn">
-      <tp:docstring>
-        Get the Electronic Serial Number of the card.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_modem_cdma_get_esn"/>
-      <arg name="esn" type="s" direction="out">
-        <tp:docstring>
-          The ESN.
-        </tp:docstring>
-      </arg>
-    </method>
-
-    <method name="GetServingSystem">
-      <tp:docstring>
-        Get the Service System details of the current network, if registered.
-      </tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_modem_cdma_get_serving_system"/>
-      <arg name="info" type="(usu)" direction="out">
-        <tp:docstring>
-          A structure containing the Band Class (0 = unknown, 1 = 800 MHz, 2 = 1900 MHz), the Band ("A" - "F" as defined by IS707-A), and the System ID of the serving network.
-        </tp:docstring>
-      </arg>
-    </method>
-
-    <signal name="SignalQuality">
-      <tp:docstring>
-	The signal quality changed.
-      </tp:docstring>
-      <arg name="quality" type="u">
-	<tp:docstring>
-	  The new quality in percent, 0..100.
-	</tp:docstring>
-      </arg>
-    </signal>
-
-    <method name="GetRegistrationState">
-      <tp:docstring>Get device registration state.</tp:docstring>
-      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_modem_cdma_get_registration_state"/>
-      <arg name="cdma_1x_state" type="u" direction="out" tp:type="MM_MODEM_CDMA_REGISTRATION_STATE">
-        <tp:docstring>CDMA 1x registration state.</tp:docstring>
-      </arg>
-      <arg name="evdo_state" type="u" direction="out" tp:type="MM_MODEM_CDMA_REGISTRATION_STATE">
-        <tp:docstring>EVDO registration state.</tp:docstring>
-      </arg>
-    </method>
-
-    <signal name="RegistrationStateChanged">
-      <tp:docstring>
-	The device registration state changed.
-      </tp:docstring>
-      <arg name="cdma-1x-state" type="u" tp:type="MM_MODEM_CDMA_REGISTRATION_STATE">
-        <tp:docstring>CDMA 1x registration state.</tp:docstring>
-      </arg>
-      <arg name="evdo-state" type="u" tp:type="MM_MODEM_CDMA_REGISTRATION_STATE">
-        <tp:docstring>EVDO registration state.</tp:docstring>
-      </arg>
-    </signal>
-
-    <tp:enum name="MM_MODEM_CDMA_REGISTRATION_STATE" type="u">
-      <tp:enumvalue suffix="UNKNOWN" value="0">
-        <tp:docstring>Registration status is unknown or the device is not registered.</tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="REGISTERED" value="1">
-        <tp:docstring>Registered, but roaming status is unknown or cannot be provided by the device.  The device may or may not be roaming.</tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="HOME" value="2">
-        <tp:docstring>Currently registered on the home network.</tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="ROAMING" value="3">
-        <tp:docstring>Currently registered on a roaming network.</tp:docstring>
-      </tp:enumvalue>
-    </tp:enum>
-
-  </interface>
-</node>
-
diff --git a/introspection/mm-properties-changed.xml b/introspection/org.freedesktop.DBus.Properties.xml
similarity index 100%
rename from introspection/mm-properties-changed.xml
rename to introspection/org.freedesktop.DBus.Properties.xml
diff --git a/introspection/mm-modem-gsm-card.xml b/introspection/org.freedesktop.ModemManager.Modem.Gsm.Card.xml
similarity index 100%
rename from introspection/mm-modem-gsm-card.xml
rename to introspection/org.freedesktop.ModemManager.Modem.Gsm.Card.xml
diff --git a/introspection/mm-modem-gsm-contacts.xml b/introspection/org.freedesktop.ModemManager.Modem.Gsm.Contacts.xml
similarity index 100%
rename from introspection/mm-modem-gsm-contacts.xml
rename to introspection/org.freedesktop.ModemManager.Modem.Gsm.Contacts.xml
diff --git a/introspection/mm-modem-gsm-hso.xml b/introspection/org.freedesktop.ModemManager.Modem.Gsm.Hso.xml
similarity index 100%
rename from introspection/mm-modem-gsm-hso.xml
rename to introspection/org.freedesktop.ModemManager.Modem.Gsm.Hso.xml
diff --git a/introspection/mm-modem-gsm-network.xml b/introspection/org.freedesktop.ModemManager.Modem.Gsm.Network.xml
similarity index 100%
rename from introspection/mm-modem-gsm-network.xml
rename to introspection/org.freedesktop.ModemManager.Modem.Gsm.Network.xml
diff --git a/introspection/mm-modem-gsm-sms.xml b/introspection/org.freedesktop.ModemManager.Modem.Gsm.SMS.xml
similarity index 100%
rename from introspection/mm-modem-gsm-sms.xml
rename to introspection/org.freedesktop.ModemManager.Modem.Gsm.SMS.xml
diff --git a/introspection/mm-modem-gsm-ussd.xml b/introspection/org.freedesktop.ModemManager.Modem.Gsm.Ussd.xml
similarity index 100%
rename from introspection/mm-modem-gsm-ussd.xml
rename to introspection/org.freedesktop.ModemManager.Modem.Gsm.Ussd.xml
diff --git a/introspection/mm-modem-gsm.xml b/introspection/org.freedesktop.ModemManager.Modem.Gsm.xml
similarity index 100%
rename from introspection/mm-modem-gsm.xml
rename to introspection/org.freedesktop.ModemManager.Modem.Gsm.xml
diff --git a/introspection/mm-modem-location.xml b/introspection/org.freedesktop.ModemManager.Modem.Location.xml
similarity index 100%
rename from introspection/mm-modem-location.xml
rename to introspection/org.freedesktop.ModemManager.Modem.Location.xml
diff --git a/introspection/mm-modem-simple.xml b/introspection/org.freedesktop.ModemManager.Modem.Simple.xml
similarity index 100%
rename from introspection/mm-modem-simple.xml
rename to introspection/org.freedesktop.ModemManager.Modem.Simple.xml
diff --git a/introspection/mm-modem.xml b/introspection/org.freedesktop.ModemManager.Modem.xml
similarity index 100%
rename from introspection/mm-modem.xml
rename to introspection/org.freedesktop.ModemManager.Modem.xml
diff --git a/introspection/mm-manager.xml b/introspection/org.freedesktop.ModemManager.xml
similarity index 100%
rename from introspection/mm-manager.xml
rename to introspection/org.freedesktop.ModemManager.xml
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 61a29c6c..9f85d54f 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -97,7 +97,7 @@ libmm_plugin_hso_la_SOURCES = \
 	mm-modem-hso.c \
 	mm-modem-hso.h
 
-mm-modem-gsm-hso-glue.h: $(top_srcdir)/introspection/mm-modem-gsm-hso.xml
+mm-modem-gsm-hso-glue.h: $(top_srcdir)/introspection/org.freedesktop.ModemManager.Modem.Gsm.Hso.xml
 	$(AM_V_GEN) dbus-binding-tool --prefix=mm_modem_gsm_hso --mode=glib-server --output=$@ $<
 
 libmm_plugin_hso_la_CPPFLAGS = \
diff --git a/src/Makefile.am b/src/Makefile.am
index 924ca261..3e656d81 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -120,31 +120,31 @@ modem_manager_SOURCES = \
 	mm-modem-location.c \
 	mm-modem-location.h
 
-mm-manager-glue.h: $(top_srcdir)/introspection/mm-manager.xml
+mm-manager-glue.h: $(top_srcdir)/introspection/org.freedesktop.ModemManager.xml
 	$(AM_V_GEN) dbus-binding-tool --prefix=mm_manager --mode=glib-server --output=$@ $<
 
-mm-modem-glue.h: $(top_srcdir)/introspection/mm-modem.xml
+mm-modem-glue.h: $(top_srcdir)/introspection/org.freedesktop.ModemManager.Modem.xml
 	$(AM_V_GEN) dbus-binding-tool --prefix=mm_modem --mode=glib-server --output=$@ $<
 
-mm-modem-simple-glue.h: $(top_srcdir)/introspection/mm-modem-simple.xml
+mm-modem-simple-glue.h: $(top_srcdir)/introspection/org.freedesktop.ModemManager.Modem.Simple.xml
 	$(AM_V_GEN) dbus-binding-tool --prefix=mm_modem_simple --mode=glib-server --output=$@ $<
 
-mm-modem-cdma-glue.h: $(top_srcdir)/introspection/mm-modem-cdma.xml
+mm-modem-cdma-glue.h: $(top_srcdir)/introspection/org.freedesktop.ModemManager.Modem.Cdma.xml
 	$(AM_V_GEN) dbus-binding-tool --prefix=mm_modem_cdma --mode=glib-server --output=$@ $<
 
-mm-modem-gsm-card-glue.h: $(top_srcdir)/introspection/mm-modem-gsm-card.xml
+mm-modem-gsm-card-glue.h: $(top_srcdir)/introspection/org.freedesktop.ModemManager.Modem.Gsm.Card.xml
 	$(AM_V_GEN) dbus-binding-tool --prefix=mm_modem_gsm_card --mode=glib-server --output=$@ $<
 
-mm-modem-gsm-network-glue.h: $(top_srcdir)/introspection/mm-modem-gsm-network.xml
+mm-modem-gsm-network-glue.h: $(top_srcdir)/introspection/org.freedesktop.ModemManager.Modem.Gsm.Network.xml
 	$(AM_V_GEN) dbus-binding-tool --prefix=mm_modem_gsm_network --mode=glib-server --output=$@ $<
 
-mm-modem-gsm-sms-glue.h: $(top_srcdir)/introspection/mm-modem-gsm-sms.xml
+mm-modem-gsm-sms-glue.h: $(top_srcdir)/introspection/org.freedesktop.ModemManager.Modem.Gsm.SMS.xml
 	$(AM_V_GEN) dbus-binding-tool --prefix=mm_modem_gsm_sms --mode=glib-server --output=$@ $<
 
-mm-modem-gsm-ussd-glue.h: $(top_srcdir)/introspection/mm-modem-gsm-ussd.xml
+mm-modem-gsm-ussd-glue.h: $(top_srcdir)/introspection/org.freedesktop.ModemManager.Modem.Gsm.Ussd.xml
 	$(AM_V_GEN) dbus-binding-tool --prefix=mm_modem_gsm_ussd --mode=glib-server --output=$@ $<
 
-mm-properties-changed-glue.h: $(top_srcdir)/introspection/mm-properties-changed.xml
+mm-properties-changed-glue.h: $(top_srcdir)/introspection/org.freedesktop.DBus.Properties.xml
 	$(AM_V_GEN) dbus-binding-tool --prefix=mm_properties_changed --mode=glib-server --output=$@ $<
 
 BUILT_SOURCES = \
@@ -158,7 +158,7 @@ BUILT_SOURCES = \
 	mm-modem-gsm-ussd-glue.h \
 	mm-properties-changed-glue.h
 
-mm-modem-location-glue.h: $(top_srcdir)/introspection/mm-modem-location.xml
+mm-modem-location-glue.h: $(top_srcdir)/introspection/org.freedesktop.ModemManager.Modem.Location.xml
 	$(AM_V_GEN) dbus-binding-tool --prefix=mm_modem_location --mode=glib-server --output=$@ $<
 
 modem_manager_SOURCES += $(loc_sources)