modal refactoring form names