Trying to fix mismatched namespaces
fixed lots of issues caused by a search and replace for namespace