Minor refactoring of input name handling

Refactored input name to code conversion into separate class, and move help for the values into the Usage message.