Renamed some Correlator stuff

Renamed some Correlator stuff