Refactored long class names