updated namespaces (partial)