[OE-3987] fixed model names and refactored use of $form->radioButtons()