Renamed private fields to adhere to existing naming standards