Renamed some private fields / functions