few more renames