rename Generator to CodeGenerator