Revert accidental renames