changed namespace (this will probably break the package for a while)