Use consistent naming for input methods

This will fix inconsistency in naming for input methods in menu
and keyboard name shown next to icon.

Bug: 50939
Merge pull request #220 from kartikm/50939

Use consistent naming for input methods