-aaf_oauth2_introspect_url=https://aaf-onap-test.osaaf.org:8095/AAF_NS.introspect:2.1/introspect
-aaf_oauth2_token_url=https://aaf-onap-test.osaaf.org:8095/AAF_NS.token:2.1/token
-fs_url=https://aaf-onap-test.osaaf.org:8095/AAF_NS.fs.2.1
-gui_url=https://aaf-onap-test.osaaf.org:8095/AAF_NS.gui.2.1
+aaf_oauth2_introspect_url=https://aaf-onap-test.osaaf.org:8095/onap.org.osaaf.aaf.introspect:2.1/introspect
+aaf_oauth2_token_url=https://aaf-onap-test.osaaf.org:8095/onap.org.osaaf.aaf.token:2.1/token
+fs_url=https://aaf-onap-test.osaaf.org:8095/onap.org.osaaf.aaf.fs.2.1
+gui_url=https://aaf-onap-test.osaaf.org:8095/onap.org.osaaf.aaf.gui.2.1