fix refactor of form names