Renamed CorrId mutators to IdMutator
Partially replaced usage of IdForCorrelation header internally
Setting the Id now also sets the CorrId, IdForCorrelation returns Id for backward compatibility