Refactor generator class name