refactoring: renamed class