Moved renamedDiag to cpp