use the normalized method names
rename to the form blocks as form
sorts the templates to be a little cleaner