Renamed Variables

To meet Android code specs