Namespacing issues

Had this bug. I fix!