Revert class name changes