Fix some variable prefixes.

Trying to standardise on the Android coding style.