Revert some unnecessary changes, rename class.