Dvogonen/590 rename things in companion

Partial fix for #590 (Companion part, radio also needs to be changed)