Renames forms to be more consistent, fixes #30