Renamed some symbols for clarity