change classnames to resolve conflicts
Merge branch 'hotfix/0.2.10'