Clean up xtext grammar naming