class name refactor