# AAF related system properties
aaf_locate_url=https://${env:AAF_HOST}:8095
-aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/AAF_NS.introspect:2.1/introspect
-aaf_oauth2_token_url=https://AAF_LOCATE_URL/AAF_NS.token:2.1/token
-aaf_url=https://AAF_LOCATE_URL/AAF_NS.service:2.1
+aaf_oauth2_introspect_url=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.introspect:2.1/introspect
+aaf_oauth2_token_url=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.token:2.1/token
+aaf_url=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.service:2.1
aaf_env=DEV
cadi_protocols=TLSv1.1,TLSv1.2
cadi_truststore=${env:POLICY_HOME}/etc/ssl/policy-truststore
cadi_truststore_password=${env:TRUSTSTORE_PASSWD}
-cm_url=https://AAF_LOCATE_URL/AAF_NS.cm:2.1
+cm_url=https://AAF_LOCATE_URL/onap.org.osaaf.aaf.cm:2.1