Renamed some objects to make the code cleared