Generalized names

So as to accommodate the change from radio inputs to selects as well
Output a <select> and <options> instead of radio buttons