change the form names to match model