Fixed typo in interface name.
Fixed more typos.
Merge branch 'dev-hotfix/fix-typo' into dev