Fix some rotations to match name changes