refactoing class name