--- a/paq/prov-aq.html	Fri Jan 04 13:11:24 2013 +0000
+++ b/paq/prov-aq.html	Fri Jan 04 13:26:13 2013 +0000
@@ -648,11 +648,11 @@
 
         <section>
           <h2>Direct HTTP query service</h2>
-          <p>A direct HTTP query service is described by an RDF resource of type <code>prov:ProvenanceQueryService</code></p>
+          <p>A direct HTTP query service is described by an RDF resource of type <code>prov:DirectQueryService</code></p>
           <p>It allows for accessing provenance about a specified <a class="internalDFN">target-URI</a>.  The query URI to use is described by a URI Template [[URI-template]] (level 2 or above) in which which the variable <cite><code>uri</code></cite> stands for the target-URI; e.g.</p>
           <pre class="pattern">
     @prefix prov: &lt;http://www.w3c.org/ns/prov#&gt;
-    <cite>query_option_node</cite> a prov:ProvenanceQueryService ;
+    <cite>query_option_node</cite> a prov:DirectQueryService ;
       prov:provenanceUriTemplate "<cite>service-URI</cite>?target={+uri}" .</pre>
           <p>
             where <cite><code>service-URI</code></cite> is the URI of the provenance query service, and <code><cite>query_option_node</cite></code> is any distinct RDF subject node (i.e. a blank node or a URI).
@@ -665,7 +665,7 @@
             For example, a query service might offer to include just the immediate provenance of an entity, or to also supply provenance of entities from which the target resource is derived.  Suppose a service accepts an additional parameter <code>steps</code> that defines the number of previous steps to include in a provenance trace, it might publish its service description thus:
           </p>
           <pre class="pattern">
-    &lt;<cite>query_option_node</cite>&gt; a prov:ProvenanceQueryService ;
+    &lt;<cite>query_option_node</cite>&gt; a prov:DirectQueryService ;
       prov:provenanceUriTemplate "http://www.example.com/provenance/service?target={+uri}{&amp;steps}" .</pre>
           <p>
             which might result in an HTTP query for provenance information that looks like this:
@@ -717,7 +717,9 @@
     @prefix prov: &lt;http://www.w3c.org/ns/prov#&gt;
     @prefix sd: &lt;http://www.w3.org/ns/sparql-service-description#&gt;
 
-    &lt;#direct&gt; a prov:ProvenanceQueryService ;
+    &lt;&gt; a prov:ProvenanceQueryService .
+
+    &lt;#direct&gt; a prov:DirectQueryService ;
       prov:provenanceUriTemplate "?target={+uri}"
       .
     &lt;#sparql&gt; a sd:Service ;
@@ -755,7 +757,7 @@
 
       <!-- <section class="informative"> -->
       <section>
-        <h2>Provenance service discovery</h2>
+        <h2>Provenance query service discovery</h2>
         <p>
           Previously, <a href="#locating-provenance-descriptions" class="sectionRef"></a> has described use of HTTP <code>Link:</code> header fields and HTML <code>&lt;link&gt;</code> elements to indicate provenance query services. Beyond that, this specification does not define any specific mechanism for discovering query services.  Applications may use any appropriate mechanism, including but not limited to: prior configuration, search engines, service registries, etc.
         </p>
@@ -769,7 +771,7 @@
   &lt;http://example.org/dataset/&gt; a void:Dataset ;
     prov:hasQueryService &lt;http://example.org/provenance/&gt; .</pre>
         <p>
-          The RDF service description example in <a href="#provenance-query-service-description" class="sectionRef"></a> shows use of the <code>prov:ProvenanceQueryService</code> type.
+          The RDF service description example in <a href="#service-description-example" class="sectionRef"></a> shows use of the <code>prov:ProvenanceQueryService</code> type.
         </p>
       </section>
 
@@ -896,8 +898,13 @@
           </tr>
           <tr style="vertical-align: top;">
             <td><code>ProvenanceQueryService</code></td>
-            <td>Class for a provenance query service. Mainly for use in RDF provenance query service descriptions, to facilitate discovery.</td>
-            <td><a href="#provenance-query-service-description" class="sectionRef"></a></td>
+            <td>Type for a generic provenance query service. Mainly for use in RDF provenance query service descriptions, to facilitate discovery in linked data environments.</td>
+            <td><a href="#provenance-query-service-discovery" class="sectionRef"></a></td>
+          </tr>
+          <tr style="vertical-align: top;">
+            <td><code>DirectQueryService</code></td>
+            <td>Type for a direct HTTP query service. Mainly for use in RDF provenance query service descriptions, to distinguish direct HTTP query service descriptiuons from other query service descriptions.</td>
+            <td><a href="#direct-http-query-service" class="sectionRef"></a></td>
           </tr>
           <tr style="vertical-align: top;">
             <td><code>hasAnchor</code></td>