Renamed some private members for consistency