class name refactoring commit again