Fixed the form input naming convention