Companion renaming done for now.
Merge pull request #603 from opentx/dvogonen/590_next_Companion_Rename

Companion renaming done for now.