Fixed radio button names
Merge remote-tracking branch 'origin/Sam'