Renamed some stuff to make it easier to read.