Update to the latest darcs telepathy-spec (my codegen branch)

38 files changed, 1271 insertions, 469 deletions

diff --git a/spec/Account.xml b/spec/Account.xml
index 5521f5cc..a274bc2b 100644
--- a/spec/Account.xml
+++ b/spec/Account.xml
@@ -130,7 +130,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       </tp:docstring>
     </signal>
 
-    <signal name="AccountPropertyChanged">
+    <signal name="AccountPropertyChanged"
+      tp:name-for-bindings="Account_Property_Changed">
       <tp:docstring>
         The values of one or more properties on this interface (that do not
         specify that this signal does not apply to them) may have changed.
@@ -147,7 +148,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       </arg>
     </signal>
 
-    <property name="DisplayName" type="s" access="readwrite">
+    <property name="DisplayName" type="s" access="readwrite"
+      tp:name-for-bindings="Display_Name">
       <tp:docstring>
         The user-visible name of this account. This SHOULD be chosen by the
         user at account creation time. The account creation user interface
@@ -263,7 +265,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       </tp:docstring>
     </property>
 
-    <method name="UpdateParameters">
+    <method name="UpdateParameters" tp:name-for-bindings="Update_Parameters">
       <tp:docstring>
         Change the value of the Parameters property. Any changes will not
         take effect until the next time the account is disconnected and
@@ -298,36 +300,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       </tp:possible-errors>
     </method>
 
-    <tp:struct name="Account_Presence">
-      <tp:docstring>
-        A simplified form of the presence statuses seen in the Presence
-        interface.
-      </tp:docstring>
-
-      <tp:member name="Type" type="u" tp:type="Connection_Presence_Type">
-        <tp:docstring>
-          The presence type, e.g. Connection_Presence_Type_Away.
-        </tp:docstring>
-      </tp:member>
-
-      <tp:member name="Status" type="s">
-        <tp:docstring>
-          The connection-manager-specific string identifier of the presence
-          status, e.g. "brb".
-        </tp:docstring>
-      </tp:member>
-
-      <tp:member name="Message" type="s">
-        <tp:docstring>
-          The user-defined status message, e.g. "Back soon!". This will be
-          used as the value for the 'message' keyword in the Presence
-          interface's dictionary, if possible.
-        </tp:docstring>
-      </tp:member>
-    </tp:struct>
-
     <property name="AutomaticPresence" type="(uss)" access="readwrite"
-      tp:type="Account_Presence">
+      tp:type="Simple_Presence" tp:name-for-bindings="Automatic_Presence">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>The presence status that this account should have if it is brought
           online.</p>
@@ -346,7 +320,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       </tp:docstring>
     </property>
 
-    <property name="ConnectAutomatically" type="b" access="readwrite">
+    <property name="ConnectAutomatically" type="b" access="readwrite"
+      tp:name-for-bindings="Connect_Automatically">
       <tp:docstring>
         If true, the account manager SHOULD attempt to put this account
         online with the AutomaticPresence whenever possible (in the base
@@ -371,7 +346,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       </tp:docstring>
     </property>
 
-    <property name="ConnectionStatus" type="u" access="read">
+    <property name="ConnectionStatus" type="u" access="read"
+      tp:name-for-bindings="Connection_Status">
       <tp:docstring>
         If the Connection property is non-empty, the status of that connection.
         If the Connection property is the empty string, this property may
@@ -390,7 +366,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       </tp:docstring>
     </property>
 
-    <property name="ConnectionStatusReason" type="u" access="read">
+    <property name="ConnectionStatusReason" type="u" access="read"
+      tp:name-for-bindings="Connection_Status_Reason">
       <tp:docstring>
         The reason for the last change to ConnectionStatus.
         The account manager is expected to set this by observing signals
@@ -405,7 +382,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     </property>
 
     <property name="CurrentPresence" type="(uss)" access="read"
-      tp:type="Account_Presence">
+      tp:type="Simple_Presence" tp:name-for-bindings="Current_Presence">
       <tp:docstring>
         The actual presence. If the connection is not online, this should be
         (Connection_Presence_Type_Offline, "", "").
@@ -421,7 +398,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     </property>
 
     <property name="RequestedPresence" type="(uss)" access="readwrite"
-      tp:type="Account_Presence">
+      tp:type="Simple_Presence" tp:name-for-bindings="Requested_Presence">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>The requested presence for this account. When this is changed, the
           account manager should attempt to manipulate the connection manager
@@ -440,7 +417,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       </tp:docstring>
     </property>
 
-    <property name="NormalizedName" type="s" access="read">
+    <property name="NormalizedName" type="s" access="read"
+      tp:name-for-bindings="Normalized_Name">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>The normalized user ID of the local user on this account (i.e. the
           string returned when the InspectHandle method is called on the
diff --git a/spec/Account_Interface_Avatar.xml b/spec/Account_Interface_Avatar.xml
index cb58256e..4ffb8f5c 100644
--- a/spec/Account_Interface_Avatar.xml
+++ b/spec/Account_Interface_Avatar.xml
@@ -50,7 +50,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       </tp:docstring>
     </property>
 
-    <signal name="AvatarChanged">
+    <signal name="AvatarChanged" tp:name-for-bindings="Avatar_Changed">
       <tp:docstring>
         Emitted when the Avatar property changes.
         
diff --git a/spec/Account_Manager.xml b/spec/Account_Manager.xml
index a068da37..841601ac 100644
--- a/spec/Account_Manager.xml
+++ b/spec/Account_Manager.xml
@@ -49,7 +49,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       </tp:docstring>
     </property>
 
-    <property name="ValidAccounts" type="ao" access="read">
+    <property name="ValidAccounts" type="ao" access="read"
+      tp:name-for-bindings="Valid_Accounts">
       <tp:docstring>
         A list of the valid (complete, usable) accounts. Change notification
         is via AccountValidityChanged.
@@ -63,14 +64,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       </tp:docstring>
     </property>
 
-    <property name="InvalidAccounts" type="ao" access="read">
+    <property name="InvalidAccounts" type="ao" access="read"
+      tp:name-for-bindings="Invalid_Accounts">
       <tp:docstring>
         A list of incomplete or otherwise unusable accounts. Change
         notification is via AccountValidityChanged.
       </tp:docstring>
     </property>
 
-    <signal name="AccountRemoved">
+    <signal name="AccountRemoved" tp:name-for-bindings="Account_Removed">
       <tp:docstring>
         The given account has been removed.
 
@@ -87,7 +89,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       </arg>
     </signal>
 
-    <signal name="AccountValidityChanged">
+    <signal name="AccountValidityChanged"
+      tp:name-for-bindings="Account_Validity_Changed">
       <tp:docstring>
         The validity of the given account has changed. New accounts are
         also indicated by this signal, as an account validity change
@@ -112,7 +115,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       </arg>
     </signal>
 
-    <method name="CreateAccount">
+    <method name="CreateAccount" tp:name-for-bindings="Create_Account">
       <tp:docstring>
         Request the creation of a new account. The account manager SHOULD NOT
         allow invalid accounts to be created. Accounts created through this
diff --git a/spec/Channel.xml b/spec/Channel.xml
index 61da1341..dcd28f06 100644
--- a/spec/Channel.xml
+++ b/spec/Channel.xml
@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
   <interface name="org.freedesktop.Telepathy.Channel">
 
     <property name="ChannelType" type="s" tp:type="DBus_Interface"
-      access="read">
+      access="read" tp:name-for-bindings="Channel_Type">
       <tp:added version="0.17.7"/>
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>The channel's type. This cannot change once the channel has
@@ -62,7 +62,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:docstring>
     </property>
 
-    <property name="TargetHandle" type="u" access="read" tp:type="Handle">
+    <property name="TargetHandle" type="u" access="read" tp:type="Handle"
+      tp:name-for-bindings="Target_Handle">
       <tp:added version="0.17.7"/>
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>The handle (a representation for the identifier) of the contact,
@@ -83,7 +84,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
     </property>
 
     <property name="TargetHandleType" type="u" access="read"
-      tp:type="Handle_Type">
+      tp:type="Handle_Type" tp:name-for-bindings="Target_Handle_Type">
       <tp:added version="0.17.7"/>
       <tp:docstring>
         The type of TargetHandle.
@@ -124,7 +125,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:docstring>
     </signal>
 
-    <method name="GetChannelType">
+    <method name="GetChannelType" tp:name-for-bindings="Get_Channel_Type">
       <tp:deprecated version="0.17.7">Use the ChannelType
         property if possible.</tp:deprecated>
       <arg direction="out" type="s" tp:type="DBus_Interface">
@@ -142,7 +143,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:docstring>
     </method>
 
-    <method name="GetHandle">
+    <method name="GetHandle" tp:name-for-bindings="Get_Handle">
       <tp:deprecated version="0.17.7">Use the TargetHandleType
         and TargetHandle properties if possible.</tp:deprecated>
       <arg direction="out" type="u" tp:type="Handle_Type">
@@ -169,7 +170,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:docstring>
     </method>
 
-    <method name="GetInterfaces">
+    <method name="GetInterfaces" tp:name-for-bindings="Get_Interfaces">
       <tp:deprecated version="0.17.7">Use the Interfaces
         property if possible.</tp:deprecated>
       <arg direction="out" type="as" tp:type="DBus_Interface[]">
diff --git a/spec/Channel_Future.xml b/spec/Channel_Future.xml
index 09d116ff..50f3b37b 100644
--- a/spec/Channel_Future.xml
+++ b/spec/Channel_Future.xml
@@ -42,7 +42,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:rationale>
     </tp:docstring>
 
-    <property name="TargetID" type="s" access="read">
+    <property name="TargetID" type="s" access="read"
+      tp:name-for-bindings="Target_ID">
       <tp:added version="0.17.7">(in Channel.FUTURE
         pseudo-interface)</tp:added>
       <tp:docstring>
@@ -57,7 +58,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
     </property>
 
     <property name="InitiatorHandle" type="u" tp:type="Contact_Handle"
-      access="read">
+      access="read" tp:name-for-bindings="Initiator_Handle">
       <tp:added version="0.17.7">(in Channel.FUTURE
         pseudo-interface)</tp:added>
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
@@ -90,7 +91,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:docstring>
     </property>
 
-    <property name="InitiatorID" type="s" access="read">
+    <property name="InitiatorID" type="s" access="read"
+      tp:name-for-bindings="Initiator_ID">
       <tp:added version="0.17.7">(in Channel.FUTURE
         pseudo-interface)</tp:added>
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
diff --git a/spec/Channel_Handler.xml b/spec/Channel_Handler.xml
index 06b14e80..e9428391 100644
--- a/spec/Channel_Handler.xml
+++ b/spec/Channel_Handler.xml
@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
     </tp:docstring>
     <tp:added version="0.17.0"/>
 
-    <method name="HandleChannel">
+    <method name="HandleChannel" tp:name-for-bindings="Handle_Channel">
       <tp:docstring>
         Called when a channel handler should handle a new channel.
       </tp:docstring>
diff --git a/spec/Channel_Interface_Call_State.xml b/spec/Channel_Interface_Call_State.xml
index aead16bb..132137ed 100644
--- a/spec/Channel_Interface_Call_State.xml
+++ b/spec/Channel_Interface_Call_State.xml
@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
     </tp:docstring>
     <tp:added version="0.17.2"/>
 
-    <method name="GetCallStates">
+    <method name="GetCallStates" tp:name-for-bindings="Get_Call_States">
       <tp:docstring>
         Get the current call states for all contacts involved in this call.
       </tp:docstring>
@@ -43,18 +43,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </arg>
     </method>
 
-    <signal name="CallStateChanged">
+    <signal name="CallStateChanged" tp:name-for-bindings="Call_State_Changed">
       <tp:docstring>
         Emitted when the state of a member of the channel has changed.
       </tp:docstring>
 
-      <arg name="contact" type="u" tp:type="Contact_Handle">
+      <arg name="Contact" type="u" tp:type="Contact_Handle">
         <tp:docstring>
           An integer handle for the contact.
         </tp:docstring>
       </arg>
 
-      <arg name="state" type="u" tp:type="Channel_Call_State_Flags">
+      <arg name="State" type="u" tp:type="Channel_Call_State_Flags">
         <tp:docstring>
           The new state for this contact.
         </tp:docstring>
diff --git a/spec/Channel_Interface_Chat_State.xml b/spec/Channel_Interface_Chat_State.xml
index 9cc6883d..aa292367 100644
--- a/spec/Channel_Interface_Chat_State.xml
+++ b/spec/Channel_Interface_Chat_State.xml
@@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
   </tp:license>
   <interface name="org.freedesktop.Telepathy.Channel.Interface.ChatState">
     <tp:requires interface="org.freedesktop.Telepathy.Channel"/>
-    <method name="SetChatState">
-      <arg direction="in" name="state" type="u" tp:type="Channel_Chat_State">
+    <method name="SetChatState" tp:name-for-bindings="Set_Chat_State">
+      <arg direction="in" name="State" type="u" tp:type="Channel_Chat_State">
         <tp:docstring>
           The new state: one of the values of ChannelChatState.
         </tp:docstring>
@@ -34,13 +34,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"/>
       </tp:possible-errors>
     </method>
-    <signal name="ChatStateChanged">
-      <arg name="contact" type="u" tp:type="Contact_Handle">
+    <signal name="ChatStateChanged" tp:name-for-bindings="Chat_State_Changed">
+      <arg name="Contact" type="u" tp:type="Contact_Handle">
         <tp:docstring>
           An integer handle for the contact.
         </tp:docstring>
       </arg>
-      <arg name="state" type="u" tp:type="Channel_Chat_State">
+      <arg name="State" type="u" tp:type="Channel_Chat_State">
         <tp:docstring>
           The new state of this contact: one of the values of ChannelChatState.
         </tp:docstring>
diff --git a/spec/Channel_Interface_DTMF.xml b/spec/Channel_Interface_DTMF.xml
index c24ec110..8abb8dce 100644
--- a/spec/Channel_Interface_DTMF.xml
+++ b/spec/Channel_Interface_DTMF.xml
@@ -21,11 +21,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
   <interface name="org.freedesktop.Telepathy.Channel.Interface.DTMF">
     <tp:requires interface="org.freedesktop.Telepathy.Channel.Type.StreamedMedia"/>
 
-    <method name="StartTone">
-      <arg direction="in" name="stream_id" type="u" tp:type="Stream_ID">
+    <method name="StartTone" tp:name-for-bindings="Start_Tone">
+      <arg direction="in" name="Stream_ID" type="u" tp:type="Stream_ID">
         <tp:docstring>A stream ID as defined in the StreamedMedia channel type.</tp:docstring>
       </arg>
-      <arg direction="in" name="event" type="y" tp:type="DTMF_Event">
+      <arg direction="in" name="Event" type="y" tp:type="DTMF_Event">
         <tp:docstring>A numeric event code from the DTMF_Event enum.</tp:docstring>
       </arg>
       <tp:docstring>
@@ -50,8 +50,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:possible-errors>
     </method>
 
-    <method name="StopTone">
-      <arg direction="in" name="stream_id" type="u" tp:type="Stream_ID">
+    <method name="StopTone" tp:name-for-bindings="Stop_Tone">
+      <arg direction="in" name="Stream_ID" type="u" tp:type="Stream_ID">
         <tp:docstring>A stream ID as defined in the StreamedMedia channel type.</tp:docstring>
       </arg>
       <tp:docstring>
diff --git a/spec/Channel_Interface_Delivery_Reporting.xml b/spec/Channel_Interface_Delivery_Reporting.xml
index 29b0f769..494b44de 100644
--- a/spec/Channel_Interface_Delivery_Reporting.xml
+++ b/spec/Channel_Interface_Delivery_Reporting.xml
@@ -249,7 +249,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </dl>
     </tp:docstring>
 
-    <tp:enum name="Delivery_Status" value-prefix="Delivery_Status">
+    <tp:enum name="Delivery_Status" value-prefix="Delivery_Status" type="u">
       <tp:docstring>
         <p>The status of a message as indicated by a delivery report.</p>
 
@@ -304,7 +304,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
     </tp:enum>
 
     <tp:flags name="Delivery_Reporting_Support_Flags"
-      value-prefix="Delivery_Reporting_Support_Flag">
+      value-prefix="Delivery_Reporting_Support_Flag" type="u">
       <tp:docstring>
         Flags indicating the level of support for delivery reporting on this
         channel. Any future flags added to this set will conform to the
@@ -354,13 +354,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
     </tp:flags>
 
     <property name="DeliveryReportingSupport" access="read"
-      tp:type="Delivery_Reporting_Support_Flags" type="u">
+      tp:type="Delivery_Reporting_Support_Flags" type="u"
+      tp:name-for-bindings="Delivery_Reporting_Support">
       <tp:docstring>
         A bitfield indicating features supported by this channel.
       </tp:docstring>
     </property>
 
-    <method name="SendDeliveryReport">
+    <method name="SendDeliveryReport"
+      tp:name-for-bindings="Send_Delivery_Report">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>Request that a delivery report is sent for the specified pending
           incoming message. Delivery reports cannot currently be sent for
diff --git a/spec/Channel_Interface_Group.xml b/spec/Channel_Interface_Group.xml
index cab68c5c..21b535e2 100644
--- a/spec/Channel_Interface_Group.xml
+++ b/spec/Channel_Interface_Group.xml
@@ -48,13 +48,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:member>
     </tp:struct>
 
-    <method name="AddMembers">
-      <arg direction="in" name="contacts" type="au" tp:type="Contact_Handle[]">
+    <method name="AddMembers" tp:name-for-bindings="Add_Members">
+      <arg direction="in" name="Contacts" type="au" tp:type="Contact_Handle[]">
         <tp:docstring>
           An array of contact handles to invite to the channel
         </tp:docstring>
       </arg>
-      <arg direction="in" name="message" type="s">
+      <arg direction="in" name="Message" type="s">
         <tp:docstring>
           A string message, which can be blank if desired
         </tp:docstring>
@@ -83,7 +83,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:possible-errors>
     </method>
 
-    <method name="GetAllMembers">
+    <method name="GetAllMembers" tp:name-for-bindings="Get_All_Members">
       <tp:deprecated version="0.17.6">Use GetAll on the D-Bus
         Properties D-Bus interface to get properties including Members,
         RemotePendingMembers and LocalPendingMembers instead, falling back to
@@ -211,7 +211,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
     </tp:flags>
 
     <property name="GroupFlags" type="u" tp:type="Channel_Group_Flags"
-      access="read">
+      access="read" tp:name-for-bindings="Group_Flags">
       <tp:docstring>
         An integer representing the bitwise-OR of flags on this
         channel. The user interface can use this to present information about
@@ -223,7 +223,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         Channel_Group_Flag_Properties is not present.</tp:added>
     </property>
 
-    <method name="GetGroupFlags">
+    <method name="GetGroupFlags" tp:name-for-bindings="Get_Group_Flags">
       <arg direction="out" type="u" tp:type="Channel_Group_Flags">
         <tp:docstring>
           The value of the GroupFlags property
@@ -264,7 +264,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
     </tp:mapping>
 
     <property name="HandleOwners" type="a{uu}" tp:type="Handle_Owner_Map"
-      access="read">
+      access="read" tp:name-for-bindings="Handle_Owners">
       <tp:docstring>
         A map from channel-specific handles to their owners, including
         at least all of the channel-specific handles in this channel's members,
@@ -277,7 +277,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       <tp:added version="0.17.6"/>
     </property>
 
-    <signal name="HandleOwnersChanged">
+    <signal name="HandleOwnersChanged"
+      tp:name-for-bindings="Handle_Owners_Changed">
       <tp:docstring>
         Emitted whenever the HandleOwners property changes.
       </tp:docstring>
@@ -301,8 +302,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </arg>
     </signal>
 
-    <method name="GetHandleOwners">
-      <arg direction="in" name="handles" type="au" tp:type="Contact_Handle[]">
+    <method name="GetHandleOwners" tp:name-for-bindings="Get_Handle_Owners">
+      <arg direction="in" name="Handles" type="au" tp:type="Contact_Handle[]">
         <tp:docstring>
           A list of integer handles representing members of the channel
         </tp:docstring>
@@ -344,7 +345,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:possible-errors>
     </method>
 
-    <method name="GetLocalPendingMembers">
+    <method name="GetLocalPendingMembers"
+      tp:name-for-bindings="Get_Local_Pending_Members">
       <arg direction="out" type="au" tp:type="Contact_Handle[]"/>
       <tp:docstring>
         Returns the To_Be_Added handle (only) for each structure in the
@@ -358,7 +360,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:possible-errors>
     </method>
 
-    <method name="GetLocalPendingMembersWithInfo">
+    <method name="GetLocalPendingMembersWithInfo"
+      tp:name-for-bindings="Get_Local_Pending_Members_With_Info">
       <tp:added version="0.15.0" />
       <tp:docstring>
         Returns the LocalPendingMembers property.
@@ -394,7 +397,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
     </method>
 
     <property name="LocalPendingMembers" access="read"
-      type="a(uuus)" tp:type="Local_Pending_Info[]">
+      type="a(uuus)" tp:type="Local_Pending_Info[]"
+      tp:name-for-bindings="Local_Pending_Members">
       <tp:docstring>
         An array of structs containing handles representing contacts
         requesting channel membership and awaiting local approval with
@@ -414,7 +418,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         is not set, fall back to calling GetAllMembers.</tp:added>
     </property>
 
-    <method name="GetMembers">
+    <method name="GetMembers" tp:name-for-bindings="Get_Members">
       <arg direction="out" type="au" tp:type="Contact_Handle[]"/>
       <tp:docstring>
         Returns the Members property.
@@ -428,7 +432,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
     </method>
 
     <property name="RemotePendingMembers" access="read" type="au"
-      tp:type="Contact_Handle[]">
+      tp:type="Contact_Handle[]" tp:name-for-bindings="Remote_Pending_Members">
       <tp:docstring>
         An array of handles representing contacts who have been
         invited to the channel and are awaiting remote approval.
@@ -437,7 +441,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         is not set, fall back to calling GetAllMembers.</tp:added>
     </property>
 
-    <method name="GetRemotePendingMembers">
+    <method name="GetRemotePendingMembers"
+      tp:name-for-bindings="Get_Remote_Pending_Members">
       <arg direction="out" type="au" tp:type="Contact_Handle[]"/>
       <tp:docstring>
         Returns an array of handles representing contacts who have been
@@ -451,7 +456,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:possible-errors>
     </method>
 
-    <signal name="SelfHandleChanged">
+    <signal name="SelfHandleChanged" tp:name-for-bindings="Self_Handle_Changed">
       <tp:docstring>
         Emitted whenever the SelfHandle property changes.
       </tp:docstring>
@@ -466,7 +471,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
     </signal>
 
     <property name="SelfHandle" type="u" tp:type="Contact_Handle"
-      access="read">
+      access="read" tp:name-for-bindings="Self_Handle">
       <tp:docstring>
         The handle for the user on this channel (which can also be a
         local or remote pending member), or 0 if the user is not a member at
@@ -480,7 +485,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         Channel_Group_Flag_Properties is not present.</tp:added>
     </property>
 
-    <method name="GetSelfHandle">
+    <method name="GetSelfHandle" tp:name-for-bindings="Get_Self_Handle">
       <arg direction="out" type="u" tp:type="Contact_Handle"/>
       <tp:docstring>
         Returns the value of the SelfHandle property.
@@ -494,13 +499,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:possible-errors>
     </method>
 
-    <signal name="GroupFlagsChanged">
-      <arg name="added" type="u" tp:type="Channel_Group_Flags">
+    <signal name="GroupFlagsChanged" tp:name-for-bindings="Group_Flags_Changed">
+      <arg name="Added" type="u" tp:type="Channel_Group_Flags">
         <tp:docstring>
           A bitwise OR of the flags which have been set
         </tp:docstring>
       </arg>
-      <arg name="removed" type="u" tp:type="Channel_Group_Flags">
+      <arg name="Removed" type="u" tp:type="Channel_Group_Flags">
         <tp:docstring>
           A bitwise OR of the flags which have been cleared
         </tp:docstring>
@@ -599,39 +604,39 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:enumvalue>
     </tp:enum>
 
-    <signal name="MembersChanged">
-      <arg name="message" type="s">
+    <signal name="MembersChanged" tp:name-for-bindings="Members_Changed">
+      <arg name="Message" type="s">
         <tp:docstring>
           A string message from the server, or blank if not
         </tp:docstring>
       </arg>
-      <arg name="added" type="au" tp:type="Contact_Handle[]">
+      <arg name="Added" type="au" tp:type="Contact_Handle[]">
         <tp:docstring>
           A list of members added to the channel
         </tp:docstring>
       </arg>
-      <arg name="removed" type="au" tp:type="Contact_Handle[]">
+      <arg name="Removed" type="au" tp:type="Contact_Handle[]">
         <tp:docstring>
           A list of members removed from the channel
         </tp:docstring>
       </arg>
-      <arg name="local_pending" type="au" tp:type="Contact_Handle[]">
+      <arg name="Local_Pending" type="au" tp:type="Contact_Handle[]">
         <tp:docstring>
           A list of members who are pending local approval
         </tp:docstring>
       </arg>
-      <arg name="remote_pending" type="au" tp:type="Contact_Handle[]">
+      <arg name="Remote_Pending" type="au" tp:type="Contact_Handle[]">
         <tp:docstring>
           A list of members who are pending remote approval
         </tp:docstring>
       </arg>
-      <arg name="actor" type="u" tp:type="Contact_Handle">
+      <arg name="Actor" type="u" tp:type="Contact_Handle">
         <tp:docstring>
           The contact handle of the person who made the change, or 0
           if not known
         </tp:docstring>
       </arg>
-      <arg name="reason" type="u" tp:type="Channel_Group_Change_Reason">
+      <arg name="Reason" type="u" tp:type="Channel_Group_Change_Reason">
         <tp:docstring>
           A reason for the change: one of the values of
           ChannelGroupChangeReason
@@ -653,13 +658,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:docstring>
     </signal>
 
-    <method name="RemoveMembers">
-      <arg direction="in" name="contacts" type="au" tp:type="Contact_Handle[]">
+    <method name="RemoveMembers" tp:name-for-bindings="Remove_Members">
+      <arg direction="in" name="Contacts" type="au" tp:type="Contact_Handle[]">
         <tp:docstring>
           An array of contact handles to remove from the channel
         </tp:docstring>
       </arg>
-      <arg direction="in" name="message" type="s">
+      <arg direction="in" name="Message" type="s">
         <tp:docstring>
           A string message, which can be blank if desired
         </tp:docstring>
@@ -683,18 +688,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:possible-errors>
     </method>
 
-    <method name="RemoveMembersWithReason">
-      <arg direction="in" name="contacts" type="au" tp:type="Contact_Handle[]">
+    <method name="RemoveMembersWithReason"
+      tp:name-for-bindings="Remove_Members_With_Reason">
+      <arg direction="in" name="Contacts" type="au" tp:type="Contact_Handle[]">
         <tp:docstring>
           An array of contact handles to remove from the channel
         </tp:docstring>
       </arg>
-      <arg direction="in" name="message" type="s">
+      <arg direction="in" name="Message" type="s">
         <tp:docstring>
           A string message, which can be blank if desired
         </tp:docstring>
       </arg>
-      <arg direction="in" name="reason" type="u"
+      <arg direction="in" name="Reason" type="u"
            tp:type="Channel_Group_Change_Reason">
         <tp:docstring>
           A reason for the change: one of the values of
diff --git a/spec/Channel_Interface_Hold.xml b/spec/Channel_Interface_Hold.xml
index 6e64e3a6..4d3cc4da 100644
--- a/spec/Channel_Interface_Hold.xml
+++ b/spec/Channel_Interface_Hold.xml
@@ -37,7 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         another call).</p>
     </tp:docstring>
 
-    <method name="GetHoldState">
+    <method name="GetHoldState" tp:name-for-bindings="Get_Hold_State">
       <tp:docstring>
         Return whether the local user has placed the channel on hold.
       </tp:docstring>
@@ -57,7 +57,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       </arg>
     </method>
 
-    <signal name="HoldStateChanged">
+    <signal name="HoldStateChanged" tp:name-for-bindings="Hold_State_Changed">
       <tp:docstring>
         Emitted to indicate that the hold state has changed for this channel.
         This may occur as a consequence of you requesting a change with
@@ -65,15 +65,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         another process.
       </tp:docstring>
 
-      <arg name="HoldState" direction="out" type="u"
-          tp:type="Local_Hold_State">
+      <arg name="HoldState" type="u" tp:type="Local_Hold_State">
         <tp:docstring>
           The state of the channel
         </tp:docstring>
       </arg>
 
-      <arg name="Reason" direction="out" type="u"
-          tp:type="Local_Hold_State_Reason">
+      <arg name="Reason" type="u" tp:type="Local_Hold_State_Reason">
         <tp:docstring>
           The reason for the state change
         </tp:docstring>
@@ -142,7 +140,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       </tp:enumvalue>
     </tp:enum>
 
-    <method name="RequestHold">
+    <method name="RequestHold" tp:name-for-bindings="Request_Hold">
       <arg direction="in" name="Hold" type="b">
         <tp:docstring>
           A boolean indicating whether or not the channel should be on hold
diff --git a/spec/Channel_Interface_Media_Signalling.xml b/spec/Channel_Interface_Media_Signalling.xml
index cc7a7a95..aa397218 100644
--- a/spec/Channel_Interface_Media_Signalling.xml
+++ b/spec/Channel_Interface_Media_Signalling.xml
@@ -39,7 +39,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:member>
     </tp:struct>
 
-    <method name="GetSessionHandlers">
+    <method name="GetSessionHandlers"
+      tp:name-for-bindings="Get_Session_Handlers">
       <arg direction="out" type="a(os)" tp:type="Media_Session_Handler_Info[]"/>
       <tp:docstring>
         Returns all currently active session handlers on this channel
@@ -47,7 +48,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:docstring>
     </method>
 
-    <signal name="NewSessionHandler">
+    <signal name="NewSessionHandler" tp:name-for-bindings="New_Session_Handler">
       <arg name="Session_Handler" type="o">
         <tp:docstring>
           Object path of the new MediaSessionHandler object
diff --git a/spec/Channel_Interface_Messages.xml b/spec/Channel_Interface_Messages.xml
index 677ca09f..fa3e7917 100644
--- a/spec/Channel_Interface_Messages.xml
+++ b/spec/Channel_Interface_Messages.xml
@@ -61,7 +61,8 @@ USA.</p>
         (which are guaranteed to duplicate signals from this interface).</p>
     </tp:docstring>
 
-    <property name="SupportedContentTypes" type="as" access="read">
+    <property name="SupportedContentTypes" type="as" access="read"
+      tp:name-for-bindings="Supported_Content_Types">
       <tp:docstring>
         A list of MIME types supported by this channel, with more preferred
         MIME types appearing earlier in the list. The list MAY include "*/*"
@@ -72,8 +73,8 @@ USA.</p>
     </property>
 
     <property name="MessagePartSupportFlags" type="u"
-      tp:type="Message_Part_Support_Flags"
-      access="read">
+      tp:type="Message_Part_Support_Flags" access="read"
+      tp:name-for-bindings="Message_Part_Support_Flags">
       <tp:docstring>
         Flags indicating the level of support for message parts on this
         channel.
@@ -81,7 +82,7 @@ USA.</p>
     </property>
 
     <tp:flags name="Message_Part_Support_Flags"
-      value-prefix="Message_Part_Support_Flag">
+      value-prefix="Message_Part_Support_Flag" type="u">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>Flags indicating the level of support for message parts on this
           channel. They are designed such that setting more flags always
@@ -426,7 +427,7 @@ USA.</p>
       </tp:docstring>
     </tp:simple-type>
 
-    <method name="SendMessage">
+    <method name="SendMessage" tp:name-for-bindings="Send_Message">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>Submit a message to the server for sending.
           If this method returns successfully, the message has been submitted
@@ -471,7 +472,8 @@ USA.</p>
       </tp:possible-errors>
     </method>
 
-    <tp:flags name="Message_Sending_Flags" value-prefix="Message_Sending_Flag">
+    <tp:flags name="Message_Sending_Flags" value-prefix="Message_Sending_Flag"
+      type="u">
       <tp:docstring>
         Flags altering the way a message is sent. The "most usual" action
         should always be to have these flags unset.
@@ -491,7 +493,7 @@ USA.</p>
       </tp:flag>
     </tp:flags>
 
-    <signal name="MessageSent">
+    <signal name="MessageSent" tp:name-for-bindings="Message_Sent">
       <tp:docstring>
         Signals that a message has been submitted for sending. This
         MUST be emitted exactly once per emission of the Sent signal on the
@@ -527,7 +529,7 @@ USA.</p>
     </signal>
 
     <property name="PendingMessages" type="aaa{sv}" access="read"
-      tp:type="Message_Part[][]">
+      tp:type="Message_Part[][]" tp:name-for-bindings="Pending_Messages">
       <tp:docstring>
         A list of incoming messages that have neither been acknowledged nor
         rejected. This list is a superset of the one returned by
@@ -536,7 +538,8 @@ USA.</p>
       </tp:docstring>
     </property>
 
-    <signal name="PendingMessagesRemoved">
+    <signal name="PendingMessagesRemoved"
+      tp:name-for-bindings="Pending_Messages_Removed">
       <tp:docstring>
         The messages with the given IDs have been removed from the
         PendingMessages list. Clients SHOULD NOT attempt to acknowledge
@@ -556,7 +559,8 @@ USA.</p>
       </arg>
     </signal>
 
-    <method name="GetPendingMessageContent">
+    <method name="GetPendingMessageContent"
+      tp:name-for-bindings="Get_Pending_Message_Content">
       <tp:docstring>
         Retrieve the content of one or more parts of a pending message.
         Note that this function may take a considerable amount of time
@@ -608,7 +612,7 @@ USA.</p>
       </tp:possible-errors>
     </method>
 
-    <signal name="MessageReceived">
+    <signal name="MessageReceived" tp:name-for-bindings="Message_Received">
       <tp:docstring>
         Signals that a message has been received and added to the pending
         messages queue. This MUST be emitted exactly once per emission of the
diff --git a/spec/Channel_Interface_Password.xml b/spec/Channel_Interface_Password.xml
index 41a92ab0..adcd0f84 100644
--- a/spec/Channel_Interface_Password.xml
+++ b/spec/Channel_Interface_Password.xml
@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         </tp:docstring>
       </tp:flag>
     </tp:flags>
-    <method name="GetPasswordFlags">
+    <method name="GetPasswordFlags" tp:name-for-bindings="Get_Password_Flags">
       <arg direction="out" type="u" tp:type="Channel_Password_Flags">
         <tp:docstring>
           An integer with the logical OR of all the flags set
@@ -47,13 +47,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/>
       </tp:possible-errors>
     </method>
-    <signal name="PasswordFlagsChanged">
-      <arg name="added" type="u" tp:type="Channel_Password_Flags">
+    <signal name="PasswordFlagsChanged"
+      tp:name-for-bindings="Password_Flags_Changed">
+      <arg name="Added" type="u" tp:type="Channel_Password_Flags">
         <tp:docstring>
           A bitwise OR of the flags which have been set
         </tp:docstring>
       </arg>
-      <arg name="removed" type="u" tp:type="Channel_Password_Flags">
+      <arg name="Removed" type="u" tp:type="Channel_Password_Flags">
         <tp:docstring>
           A bitwise OR of the flags which have been cleared
         </tp:docstring>
@@ -63,8 +64,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         The user interface should be updated as appropriate.
       </tp:docstring>
     </signal>
-    <method name="ProvidePassword">
-      <arg direction="in" name="password" type="s">
+    <method name="ProvidePassword" tp:name-for-bindings="Provide_Password">
+      <arg direction="in" name="Password" type="s">
         <tp:docstring>
           The password
         </tp:docstring>
diff --git a/spec/Channel_Interface_Transfer.xml b/spec/Channel_Interface_Transfer.xml
index 5165c9ad..02591c1d 100644
--- a/spec/Channel_Interface_Transfer.xml
+++ b/spec/Channel_Interface_Transfer.xml
@@ -22,12 +22,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
     tp:causes-havoc='not well-tested'>
     <tp:requires interface="org.freedesktop.Telepathy.Channel"/>
     <method name="Transfer">
-      <arg direction="in" name="member" type="u" tp:type="Contact_Handle">
+      <arg direction="in" name="Member" type="u" tp:type="Contact_Handle">
         <tp:docstring>
           The handle of the member to transfer
         </tp:docstring>
       </arg>
-      <arg direction="in" name="destination" type="u" tp:type="Contact_Handle">
+      <arg direction="in" name="Destination" type="u" tp:type="Contact_Handle">
         <tp:docstring>
           The handle of the destination contact
         </tp:docstring>
diff --git a/spec/Channel_Type_Contact_Search.xml b/spec/Channel_Type_Contact_Search.xml
index 0213ca70..7c324d0f 100644
--- a/spec/Channel_Type_Contact_Search.xml
+++ b/spec/Channel_Type_Contact_Search.xml
@@ -41,7 +41,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       <tp:member type="(bg)" tp:type="Search_Key_Info" name="Details"/>
     </tp:mapping>
 
-    <method name="GetSearchKeys">
+    <method name="GetSearchKeys" tp:name-for-bindings="Get_Search_Keys">
       <arg direction="out" type="s">
         <tp:docstring>
           A string with any instructions from the server
@@ -81,7 +81,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         <tp:docstring>The search has been completed</tp:docstring>
       </tp:enumvalue>
     </tp:enum>
-    <method name="GetSearchState">
+    <method name="GetSearchState" tp:name-for-bindings="Get_Search_State">
       <arg direction="out" type="u" tp:type="Channel_Contact_Search_State">
         <tp:docstring>The search state represented as one of the values of
           ChannelContactSearchState</tp:docstring>
@@ -91,7 +91,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:docstring>
     </method>
     <method name="Search">
-      <arg direction="in" name="terms" type="a{sv}" tp:type="String_Variant_Map">
+      <arg direction="in" name="Terms" type="a{sv}" tp:type="String_Variant_Map">
         <tp:docstring>
           A dictionary mapping search key names to the desired values
         </tp:docstring>
@@ -107,19 +107,21 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"/>
       </tp:possible-errors>
     </method>
-    <signal name="SearchResultReceived">
-      <arg name="contact" type="u" tp:type="Contact_Handle">
+    <signal name="SearchResultReceived"
+      tp:name-for-bindings="Search_Result_Received">
+      <arg name="Contact" type="u" tp:type="Contact_Handle">
         <tp:docstring>An integer handle for the contact</tp:docstring>
       </arg>
-      <arg name="values" type="a{sv}" tp:type="String_Variant_Map">
+      <arg name="Values" type="a{sv}" tp:type="String_Variant_Map">
         <tp:docstring>A dictionary mapping search key names to values for this contact</tp:docstring>
       </arg>
       <tp:docstring>
         Emitted when a search result is received from the server.
       </tp:docstring>
     </signal>
-    <signal name="SearchStateChanged">
-      <arg name="state" type="u" tp:type="Channel_Contact_Search_State">
+    <signal name="SearchStateChanged"
+      tp:name-for-bindings="Search_State_Changed">
+      <arg name="State" type="u" tp:type="Channel_Contact_Search_State">
         <tp:docstring>An integer representing the new search state</tp:docstring>
       </arg>
       <tp:docstring>
diff --git a/spec/Channel_Type_Room_List.xml b/spec/Channel_Type_Room_List.xml
index 10261c97..e98651d7 100644
--- a/spec/Channel_Type_Room_List.xml
+++ b/spec/Channel_Type_Room_List.xml
@@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:docstring>
     </property>
 
-    <method name="GetListingRooms">
+    <method name="GetListingRooms" tp:name-for-bindings="Get_Listing_Rooms">
       <arg direction="out" type="b">
         <tp:docstring>
           A boolean indicating if room listing is in progress
@@ -50,8 +50,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:docstring>
     </method>
 
-    <signal name="GotRooms">
-      <arg name="rooms" type="a(usa{sv})" tp:type="Room_Info[]">
+    <signal name="GotRooms" tp:name-for-bindings="Got_Rooms">
+      <arg name="Rooms" type="a(usa{sv})" tp:type="Room_Info[]">
         <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
           An array of structs containing:
           <ul>
@@ -80,7 +80,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         </dl>
       </tp:docstring>
     </signal>
-    <method name="ListRooms">
+    <method name="ListRooms" tp:name-for-bindings="List_Rooms">
       <tp:docstring>
         Request the list of rooms from the server. The ListingRooms signal
         should be emitted when this request is being processed, GotRooms when
@@ -94,14 +94,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         <tp:error name="org.freedesktop.Telepathy.Error.PermissionDenied"/>
       </tp:possible-errors>
     </method>
-    <method name="StopListing">
+    <method name="StopListing" tp:name-for-bindings="Stop_Listing">
       <tp:docstring>
         Stop the room listing if it's in progress, but don't close the channel.
         The ListingRooms signal should be emitted when the listing stops.
       </tp:docstring>
     </method>
-    <signal name="ListingRooms">
-      <arg name="listing" type="b">
+    <signal name="ListingRooms" tp:name-for-bindings="Listing_Rooms">
+      <arg name="Listing" type="b">
         <tp:docstring>A boolean indicating if room listing is in progress</tp:docstring>
       </arg>
       <tp:docstring>
diff --git a/spec/Channel_Type_Streamed_Media.xml b/spec/Channel_Type_Streamed_Media.xml
index 0c2eced3..776862ae 100644
--- a/spec/Channel_Type_Streamed_Media.xml
+++ b/spec/Channel_Type_Streamed_Media.xml
@@ -87,7 +87,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
 
     <tp:simple-type name="Stream_ID" type="u"/>
 
-    <method name="ListStreams">
+    <method name="ListStreams" tp:name-for-bindings="List_Streams">
       <arg direction="out" type="a(uuuuuu)" tp:type="Media_Stream_Info[]">
         <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
           An array of structs containing:
@@ -109,8 +109,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:docstring>
     </method>
 
-    <method name="RemoveStreams">
-      <arg direction="in" name="streams" type="au" tp:type="Stream_ID[]">
+    <method name="RemoveStreams" tp:name-for-bindings="Remove_Streams">
+      <arg direction="in" name="Streams" type="au" tp:type="Stream_ID[]">
         <tp:docstring>
           An array of stream identifiers (as defined in ListStreams)
         </tp:docstring>
@@ -125,13 +125,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:possible-errors>
     </method>
 
-    <method name="RequestStreamDirection">
-      <arg direction="in" name="stream_id" type="u">
+    <method name="RequestStreamDirection"
+      tp:name-for-bindings="Request_Stream_Direction">
+      <arg direction="in" name="Stream_ID" type="u">
         <tp:docstring>
           The stream identifier (as defined in ListStreams)
         </tp:docstring>
       </arg>
-      <arg direction="in" name="stream_direction" type="u" tp:type="Media_Stream_Direction">
+      <arg direction="in" name="Stream_Direction" type="u" tp:type="Media_Stream_Direction">
         <tp:docstring>
           The desired stream direction (a value of MediaStreamDirection)
         </tp:docstring>
@@ -162,13 +163,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:possible-errors>
     </method>
 
-    <method name="RequestStreams">
-      <arg direction="in" name="contact_handle" type="u" tp:type="Contact_Handle">
+    <method name="RequestStreams" tp:name-for-bindings="Request_Streams">
+      <arg direction="in" name="Contact_Handle" type="u" tp:type="Contact_Handle">
         <tp:docstring>
           A contact handle with whom to establish the streams
         </tp:docstring>
       </arg>
-      <arg direction="in" name="types" type="au" tp:type="Media_Stream_Type[]">
+      <arg direction="in" name="Types" type="au" tp:type="Media_Stream_Type[]">
         <tp:docstring>
           An array of stream types (values of MediaStreamType)
         </tp:docstring>
@@ -219,19 +220,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:possible-errors>
     </method>
 
-    <signal name="StreamAdded">
-      <arg name="stream_id" type="u">
+    <signal name="StreamAdded" tp:name-for-bindings="Stream_Added">
+      <arg name="Stream_ID" type="u">
         <tp:docstring>
           The stream identifier (as defined in ListStreams)
         </tp:docstring>
       </arg>
-      <arg name="contact_handle" type="u" tp:type="Contact_Handle">
+      <arg name="Contact_Handle" type="u" tp:type="Contact_Handle">
         <tp:docstring>
           The contact handle who the stream is with (or 0 if it
           represents more than a single member)
         </tp:docstring>
       </arg>
-      <arg name="stream_type" type="u" tp:type="Media_Stream_Type">
+      <arg name="Stream_Type" type="u" tp:type="Media_Stream_Type">
         <tp:docstring>
           The stream type (a value from MediaStreamType)
         </tp:docstring>
@@ -241,18 +242,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:docstring>
     </signal>
 
-    <signal name="StreamDirectionChanged">
-      <arg name="stream_id" type="u">
+    <signal name="StreamDirectionChanged"
+      tp:name-for-bindings="Stream_Direction_Changed">
+      <arg name="Stream_ID" type="u">
         <tp:docstring>
         The stream identifier (as defined in ListStreams)
         </tp:docstring>
       </arg>
-      <arg name="stream_direction" type="u" tp:type="Media_Stream_Direction">
+      <arg name="Stream_Direction" type="u" tp:type="Media_Stream_Direction">
         <tp:docstring>
         The new stream direction (as defined in ListStreams)
         </tp:docstring>
       </arg>
-      <arg name="pending_flags" type="u" tp:type="Media_Stream_Pending_Send">
+      <arg name="Pending_Flags" type="u" tp:type="Media_Stream_Pending_Send">
         <tp:docstring>
         The new pending send flags (as defined in ListStreams)
         </tp:docstring>
@@ -265,18 +267,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:docstring>
     </signal>
 
-    <signal name="StreamError">
-      <arg name="stream_id" type="u">
+    <signal name="StreamError" tp:name-for-bindings="Stream_Error">
+      <arg name="Stream_ID" type="u">
         <tp:docstring>
         The stream identifier (as defined in ListStreams)
         </tp:docstring>
       </arg>
-      <arg name="errno" type="u">
+      <arg name="Errno" type="u">
         <tp:docstring>
           A stream error number, one of the values of MediaStreamError
         </tp:docstring>
       </arg>
-      <arg name="message" type="s">
+      <arg name="Message" type="s">
         <tp:docstring>
           A string describing the error (for debugging purposes only)
         </tp:docstring>
@@ -286,8 +288,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:docstring>
     </signal>
 
-    <signal name="StreamRemoved">
-      <arg name="stream_id" type="u">
+    <signal name="StreamRemoved" tp:name-for-bindings="Stream_Removed">
+      <arg name="Stream_ID" type="u">
         <tp:docstring>
         stream_id - the stream identifier (as defined in ListStreams)
         </tp:docstring>
@@ -297,13 +299,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:docstring>
     </signal>
 
-    <signal name="StreamStateChanged">
-      <arg name="stream_id" type="u">
+    <signal name="StreamStateChanged"
+      tp:name-for-bindings="Stream_State_Changed">
+      <arg name="Stream_ID" type="u">
         <tp:docstring>
           The stream identifier (as defined in ListStreams)
         </tp:docstring>
       </arg>
-      <arg name="stream_state" type="u" tp:type="Media_Stream_State">
+      <arg name="Stream_State" type="u" tp:type="Media_Stream_State">
         <tp:docstring>
           The new stream state (as defined in ListStreams)
         </tp:docstring>
diff --git a/spec/Channel_Type_Text.xml b/spec/Channel_Type_Text.xml
index b3265ec5..8917a5f9 100644
--- a/spec/Channel_Type_Text.xml
+++ b/spec/Channel_Type_Text.xml
@@ -45,7 +45,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       <tp:member type="s" name="Text"/>
     </tp:struct>
 
-    <method name="AcknowledgePendingMessages">
+    <method name="AcknowledgePendingMessages"
+      tp:name-for-bindings="Acknowledge_Pending_Messages">
       <arg direction="in" name="ids" type="au" tp:type="Message_ID[]">
         <tp:docstring>
           The IDs of the messages to acknowledge
@@ -64,7 +65,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:possible-errors>
     </method>
 
-    <method name="GetMessageTypes">
+    <method name="GetMessageTypes" tp:name-for-bindings="Get_Message_Types">
       <arg direction="out" type="au" tp:type="Channel_Text_Message_Type[]">
         <tp:docstring>
           An array of integer message types (ChannelTextMessageType)
@@ -76,8 +77,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:docstring>
     </method>
 
-    <method name="ListPendingMessages">
-      <arg direction="in" name="clear" type="b">
+    <method name="ListPendingMessages"
+      tp:name-for-bindings="List_Pending_Messages">
+      <arg direction="in" name="Clear" type="b">
         <tp:docstring>
           If true, behave as if AcknowledgePendingMessages had also been
           called.
@@ -107,7 +109,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:docstring>
     </method>
 
-    <signal name="LostMessage">
+    <signal name="LostMessage" tp:name-for-bindings="Lost_Message">
       <tp:docstring>
         This signal is emitted to indicate that an incoming message was
         not able to be stored and forwarded by the connection manager
@@ -116,32 +118,32 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
     </signal>
 
     <signal name="Received">
-      <arg name="id" type="u">
+      <arg name="ID" type="u">
         <tp:docstring>
           A numeric identifier for acknowledging the message
         </tp:docstring>
       </arg>
-      <arg name="timestamp" type="u" tp:type="Unix_Timestamp">
+      <arg name="Timestamp" type="u" tp:type="Unix_Timestamp">
         <tp:docstring>
           A Unix timestamp indicating when the message was received
         </tp:docstring>
       </arg>
-      <arg name="sender" type="u" tp:type="Contact_Handle">
+      <arg name="Sender" type="u" tp:type="Contact_Handle">
         <tp:docstring>
           The handle of the contact who sent the message
         </tp:docstring>
       </arg>
-      <arg name="type" type="u" tp:type="Channel_Text_Message_Type">
+      <arg name="Type" type="u" tp:type="Channel_Text_Message_Type">
         <tp:docstring>
           The type of the message (normal, action, notice, etc.)
         </tp:docstring>
       </arg>
-      <arg name="flags" type="u" tp:type="Channel_Text_Message_Flags">
+      <arg name="Flags" type="u" tp:type="Channel_Text_Message_Flags">
         <tp:docstring>
           A bitwise OR of the message flags
         </tp:docstring>
       </arg>
-      <arg name="text" type="s">
+      <arg name="Text" type="s">
         <tp:docstring>
           The text of the message
         </tp:docstring>
@@ -156,12 +158,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
     </signal>
 
     <method name="Send">
-      <arg direction="in" name="type" type="u" tp:type="Channel_Text_Message_Type">
+      <arg direction="in" name="Type" type="u" tp:type="Channel_Text_Message_Type">
         <tp:docstring>
           An integer indicating the type of the message
         </tp:docstring>
       </arg>
-      <arg direction="in" name="text" type="s">
+      <arg direction="in" name="Text" type="s">
         <tp:docstring>
           The message to send
         </tp:docstring>
@@ -214,23 +216,23 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:enumvalue>
     </tp:enum>
 
-    <signal name="SendError">
-      <arg name="error" type="u" tp:type="Channel_Text_Send_Error">
+    <signal name="SendError" tp:name-for-bindings="Send_Error">
+      <arg name="Error" type="u" tp:type="Channel_Text_Send_Error">
         <tp:docstring>
           The error that occurred
         </tp:docstring>
       </arg>
-      <arg name="timestamp" type="u" tp:type="Unix_Timestamp">
+      <arg name="Timestamp" type="u" tp:type="Unix_Timestamp">
         <tp:docstring>
           The Unix timestamp indicating when the message was sent
         </tp:docstring>
       </arg>
-      <arg name="type" type="u" tp:type="Channel_Text_Message_Type">
+      <arg name="Type" type="u" tp:type="Channel_Text_Message_Type">
         <tp:docstring>
           The message type
         </tp:docstring>
       </arg>
-      <arg name="text" type="s">
+      <arg name="Text" type="s">
         <tp:docstring>
           The text of the message
         </tp:docstring>
@@ -250,18 +252,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
     </signal>
 
     <signal name="Sent">
-      <arg name="timestamp" type="u" tp:type="Unix_Timestamp">
+      <arg name="Timestamp" type="u" tp:type="Unix_Timestamp">
         <tp:docstring>
           Unix timestamp indicating when the message was sent
         </tp:docstring>
       </arg>
-      <arg name="type" type="u" tp:type="Channel_Text_Message_Type">
+      <arg name="Type" type="u" tp:type="Channel_Text_Message_Type">
         <tp:docstring>
           The message type (normal, action, notice, etc) from
           ChannelTextMessageType
         </tp:docstring>
       </arg>
-      <arg name="text" type="s">
+      <arg name="Text" type="s">
         <tp:docstring>
           The text of the message
         </tp:docstring>
@@ -457,7 +459,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
 
       <p>On protocols where a conversation with a user is actually just
         a nameless chat room starting with exactly two members, to which
-        more members can be invited, calling RequestChannel with type Text
+        more members can be invited, calling
+        <tp:dbus-ref namespace="org.freedesktop.Telepathy.Connection">RequestChannel</tp:dbus-ref>
+        with type Text
         and handle type CONTACT should continue to succeed, but may return
         a channel with handle type 0, handle 0, the group interface,
         and the local and remote contacts in its members.</p>
diff --git a/spec/Channel_Type_Tubes.xml b/spec/Channel_Type_Tubes.xml
index b187c03e..68df224a 100644
--- a/spec/Channel_Type_Tubes.xml
+++ b/spec/Channel_Type_Tubes.xml
@@ -273,7 +273,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         tp:type="Socket_Access_Control[]"/>
     </tp:mapping>
 
-    <method name="GetAvailableStreamTubeTypes">
+    <method name="GetAvailableStreamTubeTypes"
+      tp:name-for-bindings="Get_Available_Stream_Tube_Types">
       <tp:docstring>List the available address types and access-control types
         for stream tubes.</tp:docstring>
       <arg direction="out" type="a{uau}" tp:type="Supported_Socket_Map">
@@ -302,7 +303,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       </arg>
     </method>
 
-    <method name="GetAvailableTubeTypes">
+    <method name="GetAvailableTubeTypes"
+      tp:name-for-bindings="Get_Available_Tube_Types">
       <arg direction="out" type="au" tp:type="Tube_Type[]">
         <tp:docstring>
           An array of the available tube types, as defined by the Tube_Type
@@ -311,7 +313,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       </arg>
     </method>
 
-    <method name="ListTubes">
+    <method name="ListTubes" tp:name-for-bindings="List_Tubes">
       <arg direction="out" type="a(uuusa{sv}u)" tp:type="Tube_Info[]">
         <tp:docstring>
          Return an array of tuples, each representing a tube, with the
@@ -329,11 +331,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       </arg>
     </method>
 
-    <method name="OfferDBusTube">
+    <method name="OfferDBusTube" tp:name-for-bindings="Offer_DBus_Tube">
       <tp:docstring>
         Offers a D-Bus tube providing the service specified.
       </tp:docstring>
-      <arg direction="in" name="service" type="s">
+      <arg direction="in" name="Service" type="s">
         <tp:docstring>
           A string representing the service name that will be used over the
           tube.
@@ -341,7 +343,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
           com.example.ServiceName.
         </tp:docstring>
       </arg>
-      <arg direction="in" name="parameters" type="a{sv}"
+      <arg direction="in" name="Parameters" type="a{sv}"
         tp:type="String_Variant_Map">
         <tp:docstring>
           A dictionary of properties for the new tube; the allowable keys,
@@ -371,11 +373,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       </tp:possible-errors>
     </method>
 
-    <method name="OfferStreamTube">
+    <method name="OfferStreamTube" tp:name-for-bindings="Offer_Stream_Tube">
       <tp:docstring>
         Offer a stream tube exporting the local socket specified.
       </tp:docstring>
-      <arg direction="in" name="service" type="s">
+      <arg direction="in" name="Service" type="s">
         <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
           A string representing the service name that will be used over the
           tube.
@@ -387,7 +389,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
           "rsync" or "daap".
         </tp:docstring>
       </arg>
-      <arg direction="in" name="parameters" type="a{sv}"
+      <arg direction="in" name="Parameters" type="a{sv}"
         tp:type="String_Variant_Map">
         <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
           <p>A dictionary of properties for the new tube; the allowable keys,
@@ -398,26 +400,26 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
           use in the DNS-SD TXT record for that service.</p>
         </tp:docstring>
       </arg>
-      <arg direction="in" name="address_type" type="u" tp:type="Socket_Address_Type">
+      <arg direction="in" name="Address_Type" type="u" tp:type="Socket_Address_Type">
         <tp:docstring>
           The type of the listening address of the local service, as a member of
           Socket_Address_Type.
         </tp:docstring>
       </arg>
-      <arg direction="in" name="address" type="v">
+      <arg direction="in" name="Address" type="v">
         <tp:docstring>
           The listening address of the local service, as indicated by the
           address_type.
         </tp:docstring>
       </arg>
-      <arg direction="in" name="access_control" type="u" tp:type="Socket_Access_Control">
+      <arg direction="in" name="Access_Control" type="u" tp:type="Socket_Access_Control">
         <tp:docstring>
           The access control the local service applies to the local socket,
           specified so the connection manager can behave appropriately
           when it connects.
         </tp:docstring>
       </arg>
-      <arg direction="in" name="access_control_param" type="v">
+      <arg direction="in" name="Access_Control_Param" type="v">
         <tp:docstring>
           A parameter for the access control type, to be interpreted as
           specified in the documentation for the Socket_Access_Control enum.
@@ -445,55 +447,55 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       </tp:possible-errors>
     </method>
 
-    <signal name="NewTube">
+    <signal name="NewTube" tp:name-for-bindings="New_Tube">
       <tp:docstring>
         Emitted when a tube is created.
       </tp:docstring>
-      <arg name="id" type="u" tp:type="Tube_ID">
+      <arg name="ID" type="u" tp:type="Tube_ID">
         <tp:docstring>
           The ID of the new tube.
         </tp:docstring>
       </arg>
-      <arg name="initiator" type="u" tp:type="Contact_Handle">
+      <arg name="Initiator" type="u" tp:type="Contact_Handle">
         <tp:docstring>
           The handle of the contact who initiated the tube.
         </tp:docstring>
       </arg>
-      <arg name="type" type="u" tp:type="Tube_Type">
+      <arg name="Type" type="u" tp:type="Tube_Type">
         <tp:docstring>
           The tube type, as defined by the Tube_Type enum.
         </tp:docstring>
       </arg>
-      <arg name="service" type="s">
+      <arg name="Service" type="s">
         <tp:docstring>
           A string representing the service that will be used over the tube.
         </tp:docstring>
       </arg>
-      <arg name="parameters" type="a{sv}" tp:type="String_Variant_Map">
+      <arg name="Parameters" type="a{sv}" tp:type="String_Variant_Map">
         <tp:docstring>
           The new tube's properties.
         </tp:docstring>
       </arg>
-      <arg name="state" type="u" tp:type="Tube_State">
+      <arg name="State" type="u" tp:type="Tube_State">
         <tp:docstring>
           The new tube's state.
         </tp:docstring>
       </arg>
     </signal>
 
-    <method name="AcceptDBusTube">
+    <method name="AcceptDBusTube" tp:name-for-bindings="Accept_DBus_Tube">
       <tp:docstring>
         Accept a D-Bus tube that's in the "local pending" state. The
         connection manager will attempt to open the tube. The tube remains in
         the "local pending" state until the TubeStateChanged signal is
         emitted.
       </tp:docstring>
-      <arg direction="in" name="id" type="u" tp:type="Tube_ID">
+      <arg direction="in" name="ID" type="u" tp:type="Tube_ID">
         <tp:docstring>
           The ID of the tube to accept.
         </tp:docstring>
       </arg>
-      <arg direction="out" name="address" type="s">
+      <arg direction="out" name="Address" type="s">
         <tp:docstring>
           The string describing the address of the private bus. The client
           should not attempt to connect to the address until the tube is open.
@@ -509,36 +511,36 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       </tp:possible-errors>
     </method>
 
-    <method name="AcceptStreamTube">
+    <method name="AcceptStreamTube" tp:name-for-bindings="Accept_Stream_Tube">
       <tp:docstring>
         Accept a stream tube that's in the "local pending" state. The
         connection manager will attempt to open the tube. The tube remains in
         the "local pending" state until the TubeStateChanged signal is
         emitted.
       </tp:docstring>
-      <arg direction="in" name="id" type="u" tp:type="Tube_ID">
+      <arg direction="in" name="ID" type="u" tp:type="Tube_ID">
         <tp:docstring>
           The ID of the tube to accept.
         </tp:docstring>
       </arg>
-      <arg direction="in" name="address_type" type="u" tp:type="Socket_Address_Type">
+      <arg direction="in" name="Address_Type" type="u" tp:type="Socket_Address_Type">
         <tp:docstring>
           The type of address the connection manager should listen on.
         </tp:docstring>
       </arg>
-      <arg direction="in" name="access_control" type="u" tp:type="Socket_Access_Control">
+      <arg direction="in" name="Access_Control" type="u" tp:type="Socket_Access_Control">
         <tp:docstring>
           The type of access control the connection manager should apply to
           the socket.
         </tp:docstring>
       </arg>
-      <arg direction="in" name="access_control_param" type="v">
+      <arg direction="in" name="Access_Control_Param" type="v">
         <tp:docstring>
           A parameter for the access control type, to be interpreted as
           specified in the documentation for the Socket_Access_Control enum.
         </tp:docstring>
       </arg>
-      <arg direction="out" name="address" type="v">
+      <arg direction="out" name="Address" type="v">
         <tp:docstring>
           The address on which the connection manager will listen for
           connections to this tube. The client should not attempt to connect
@@ -561,27 +563,27 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       </tp:possible-errors>
     </method>
 
-    <signal name="TubeStateChanged">
+    <signal name="TubeStateChanged" tp:name-for-bindings="Tube_State_Changed">
       <tp:docstring>
         Emitted when the state of a tube changes.
       </tp:docstring>
-      <arg name="id" type="u" tp:type="Tube_ID">
+      <arg name="ID" type="u" tp:type="Tube_ID">
         <tp:docstring>
           The ID of the tube that changed state.
         </tp:docstring>
       </arg>
-      <arg name="state" type="u" tp:type="Tube_State">
+      <arg name="State" type="u" tp:type="Tube_State">
         <tp:docstring>
           The new state of the tube; see the Tube_State enumeration.
         </tp:docstring>
       </arg>
     </signal>
 
-    <method name="CloseTube">
+    <method name="CloseTube" tp:name-for-bindings="Close_Tube">
       <tp:docstring>
         Close a tube.
       </tp:docstring>
-      <arg direction="in" name="id" type="u" tp:type="Tube_ID">
+      <arg direction="in" name="ID" type="u" tp:type="Tube_ID">
         <tp:docstring>
           The ID of the tube to close.
         </tp:docstring>
@@ -591,24 +593,25 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       </tp:possible-errors>
     </method>
 
-    <signal name="TubeClosed">
+    <signal name="TubeClosed" tp:name-for-bindings="Tube_Closed">
       <tp:docstring>
        Emitted when a tube has been closed. The ID of a closed tube is no
        longer valid. The ID may later be reused for a new tube.
       </tp:docstring>
-      <arg name="id" type="u" tp:type="Tube_ID">
+      <arg name="ID" type="u" tp:type="Tube_ID">
         <tp:docstring>
           The ID of the tube that was closed.
         </tp:docstring>
       </arg>
     </signal>
 
-    <method name="GetDBusTubeAddress">
+    <method name="GetDBusTubeAddress"
+      tp:name-for-bindings="Get_DBus_Tube_Address">
       <tp:docstring>
         For a D-Bus tube, return a string describing the address of the
         private bus.
       </tp:docstring>
-      <arg direction="in" name="id" type="u" tp:type="Tube_ID">
+      <arg direction="in" name="ID" type="u" tp:type="Tube_ID">
         <tp:docstring>
           The ID of the tube to get an address for.
         </tp:docstring>
@@ -632,12 +635,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       </tp:possible-errors>
     </method>
 
-    <method name="GetDBusNames">
+    <method name="GetDBusNames" tp:name-for-bindings="Get_DBus_Names">
       <tp:docstring>
         For a multi-user (i.e. Handle_Type_Room) D-Bus tube, obtain a mapping
         between contact handles and their unique bus names on this tube.
       </tp:docstring>
-      <arg direction="in" name="id" type="u" tp:type="Tube_ID">
+      <arg direction="in" name="ID" type="u" tp:type="Tube_ID">
         <tp:docstring>
           The ID of the tube to get names for.
         </tp:docstring>
@@ -662,45 +665,46 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       </tp:possible-errors>
     </method>
 
-    <signal name="DBusNamesChanged">
+    <signal name="DBusNamesChanged" tp:name-for-bindings="DBus_Names_Changed">
       <tp:docstring>
         Emitted on a multi-user (i.e. Handle_Type_Room) D-Bus tube when a
         participant opens or closes the tube.
       </tp:docstring>
-      <arg name="id" type="u" tp:type="Tube_ID">
+      <arg name="ID" type="u" tp:type="Tube_ID">
         <tp:docstring>
           The ID of the tube whose names have changed.
         </tp:docstring>
       </arg>
-      <arg name="added" type="a(us)" tp:type="DBus_Tube_Member[]">
+      <arg name="Added" type="a(us)" tp:type="DBus_Tube_Member[]">
         <tp:docstring>
           Array of handles and D-Bus names of new participants.
         </tp:docstring>
       </arg>
-      <arg name="removed" type="au" tp:type="Contact_Handle[]">
+      <arg name="Removed" type="au" tp:type="Contact_Handle[]">
         <tp:docstring>
           Array of handles of former participants.
         </tp:docstring>
       </arg>
     </signal>
 
-    <method name="GetStreamTubeSocketAddress">
+    <method name="GetStreamTubeSocketAddress"
+      tp:name-for-bindings="Get_Stream_Tube_Socket_Address">
       <tp:docstring>
         For a stream tube, obtain the address of the socket used to
         communicate over this tube.
       </tp:docstring>
-      <arg direction="in" name="id" type="u" tp:type="Tube_ID">
+      <arg direction="in" name="ID" type="u" tp:type="Tube_ID">
         <tp:docstring>
           The ID of the stream tube to get the socket for.
         </tp:docstring>
       </arg>
-      <arg direction="out" name="address_type" type="u" tp:type="Socket_Address_Type">
+      <arg direction="out" name="Address_Type" type="u" tp:type="Socket_Address_Type">
         <tp:docstring>
           The type of the listening address of the socket, as a member of
           Socket_Address_Type.
         </tp:docstring>
       </arg>
-      <arg direction="out" name="address" type="v">
+      <arg direction="out" name="Address" type="v">
         <tp:docstring>
           The listening address of the socket, as indicated by the
           address_type.
@@ -720,17 +724,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       </tp:possible-errors>
     </method>
 
-    <signal name="StreamTubeNewConnection">
+    <signal name="StreamTubeNewConnection"
+      tp:name-for-bindings="Stream_Tube_New_Connection">
       <tp:docstring>
         Emitted on a stream tube when a participant opens a new connection
         to its socket.
       </tp:docstring>
-      <arg name="id" type="u" tp:type="Tube_ID">
+      <arg name="ID" type="u" tp:type="Tube_ID">
         <tp:docstring>
           The ID of the tube
         </tp:docstring>
       </arg>
-      <arg name="handle" type="u" tp:type="Contact_Handle">
+      <arg name="Handle" type="u" tp:type="Contact_Handle">
         <tp:docstring>
           The handle of the participant who opened the new connection
         </tp:docstring>
diff --git a/spec/Connection.xml b/spec/Connection.xml
index 79249967..2a70afb8 100644
--- a/spec/Connection.xml
+++ b/spec/Connection.xml
@@ -66,23 +66,50 @@ USA.</p>
       </tp:docstring>
     </method>
 
-    <method name="GetInterfaces">
+    <method name="GetInterfaces" tp:name-for-bindings="Get_Interfaces">
       <arg direction="out" type="as" tp:type="DBus_Interface[]">
         <tp:docstring>
           An array of D-Bus interface names
         </tp:docstring>
       </arg>
 
-      <tp:docstring>
-        Get the optional interfaces supported by this connection.
+      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+        <p>Get the optional interfaces supported by this connection.
+          Before the connection status changes to CONNECTED, the return
+          from this method may change at any time, but it is guaranteed that
+          interfaces will only be added, not removed. After the connection
+          status changes to CONNECTED, the return from this method cannot
+          change further.</p>
+
+        <p>There is no explicit change notification; reasonable behaviour
+          for a client would be to retrieve the interfaces list once
+          initially, and once more when it becomes CONNECTED.</p>
+
+        <tp:rationale>
+          <p>In some connection managers, certain capabilities of a connection
+            are known to be implemented for all connections (e.g. support
+            for SimplePresence), and some interfaces (like SimplePresence) can
+            even be used before connecting. Other capabilities may
+            or may not exist, depending on server functionality; by the time
+            the connection goes CONNECTED, the connection manager is expected
+            to have evaluated the server's functionality and enabled any extra
+            interfaces for the remainder of the Connection's lifetime.</p>
+        </tp:rationale>
       </tp:docstring>
 
       <tp:possible-errors>
-        <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/>
+        <tp:error name="org.freedesktop.Telepathy.Error.Disconnected">
+          <tp:docstring>
+             Before version 0.17.UNRELEASED calling GetInterfaces while
+             on a connection that is not yet CONNECTED wasn't allowed. If a
+             CM returns this error, its list of interfaces should be regarded
+             as empty until it becomes CONNECTED.
+          </tp:docstring>
+        </tp:error>
       </tp:possible-errors>
     </method>
 
-    <method name="GetProtocol">
+    <method name="GetProtocol" tp:name-for-bindings="Get_Protocol">
       <arg direction="out" type="s" tp:type="Protocol">
         <tp:docstring>
           A string identifier for the protocol
@@ -94,7 +121,7 @@ USA.</p>
       </tp:docstring>
     </method>
 
-    <method name="GetSelfHandle">
+    <method name="GetSelfHandle" tp:name-for-bindings="Get_Self_Handle">
       <arg direction="out" type="u" tp:type="Contact_Handle">
         <tp:docstring>
           An integer handle representing the user
@@ -113,7 +140,7 @@ USA.</p>
       </tp:possible-errors>
     </method>
 
-    <method name="GetStatus">
+    <method name="GetStatus" tp:name-for-bindings="Get_Status">
       <arg direction="out" type="u" tp:type="Connection_Status">
         <tp:docstring>
           An integer representing the current status
@@ -125,14 +152,14 @@ USA.</p>
       </tp:docstring>
     </method>
 
-    <method name="HoldHandles">
-      <arg direction="in" name="handle_type" type="u" tp:type="Handle_Type">
+    <method name="HoldHandles" tp:name-for-bindings="Hold_Handles">
+      <arg direction="in" name="Handle_Type" type="u" tp:type="Handle_Type">
         <tp:docstring>
           The type of handle to be held
         </tp:docstring>
       </arg>
 
-      <arg direction="in" name="handles" type="au" tp:type="Handle[]">
+      <arg direction="in" name="Handles" type="au" tp:type="Handle[]">
         <tp:docstring>
           A array of integer handles to hold
         </tp:docstring>
@@ -167,14 +194,14 @@ USA.</p>
       </tp:possible-errors>
     </method>
 
-    <method name="InspectHandles">
-      <arg direction="in" name="handle_type" type="u" tp:type="Handle_Type">
+    <method name="InspectHandles" tp:name-for-bindings="Inspect_Handles">
+      <arg direction="in" name="Handle_Type" type="u" tp:type="Handle_Type">
         <tp:docstring>
           The type of handle to be inspected
         </tp:docstring>
       </arg>
 
-      <arg direction="in" name="handles" type="au" tp:type="Handle[]">
+      <arg direction="in" name="Handles" type="au" tp:type="Handle[]">
         <tp:docstring>
           An array of integer handles of this type
         </tp:docstring>
@@ -202,7 +229,7 @@ USA.</p>
       </tp:possible-errors>
     </method>
 
-    <method name="ListChannels">
+    <method name="ListChannels" tp:name-for-bindings="List_Channels">
       <arg direction="out" type="a(osuu)" tp:type="Channel_Info[]">
         <tp:docstring>
           An array of structs representing channels.
@@ -218,34 +245,34 @@ USA.</p>
       </tp:possible-errors>
     </method>
 
-    <signal name="NewChannel">
-      <arg name="object_path" type="o">
+    <signal name="NewChannel" tp:name-for-bindings="New_Channel">
+      <arg name="Object_Path" type="o">
         <tp:docstring>
           A D-Bus object path for the channel object on this service
         </tp:docstring>
       </arg>
 
-      <arg name="channel_type" type="s" tp:type="DBus_Interface">
+      <arg name="Channel_Type" type="s" tp:type="DBus_Interface">
         <tp:docstring>
           A D-Bus interface name representing the channel type
         </tp:docstring>
       </arg>
 
-      <arg name="handle_type" type="u" tp:type="Handle_Type">
+      <arg name="Handle_Type" type="u" tp:type="Handle_Type">
         <tp:docstring>
           An integer representing the type of handle this channel
           communicates with, or Handle_Type_None if no handle is specified
         </tp:docstring>
       </arg>
 
-      <arg name="handle" type="u" tp:type="Handle">
+      <arg name="Handle" type="u" tp:type="Handle">
         <tp:docstring>
           A handle indicating the specific contact, room or list this
           channel communicates with, or zero if no handle is specified
         </tp:docstring>
       </arg>
 
-      <arg name="suppress_handler" type="b">
+      <arg name="Suppress_Handler" type="b">
         <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
           <p>If true, the channel was requested by a client that intends to
             present it to the user itself (i.e. it passed suppress_handler=TRUE
@@ -271,14 +298,14 @@ USA.</p>
       </tp:docstring>
     </signal>
 
-    <method name="ReleaseHandles">
-      <arg direction="in" name="handle_type" type="u" tp:type="Handle_Type">
+    <method name="ReleaseHandles" tp:name-for-bindings="Release_Handles">
+      <arg direction="in" name="Handle_Type" type="u" tp:type="Handle_Type">
         <tp:docstring>
           An integer handle type (as defined in RequestHandle)
         </tp:docstring>
       </arg>
 
-      <arg direction="in" name="handles" type="au" tp:type="Handle[]">
+      <arg direction="in" name="Handles" type="au" tp:type="Handle[]">
         <tp:docstring>
           An array of integer handles being held by the client
         </tp:docstring>
@@ -294,32 +321,38 @@ USA.</p>
       <tp:possible-errors>
         <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/>
         <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument">
-          The handle type is invalid
+          <tp:docstring>
+            The handle type is invalid
+          </tp:docstring>
         </tp:error>
         <tp:error name="org.freedesktop.Telepathy.Error.InvalidHandle">
-          One of the given handles is not valid
+          <tp:docstring>
+            One of the given handles is not valid
+          </tp:docstring>
         </tp:error>
         <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable">
-          One of the given handles is not held by this client
+          <tp:docstring>
+            One of the given handles is not held by this client
+          </tp:docstring>
         </tp:error>
       </tp:possible-errors>
     </method>
 
-    <method name="RequestChannel">
-      <arg direction="in" name="type" type="s" tp:type="DBus_Interface">
+    <method name="RequestChannel" tp:name-for-bindings="Request_Channel">
+      <arg direction="in" name="Type" type="s" tp:type="DBus_Interface">
         <tp:docstring>
           A D-Bus interface name representing base channel type
         </tp:docstring>
       </arg>
 
-      <arg direction="in" name="handle_type" type="u" tp:type="Handle_Type">
+      <arg direction="in" name="Handle_Type" type="u" tp:type="Handle_Type">
         <tp:docstring>
           An integer representing the handle type, or Handle_Type_None if
           no handle is specified
         </tp:docstring>
       </arg>
 
-      <arg direction="in" name="handle" type="u" tp:type="Handle">
+      <arg direction="in" name="Handle" type="u" tp:type="Handle">
         <tp:docstring>
           A nonzero integer handle representing a contact, room, list etc.
           according to handle_type, or zero if the handle_type is
@@ -327,7 +360,7 @@ USA.</p>
         </tp:docstring>
       </arg>
 
-      <arg direction="in" name="suppress_handler" type="b">
+      <arg direction="in" name="Suppress_Handler" type="b">
         <tp:docstring>
           If true, the requesting client intends to take responsibility for
           displaying the channel to the user, so no other handler needs to
@@ -450,14 +483,14 @@ USA.</p>
         Handle_Type_Group</tp:docstring>
     </tp:simple-type>
 
-    <method name="RequestHandles">
-      <arg direction="in" name="handle_type" type="u" tp:type="Handle_Type">
+    <method name="RequestHandles" tp:name-for-bindings="Request_Handles">
+      <arg direction="in" name="Handle_Type" type="u" tp:type="Handle_Type">
         <tp:docstring>
           The type of handle required
         </tp:docstring>
       </arg>
 
-      <arg direction="in" name="names" type="as">
+      <arg direction="in" name="Names" type="as">
         <tp:docstring>
           An array of names of entities to request handles for
         </tp:docstring>
@@ -483,10 +516,14 @@ USA.</p>
       <tp:possible-errors>
         <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/>
         <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument">
-          The handle type is invalid
+          <tp:docstring>
+            The handle type is invalid
+          </tp:docstring>
         </tp:error>
         <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable">
-          The given name is not a valid entity of the given type
+          <tp:docstring>
+            The given name is not a valid entity of the given type
+          </tp:docstring>
         </tp:error>
       </tp:possible-errors>
     </method>
@@ -588,14 +625,14 @@ USA.</p>
       </tp:enumvalue>
     </tp:enum>
 
-    <signal name="StatusChanged">
-      <arg name="status" type="u" tp:type="Connection_Status">
+    <signal name="StatusChanged" tp:name-for-bindings="Status_Changed">
+      <arg name="Status" type="u" tp:type="Connection_Status">
         <tp:docstring>
           An integer indicating the new status, as defined by ConnectionStatus
         </tp:docstring>
       </arg>
 
-      <arg name="reason" type="u" tp:type="Connection_Status_Reason">
+      <arg name="Reason" type="u" tp:type="Connection_Status_Reason">
         <tp:docstring>
           An integer indicating the reason for the status change, as defined
           by ConnectionStatusReason
diff --git a/spec/Connection_Interface_Aliasing.xml b/spec/Connection_Interface_Aliasing.xml
index c975adff..15c4a657 100644
--- a/spec/Connection_Interface_Aliasing.xml
+++ b/spec/Connection_Interface_Aliasing.xml
@@ -35,8 +35,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       <tp:member type="s" name="Alias"/>
     </tp:struct>
 
-    <signal name="AliasesChanged">
-      <arg name="aliases" type="a(us)" tp:type="Alias_Pair[]">
+    <signal name="AliasesChanged" tp:name-for-bindings="Aliases_Changed">
+      <arg name="Aliases" type="a(us)" tp:type="Alias_Pair[]">
         <!-- FIXME: if we break API, this could be an Alias_Map, a{us} -->
         <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
           An array containing structs of:
@@ -68,7 +68,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         </tp:docstring>
       </tp:flag>
     </tp:flags>
-    <method name="GetAliasFlags">
+    <method name="GetAliasFlags" tp:name-for-bindings="Get_Alias_Flags">
       <arg direction="out" type="u" tp:type="Connection_Alias_Flags">
         <tp:docstring>
           An integer with a bitwise OR of flags from ConnectionAliasFlags
@@ -82,8 +82,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/>
       </tp:possible-errors>
     </method>
-    <method name="RequestAliases">
-      <arg direction="in" name="contacts" type="au" tp:type="Contact_Handle[]">
+    <method name="RequestAliases" tp:name-for-bindings="Request_Aliases">
+      <arg direction="in" name="Contacts" type="au" tp:type="Contact_Handle[]">
         <tp:docstring>
           An array of handles representing contacts
         </tp:docstring>
@@ -103,8 +103,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         <tp:error name="org.freedesktop.Telepathy.Error.InvalidHandle"/>
       </tp:possible-errors>
     </method>
-    <method name="SetAliases">
-      <arg direction="in" name="aliases" type="a{us}" tp:type="Alias_Map">
+    <method name="SetAliases" tp:name-for-bindings="Set_Aliases">
+      <arg direction="in" name="Aliases" type="a{us}" tp:type="Alias_Map">
         <tp:docstring>
           A dictionary mapping integer handles of contacts
           to strings of the new alias to set.
diff --git a/spec/Connection_Interface_Avatars.xml b/spec/Connection_Interface_Avatars.xml
index 9395a6ef..018f80ec 100644
--- a/spec/Connection_Interface_Avatars.xml
+++ b/spec/Connection_Interface_Avatars.xml
@@ -28,13 +28,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       <tp:member type="s" name="Token"/>
     </tp:mapping>
 
-    <signal name="AvatarUpdated">
-      <arg name="contact" type="u" tp:type="Contact_Handle">
+    <signal name="AvatarUpdated" tp:name-for-bindings="Avatar_Updated">
+      <arg name="Contact" type="u" tp:type="Contact_Handle">
         <tp:docstring>
           An integer handle for the contact whose avatar has changed
         </tp:docstring>
       </arg>
-      <arg name="new_avatar_token" type="s">
+      <arg name="New_Avatar_Token" type="s">
         <tp:docstring>
           Unique token for their new avatar
         </tp:docstring>
@@ -46,23 +46,23 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         avatar should be requested with RequestAvatars.
       </tp:docstring>
     </signal>
-    <signal name="AvatarRetrieved">
-      <arg name="contact" type="u" tp:type="Contact_Handle">
+    <signal name="AvatarRetrieved" tp:name-for-bindings="Avatar_Retrieved">
+      <arg name="Contact" type="u" tp:type="Contact_Handle">
         <tp:docstring>
           The contact whose avatar has been retrieved
         </tp:docstring>
       </arg>
-      <arg name="token" type="s">
+      <arg name="Token" type="s">
         <tp:docstring>
           The token corresponding to the avatar
         </tp:docstring>
       </arg>
-      <arg name="avatar" type="ay">
+      <arg name="Avatar" type="ay">
         <tp:docstring>
           An array of bytes containing the image data
         </tp:docstring>
       </arg>
-      <arg name="type" type="s">
+      <arg name="Type" type="s">
         <tp:docstring>
           A string containing the image MIME type (eg image/jpeg), or empty if
           unknown
@@ -72,7 +72,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         Emitted when the avatar for a contact has been retrieved.
       </tp:docstring>
     </signal>
-    <method name="GetAvatarRequirements">
+    <method name="GetAvatarRequirements"
+      tp:name-for-bindings="Get_Avatar_Requirements">
       <arg direction="out" type="as">
         <tp:docstring>
           An array of supported MIME types (eg image/jpeg)
@@ -113,8 +114,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"/>
       </tp:possible-errors>
     </method>
-    <method name="GetAvatarTokens">
-      <arg direction="in" name="contacts" type="au" tp:type="Contact_Handle[]">
+    <method name="GetAvatarTokens" tp:name-for-bindings="Get_Avatar_Tokens">
+      <arg direction="in" name="Contacts" type="au" tp:type="Contact_Handle[]">
         <tp:docstring>
         An array of handles representing contacts
         </tp:docstring>
@@ -139,8 +140,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"/>
       </tp:possible-errors>
     </method>
-    <method name="GetKnownAvatarTokens">
-      <arg direction="in" name="contacts" type="au" tp:type="Contact_Handle[]">
+    <method name="GetKnownAvatarTokens"
+      tp:name-for-bindings="Get_Known_Avatar_Tokens">
+      <arg direction="in" name="Contacts" type="au" tp:type="Contact_Handle[]">
         <tp:docstring>
         An array of handles representing contacts
         </tp:docstring>
@@ -167,8 +169,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"/>
       </tp:possible-errors>
     </method>
-    <method name="RequestAvatar">
-      <arg direction="in" name="contact" type="u" tp:type="Contact_Handle">
+    <method name="RequestAvatar" tp:name-for-bindings="Request_Avatar">
+      <arg direction="in" name="Contact" type="u" tp:type="Contact_Handle">
         <tp:docstring>
           An integer handle for the contact to request the avatar for
         </tp:docstring>
@@ -200,8 +202,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         </tp:error>
       </tp:possible-errors>
     </method>
-    <method name="RequestAvatars">
-      <arg direction="in" name="contacts" type="au"
+    <method name="RequestAvatars" tp:name-for-bindings="Request_Avatars">
+      <arg direction="in" name="Contacts" type="au"
         tp:type="Contact_Handle[]">
         <tp:docstring>
           The contacts to retrieve avatars for
@@ -219,13 +221,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         <tp:error name="org.freedesktop.Telepathy.Error.InvalidHandle"/>
       </tp:possible-errors>
     </method>
-    <method name="SetAvatar">
-      <arg direction="in" name="avatar" type="ay">
+    <method name="SetAvatar" tp:name-for-bindings="Set_Avatar">
+      <arg direction="in" name="Avatar" type="ay">
         <tp:docstring>
           An array of bytes representing the avatar image data
         </tp:docstring>
       </arg>
-      <arg direction="in" name="mime_type" type="s">
+      <arg direction="in" name="MIME_Type" type="s">
         <tp:docstring>
           A string representing the image MIME type
         </tp:docstring>
@@ -247,7 +249,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"/>
       </tp:possible-errors>
     </method>
-    <method name="ClearAvatar">
+    <method name="ClearAvatar" tp:name-for-bindings="Clear_Avatar">
       <tp:added version="0.15.0" />
       <tp:docstring>
         Remove the avatar image for this connection.
diff --git a/spec/Connection_Interface_Capabilities.xml b/spec/Connection_Interface_Capabilities.xml
index e4b739d2..88d16840 100644
--- a/spec/Connection_Interface_Capabilities.xml
+++ b/spec/Connection_Interface_Capabilities.xml
@@ -28,16 +28,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         manager that it will ordinarily be able to create a channel when given
         a request with the given type and handle.</p>
 
-      <p>Capabilities can pertain to a certain contact handle, representing
-        activities such as having a text chat or a voice call with the user, or
-        can be on the connection itself (where the handle will be zero), where
-        they represent the ability to create channels for chat rooms or
-        activities such as searching and room listing. The activities are
-        represented by the D-Bus interface name of the channel type for that
-        activity.</p>
+      <p>Capabilities pertain to particular contact handles, and represent
+        activities such as having a text chat or a voice call with the user.
+        The activities are represented by the D-Bus interface name of the
+        channel type for that activity.</p>
 
       <p>The generic capability flags are defined by
-        Connection_Capability_Flags.</p>
+        <tp:type>Connection_Capability_Flags</tp:type>.</p>
 
       <p>In addition, channel types may have type specific capability flags of
         their own, which are described in the documentation for each channel
@@ -50,6 +47,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         to them which are implemented by available client processes.</p>
     </tp:docstring>
 
+    <tp:changed version="0.17.UNRELEASED">Previously, this interface
+      also expressed capabilities of the connection itself, indicating what
+      sorts of channels could be requested (for instance, the ability to
+      open chatroom lists or chatrooms). However, this was never very
+      well-defined or consistent, and as far as we know it was never
+      implemented correctly. This usage is now deprecated.</tp:changed>
+
+    <!-- FIXME: are the type-specific flags sufficient, in a world that has
+    the Requests interface? It'd be nice if we could advertise capabilities
+    that are not defined in terms of a channel type but rather in terms of
+    a property or something, e.g. Channel.Interface.TLS.Secure for
+    individually TLS'd channels. -->
+
     <tp:flags name="Connection_Capability_Flags"
       value-prefix="Connection_Capability_Flag" type="u">
       <tp:flag suffix="Create" value="1">
@@ -99,8 +109,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       <tp:member type="u" name="New_Type_Specific_Flags"/>
     </tp:struct>
 
-    <method name="AdvertiseCapabilities">
-      <arg direction="in" name="add" type="a(su)" tp:type="Capability_Pair[]">
+    <method name="AdvertiseCapabilities"
+      tp:name-for-bindings="Advertise_Capabilities">
+      <arg direction="in" name="Add" type="a(su)" tp:type="Capability_Pair[]">
         <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
           An array of structures containing:
           <ul>
@@ -109,7 +120,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
           </ul>
         </tp:docstring>
       </arg>
-      <arg direction="in" name="remove" type="as" tp:type="DBus_Interface[]">
+      <arg direction="in" name="Remove" type="as" tp:type="DBus_Interface[]">
         <tp:docstring>
           An array of D-Bus interface names of channel types to remove
         </tp:docstring>
@@ -136,7 +147,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
 
         <p>Upon a successful invocation of this method, the CapabilitiesChanged
         signal will be emitted for the user's own handle (as returned by
-        GetSelfHandle) the by the connection manager to indicate the changes
+        GetSelfHandle) by the connection manager to indicate the changes
         that have been made.  This signal should also be monitored to ensure
         that the set is kept accurate - for example, a client may remove
         capabilities or type specific capability flags when it exits
@@ -148,8 +159,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:possible-errors>
     </method>
 
-    <signal name="CapabilitiesChanged">
-      <arg name="caps" type="a(usuuuu)" tp:type="Capability_Change[]">
+    <signal name="CapabilitiesChanged"
+      tp:name-for-bindings="Capabilities_Changed">
+      <arg name="Caps" type="a(usuuuu)" tp:type="Capability_Change[]">
         <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
           An array of structures containing:
           <ul>
@@ -162,20 +174,30 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
           </ul>
         </tp:docstring>
       </arg>
-      <tp:docstring>
-        Announce that there has been a change of capabilities on the
-        given handle, or on the connection itself if the handle is zero.
+      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+        <p>Announce that there has been a change of capabilities on the
+          given handle.</p>
+
+        <p>If the handle is zero, the capabilities refer to the connection
+          itself, in some poorly defined way. This usage is deprecated and
+          clients should ignore it.</p>
       </tp:docstring>
     </signal>
 
-    <method name="GetCapabilities">
-      <arg direction="in" name="handles" type="au" tp:type="Contact_Handle[]">
-        <tp:docstring>
-          An array of contact handles for this connection, or zero to query capabilities available on the connection itself
+    <method name="GetCapabilities" tp:name-for-bindings="Get_Capabilities">
+      <arg direction="in" name="Handles" type="au" tp:type="Contact_Handle[]">
+        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+          <p>An array of contact handles for this connection.</p>
+
+          <p>This may include zero, which originally meant a query for
+            capabilities available on the connection itself. This usage
+            is deprecated; clients SHOULD NOT do this, and connection managers
+            SHOULD proceed as though zero had not been present in this
+            list.</p>
         </tp:docstring>
       </arg>
       <arg direction="out" type="a(usuu)" tp:type="Contact_Capability[]">
-        <tp:docstring>
+        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
           An array of structures containing:
           <ul>
             <li>an integer handle representing the contact</li>
@@ -186,15 +208,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         </tp:docstring>
       </arg>
       <tp:docstring>
-        Returns an array of capabilities for the given contact handles, or
-        the connection itself (where handle is zero).
+        Returns an array of capabilities for the given contact handles.
       </tp:docstring>
       <tp:possible-errors>
         <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/>
         <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/>
         <tp:error name="org.freedesktop.Telepathy.Error.InvalidHandle">
           <tp:docstring>
-            The handle does not represent a contact
+            The handle does not represent a contact and is not zero
           </tp:docstring>
         </tp:error>
         <tp:error name="org.freedesktop.Telepathy.Error.PermissionDenied"/>
diff --git a/spec/Connection_Interface_Contact_Info.xml b/spec/Connection_Interface_Contact_Info.xml
index 22cd507c..4f8fd42d 100644
--- a/spec/Connection_Interface_Contact_Info.xml
+++ b/spec/Connection_Interface_Contact_Info.xml
@@ -21,13 +21,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
   <interface name="org.freedesktop.Telepathy.Connection.Interface.ContactInfo"
     tp:causes-havoc='obsolete'>
     <tp:requires interface="org.freedesktop.Telepathy.Connection"/>
-    <signal name="GotContactInfo">
-      <arg name="contact" type="u" tp:type="Contact_Handle">
+    <signal name="GotContactInfo" tp:name-for-bindings="Got_Contact_Info">
+      <arg name="Contact" type="u" tp:type="Contact_Handle">
         <tp:docstring>
           An integer handle of the contact ID on the server
         </tp:docstring>
       </arg>
-      <arg name="vcard" type="s">
+      <arg name="VCard" type="s">
         <tp:docstring>
           The XML string containing their vcard information
         </tp:docstring>
@@ -37,8 +37,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         the details of a particular contact.
       </tp:docstring>
     </signal>
-    <method name="RequestContactInfo">
-      <arg direction="in" name="contact" type="u" tp:type="Contact_Handle">
+    <method name="RequestContactInfo"
+      tp:name-for-bindings="Request_Contact_Info">
+      <arg direction="in" name="Contact" type="u" tp:type="Contact_Handle">
         <tp:docstring>
           An integer handle for the contact to request info for
         </tp:docstring>
diff --git a/spec/Connection_Interface_Contacts.xml b/spec/Connection_Interface_Contacts.xml
new file mode 100644
index 00000000..d6cb2467
--- /dev/null
+++ b/spec/Connection_Interface_Contacts.xml
@@ -0,0 +1,225 @@
+<?xml version="1.0" ?>
+<node name="/Connection_Interface_Contact_Attributes" 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>
+  <tp:license xmlns="http://www.w3.org/1999/xhtml">
+    <p>This library is free software; you can redistribute it and/or modify it
+      under the terms of the GNU Lesser General Public License as published by
+      the Free Software Foundation; either version 2.1 of the License, or (at
+      your option) any later version.</p>
+
+    <p>This library is distributed in the hope that it will be useful, but
+      WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser
+      General Public License for more details.</p>
+
+    <p>You should have received a copy of the GNU Lesser General Public License
+      along with this library; if not, write to the Free Software Foundation,
+      Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p>
+  </tp:license>
+  <interface name="org.freedesktop.Telepathy.Connection.Interface.Contacts.DRAFT"
+    tp:causes-havoc="experimental">
+    <tp:requires interface="org.freedesktop.Telepathy.Connection"/>
+
+    <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+      <p>This interface allows many attributes of many contacts to be
+        obtained in a single D-Bus round trip.</p>
+
+      <p>Each contact attribute has an string identifier
+        (<tp:type>Contact_Attribute</tp:type>), which is namespaced
+        by the D-Bus interface which defines it.</p>
+
+      <p>While this interface is a draft, an initial set of contact
+        attributes is defined here. The definitions of these attributes
+        will be moved to the spec for individual interfaces when this interface
+        is finalized.</p>
+
+      <dl>
+        <dt>org.freedesktop.Telepathy.Connection/contact-id
+          (type s)</dt>
+        <dd>The same string that would be returned by <tp:dbus-ref
+            namespace="org.freedesktop.Telepathy.Connection">InspectHandles</tp:dbus-ref>
+          (always present in the result)
+        </dd>
+        <dt>org.freedesktop.Telepathy.Connection.Interface.Aliasing/alias
+          (type s)</dt>
+        <dd>The contact's alias as defined by the <tp:dbus-ref
+            namespace="org.freedesktop.Telepathy.Connection.Interface">Aliasing</tp:dbus-ref>
+          interface (always present with some value, possibly the
+          same as Connection/contact-id, if information from the
+          Aliasing interface was requested)
+        </dd>
+        <dt>org.freedesktop.Telepathy.Connection.Interface.Avatars/token
+          (type s</dt>
+        <dd>The same string that would be returned by <tp:dbus-ref
+            namespace="org.freedesktop.Telepathy.Connection.Interface.Avatars">GetAvatarTokens</tp:dbus-ref>
+          (omitted from the result if the contact's avatar token is not known,
+          present as an empty string if the contact is known not to have
+          an avatar)
+        </dd>
+        <dt>org.freedesktop.Telepathy.Connection.Interface.SimplePresence/presence
+          (type (uss), <tp:type>Simple_Presence</tp:type>)</dt>
+        <dd> The same struct that would be returned by
+            <tp:dbus-ref
+              namespace="org.freedesktop.Telepathy.Connection.Interface.SimplePresence">GetPresences</tp:dbus-ref>
+          (always present with some value if information from the
+          SimplePresence interface was requested)
+          </dd>
+        <dt>org.freedesktop.Telepathy.Connection.Interface.Capabilities/caps
+          (type a(usuu), <tp:type>Contact_Capability</tp:type>)</dt>
+        <dd>The same structs that would be returned by
+          <tp:dbus-ref namespace="org.freedesktop.Telepathy.Connection.Interface.Capabilities">GetCapabilities</tp:dbus-ref>
+          (all of them will redundantly have the contact's handle as the
+          first member). Omitted from the result if the contact's capabilities
+          are not known; present in the result as an empty array if the
+          contact is known to have no capabilities at all.</dd>
+      </dl>
+    </tp:docstring>
+
+    <tp:simple-type name="Contact_Attribute" type="s">
+      <tp:docstring>
+        A <tp:type>DBus_Interface</tp:type>, followed by a slash '/' character
+        and an identifier for an attribute defined by that interface. The
+        attribute identifier SHOULD be in lower case.
+
+        <tp:rationale>
+          These aren't D-Bus core Properties, and we want them to look visibly
+          different.
+        </tp:rationale>
+      </tp:docstring>
+    </tp:simple-type>
+
+    <tp:mapping name="Single_Contact_Attributes_Map">
+      <tp:docstring>
+        Some of the attributes of a single contact.
+      </tp:docstring>
+
+      <tp:member type="s" tp:type="Contact_Attribute" name="Attribute">
+        <tp:docstring>
+          The name of the attribute
+        </tp:docstring>
+      </tp:member>
+
+      <tp:member type="v" name="Value">
+        <tp:docstring>
+          The value of the attribute
+        </tp:docstring>
+      </tp:member>
+    </tp:mapping>
+
+    <tp:mapping name="Contact_Attributes_Map">
+      <tp:docstring>Mapping returned by InspectContacts, representing a
+        collection of Contacts and their requested attributes.</tp:docstring>
+
+      <tp:member type="u" tp:type="Contact_Handle" name="Contact">
+        <tp:docstring>
+          A contact
+        </tp:docstring>
+      </tp:member>
+
+      <tp:member type="a{sv}" tp:type="Single_Contact_Attributes_Map"
+        name="Attributes">
+        <tp:docstring>
+          Attributes of that contact
+        </tp:docstring>
+      </tp:member>
+    </tp:mapping>
+
+    <property name="InspectableInterfaces" access="read" type="as"
+      tp:type="DBus_Interface[]" tp:name-for-bindings="InspectableInterfaces">
+      <tp:docstring>
+        A list of D-Bus interfaces for which
+        <tp:member-ref>InspectContacts</tp:member-ref> is expected to work.
+        This cannot change during the lifetime of the Connection.
+      </tp:docstring>
+    </property>
+
+    <method name="InspectContacts" tp:name-for-bindings="Inspect_Contacts">
+      <tp:docstring>
+        Return any number of contact attributes for the given handles.
+      </tp:docstring>
+
+      <arg direction="in" name="Handles" type="au" tp:type="Contact_Handle[]">
+        <tp:docstring>
+          An array of handles representing contacts.
+        </tp:docstring>
+      </arg>
+
+      <arg direction="in" name="Interfaces" type="as"
+        tp:type="DBus_Interface[]">
+        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+          <p>A list of strings indicating which D-Bus interfaces the calling
+            process is interested in. All supported attributes from these
+            interfaces, whose values can be obtained without additional network
+            activity, will be in the reply.</p>
+
+          <p>It is an error to request interfaces that are not supported by
+            this Connection (i.e. mentioned in the
+            <tp:member-ref>InspectableInterfaces</tp:member-ref> property).</p>
+
+          <tp:rationale>
+            <p>This makes it possible to distinguish between interfaces for
+              which the Connection has nothing to say (e.g. we don't know the
+              avatar tokens of any of the contacts, so we omitted them all),
+              and interfaces for which this API isn't supported.</p>
+          </tp:rationale>
+
+          <p>Attributes from the interface
+            <tp:dbus-ref>org.freedesktop.Telepathy.Connection</tp:dbus-ref>
+            are always returned, and need not be requested explicitly.</p>
+
+          <p>As well as returning cached information immediately, the
+            connection MAY start asynchronous requests to obtain better
+            values for the contact attributes. If better values are later
+            obtained by this process, they will be indicated with the usual
+            signals (such as AliasesChanged).</p>
+
+          <tp:rationale>
+            For instance, an XMPP connection manager could download vCards
+            in response to a request for Aliasing attributes.
+          </tp:rationale>
+        </tp:docstring>
+      </arg>
+
+      <arg direction="in" name="Hold" type="b">
+        <tp:docstring>
+          If true, all handles in the result have been held on behalf of the
+          calling process, as if by a call to
+          <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.HoldHandles</tp:dbus-ref>.
+
+          <tp:rationale>
+            For further round-trip avoidance.
+          </tp:rationale>
+        </tp:docstring>
+      </arg>
+
+      <arg direction="out" type="a{ua{sv}}" name="Attributes"
+        tp:type="Contact_Attributes_Map">
+        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+          <p>A dictionary mapping the contact handles to contact attributes.
+            If any of the requested handles are in fact invalid, they are
+            simply omitted from this mapping. If contact attributes are not
+            immediately known, the behaviour is defined by the interface;
+            the attribute should either be omitted from the result or
+            replaced with a default value.</p>
+
+          <p>Each contact's attributes will always include at least the
+            identifier that would be obtained by inspecting the handle
+            (<code>org.freedesktop.Telepathy.Connection/contact-id</code>).</p>
+        </tp:docstring>
+      </arg>
+
+      <tp:possible-errors>
+        <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/>
+        <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument">
+          <tp:docstring>
+            One of the requested interfaces is not supported (mentioned in
+            <tp:member-ref>InspectableInterfaces</tp:member-ref>).
+          </tp:docstring>
+        </tp:error>
+      </tp:possible-errors>
+    </method>
+  </interface>
+</node>
+<!-- vim:set sw=2 sts=2 et ft=xml: -->
diff --git a/spec/Connection_Interface_Forwarding.xml b/spec/Connection_Interface_Forwarding.xml
index 6322fbc7..73051f4b 100644
--- a/spec/Connection_Interface_Forwarding.xml
+++ b/spec/Connection_Interface_Forwarding.xml
@@ -21,8 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
   <interface name="org.freedesktop.Telepathy.Connection.Interface.Forwarding"
     tp:causes-havoc='not well-tested'>
     <tp:requires interface="org.freedesktop.Telepathy.Connection"/>
-    <signal name="ForwardingChanged">
-      <arg name="forward_to" type="u" tp:type="Contact_Handle">
+    <signal name="ForwardingChanged" tp:name-for-bindings="Forwarding_Changed">
+      <arg name="Forward_To" type="u" tp:type="Contact_Handle">
         <tp:docstring>
           An integer contact handle to forward communication to
         </tp:docstring>
@@ -32,7 +32,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         changed. An zero handle indicates forwarding is disabled.
       </tp:docstring>
     </signal>
-    <method name="GetForwardingHandle">
+    <method name="GetForwardingHandle"
+      tp:name-for-bindings="Get_Forwarding_Handle">
       <arg direction="out" type="u" tp:type="Contact_Handle">
         <tp:docstring>
           An integer contact handle to whom incoming communication is forwarded
@@ -47,8 +48,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"/>
       </tp:possible-errors>
     </method>
-    <method name="SetForwardingHandle">
-      <arg direction="in" name="forward_to" type="u" tp:type="Contact_Handle">
+    <method name="SetForwardingHandle"
+      tp:name-for-bindings="Set_Forwarding_Handle">
+      <arg direction="in" name="Forward_To" type="u" tp:type="Contact_Handle">
         <tp:docstring>
           An integer contact handle to forward incoming communications to
         </tp:docstring>
diff --git a/spec/Connection_Interface_Presence.xml b/spec/Connection_Interface_Presence.xml
index 98cf8739..b9f37f65 100644
--- a/spec/Connection_Interface_Presence.xml
+++ b/spec/Connection_Interface_Presence.xml
@@ -63,13 +63,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       <tp:member type="(ubba{ss})" tp:type="Status_Spec" name="Spec"/>
     </tp:mapping>
 
-    <method name="AddStatus">
-      <arg direction="in" name="status" type="s">
+    <method name="AddStatus" tp:name-for-bindings="Add_Status">
+      <arg direction="in" name="Status" type="s">
         <tp:docstring>
           The string identifier of the desired status
         </tp:docstring>
       </arg>
-      <arg direction="in" name="parms" type="a{sv}" tp:type="String_Variant_Map">
+      <arg direction="in" name="Parms" type="a{sv}" tp:type="String_Variant_Map">
         <tp:docstring>
           A dictionary of optional parameter names mapped to their variant-boxed values
         </tp:docstring>
@@ -87,7 +87,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         <tp:error name="org.freedesktop.Telepathy.Error.PermissionDenied"/>
       </tp:possible-errors>
     </method>
-    <method name="ClearStatus">
+    <method name="ClearStatus" tp:name-for-bindings="Clear_Status">
       <tp:docstring>
         Request that all of a user's presence statuses be removed. Be aware
         that this request may simply result in the statuses being replaced by a
@@ -100,13 +100,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         <tp:error name="org.freedesktop.Telepathy.Error.PermissionDenied"/>
       </tp:possible-errors>
     </method>
-    <method name="GetPresence">
-      <arg direction="in" name="contacts" type="au" tp:type="Contact_Handle[]">
+    <method name="GetPresence" tp:name-for-bindings="Get_Presence">
+      <arg direction="in" name="Contacts" type="au" tp:type="Contact_Handle[]">
         <tp:docstring>
           An array of the contacts whose presence should be obtained
         </tp:docstring>
       </arg>
-      <arg direction="out" name="presence" type="a{u(ua{sa{sv}})}"
+      <arg direction="out" name="Presence" type="a{u(ua{sa{sv}})}"
         tp:type="Contact_Presences">
         <tp:docstring>
           Presence information in the same format as for the PresenceUpdate
@@ -126,7 +126,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"/>
       </tp:possible-errors>
     </method>
-    <method name="GetStatuses">
+    <method name="GetStatuses" tp:name-for-bindings="Get_Statuses">
       <arg direction="out" type="a{s(ubba{ss})}" tp:type="Status_Spec_Map">
         <tp:docstring>
         A dictionary of string identifiers mapped to a struct for each status, containing:
@@ -148,8 +148,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/>
       </tp:possible-errors>
     </method>
-    <signal name="PresenceUpdate">
-      <arg name="presence" type="a{u(ua{sa{sv}})}" tp:type="Contact_Presences">
+    <signal name="PresenceUpdate" tp:name-for-bindings="Presence_Update">
+      <arg name="Presence" type="a{u(ua{sa{sv}})}" tp:type="Contact_Presences">
         <tp:docstring>
         A dictionary of contact handles mapped to a struct containing
         a UNIX timestamp of the last activity time (in UTC), and
@@ -165,8 +165,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
 
       </tp:docstring>
     </signal>
-    <method name="RemoveStatus">
-      <arg direction="in" name="status" type="s">
+    <method name="RemoveStatus" tp:name-for-bindings="Remove_Status">
+      <arg direction="in" name="Status" type="s">
         <tp:docstring>
           The string identifier of the status not to publish anymore for the user
         </tp:docstring>
@@ -186,8 +186,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         </tp:error>
       </tp:possible-errors>
     </method>
-    <method name="RequestPresence">
-      <arg direction="in" name="contacts" type="au" tp:type="Contact_Handle[]">
+    <method name="RequestPresence" tp:name-for-bindings="Request_Presence">
+      <arg direction="in" name="Contacts" type="au" tp:type="Contact_Handle[]">
         <tp:docstring>
           An array of the contacts whose presence should be obtained
         </tp:docstring>
@@ -211,8 +211,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         </tp:error>
       </tp:possible-errors>
     </method>
-    <method name="SetLastActivityTime">
-      <arg direction="in" name="time" type="u" tp:type="Unix_Timestamp">
+    <method name="SetLastActivityTime"
+      tp:name-for-bindings="Set_Last_Activity_Time">
+      <arg direction="in" name="Time" type="u" tp:type="Unix_Timestamp">
         <tp:docstring>
           A UNIX timestamp of the user's last activity time (in UTC)
         </tp:docstring>
@@ -231,8 +232,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         </tp:error>
       </tp:possible-errors>
     </method>
-    <method name="SetStatus">
-      <arg direction="in" name="statuses" type="a{sa{sv}}" tp:type="Multiple_Status_Map">
+    <method name="SetStatus" tp:name-for-bindings="Set_Status">
+      <arg direction="in" name="Statuses" type="a{sa{sv}}" tp:type="Multiple_Status_Map">
         <tp:docstring>
           A dictionary mapping status identifiers to dictionaries, which
           map optional parameter names to their variant-boxed values
@@ -258,10 +259,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:possible-errors>
     </method>
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-      <p>This interface is for services which have a concept of presence which can
-    be published for yourself and monitored on your contacts. Telepathy's
-    definition of presence is based on that used by the Galago project
-    (see http://www.galago-project.org/).</p>
+      <p>This interface will become deprecated in future versions. New
+        client implementations MAY use
+        org.freedesktop.Telepathy.Connection.Interface.SimplePresence
+        instead; new connection managers SHOULD implement both
+        Presence and SimplePresence.</p>
+
+      <p>This interface is for services which have a concept of presence which
+        can be published for yourself and monitored on your contacts.
+        Telepathy's definition of presence is based on that used by
+        <a href="http://www.galago-project.org/">the Galago
+          project</a>.</p>
 
     <p>Presence on an individual (yourself or one of your contacts) is modelled as
     a last activity time along with a set of zero or more statuses, each of
@@ -276,14 +284,20 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
     choices:</p>
 
     <ul>
-      <li>available</li>
-      <li>away</li>
-      <li>brb (Be Right Back)</li>
-      <li>busy</li>
-      <li>dnd (Do Not Disturb),</li>
-      <li>xa (Extended Away)</li>
-      <li>hidden (aka Invisible)</li>
-      <li>offline</li>
+      <li>available (corresponding to Connection_Presence_Type_Available)</li>
+      <li>away (corresponding to Connection_Presence_Type_Away)</li>
+      <li>brb (Be Right Back) (corresponding to
+        Connection_Presence_Type_Away, but more specific)</li>
+      <li>busy (corresponding to Connection_Presence_Type_Busy)</li>
+      <li>dnd (Do Not Disturb) (corresponding to
+        Connection_Presence_Type_Busy, but more specific)</li>
+      <li>xa (Extended Away) (corresponding to
+        Connection_Presence_Type_Extended_Away)</li>
+      <li>hidden (aka Invisible) (corresponding to
+        Connection_Presence_Type_Hidden)</li>
+      <li>offline (corresponding to Connection_Presence_Type_Offline)</li>
+      <li>unknown (corresponding to Connection_Presence_Type_Unknown)</li>
+      <li>error (corresponding to Connection_Presence_Type_Error)</li>
     </ul>
 
     <p>As well as these well-known status identifiers, every status also has a
@@ -317,7 +331,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
     <tp:enum name="Connection_Presence_Type" type="u">
       <tp:enumvalue suffix="Unset" value="0">
         <tp:docstring>
-          An invalid presence type used as a null value
+          An invalid presence type used as a null value. This value MUST NOT
+          appear in the result of GetStatuses, or in the Statuses property
+          of the SimplePresence interface.
         </tp:docstring>
       </tp:enumvalue>
       <tp:enumvalue suffix="Offline" value="1">
@@ -351,6 +367,20 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
           Busy, Do Not Disturb.
         </tp:docstring>
       </tp:enumvalue>
+      <tp:enumvalue suffix="Unknown" value="7">
+        <tp:added version="0.17.UNRELEASED"/>
+        <tp:docstring>
+          Unknown, unable to determine presence for this contact, for example
+          if the protocol only allows presence of subscribed contacts.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="Error" value="8">
+        <tp:added version="0.17.UNRELEASED"/>
+        <tp:docstring>
+          Error, an error occurred while trying to determine presence.  The
+          message, if set, is an error from the server.
+        </tp:docstring>
+      </tp:enumvalue>
     </tp:enum>
   </interface>
 </node>
diff --git a/spec/Connection_Interface_Privacy.xml b/spec/Connection_Interface_Privacy.xml
index 86547363..b89d968f 100644
--- a/spec/Connection_Interface_Privacy.xml
+++ b/spec/Connection_Interface_Privacy.xml
@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
   <interface name="org.freedesktop.Telepathy.Connection.Interface.Privacy"
     tp:causes-havoc='not well-tested'>
     <tp:requires interface="org.freedesktop.Telepathy.Connection"/>
-    <method name="GetPrivacyMode">
+    <method name="GetPrivacyMode" tp:name-for-bindings="Get_Privacy_Mode">
       <arg direction="out" type="s">
         <tp:docstring>
           A string representing the current privacy mode
@@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/>
       </tp:possible-errors>
     </method>
-    <method name="GetPrivacyModes">
+    <method name="GetPrivacyModes" tp:name-for-bindings="Get_Privacy_Modes">
       <arg direction="out" type="as">
         <tp:docstring>
           An array of valid privacy modes for this connection
@@ -52,8 +52,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
          </dl>
        </tp:docstring>
     </method>
-    <signal name="PrivacyModeChanged">
-      <arg name="mode" type="s">
+    <signal name="PrivacyModeChanged"
+      tp:name-for-bindings="Privacy_Mode_Changed">
+      <arg name="Mode" type="s">
         <tp:docstring>
           The current privacy mode
         </tp:docstring>
@@ -63,8 +64,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         initially received from the server.
       </tp:docstring>
     </signal>
-    <method name="SetPrivacyMode">
-      <arg direction="in" name="mode" type="s">
+    <method name="SetPrivacyMode" tp:name-for-bindings="Set_Privacy_Mode">
+      <arg direction="in" name="Mode" type="s">
         <tp:docstring>
           The desired privacy mode
         </tp:docstring>
diff --git a/spec/Connection_Interface_Renaming.xml b/spec/Connection_Interface_Renaming.xml
index 2c4e2725..84012884 100644
--- a/spec/Connection_Interface_Renaming.xml
+++ b/spec/Connection_Interface_Renaming.xml
@@ -22,12 +22,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
     tp:causes-havoc='not well-tested'>
     <tp:requires interface="org.freedesktop.Telepathy.Connection"/>
     <signal name="Renamed">
-      <arg name="original" type="u" tp:type="Contact_Handle">
+      <arg name="Original" type="u" tp:type="Contact_Handle">
         <tp:docstring>
           The handle of the original identifier
         </tp:docstring>
       </arg>
-      <arg name="new" type="u" tp:type="Contact_Handle">
+      <arg name="New" type="u" tp:type="Contact_Handle">
         <tp:docstring>
           The handle of the new identifier
         </tp:docstring>
@@ -61,8 +61,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         </p>
       </tp:docstring>
     </signal>
-    <method name="RequestRename">
-      <arg direction="in" name="name" type="s">
+    <method name="RequestRename" tp:name-for-bindings="Request_Rename">
+      <arg direction="in" name="Name" type="s">
         <tp:docstring>
           The desired identifier
         </tp:docstring>
diff --git a/spec/Connection_Interface_Simple_Presence.xml b/spec/Connection_Interface_Simple_Presence.xml
new file mode 100644
index 00000000..8e38f48e
--- /dev/null
+++ b/spec/Connection_Interface_Simple_Presence.xml
@@ -0,0 +1,382 @@
+<?xml version="1.0" ?>
+<node name="/Connection_Interface_Simple_Presence" 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>
+  <tp:license xmlns="http://www.w3.org/1999/xhtml">
+    <p>This library is free software; you can redistribute it and/or modify it
+      under the terms of the GNU Lesser General Public License as published by
+      the Free Software Foundation; either version 2.1 of the License, or (at
+      your option) any later version.</p>
+
+    <p>This library is distributed in the hope that it will be useful, but
+      WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser
+      General Public License for more details.</p>
+
+    <p>You should have received a copy of the GNU Lesser General Public License
+      along with this library; if not, write to the Free Software Foundation,
+      Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p>
+  </tp:license>
+
+  <interface name="org.freedesktop.Telepathy.Connection.Interface.SimplePresence">
+    <tp:requires interface="org.freedesktop.Telepathy.Connection"/>
+
+    <tp:struct name="Simple_Presence">
+      <tp:docstring>
+        A struct representing the presence of a contact.
+      </tp:docstring>
+      <tp:member type="u" tp:type="Connection_Presence_Type" name="Type">
+        <tp:docstring>
+          The presence type, e.g. Connection_Presence_Type_Away.
+        </tp:docstring>
+      </tp:member>
+      <tp:member type="s" name="Status">
+        <tp:docstring>
+          The string identifier of the status, e.g. "brb", as defined in the
+          <tp:member-ref>Statuses</tp:member-ref> property.
+        </tp:docstring>
+      </tp:member>
+      <tp:member type="s" name="Status_Message">
+        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+          <p>The user-defined status message, e.g. "Back soon!".</p>
+
+          <p>Clients SHOULD set the status message for the local
+            user to the empty string, unless the user has actually provided
+            a specific message (i.e. one that conveys more information than the
+            Status).</p>
+
+          <p>User interfaces SHOULD regard an empty status message as unset,
+            and MAY replace it with a localized string corresponding to the
+            Status or Type.</p>
+
+          <tp:rationale>
+            Use case: Daf sets his status in Empathy by choosing the Welsh
+            translation of "Available" from a menu.
+            It is more informative for his English-speaking colleagues
+            to see the English translation of "Available" (as localized
+            by their own clients) than to see the Welsh version (which they
+            don't understand anyway).
+          </tp:rationale>
+        </tp:docstring>
+      </tp:member>
+    </tp:struct>
+
+    <tp:mapping name="Simple_Contact_Presences">
+      <tp:docstring>
+        Mapping returned by <tp:member-ref>GetPresences</tp:member-ref>
+        and signalled by <tp:member-ref>PresencesChanged</tp:member-ref>,
+        indicating the presence of a number of contacts.
+      </tp:docstring>
+      <tp:member type="u" tp:type="Contact_Handle" name="Contact">
+        <tp:docstring>
+          A contact
+        </tp:docstring>
+      </tp:member>
+      <tp:member type="(uss)" tp:type="Simple_Presence" name="Presence">
+        <tp:docstring>
+          The contact's presence
+        </tp:docstring>
+      </tp:member>
+    </tp:mapping>
+
+    <tp:struct name="Simple_Status_Spec">
+      <tp:docstring>
+        A struct containing information about a status.
+      </tp:docstring>
+      <tp:member type="u" tp:type="Connection_Presence_Type" name="Type">
+        <tp:docstring>
+          The type of a presence. This SHOULD NOT be used as a way to set
+          statuses that the client does not recognise (as explained in
+          <tp:member-ref>SetPresence</tp:member-ref>), but MAY be used to check
+          that the client's assumptions about a particular status name
+          match the connection manager's.
+        </tp:docstring>
+      </tp:member>
+      <tp:member type="b" name="May_Set_On_Self">
+        <tp:docstring>
+          If true, the user can set this status on themselves using
+          <tp:member-ref>SetPresence</tp:member-ref>.
+        </tp:docstring>
+      </tp:member>
+      <tp:member type="b" name="Can_Have_Message">
+        <tp:docstring>
+          If true, a non-empty message can be set for this status. Otherwise,
+          the empty string is the only acceptable message.
+
+          <tp:rationale>
+            On IRC you can be Away with a status message, but if you are
+            available you cannot set a status message.
+          </tp:rationale>
+        </tp:docstring>
+      </tp:member>
+    </tp:struct>
+
+    <tp:mapping name="Simple_Status_Spec_Map">
+      <tp:docstring>
+        A mapping describing possible statuses.
+      </tp:docstring>
+
+      <tp:member type="s" name="Identifier">
+        <tp:docstring>
+          The string identifier of this status.
+        </tp:docstring>
+      </tp:member>
+      <tp:member type="(ubb)" tp:type="Simple_Status_Spec" name="Spec">
+        <tp:docstring>
+          Details of this status.
+        </tp:docstring>
+      </tp:member>
+    </tp:mapping>
+
+    <method name="SetPresence" tp:name-for-bindings="Set_Presence">
+      <arg direction="in" name="Status" type="s">
+        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+          <p>The string identifier of the desired status. Possible status
+            identifiers are defined in the
+            <tp:member-ref>Statuses</tp:member-ref> property.</p>
+
+          <p>Clients MUST NOT set a status whose string value they do not
+            recognise, even if its presence type in Statuses
+            matches what the user requested.</p>
+
+          <tp:rationale>
+            <p>Suppose a protocol has statuses that include 'phone' (of type
+              BUSY) and 'in-a-meeting' (of type BUSY), but there is no
+              generic 'busy' status.</p>
+
+            <p>If the user requests "Busy" status from a menu, a
+              client author might be tempted to pick an arbitrary status
+              that has type BUSY. However, on this protocol, neither of
+              the choices would be appropriate, and incorrect information
+              about the user would be conveyed.</p>
+          </tp:rationale>
+        </tp:docstring>
+      </arg>
+      <arg direction="in" name="Status_Message" type="s">
+        <tp:docstring>
+          The status message associated with the current status.
+        </tp:docstring>
+      </arg>
+      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+        <p>Request that the presence status and status message are published for
+          the connection.  Changes will be indicated by
+          <tp:member-ref>PresencesChanged</tp:member-ref>
+          signals being emitted.</p>
+
+        <p>This method may be called on a newly-created connection while it
+          is still in the DISCONNECTED state, to request that when the
+          connection connects, it will do so with the selected status.</p>
+
+        <p>In DISCONNECTED state the
+          <tp:member-ref>Statuses</tp:member-ref>
+          property will indicate which statuses are allowed to be set
+          while DISCONNECTED (none, if the Connection Manager doesn't allow
+          this). This value MUST NOT be cached, as the set of allowed
+          presences might change upon connecting.</p>
+      </tp:docstring>
+      <tp:possible-errors>
+        <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/>
+        <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument">
+          <tp:docstring>
+            Either the specified status is not supported, the specified
+            status cannot be set on the user themselves, or a non-empty
+            message was supplied for a status that does not
+            accept a message.
+          </tp:docstring>
+        </tp:error>
+        <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"/>
+      </tp:possible-errors>
+    </method>
+
+    <method name="GetPresences" tp:name-for-bindings="Get_Presences">
+      <arg direction="in" name="Contacts" type="au" tp:type="Contact_Handle[]">
+        <tp:docstring>
+          An array of the contacts whose presence should be obtained.
+        </tp:docstring>
+      </arg>
+      <arg direction="out" name="Presence" type="a{u(uss)}"
+        tp:type="Simple_Contact_Presences">
+        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+          <p>Presence information in the same format as for the
+            <tp:member-ref>PresencesChanged</tp:member-ref> signal.
+            The returned mapping MUST include an entry for each contact
+            in the method's argument.</p>
+
+          <p>The definition of the connection presence types Unknown
+            and Offline means that if a connection manager will return
+            Unknown for contacts not on the subscribe list, it MUST delay
+            the reply to this method call until it has found out which
+            contacts are, in fact, on the subscribe list.</p>
+        </tp:docstring>
+      </arg>
+      <tp:docstring>
+        Get presence previously emitted by PresencesChanged for the given
+        contacts. Data is returned in the same structure as the
+        PresencesChanged signal; no additional network requests are made.
+      </tp:docstring>
+      <tp:possible-errors>
+        <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/>
+        <tp:error name="org.freedesktop.Telepathy.Error.InvalidHandle"/>
+        <tp:error name="org.freedesktop.Telepathy.Error.NetworkError">
+          <tp:docstring>
+            While discovering the subscribe list in order to distinguish
+            between Unknown and Offline statuses, a network error occurred.
+          </tp:docstring>
+        </tp:error>
+        <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"/>
+      </tp:possible-errors>
+    </method>
+
+    <property name="Statuses" access="read"
+      type="a{s(ubb)}" tp:type="Simple_Status_Spec_Map">
+      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+        <p>A dictionary where the keys are the presence statuses that the user
+          can set on themselves for this connection, and the values are the
+          corresponding presence types.</p>
+
+        <p>While the connection is in the DISCONNECTED state, it contains
+          the set of presence statuses allowed to be set before connecting.
+          The connection manager will attempt to set the appropriate status
+          when the connection becomes connected, but cannot necessarily
+          guarantee it. The available statuses cannot change until the
+          connection status changes, so there is no change notification.</p>
+
+        <p>While the connection is in the CONNECTED state, this property
+          contains the set of presence statuses which are actually available
+          on this protocol. This set is constant for the remaining lifetime
+          of the connection, so again, there is no change notification.</p>
+
+        <p>While the connection is in the CONNECTING state, the value of
+          this property is undefined and SHOULD NOT be used. It can change
+          at any time without notification (in particular, any cached values
+          from when the connection was in the DISCONNECTED or CONNECTING
+          state MUST NOT be assumed to still be correct when the state has
+          become CONNECTED).</p>
+
+        <p>This property MUST include the special statuses "unknown" and
+          "error" if and only if the connection manager can emit them
+          as a contact's status.</p>
+
+        <tp:rationale>
+          For instance, connection managers for local-xmpp (XEP-0174) would
+          omit "unknown" since there is no such concept.
+        </tp:rationale>
+      </tp:docstring>
+    </property>
+
+    <signal name="PresencesChanged" tp:name-for-bindings="Presences_Changed">
+      <arg name="Presence" type="a{u(uss)}" tp:type="Simple_Contact_Presences">
+        <tp:docstring>
+          A dictionary of contact handles mapped to the status,
+          presence type and status message.
+        </tp:docstring>
+      </arg>
+      <tp:docstring>
+        This signal should be emitted when your own presence has been changed,
+        or the presence of the member of any of the connection's channels has
+        been changed.
+      </tp:docstring>
+    </signal>
+
+    <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+      <p>This interface is for services which have a concept of presence which
+        can be published for yourself and monitored on your contacts.</p>
+
+      <p>Presence on an individual (yourself or one of your contacts) is
+        modelled as a status and a status message. Valid statuses are defined
+        per connection, and a list of those that can be set on youself
+        can be obtained from the
+        <tp:member-ref>Statuses</tp:member-ref>
+        property.</p>
+
+      <p>Each status has an arbitrary string identifier which should have an
+        agreed meaning between the connection manager and any client which is
+        expected to make use of it. The following well-known values should be
+        used where possible to allow clients to identify common choices:</p>
+
+      <table>
+        <tr>
+          <th>status identifier</th>
+          <th>Connection_Presence_Type</th>
+          <th>comments</th>
+        </tr>
+        <tr>
+          <td>available</td>
+          <td>Connection_Presence_Type_Available</td>
+          <td></td>
+        </tr>
+        <tr>
+          <td>away</td>
+          <td>Connection_Presence_Type_Away</td>
+          <td></td>
+        </tr>
+        <tr>
+          <td>brb</td>
+          <td>Connection_Presence_Type_Away</td>
+          <td>Be Right Back (a more specific form of Away)</td>
+        </tr>
+        <tr>
+          <td>busy</td>
+          <td>Connection_Presence_Type_Busy</td>
+          <td></td>
+        </tr>
+        <tr><td>dnd</td>
+          <td>Connection_Presence_Type_Busy</td>
+          <td>Do Not Disturb (a more specific form of Busy)</td>
+        </tr>
+        <tr>
+          <td>xa</td>
+          <td>Connection_Presence_Type_Extended_Away</td>
+          <td>Extended Away</td>
+        </tr>
+        <tr>
+          <td>hidden</td>
+          <td>Connection_Presence_Type_Hidden</td>
+          <td>Also known as "Invisible" or "Appear Offline"</td>
+        </tr>
+        <tr>
+          <td>offline</td>
+          <td>Connection_Presence_Type_Offline</td>
+          <td></td>
+        </tr>
+        <tr>
+          <td>unknown</td>
+          <td>Connection_Presence_Type_Unknown</td>
+          <td>special, see below</td>
+        </tr>
+        <tr>
+          <td>error</td>
+          <td>Connection_Presence_Type_Error</td>
+          <td>special, see below</td>
+        </tr>
+      </table>
+
+      <p>As well as these well-known status identifiers, every status also has
+        a numerical type value chosen from ConnectionPresenceType which can be
+        used by the client to classify even unknown statuses into different
+        fundamental types.</p>
+
+      <p>These numerical types exist so that even if a client does not
+        understand the string identifier being used, and hence cannot present
+        the presence to the user to set on themselves, it may display an
+        approximation of the presence if it is set on a contact.</p>
+
+      <p>As well as the normal status identifiers, there are two special ones
+        that may be present: 'unknown' with type Unknown and 'error' with type
+        Error. 'unknown' indicates that it is impossible to determine the
+        presence of a contact at this time, for example because it's not on the
+        'subscribe' list and the protocol only allows one to determine the
+        presence of contacts you're subscribed to. 'error' indicates that there
+        was a failure in determining the status of a contact.</p>
+
+      <p>If the connection has a 'subscribe' contact list, PresencesChanged
+        signals should be emitted to indicate changes of contacts on this list,
+        and should also be emitted for changes in your own presence. Depending
+        on the protocol, the signal may also be emitted for others such as
+        people with whom you are communicating, and any user interface should
+        be updated accordingly.</p>
+    </tp:docstring>
+  </interface>
+</node>
+<!-- vim:set sw=2 sts=2 et ft=xml: -->
diff --git a/spec/Connection_Manager.xml b/spec/Connection_Manager.xml
index d1696072..7370d381 100644
--- a/spec/Connection_Manager.xml
+++ b/spec/Connection_Manager.xml
@@ -21,13 +21,35 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
   <interface name="org.freedesktop.Telepathy.ConnectionManager">
 
     <tp:simple-type name="Connection_Manager_Name" type="s">
-      <tp:docstring>
-        The name of a connection manager, found in its well-known
-        bus name and object path. This must be a non-empty string of
-        ASCII letters, digits and underscores, starting with a letter.
-        This is typically the name of the executable with any "telepathy-"
-        prefix removed, and any hyphen/minus signs replaced by
-        underscores.
+      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+        <p>The name of a connection manager, found in its well-known
+          bus name and object path. This must be a non-empty string of
+          ASCII letters, digits and underscores, starting with a letter.
+          This is typically the name of the executable with any "telepathy-"
+          prefix removed, and any hyphen/minus signs replaced by
+          underscores.</p>
+
+        <p>Connection manager names SHOULD NOT be the same as the name of
+          the protocol they implement.</p>
+
+        <tp:rationale>
+          <p>This is likely to lead to conflicts between different
+            implementations of the same protocol (or indeed inability
+            to distinguish between the different implementations!). The
+            Telepathy project traditionally uses some sort of pun (Haze is
+            based on libpurple, Salut implements a protocol often called
+            Bonjour, and Wilde implements the OSCAR protocol).</p>
+        </tp:rationale>
+
+        <p>Connection manager names SHOULD NOT be the same as the name of
+          a library on which they are based.</p>
+
+        <tp:rationale>
+          <p>We often abbreviate, for instance, telepathy-haze as "Haze",
+            but abbreviating telepathy-sofiasip to "Sofia-SIP" would cause
+            confusion between the connection manager and the library it
+            uses. Please don't repeat that mistake.</p>
+        </tp:rationale>
       </tp:docstring>
       <tp:changed version="0.17.1">Prior to version 0.17.1, the allowed
         characters were not specified</tp:changed>
@@ -118,8 +140,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:flag>
     </tp:flags>
 
-    <method name="GetParameters">
-      <arg direction="in" name="proto" type="s" tp:type="Protocol">
+    <method name="GetParameters" tp:name-for-bindings="Get_Parameters">
+      <arg direction="in" name="Proto" type="s" tp:type="Protocol">
         <tp:docstring>
           The required protocol name
         </tp:docstring>
@@ -142,7 +164,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:possible-errors>
     </method>
 
-    <method name="ListProtocols">
+    <method name="ListProtocols" tp:name-for-bindings="List_Protocols">
       <arg direction="out" type="as" tp:type="Protocol[]">
         <tp:docstring>
           A array of string protocol identifiers supported by this manager
@@ -154,18 +176,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:docstring>
     </method>
 
-    <signal name="NewConnection">
-      <arg name="bus_name" type="s" tp:type="DBus_Bus_Name">
+    <signal name="NewConnection" tp:name-for-bindings="New_Connection">
+      <arg name="Bus_Name" type="s" tp:type="DBus_Bus_Name">
         <tp:docstring>
           The D-Bus service where the connection object can be found
         </tp:docstring>
       </arg>
-      <arg name="object_path" type="o">
+      <arg name="Object_Path" type="o">
         <tp:docstring>
           The object path of the Connection object on this service
         </tp:docstring>
       </arg>
-      <arg name="proto" type="s" tp:type="Protocol">
+      <arg name="Proto" type="s" tp:type="Protocol">
         <tp:docstring>
           The identifier for the protocol this connection uses
         </tp:docstring>
@@ -175,13 +197,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:docstring>
     </signal>
 
-    <method name="RequestConnection">
-      <arg direction="in" name="proto" type="s" tp:type="Protocol">
+    <method name="RequestConnection" tp:name-for-bindings="Request_Connection">
+      <arg direction="in" name="Proto" type="s" tp:type="Protocol">
         <tp:docstring>
           The protocol identifier
         </tp:docstring>
       </arg>
-      <arg direction="in" name="parameters" type="a{sv}"
+      <arg direction="in" name="Parameters" type="a{sv}"
         tp:type="String_Variant_Map">
         <tp:docstring>
           A dictionary mapping parameter name to the variant boxed value
@@ -298,6 +320,30 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:possible-errors>
     </method>
 
+    <property name="Interfaces" type="as" access="read">
+      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+        <p>A list of the extra interfaces provided by this connection manager
+          (i.e. extra functionality that can be provided even before a
+          connection has been created).</p>
+
+        <p>No interfaces suitable for listing in this property are currently
+          defined; it's provided as a hook for possible future
+          functionality.</p>
+
+        <p>To be compatible with older connection managers, if retrieving
+          this property fails, clients SHOULD assume that its value is
+          an empty list.</p>
+      </tp:docstring>
+      <tp:added version="0.17.UNRELEASED"/>
+    </property>
+
+    <!-- FIXME: One thing we could perhaps use Interfaces for would be a
+    ConnectionManager.Interface.Capabilities that can give hints regarding
+    the capabilities (in the sense of
+    Connection.Interface.Requests.AvailableChannelClasses and/or
+    Connection.GetInterfaces()) that a Connection from this CM is likely
+    to have -->
+
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
     <p>A D-Bus service which allows connections to be created. The manager
       processes are intended to be started by D-Bus service activation.</p>
diff --git a/spec/Media_Session_Handler.xml b/spec/Media_Session_Handler.xml
index b4e9ffbe..8719f00c 100644
--- a/spec/Media_Session_Handler.xml
+++ b/spec/Media_Session_Handler.xml
@@ -20,8 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
   </tp:license>
   <interface name="org.freedesktop.Telepathy.Media.SessionHandler">
     <method name="Error">
-      <arg direction="in" name="errno" type="u"/>
-      <arg direction="in" name="message" type="s"/>
+      <arg direction="in" name="Errno" type="u"/>
+      <arg direction="in" name="Message" type="s"/>
       <tp:docstring>
         THIS METHOD IS DEPRECATED AND SHOULD NOT BE USED. Instead the Error
         function should be used on the relevant MediaStreamHandler objects.
@@ -31,24 +31,24 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         channel for each stream within the session.
       </tp:docstring>
     </method>
-    <signal name="NewStreamHandler">
-      <arg name="stream_handler" type="o">
+    <signal name="NewStreamHandler" tp:name-for-bindings="New_Stream_Handler">
+      <arg name="Stream_Handler" type="o">
         <tp:docstring>
           An object path to a new MediaStreamHandler
         </tp:docstring>
       </arg>
-      <arg name="id" type="u">
+      <arg name="ID" type="u">
         <tp:docstring>
           The unique ID of the new stream
         </tp:docstring>
       </arg>
-      <arg name="media_type" type="u" tp:type="Media_Stream_Type">
+      <arg name="Media_Type" type="u" tp:type="Media_Stream_Type">
         <tp:docstring>
           Enum for type of media that this stream should handle
           (a value from MediaStreamType)
         </tp:docstring>
       </arg>
-      <arg name="direction" type="u" tp:type="Media_Stream_Direction">
+      <arg name="Direction" type="u" tp:type="Media_Stream_Direction">
         <tp:docstring>
           Enum for direction of this stream (a value from
           MediaStreamDirection)
diff --git a/spec/Media_Stream_Handler.xml b/spec/Media_Stream_Handler.xml
index 7d694632..02ce82c6 100644
--- a/spec/Media_Stream_Handler.xml
+++ b/spec/Media_Stream_Handler.xml
@@ -52,13 +52,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       <tp:member type="a{ss}" name="Parameters" tp:type="String_String_Map"/>
     </tp:struct>
 
-    <signal name="AddRemoteCandidate">
-      <arg name="candidate_id" type="s">
+    <signal name="AddRemoteCandidate"
+      tp:name-for-bindings="Add_Remote_Candidate">
+      <arg name="Candidate_ID" type="s">
         <tp:docstring>
           String identifier for this candidate
         </tp:docstring>
       </arg>
-      <arg name="transports" type="a(usuussduss)"
+      <arg name="Transports" type="a(usuussduss)"
         tp:type="Media_Stream_Handler_Transport[]">
         <tp:docstring>
           Array of transports for this candidate with fields,
@@ -76,19 +77,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         closed.
       </tp:docstring>
     </signal>
-    <method name="CodecChoice">
-      <arg direction="in" name="codec_id" type="u"/>
+    <method name="CodecChoice" tp:name-for-bindings="Codec_Choice">
+      <arg direction="in" name="Codec_ID" type="u"/>
       <tp:docstring>
         Inform the connection manager of the current codec choice.
       </tp:docstring>
     </method>
     <method name="Error">
-      <arg direction="in" name="errno" type="u" tp:type="Media_Stream_Error">
+      <arg direction="in" name="Errno" type="u" tp:type="Media_Stream_Error">
         <tp:docstring>
           ID of error, from the MediaStreamError enumeration
         </tp:docstring>
       </arg>
-      <arg direction="in" name="message" type="s">
+      <arg direction="in" name="Message" type="s">
         <tp:docstring>
           String describing the error
         </tp:docstring>
@@ -111,15 +112,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         </tp:docstring>
       </tp:enumvalue>
     </tp:enum>
-    <method name="NativeCandidatesPrepared">
+    <method name="NativeCandidatesPrepared"
+      tp:name-for-bindings="Native_Candidates_Prepared">
       <tp:docstring>
         Informs the connection manager that all possible native candisates
         have been discovered for the moment.
       </tp:docstring>
     </method>
-    <method name="NewActiveCandidatePair">
-      <arg direction="in" name="native_candidate_id" type="s"/>
-      <arg direction="in" name="remote_candidate_id" type="s"/>
+    <method name="NewActiveCandidatePair"
+      tp:name-for-bindings="New_Active_Candidate_Pair">
+      <arg direction="in" name="Native_Candidate_ID" type="s"/>
+      <arg direction="in" name="Remote_Candidate_ID" type="s"/>
       <tp:docstring>
         Informs the connection manager that a valid candidate pair
         has been discovered and streaming is in progress.
@@ -133,13 +136,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         <tp:docstring>TCP (Transmission Control Protocol)</tp:docstring>
       </tp:enumvalue>
     </tp:enum>
-    <method name="NewNativeCandidate">
-      <arg direction="in" name="candidate_id" type="s">
+    <method name="NewNativeCandidate"
+      tp:name-for-bindings="New_Native_Candidate">
+      <arg direction="in" name="Candidate_ID" type="s">
         <tp:docstring>
           String identifier for this candidate
         </tp:docstring>
       </arg>
-      <arg direction="in" name="transports" type="a(usuussduss)"
+      <arg direction="in" name="Transports" type="a(usuussduss)"
         tp:type="Media_Stream_Handler_Transport[]">
         <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
           Array of transports for this candidate, with fields:
@@ -181,7 +185,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:enumvalue>
     </tp:enum>
     <method name="Ready">
-      <arg direction="in" name="codecs" type="a(usuuua{ss})"
+      <arg direction="in" name="Codecs" type="a(usuuua{ss})"
         tp:type="Media_Stream_Handler_Codec[]">
         <tp:docstring>
           As for SupportedCodecs.
@@ -193,8 +197,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         codecs.
       </tp:docstring>
     </method>
-    <method name="SetLocalCodecs">
-      <arg name="codecs" type="a(usuuua{ss})" direction="in"
+    <method name="SetLocalCodecs" tp:name-for-bindings="Set_Local_Codecs">
+      <arg name="Codecs" type="a(usuuua{ss})" direction="in"
         tp:type="Media_Stream_Handler_Codec[]">
         <tp:docstring>Codecs in the same format as for
           SupportedCodecs, which have the same semantics as the
@@ -206,8 +210,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         knowing what local codecs are available.
       </tp:docstring>
     </method>
-    <signal name="RemoveRemoteCandidate">
-      <arg name="candidate_id" type="s">
+    <signal name="RemoveRemoteCandidate"
+      tp:name-for-bindings="Remove_Remote_Candidate">
+      <arg name="Candidate_ID" type="s">
         <tp:docstring>
           String identifier for remote candidate to drop
         </tp:docstring>
@@ -218,17 +223,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         candidate.
       </tp:docstring>
     </signal>
-    <signal name="SetActiveCandidatePair">
-      <arg name="native_candidate_id" type="s"/>
-      <arg name="remote_candidate_id" type="s"/>
+    <signal name="SetActiveCandidatePair"
+      tp:name-for-bindings="Set_Active_Candidate_Pair">
+      <arg name="Native_Candidate_ID" type="s"/>
+      <arg name="Remote_Candidate_ID" type="s"/>
       <tp:docstring>
         Emitted by the connection manager to inform the client that a
         valid candidate pair has been discovered by the remote end
         and streaming is in progress.
       </tp:docstring>
     </signal>
-    <signal name="SetRemoteCandidateList">
-      <arg name="remote_candidates" type="a(sa(usuussduss))"
+    <signal name="SetRemoteCandidateList"
+      tp:name-for-bindings="Set_Remote_Candidate_List">
+      <arg name="Remote_Candidates" type="a(sa(usuussduss))"
         tp:type="Media_Stream_Handler_Candidate[]">
         <tp:docstring>
         A list of candidate id and a list of transports
@@ -240,8 +247,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         client of all the available remote candidates at once.
       </tp:docstring>
     </signal>
-    <signal name="SetRemoteCodecs">
-      <arg name="codecs" type="a(usuuua{ss})"
+    <signal name="SetRemoteCodecs" tp:name-for-bindings="Set_Remote_Codecs">
+      <arg name="Codecs" type="a(usuuua{ss})"
         tp:type="Media_Stream_Handler_Codec[]">
         <tp:docstring>As for SupportedCodecs</tp:docstring>
       </arg>
@@ -250,22 +257,23 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         client of the codecs supported by the remote end.
       </tp:docstring>
     </signal>
-    <signal name="SetStreamPlaying">
-      <arg name="playing" type="b"/>
+    <signal name="SetStreamPlaying" tp:name-for-bindings="Set_Stream_Playing">
+      <arg name="Playing" type="b"/>
       <tp:docstring>
         Signal emitted when the connection manager wishes to set the
         stream playing or stopped.
       </tp:docstring>
     </signal>
-    <signal name="SetStreamSending">
-      <arg name="sending" type="b"/>
+    <signal name="SetStreamSending" tp:name-for-bindings="Set_Stream_Sending">
+      <arg name="Sending" type="b"/>
       <tp:docstring>
         Signal emitted when the connection manager wishes to set whether or not
         the stream sends to the remote end.
       </tp:docstring>
     </signal>
-    <signal name="StartTelephonyEvent">
-      <arg name="event" type="y">
+    <signal name="StartTelephonyEvent"
+      tp:name-for-bindings="Start_Telephony_Event">
+      <arg name="Event" type="y">
         <tp:docstring>
           A telephony event code as defined by RFC 4733.
         </tp:docstring>
@@ -275,21 +283,22 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         over this stream until StopTelephonyEvent is called.
       </tp:docstring>
     </signal>
-    <signal name="StopTelephonyEvent">
+    <signal name="StopTelephonyEvent"
+      tp:name-for-bindings="Stop_Telepathy_Event">
       <tp:docstring>
         Request that any ongoing telephony events (as defined by RFC 4733)
         being transmitted over this stream are stopped.
       </tp:docstring>
     </signal>
-    <method name="StreamState">
-      <arg direction="in" name="state" type="u" tp:type="Media_Stream_State"/>
+    <method name="StreamState" tp:name-for-bindings="Stream_State">
+      <arg direction="in" name="State" type="u" tp:type="Media_Stream_State"/>
       <tp:docstring>
         Informs the connection manager of the stream's current state, as
         as specified in Channel.Type.StreamedMedia::ListStreams.
       </tp:docstring>
     </method>
-    <method name="SupportedCodecs">
-      <arg direction="in" name="codecs" type="a(usuuua{ss})"
+    <method name="SupportedCodecs" tp:name-for-bindings="Supported_Codecs">
+      <arg direction="in" name="Codecs" type="a(usuuua{ss})"
         tp:type="Media_Stream_Handler_Codec[]">
         <tp:docstring>
           List of codec info structures, each containing:
@@ -312,7 +321,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:docstring>
     </method>
 
-    <signal name="SetStreamHeld">
+    <signal name="SetStreamHeld" tp:name-for-bindings="Set_Stream_Held">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>Emitted when the connection manager wishes to place the stream on
           hold (so the streaming client should free hardware or software
@@ -347,7 +356,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </arg>
     </signal>
 
-    <method name="HoldState">
+    <method name="HoldState" tp:name-for-bindings="Hold_State">
       <tp:docstring>
         Notify the connection manager that the stream's hold state has
         been changed successfully in response to SetStreamHeld.
@@ -360,7 +369,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </arg>
     </method>
 
-    <method name="UnholdFailure">
+    <method name="UnholdFailure" tp:name-for-bindings="Unhold_Failure">
       <tp:docstring>
         Notify the connection manager that an attempt to reacquire the
         necessary hardware or software resources to unhold the stream,
diff --git a/spec/Properties_Interface.xml b/spec/Properties_Interface.xml
index fa78f20a..fd52296f 100644
--- a/spec/Properties_Interface.xml
+++ b/spec/Properties_Interface.xml
@@ -54,12 +54,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       <tp:member type="v" name="Value"/>
     </tp:struct>
 
-    <method name="GetProperties">
+    <method name="GetProperties" tp:name-for-bindings="Get_Properties">
       <tp:docstring>
         Returns an array of (identifier, value) pairs containing the current
         values of the given properties.
       </tp:docstring>
-      <arg direction="in" name="properties" type="au" tp:type="Property_ID[]">
+      <arg direction="in" name="Properties" type="au" tp:type="Property_ID[]">
         <tp:docstring>An array of property identifiers</tp:docstring>
       </arg>
       <arg direction="out" type="a(uv)" tp:type="Property_Value[]">
@@ -86,7 +86,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         </tp:error>
       </tp:possible-errors>
     </method>
-    <method name="ListProperties">
+    <method name="ListProperties" tp:name-for-bindings="List_Properties">
       <tp:docstring>
         Returns a dictionary of the properties available on this channel.
       </tp:docstring>
@@ -104,11 +104,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         </tp:docstring>
       </arg>
     </method>
-    <signal name="PropertiesChanged">
+    <signal name="PropertiesChanged" tp:name-for-bindings="Properties_Changed">
       <tp:docstring>
         Emitted when the value of readable properties has changed.
       </tp:docstring>
-      <arg name="properties" type="a(uv)" tp:type="Property_Value[]">
+      <arg name="Properties" type="a(uv)" tp:type="Property_Value[]">
         <!-- XXX: if we're ever breaking API compatibility, make this a{uv} -->
         <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
           <p>An array of structs containing:</p>
@@ -121,11 +121,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         </tp:docstring>
       </arg>
     </signal>
-    <signal name="PropertyFlagsChanged">
+    <signal name="PropertyFlagsChanged"
+      tp:name-for-bindings="Property_Flags_Changed">
       <tp:docstring>
         Emitted when the flags of some room properties have changed.
       </tp:docstring>
-      <arg name="properties" type="a(uu)" tp:type="Property_Flags_Change[]">
+      <arg name="Properties" type="a(uu)" tp:type="Property_Flags_Change[]">
         <!-- XXX: if we're ever breaking API compatibility, make this a{uu} -->
         <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
           <p>An array of structs containing:</p>
@@ -138,7 +139,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         </tp:docstring>
       </arg>
     </signal>
-    <method name="SetProperties">
+    <method name="SetProperties" tp:name-for-bindings="Set_Properties">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>Takes an array of (identifier, value) pairs containing desired
           values to set the given properties. In the case of any errors, no
@@ -151,7 +152,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         are invalid, InvalidArgument will be returned.</p>
       </tp:docstring>
 
-      <arg direction="in" name="properties" type="a(uv)"
+      <arg direction="in" name="Properties" type="a(uv)"
         tp:type="Property_Value[]">
         <!-- XXX: if we're ever breaking API compatibility, make this a{uv} -->
       <tp:docstring>
diff --git a/spec/all.xml b/spec/all.xml
index b5a1b60c..586beb33 100644
--- a/spec/all.xml
+++ b/spec/all.xml
@@ -3,7 +3,7 @@
   xmlns:xi="http://www.w3.org/2001/XInclude">
 
 <tp:title>Telepathy D-Bus Interface Specification</tp:title>
-<tp:version>0.17.7</tp:version>
+<tp:version>0.17.8.1</tp:version>
 
 <tp:copyright>Copyright (C) 2005-2008 Collabora Limited</tp:copyright>
 <tp:copyright>Copyright (C) 2005-2008 Nokia Corporation</tp:copyright>
@@ -30,10 +30,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
 <xi:include href="Connection_Interface_Aliasing.xml"/>
 <xi:include href="Connection_Interface_Avatars.xml"/>
 <xi:include href="Connection_Interface_Capabilities.xml"/>
+<xi:include href="Connection_Interface_Contacts.xml"/>
 <!-- Never implemented, is a terrible API
 <xi:include href="Connection_Interface_Contact_Info.xml"/> -->
 <!-- Never implemented, insufficient (needs conditions)
 <xi:include href="Connection_Interface_Forwarding.xml"/> -->
+<xi:include href="Connection_Interface_Simple_Presence.xml"/>
 <xi:include href="Connection_Interface_Presence.xml"/>
 <!-- Never implemented, vague
 <xi:include href="Connection_Interface_Privacy.xml"/> -->
diff --git a/spec/generic-types.xml b/spec/generic-types.xml
index a96237df..c0a000d0 100644
--- a/spec/generic-types.xml
+++ b/spec/generic-types.xml
@@ -17,7 +17,11 @@
   </tp:simple-type>
 
   <tp:simple-type name="DBus_Interface" type="s">
-    <tp:docstring>A string representing a D-Bus interface</tp:docstring>
+    <tp:docstring>An ASCII string representing a D-Bus interface - two or more
+      elements separated by dots, where each element is a non-empty
+      string of ASCII letters, digits and underscores, not starting with
+      a digit. The maximum total length is 255 characters. For example,
+      "org.freedesktop.DBus.Peer".</tp:docstring>
   </tp:simple-type>
 
   <tp:simple-type name="DBus_Signature" type="s">
@@ -26,6 +30,35 @@
       with dbus-glib)</tp:docstring>
   </tp:simple-type>
 
+  <tp:simple-type name="DBus_Member" type="s">
+    <tp:docstring>An ASCII string representing a D-Bus method, signal
+      or property name - a non-empty string of ASCII letters, digits and
+      underscores, not starting with a digit, with a maximum length of 255
+      characters. For example, "Ping".</tp:docstring>
+  </tp:simple-type>
+
+  <tp:simple-type name="DBus_Qualified_Member" type="s">
+    <tp:docstring>A string representing the full name of a D-Bus method,
+      signal or property, consisting of a DBus_Interface, followed by
+      a dot, followed by a DBus_Member. For example,
+      "org.freedesktop.DBus.Peer.Ping".</tp:docstring>
+  </tp:simple-type>
+
+  <tp:mapping name="Qualified_Property_Value_Map">
+    <tp:docstring>A mapping from strings representing D-Bus
+      properties (by their namespaced names) to their values.</tp:docstring>
+    <tp:member type="s" name="Key" tp:type="DBus_Qualified_Member">
+      <tp:docstring>
+        A D-Bus interface name, followed by a dot and a D-Bus property name.
+      </tp:docstring>
+    </tp:member>
+    <tp:member type="v" name="Value">
+      <tp:docstring>
+        The value of the property.
+      </tp:docstring>
+    </tp:member>
+  </tp:mapping>
+
   <tp:mapping name="String_Variant_Map">
     <tp:docstring>A mapping from strings to variants representing extra
       key-value pairs.</tp:docstring>