fix form.types var names