Refactoring: rename class