Reverted renames.