forms: name consistancy fix

refs #13149
base: form wizard tweaks to the base template

refs #13149