Update namespaces based on PSA's feedback.