--- a/discovery-api/Overview.src.html	Fri Aug 03 15:16:38 2012 +0200
+++ b/discovery-api/Overview.src.html	Fri Aug 03 15:44:17 2012 +0200
@@ -380,7 +380,7 @@
     <script src="tools/syntaxhighlighter/js/shBrushXml.js" type="text/javascript" class='remove'></script>
     <script src="tools/syntaxhighlighter/js/shBrushJScript.js" type="text/javascript" class='remove'></script>
 
-    <script src='./js/profiles/w3c-common-loader.js' type="text/javascript" class='remove'></script>
+    <script src='http://www.w3.org/Tools/respec/respec-w3c-common' type="text/javascript" class='remove' async></script>
     <style type="text/css">
       /* Custom CSS optimizations (Richard Tibbett) */
 
@@ -555,7 +555,7 @@
 
       <p>
          The term DOM is used to refer to the API set made available to scripts in Web applications, and does not necessarily imply the existence of an actual <code>Document</code> object or of any
-         other <code>Node</code> objects as defined in the DOM Core specifications. [[!DOM-CORE]]
+         other <code>Node</code> objects as defined in the DOM Core specifications. [[!DOM4]]
       </p>
 
       <p>
@@ -1257,7 +1257,7 @@
       </table>
 
       <p>
-         Events with an event type of <code>message</code> defined in this specification are <a href="http://dev.w3.org/html5/postmsg/#messageevent" class="externalDFN"><code>MessageEvent</code></a> objects as defined in [[!WEBMESSAGING]].
+         Events with an event type of <code>message</code> defined in this specification are <a href="http://dev.w3.org/html5/postmsg/#messageevent" class="externalDFN"><code>MessageEvent</code></a> objects as defined in [[!POSTMSG]].
       </p>
 
       <p>
@@ -1271,7 +1271,7 @@
             <h2>Service Discovery</h2>
 
       <p>
-         A <a>user agent</a> conforming to this specification MAY implement <acronym title="Simple Service Discovery Protocol">SSDP</acronym> [[!UPNP]] and Zeroconf [[!ZEROCONF]] service discovery mechanisms
+         A <a>user agent</a> conforming to this specification MAY implement <acronym title="Simple Service Discovery Protocol">SSDP</acronym> [[!UPNP-DEVICEARCH11]] and Zeroconf [[!ZEROCONF]] service discovery mechanisms
          to enable Web pages to request and connect with HTTP services running on networked devices, discovered via either mechanism, through this API. When a <a>user agent</a> implements either of these service discovery mechanisms, then it MUST conform to the corresponding algorithms provided in this section of the specification.
       </p>
       <p>
@@ -1370,7 +1370,7 @@
          <h5>Universal Plug-and-Play (<acronym title="Universal Plug-and-Play">UPnP</acronym>)</h5>
 
          <p>
-            For each SSDP Presence Announcement [[!UPNP]] - a HTTP NOTIFY request - received from a user-agent-initiated SSDP Discovery Request [[!UPNP]], the <a>user agent</a> MUST run the following steps:
+            For each SSDP Presence Announcement [[!UPNP-DEVICEARCH11]] - a HTTP NOTIFY request - received from a user-agent-initiated SSDP Discovery Request [[!UPNP-DEVICEARCH11]], the <a>user agent</a> MUST run the following steps:
          </p>
 
          <ol class="rule">
@@ -1389,7 +1389,7 @@
 
             <li>
                Let <var>root device descriptor file</var> contain the contents of the file located at the URL provided in the first occurrence of <var>Location</var> obtained according to the rules
-               defined in the section 'Retrieving a description using HTTP' [[!UPNP]].
+               defined in the section 'Retrieving a description using HTTP' [[!UPNP-DEVICEARCH11]].
             </li>
 
             <li>
@@ -1398,7 +1398,7 @@
 
             <li>
                Let <var>advertised services</var> be a <a>list of all advertised services</a> obtained from the <var>root device descriptor file</var> containing all sub-nodes of the <code>serviceList</code> node as described in
-               the section 'Device Description' [[!UPNP]].
+               the section 'Device Description' [[!UPNP-DEVICEARCH11]].
             </li>
 
             <li>
@@ -1542,7 +1542,7 @@
                            Let <var>content clone</var> be the result of obtaining the message body of the HTTP NOTIFY request. If <var>content clone</var> is empty, then the <a>user agent</a> MUST abort these steps.
                         </li>
                         <li>
-                          Create a new <code>message</code> event that uses the <a href="http://dev.w3.org/html5/postmsg/#messageevent" class="externalDFN"><code>MessageEvent</code></a> interface [[!WEBMESSAGING]], with the name <code>message</code>,
+                          Create a new <code>message</code> event that uses the <a href="http://dev.w3.org/html5/postmsg/#messageevent" class="externalDFN"><code>MessageEvent</code></a> interface [[!POSTMSG]], with the name <code>message</code>,
                            which does not bubble, is not cancelable, and has no default action.
                         </li>
                         <li>