Capitalisation according to Android guidelines

Not all updated capitalisations were correct.