renaming in a consistent manner