Fixed capitalization inconsistensies with Android guidelines.

Fixes #673