Minor rename refactoring