--- a/spec/latest/index.html	Thu Sep 01 13:59:21 2011 +0200
+++ b/spec/latest/index.html	Thu Sep 01 14:18:15 2011 +0200
@@ -937,7 +937,7 @@
   <li>By using a native JSON datatype.</li>
 </ol>
 
-<p>The first form uses the <code>@coerce</code> keyword to express a
+<p>The first example uses the <code>@coerce</code> keyword to express a
 typed literal:</p>
 
 <pre class="example" data-transform="updateExample">
@@ -959,7 +959,7 @@
 -->
 </pre>
 
-<p>The second form uses the expanded form for specifying objects:</p>
+<p>The second example uses the expanded form for specifying objects:</p>
 
 <pre class="example" data-transform="updateExample">
 <!--
@@ -979,7 +979,7 @@
 <code>2010-05-29T14:17:39+02:00</code> and the datatype of
 <code>http://www.w3.org/2001/XMLSchema#dateTime</code>.</p>
 
-<p>The third form uses a built-in native JSON type, a
+<p>The third example uses a built-in native JSON type, a
   <tref>number</tref>, to express a datatype:</p>
 
 <pre class="example" data-transform="updateExample">
@@ -1094,8 +1094,8 @@
 <p>Expansion is the process of taking a JSON-LD document and applying a
 context such that all IRI, datatypes, and literal values are expanded so
 that the context is no longer necessary. JSON-LD document expansion
-is typically used as a part of the <a href="#normalization">Normalization</a>
-process.</p>
+is typically used as a part of <a href="#normalization">Framing</a> or
+<a href="#normalization">Normalization</a>.</p>
 
 <p>For example, assume the following JSON-LD input document:</p>
 
@@ -1699,8 +1699,8 @@
 </p>
 
 <section>
-<h3>JsonLDProcessor</h3>
-<dl title="[NoInterfaceObject] interface JsonLDProcessor" class="idl">
+<h3>JsonLdProcessor</h3>
+<dl title="[NoInterfaceObject] interface JsonLdProcessor" class="idl">
 
   <dt>object expand()</dt>
   <dd><a href="#expansion">Expands</a> the given <code>input</code>
@@ -1716,7 +1716,7 @@
      <dd>The JSON-LD object to copy and perform the expansion upon.</dd>
      <dt>object optional? context</dt>
      <dd>An external context to use additionally to the context embedded in <code>input</code> when expanding the <code>input</code>.</dd>
-     <dt>JsonLDProcessorCallback optional? callback</dt>
+     <dt>JsonLdProcessorCallback optional? callback</dt>
      <dd>A callback that is called whenever a processing error occurs on
      the <code>input</code>.</dd>
   </dl>
@@ -1733,7 +1733,7 @@
      <dd>The JSON-LD object to perform compaction on.</dd>
      <dt>object optional? context</dt>
      <dd>The base context to use when compacting the <code>input</code>.</dd>
-     <dt>JsonLDProcessorCallback optional? callback</dt>
+     <dt>JsonLdProcessorCallback optional? callback</dt>
      <dd>A callback that is called whenever a processing error occurs on
        the given <code>input</code>.</dd>
   </dl>
@@ -1755,7 +1755,7 @@
      <dd>The frame to use when re-arranging the data.</dd>
      <dt>object options</dt>
      <dd>A set of options that will affect the framing algorithm.</dd>
-     <dt>JsonLDProcessorCallback optional? callback</dt>
+     <dt>JsonLdProcessorCallback optional? callback</dt>
      <dd>A callback that is called whenever a processing error occurs on
      the given <code>input</code>.</dd>
   </dl>
@@ -1772,7 +1772,7 @@
      <dd>The JSON-LD object to perform normalization upon.</dd>
      <dt>object optional? context</dt>
      <dd>An external context to use additionally to the context embedded in <code>input</code> when expanding the <code>input</code>.</dd>
-     <dt>JsonLDProcessorCallback optional? callback</dt>
+     <dt>JsonLdProcessorCallback optional? callback</dt>
      <dd>A callback that is called whenever a processing error occurs on
      the given JSON-LD string.</dd>
   </dl>
@@ -1785,14 +1785,14 @@
   <dl class="parameters">
      <dt>object input</dt>
      <dd>The JSON-LD object to process when outputting triples.</dd>
-     <dt>JsonLDTripleCallback tripleCallback</dt>
+     <dt>JsonLdTripleCallback tripleCallback</dt>
      <dd>A callback that is called whenever a processing error occurs on
      the given <code>input</code>.
      <div class="issue">This callback should be aligned with the
        RDF API.</div></dd>
      <dt>object optional? context</dt>
      <dd>An external context to use additionally to the context embedded in <code>input</code> when expanding the <code>input</code>.</dd>
-     <dt>JsonLDProcessorCallback optional? parserCallback</dt>
+     <dt>JsonLdProcessorCallback optional? parserCallback</dt>
      <dd>A callback that is called whenever a processing error occurs on
      the given <code>input</code>.</dd>
   </dl>
@@ -1802,11 +1802,11 @@
 </section>
 
 <section>
-<h3>JsonLDProcessorCallback</h3>
-<p>The JsonLDProcessorCallback is called whenever a processing error occurs
+<h3>JsonLdProcessorCallback</h3>
+<p>The JsonLdProcessorCallback is called whenever a processing error occurs
 while processing the <tref>JSON-LD input</tref>.</p>
 
-<dl title="[NoInterfaceObject Callback] interface JsonLDProcessorCallback"
+<dl title="[NoInterfaceObject Callback] interface JsonLdProcessorCallback"
     class="idl">
 
   <dt>void error()</dt>
@@ -1820,11 +1820,11 @@
 </section>
 
 <section>
-<h3>JsonLDTripleCallback</h3>
-<p>The JsonLDTripleCallback is called whenever the processor generates a
+<h3>JsonLdTripleCallback</h3>
+<p>The JsonLdTripleCallback is called whenever the processor generates a
 triple during the <code>triple()</code> call.</p>
 
-<dl title="[NoInterfaceObject Callback] interface JsonLDTripleCallback"
+<dl title="[NoInterfaceObject Callback] interface JsonLdTripleCallback"
     class="idl">
 
   <dt>void triple()</dt>
@@ -3805,7 +3805,7 @@
   <p>
     This results in three triples being generated, each relating the subject to an individual
     object, with no inherent order.</p>
-  <p>To address this issue, RDF-based languages, such as [[TURTLE]]
+  <p>To preserve the order of the objects, RDF-based languages, such as [[TURTLE]]
     use the concept of an <code>rdf:List</code> (as described in [[RDF-SCHEMA]]). This uses a sequence
     of unlabeled nodes with properties describing a value, a null-terminated next property. Without
     specific syntactical support, this could be represented in JSON-LD as follows: