Small renaming refactoring