Merge branch 'hotfix/fix_names' into develop

* hotfix/fix_names:
  fix names
fix forms
Merge branch 'release/0.2.2'

* release/0.2.2:
  fix forms