AndroidProject: Use more consistent variable naming