Changed the names of the forms to more meaningful terms