Change form name and caption
Merge branch 'refactor'