Fixed form labels as per Troy's suggestion [MJ-975]

All tests pass.