Refactored form generator to have consistent naming of bindings
throughout