Class name refactoring