some more renames after the merge