Replace ecomp references

Issue-ID: PORTAL-19

Remove ecomp trademark

Change-Id: I76311f2ab10b2c0d406415ea2f922d1aad993e21
Signed-off-by: Hima Elisetty <hbindu@research.att.com>
diff --git a/deliveries/properties_simpledemo/ONAPPORTAL/fusion.properties b/deliveries/properties_simpledemo/ONAPPORTAL/fusion.properties
index 7f2980e..f618295 100644
--- a/deliveries/properties_simpledemo/ONAPPORTAL/fusion.properties
+++ b/deliveries/properties_simpledemo/ONAPPORTAL/fusion.properties
@@ -19,7 +19,7 @@
 business_direct_menu_set_name        = BD
 business_direct_menu_attribute_name  = businessDirectMenuData
 
-# ECOMP settings
+# ONAP settings
 ecomp_app_id = 1
 # Role settings
 sys_admin_role_id = 1
diff --git a/deliveries/properties_simpledemo/ONAPPORTAL/logback.xml b/deliveries/properties_simpledemo/ONAPPORTAL/logback.xml
index c8bb577..7ce2093 100644
--- a/deliveries/properties_simpledemo/ONAPPORTAL/logback.xml
+++ b/deliveries/properties_simpledemo/ONAPPORTAL/logback.xml
@@ -34,7 +34,7 @@
  
   ============LICENSE_END============================================
  
-  ECOMP is a trademark and service mark of AT&T Intellectual Property.
+  
   -->
 
 <!DOCTYPE xml>
diff --git a/deliveries/properties_simpledemo/ONAPPORTAL/portal.properties b/deliveries/properties_simpledemo/ONAPPORTAL/portal.properties
index 601a4d7..c124eba 100644
--- a/deliveries/properties_simpledemo/ONAPPORTAL/portal.properties
+++ b/deliveries/properties_simpledemo/ONAPPORTAL/portal.properties
@@ -7,7 +7,7 @@
 # for single sign on
 ecomp_redirect_url = http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm
 
-# URL of the ECOMP Portal REST API
+# URL of the ONAP Portal REST API
 ecomp_rest_url = http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/auxapi
 
 ueb_listeners_enable = true
diff --git a/deliveries/properties_simpledemo/ONAPPORTAL/system.properties b/deliveries/properties_simpledemo/ONAPPORTAL/system.properties
index 0ef45a1..c16c490 100644
--- a/deliveries/properties_simpledemo/ONAPPORTAL/system.properties
+++ b/deliveries/properties_simpledemo/ONAPPORTAL/system.properties
@@ -48,7 +48,7 @@
 
 
 # An Unqiue 128-bit value defined to indentify a specific version of
-# ECOMP Portal deployed on a specific virtual machine.
+# ONAP Portal deployed on a specific virtual machine.
 # This value must be generated and updated at the time of 
 # the deployment.
 # Online Unique UUID generator - https://www.uuidgenerator.net/
diff --git a/deliveries/properties_simpledemo/ONAPPORTALSDK/logback.xml b/deliveries/properties_simpledemo/ONAPPORTALSDK/logback.xml
index 8daf2cc..a299a5e 100644
--- a/deliveries/properties_simpledemo/ONAPPORTALSDK/logback.xml
+++ b/deliveries/properties_simpledemo/ONAPPORTALSDK/logback.xml
@@ -34,7 +34,7 @@
  
   ============LICENSE_END============================================
  
-  ECOMP is a trademark and service mark of AT&T Intellectual Property.
+  
   -->
 
 <configuration scan="true" scanPeriod="3 seconds" debug="true">
diff --git a/deliveries/properties_simpledemo/ONAPPORTALSDK/system.properties b/deliveries/properties_simpledemo/ONAPPORTALSDK/system.properties
index c80d2f0..34cb7b5 100644
--- a/deliveries/properties_simpledemo/ONAPPORTALSDK/system.properties
+++ b/deliveries/properties_simpledemo/ONAPPORTALSDK/system.properties
@@ -53,7 +53,7 @@
 # An Unique 128-bit value defined to identify a specific version
 # of an application deployed on a specific virtual machine.
 # This value must be generated and updated by the application 
-# which is using the ECOMP SDK at the time of its deployment.
+# which is using the ONAP SDK at the time of its deployment.
 # Online Unique UUID generator - https://www.uuidgenerator.net/
 instance_uuid=8da691c9-987d-43ed-a358-00ac2f35685d