fix names
Merge branch 'hotfix/fix_names'

* hotfix/fix_names:
  fix names