Codegen refactor - variable rename, submit missing parser file change, merge changes from upstream