correct class names
Merge branch 'hotfix/0.1.4'