Minor refactoring of class name