renaming consistency