Refactored class naming