Naming correction to Johnny
Merge branch 'hotfix-keyword-name' into 1.0.1