Rename package to avoid confusion