--- a/model/prov-n.html	Thu Mar 29 16:59:32 2012 -0400
+++ b/model/prov-n.html	Thu Mar 29 22:29:35 2012 +0100
@@ -1149,15 +1149,15 @@
 <div class="grammar">
 <span class="nonterminal">keyValuePairs</span> &nbsp;::= 
 <span class="name">(</span>
-    <span class="nonterminal">keyidentifier</span>
+    <span class="nonterminal">literal</span>
  <span class="name">,</span>
-<span class="nonterminal">validentifier</span>
+<span class="nonterminal">eidentifier</span>
     <span class="name">)</span>
 |
 <span class="name">(</span>
-  <span class="nonterminal">keyidentifier</span>
+  <span class="nonterminal">literal</span>
  <span class="name">,</span>
-<span class="nonterminal">validentifier</span>
+<span class="nonterminal">eidentifier</span>
 <span class="name">)</span>
   <span class="name">,</span>
 <span class="nonterminal">keyValuePairs</span>
@@ -1165,9 +1165,9 @@
 
   <div class="grammar">
 <span class="nonterminal">keySet</span> &nbsp;::= 
-    <span class="nonterminal">keyidentifier</span>
+    <span class="nonterminal">literal</span>
 |
-  <span class="nonterminal">keyidentifier</span>
+  <span class="nonterminal">literal</span>
  <span class="name">,</span>
 <span class="nonterminal">keySet</span>
 </div>
@@ -1254,7 +1254,6 @@
   <span class="name">{</span>
   <span class="nonterminal">keyValuePairs</span>
    <span class="name">}</span>
-<span class="nonterminal">validentifier</span>
 <span class="nonterminal">optional-attribute-values</span>
   <span class="name">)</span>
   <br>