Rename package to be less collision-prone