Renamed symbols to better convey their meaning