diff --git a/ONAP-SDK-APP/src/main/resources/portal.properties b/ONAP-SDK-APP/src/main/resources/portal.properties
index 2ab096f..30cbf0f 100644
--- a/ONAP-SDK-APP/src/main/resources/portal.properties
+++ b/ONAP-SDK-APP/src/main/resources/portal.properties
@@ -43,10 +43,10 @@
 portal.api.impl.class = org.openecomp.portalapp.service.OnBoardingApiServiceImpl
 
 # CSP Global Log On for single sign on
-onap_redirect_url = todo_csp_global_logon
+ecomp_redirect_url = todo_csp_global_logon
 
 # URL of the ONAP Portal REST API
-onap_rest_url = todo_Onap_rest_url
+ecomp_rest_url = todo_Onap_rest_url
 
 # Applications do not need to run a UEB listener in 1610.  
 ueb_listeners_enable = false
@@ -58,7 +58,7 @@
 # UEB servers
 ueb_url_list = todo_ueb_list
 # ONAP Portal listens on this UEB topic
-onap_portal_inbox_name = ONAP-PORTAL-INBOX-TEST-DEMETER
+ecomp_portal_inbox_name = ONAP-PORTAL-INBOX-TEST-DEMETER
 # Replace these 3 default values with the ones for your specific App,
 # as shown on the on-boarding page on the ONAP Portal web application.
 ueb_app_key = ZOicEniw7BWDL1pM
diff --git a/ONAP-SDK-APP/src/main/webapp/WEB-INF/conf/system.properties b/ONAP-SDK-APP/src/main/webapp/WEB-INF/conf/system.properties
index 991cb8a..aa8ee14 100644
--- a/ONAP-SDK-APP/src/main/webapp/WEB-INF/conf/system.properties
+++ b/ONAP-SDK-APP/src/main/webapp/WEB-INF/conf/system.properties
@@ -50,7 +50,7 @@
 my_login_feed_output_dir      = /tmp/MyLogins
 
 # ONAP Portal Shared Context REST API URL
-onap_shared_context_rest_url= todo_shared_context_url
+ecomp_shared_context_rest_url= todo_shared_context_url
 
 # Link shown in Help menu
 contact_us_link = todo_Contact_link