Refactoring: rename control