Refactored Class names