revert some name changes