refactor name of class