refactore class name