Change names of report classes, to be more consistent with the others.