Changed the namespace and modified other stuff

The namespace has been changed to one that is importable, and I have
renamed some variables.