Renamed some stuff to make more sense