Version the names and node-names of all versioned interfaces

Otherwise, either we can't generate code for Foo1 and Foo2 simultaneously,
or the rules for when you version and when you don't are really
confusing. See fd.o #26866.

73 files changed, 143 insertions, 143 deletions

diff --git a/spec/Account_Interface_Addressing.xml b/spec/Account_Interface_Addressing1.xml
index 28c366c7..4212811c 100644
--- a/spec/Account_Interface_Addressing.xml
+++ b/spec/Account_Interface_Addressing1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Account_Interface_Addressing" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<node name="/Account_Interface_Addressing1" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright>Copyright © 2010 Collabora Ltd</tp:copyright>
   <tp:license xmlns="http://www.w3.org/1999/xhtml">
     <p>This library is free software; you can redistribute it and/or
diff --git a/spec/Account_Interface_Avatar.xml b/spec/Account_Interface_Avatar1.xml
index 6ffe0a08..db77838e 100644
--- a/spec/Account_Interface_Avatar.xml
+++ b/spec/Account_Interface_Avatar1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Account_Interface_Avatar"
+<node name="/Account_Interface_Avatar1"
   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright>Copyright (C) 2008 Collabora Ltd.</tp:copyright>
   <tp:copyright>Copyright (C) 2008 Nokia Corporation</tp:copyright>
diff --git a/spec/Account_Interface_External_Password_Storage.xml b/spec/Account_Interface_External_Password_Storage1.xml
index 1224687d..cfa07fa4 100644
--- a/spec/Account_Interface_External_Password_Storage.xml
+++ b/spec/Account_Interface_External_Password_Storage1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Account_Interface_External_Password_Storage"
+<node name="/Account_Interface_External_Password_Storage1"
   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
 
   <tp:copyright>Copyright © 2011 Collabora Ltd.</tp:copyright>
diff --git a/spec/Account_Interface_Hidden.xml b/spec/Account_Interface_Hidden1.xml
index 3f98c1ba..a7863605 100644
--- a/spec/Account_Interface_Hidden.xml
+++ b/spec/Account_Interface_Hidden1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Account_Interface_Hidden"
+<node name="/Account_Interface_Hidden1"
   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
 
   <tp:copyright>Copyright © 2010 Collabora Ltd.</tp:copyright>
diff --git a/spec/Account_Interface_Storage.xml b/spec/Account_Interface_Storage1.xml
index f486fbd1..8a4809e7 100644
--- a/spec/Account_Interface_Storage.xml
+++ b/spec/Account_Interface_Storage1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Account_Interface_Storage"
+<node name="/Account_Interface_Storage1"
   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright>Copyright (C) 2010 Collabora Ltd.</tp:copyright>
   <tp:license xmlns="http://www.w3.org/1999/xhtml">
diff --git a/spec/Account_Manager_Interface_Hidden.xml b/spec/Account_Manager_Interface_Hidden1.xml
index 1387e985..2a4d32e8 100644
--- a/spec/Account_Manager_Interface_Hidden.xml
+++ b/spec/Account_Manager_Interface_Hidden1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Account_Manager_Interface_Hidden"
+<node name="/Account_Manager_Interface_Hidden1"
   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright>Copyright © 2010 Collabora Ltd.</tp:copyright>
   <tp:copyright>Copyright © 2010 Nokia Corporation</tp:copyright>
diff --git a/spec/Call_Content_Interface_Audio_Control.xml b/spec/Call_Content_Interface_Audio_Control1.xml
index e2c6dce0..be7b659b 100644
--- a/spec/Call_Content_Interface_Audio_Control.xml
+++ b/spec/Call_Content_Interface_Audio_Control1.xml
@@ -1,5 +1,5 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node name="/Call_Content_Interface_Audio_Control"
+<node name="/Call_Content_Interface_Audio_Control1"
   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright>Copyright © 2009-2011 Collabora Ltd.</tp:copyright>
   <tp:license xmlns="http://www.w3.org/1999/xhtml">
diff --git a/spec/Call_Content_Interface_Video_Control.xml b/spec/Call_Content_Interface_Video_Control1.xml
index 80644b4a..5da172b5 100644
--- a/spec/Call_Content_Interface_Video_Control.xml
+++ b/spec/Call_Content_Interface_Video_Control1.xml
@@ -1,5 +1,5 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node name="/Call_Content_Interface_Video_Control"
+<node name="/Call_Content_Interface_Video_Control1"
   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright>Copyright © 2011 Collabora Ltd.</tp:copyright>
   <tp:license xmlns="http://www.w3.org/1999/xhtml">
diff --git a/spec/Call_Content_Media_Description_Interface_RTCP_Extended_Reports.xml b/spec/Call_Content_Media_Description_Interface_RTCP_Extended_Reports1.xml
index 29696b80..efefa111 100644
--- a/spec/Call_Content_Media_Description_Interface_RTCP_Extended_Reports.xml
+++ b/spec/Call_Content_Media_Description_Interface_RTCP_Extended_Reports1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Call_Content_Media_Description_Interface_RTCP_Extended_Reports" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<node name="/Call_Content_Media_Description_Interface_RTCP_Extended_Reports1" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright> Copyright © 2005-2010 Nokia Corporation </tp:copyright>
   <tp:copyright> Copyright © 2005-2010 Collabora Ltd </tp:copyright>
   <tp:license xmlns="http://www.w3.org/1999/xhtml">
diff --git a/spec/Call_Content_Media_Description_Interface_RTCP_Feedback.xml b/spec/Call_Content_Media_Description_Interface_RTCP_Feedback1.xml
index 263b5eef..5a7f0679 100644
--- a/spec/Call_Content_Media_Description_Interface_RTCP_Feedback.xml
+++ b/spec/Call_Content_Media_Description_Interface_RTCP_Feedback1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Call_Content_Media_Description_Interface_RTCP_Feedback" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<node name="/Call_Content_Media_Description_Interface_RTCP_Feedback1" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright> Copyright © 2005-2010 Nokia Corporation </tp:copyright>
   <tp:copyright> Copyright © 2005-2010 Collabora Ltd </tp:copyright>
   <tp:license xmlns="http://www.w3.org/1999/xhtml">
diff --git a/spec/Call_Content_Media_Description_Interface_RTP_Header_Extensions.xml b/spec/Call_Content_Media_Description_Interface_RTP_Header_Extensions1.xml
index babafecf..ef3214a6 100644
--- a/spec/Call_Content_Media_Description_Interface_RTP_Header_Extensions.xml
+++ b/spec/Call_Content_Media_Description_Interface_RTP_Header_Extensions1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Call_Content_Media_Description_Interface_RTP_Header_Extensions" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<node name="/Call_Content_Media_Description_Interface_RTP_Header_Extensions1" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright> Copyright © 2005-2010 Nokia Corporation </tp:copyright>
   <tp:copyright> Copyright © 2005-2010 Collabora Ltd </tp:copyright>
   <tp:license xmlns="http://www.w3.org/1999/xhtml">
diff --git a/spec/Channel_Dispatcher_Interface_Operation_List.xml b/spec/Channel_Dispatcher_Interface_Operation_List1.xml
index 46a22a3e..f2d365a7 100644
--- a/spec/Channel_Dispatcher_Interface_Operation_List.xml
+++ b/spec/Channel_Dispatcher_Interface_Operation_List1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Channel_Dispatcher_Interface_Operation_List"
+<node name="/Channel_Dispatcher_Interface_Operation_List1"
   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
 
   <tp:copyright>Copyright © 2008-2009 Collabora Ltd.</tp:copyright>
diff --git a/spec/Channel_Interface_Addressing.xml b/spec/Channel_Interface_Addressing1.xml
index 9fa27b03..9daada9c 100644
--- a/spec/Channel_Interface_Addressing.xml
+++ b/spec/Channel_Interface_Addressing1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Channel_Interface_Addressing" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<node name="/Channel_Interface_Addressing1" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright>Copyright © 2010 Collabora Limited</tp:copyright>
   <tp:license xmlns="http://www.w3.org/1999/xhtml">
     <p>This library is free software; you can redistribute it and/or
diff --git a/spec/Channel_Interface_Anonymity.xml b/spec/Channel_Interface_Anonymity1.xml
index 54c62163..f98311fd 100644
--- a/spec/Channel_Interface_Anonymity.xml
+++ b/spec/Channel_Interface_Anonymity1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Channel_Interface_Anonymity"
+<node name="/Channel_Interface_Anonymity1"
   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
 
   <tp:copyright>Copyright © 2008-2010 Nokia Corporation</tp:copyright>
diff --git a/spec/Channel_Interface_Chat_State.xml b/spec/Channel_Interface_Chat_State1.xml
index 72743203..f2f1dabe 100644
--- a/spec/Channel_Interface_Chat_State.xml
+++ b/spec/Channel_Interface_Chat_State1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Channel_Interface_Chat_State" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<node name="/Channel_Interface_Chat_State1" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright> Copyright (C) 2007 Collabora Limited </tp:copyright>
   <tp:license xmlns="http://www.w3.org/1999/xhtml">
     <p>This library is free software; you can redistribute it and/or
diff --git a/spec/Channel_Interface_Conference.xml b/spec/Channel_Interface_Conference1.xml
index a5923b2b..41a833c8 100644
--- a/spec/Channel_Interface_Conference.xml
+++ b/spec/Channel_Interface_Conference1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Channel_Interface_Conference"
+<node name="/Channel_Interface_Conference1"
   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright>Copyright © 2009 Collabora Limited</tp:copyright>
   <tp:copyright>Copyright © 2009 Nokia Corporation</tp:copyright>
diff --git a/spec/Channel_Interface_Credentials_Storage.xml b/spec/Channel_Interface_Credentials_Storage1.xml
index 10ce2ce5..0f5226a1 100644
--- a/spec/Channel_Interface_Credentials_Storage.xml
+++ b/spec/Channel_Interface_Credentials_Storage1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Channel_Interface_Credentials_Storage"
+<node name="/Channel_Interface_Credentials_Storage1"
       xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright> Copyright © 2011 Collabora Limited </tp:copyright>
   <tp:license xmlns="http://www.w3.org/1999/xhtml">
diff --git a/spec/Channel_Interface_DTMF.xml b/spec/Channel_Interface_DTMF1.xml
index d8b9a151..b0da4c80 100644
--- a/spec/Channel_Interface_DTMF.xml
+++ b/spec/Channel_Interface_DTMF1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Channel_Interface_DTMF" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<node name="/Channel_Interface_DTMF1" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright>Copyright © 2005-2010 Collabora Limited</tp:copyright>
   <tp:copyright>Copyright © 2005-2010 Nokia Corporation</tp:copyright>
   <tp:copyright>Copyright © 2006 INdT</tp:copyright>
diff --git a/spec/Channel_Interface_Destroyable.xml b/spec/Channel_Interface_Destroyable1.xml
index 2cc6dc89..e373bf5d 100644
--- a/spec/Channel_Interface_Destroyable.xml
+++ b/spec/Channel_Interface_Destroyable1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Channel_Interface_Destroyable"
+<node name="/Channel_Interface_Destroyable1"
   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright>Copyright (C) 2008 Collabora Ltd.</tp:copyright>
   <tp:copyright>Copyright (C) 2008 Nokia Corporation</tp:copyright>
diff --git a/spec/Channel_Interface_File_Transfer_Metadata.xml b/spec/Channel_Interface_File_Transfer_Metadata1.xml
index ffe1c98e..26d3374b 100644
--- a/spec/Channel_Interface_File_Transfer_Metadata.xml
+++ b/spec/Channel_Interface_File_Transfer_Metadata1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Channel_Interface_File_Transfer_Metadata"
+<node name="/Channel_Interface_File_Transfer_Metadata1"
   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright>Copyright (C) 2011 Collabora Ltd.</tp:copyright>
 
diff --git a/spec/Channel_Interface_Group.xml b/spec/Channel_Interface_Group1.xml
index fc40839e..ca2201d2 100644
--- a/spec/Channel_Interface_Group.xml
+++ b/spec/Channel_Interface_Group1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Channel_Interface_Group" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<node name="/Channel_Interface_Group1" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright>Copyright © 2005-2009 Collabora Limited</tp:copyright>
   <tp:copyright>Copyright © 2005-2009 Nokia Corporation</tp:copyright>
   <tp:copyright>Copyright © 2006 INdT</tp:copyright>
diff --git a/spec/Channel_Interface_HTML.xml b/spec/Channel_Interface_HTML1.xml
index fca6e12f..245ad1b1 100644
--- a/spec/Channel_Interface_HTML.xml
+++ b/spec/Channel_Interface_HTML1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Channel_Interface_HTML"
+<node name="/Channel_Interface_HTML1"
   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright>Copyright (C) 2008 Collabora Ltd.</tp:copyright>
   <tp:copyright>Copyright (C) 2008 Nokia Corporation</tp:copyright>
diff --git a/spec/Channel_Interface_Hold.xml b/spec/Channel_Interface_Hold1.xml
index 96d1f659..9801827e 100644
--- a/spec/Channel_Interface_Hold.xml
+++ b/spec/Channel_Interface_Hold1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Channel_Interface_Hold" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<node name="/Channel_Interface_Hold1" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright> Copyright (C) 2005-2008 Collabora Limited </tp:copyright>
   <tp:copyright> Copyright (C) 2005-2008 Nokia Corporation </tp:copyright>
   <tp:copyright> Copyright (C) 2006 INdT </tp:copyright>
diff --git a/spec/Channel_Interface_Mergeable_Conference.xml b/spec/Channel_Interface_Mergeable_Conference1.xml
index 5ff5d69d..91ed1051 100644
--- a/spec/Channel_Interface_Mergeable_Conference.xml
+++ b/spec/Channel_Interface_Mergeable_Conference1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Channel_Interface_Mergeable_Conference"
+<node name="/Channel_Interface_Mergeable_Conference1"
   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright>Copyright © 2009 Collabora Limited</tp:copyright>
   <tp:copyright>Copyright © 2009 Nokia Corporation</tp:copyright>
diff --git a/spec/Channel_Interface_Password.xml b/spec/Channel_Interface_Password1.xml
index aec04b80..e2a35b82 100644
--- a/spec/Channel_Interface_Password.xml
+++ b/spec/Channel_Interface_Password1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Channel_Interface_Password" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<node name="/Channel_Interface_Password1" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright>
 Copyright © 2005-2011 Collabora Limited
 Copyright © 2005-2009 Nokia Corporation
diff --git a/spec/Channel_Interface_Picture.xml b/spec/Channel_Interface_Picture1.xml
index ba8f1d63..ae1bbeb9 100644
--- a/spec/Channel_Interface_Picture.xml
+++ b/spec/Channel_Interface_Picture1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Channel_Interface_Picture"
+<node name="/Channel_Interface_Picture1"
   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
 
   <tp:copyright>Copyright © 2011 Collabora Ltd.</tp:copyright>
diff --git a/spec/Channel_Interface_Room.xml b/spec/Channel_Interface_Room1.xml
index 8b9d2399..f0cad304 100644
--- a/spec/Channel_Interface_Room.xml
+++ b/spec/Channel_Interface_Room1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Channel_Interface_Room"
+<node name="/Channel_Interface_Room1"
   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
 
   <tp:copyright>Copyright © 2010 Collabora Ltd.</tp:copyright>
diff --git a/spec/Channel_Interface_Room_Config.xml b/spec/Channel_Interface_Room_Config1.xml
index 8079ef5c..9fba3a44 100644
--- a/spec/Channel_Interface_Room_Config.xml
+++ b/spec/Channel_Interface_Room_Config1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Channel_Interface_Room_Config"
+<node name="/Channel_Interface_Room_Config1"
   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
 
   <tp:copyright>Copyright © 2011 Collabora Ltd.</tp:copyright>
diff --git a/spec/Channel_Interface_SASL_Authentication.xml b/spec/Channel_Interface_SASL_Authentication1.xml
index 42067890..b58c90e5 100644
--- a/spec/Channel_Interface_SASL_Authentication.xml
+++ b/spec/Channel_Interface_SASL_Authentication1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Channel_Interface_SASL_Authentication"
+<node name="/Channel_Interface_SASL_Authentication1"
       xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright> Copyright © 2010 Collabora Limited </tp:copyright>
   <tp:license xmlns="http://www.w3.org/1999/xhtml">
diff --git a/spec/Channel_Interface_SMS.xml b/spec/Channel_Interface_SMS1.xml
index eb0225ed..f785c8b9 100644
--- a/spec/Channel_Interface_SMS.xml
+++ b/spec/Channel_Interface_SMS1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Channel_Interface_SMS"
+<node name="/Channel_Interface_SMS1"
   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright>Copyright © 2008–2010 Nokia Corporation</tp:copyright>
   <tp:copyright>Copyright © 2010 Collabora Ltd.</tp:copyright>
diff --git a/spec/Channel_Interface_Securable.xml b/spec/Channel_Interface_Securable1.xml
index 9e2dedc4..6a139a36 100644
--- a/spec/Channel_Interface_Securable.xml
+++ b/spec/Channel_Interface_Securable1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Channel_Interface_Securable"
+<node name="/Channel_Interface_Securable1"
   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright>Copyright (C) 2010 Collabora Ltd.</tp:copyright>
 
diff --git a/spec/Channel_Interface_Service_Point.xml b/spec/Channel_Interface_Service_Point1.xml
index 732b0e68..c2d37e6e 100644
--- a/spec/Channel_Interface_Service_Point.xml
+++ b/spec/Channel_Interface_Service_Point1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Channel_Interface_Service_Point" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<node name="/Channel_Interface_Service_Point1" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright> Copyright © 2005-2010 Nokia Corporation </tp:copyright>
   <tp:copyright> Copyright © 2005-2010 Collabora Ltd </tp:copyright>
   <tp:license xmlns="http://www.w3.org/1999/xhtml">
diff --git a/spec/Channel_Interface_Splittable.xml b/spec/Channel_Interface_Splittable1.xml
index 4e29395a..52976ed6 100644
--- a/spec/Channel_Interface_Splittable.xml
+++ b/spec/Channel_Interface_Splittable1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Channel_Interface_Splittable"
+<node name="/Channel_Interface_Splittable1"
   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright>Copyright © 2009 Collabora Limited</tp:copyright>
   <tp:copyright>Copyright © 2009 Nokia Corporation</tp:copyright>
diff --git a/spec/Channel_Interface_Subject.xml b/spec/Channel_Interface_Subject1.xml
index 069a0747..a5fee4fd 100644
--- a/spec/Channel_Interface_Subject.xml
+++ b/spec/Channel_Interface_Subject1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Channel_Interface_Subject"
+<node name="/Channel_Interface_Subject1"
   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
 
   <tp:copyright>Copyright © 2010–2011 Collabora Ltd.</tp:copyright>
diff --git a/spec/Channel_Interface_Tube.xml b/spec/Channel_Interface_Tube1.xml
index 25faccd9..e02ce2cb 100644
--- a/spec/Channel_Interface_Tube.xml
+++ b/spec/Channel_Interface_Tube1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Channel_Interface_Tube" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<node name="/Channel_Interface_Tube1" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright>Copyright © 2008-2009 Collabora Limited</tp:copyright>
   <tp:copyright>Copyright © 2008-2009 Nokia Corporation</tp:copyright>
   <tp:license>
diff --git a/spec/Channel_Type_Call.xml b/spec/Channel_Type_Call1.xml
index 96900618..db9f2f87 100644
--- a/spec/Channel_Type_Call.xml
+++ b/spec/Channel_Type_Call1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Channel_Type_Call" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<node name="/Channel_Type_Call1" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright>Copyright © 2009-2010 Collabora Limited</tp:copyright>
   <tp:copyright>Copyright © 2009-2010 Nokia Corporation</tp:copyright>
   <tp:license>
diff --git a/spec/Channel_Type_Contact_Search.xml b/spec/Channel_Type_Contact_Search1.xml
index 2d8fa452..4c20a8a7 100644
--- a/spec/Channel_Type_Contact_Search.xml
+++ b/spec/Channel_Type_Contact_Search1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Channel_Type_Contact_Search" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<node name="/Channel_Type_Contact_Search1" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright> Copyright © 2005-2009 Collabora Limited </tp:copyright>
   <tp:copyright> Copyright © 2005-2009 Nokia Corporation </tp:copyright>
   <tp:copyright> Copyright © 2006 INdT </tp:copyright>
diff --git a/spec/Channel_Type_DBus_Tube.xml b/spec/Channel_Type_DBus_Tube1.xml
index 5b4c7485..21e4ac42 100644
--- a/spec/Channel_Type_DBus_Tube.xml
+++ b/spec/Channel_Type_DBus_Tube1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Channel_Type_DBus_Tube" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<node name="/Channel_Type_DBus_Tube1" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright>Copyright © 2008-2009 Collabora Limited</tp:copyright>
   <tp:copyright>Copyright © 2008-2009 Nokia Corporation</tp:copyright>
   <tp:license>
diff --git a/spec/Channel_Type_File_Transfer.xml b/spec/Channel_Type_File_Transfer1.xml
index cecd3c83..dbfe5424 100644
--- a/spec/Channel_Type_File_Transfer.xml
+++ b/spec/Channel_Type_File_Transfer1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Channel_Type_File_Transfer" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<node name="/Channel_Type_File_Transfer1" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright>
     Copyright © 2008-2009 Collabora Limited
   </tp:copyright>
diff --git a/spec/Channel_Type_Room_List.xml b/spec/Channel_Type_Room_List1.xml
index c5567f80..f462e3a0 100644
--- a/spec/Channel_Type_Room_List.xml
+++ b/spec/Channel_Type_Room_List1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Channel_Type_Room_List" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<node name="/Channel_Type_Room_List1" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright> Copyright © 2005-2009 Collabora Limited </tp:copyright>
   <tp:copyright> Copyright © 2005-2009 Nokia Corporation </tp:copyright>
   <tp:copyright> Copyright © 2006 INdT </tp:copyright>
diff --git a/spec/Channel_Type_Server_Authentication.xml b/spec/Channel_Type_Server_Authentication1.xml
index eec13cd7..461cef02 100644
--- a/spec/Channel_Type_Server_Authentication.xml
+++ b/spec/Channel_Type_Server_Authentication1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Channel_Type_Server_Authentication" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<node name="/Channel_Type_Server_Authentication1" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright> Copyright © 2010 Collabora Limited </tp:copyright>
   <tp:license xmlns="http://www.w3.org/1999/xhtml">
     <p>This library is free software; you can redistribute it and/or
diff --git a/spec/Channel_Type_Server_TLS_Connection.xml b/spec/Channel_Type_Server_TLS_Connection1.xml
index 7d01a8e9..89fe43c6 100644
--- a/spec/Channel_Type_Server_TLS_Connection.xml
+++ b/spec/Channel_Type_Server_TLS_Connection1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Channel_Type_Server_TLS_Connection"
+<node name="/Channel_Type_Server_TLS_Connection1"
     xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright> Copyright © 2010 Collabora Limited </tp:copyright>
   <tp:license>
diff --git a/spec/Channel_Type_Stream_Tube.xml b/spec/Channel_Type_Stream_Tube1.xml
index 548ea1d5..e2f169dd 100644
--- a/spec/Channel_Type_Stream_Tube.xml
+++ b/spec/Channel_Type_Stream_Tube1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Channel_Type_Stream_Tube" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<node name="/Channel_Type_Stream_Tube1" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright>Copyright © 2008-2009 Collabora Limited</tp:copyright>
   <tp:copyright>Copyright © 2008-2009 Nokia Corporation</tp:copyright>
   <tp:license>
diff --git a/spec/Channel_Type_Text.xml b/spec/Channel_Type_Text1.xml
index b78c2c3d..c051c94a 100644
--- a/spec/Channel_Type_Text.xml
+++ b/spec/Channel_Type_Text1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Channel_Type_Text" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<node name="/Channel_Type_Text1" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright> Copyright © 2005-2011 Collabora Limited </tp:copyright>
   <tp:copyright> Copyright © 2005-2009 Nokia Corporation </tp:copyright>
   <tp:copyright> Copyright © 2006 INdT </tp:copyright>
diff --git a/spec/Connection_Interface_Addressing.xml b/spec/Connection_Interface_Addressing1.xml
index b6171349..6bec6d66 100644
--- a/spec/Connection_Interface_Addressing.xml
+++ b/spec/Connection_Interface_Addressing1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Connection_Interface_Addressing" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<node name="/Connection_Interface_Addressing1" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright> Copyright (C) 2010 Collabora Limited </tp:copyright>
   <tp:license xmlns="http://www.w3.org/1999/xhtml">
     <p>This library is free software; you can redistribute it and/or modify it
diff --git a/spec/Connection_Interface_Aliasing.xml b/spec/Connection_Interface_Aliasing1.xml
index 7fa5bccf..676f04e1 100644
--- a/spec/Connection_Interface_Aliasing.xml
+++ b/spec/Connection_Interface_Aliasing1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Connection_Interface_Aliasing" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<node name="/Connection_Interface_Aliasing1" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright> Copyright (C) 2005, 2006 Collabora Limited </tp:copyright>
   <tp:copyright> Copyright (C) 2005, 2006 Nokia Corporation </tp:copyright>
   <tp:copyright> Copyright (C) 2006 INdT </tp:copyright>
diff --git a/spec/Connection_Interface_Anonymity.xml b/spec/Connection_Interface_Anonymity1.xml
index 788610a0..8e626d06 100644
--- a/spec/Connection_Interface_Anonymity.xml
+++ b/spec/Connection_Interface_Anonymity1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Connection_Interface_Anonymity"
+<node name="/Connection_Interface_Anonymity1"
   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
 
   <tp:copyright>Copyright © 2008-2010 Nokia Corporation</tp:copyright>
diff --git a/spec/Connection_Interface_Avatars.xml b/spec/Connection_Interface_Avatars1.xml
index 889d9028..e2040984 100644
--- a/spec/Connection_Interface_Avatars.xml
+++ b/spec/Connection_Interface_Avatars1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Connection_Interface_Avatars" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<node name="/Connection_Interface_Avatars1" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright>Copyright (C) 2005-2008 Collabora Limited</tp:copyright>
   <tp:copyright>Copyright (C) 2005-2008 Nokia Corporation</tp:copyright>
   <tp:copyright>Copyright (C) 2006 INdT</tp:copyright>
diff --git a/spec/Connection_Interface_Balance.xml b/spec/Connection_Interface_Balance1.xml
index 8e737aa9..a01b8241 100644
--- a/spec/Connection_Interface_Balance.xml
+++ b/spec/Connection_Interface_Balance1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Connection_Interface_Balance"
+<node name="/Connection_Interface_Balance1"
   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright>Copyright © 2009 Collabora Ltd.</tp:copyright>
   <tp:copyright>Copyright © 2009 Nokia Corporation</tp:copyright>
diff --git a/spec/Connection_Interface_Cellular.xml b/spec/Connection_Interface_Cellular1.xml
index 83ba19d5..d5f66974 100644
--- a/spec/Connection_Interface_Cellular.xml
+++ b/spec/Connection_Interface_Cellular1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Connection_Interface_Cellular"
+<node name="/Connection_Interface_Cellular1"
   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
 
   <tp:copyright>Copyright © 2008-2010 Nokia Corporation</tp:copyright>
diff --git a/spec/Connection_Interface_Client_Types.xml b/spec/Connection_Interface_Client_Types1.xml
index c08d8c15..753da3c8 100644
--- a/spec/Connection_Interface_Client_Types.xml
+++ b/spec/Connection_Interface_Client_Types1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Connection_Interface_Client_Types"
+<node name="/Connection_Interface_Client_Types1"
   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright>Copyright (C) 2010 Collabora Ltd.</tp:copyright>
   <tp:license xmlns="http://www.w3.org/1999/xhtml">
diff --git a/spec/Connection_Interface_Communication_Policy.xml b/spec/Connection_Interface_Communication_Policy1.xml
index e9797ab5..33e9c56f 100644
--- a/spec/Connection_Interface_Communication_Policy.xml
+++ b/spec/Connection_Interface_Communication_Policy1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Connection_Interface_Communication_Policy"
+<node name="/Connection_Interface_Communication_Policy1"
   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright>Copyright © 2010 Collabora Limited</tp:copyright>
   <tp:license xmlns="http://www.w3.org/1999/xhtml">
diff --git a/spec/Connection_Interface_Contact_Blocking.xml b/spec/Connection_Interface_Contact_Blocking1.xml
index c524a074..594aff31 100644
--- a/spec/Connection_Interface_Contact_Blocking.xml
+++ b/spec/Connection_Interface_Contact_Blocking1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Connection_Interface_Contact_Blocking" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<node name="/Connection_Interface_Contact_Blocking1" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright>Copyright © 2009–2011 Collabora Ltd.</tp:copyright>
   <tp:copyright>Copyright © 2009 Nokia Corporation</tp:copyright>
   <tp:license xmlns="http://www.w3.org/1999/xhtml">
diff --git a/spec/Connection_Interface_Contact_Capabilities.xml b/spec/Connection_Interface_Contact_Capabilities1.xml
index bddc35c1..4a04f306 100644
--- a/spec/Connection_Interface_Contact_Capabilities.xml
+++ b/spec/Connection_Interface_Contact_Capabilities1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Connection_Interface_Contact_Capabilities" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<node name="/Connection_Interface_Contact_Capabilities1" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright> Copyright (C) 2005, 2006, 2008 Collabora Limited </tp:copyright>
   <tp:copyright> Copyright (C) 2005, 2006, 2008 Nokia Corporation </tp:copyright>
   <tp:copyright> Copyright (C) 2006 INdT </tp:copyright>
diff --git a/spec/Connection_Interface_Contact_Groups.xml b/spec/Connection_Interface_Contact_Groups1.xml
index cd86c75f..68ee9cc1 100644
--- a/spec/Connection_Interface_Contact_Groups.xml
+++ b/spec/Connection_Interface_Contact_Groups1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Connection_Interface_Contact_Groups" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<node name="/Connection_Interface_Contact_Groups1" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright>Copyright © 2009-2010 Collabora Ltd.</tp:copyright>
   <tp:copyright>Copyright © 2009 Nokia Corporation</tp:copyright>
   <tp:license xmlns="http://www.w3.org/1999/xhtml">
diff --git a/spec/Connection_Interface_Contact_Info.xml b/spec/Connection_Interface_Contact_Info1.xml
index 88812cab..6056b6ad 100644
--- a/spec/Connection_Interface_Contact_Info.xml
+++ b/spec/Connection_Interface_Contact_Info1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Connection_Interface_Contact_Info" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<node name="/Connection_Interface_Contact_Info1" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright> Copyright (C) 2008 Collabora Limited </tp:copyright>
   <tp:copyright> Copyright (C) 2008 Nokia Corporation </tp:copyright>
   <tp:license xmlns="http://www.w3.org/1999/xhtml">
diff --git a/spec/Connection_Interface_Contact_List.xml b/spec/Connection_Interface_Contact_List1.xml
index 714ea39e..895bbbbc 100644
--- a/spec/Connection_Interface_Contact_List.xml
+++ b/spec/Connection_Interface_Contact_List1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Connection_Interface_Contact_List" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<node name="/Connection_Interface_Contact_List1" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright>Copyright © 2009-2010 Collabora Ltd.</tp:copyright>
   <tp:copyright>Copyright © 2009 Nokia Corporation</tp:copyright>
   <tp:license xmlns="http://www.w3.org/1999/xhtml">
diff --git a/spec/Connection_Interface_Forwarding.xml b/spec/Connection_Interface_Forwarding1.xml
index ab680ef3..60aab7a5 100644
--- a/spec/Connection_Interface_Forwarding.xml
+++ b/spec/Connection_Interface_Forwarding1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Connection_Interface_Forwarding"
+<node name="/Connection_Interface_Forwarding1"
   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
 
   <tp:copyright>Copyright © 2005-2010 Nokia Corporation</tp:copyright>
diff --git a/spec/Connection_Interface_Keepalive.xml b/spec/Connection_Interface_Keepalive1.xml
index f39b23aa..e2c32dcb 100644
--- a/spec/Connection_Interface_Keepalive.xml
+++ b/spec/Connection_Interface_Keepalive1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Connection_Interface_Keepalive"
+<node name="/Connection_Interface_Keepalive1"
   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
 
   <tp:copyright>Copyright © 2010 Collabora Ltd.</tp:copyright>
diff --git a/spec/Connection_Interface_Location.xml b/spec/Connection_Interface_Location1.xml
index 6fba12e5..1f717eb3 100644
--- a/spec/Connection_Interface_Location.xml
+++ b/spec/Connection_Interface_Location1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Connection_Interface_Location"
+<node name="/Connection_Interface_Location1"
   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright>Copyright (C) 2008 Collabora Ltd.</tp:copyright>
   <tp:copyright>Copyright (C) 2008 Nokia Corporation</tp:copyright>
diff --git a/spec/Connection_Interface_Mail_Notification.xml b/spec/Connection_Interface_Mail_Notification1.xml
index 0fff4f36..b8ef504e 100644
--- a/spec/Connection_Interface_Mail_Notification.xml
+++ b/spec/Connection_Interface_Mail_Notification1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Connection_Interface_Mail_Notification"
+<node name="/Connection_Interface_Mail_Notification1"
   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"
   >
   <tp:copyright> Copyright (C) 2007 Collabora Limited </tp:copyright>
diff --git a/spec/Connection_Interface_Power_Saving.xml b/spec/Connection_Interface_Power_Saving1.xml
index 80879ca6..c4913807 100644
--- a/spec/Connection_Interface_Power_Saving.xml
+++ b/spec/Connection_Interface_Power_Saving1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Connection_Interface_Power_Saving"
+<node name="/Connection_Interface_Power_Saving1"
   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"
   >
   <tp:copyright> Copyright © 2007-2010 Collabora Limited </tp:copyright>
diff --git a/spec/Connection_Interface_Presence.xml b/spec/Connection_Interface_Presence1.xml
index 3e775135..1e27cc2e 100644
--- a/spec/Connection_Interface_Presence.xml
+++ b/spec/Connection_Interface_Presence1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Connection_Interface_Presence" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<node name="/Connection_Interface_Presence1" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright> Copyright (C) 2005-2008 Collabora Limited </tp:copyright>
   <tp:copyright> Copyright (C) 2005, 2006 Nokia Corporation </tp:copyright>
   <tp:copyright> Copyright (C) 2006 INdT </tp:copyright>
diff --git a/spec/Connection_Interface_Renaming.xml b/spec/Connection_Interface_Renaming1.xml
index 1fd74888..15b7a9ac 100644
--- a/spec/Connection_Interface_Renaming.xml
+++ b/spec/Connection_Interface_Renaming1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Connection_Interface_Renaming" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<node name="/Connection_Interface_Renaming1" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright> Copyright (C) 2005, 2006 Collabora Limited </tp:copyright>
   <tp:copyright> Copyright (C) 2005, 2006 Nokia Corporation </tp:copyright>
   <tp:copyright> Copyright (C) 2006 INdT </tp:copyright>
diff --git a/spec/Connection_Interface_Resources.xml b/spec/Connection_Interface_Resources1.xml
index 0f39ba2e..ca7dddd3 100644
--- a/spec/Connection_Interface_Resources.xml
+++ b/spec/Connection_Interface_Resources1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Connection_Interface_Resources"
+<node name="/Connection_Interface_Resources1"
   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright>Copyright © 2010 Collabora Ltd.</tp:copyright>
   <tp:license xmlns="http://www.w3.org/1999/xhtml">
diff --git a/spec/Connection_Interface_Service_Point.xml b/spec/Connection_Interface_Service_Point1.xml
index 9daf3e98..a650141b 100644
--- a/spec/Connection_Interface_Service_Point.xml
+++ b/spec/Connection_Interface_Service_Point1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Connection_Interface_Service_Point" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+<node name="/Connection_Interface_Service_Point1" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright> Copyright © 2005-2010 Nokia Corporation </tp:copyright>
   <tp:copyright> Copyright © 2005-2010 Collabora Ltd </tp:copyright>
   <tp:license xmlns="http://www.w3.org/1999/xhtml">
diff --git a/spec/Connection_Manager_Interface_Account_Storage.xml b/spec/Connection_Manager_Interface_Account_Storage1.xml
index 2229afe8..a3af965d 100644
--- a/spec/Connection_Manager_Interface_Account_Storage.xml
+++ b/spec/Connection_Manager_Interface_Account_Storage1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Connection_Manager_Interface_Account_Storage"
+<node name="/Connection_Manager_Interface_Account_Storage1"
   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
 
   <tp:copyright>Copyright © 2011 Collabora Ltd.</tp:copyright>
diff --git a/spec/Debug.xml b/spec/Debug1.xml
index fd491c54..ae98c2db 100644
--- a/spec/Debug.xml
+++ b/spec/Debug1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Debug"
+<node name="/Debug1"
   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
   <tp:copyright>Copyright (C) 2009 Collabora Ltd.</tp:copyright>
   <tp:license xmlns="http://www.w3.org/1999/xhtml">
diff --git a/spec/Protocol_Interface_Addressing.xml b/spec/Protocol_Interface_Addressing1.xml
index 84501b4f..d3abe062 100644
--- a/spec/Protocol_Interface_Addressing.xml
+++ b/spec/Protocol_Interface_Addressing1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Protocol_Interface_Addressing"
+<node name="/Protocol_Interface_Addressing1"
   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
 
   <tp:copyright>Copyright © 2010 Collabora Ltd.</tp:copyright>
diff --git a/spec/Protocol_Interface_Avatars.xml b/spec/Protocol_Interface_Avatars1.xml
index 66124290..9faefe64 100644
--- a/spec/Protocol_Interface_Avatars.xml
+++ b/spec/Protocol_Interface_Avatars1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Protocol_Interface_Avatars"
+<node name="/Protocol_Interface_Avatars1"
   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
 
   <tp:copyright>Copyright © 2009-2010 Collabora Ltd.</tp:copyright>
diff --git a/spec/Protocol_Interface_Presence.xml b/spec/Protocol_Interface_Presence1.xml
index 52fe28fd..9ae79e5c 100644
--- a/spec/Protocol_Interface_Presence.xml
+++ b/spec/Protocol_Interface_Presence1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Protocol_Interface_Presence"
+<node name="/Protocol_Interface_Presence1"
   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
 
   <tp:copyright>Copyright © 2009-2010 Collabora Ltd.</tp:copyright>
diff --git a/spec/all.xml b/spec/all.xml
index fbb10499..64330ad8 100644
--- a/spec/all.xml
+++ b/spec/all.xml
@@ -32,11 +32,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
   </p>
  </tp:docstring>
  <xi:include href="Connection_Manager.xml"/>
- <xi:include href="Connection_Manager_Interface_Account_Storage.xml"/>
+ <xi:include href="Connection_Manager_Interface_Account_Storage1.xml"/>
  <xi:include href="Protocol.xml"/>
- <xi:include href="Protocol_Interface_Addressing.xml"/>
- <xi:include href="Protocol_Interface_Avatars.xml"/>
- <xi:include href="Protocol_Interface_Presence.xml"/>
+ <xi:include href="Protocol_Interface_Addressing1.xml"/>
+ <xi:include href="Protocol_Interface_Avatars1.xml"/>
+ <xi:include href="Protocol_Interface_Presence1.xml"/>
 
  <tp:section name="Connection Object">
   <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
@@ -62,9 +62,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
     </p>
    </tp:docstring>
 
-   <xi:include href="Connection_Interface_Contact_List.xml"/>
-   <xi:include href="Connection_Interface_Contact_Groups.xml"/>
-   <xi:include href="Connection_Interface_Contact_Blocking.xml"/>
+   <xi:include href="Connection_Interface_Contact_List1.xml"/>
+   <xi:include href="Connection_Interface_Contact_Groups1.xml"/>
+   <xi:include href="Connection_Interface_Contact_Blocking1.xml"/>
   </tp:section>
 
   <tp:section name="Contact metadata interfaces">
@@ -77,15 +77,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
     </p>
    </tp:docstring>
 
-   <xi:include href="Connection_Interface_Aliasing.xml"/>
-   <xi:include href="Connection_Interface_Avatars.xml"/>
-   <xi:include href="Connection_Interface_Client_Types.xml"/>
-   <xi:include href="Connection_Interface_Contact_Capabilities.xml"/>
-   <xi:include href="Connection_Interface_Contact_Info.xml"/>
-   <xi:include href="Connection_Interface_Location.xml"/>
-   <xi:include href="Connection_Interface_Presence.xml"/>
-   <xi:include href="Connection_Interface_Renaming.xml"/>
-   <xi:include href="Connection_Interface_Resources.xml"/>
+   <xi:include href="Connection_Interface_Aliasing1.xml"/>
+   <xi:include href="Connection_Interface_Avatars1.xml"/>
+   <xi:include href="Connection_Interface_Client_Types1.xml"/>
+   <xi:include href="Connection_Interface_Contact_Capabilities1.xml"/>
+   <xi:include href="Connection_Interface_Contact_Info1.xml"/>
+   <xi:include href="Connection_Interface_Location1.xml"/>
+   <xi:include href="Connection_Interface_Presence1.xml"/>
+   <xi:include href="Connection_Interface_Renaming1.xml"/>
+   <xi:include href="Connection_Interface_Resources1.xml"/>
   </tp:section>
 
   <tp:section name="Connection feature interfaces">
@@ -96,16 +96,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
     </p>
    </tp:docstring>
 
-   <xi:include href="Connection_Interface_Addressing.xml"/>
-   <xi:include href="Connection_Interface_Anonymity.xml"/>
-   <xi:include href="Connection_Interface_Balance.xml"/>
-   <xi:include href="Connection_Interface_Cellular.xml"/>
-   <xi:include href="Connection_Interface_Communication_Policy.xml"/>
-   <xi:include href="Connection_Interface_Forwarding.xml"/>
-   <xi:include href="Connection_Interface_Keepalive.xml"/>
-   <xi:include href="Connection_Interface_Mail_Notification.xml"/>
-   <xi:include href="Connection_Interface_Power_Saving.xml"/>
-   <xi:include href="Connection_Interface_Service_Point.xml"/>
+   <xi:include href="Connection_Interface_Addressing1.xml"/>
+   <xi:include href="Connection_Interface_Anonymity1.xml"/>
+   <xi:include href="Connection_Interface_Balance1.xml"/>
+   <xi:include href="Connection_Interface_Cellular1.xml"/>
+   <xi:include href="Connection_Interface_Communication_Policy1.xml"/>
+   <xi:include href="Connection_Interface_Forwarding1.xml"/>
+   <xi:include href="Connection_Interface_Keepalive1.xml"/>
+   <xi:include href="Connection_Interface_Mail_Notification1.xml"/>
+   <xi:include href="Connection_Interface_Power_Saving1.xml"/>
+   <xi:include href="Connection_Interface_Service_Point1.xml"/>
   </tp:section>
  </tp:section>
 
@@ -130,15 +130,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
      Each Channel implements one of the following types:
     </p>
    </tp:docstring>
-   <xi:include href="Channel_Type_Call.xml"/>
-   <xi:include href="Channel_Type_Contact_Search.xml"/>
-   <xi:include href="Channel_Type_DBus_Tube.xml"/>
-   <xi:include href="Channel_Type_File_Transfer.xml"/>
-   <xi:include href="Channel_Type_Room_List.xml"/>
-   <xi:include href="Channel_Type_Server_Authentication.xml"/>
-   <xi:include href="Channel_Type_Server_TLS_Connection.xml"/>
-   <xi:include href="Channel_Type_Stream_Tube.xml"/>
-   <xi:include href="Channel_Type_Text.xml"/>
+   <xi:include href="Channel_Type_Call1.xml"/>
+   <xi:include href="Channel_Type_Contact_Search1.xml"/>
+   <xi:include href="Channel_Type_DBus_Tube1.xml"/>
+   <xi:include href="Channel_Type_File_Transfer1.xml"/>
+   <xi:include href="Channel_Type_Room_List1.xml"/>
+   <xi:include href="Channel_Type_Server_Authentication1.xml"/>
+   <xi:include href="Channel_Type_Server_TLS_Connection1.xml"/>
+   <xi:include href="Channel_Type_Stream_Tube1.xml"/>
+   <xi:include href="Channel_Type_Text1.xml"/>
   </tp:section>
 
   <tp:section name="Channel Interfaces">
@@ -151,21 +151,21 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
     </p>
    </tp:docstring>
 
-   <xi:include href="Channel_Interface_Addressing.xml"/>
-   <xi:include href="Channel_Interface_Anonymity.xml"/>
-   <xi:include href="Channel_Interface_Destroyable.xml"/>
-   <xi:include href="Channel_Interface_File_Transfer_Metadata.xml"/>
-   <xi:include href="Channel_Interface_Group.xml"/>
-   <xi:include href="Channel_Interface_Password.xml"/>
-   <xi:include href="Channel_Interface_Room.xml"/>
-   <xi:include href="Channel_Interface_Room_Config.xml"/>
-   <xi:include href="Channel_Interface_SASL_Authentication.xml"/>
-   <xi:include href="Channel_Interface_Credentials_Storage.xml"/>
-   <xi:include href="Channel_Interface_Securable.xml"/>
-   <xi:include href="Channel_Interface_Service_Point.xml"/>
-   <xi:include href="Channel_Interface_Subject.xml"/>
-   <xi:include href="Channel_Interface_Picture.xml"/>
-   <xi:include href="Channel_Interface_Tube.xml"/>
+   <xi:include href="Channel_Interface_Addressing1.xml"/>
+   <xi:include href="Channel_Interface_Anonymity1.xml"/>
+   <xi:include href="Channel_Interface_Destroyable1.xml"/>
+   <xi:include href="Channel_Interface_File_Transfer_Metadata1.xml"/>
+   <xi:include href="Channel_Interface_Group1.xml"/>
+   <xi:include href="Channel_Interface_Password1.xml"/>
+   <xi:include href="Channel_Interface_Room1.xml"/>
+   <xi:include href="Channel_Interface_Room_Config1.xml"/>
+   <xi:include href="Channel_Interface_SASL_Authentication1.xml"/>
+   <xi:include href="Channel_Interface_Credentials_Storage1.xml"/>
+   <xi:include href="Channel_Interface_Securable1.xml"/>
+   <xi:include href="Channel_Interface_Service_Point1.xml"/>
+   <xi:include href="Channel_Interface_Subject1.xml"/>
+   <xi:include href="Channel_Interface_Picture1.xml"/>
+   <xi:include href="Channel_Interface_Tube1.xml"/>
 
    <tp:section name="Text-specific interfaces">
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
@@ -173,9 +173,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         namespace='imt1.Channel.Type'>Text</tp:dbus-ref>.</p>
     </tp:docstring>
 
-    <xi:include href="Channel_Interface_Chat_State.xml"/>
-    <xi:include href="Channel_Interface_HTML.xml"/>
-    <xi:include href="Channel_Interface_SMS.xml"/>
+    <xi:include href="Channel_Interface_Chat_State1.xml"/>
+    <xi:include href="Channel_Interface_HTML1.xml"/>
+    <xi:include href="Channel_Interface_SMS1.xml"/>
    </tp:section>
 
    <tp:section name="Call-related interfaces">
@@ -184,8 +184,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
        namespace='imt1.Channel.Type'>Call1</tp:dbus-ref>.</p>
     </tp:docstring>
 
-    <xi:include href="Channel_Interface_DTMF.xml"/>
-    <xi:include href="Channel_Interface_Hold.xml"/>
+    <xi:include href="Channel_Interface_DTMF1.xml"/>
+    <xi:include href="Channel_Interface_Hold1.xml"/>
    </tp:section>
 
    <tp:section name="Conference-related interfaces">
@@ -197,9 +197,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
        channels, but may also appear on other types of channel.</p>
     </tp:docstring>
 
-    <xi:include href="Channel_Interface_Conference.xml"/>
-    <xi:include href="Channel_Interface_Splittable.xml"/>
-    <xi:include href="Channel_Interface_Mergeable_Conference.xml"/>
+    <xi:include href="Channel_Interface_Conference1.xml"/>
+    <xi:include href="Channel_Interface_Splittable1.xml"/>
+    <xi:include href="Channel_Interface_Mergeable_Conference1.xml"/>
    </tp:section>
   </tp:section>
  </tp:section>
@@ -219,20 +219,20 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
    <xi:include href="Call_Content.xml"/>
    <xi:include href="Call_Content_Interface_Media.xml"/>
    <xi:include href="Call_Interface_Mute.xml"/>
-   <xi:include href="Call_Content_Interface_Video_Control.xml"/>
-   <xi:include href="Call_Content_Interface_Audio_Control.xml"/>
+   <xi:include href="Call_Content_Interface_Video_Control1.xml"/>
+   <xi:include href="Call_Content_Interface_Audio_Control1.xml"/>
    <xi:include href="Call_Content_Media_Description.xml"/>
-   <xi:include href="Call_Content_Media_Description_Interface_RTP_Header_Extensions.xml"/>
-   <xi:include href="Call_Content_Media_Description_Interface_RTCP_Feedback.xml"/>
+   <xi:include href="Call_Content_Media_Description_Interface_RTP_Header_Extensions1.xml"/>
+   <xi:include href="Call_Content_Media_Description_Interface_RTCP_Feedback1.xml"/>
    <xi:include
-   href="Call_Content_Media_Description_Interface_RTCP_Extended_Reports.xml"/>
+   href="Call_Content_Media_Description_Interface_RTCP_Extended_Reports1.xml"/>
    <xi:include href="Call_Stream.xml"/>
    <xi:include href="Call_Stream_Interface_Media.xml"/>
    <xi:include href="Call_Stream_Endpoint.xml"/>
  </tp:section>
 
  <tp:section name="Debugging">
-  <xi:include href="Debug.xml"/>
+  <xi:include href="Debug1.xml"/>
  </tp:section>
 </tp:section>
 
@@ -246,13 +246,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
   </p>
  </tp:docstring>
  <xi:include href="Account_Manager.xml"/>
- <xi:include href="Account_Manager_Interface_Hidden.xml"/>
+ <xi:include href="Account_Manager_Interface_Hidden1.xml"/>
  <xi:include href="Account.xml"/>
- <xi:include href="Account_Interface_Addressing.xml"/>
- <xi:include href="Account_Interface_Avatar.xml"/>
- <xi:include href="Account_Interface_Hidden.xml"/>
- <xi:include href="Account_Interface_Storage.xml"/>
- <xi:include href="Account_Interface_External_Password_Storage.xml"/>
+ <xi:include href="Account_Interface_Addressing1.xml"/>
+ <xi:include href="Account_Interface_Avatar1.xml"/>
+ <xi:include href="Account_Interface_Hidden1.xml"/>
+ <xi:include href="Account_Interface_Storage1.xml"/>
+ <xi:include href="Account_Interface_External_Password_Storage1.xml"/>
 </tp:section>
 
 <tp:section name="The Channel Dispatcher">
@@ -264,7 +264,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
   </p>
  </tp:docstring>
  <xi:include href="Channel_Dispatcher.xml"/>
- <xi:include href="Channel_Dispatcher_Interface_Operation_List.xml"/>
+ <xi:include href="Channel_Dispatcher_Interface_Operation_List1.xml"/>
  <xi:include href="Channel_Dispatch_Operation.xml"/>
  <xi:include href="Channel_Request.xml"/>
 </tp:section>
diff --git a/spec/template.xml b/spec/template.xml
index 33cc0e1f..f5a9529d 100644
--- a/spec/template.xml
+++ b/spec/template.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<node name="/Foo"
+<node name="/Foo1"
   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
 
   <tp:copyright>Copyright © 2010 Collabora Ltd.</tp:copyright>