Refactoring names of class for better readability