Renamed some objects for easy reading