--- a/rdf-turtle/turtle-bnf.html	Wed Apr 25 17:00:33 2012 -0700
+++ b/rdf-turtle/turtle-bnf.html	Mon Apr 30 18:13:28 2012 -0700
@@ -1,5 +1,5 @@
 <table class="grammar">
-    <tbody>
+    <tbody class="grammar-productions">
             <tr id="grammar-production-turtleDoc" data-grammar-original="[1] turtleDoc ::= (statement)*" data-grammar-expression="(&#x27;*&#x27;, (&#x27;id&#x27;, &#x27;statement&#x27;))" >
     <td>[1]<td>
     <td><code>turtleDoc</code><td>
@@ -18,17 +18,17 @@
     <td>::=</td>
     <td>(<a href='#grammar-production-prefixID'>prefixID</a> <code>|</code> <a href='#grammar-production-base'>base</a>)</td>
 </tr>
-            <tr id="grammar-production-prefixID" data-grammar-original="[4] prefixID ::= PREFIX PNAME_NS IRI_REF" data-grammar-expression="(&#x27;,&#x27;, [(&#x27;id&#x27;, &#x27;PREFIX&#x27;), (&#x27;id&#x27;, &#x27;PNAME_NS&#x27;), (&#x27;id&#x27;, &#x27;IRI_REF&#x27;)])" >
+            <tr id="grammar-production-prefixID" data-grammar-original="[4] prefixID ::= PREFIX PNAME_NS IRIREF" data-grammar-expression="(&#x27;,&#x27;, [(&#x27;id&#x27;, &#x27;PREFIX&#x27;), (&#x27;id&#x27;, &#x27;PNAME_NS&#x27;), (&#x27;id&#x27;, &#x27;IRIREF&#x27;)])" >
     <td>[4]<td>
     <td><code>prefixID</code><td>
     <td>::=</td>
-    <td><a href='#grammar-production-PREFIX'>PREFIX</a> <a href='#grammar-production-PNAME_NS'>PNAME_NS</a> <a href='#grammar-production-IRI_REF'>IRI_REF</a></td>
+    <td><a href='#grammar-production-PREFIX'>PREFIX</a> <a href='#grammar-production-PNAME_NS'>PNAME_NS</a> <a href='#grammar-production-IRIREF'>IRIREF</a></td>
 </tr>
-            <tr id="grammar-production-base" data-grammar-original="[5] base ::= BASE IRI_REF" data-grammar-expression="(&#x27;,&#x27;, [(&#x27;id&#x27;, &#x27;BASE&#x27;), (&#x27;id&#x27;, &#x27;IRI_REF&#x27;)])" >
+            <tr id="grammar-production-base" data-grammar-original="[5] base ::= BASE IRIREF" data-grammar-expression="(&#x27;,&#x27;, [(&#x27;id&#x27;, &#x27;BASE&#x27;), (&#x27;id&#x27;, &#x27;IRIREF&#x27;)])" >
     <td>[5]<td>
     <td><code>base</code><td>
     <td>::=</td>
-    <td><a href='#grammar-production-BASE'>BASE</a> <a href='#grammar-production-IRI_REF'>IRI_REF</a></td>
+    <td><a href='#grammar-production-BASE'>BASE</a> <a href='#grammar-production-IRIREF'>IRIREF</a></td>
 </tr>
             <tr id="grammar-production-triples" data-grammar-original="[6] triples ::= subject predicateObjectList" data-grammar-expression="(&#x27;,&#x27;, [(&#x27;id&#x27;, &#x27;subject&#x27;), (&#x27;id&#x27;, &#x27;predicateObjectList&#x27;)])" >
     <td>[6]<td>
@@ -54,23 +54,23 @@
     <td>::=</td>
     <td>(<a href='#grammar-production-predicate'>predicate</a> <code>|</code> '<code class='grammar-literal'>a</code>')</td>
 </tr>
-            <tr id="grammar-production-subject" data-grammar-original="[10] subject ::= IRIref| blank" data-grammar-expression="(&#x27;|&#x27;, [(&#x27;id&#x27;, &#x27;IRIref&#x27;), (&#x27;id&#x27;, &#x27;blank&#x27;)])" >
+            <tr id="grammar-production-subject" data-grammar-original="[10] subject ::= iri| blank" data-grammar-expression="(&#x27;|&#x27;, [(&#x27;id&#x27;, &#x27;iri&#x27;), (&#x27;id&#x27;, &#x27;blank&#x27;)])" >
     <td>[10]<td>
     <td><code>subject</code><td>
     <td>::=</td>
-    <td>(<a href='#grammar-production-IRIref'>IRIref</a> <code>|</code> <a href='#grammar-production-blank'>blank</a>)</td>
+    <td>(<a href='#grammar-production-iri'>iri</a> <code>|</code> <a href='#grammar-production-blank'>blank</a>)</td>
 </tr>
-            <tr id="grammar-production-predicate" data-grammar-original="[11] predicate ::= IRIref" data-grammar-expression="(&#x27;id&#x27;, &#x27;IRIref&#x27;)" >
+            <tr id="grammar-production-predicate" data-grammar-original="[11] predicate ::= iri" data-grammar-expression="(&#x27;id&#x27;, &#x27;iri&#x27;)" >
     <td>[11]<td>
     <td><code>predicate</code><td>
     <td>::=</td>
-    <td><a href='#grammar-production-IRIref'>IRIref</a></td>
+    <td><a href='#grammar-production-iri'>iri</a></td>
 </tr>
-            <tr id="grammar-production-object" data-grammar-original="[12] object ::= IRIref| blank| literal" data-grammar-expression="(&#x27;|&#x27;, [(&#x27;id&#x27;, &#x27;IRIref&#x27;), (&#x27;id&#x27;, &#x27;blank&#x27;), (&#x27;id&#x27;, &#x27;literal&#x27;)])" >
+            <tr id="grammar-production-object" data-grammar-original="[12] object ::= iri| blank| literal" data-grammar-expression="(&#x27;|&#x27;, [(&#x27;id&#x27;, &#x27;iri&#x27;), (&#x27;id&#x27;, &#x27;blank&#x27;), (&#x27;id&#x27;, &#x27;literal&#x27;)])" >
     <td>[12]<td>
     <td><code>object</code><td>
     <td>::=</td>
-    <td>(<a href='#grammar-production-IRIref'>IRIref</a> <code>|</code> <a href='#grammar-production-blank'>blank</a> <code>|</code> <a href='#grammar-production-literal'>literal</a>)</td>
+    <td>(<a href='#grammar-production-iri'>iri</a> <code>|</code> <a href='#grammar-production-blank'>blank</a> <code>|</code> <a href='#grammar-production-literal'>literal</a>)</td>
 </tr>
             <tr id="grammar-production-literal" data-grammar-original="[13] literal ::= RDFLiteral| NumericLiteral| BooleanLiteral" data-grammar-expression="(&#x27;|&#x27;, [(&#x27;id&#x27;, &#x27;RDFLiteral&#x27;), (&#x27;id&#x27;, &#x27;NumericLiteral&#x27;), (&#x27;id&#x27;, &#x27;BooleanLiteral&#x27;)])" >
     <td>[13]<td>
@@ -96,11 +96,11 @@
     <td>::=</td>
     <td>'<code class='grammar-literal'>(</code>' (<a href='#grammar-production-object'>object</a>)<code class='grammar-star'>*</code> '<code class='grammar-literal'>)</code>'</td>
 </tr>
-            <tr id="grammar-production-RDFLiteral" data-grammar-original="[60s] RDFLiteral ::= String ( LANGTAG | ( &quot;^^&quot; IRIref ) )?" data-grammar-expression="(&#x27;,&#x27;, [(&#x27;id&#x27;, &#x27;String&#x27;), (&#x27;?&#x27;, (&#x27;|&#x27;, [(&#x27;id&#x27;, &#x27;LANGTAG&#x27;), (&#x27;,&#x27;, [(&quot;&#x27;&quot;, &#x27;^^&#x27;), (&#x27;id&#x27;, &#x27;IRIref&#x27;)])]))])" >
+            <tr id="grammar-production-RDFLiteral" data-grammar-original="[60s] RDFLiteral ::= String ( LANGTAG | ( &quot;^^&quot; iri ) )?" data-grammar-expression="(&#x27;,&#x27;, [(&#x27;id&#x27;, &#x27;String&#x27;), (&#x27;?&#x27;, (&#x27;|&#x27;, [(&#x27;id&#x27;, &#x27;LANGTAG&#x27;), (&#x27;,&#x27;, [(&quot;&#x27;&quot;, &#x27;^^&#x27;), (&#x27;id&#x27;, &#x27;iri&#x27;)])]))])" >
     <td>[60s]<td>
     <td><code>RDFLiteral</code><td>
     <td>::=</td>
-    <td><a href='#grammar-production-String'>String</a> ((<a href='#grammar-production-LANGTAG'>LANGTAG</a> <code>|</code> '<code class='grammar-literal'>^^</code>' <a href='#grammar-production-IRIref'>IRIref</a>))?</td>
+    <td><a href='#grammar-production-String'>String</a> ((<a href='#grammar-production-LANGTAG'>LANGTAG</a> <code>|</code> '<code class='grammar-literal'>^^</code>' <a href='#grammar-production-iri'>iri</a>))?</td>
 </tr>
             <tr id="grammar-production-NumericLiteral" data-grammar-original="[61s] NumericLiteral ::= NumericLiteralUnsigned| NumericLiteralPositive| NumericLiteralNegative" data-grammar-expression="(&#x27;|&#x27;, [(&#x27;id&#x27;, &#x27;NumericLiteralUnsigned&#x27;), (&#x27;id&#x27;, &#x27;NumericLiteralPositive&#x27;), (&#x27;id&#x27;, &#x27;NumericLiteralNegative&#x27;)])" >
     <td>[61s]<td>
@@ -138,11 +138,11 @@
     <td>::=</td>
     <td>(<a href='#grammar-production-STRING_LITERAL1'>STRING_LITERAL1</a> <code>|</code> <a href='#grammar-production-STRING_LITERAL2'>STRING_LITERAL2</a> <code>|</code> <a href='#grammar-production-STRING_LITERAL_LONG1'>STRING_LITERAL_LONG1</a> <code>|</code> <a href='#grammar-production-STRING_LITERAL_LONG2'>STRING_LITERAL_LONG2</a>)</td>
 </tr>
-            <tr id="grammar-production-IRIref" data-grammar-original="[67s] IRIref ::= IRI_REF| PrefixedName" data-grammar-expression="(&#x27;|&#x27;, [(&#x27;id&#x27;, &#x27;IRI_REF&#x27;), (&#x27;id&#x27;, &#x27;PrefixedName&#x27;)])" >
+            <tr id="grammar-production-iri" data-grammar-original="[67s] iri ::= IRIREF| PrefixedName" data-grammar-expression="(&#x27;|&#x27;, [(&#x27;id&#x27;, &#x27;IRIREF&#x27;), (&#x27;id&#x27;, &#x27;PrefixedName&#x27;)])" >
     <td>[67s]<td>
-    <td><code>IRIref</code><td>
+    <td><code>iri</code><td>
     <td>::=</td>
-    <td>(<a href='#grammar-production-IRI_REF'>IRI_REF</a> <code>|</code> <a href='#grammar-production-PrefixedName'>PrefixedName</a>)</td>
+    <td>(<a href='#grammar-production-IRIREF'>IRIREF</a> <code>|</code> <a href='#grammar-production-PrefixedName'>PrefixedName</a>)</td>
 </tr>
             <tr id="grammar-production-PrefixedName" data-grammar-original="[68s] PrefixedName ::= PNAME_LN| PNAME_NS" data-grammar-expression="(&#x27;|&#x27;, [(&#x27;id&#x27;, &#x27;PNAME_LN&#x27;), (&#x27;id&#x27;, &#x27;PNAME_NS&#x27;)])" >
     <td>[68s]<td>
@@ -156,6 +156,8 @@
     <td>::=</td>
     <td>(<a href='#grammar-production-BLANK_NODE_LABEL'>BLANK_NODE_LABEL</a> <code>|</code> <a href='#grammar-production-ANON'>ANON</a>)</td>
 </tr>
+    </tbody>
+    <tbody class="grammar-terminals">
             <tr id="grammar-production-BASE" data-grammar-original="[17] BASE ::= &quot;@base&quot;" data-grammar-expression="(&quot;&#x27;&quot;, &#x27;@base&#x27;)" class='grammar-token'>
     <td>[17]<td>
     <td><code>BASE</code><td>
@@ -168,9 +170,9 @@
     <td>::=</td>
     <td>'<code class='grammar-literal'>@prefix</code>'</td>
 </tr>
-            <tr id="grammar-production-IRI_REF" data-grammar-original="[70s] IRI_REF ::= &quot;&lt;&quot; ( [^&lt;&gt;\&quot;{}|^`\\] - [#x00-#x20] | UCHAR )* &quot;&gt;&quot;" data-grammar-expression="(&#x27;,&#x27;, [(&quot;&#x27;&quot;, &#x27;&lt;&#x27;), (&#x27;*&#x27;, (&#x27;|&#x27;, [(&#x27;-&#x27;, [(&#x27;[&#x27;, &#x27;^&lt;&gt;\\&quot;{}|^`\\\\&#x27;), (&#x27;[&#x27;, &#x27;#x00-#x20&#x27;)]), (&#x27;id&#x27;, &#x27;UCHAR&#x27;)])), (&quot;&#x27;&quot;, &#x27;&gt;&#x27;)])" class='grammar-token'>
+            <tr id="grammar-production-IRIREF" data-grammar-original="[70s] IRIREF ::= &quot;&lt;&quot; ( [^&lt;&gt;\&quot;{}|^`\\] - [#x00-#x20] | UCHAR )* &quot;&gt;&quot;" data-grammar-expression="(&#x27;,&#x27;, [(&quot;&#x27;&quot;, &#x27;&lt;&#x27;), (&#x27;*&#x27;, (&#x27;|&#x27;, [(&#x27;-&#x27;, [(&#x27;[&#x27;, &#x27;^&lt;&gt;\\&quot;{}|^`\\\\&#x27;), (&#x27;[&#x27;, &#x27;#x00-#x20&#x27;)]), (&#x27;id&#x27;, &#x27;UCHAR&#x27;)])), (&quot;&#x27;&quot;, &#x27;&gt;&#x27;)])" class='grammar-token'>
     <td>[70s]<td>
-    <td><code>IRI_REF</code><td>
+    <td><code>IRIREF</code><td>
     <td>::=</td>
     <td>'<code class='grammar-literal'>&lt;</code>' (([<code class='grammar-chars'>^<>\"{}|^`\\</code>]<code class='grammar-diff'>-</code>[<code class='grammar-chars'>#x00-#x20</code>] <code>|</code> <a href='#grammar-production-UCHAR'>UCHAR</a>))<code class='grammar-star'>*</code> '<code class='grammar-literal'>&gt;</code>'</td>
 </tr>

--- a/rdf-turtle/turtle.bnf	Wed Apr 25 17:00:33 2012 -0700
+++ b/rdf-turtle/turtle.bnf	Mon Apr 30 18:13:28 2012 -0700
@@ -4,9 +4,9 @@
  | triples "." 
 [3] directive ::= prefixID 
  | base 
-[4] prefixID ::= PREFIX PNAME_NS IRI_REF 
+[4] prefixID ::= PREFIX PNAME_NS IRIREF 
  
-[5] base ::= BASE IRI_REF 
+[5] base ::= BASE IRIREF 
  
 [6] triples ::= subject predicateObjectList 
  
@@ -16,11 +16,11 @@
  
 [9] verb ::= predicate 
  | "a" 
-[10] subject ::= IRIref 
+[10] subject ::= iri 
  | blank 
-[11] predicate ::= IRIref 
+[11] predicate ::= iri 
  
-[12] object ::= IRIref 
+[12] object ::= iri 
  | blank 
  | literal 
 [13] literal ::= RDFLiteral 
@@ -33,7 +33,7 @@
  
 [16] collection ::= "(" object* ")" 
  
-[60s] RDFLiteral ::= String ( LANGTAG | ( "^^" IRIref ) )? 
+[60s] RDFLiteral ::= String ( LANGTAG | ( "^^" iri ) )? 
  
 [61s] NumericLiteral ::= NumericLiteralUnsigned 
  | NumericLiteralPositive 
@@ -53,7 +53,7 @@
  | STRING_LITERAL2 
  | STRING_LITERAL_LONG1 
  | STRING_LITERAL_LONG2 
-[67s] IRIref ::= IRI_REF 
+[67s] iri ::= IRIREF 
  | PrefixedName 
 [68s] PrefixedName ::= PNAME_LN 
  | PNAME_NS 
@@ -66,7 +66,7 @@
  
 [18] PREFIX ::= "@prefix" 
 
-[70s] IRI_REF ::= "<" ( [^<>\"{}|^`\\] - [#x00-#x20] | UCHAR )* ">" 
+[70s] IRIREF ::= "<" ( [^<>\"{}|^`\\] - [#x00-#x20] | UCHAR )* ">" 
  
 [71s] PNAME_NS ::= (PN_PREFIX)? ":"