Rename generator identifiers, because package is a reserved keyword