Rename and move around controller information for submit_application step