Oops, missed 2 renames