Renamed some things to be clearer again