Major class name refactoring