Don't strip ABI versions from generated code

13 files changed, 79 insertions, 79 deletions

diff --git a/examples/client/approver.c b/examples/client/approver.c
index 67ef28a22..7da0eff5d 100644
--- a/examples/client/approver.c
+++ b/examples/client/approver.c
@@ -177,7 +177,7 @@ main (int argc,
   /* file transfer */
   tp_base_client_take_approver_filter (approver, tp_asv_new (
         TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
-          TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER,
+          TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1,
         TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
           TP_HANDLE_TYPE_CONTACT,
         NULL));
diff --git a/examples/client/dbus-tubes/accepter.c b/examples/client/dbus-tubes/accepter.c
index 6d390916a..fe8362c88 100644
--- a/examples/client/dbus-tubes/accepter.c
+++ b/examples/client/dbus-tubes/accepter.c
@@ -195,13 +195,13 @@ main (int argc,
   tp_base_client_take_handler_filter (handler, tp_asv_new (
       TP_PROP_CHANNEL_CHANNEL_TYPE,
       G_TYPE_STRING,
-      TP_IFACE_CHANNEL_TYPE_DBUS_TUBE,
+      TP_IFACE_CHANNEL_TYPE_DBUS_TUBE1,
 
       TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
       G_TYPE_UINT,
       TP_HANDLE_TYPE_CONTACT,
 
-      TP_PROP_CHANNEL_TYPE_DBUS_TUBE_SERVICE_NAME,
+      TP_PROP_CHANNEL_TYPE_DBUS_TUBE1_SERVICE_NAME,
       G_TYPE_STRING,
       EXAMPLE_SERVICE_NAME,
 
diff --git a/examples/client/dbus-tubes/offerer.c b/examples/client/dbus-tubes/offerer.c
index 8d9d1881d..396d409f1 100644
--- a/examples/client/dbus-tubes/offerer.c
+++ b/examples/client/dbus-tubes/offerer.c
@@ -208,7 +208,7 @@ main (int argc,
   request = tp_asv_new (
       TP_PROP_CHANNEL_CHANNEL_TYPE,
       G_TYPE_STRING,
-      TP_IFACE_CHANNEL_TYPE_DBUS_TUBE,
+      TP_IFACE_CHANNEL_TYPE_DBUS_TUBE1,
 
       TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
       G_TYPE_UINT,
@@ -218,7 +218,7 @@ main (int argc,
       G_TYPE_STRING,
       argv[2],
 
-      TP_PROP_CHANNEL_TYPE_DBUS_TUBE_SERVICE_NAME,
+      TP_PROP_CHANNEL_TYPE_DBUS_TUBE1_SERVICE_NAME,
       G_TYPE_STRING,
       EXAMPLE_SERVICE_NAME,
 
diff --git a/examples/client/inspect-channel.c b/examples/client/inspect-channel.c
index 01ecc75cd..5a39c548c 100644
--- a/examples/client/inspect-channel.c
+++ b/examples/client/inspect-channel.c
@@ -63,7 +63,7 @@ channel_ready_cb (GObject *source,
   g_strfreev (interfaces);
 
   if (tp_proxy_has_interface_by_id (channel,
-        TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP))
+        TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP1))
     {
       GPtrArray *members = tp_channel_group_dup_members (channel);
       guint i;
diff --git a/examples/client/stream-tubes/accepter.c b/examples/client/stream-tubes/accepter.c
index c0e9e3316..3f298ef8d 100644
--- a/examples/client/stream-tubes/accepter.c
+++ b/examples/client/stream-tubes/accepter.c
@@ -145,13 +145,13 @@ main (int argc,
   tp_base_client_take_handler_filter (handler, tp_asv_new (
         TP_PROP_CHANNEL_CHANNEL_TYPE,
         G_TYPE_STRING,
-        TP_IFACE_CHANNEL_TYPE_STREAM_TUBE,
+        TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1,
 
         TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
         G_TYPE_UINT,
         TP_HANDLE_TYPE_CONTACT,
 
-        TP_PROP_CHANNEL_TYPE_STREAM_TUBE_SERVICE,
+        TP_PROP_CHANNEL_TYPE_STREAM_TUBE1_SERVICE,
         G_TYPE_STRING,
         "ExampleService",
 
diff --git a/examples/client/stream-tubes/offerer.c b/examples/client/stream-tubes/offerer.c
index 212a686ca..2e9134a64 100644
--- a/examples/client/stream-tubes/offerer.c
+++ b/examples/client/stream-tubes/offerer.c
@@ -160,7 +160,7 @@ main (int argc,
   request = tp_asv_new (
       TP_PROP_CHANNEL_CHANNEL_TYPE,
       G_TYPE_STRING,
-      TP_IFACE_CHANNEL_TYPE_STREAM_TUBE,
+      TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1,
 
       TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
       G_TYPE_UINT,
@@ -170,7 +170,7 @@ main (int argc,
       G_TYPE_STRING,
       argv[2],
 
-      TP_PROP_CHANNEL_TYPE_STREAM_TUBE_SERVICE,
+      TP_PROP_CHANNEL_TYPE_STREAM_TUBE1_SERVICE,
       G_TYPE_STRING,
       "ExampleService",
 
diff --git a/examples/cm/call/call-channel.c b/examples/cm/call/call-channel.c
index a30615543..39d1c67e4 100644
--- a/examples/cm/call/call-channel.c
+++ b/examples/cm/call/call-channel.c
@@ -53,7 +53,7 @@ static void hold_iface_init (gpointer iface, gpointer data);
 G_DEFINE_TYPE_WITH_CODE (ExampleCallChannel,
     example_call_channel,
     TP_TYPE_BASE_MEDIA_CALL_CHANNEL,
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_HOLD,
+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_HOLD1,
       hold_iface_init))
 
 enum
@@ -84,7 +84,7 @@ example_call_channel_get_interfaces (TpBaseChannel *self)
   interfaces = TP_BASE_CHANNEL_CLASS (
       example_call_channel_parent_class)->get_interfaces (self);
 
-  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_HOLD);
+  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_HOLD1);
   return interfaces;
 }
 
@@ -701,7 +701,7 @@ simulate_hold (gpointer p)
 
   self->priv->hold_state = TP_LOCAL_HOLD_STATE_HELD;
   g_message ("SIGNALLING: hold state changed to held");
-  tp_svc_channel_interface_hold_emit_hold_state_changed (self,
+  tp_svc_channel_interface_hold1_emit_hold_state_changed (self,
       self->priv->hold_state, self->priv->hold_state_reason);
 
   example_call_channel_set_state (self, call_state,
@@ -722,7 +722,7 @@ simulate_unhold (gpointer p)
 
   self->priv->hold_state = TP_LOCAL_HOLD_STATE_UNHELD;
   g_message ("SIGNALLING: hold state changed to unheld");
-  tp_svc_channel_interface_hold_emit_hold_state_changed (self,
+  tp_svc_channel_interface_hold1_emit_hold_state_changed (self,
       self->priv->hold_state, self->priv->hold_state_reason);
 
   example_call_channel_set_state (self, call_state,
@@ -741,7 +741,7 @@ simulate_inability_to_unhold (gpointer p)
   self->priv->hold_state = TP_LOCAL_HOLD_STATE_PENDING_HOLD;
   g_message ("SIGNALLING: unable to unhold - hold state changed to "
       "pending hold");
-  tp_svc_channel_interface_hold_emit_hold_state_changed (self,
+  tp_svc_channel_interface_hold1_emit_hold_state_changed (self,
       self->priv->hold_state, self->priv->hold_state_reason);
   /* hold again */
   g_timeout_add_full (G_PRIORITY_DEFAULT,
@@ -752,17 +752,17 @@ simulate_inability_to_unhold (gpointer p)
 }
 
 static void
-hold_get_hold_state (TpSvcChannelInterfaceHold *iface,
+hold_get_hold_state (TpSvcChannelInterfaceHold1 *iface,
     DBusGMethodInvocation *context)
 {
   ExampleCallChannel *self = EXAMPLE_CALL_CHANNEL (iface);
 
-  tp_svc_channel_interface_hold_return_from_get_hold_state (context,
+  tp_svc_channel_interface_hold1_return_from_get_hold_state (context,
       self->priv->hold_state, self->priv->hold_state_reason);
 }
 
 static void
-hold_request_hold (TpSvcChannelInterfaceHold *iface,
+hold_request_hold (TpSvcChannelInterfaceHold1 *iface,
     gboolean hold,
     DBusGMethodInvocation *context)
 {
@@ -776,7 +776,7 @@ hold_request_hold (TpSvcChannelInterfaceHold *iface,
   if ((hold && self->priv->hold_state == TP_LOCAL_HOLD_STATE_HELD) ||
       (!hold && self->priv->hold_state == TP_LOCAL_HOLD_STATE_UNHELD))
     {
-      tp_svc_channel_interface_hold_return_from_request_hold (context);
+      tp_svc_channel_interface_hold1_return_from_request_hold (context);
       return;
     }
 
@@ -814,7 +814,7 @@ hold_request_hold (TpSvcChannelInterfaceHold *iface,
 
   g_message ("SIGNALLING: hold state changed to pending %s",
              (hold ? "hold" : "unhold"));
-  tp_svc_channel_interface_hold_emit_hold_state_changed (iface,
+  tp_svc_channel_interface_hold1_emit_hold_state_changed (iface,
     self->priv->hold_state, self->priv->hold_state_reason);
   /* No need to change the call flags - we never change the actual hold state
    * here, only the pending hold state */
@@ -824,7 +824,7 @@ hold_request_hold (TpSvcChannelInterfaceHold *iface,
       callback, g_object_ref (self),
       g_object_unref);
 
-  tp_svc_channel_interface_hold_return_from_request_hold (context);
+  tp_svc_channel_interface_hold1_return_from_request_hold (context);
   return;
 
 error:
@@ -837,10 +837,10 @@ void
 hold_iface_init (gpointer iface,
     gpointer data)
 {
-  TpSvcChannelInterfaceHoldClass *klass = iface;
+  TpSvcChannelInterfaceHold1Class *klass = iface;
 
 #define IMPLEMENT(x) \
-  tp_svc_channel_interface_hold_implement_##x (klass, hold_##x)
+  tp_svc_channel_interface_hold1_implement_##x (klass, hold_##x)
   IMPLEMENT (get_hold_state);
   IMPLEMENT (request_hold);
 #undef IMPLEMENT
diff --git a/examples/cm/call/call-manager.c b/examples/cm/call/call-manager.c
index de2e38ae3..c39d03774 100644
--- a/examples/cm/call/call-manager.c
+++ b/examples/cm/call/call-manager.c
@@ -356,28 +356,28 @@ new_channel (ExampleCallManager *self,
 static const gchar * const audio_fixed_properties[] = {
     TP_PROP_CHANNEL_CHANNEL_TYPE,
     TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
-    TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO,
+    TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO,
     NULL
 };
 
 static const gchar * const video_fixed_properties[] = {
     TP_PROP_CHANNEL_CHANNEL_TYPE,
     TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
-    TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO,
+    TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO,
     NULL
 };
 
 static const gchar * const audio_allowed_properties[] = {
     TP_PROP_CHANNEL_TARGET_HANDLE,
     TP_PROP_CHANNEL_TARGET_ID,
-    TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO,
+    TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO,
     NULL
 };
 
 static const gchar * const video_allowed_properties[] = {
     TP_PROP_CHANNEL_TARGET_HANDLE,
     TP_PROP_CHANNEL_TARGET_ID,
-    TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO,
+    TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO,
     NULL
 };
 
@@ -388,15 +388,15 @@ example_call_manager_type_foreach_channel_class (GType type,
 {
   GHashTable *table = tp_asv_new (
       TP_PROP_CHANNEL_CHANNEL_TYPE,
-          G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_CALL,
+          G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_CALL1,
       TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
-    TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO, G_TYPE_BOOLEAN, TRUE,
+    TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO, G_TYPE_BOOLEAN, TRUE,
       NULL);
 
   func (type, table, audio_allowed_properties, user_data);
 
-  g_hash_table_remove (table, TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO);
-  tp_asv_set_boolean (table, TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO,
+  g_hash_table_remove (table, TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO);
+  tp_asv_set_boolean (table, TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO,
       TRUE);
 
   func (type, table, video_allowed_properties, user_data);
@@ -416,7 +416,7 @@ example_call_manager_request (ExampleCallManager *self,
 
   if (tp_strdiff (tp_asv_get_string (request_properties,
           TP_PROP_CHANNEL_CHANNEL_TYPE),
-      TP_IFACE_CHANNEL_TYPE_CALL))
+      TP_IFACE_CHANNEL_TYPE_CALL1))
     {
       return FALSE;
     }
@@ -432,9 +432,9 @@ example_call_manager_request (ExampleCallManager *self,
   g_assert (handle != 0);
 
   initial_audio = tp_asv_get_boolean (request_properties,
-      TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO, NULL);
+      TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO, NULL);
   initial_video = tp_asv_get_boolean (request_properties,
-        TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO, NULL);
+        TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO, NULL);
 
   if (!initial_audio && !initial_video)
     {
diff --git a/examples/cm/call/conn.c b/examples/cm/call/conn.c
index 87c548537..c3a736f82 100644
--- a/examples/cm/call/conn.c
+++ b/examples/cm/call/conn.c
@@ -36,7 +36,7 @@ G_DEFINE_TYPE_WITH_CODE (ExampleCallConnection,
     TP_TYPE_BASE_CONNECTION,
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACTS,
       tp_contacts_mixin_iface_init);
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_PRESENCE,
+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_PRESENCE1,
       tp_presence_mixin_iface_init))
 
 enum
@@ -362,7 +362,7 @@ static const TpPresenceStatusSpec presence_statuses[] = {
 
 static const gchar *interfaces_always_present[] = {
     TP_IFACE_CONNECTION_INTERFACE_CONTACTS,
-    TP_IFACE_CONNECTION_INTERFACE_PRESENCE,
+    TP_IFACE_CONNECTION_INTERFACE_PRESENCE1,
     TP_IFACE_CONNECTION_INTERFACE_REQUESTS,
     NULL };
 
diff --git a/examples/cm/channelspecific/room.c b/examples/cm/channelspecific/room.c
index 4c805c761..ea577701e 100644
--- a/examples/cm/channelspecific/room.c
+++ b/examples/cm/channelspecific/room.c
@@ -19,7 +19,7 @@ G_DEFINE_TYPE_WITH_CODE (ExampleCSHRoomChannel,
     TP_TYPE_BASE_CHANNEL,
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_TEXT,
       tp_message_mixin_iface_init);
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_GROUP,
+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_GROUP1,
       tp_group_mixin_iface_init);)
 
 /* type definition stuff */
@@ -43,7 +43,7 @@ example_csh_room_channel_get_interfaces (TpBaseChannel *self)
   interfaces = TP_BASE_CHANNEL_CLASS (example_csh_room_channel_parent_class)->
     get_interfaces (self);
 
-  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_GROUP);
+  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_GROUP1);
   return interfaces;
 };
 
diff --git a/examples/cm/contactlist/conn.c b/examples/cm/contactlist/conn.c
index caec16e7f..e3ddd3391 100644
--- a/examples/cm/contactlist/conn.c
+++ b/examples/cm/contactlist/conn.c
@@ -28,17 +28,17 @@ G_DEFINE_TYPE_WITH_CODE (ExampleContactListConnection,
     TP_TYPE_BASE_CONNECTION,
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_DBUS_PROPERTIES,
        tp_dbus_properties_mixin_iface_init);
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_ALIASING,
+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_ALIASING1,
       init_aliasing);
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACTS,
       tp_contacts_mixin_iface_init);
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_LIST,
+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_LIST1,
       tp_base_contact_list_mixin_list_iface_init);
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_GROUPS,
+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_GROUPS1,
       tp_base_contact_list_mixin_groups_iface_init);
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_BLOCKING,
+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_BLOCKING1,
       tp_base_contact_list_mixin_blocking_iface_init);
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_PRESENCE,
+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CONNECTION_INTERFACE_PRESENCE1,
         tp_presence_mixin_iface_init))
 
 enum
@@ -167,7 +167,7 @@ alias_updated_cb (ExampleContactList *contact_list,
   g_hash_table_insert (aliases, GUINT_TO_POINTER (contact),
       (gpointer) example_contact_list_get_alias (contact_list, contact));
 
-  tp_svc_connection_interface_aliasing_emit_aliases_changed (self, aliases);
+  tp_svc_connection_interface_aliasing1_emit_aliases_changed (self, aliases);
 
   g_hash_table_unref (aliases);
 }
@@ -248,7 +248,7 @@ aliasing_fill_contact_attributes (GObject *object,
       TpHandle contact = g_array_index (contacts, guint, i);
 
       tp_contacts_mixin_set_contact_attribute (attributes, contact,
-          TP_TOKEN_CONNECTION_INTERFACE_ALIASING_ALIAS,
+          TP_TOKEN_CONNECTION_INTERFACE_ALIASING1_ALIAS,
           tp_g_value_slice_new_string (
             example_contact_list_get_alias (self->priv->contact_list,
               contact)));
@@ -286,7 +286,7 @@ constructed (GObject *object)
       TP_BASE_CONTACT_LIST (self->priv->contact_list), base);
 
   tp_contacts_mixin_add_contact_attributes_iface (object,
-      TP_IFACE_CONNECTION_INTERFACE_ALIASING,
+      TP_IFACE_CONNECTION_INTERFACE_ALIASING1,
       aliasing_fill_contact_attributes);
 
   tp_presence_mixin_init (object,
@@ -379,12 +379,12 @@ set_own_status (GObject *object,
 }
 
 static const gchar *interfaces_always_present[] = {
-    TP_IFACE_CONNECTION_INTERFACE_ALIASING,
+    TP_IFACE_CONNECTION_INTERFACE_ALIASING1,
     TP_IFACE_CONNECTION_INTERFACE_CONTACTS,
-    TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST,
-    TP_IFACE_CONNECTION_INTERFACE_CONTACT_GROUPS,
-    TP_IFACE_CONNECTION_INTERFACE_CONTACT_BLOCKING,
-    TP_IFACE_CONNECTION_INTERFACE_PRESENCE,
+    TP_IFACE_CONNECTION_INTERFACE_CONTACT_LIST1,
+    TP_IFACE_CONNECTION_INTERFACE_CONTACT_GROUPS1,
+    TP_IFACE_CONNECTION_INTERFACE_CONTACT_BLOCKING1,
+    TP_IFACE_CONNECTION_INTERFACE_PRESENCE1,
     TP_IFACE_CONNECTION_INTERFACE_REQUESTS,
     NULL };
 
@@ -447,7 +447,7 @@ example_contact_list_connection_class_init (
     { NULL }
   };
   static TpDBusPropertiesMixinIfaceImpl prop_interfaces[] = {
-        { TP_IFACE_CONNECTION_INTERFACE_ALIASING,
+        { TP_IFACE_CONNECTION_INTERFACE_ALIASING1,
           aliasing_get_dbus_property,
           NULL,
           aliasing_props,
@@ -498,7 +498,7 @@ example_contact_list_connection_class_init (
 }
 
 static void
-request_aliases (TpSvcConnectionInterfaceAliasing *aliasing,
+request_aliases (TpSvcConnectionInterfaceAliasing1 *aliasing,
                  const GArray *contacts,
                  DBusGMethodInvocation *context)
 {
@@ -534,13 +534,13 @@ request_aliases (TpSvcConnectionInterfaceAliasing *aliasing,
 
   g_ptr_array_add (result, NULL);
   strings = (gchar **) g_ptr_array_free (result, FALSE);
-  tp_svc_connection_interface_aliasing_return_from_request_aliases (context,
+  tp_svc_connection_interface_aliasing1_return_from_request_aliases (context,
       (const gchar **) strings);
   g_free (strings);
 }
 
 static void
-set_aliases (TpSvcConnectionInterfaceAliasing *aliasing,
+set_aliases (TpSvcConnectionInterfaceAliasing1 *aliasing,
              GHashTable *aliases,
              DBusGMethodInvocation *context)
 {
@@ -575,16 +575,16 @@ set_aliases (TpSvcConnectionInterfaceAliasing *aliasing,
           GPOINTER_TO_UINT (key), value);
     }
 
-  tp_svc_connection_interface_aliasing_return_from_set_aliases (context);
+  tp_svc_connection_interface_aliasing1_return_from_set_aliases (context);
 }
 
 static void
 init_aliasing (gpointer iface,
                gpointer iface_data G_GNUC_UNUSED)
 {
-  TpSvcConnectionInterfaceAliasingClass *klass = iface;
+  TpSvcConnectionInterfaceAliasing1Class *klass = iface;
 
-#define IMPLEMENT(x) tp_svc_connection_interface_aliasing_implement_##x (\
+#define IMPLEMENT(x) tp_svc_connection_interface_aliasing1_implement_##x (\
     klass, x)
   IMPLEMENT(request_aliases);
   IMPLEMENT(set_aliases);
diff --git a/examples/cm/echo-message-parts/chan.c b/examples/cm/echo-message-parts/chan.c
index da4ba6acf..feecfebea 100644
--- a/examples/cm/echo-message-parts/chan.c
+++ b/examples/cm/echo-message-parts/chan.c
@@ -26,11 +26,11 @@ G_DEFINE_TYPE_WITH_CODE (ExampleEcho2Channel,
     TP_TYPE_BASE_CHANNEL,
     G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_TYPE_TEXT,
       tp_message_mixin_iface_init)
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_CHAT_STATE,
+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_CHAT_STATE1,
       tp_message_mixin_chat_state_iface_init)
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_DESTROYABLE,
+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_DESTROYABLE1,
       destroyable_iface_init)
-    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_SMS, sms_iface_init)
+    G_IMPLEMENT_INTERFACE (TP_TYPE_SVC_CHANNEL_INTERFACE_SMS1, sms_iface_init)
     )
 
 /* type definition stuff */
@@ -43,9 +43,9 @@ example_echo_2_channel_get_interfaces (TpBaseChannel *self)
   interfaces = TP_BASE_CHANNEL_CLASS (example_echo_2_channel_parent_class)->
     get_interfaces (self);
 
-  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_DESTROYABLE);
-  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_SMS);
-  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_CHAT_STATE);
+  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_DESTROYABLE1);
+  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_SMS1);
+  g_ptr_array_add (interfaces, TP_IFACE_CHANNEL_INTERFACE_CHAT_STATE1);
 
   return interfaces;
 };
@@ -267,7 +267,7 @@ example_echo_2_channel_fill_immutable_properties (TpBaseChannel *chan,
       TP_IFACE_CHANNEL_TYPE_TEXT, "DeliveryReportingSupport",
       TP_IFACE_CHANNEL_TYPE_TEXT, "SupportedContentTypes",
       TP_IFACE_CHANNEL_TYPE_TEXT, "MessageTypes",
-      TP_IFACE_CHANNEL_INTERFACE_SMS, "Flash",
+      TP_IFACE_CHANNEL_INTERFACE_SMS1, "Flash",
       NULL);
 }
 
@@ -339,19 +339,19 @@ example_echo_2_channel_class_init (ExampleEcho2ChannelClass *klass)
     example_echo_2_channel_fill_immutable_properties;
 
   param_spec = g_param_spec_boolean ("sms", "SMS",
-      "SMS.SMSChannel",
+      "SMS1.SMSChannel",
       FALSE,
       G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_SMS, param_spec);
 
   param_spec = g_param_spec_boolean ("sms-flash", "SMS Flash",
-      "SMS.Flash",
+      "SMS1.Flash",
       FALSE,
       G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_SMS_FLASH, param_spec);
 
   tp_dbus_properties_mixin_implement_interface (object_class,
-      TP_IFACE_QUARK_CHANNEL_INTERFACE_SMS,
+      TP_IFACE_QUARK_CHANNEL_INTERFACE_SMS1,
       tp_dbus_properties_mixin_getter_gobject_properties, NULL,
       sms_props);
 
@@ -359,7 +359,7 @@ example_echo_2_channel_class_init (ExampleEcho2ChannelClass *klass)
 }
 
 static void
-destroyable_destroy (TpSvcChannelInterfaceDestroyable *iface,
+destroyable_destroy (TpSvcChannelInterfaceDestroyable1 *iface,
     DBusGMethodInvocation *context)
 {
   TpBaseChannel *self = TP_BASE_CHANNEL (iface);
@@ -367,17 +367,17 @@ destroyable_destroy (TpSvcChannelInterfaceDestroyable *iface,
   tp_message_mixin_clear ((GObject *) self);
   example_echo_2_channel_close (self);
   g_assert (tp_base_channel_is_destroyed (self));
-  tp_svc_channel_interface_destroyable_return_from_destroy (context);
+  tp_svc_channel_interface_destroyable1_return_from_destroy (context);
 }
 
 static void
 destroyable_iface_init (gpointer iface,
     gpointer data)
 {
-  TpSvcChannelInterfaceDestroyableClass *klass = iface;
+  TpSvcChannelInterfaceDestroyable1Class *klass = iface;
 
 #define IMPLEMENT(x) \
-  tp_svc_channel_interface_destroyable_implement_##x (klass, destroyable_##x)
+  tp_svc_channel_interface_destroyable1_implement_##x (klass, destroyable_##x)
   IMPLEMENT (destroy);
 #undef IMPLEMENT
 }
@@ -392,11 +392,11 @@ example_echo_2_channel_set_sms (ExampleEcho2Channel *self,
 
   self->priv->sms = sms;
 
-  tp_svc_channel_interface_sms_emit_sms_channel_changed (self, sms);
+  tp_svc_channel_interface_sms1_emit_sms_channel_changed (self, sms);
 }
 
 static void
-sms_get_sms_length (TpSvcChannelInterfaceSMS *self,
+sms_get_sms_length (TpSvcChannelInterfaceSMS1 *self,
     const GPtrArray *parts,
     DBusGMethodInvocation *context)
 {
@@ -424,7 +424,7 @@ sms_get_sms_length (TpSvcChannelInterfaceSMS *self,
   txt = tp_message_to_text (message);
   len = strlen (txt);
 
-  tp_svc_channel_interface_sms_return_from_get_sms_length (context, len,
+  tp_svc_channel_interface_sms1_return_from_get_sms_length (context, len,
       EXAMPLE_ECHO_2_CHANNEL_MAX_SMS_LENGTH - len, -1);
 
   g_object_unref (message);
@@ -435,10 +435,10 @@ static void
 sms_iface_init (gpointer iface,
     gpointer data)
 {
-  TpSvcChannelInterfaceSMSClass *klass = iface;
+  TpSvcChannelInterfaceSMS1Class *klass = iface;
 
 #define IMPLEMENT(x) \
-  tp_svc_channel_interface_sms_implement_##x (klass, sms_##x)
+  tp_svc_channel_interface_sms1_implement_##x (klass, sms_##x)
   IMPLEMENT (get_sms_length);
 #undef IMPLEMENT
 }
diff --git a/examples/cm/echo-message-parts/protocol.c b/examples/cm/echo-message-parts/protocol.c
index ad80a1416..ef3135063 100644
--- a/examples/cm/echo-message-parts/protocol.c
+++ b/examples/cm/echo-message-parts/protocol.c
@@ -131,8 +131,8 @@ get_interfaces_array (TpBaseProtocol *self)
   interfaces = TP_BASE_PROTOCOL_CLASS (
       example_echo_2_protocol_parent_class)->get_interfaces_array (self);
 
-  g_ptr_array_add (interfaces, TP_IFACE_PROTOCOL_INTERFACE_AVATARS);
-  g_ptr_array_add (interfaces, TP_IFACE_PROTOCOL_INTERFACE_ADDRESSING);
+  g_ptr_array_add (interfaces, TP_IFACE_PROTOCOL_INTERFACE_AVATARS1);
+  g_ptr_array_add (interfaces, TP_IFACE_PROTOCOL_INTERFACE_ADDRESSING1);
 
   return interfaces;
 }