Unify Form control names