small refactoring to class names