CQL grammar: rename two terminals