Switched names of form-type classes