Fix some borky renames after we lost them :D