Refactored main class name