More renaming shenanigans