NameSpace fixes

fixed some errors from changing the namespaces around.