Bump all call interfaces to DRAFT2

Note that some interfaces never had a DRAFT version merged into master,
but I think that having everything as DRAFT2 makes everyone's lives easier.

18 files changed, 127 insertions, 127 deletions

diff --git a/spec/Call_Content.xml b/spec/Call_Content.xml
index e470ca12..43db9c79 100644
--- a/spec/Call_Content.xml
+++ b/spec/Call_Content.xml
@@ -20,18 +20,18 @@
       02110-1301, USA.</p>
   </tp:license>
 
-  <interface name="org.freedesktop.Telepathy.Call.Content.DRAFT"
+  <interface name="org.freedesktop.Telepathy.Call.Content.DRAFT2"
       tp:causes-havoc="experimental">
     <tp:added version="0.19.0">(draft 1)</tp:added>
     <tp:requires
-      interface="org.freedesktop.Telepathy.Call.Interface.Mute.DRAFT"/>
+      interface="org.freedesktop.Telepathy.Call.Interface.Mute.DRAFT2"/>
 
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
       This object represents one Content inside a <tp:dbus-ref
-      namespace="ofdT.Channel.Type">Call.DRAFT</tp:dbus-ref>. For
+      namespace="ofdT.Channel.Type">Call.DRAFT2</tp:dbus-ref>. For
       example, in an audio/video call there would be one audio content
       and one video content. Each content has one or more <tp:dbus-ref
-      namespace="ofdT.Call">Stream.DRAFT</tp:dbus-ref> objects which
+      namespace="ofdT.Call">Stream.DRAFT2</tp:dbus-ref> objects which
       represent the actual transport to one or more remote contacts.
     </tp:docstring>
 
@@ -60,7 +60,7 @@
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>Emitted when the content is removed from the call. This
           is the same as the <tp:dbus-ref
-          namespace="ofdT.Channel.Type">Call.DRAFT.ContentRemoved</tp:dbus-ref>
+          namespace="ofdT.Channel.Type">Call.DRAFT2.ContentRemoved</tp:dbus-ref>
           signal.</p>
       </tp:docstring>
     </signal>
@@ -72,7 +72,7 @@
         <p>Extra interfaces provided by this content, such as <tp:dbus-ref
           namespace="ofdT.Call">Content.Interface.Media.DRAFT2</tp:dbus-ref>,
           <tp:dbus-ref namespace="ofdT.Channel">Interface.Hold</tp:dbus-ref> or
-          <tp:dbus-ref namespace="ofdT.Call">Interface.Mute.DRAFT</tp:dbus-ref>.
+          <tp:dbus-ref namespace="ofdT.Call">Interface.Mute.DRAFT2</tp:dbus-ref>.
           This SHOULD NOT include the Content interface itself, and cannot
           change once the content has been created.</p>
       </tp:docstring>
@@ -105,7 +105,7 @@
         The disposition of this content, which defines whether to
         automatically start sending data on the streams when
         <tp:dbus-ref
-        namespace="ofdT.Channel.Type">Call.DRAFT</tp:dbus-ref> is
+        namespace="ofdT.Channel.Type">Call.DRAFT2</tp:dbus-ref> is
         called on the channel.
       </tp:docstring>
 
@@ -119,14 +119,14 @@
         <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
           <p>The content was initially part of the call. When
           <tp:dbus-ref
-          namespace="ofdT.Channel.Type.Call.DRAFT">Accept</tp:dbus-ref>
+          namespace="ofdT.Channel.Type.Call.DRAFT2">Accept</tp:dbus-ref>
           is called on the channel, all streams of this content with
           <tp:dbus-ref
-          namespace="ofdT.Call.Stream.DRAFT">LocalSendingState</tp:dbus-ref>
+          namespace="ofdT.Call.Stream.DRAFT2">LocalSendingState</tp:dbus-ref>
           set to <tp:type>Sending_State</tp:type>_Pending_Send will be
           moved to <tp:type>Sending_State</tp:type>_Sending as if
           <tp:dbus-ref
-          namespace="ofdT.Call.Stream.DRAFT">SetSending</tp:dbus-ref>
+          namespace="ofdT.Call.Stream.DRAFT2">SetSending</tp:dbus-ref>
           (True) had been called.</p>
         </tp:docstring>
       </tp:enumvalue>
@@ -149,7 +149,7 @@
       <arg name="Streams" type="ao">
          <tp:docstring>
            The <tp:dbus-ref
-           namespace="ofdT.Call">Stream.DRAFT</tp:dbus-ref>s which were
+           namespace="ofdT.Call">Stream.DRAFT2</tp:dbus-ref>s which were
            added.
          </tp:docstring>
        </arg>
@@ -164,7 +164,7 @@
       <arg name="Streams" type="ao">
         <tp:docstring>
           The <tp:dbus-ref
-          namespace="ofdT.Call">Stream.DRAFT</tp:dbus-ref>s which were
+          namespace="ofdT.Call">Stream.DRAFT2</tp:dbus-ref>s which were
           removed.
         </tp:docstring>
       </arg>
@@ -179,7 +179,7 @@
       type="ao" access="read">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>The list of <tp:dbus-ref namespace="ofdT.Call"
-          >Stream.DRAFT</tp:dbus-ref> objects that exist in this
+          >Stream.DRAFT2</tp:dbus-ref> objects that exist in this
           content.</p>
 
         <tp:rationale>
diff --git a/spec/Call_Content_Interface_Media.xml b/spec/Call_Content_Interface_Media.xml
index 95710c83..c3c85c0d 100644
--- a/spec/Call_Content_Interface_Media.xml
+++ b/spec/Call_Content_Interface_Media.xml
@@ -24,13 +24,13 @@
       name="org.freedesktop.Telepathy.Call.Content.Interface.Media.DRAFT2"
       tp:causes-havoc="experimental">
     <tp:added version="UNRELEASED">(draft 2)</tp:added>
-    <tp:requires interface="org.freedesktop.Telepathy.Call.Content.DRAFT"/>
+    <tp:requires interface="org.freedesktop.Telepathy.Call.Content.DRAFT2"/>
 
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
       <p>Interface to use by a software implementation of media
         streaming. The reason behind splitting the members of this
         interface out from the main <tp:dbus-ref
-        namespace="ofdT.Call">Content.DRAFT</tp:dbus-ref> interface is
+        namespace="ofdT.Call">Content.DRAFT2</tp:dbus-ref> interface is
         that the software is not necessarily what controls the
         media. An example of this is in GSM phones, where the CM just
         tells the phone to dial a number and it does the audio routing
@@ -40,9 +40,9 @@
       <h4>Codec Negotiation</h4>
 
       <p>When a new <tp:dbus-ref
-        namespace="ofdT.Channel.Type">Call.DRAFT</tp:dbus-ref> channel
+        namespace="ofdT.Channel.Type">Call.DRAFT2</tp:dbus-ref> channel
         appears (whether it was requested or not) a <tp:dbus-ref
-        namespace="ofdT.Call.Content">MediaDescription.DRAFT</tp:dbus-ref>
+        namespace="ofdT.Call.Content">MediaDescription.DRAFT2</tp:dbus-ref>
         object will either be waiting in the
         <tp:member-ref>MediaDescriptionOffer</tp:member-ref> property, or will
         appear at some point via the
@@ -50,31 +50,31 @@
 
       <p>If nothing is known about the remote side's Media capabilities,
         (e.g. outgoing SIP/XMPP call, this <tp:dbus-ref namespace="ofdT.Call.Content"
-        >MediaDescription.DRAFT</tp:dbus-ref> will pop up with {<tp:dbus-ref
-        namespace="ofdT.Call.Content.MediaDescription.DRAFT"
+        >MediaDescription.DRAFT2</tp:dbus-ref> will pop up with {<tp:dbus-ref
+        namespace="ofdT.Call.Content.MediaDescription.DRAFT2"
           >HasRemoteInformation</tp:dbus-ref> = false, <tp:dbus-ref
-        namespace="ofdT.Call.Content.MediaDescription.DRAFT"
+        namespace="ofdT.Call.Content.MediaDescription.DRAFT2"
           >FurtherNegotiationRequired</tp:dbus-ref> = true}, and the local
         user's streaming implementation SHOULD call 
-        <tp:dbus-ref namespace="ofdT.Call.Content.MediaDescription.DRAFT"
+        <tp:dbus-ref namespace="ofdT.Call.Content.MediaDescription.DRAFT2"
         >Accept</tp:dbus-ref>,
         with a description of all supported codecs and other features.
         The CM will then send this information to the remote side (and
         <tp:member-ref>LocalMediaDescriptionChanged</tp:member-ref> will fire
         with details of the description passed into <tp:dbus-ref
-          namespace="ofdT.Call.Content.MediaDescription.DRAFT"
+          namespace="ofdT.Call.Content.MediaDescription.DRAFT2"
           >Accept</tp:dbus-ref> for debugging purposes).
       </p>
       <p>When the remote codecs and other content information are available
         (e.g. Remote user replies to initial offer, or sends a new offer of
         their own, a new <tp:dbus-ref namespace="ofdT.Call.Content"
-         >MediaDescription.DRAFT</tp:dbus-ref> will appear, with {<tp:dbus-ref
-         namespace="ofdT.Call.Content.MediaDescription.DRAFT"
+         >MediaDescription.DRAFT2</tp:dbus-ref> will appear, with {<tp:dbus-ref
+         namespace="ofdT.Call.Content.MediaDescription.DRAFT2"
          >HasRemoteInformation</tp:dbus-ref> = true, <tp:dbus-ref
-        namespace="ofdT.Call.Content.MediaDescription.DRAFT"
+        namespace="ofdT.Call.Content.MediaDescription.DRAFT2"
           >FurtherNegotiationRequired</tp:dbus-ref> = false},
         and the <tp:dbus-ref
-        namespace="ofdT.Call.Content.MediaDescription.DRAFT"
+        namespace="ofdT.Call.Content.MediaDescription.DRAFT2"
           >Codecs</tp:dbus-ref>
         property on the description offer set to the codecs which are
         supported by the remote contact. The local user's streaming
@@ -84,9 +84,9 @@
          <tp:member-ref>LocalMediaDescriptionChanged</tp:member-ref> and
          <tp:member-ref>RemoteMediaDescriptionsChanged</tp:member-ref>
         will fire to signal their respective changes, to aid with debugging.
-        Note that if <tp:dbus-ref namespace="ofdT.Call.Content.MediaDescription.DRAFT"
+        Note that if <tp:dbus-ref namespace="ofdT.Call.Content.MediaDescription.DRAFT2"
         >Accept</tp:dbus-ref> is called, with <tp:dbus-ref
-        namespace="ofdT.Call.Content.MediaDescription.DRAFT"
+        namespace="ofdT.Call.Content.MediaDescription.DRAFT2"
           >FurtherNegotiationRequired</tp:dbus-ref> set to false,
         the CM should be able to rely on the fact that the
         description passed into Accept is compatible with the one in the
@@ -106,7 +106,7 @@
       </p>
       <p> If parameters requiring negotiation are changed, then the
         <tp:dbus-ref
-        namespace="ofdT.Call.Content.MediaDescription.DRAFT"
+        namespace="ofdT.Call.Content.MediaDescription.DRAFT2"
           >FurtherNegotiationRequired</tp:dbus-ref> property should be set to
         TRUE, and the new media description should
         only be used once they come in a new MediaDescriptionOffer
@@ -114,7 +114,7 @@
 
       <p>If the other side decides to update his or her codec list
         during a call, a new <tp:dbus-ref
-        namespace="ofdT.Call.Content">MediaDescription.DRAFT</tp:dbus-ref>
+        namespace="ofdT.Call.Content">MediaDescription.DRAFT2</tp:dbus-ref>
         object will appear through
         <tp:member-ref>NewMediaDescriptionOffer</tp:member-ref> which should be
         acted on as documented above.</p>
@@ -122,12 +122,12 @@
       <h4>Protocols without negotiation</h4>
 
       <p>For protocols where the codecs are not negotiable, the initial content's <tp:dbus-ref
-        namespace="ofdT.Call.Content">MediaDescription.DRAFT</tp:dbus-ref>
+        namespace="ofdT.Call.Content">MediaDescription.DRAFT2</tp:dbus-ref>
         object will appear with <tp:dbus-ref
-        namespace="ofdT.Call.Content.MediaDescription.DRAFT"
+        namespace="ofdT.Call.Content.MediaDescription.DRAFT2"
           >HasRemoteInformation</tp:dbus-ref>,
         set to true and the known supported codec values in <tp:dbus-ref
-        namespace="ofdT.Call.Content.MediaDescription.DRAFT"
+        namespace="ofdT.Call.Content.MediaDescription.DRAFT2"
           >Codecs</tp:dbus-ref>.
       </p>
     </tp:docstring>
@@ -160,7 +160,7 @@
       <tp:member name="Updated" type="b">
         <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
           This should be set to true in calls to <tp:dbus-ref
-              namespace="ofdT.Call.Content.MediaDescription.DRAFT"
+              namespace="ofdT.Call.Content.MediaDescription.DRAFT2"
           >Accept</tp:dbus-ref> and
           <tp:member-ref>UpdateLocalMediaDescription</tp:member-ref> if this
           codec has changed in a way that needs to be signalled over the
@@ -201,10 +201,10 @@
       <tp:member name="Remote_Contact" type="u" tp:type="Handle">
         <tp:docstring>
           The remote contact this description refers to or 0. This matches the
-          <tp:dbus-ref namespace="ofdT.Call.Content.MediaDescription.DRAFT"
+          <tp:dbus-ref namespace="ofdT.Call.Content.MediaDescription.DRAFT2"
             >RemoteContact</tp:dbus-ref> property on
           <tp:dbus-ref namespace="ofdT.Call.Content"
-                    >MediaDescription.DRAFT</tp:dbus-ref>
+                    >MediaDescription.DRAFT2</tp:dbus-ref>
         </tp:docstring>
       </tp:member>
       <tp:member name="Media_Description_Properties" type="a{sv}"
@@ -222,7 +222,7 @@
       <tp:member name="Media_Description" type="o">
         <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
           The object path to the <tp:dbus-ref namespace="ofdT.Call.Content"
-          >MediaDescription.DRAFT</tp:dbus-ref>
+          >MediaDescription.DRAFT2</tp:dbus-ref>
         </tp:docstring>
       </tp:member>
       <tp:member name="Remote_Contact" type="u" tp:type="Contact_Handle">
@@ -294,8 +294,8 @@
           contact.</p>
 
         <p>Keys of this map will appear in at most one <tp:dbus-ref
-          namespace="ofdT.Call.Stream.DRAFT">RemoteMembers</tp:dbus-ref>.
-          See <tp:dbus-ref namespace="ofdT.Call.Content.MediaDescription.DRAFT"
+          namespace="ofdT.Call.Stream.DRAFT2">RemoteMembers</tp:dbus-ref>.
+          See <tp:dbus-ref namespace="ofdT.Call.Content.MediaDescription.DRAFT2"
           >RemoteContact</tp:dbus-ref> for more details on how to map between
           MediaDescriptions and Streams.</p>
       </tp:docstring>
@@ -314,11 +314,11 @@
         tp:name-for-bindings="New_Media_Description_Offer">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>Emitted when a new <tp:dbus-ref namespace="ofdT.Call.Content"
-          >MediaDescription.DRAFT</tp:dbus-ref> appears. The streaming
+          >MediaDescription.DRAFT2</tp:dbus-ref> appears. The streaming
           >implementation MUST respond by calling the
-          <tp:dbus-ref namespace="ofdT.Call.Content.MediaDescription.DRAFT"
+          <tp:dbus-ref namespace="ofdT.Call.Content.MediaDescription.DRAFT2"
           >Accept</tp:dbus-ref> or <tp:dbus-ref
-          namespace="ofdT.Call.Content.MediaDescription.DRAFT"
+          namespace="ofdT.Call.Content.MediaDescription.DRAFT2"
           >Reject</tp:dbus-ref> method on the description object appeared.</p>
 
         <p>Emission of this signal indicates that the
@@ -364,7 +364,7 @@
         tp:name-for-bindings="Media_Description_Offer_Done">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>Emitted when a <tp:dbus-ref namespace="ofdT.Call.Content"
-          >MediaDescription.DRAFT</tp:dbus-ref> has been handled. </p>
+          >MediaDescription.DRAFT2</tp:dbus-ref> has been handled. </p>
         <p>Emission of this signal indicates that the
           <tp:member-ref>MediaDescriptionOffer</tp:member-ref> property has
           changed to
@@ -444,8 +444,8 @@
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>The object path to the current
           <tp:dbus-ref namespace="ofdT.Call.Content"
-           >MediaDescription.DRAFT</tp:dbus-ref> object, its
-            <tp:dbus-ref namespace="ofdT.Call.Content.MediaDescription.DRAFT"
+           >MediaDescription.DRAFT2</tp:dbus-ref> object, its
+            <tp:dbus-ref namespace="ofdT.Call.Content.MediaDescription.DRAFT2"
             >RemoteContact</tp:dbus-ref> and
             a mapping of the MediaDescriptions properties.
             If the object path is "/" then there isn't an outstanding
@@ -453,7 +453,7 @@
 
         <tp:rationale>
           Having all <tp:dbus-ref
-          namespace="ofdT.Call.Content">MediaDescription.DRAFT</tp:dbus-ref>
+          namespace="ofdT.Call.Content">MediaDescription.DRAFT2</tp:dbus-ref>
           properties here saves a D-Bus round-trip - it shouldn't be
           necessary to get these properties from the Content MediaDescription
           object, in practice.
diff --git a/spec/Call_Content_Interface_Video_Control.xml b/spec/Call_Content_Interface_Video_Control.xml
index 276c40de..4cfae0db 100644
--- a/spec/Call_Content_Interface_Video_Control.xml
+++ b/spec/Call_Content_Interface_Video_Control.xml
@@ -20,7 +20,7 @@
       02110-1301, USA.</p>
   </tp:license>
 
-  <interface name="org.freedesktop.Telepathy.Call.Content.Interface.VideoControl.DRAFT"
+  <interface name="org.freedesktop.Telepathy.Call.Content.Interface.VideoControl.DRAFT2"
     tp:causes-havoc="experimental">
     <tp:added version="0.21.10">(draft 1)</tp:added>
     <tp:requires interface="org.freedesktop.Telepathy.Call.Content.Interface.Media.DRAFT2"/>
diff --git a/spec/Call_Content_Media_Description.xml b/spec/Call_Content_Media_Description.xml
index 11b841b0..ea3a3d5c 100644
--- a/spec/Call_Content_Media_Description.xml
+++ b/spec/Call_Content_Media_Description.xml
@@ -20,7 +20,7 @@
       02110-1301, USA.</p>
   </tp:license>
 
-  <interface name="org.freedesktop.Telepathy.Call.Content.MediaDescription.DRAFT"
+  <interface name="org.freedesktop.Telepathy.Call.Content.MediaDescription.DRAFT2"
       tp:causes-havoc="experimental">
     <tp:added version="UNRELEASED">(draft 1)</tp:added>
 
@@ -45,7 +45,7 @@
         <tp:docstring>
           The local description to send to the remote contacts and
           to use in the <tp:dbus-ref
-          namespace="ofdT.Call">Content.DRAFT</tp:dbus-ref>.
+          namespace="ofdT.Call">Content.DRAFT2</tp:dbus-ref>.
         </tp:docstring>
       </arg>
       <tp:docstring>
@@ -130,7 +130,7 @@
         The contact handle that this description applies to.
 
         This property can be used as an opaque identifier, and searched for in
-        <tp:dbus-ref namespace="ofdT.Call.Stream.DRAFT"
+        <tp:dbus-ref namespace="ofdT.Call.Stream.DRAFT2"
         >RemoteMembers</tp:dbus-ref> for each Stream in this Content, to
         determine which Stream this MediaDescription applies to. If multiple
         MediaDescriptions apply to the same Stream, the
@@ -201,14 +201,14 @@
           A mapping containing all properties that define the information from a
           <tp:dbus-ref
             namespace="ofdT.Call.Content"
-            >MediaDescription.DRAFT</tp:dbus-ref> and its interfaces.
+            >MediaDescription.DRAFT2</tp:dbus-ref> and its interfaces.
         </p>
 
         <p>
-          If <tp:dbus-ref namespace="ofdT.Call.Content.MediaDescription.DRAFT"
+          If <tp:dbus-ref namespace="ofdT.Call.Content.MediaDescription.DRAFT2"
             >HasRemoteInformation</tp:dbus-ref> is True, then this mapping
           will always contains at least
-          <tp:dbus-ref namespace="ofdT.Call.Content.MediaDescription.DRAFT"
+          <tp:dbus-ref namespace="ofdT.Call.Content.MediaDescription.DRAFT2"
             >Codecs</tp:dbus-ref>
         </p>
       </tp:docstring>
diff --git a/spec/Call_Content_Media_Description_Interface_RTCP_Extended_Reports.xml b/spec/Call_Content_Media_Description_Interface_RTCP_Extended_Reports.xml
index a5412256..ab67ac4d 100644
--- a/spec/Call_Content_Media_Description_Interface_RTCP_Extended_Reports.xml
+++ b/spec/Call_Content_Media_Description_Interface_RTCP_Extended_Reports.xml
@@ -18,11 +18,11 @@ License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
   </tp:license>
 
-  <interface name="org.freedesktop.Telepathy.Call.Content.MediaDescription.Interface.RTCPExtendedReports.DRAFT"
+  <interface name="org.freedesktop.Telepathy.Call.Content.MediaDescription.Interface.RTCPExtendedReports.DRAFT2"
     tp:causes-havoc="experimental">
     <tp:added version="0.21.UNRELEASED">(draft version, not API-stable)</tp:added>
     <tp:requires
-    interface="org.freedesktop.Telepathy.Call.Content.MediaDescription.DRAFT"/>
+    interface="org.freedesktop.Telepathy.Call.Content.MediaDescription.DRAFT2"/>
 
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
       <p>This codec offer interface provides a method of signalling for
diff --git a/spec/Call_Content_Media_Description_Interface_RTCP_Feedback.xml b/spec/Call_Content_Media_Description_Interface_RTCP_Feedback.xml
index 3aba4381..b13e1870 100644
--- a/spec/Call_Content_Media_Description_Interface_RTCP_Feedback.xml
+++ b/spec/Call_Content_Media_Description_Interface_RTCP_Feedback.xml
@@ -18,10 +18,10 @@ License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
   </tp:license>
 
-  <interface name="org.freedesktop.Telepathy.Call.Content.MediaDescription.Interface.RTCPFeedback.DRAFT"
+  <interface name="org.freedesktop.Telepathy.Call.Content.MediaDescription.Interface.RTCPFeedback.DRAFT2"
     tp:causes-havoc="experimental">
     <tp:added version="0.21.UNRELEASED">(draft version, not API-stable)</tp:added>
-    <tp:requires interface="org.freedesktop.Telepathy.Call.Content.MediaDescription.DRAFT"/>
+    <tp:requires interface="org.freedesktop.Telepathy.Call.Content.MediaDescription.DRAFT2"/>
 
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
       <p>This codec offer interface provides a method of signalling
@@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
       <p>The codec identifiers used in the description of the Feedback Messages
       sent in the <tp:dbus-ref
-        namespace="ofdT.Call.Content.MediaDescription.DRAFT">Accept</tp:dbus-ref>'s
+        namespace="ofdT.Call.Content.MediaDescription.DRAFT2">Accept</tp:dbus-ref>'s
       should match those used for the RemoteCodecs in the same Accept call.
       </p>
 
diff --git a/spec/Call_Content_Media_Description_Interface_RTP_Header_Extensions.xml b/spec/Call_Content_Media_Description_Interface_RTP_Header_Extensions.xml
index 0e4cf553..c3357203 100644
--- a/spec/Call_Content_Media_Description_Interface_RTP_Header_Extensions.xml
+++ b/spec/Call_Content_Media_Description_Interface_RTP_Header_Extensions.xml
@@ -18,10 +18,10 @@ License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
   </tp:license>
 
-  <interface name="org.freedesktop.Telepathy.Call.Content.MediaDescription.Interface.RTPHeaderExtensions.DRAFT"
+  <interface name="org.freedesktop.Telepathy.Call.Content.MediaDescription.Interface.RTPHeaderExtensions.DRAFT2"
     tp:causes-havoc="experimental">
     <tp:added version="0.21.UNRELEASED">(draft version, not API-stable)</tp:added>
-    <tp:requires interface="org.freedesktop.Telepathy.Call.Content.MediaDescription.DRAFT"/>
+    <tp:requires interface="org.freedesktop.Telepathy.Call.Content.MediaDescription.DRAFT2"/>
 
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
       <p>This media description interface provides a method of signalling
diff --git a/spec/Call_Interface_Mute.xml b/spec/Call_Interface_Mute.xml
index de0cb27d..cc9bf8b9 100644
--- a/spec/Call_Interface_Mute.xml
+++ b/spec/Call_Interface_Mute.xml
@@ -18,11 +18,11 @@ License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
   </tp:license>
 
-  <interface name="org.freedesktop.Telepathy.Call.Interface.Mute.DRAFT" tp:causes-havoc="experimental">
+  <interface name="org.freedesktop.Telepathy.Call.Interface.Mute.DRAFT2" tp:causes-havoc="experimental">
     <tp:added version="0.19.6">(draft version, not API-stable)</tp:added>
-    <tp:xor-requires interface="org.freedesktop.Telepathy.Channel.Type.Call.DRAFT"/>
-    <tp:xor-requires interface="org.freedesktop.Telepathy.Call.Content.DRAFT"/>
-    <tp:xor-requires interface="org.freedesktop.Telepathy.Call.Stream.DRAFT"/>
+    <tp:xor-requires interface="org.freedesktop.Telepathy.Channel.Type.Call.DRAFT2"/>
+    <tp:xor-requires interface="org.freedesktop.Telepathy.Call.Content.DRAFT2"/>
+    <tp:xor-requires interface="org.freedesktop.Telepathy.Call.Stream.DRAFT2"/>
 
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
       <p>Interface for calls which may be muted.  This only makes sense
diff --git a/spec/Call_Stream.xml b/spec/Call_Stream.xml
index 48a19cb1..bdfb7c3f 100644
--- a/spec/Call_Stream.xml
+++ b/spec/Call_Stream.xml
@@ -20,13 +20,13 @@
       02110-1301, USA.</p>
   </tp:license>
 
-  <interface name="org.freedesktop.Telepathy.Call.Stream.DRAFT"
+  <interface name="org.freedesktop.Telepathy.Call.Stream.DRAFT2"
       tp:causes-havoc="experimental">
     <tp:added version="0.19.0">(draft 1)</tp:added>
 
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
       One stream inside a <tp:dbus-ref
-      namespace="ofdT.Call">Content.DRAFT</tp:dbus-ref>.  A stream is
+      namespace="ofdT.Call">Content.DRAFT2</tp:dbus-ref>.  A stream is
       a single flow of packets to and from a single remote endpoint.
       If your call connects to multiple people, you could have
       multiple streams.
@@ -204,7 +204,7 @@
       <tp:added version="0.19.11"/>
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>Extra interfaces provided by this stream, such as <tp:dbus-ref
-            namespace="ofdT.Call">Stream.Interface.Media.DRAFT</tp:dbus-ref>.
+            namespace="ofdT.Call">Stream.Interface.Media.DRAFT2</tp:dbus-ref>.
           This SHOULD NOT include the Stream interface itself, and cannot
           change once the stream has been created.</p>
       </tp:docstring>
@@ -218,7 +218,7 @@
 
         <p>Media sent to this stream will be sent to all members listed here.
           All members listed here will also appear in <tp:dbus-ref
-          namespace="ofdT.Channel.Type.Call.DRAFT">CallMembers</tp:dbus-ref>,
+          namespace="ofdT.Channel.Type.Call.DRAFT2">CallMembers</tp:dbus-ref>,
           and each CallMembers member will be listed in at most one Stream per
           Content. Therefore, to hide things from a member of the
           call, UIs only need to mute one Stream per Content.</p>
@@ -231,7 +231,7 @@
 
         <p>This mapping is also used by the streaming implementation to map
           from <tp:dbus-ref namespace="ofdT.Call.Content"
-          >MediaDescription.DRAFT</tp:dbus-ref>s to Streams. In this use-case,
+          >MediaDescription.DRAFT2</tp:dbus-ref>s to Streams. In this use-case,
           all of the senders in this stream will be represented in
           <tp:dbus-ref namespace="ofdT.Call.Content.Interface.Media.DRAFT2"
           >RemoteMediaDescriptions</tp:dbus-ref>. This use-case should not
@@ -262,13 +262,13 @@
           this property indicates that the other side requested the
           local user start sending media (which can be done by calling either
           <tp:member-ref>SetSending</tp:member-ref> or <tp:dbus-ref
-          namespace="ofdT.Channel.Type.Call.DRAFT">Accept</tp:dbus-ref>).</p>
+          namespace="ofdT.Channel.Type.Call.DRAFT2">Accept</tp:dbus-ref>).</p>
 
         <p>When <tp:dbus-ref
-          namespace="ofdT.Channel.Type.Call.DRAFT">Accept</tp:dbus-ref> is
+          namespace="ofdT.Channel.Type.Call.DRAFT2">Accept</tp:dbus-ref> is
           called, all streams with a local sending state of
           <tp:type>Sending_State</tp:type>_Pending_Send and the associated
-          <tp:dbus-ref namespace="ofdT.Call.Content.DRAFT"
+          <tp:dbus-ref namespace="ofdT.Call.Content.DRAFT2"
           >Disposition</tp:dbus-ref> set to
           <tp:type>Call_Content_Disposition</tp:type>_Initial are
           automatically set to sending.</p>
diff --git a/spec/Call_Stream_Endpoint.xml b/spec/Call_Stream_Endpoint.xml
index 09d7a98a..ac6f62b7 100644
--- a/spec/Call_Stream_Endpoint.xml
+++ b/spec/Call_Stream_Endpoint.xml
@@ -20,7 +20,7 @@
       02110-1301, USA.</p>
   </tp:license>
 
-  <interface name="org.freedesktop.Telepathy.Call.Stream.Endpoint.DRAFT"
+  <interface name="org.freedesktop.Telepathy.Call.Stream.Endpoint.DRAFT2"
     tp:causes-havoc="experimental">
     <tp:added version="0.19.0">(draft 1)</tp:added>
 
@@ -147,7 +147,7 @@
 
         Also note that some or all of the local candidates in this list may
         represent a peer-reflexive candidate that do not appear in
-        <tp:dbus-ref namespace="ofdT.Call.Stream.Interface.Media.DRAFT"
+        <tp:dbus-ref namespace="ofdT.Call.Stream.Interface.Media.DRAFT2"
         >LocalCandidates</tp:dbus-ref>.
 
         See rfc 5245 Appendix B.6. for more details about why this is.
diff --git a/spec/Call_Stream_Interface_Media.xml b/spec/Call_Stream_Interface_Media.xml
index 5e82beff..4a4360ac 100644
--- a/spec/Call_Stream_Interface_Media.xml
+++ b/spec/Call_Stream_Interface_Media.xml
@@ -20,10 +20,10 @@
       02110-1301, USA.</p>
   </tp:license>
 
-  <interface name="org.freedesktop.Telepathy.Call.Stream.Interface.Media.DRAFT"
+  <interface name="org.freedesktop.Telepathy.Call.Stream.Interface.Media.DRAFT2"
       tp:causes-havoc="experimental">
     <tp:added version="0.19.0">(draft 1)</tp:added>
-    <tp:requires interface="org.freedesktop.Telepathy.Call.Stream.DRAFT"/>
+    <tp:requires interface="org.freedesktop.Telepathy.Call.Stream.DRAFT2"/>
 
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
       <p>This interfaces deals with how a to connect a stream to an
@@ -33,7 +33,7 @@
       endpoints at the same time. This is called forking in the SIP
       jargon.  Informations related to the connections are on the
       <tp:dbus-ref
-      namespace="ofdT.Call.Stream">Endpoint.DRAFT</tp:dbus-ref>
+      namespace="ofdT.Call.Stream">Endpoint.DRAFT2</tp:dbus-ref>
       objects. Once the call is established, there MUST be a single
       endpoint left.</p>
 
@@ -438,7 +438,7 @@
           Raw UDP, with or without STUN. All streaming clients are assumed to
           support this transport, so there is no handler capability token for
           it in the <tp:dbus-ref namespace="ofdT.Channel.Type"
-          >Call.DRAFT</tp:dbus-ref> interface.
+          >Call.DRAFT2</tp:dbus-ref> interface.
           [This corresponds to "none" or "stun" in the old Media.StreamHandler
           interface.]
         </tp:docstring>
@@ -725,7 +725,7 @@
       type="ao" access="read">
       <tp:docstring>
         <p>The list of <tp:dbus-ref namespace="ofdT.Call.Stream"
-          >Endpoint.DRAFT</tp:dbus-ref> objects that exist for this
+          >Endpoint.DRAFT2</tp:dbus-ref> objects that exist for this
           stream.</p>
 
         <p>Change notification is via the
diff --git a/spec/Channel_Interface_DTMF.xml b/spec/Channel_Interface_DTMF.xml
index d74ea6fa..a2e36481 100644
--- a/spec/Channel_Interface_DTMF.xml
+++ b/spec/Channel_Interface_DTMF.xml
@@ -21,12 +21,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
   <interface name="org.freedesktop.Telepathy.Channel.Interface.DTMF">
     <tp:xor-requires>
       <tp:requires interface="org.freedesktop.Telepathy.Channel.Type.StreamedMedia"/>
-      <tp:requires interface="org.freedesktop.Telepathy.Channel.Type.Call.DRAFT"/>
+      <tp:requires interface="org.freedesktop.Telepathy.Channel.Type.Call.DRAFT2"/>
     </tp:xor-requires>
     <tp:changed version="0.19.6">The <tp:type>Stream_ID</tp:type>s in this
       interface should now be ignored by CMs. This is primarily to allow this
       interface to be used with <tp:dbus-ref
-      namespace='ofdT.Channel.Type'>Call.DRAFT</tp:dbus-ref>
+      namespace='ofdT.Channel.Type'>Call.DRAFT2</tp:dbus-ref>
       channels.</tp:changed>
 
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
diff --git a/spec/Channel_Interface_Hold.xml b/spec/Channel_Interface_Hold.xml
index 64567d96..fff88593 100644
--- a/spec/Channel_Interface_Hold.xml
+++ b/spec/Channel_Interface_Hold.xml
@@ -22,8 +22,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
   <interface name="org.freedesktop.Telepathy.Channel.Interface.Hold">
     <tp:xor-requires>
       <tp:requires interface="org.freedesktop.Telepathy.Channel.Type.StreamedMedia"/>
-      <tp:requires interface="org.freedesktop.Telepathy.Channel.Type.Call.DRAFT"/>
-      <tp:requires interface="org.freedesktop.Telepathy.Call.Content.DRAFT"/>
+      <tp:requires interface="org.freedesktop.Telepathy.Channel.Type.Call.DRAFT2"/>
+      <tp:requires interface="org.freedesktop.Telepathy.Call.Content.DRAFT2"/>
     </tp:xor-requires>
     <tp:changed version="0.17.4">first API-stable version</tp:changed>
 
diff --git a/spec/Channel_Type_Call.xml b/spec/Channel_Type_Call.xml
index 2e422640..1696c11f 100644
--- a/spec/Channel_Type_Call.xml
+++ b/spec/Channel_Type_Call.xml
@@ -17,13 +17,13 @@ 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.
   </tp:license>
-  <interface name="org.freedesktop.Telepathy.Channel.Type.Call.DRAFT"
+  <interface name="org.freedesktop.Telepathy.Channel.Type.Call.DRAFT2"
       tp:causes-havoc="experimental">
     <tp:added version="0.19.0">(draft 1)</tp:added>
 
     <tp:requires interface="org.freedesktop.Telepathy.Channel"/>
     <tp:requires
-      interface="org.freedesktop.Telepathy.Call.Interface.Mute.DRAFT"/>
+      interface="org.freedesktop.Telepathy.Call.Interface.Mute.DRAFT2"/>
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
       <p>A channel type for making audio and video calls. Call
         channels supersede the old <tp:dbus-ref
@@ -54,7 +54,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
       <h4>Contents</h4>
 
-      <p><tp:dbus-ref namespace="ofdT.Call">Content.DRAFT</tp:dbus-ref>
+      <p><tp:dbus-ref namespace="ofdT.Call">Content.DRAFT2</tp:dbus-ref>
         objects represent the actual media that forms the Call (for
         example an audio content and a video content). Calls always
         have one or more Content objects associated with them. As a
@@ -64,10 +64,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         as the Requestable Channel Classes will document.</p>
 
       <p><tp:dbus-ref
-        namespace="ofdT.Call">Content.DRAFT</tp:dbus-ref> objects have
+        namespace="ofdT.Call">Content.DRAFT2</tp:dbus-ref> objects have
         one or more stream associated with them. More information on
         these streams and how to maniuplate them can be found on the
-        <tp:dbus-ref namespace="ofdT.Call">Content.DRAFT</tp:dbus-ref>
+        <tp:dbus-ref namespace="ofdT.Call">Content.DRAFT2</tp:dbus-ref>
         interface page.</p>
 
       <h4>Outgoing calls</h4>
@@ -79,7 +79,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         <pre>
 <tp:dbus-ref namespace="ofdT.Connection.Interface.Requests">CreateChannel</tp:dbus-ref>({
   ...<tp:dbus-ref namespace="ofdT.Channel">ChannelType</tp:dbus-ref>: ...<tp:dbus-ref
-      namespace="ofdT.Channel.Type">Call.DRAFT</tp:dbus-ref>,
+      namespace="ofdT.Channel.Type">Call.DRAFT2</tp:dbus-ref>,
   ...<tp:dbus-ref namespace="ofdT.Channel">TargetHandleType</tp:dbus-ref>: Contact,
   ...<tp:dbus-ref namespace="ofdT.Channel">TargetID</tp:dbus-ref>: 'foo@example.com',
   ...<tp:member-ref>InitialAudio</tp:member-ref>: True,
@@ -166,7 +166,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
   /org/freedesktop/Telepathy/Connection/foo/bar/foo_40bar_2ecom/CallChannel,
   {
     ...<tp:dbus-ref namespace="ofdT.Channel">ChannelType</tp:dbus-ref>: ...<tp:dbus-ref
-      namespace="ofdT.Channel.Type">Call.DRAFT</tp:dbus-ref>,
+      namespace="ofdT.Channel.Type">Call.DRAFT2</tp:dbus-ref>,
     ...<tp:dbus-ref namespace="ofdT.Channel">TargetHandleType</tp:dbus-ref>: Contact,
     ...<tp:dbus-ref namespace="ofdT.Channel">TargetID</tp:dbus-ref>: 'foo@example.com',
     ...<tp:dbus-ref namespace="ofdT.Channel">TargetHandle</tp:dbus-ref>: 42,
@@ -193,7 +193,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         The new channel should also be given to telepathy-farstream to
         work out how the two participants will connect together.
         telepathy-farstream will call the appropriate methods on the call's
-        <tp:dbus-ref namespace="ofdT.Call">Content.DRAFT</tp:dbus-ref>s
+        <tp:dbus-ref namespace="ofdT.Call">Content.DRAFT2</tp:dbus-ref>s
         to negotiate codecs and transports.</p>
 
       <p>To pick up the call, the handler should call
@@ -241,9 +241,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
       <p>A similar method is used for removing contents from a call,
         except that the <tp:dbus-ref
-        namespace="ofdT.Call.Content.DRAFT">Remove</tp:dbus-ref> method
+        namespace="ofdT.Call.Content.DRAFT2">Remove</tp:dbus-ref> method
         is on the <tp:dbus-ref
-        namespace="ofdT.Call">Content.DRAFT</tp:dbus-ref> object.</p>
+        namespace="ofdT.Call">Content.DRAFT2</tp:dbus-ref> object.</p>
 
       <h5>Ending the call</h5>
 
@@ -271,12 +271,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       <p>The <tp:dbus-ref
         namespace="ofdT.Connection.Interface.Requests">RequestableChannelClasses</tp:dbus-ref>
         for <tp:dbus-ref
-        namespace="ofdT.Channel.Type">Call.DRAFT</tp:dbus-ref> channels
+        namespace="ofdT.Channel.Type">Call.DRAFT2</tp:dbus-ref> channels
         can be:</p>
 
       <blockquote>
         <pre>
-[( Fixed = { ...<tp:dbus-ref namespace="ofdT.Channel">ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="ofdT.Channel.Type">Call.DRAFT</tp:dbus-ref>,
+[( Fixed = { ...<tp:dbus-ref namespace="ofdT.Channel">ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="ofdT.Channel.Type">Call.DRAFT2</tp:dbus-ref>,
             ...<tp:dbus-ref namespace="ofdT.Channel">TargetHandleType</tp:dbus-ref>: Contact,
             ...<tp:member-ref>InitialVideo</tp:member-ref>: True
           },
@@ -285,7 +285,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
               ...<tp:member-ref>InitialAudioName</tp:member-ref>
             ]
 ),
-( Fixed = { ...<tp:dbus-ref namespace="ofdT.Channel">ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="ofdT.Channel.Type">Call.DRAFT</tp:dbus-ref>,
+( Fixed = { ...<tp:dbus-ref namespace="ofdT.Channel">ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="ofdT.Channel.Type">Call.DRAFT2</tp:dbus-ref>,
             ...<tp:dbus-ref namespace="ofdT.Channel">TargetHandleType</tp:dbus-ref>: Contact,
             ...<tp:member-ref>InitialAudio</tp:member-ref>: True
           },
@@ -302,7 +302,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         class, and vice versa for CMs without audio support.</p>
 
       <p>Handlers should not close <tp:dbus-ref
-        namespace="ofdT.Channel.Type">Call.DRAFT</tp:dbus-ref> channels
+        namespace="ofdT.Channel.Type">Call.DRAFT2</tp:dbus-ref> channels
         without first calling <tp:member-ref>Hangup</tp:member-ref> on
         the channel. If a Call handler crashes, the <tp:dbus-ref
         namespace="ofdT">ChannelDispatcher</tp:dbus-ref> will call
@@ -411,15 +411,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
           client (user interface) is handling the channel.</p>
 
         <p>When this method is called, for each <tp:dbus-ref
-          namespace="ofdT.Call" >Content.DRAFT</tp:dbus-ref> whose
-          <tp:dbus-ref namespace="ofdT.Call.Content.DRAFT"
+          namespace="ofdT.Call" >Content.DRAFT2</tp:dbus-ref> whose
+          <tp:dbus-ref namespace="ofdT.Call.Content.DRAFT2"
           >Disposition</tp:dbus-ref> is
           <tp:type>Call_Content_Disposition</tp:type>_Initial, any
           streams where the <tp:dbus-ref
-          namespace="ofdT.Call.Stream.DRAFT">LocalSendingState</tp:dbus-ref>
+          namespace="ofdT.Call.Stream.DRAFT2">LocalSendingState</tp:dbus-ref>
           is <tp:type>Sending_State</tp:type>_Pending_Send will be
           moved to <tp:type>Sending_State</tp:type>_Sending as if
-          <tp:dbus-ref namespace="ofdT.Call.Stream.DRAFT"
+          <tp:dbus-ref namespace="ofdT.Call.Stream.DRAFT2"
           >SetSending</tp:dbus-ref>(True) had been called.</p>
       </tp:docstring>
 
@@ -478,7 +478,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     <method name="AddContent" tp:name-for-bindings="Add_Content">
       <tp:docstring>
         Request that a new <tp:dbus-ref
-        namespace="ofdT.Call">Content.DRAFT</tp:dbus-ref> of type
+        namespace="ofdT.Call">Content.DRAFT2</tp:dbus-ref> of type
         Content_Type is added to the Call. Handlers should check the
         value of the <tp:member-ref>MutableContents</tp:member-ref>
         property before trying to add another content as it might not
@@ -516,7 +516,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         <tp:docstring>
           Path to the newly-created <tp:dbus-ref
             namespace="org.freedesktop.Telepathy"
-            >Call.Content.DRAFT</tp:dbus-ref> object.
+            >Call.Content.DRAFT2</tp:dbus-ref> object.
         </tp:docstring>
       </arg>
 
@@ -554,12 +554,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
             tp:name-for-bindings="Content_Added">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>Emitted when a new <tp:dbus-ref namespace="ofdT.Call"
-          >Content.DRAFT</tp:dbus-ref> is added to the call.</p>
+          >Content.DRAFT2</tp:dbus-ref> is added to the call.</p>
       </tp:docstring>
       <arg name="Content" type="o">
         <tp:docstring>
           Path to the newly-created <tp:dbus-ref namespace="ofdT.Call"
-          >Content.DRAFT</tp:dbus-ref> object.
+          >Content.DRAFT2</tp:dbus-ref> object.
         </tp:docstring>
       </arg>
     </signal>
@@ -567,12 +567,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     <signal name="ContentRemoved" tp:name-for-bindings="Content_Removed">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>Emitted when a <tp:dbus-ref namespace="ofdT.Call"
-          >Content.DRAFT</tp:dbus-ref> is removed from the call.</p>
+          >Content.DRAFT2</tp:dbus-ref> is removed from the call.</p>
       </tp:docstring>
       <arg name="Content" type="o">
         <tp:docstring>
           The <tp:dbus-ref namespace="ofdT.Call"
-          >Content.DRAFT</tp:dbus-ref> which was removed.
+          >Content.DRAFT2</tp:dbus-ref> which was removed.
         </tp:docstring>
       </arg>
       <arg name="Reason" type="(uuss)" tp:type="Call_State_Reason">
@@ -586,7 +586,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       tp:name-for-bindings="Contents">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>The list of <tp:dbus-ref
-          namespace="ofdT.Call">Content.DRAFT</tp:dbus-ref> objects that
+          namespace="ofdT.Call">Content.DRAFT2</tp:dbus-ref> objects that
           are part of this call. Change notification is via the
           <tp:member-ref>ContentAdded</tp:member-ref> and
           <tp:member-ref>ContentRemoved</tp:member-ref> signals.
@@ -735,13 +735,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         <tp:docstring>
           The call has been muted by the local user, e.g. using the
           <tp:dbus-ref namespace="ofdT.Call.Interface"
-          >Mute.DRAFT</tp:dbus-ref> interface. This flag SHOULD only
+          >Mute.DRAFT2</tp:dbus-ref> interface. This flag SHOULD only
           be set if there is at least one Content, and all Contents
           are locally muted (for the same reason as Locally_Held).
 
           <tp:rationale>
             This flag exists to provide a simplified verson of <tp:dbus-ref
-            namespace="ofdT.Call.Interface.Mute.DRAFT"
+            namespace="ofdT.Call.Interface.Mute.DRAFT2"
               >MuteStateChanged</tp:dbus-ref>,
             to reduce the number of signals that need to be
             listened to by a simple UI.
@@ -1326,7 +1326,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
           the connection manager should immediately attempt to establish an
           audio stream to the remote contact, making it unnecessary for the
           client to call <tp:dbus-ref
-          namespace="ofdT.Channel.Type.Call.DRAFT">AddContent</tp:dbus-ref>.</p>
+          namespace="ofdT.Channel.Type.Call.DRAFT2">AddContent</tp:dbus-ref>.</p>
 
         <p>If this property, or InitialVideo, is passed to EnsureChannel
           (as opposed to CreateChannel), the connection manager SHOULD ignore
@@ -1341,7 +1341,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         <p>If True on an unrequested (incoming) channel, this indicates that
           the remote contact initially requested an audio stream; this does
           not imply that that audio stream is still active (as indicated by
-          <tp:dbus-ref namespace="ofdT.Channel.Type.Call.DRAFT"
+          <tp:dbus-ref namespace="ofdT.Channel.Type.Call.DRAFT2"
           >Contents</tp:dbus-ref>).</p>
 
         <p>The name of this new content can be decided by using the
@@ -1484,7 +1484,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     <tp:hct name="gtalk-p2p">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>The client can implement streaming for streams whose <tp:dbus-ref
-          namespace="ofdT.Call.Stream.Interface.Media.DRAFT">Transport</tp:dbus-ref>
+          namespace="ofdT.Call.Stream.Interface.Media.DRAFT2">Transport</tp:dbus-ref>
           property is <tp:type>Stream_Transport_Type</tp:type>_GTalk_P2P.</p>
       </tp:docstring>
     </tp:hct>
@@ -1492,7 +1492,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     <tp:hct name="ice">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>The client can implement streaming for streams whose <tp:dbus-ref
-          namespace="ofdT.Call.Stream.Interface.Media.DRAFT">Transport</tp:dbus-ref>
+          namespace="ofdT.Call.Stream.Interface.Media.DRAFT2">Transport</tp:dbus-ref>
           property is <tp:type>Stream_Transport_Type</tp:type>_ICE.</p>
       </tp:docstring>
     </tp:hct>
@@ -1500,7 +1500,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     <tp:hct name="wlm-2009">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>The client can implement streaming for streams whose <tp:dbus-ref
-          namespace="ofdT.Call.Stream.Interface.Media.DRAFT">Transport</tp:dbus-ref>
+          namespace="ofdT.Call.Stream.Interface.Media.DRAFT2">Transport</tp:dbus-ref>
           property is <tp:type>Stream_Transport_Type</tp:type>_WLM_2009.</p>
       </tp:docstring>
     </tp:hct>
@@ -1508,7 +1508,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     <tp:hct name="shm">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>The client can implement streaming for streams whose <tp:dbus-ref
-          namespace="ofdT.Call.Stream.Interface.Media.DRAFT">Transport</tp:dbus-ref>
+          namespace="ofdT.Call.Stream.Interface.Media.DRAFT2">Transport</tp:dbus-ref>
           property is <tp:type>Stream_Transport_Type</tp:type>_SHM.</p>
       </tp:docstring>
     </tp:hct>
@@ -1544,11 +1544,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
           property:</p>
 
         <ul>
-          <li><code>org.freedesktop.Telepathy.Channel.Type.Call.DRAFT/audio</code></li>
-          <li><code>org.freedesktop.Telepathy.Channel.Type.Call.DRAFT/audio/speex</code></li>
-          <li><code>org.freedesktop.Telepathy.Channel.Type.Call.DRAFT/video</code></li>
-          <li><code>org.freedesktop.Telepathy.Channel.Type.Call.DRAFT/video/theora</code></li>
-          <li><code>org.freedesktop.Telepathy.Channel.Type.Call.DRAFT/video/h264</code></li>
+          <li><code>org.freedesktop.Telepathy.Channel.Type.Call.DRAFT2/audio</code></li>
+          <li><code>org.freedesktop.Telepathy.Channel.Type.Call.DRAFT2/audio/speex</code></li>
+          <li><code>org.freedesktop.Telepathy.Channel.Type.Call.DRAFT2/video</code></li>
+          <li><code>org.freedesktop.Telepathy.Channel.Type.Call.DRAFT2/video/theora</code></li>
+          <li><code>org.freedesktop.Telepathy.Channel.Type.Call.DRAFT2/video/h264</code></li>
         </ul>
 
         <p>Clients MAY have media signalling abilities without explicitly
diff --git a/spec/Connection_Interface_Forwarding.xml b/spec/Connection_Interface_Forwarding.xml
index e5457b1e..1aea2b0b 100644
--- a/spec/Connection_Interface_Forwarding.xml
+++ b/spec/Connection_Interface_Forwarding.xml
@@ -92,7 +92,7 @@
         the group with the self handle as the actor, and
         <tp:type>Channel_Group_Change_Reason</tp:type> <code>No_Answer</code> or
         <code>Busy</code>, as appropriate. For <tp:dbus-ref
-        namespace='ofdT.Channel.Type'>Call.DRAFT</tp:dbus-ref> channels, the
+        namespace='ofdT.Channel.Type'>Call.DRAFT2</tp:dbus-ref> channels, the
         <tp:type>Call_State_Change_Reason</tp:type> <code>Forwarded</code>
         should be used.</p>
     </tp:docstring>
diff --git a/spec/Media_Stream_Handler.xml b/spec/Media_Stream_Handler.xml
index 75b5e720..86ff6241 100644
--- a/spec/Media_Stream_Handler.xml
+++ b/spec/Media_Stream_Handler.xml
@@ -735,7 +735,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
 
           Implementors and users of Call's <tp:dbus-ref
           namespace="ofdT.Call.Content.MediaDescription.Interface"
-          >RTCPFeedback.DRAFT</tp:dbus-ref> should not use the MAXUINT default.
+          >RTCPFeedback.DRAFT2</tp:dbus-ref> should not use the MAXUINT default.
           Instead, in RTP/AVP, the default should be 5000 (5 seconds).
           If using the RTP/AVPF profile, it can be set to a lower value,
           the default being 0.
diff --git a/spec/all.xml b/spec/all.xml
index 2987dfb7..181ecfb7 100644
--- a/spec/all.xml
+++ b/spec/all.xml
@@ -191,7 +191,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
        namespace='ofdT.Channel.Interface'>Hold</tp:dbus-ref> and
        <tp:dbus-ref namespace="ofdT.Channel.Interface">DTMF</tp:dbus-ref>
        interfaces, which may also appear on <tp:dbus-ref
-       namespace='ofdT.Channel.Type'>Call.DRAFT</tp:dbus-ref> channels.</p>
+       namespace='ofdT.Channel.Type'>Call.DRAFT2</tp:dbus-ref> channels.</p>
     </tp:docstring>
 
     <xi:include href="Channel_Interface_Call_State.xml"/>
@@ -206,7 +206,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
        chat rooms. They are primarily intended for <tp:dbus-ref
        namespace='ofdT.Channel.Type'>Text</tp:dbus-ref>, <tp:dbus-ref
        namespace='ofdT.Channel.Type'>StreamedMedia</tp:dbus-ref> and
-       <tp:dbus-ref namespace='ofdT.Channel.Type'>Call.DRAFT</tp:dbus-ref>
+       <tp:dbus-ref namespace='ofdT.Channel.Type'>Call.DRAFT2</tp:dbus-ref>
        channels, but may also appear on other types of channel.</p>
     </tp:docstring>
 
diff --git a/spec/errors.xml b/spec/errors.xml
index 9fdb7ff4..1343bae6 100644
--- a/spec/errors.xml
+++ b/spec/errors.xml
@@ -534,7 +534,7 @@
     <tp:added version="0.21.2"/>
     <tp:docstring>
       Raised when an incoming or outgoing <tp:dbus-ref
-      namespace="ofdT.Channel.Type">Call.DRAFT</tp:dbus-ref> is
+      namespace="ofdT.Channel.Type">Call.DRAFT2</tp:dbus-ref> is
       rejected by the the receiver.
     </tp:docstring>
   </tp:error>
@@ -628,7 +628,7 @@
         to place a call or send a message.</p>
 
       <p>The key 'balance-required' MAY be included in
-        <tp:dbus-ref namespace="ofdT.Channel.Type.Call.DRAFT">CallStateDetails</tp:dbus-ref>
+        <tp:dbus-ref namespace="ofdT.Channel.Type.Call.DRAFT2">CallStateDetails</tp:dbus-ref>
         or a delivery report's <tp:type>Message_Part</tp:type>
         (with the same units and scale as
         <tp:dbus-ref namespace="ofdT.Connection.Interface.Balance">AccountBalance</tp:dbus-ref>)