I have the same problem when testing.  If we rename the package, it's going to be a pain anyway, so I'm okay with this.