Refactor by renaming