Revert import renaming