Refactor class name