Renaming SourceGrammar to Grammar and similarly for some related types