Refactoring: Rename radio buttons