I don't see the rationale for renaming this on import, is there a particular reason? Just curious, I don't want this to hold up the PR.