Refactor old class name