Finish replacement of _s => radio