--- a/spec/latest/json-ld-api/index.html	Wed May 23 16:56:29 2012 -0700
+++ b/spec/latest/json-ld-api/index.html	Wed May 23 17:52:10 2012 -0700
@@ -662,10 +662,7 @@
       <dd>Creates a JSON-LD document given an set of <ldtref title="quad">Quads</ldtref>.
         <dl class="parameters">
           <dt>Quad[] input</dt>
-          <dd>
-            An array of RDF statements.
-            <div class="issue">This could change to <a>RDFDataset</a>.</div>
-          </dd>
+          <dd>An array of RDF quads.</dd>
           <dt>JsonLdCallback callback</dt>
           <dd>A callback that is called when processing is complete on
             the given <code>input</code>.</dd>
@@ -688,8 +685,6 @@
           <dt>QuadCallback callback</dt>
           <dd>A callback that is called when a <a>Quad</a> is created from processing
             the given <code>input</code>.
-            <div class="issue">To be more compatible with [[!RDF-CONCEPTS]], this could
-              change to be a single callback of <a>RDFDataset</a>.</div>
           </dd>
           <dt>optional JsonLdOptions options</dt>
           <dd>A set of options that MAY affect the conversion to RDF such as, e.g.,
@@ -739,16 +734,16 @@
   <section>
     <h3>QuadCallback</h3>
     <p>The <a>QuadCallback</a> is called whenever the processor generates a
-    statement during the <code>statement()</code> call.</p>
+    quad during the <code>quad()</code> call.</p>
 
     <dl title="[NoInterfaceObject Callback] interface QuadCallback"
         class="idl">
 
-      <dt>void statement()</dt>
-      <dd>This callback is invoked whenever a statement is generated by the processor.
+      <dt>void quad()</dt>
+      <dd>This callback is invoked whenever a quad is generated by the processor.
       <dl class="parameters">
-         <dt>Quad statement</dt>
-         <dd>The statement.</dd>
+         <dt>Quad quad</dt>
+         <dd>The quad.</dd>
       </dl>
       </dd>
     </dl>
@@ -792,48 +787,16 @@
     </section>
 
     <p>The following data structures are used for representing data about
-      RDF statements (triples or quads). They are used for normalization, <a>fromRDF</a>,
+      RDF quads. They are used for normalization, <a>fromRDF</a>,
       and from <a>toRDF</a> interfaces.
     </p>
 
     <section>
-    <h3>RDF Graph</h3>
-    <p><tdef>RDF graph</tdef>, is defined in [[!RDF-CONCEPTS]] as a set of RDF triples.
-      Within the JSON-LD API, this is representing using <a>RDFGraph</a>.</p>
-    <dl title="[NoInterfaceObject] interface RDFGraph" class="idl">
-      <dt>readonly attribute Quad[] statements</dt>
-      <dd>An <a>RDFGraph</a> is represented as an array of <a>Quad</a>, although underlying
-        implementations MAY NOT guarantee statement order.
-        <div class="issue">[[!RDF-CONCEPTS]] uses RDF triple instead of <a>Quad</a>.</div>
-      </dd>
-    </dl>
-    </section>
-    
-    <section>
-    <h3>RDF Dataset</h3>
-    <p>An <tdef>RDF Dataset</tdef> defines a single default <tref>RDF Graph</tref> and zero or more
-      named <tref title="RDF graph">RDF Graphs</tref>.</p>
-    <dl title="[NoInterfaceObject] interface RDFDataset" class="idl">
-      <dt>readonly attribute RDFGraph defaultGraph</dt>
-      <dd>The default <tref>RDF Graph</tref></dd>
-      <dt>readonly attribute object namedGraphs</dt>
-      <dd>An object containing <em>name</em>/graph pairs, where <em>name</em> is a
-        <a>node</a> and <em>graph</em> is an <a>RDFGraph</a>.
-        <div class="note">[[!RDF-CONCEPTS]] requires that <em>name</em> by an
-          <ldtref>IRI</ldtref>, JSON-LD allows this to be a <a>BlankNode</a>.</div>
-        <div class="issue">Is there a more IDLish way to do this?.</div>
-      </dd>
-    </dl>
-    </section>
-    
-    <section>
     <h3>Quad</h3>
     <p>The <a>Quad</a> interface represents an RDF Quad.
       See [[!RDF-CONCEPTS]] definition for
       <cite><a href="http://www.w3.org/TR/rdf11-concepts/#dfn-rdf-triple">RDF triple</a></cite>,
       which most closely aligns to <a>Quad</a>.
-      <div class="issue">If we use the <a>RDFDataset</a> type, this can
-        revert back to RDF triple.</div>
     </p>
     <dl title="[NoInterfaceObject] interface Quad" class="idl">
       <dt>readonly attribute Node subject</dt>
@@ -845,8 +808,8 @@
       <dt>readonly attribute Node? name</dt>
       <dd>The name associated with the <a>Quad</a> identifying
         it as a member of a named graph. If the attribute is present,
-        it indicates that this statement is a member of a <em>named graph</em>
-        associated with <em>name</em>. If it is missing, the statement
+        it indicates that this quad is a member of a <em>named graph</em>
+        associated with <em>name</em>. If it is missing, the quad
         is a member of the <em>default graph</em>.
         <div class="issue">This element is at risk, and may be removed.</div>
       </dd>
@@ -2135,7 +2098,7 @@
 <p>The processing algorithms described in this section are provided in
   order to demonstrate how one might implement a JSON-LD to RDF processor.
   Conformant implementations are only required to produce the same type and
-  number of statements during the output process and are not required to
+  number of quads during the output process and are not required to
   implement the algorithm exactly as described.</p>
 
 <section class="informative">
@@ -2166,7 +2129,7 @@
   <dl>
     <dt><tdef>graph name</tdef></dt>
     <dd>
-      A <ldtref>IRI</ldtref> or <ldtref>BlankNode</ldtref> used to identify statements belonging to a
+      A <ldtref>IRI</ldtref> or <ldtref>BlankNode</ldtref> used to identify quads belonging to a
       <em>named graph</em>.
     </dd>
   </dl>
@@ -2333,7 +2296,7 @@
     <li>Construct <em>graphs</em> as a <tref>JSON object</tref> containing <em>defaultGraph</em>
       identified by
       an empty <tref>string</tref>.</li>
-    <li>For each statement in <em>input</em>:
+    <li>For each quad in <em>input</em>:
       <ol class="algorithm">
         <li>Set <em>graph</em> to the entry in <em>graphs</em> identified
           by <em>name</em>, initializing it to a new entry using the mechanism
@@ -2344,7 +2307,7 @@
           <em>object</em> in expanded form, as described in
           <a href="#value-expansion">Value Expansion</a>. Add the
           resulting <em>object representation</em> to the entry indexed by
-          <em>first</em>, and skip to the next statement.</li>
+          <em>first</em>, and skip to the next quad.</li>
         <li>If <em>property</em> is <code>rdf:rest</code>:
           <ol class="algorithm">
             <li>If <em>object</em> is a <a>BlankNode</a>, use the entry in
@@ -2352,7 +2315,7 @@
               to a new <tref>JSON object</tref> if necessary. Add the <em>nominalValue</em> of
               <em>object</em> to the entry indexed by <em>rest</em>.
             </li>
-            <li>Skip to the next statement.</li>
+            <li>Skip to the next quad.</li>
           </ol>
         </li>
         <li>If <em>name</em> is not <tref>null</tref>, and <em>defaultGraph.subjects</em>