Revert some renaming