fixing more namespaces