Renamed class member variables to be consistent with STAR styles