revert Class refactor-rename