Rename all operators in grammar to be more consistent