Fixed ambiguous names in `keyboard`
Merge pull request #151 from bvssvni/master

Fixed ambiguous names in `keyboard`