Fixed ambiguous names in `keyboard`