some more renames