diff --git a/src/adql/parser/grammar/adqlGrammar200.jj b/src/adql/parser/grammar/adqlGrammar200.jj
index bdcf299c73112fc3b3ebb19e26ff11a33b69e230..0f0ed3ab3befe0e2e04ec3083eb3c6aba2ac3507 100644
--- a/src/adql/parser/grammar/adqlGrammar200.jj
+++ b/src/adql/parser/grammar/adqlGrammar200.jj
@@ -1234,7 +1234,7 @@ GeometryFunction GeometryFunction(): {Token fct=null, end; GeometryValue<Geometr
 }
 
 ADQLOperand CoordinateSystem(): { ADQLOperand coordSys=null;}{
-	coordSys=StringExpression()
+	coordSys=String()
 	{ return coordSys; }
 }
 
diff --git a/src/adql/parser/grammar/adqlGrammar201.jj b/src/adql/parser/grammar/adqlGrammar201.jj
index 99f071836d33ccaffa51fd1bc274c4d177d84ee5..9626e427fd06e43ad48356b1dbe2da4d84d62dc1 100644
--- a/src/adql/parser/grammar/adqlGrammar201.jj
+++ b/src/adql/parser/grammar/adqlGrammar201.jj
@@ -31,7 +31,7 @@
 * ParseException is thrown.
 *
 * Author:  Gr&eacute;gory Mantelet (CDS)
-* Version: 2.0 (04/2020)
+* Version: 2.0 (06/2020)
 */
 
 							/* ########### */
@@ -107,7 +107,7 @@ import adql.query.operand.function.geometry.GeometryFunction.GeometryValue;
  * @see ADQLParser
  *
  * @author Gr&eacute;gory Mantelet (CDS)
- * @version 2.0 (04/2020)
+ * @version 2.0 (06/2020)
  * @since 2.0
  */
 public class ADQLGrammar201 extends ADQLGrammarBase {
@@ -1345,7 +1345,7 @@ DistanceFunction DistanceFunction2(): { Token fct=null, end=null; DistanceFuncti
 }
 
 ADQLOperand CoordinateSystem(): { ADQLOperand coordSys=null;}{
-	coordSys=StringExpression()
+	coordSys=String()
 	{ return coordSys; }
 }