Renamed private fields to follow naming rules