Fixed form names

We missed these. All tests pass.