Refactored redundant class names