Refactor main class name