minor class name refactoring