Fix namespacing issues

Everything should be namespaced anyway. I fixed that.