Companion renaming done for now.