Refactoring: rename (STOX-10)