Refactoring class names to be more intelligible