Refactor some class name