Capitalisation according to Android guidelines

Not all updated capitalisations were correct.
Merge pull request #1554 from thoughtbox/patch-8

Capitalisation according to Android guidelines