Update field variable names to Android code style