fixed spelling errors, added consistency with ios version
Merge branch 'hotfix/v2.0.1'