Class naming refactored