Rename correlator.
Merge pull request #147 from dmend/master

Renamed some Correlator stuff