#372 CR response, revert class name