--- a/rdf-turtle/turtle.bnf	Sat Jun 16 09:28:27 2012 -0700
+++ b/rdf-turtle/turtle.bnf	Sat Jun 16 09:41:01 2012 -0700
@@ -39,10 +39,10 @@
  
 [133s] BooleanLiteral ::= "true" 
  | "false" 
-[134s] String ::= STRING_LITERAL1 
- | STRING_LITERAL2 
- | STRING_LITERAL_LONG1 
- | STRING_LITERAL_LONG2 
+[18] String ::= STRING_LITERAL_QUOTE 
+ | STRING_LITERAL_SINGLE_QUOTE 
+ | STRING_LITERAL_LONG_SINGLE_QUOTE 
+ | STRING_LITERAL_LONG_QUOTE 
 [135s] iri ::= IRIREF 
  | PrefixedName 
 [136s] PrefixedName ::= PNAME_LN 
@@ -52,7 +52,7 @@
 
 @terminals
 
-[18] IRIREF ::=  '<' ([^#x00-#x20<>\"{}|^`\] | UCHAR)* '>'
+[19] IRIREF ::=  '<' ([^#x00-#x20<>\"{}|^`\] | UCHAR)* '>'
  
 [139s] PNAME_NS ::= PN_PREFIX? ":" 
  
@@ -69,13 +69,13 @@
   
 [154s] EXPONENT ::= [eE] [+-]? [0-9]+ 
  
-[23] STRING_LITERAL1 ::= '"' ( [^#x22#x5C#xA#xD] | ECHAR | UCHAR )* '"' 
+[23] STRING_LITERAL_QUOTE ::= '"' ( [^#x22#x5C#xA#xD] | ECHAR | UCHAR )* '"' 
  
-[24] STRING_LITERAL2 ::= "'" ( [^#x27#x5C#xA#xD] | ECHAR | UCHAR )* "'" 
+[24] STRING_LITERAL_SINGLE_QUOTE ::= "'" ( [^#x27#x5C#xA#xD] | ECHAR | UCHAR )* "'" 
  
-[25] STRING_LITERAL_LONG1 ::= "'''" ( ( "'" | "''" )? ( [^'\] | ECHAR | UCHAR ) )* "'''" 
+[25] STRING_LITERAL_LONG_SINGLE_QUOTE ::= "'''" ( ( "'" | "''" )? ( [^'\] | ECHAR | UCHAR ) )* "'''" 
  
-[26] STRING_LITERAL_LONG2 ::= '"""' ( ( '"' | '""' )? ( [^"\] | ECHAR | UCHAR ) )* '"""' 
+[26] STRING_LITERAL_LONG_QUOTE ::= '"""' ( ( '"' | '""' )? ( [^"\] | ECHAR | UCHAR ) )* '"""' 
  
 [27] UCHAR ::= ( "\u" HEX HEX HEX HEX ) 
  | ( "\U" HEX HEX HEX HEX HEX HEX HEX HEX )