Fix resolveNamespace