Change naming scheme for generated code.
Fixed parsing errors.