Fix class naming problem
Merge branch 'hotfix/2.0.3' into develop