From be7a01eda7e4fb9f97a18009d727e6a0692e9399 Mon Sep 17 00:00:00 2001
From: "Lott, Christopher (cl778h)" <cl778h@att.com>
Date: Mon, 6 May 2019 11:19:06 -0400
Subject: [PATCH] Use O-RAN-SC

Also repair logback.xml file for new package name

Change-Id: Ib17524f891b3b97f7382dc545462e5a772b7a6f0
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>
---
 README.md                                                           | 2 +-
 a1-med-client/pom.xml                                               | 2 +-
 a1-med-client/src/main/resources/a1_mediator_0.3.0.yaml             | 2 +-
 .../portal/dashboard/a1med/client/test/A1MediatorClientTest.java    | 2 +-
 docs/release-notes.rst                                              | 3 ++-
 e2-mgr-client/pom.xml                                               | 2 +-
 e2-mgr-client/src/main/resources/e2_manager_02052019.yaml           | 2 +-
 e2-mgr-client/src/main/resources/e2_manager_02052019_2.yaml         | 2 +-
 e2-mgr-client/src/main/resources/e2_mgr_rest_api_v0_0_1.yaml        | 2 +-
 .../ric/portal/dashboard/e2mgr/client/test/E2ManagerClientTest.java | 2 +-
 pom.xml                                                             | 4 ++--
 webapp-backend/pom.xml                                              | 4 +---
 .../java/org/oransc/ric/portal/dashboard/DashboardApplication.java  | 2 +-
 .../java/org/oransc/ric/portal/dashboard/DashboardConstants.java    | 2 +-
 .../oransc/ric/portal/dashboard/config/A1MediatorConfiguration.java | 2 +-
 .../ric/portal/dashboard/config/A1MediatorMockConfiguration.java    | 2 +-
 .../oransc/ric/portal/dashboard/config/E2ManagerConfiguration.java  | 2 +-
 .../ric/portal/dashboard/config/E2ManagerMockConfiguration.java     | 2 +-
 .../oransc/ric/portal/dashboard/config/SwaggerConfiguration.java    | 4 ++--
 .../ric/portal/dashboard/config/XappManagerConfiguration.java       | 2 +-
 .../ric/portal/dashboard/config/XappManagerMockConfiguration.java   | 2 +-
 .../ric/portal/dashboard/controller/A1MediationController.java      | 2 +-
 .../oransc/ric/portal/dashboard/controller/E2ManagerController.java | 2 +-
 .../ric/portal/dashboard/controller/SimpleErrorController.java      | 2 +-
 .../ric/portal/dashboard/controller/XappManagerController.java      | 2 +-
 .../java/org/oransc/ric/portal/dashboard/model/DelayTransport.java  | 2 +-
 .../java/org/oransc/ric/portal/dashboard/model/ErrorTransport.java  | 2 +-
 .../org/oransc/ric/portal/dashboard/model/IDashboardResponse.java   | 2 +-
 .../java/org/oransc/ric/portal/dashboard/model/LoadTransport.java   | 2 +-
 .../org/oransc/ric/portal/dashboard/model/MetricsTransport.java     | 2 +-
 .../java/org/oransc/ric/portal/dashboard/model/PathTransport.java   | 2 +-
 .../org/oransc/ric/portal/dashboard/model/SuccessTransport.java     | 2 +-
 .../java/org/oransc/ric/portal/dashboard/model/UrlTransport.java    | 2 +-
 webapp-backend/src/main/resources/application.properties            | 2 +-
 webapp-backend/src/main/resources/logback.xml                       | 4 ++--
 .../org/oransc/ric/portal/dashboard/DashboardApplicationTest.java   | 2 +-
 webapp-frontend/.gitignore                                          | 1 +
 webapp-frontend/e2e/protractor.conf.js                              | 2 +-
 webapp-frontend/e2e/src/app.e2e-spec.ts                             | 2 +-
 webapp-frontend/e2e/src/app.po.ts                                   | 2 +-
 webapp-frontend/pom.xml                                             | 6 +-----
 webapp-frontend/src/app/admin/admin.component.css                   | 2 +-
 webapp-frontend/src/app/admin/admin.component.html                  | 2 +-
 webapp-frontend/src/app/admin/admin.component.spec.ts               | 2 +-
 webapp-frontend/src/app/admin/admin.component.ts                    | 2 +-
 webapp-frontend/src/app/app-routing.module.ts                       | 2 +-
 webapp-frontend/src/app/app.component.css                           | 2 +-
 webapp-frontend/src/app/app.component.html                          | 2 +-
 webapp-frontend/src/app/app.component.spec.ts                       | 2 +-
 webapp-frontend/src/app/app.component.ts                            | 2 +-
 webapp-frontend/src/app/app.module.ts                               | 2 +-
 webapp-frontend/src/app/catalog/catalog.component.css               | 2 +-
 .../src/app/catalog/catalog.component.deploy-dialog.html            | 2 +-
 webapp-frontend/src/app/catalog/catalog.component.html              | 2 +-
 webapp-frontend/src/app/catalog/catalog.component.spec.ts           | 2 +-
 webapp-frontend/src/app/catalog/catalog.component.ts                | 2 +-
 webapp-frontend/src/app/control/control.component.css               | 2 +-
 webapp-frontend/src/app/control/control.component.html              | 2 +-
 webapp-frontend/src/app/control/control.component.spec.ts           | 2 +-
 webapp-frontend/src/app/control/control.component.ts                | 2 +-
 webapp-frontend/src/app/login/login.component.css                   | 2 +-
 webapp-frontend/src/app/login/login.component.html                  | 2 +-
 webapp-frontend/src/app/login/login.component.spec.ts               | 2 +-
 webapp-frontend/src/app/login/login.component.ts                    | 2 +-
 .../src/app/navigation/sidenav-list/sidenav-list.component.css      | 2 +-
 .../src/app/navigation/sidenav-list/sidenav-list.component.html     | 2 +-
 .../src/app/navigation/sidenav-list/sidenav-list.component.ts       | 2 +-
 webapp-frontend/src/app/services/admin/admin.service.spec.ts        | 2 +-
 webapp-frontend/src/app/services/admin/admin.service.ts             | 2 +-
 webapp-frontend/src/app/services/catalog/catalog.service.spec.ts    | 2 +-
 webapp-frontend/src/app/services/catalog/catalog.service.ts         | 2 +-
 webapp-frontend/src/app/services/control/control.service.spec.ts    | 2 +-
 webapp-frontend/src/app/services/control/control.service.ts         | 2 +-
 webapp-frontend/src/app/services/stats/stats.service.spec.ts        | 2 +-
 webapp-frontend/src/app/services/stats/stats.service.ts             | 2 +-
 webapp-frontend/src/app/services/ui/ui.service.spec.ts              | 2 +-
 webapp-frontend/src/app/services/ui/ui.service.ts                   | 2 +-
 webapp-frontend/src/app/stats/stats.component.html                  | 2 +-
 webapp-frontend/src/app/stats/stats.component.spec.ts               | 2 +-
 webapp-frontend/src/app/stats/stats.component.ts                    | 2 +-
 webapp-frontend/src/app/ui/catalog-card/catalog-card.component.css  | 2 +-
 webapp-frontend/src/app/ui/catalog-card/catalog-card.component.html | 2 +-
 .../src/app/ui/catalog-card/catalog-card.component.spec.ts          | 2 +-
 webapp-frontend/src/app/ui/catalog-card/catalog-card.component.ts   | 2 +-
 webapp-frontend/src/app/ui/config-event/config-event.component.html | 2 +-
 .../src/app/ui/config-event/config-event.component.spec.ts          | 2 +-
 webapp-frontend/src/app/ui/config-event/config-event.component.ts   | 2 +-
 webapp-frontend/src/app/ui/control-card/control-card.component.css  | 2 +-
 webapp-frontend/src/app/ui/control-card/control-card.component.html | 2 +-
 .../src/app/ui/control-card/control-card.component.spec.ts          | 2 +-
 webapp-frontend/src/app/ui/control-card/control-card.component.ts   | 2 +-
 webapp-frontend/src/app/ui/modal-event/modal-event.component.html   | 2 +-
 .../src/app/ui/modal-event/modal-event.component.spec.ts            | 2 +-
 webapp-frontend/src/app/ui/modal-event/modal-event.component.ts     | 2 +-
 webapp-frontend/src/app/ui/stat-card/stat-card.component.css        | 2 +-
 webapp-frontend/src/app/ui/stat-card/stat-card.component.html       | 2 +-
 webapp-frontend/src/app/ui/stat-card/stat-card.component.spec.ts    | 2 +-
 webapp-frontend/src/app/ui/stat-card/stat-card.component.ts         | 2 +-
 webapp-frontend/src/app/xapp/xapp.component.html                    | 2 +-
 webapp-frontend/src/app/xapp/xapp.component.spec.ts                 | 2 +-
 webapp-frontend/src/app/xapp/xapp.component.ts                      | 2 +-
 webapp-frontend/src/environments/environment.prod.ts                | 2 +-
 webapp-frontend/src/environments/environment.ts                     | 2 +-
 webapp-frontend/src/index.html                                      | 2 +-
 webapp-frontend/src/karma.conf.js                                   | 2 +-
 webapp-frontend/src/main.ts                                         | 2 +-
 webapp-frontend/src/polyfills.ts                                    | 2 +-
 webapp-frontend/src/test.ts                                         | 2 +-
 xapp-mgr-client/pom.xml                                             | 4 ++--
 .../portal/dashboard/xappmgr/client/test/XappManagerClientTest.java | 2 +-
 110 files changed, 115 insertions(+), 119 deletions(-)

diff --git a/README.md b/README.md
index 5553352c..0333213d 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# ORAN-OSC RIC Dashboard Web Application
+# O-RAN-SC RIC Dashboard Web Application
 
 This webapp is built with Angular 7 and Spring-Boot 2.
 
diff --git a/a1-med-client/pom.xml b/a1-med-client/pom.xml
index 772c462d..a7a936ad 100644
--- a/a1-med-client/pom.xml
+++ b/a1-med-client/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--<![CDATA[
 ========================LICENSE_START=================================
-ORAN-OSC
+O-RAN-SC
 %%
 Copyright (C) 2019 AT&T Intellectual Property and Nokia
 %%
diff --git a/a1-med-client/src/main/resources/a1_mediator_0.3.0.yaml b/a1-med-client/src/main/resources/a1_mediator_0.3.0.yaml
index 1fff00a7..ce97a4bc 100644
--- a/a1-med-client/src/main/resources/a1_mediator_0.3.0.yaml
+++ b/a1-med-client/src/main/resources/a1_mediator_0.3.0.yaml
@@ -1,5 +1,5 @@
 # ========================LICENSE_START=================================
-# ORAN-OSC
+# O-RAN-SC
 # %%
 # Copyright (C) 2019 AT&T Intellectual Property and Nokia
 # %%
diff --git a/a1-med-client/src/test/java/org/oransc/ric/portal/dashboard/a1med/client/test/A1MediatorClientTest.java b/a1-med-client/src/test/java/org/oransc/ric/portal/dashboard/a1med/client/test/A1MediatorClientTest.java
index d1ffdbf4..d8d5193f 100644
--- a/a1-med-client/src/test/java/org/oransc/ric/portal/dashboard/a1med/client/test/A1MediatorClientTest.java
+++ b/a1-med-client/src/test/java/org/oransc/ric/portal/dashboard/a1med/client/test/A1MediatorClientTest.java
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index 363c44c2..7ae55e5e 100644
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -20,10 +20,11 @@
 RIC Dashboard Release Notes
 ===========================
 
-Version 1.0.1, 3 May 2019
+Version 1.0.1, 6 May 2019
 -------------------------
 * Add draft A1 Mediator API definition
 * Use E2 Manager API definition dated 2 May 2019, with tag modifications
+* Adjust group IDs and packages for name O-RAN-SC; drop ORAN-OSC
 
 Version 1.0.0, 30 Apr 2019
 --------------------------
diff --git a/e2-mgr-client/pom.xml b/e2-mgr-client/pom.xml
index 0a1f67a3..e558cc8d 100644
--- a/e2-mgr-client/pom.xml
+++ b/e2-mgr-client/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--<![CDATA[
 ========================LICENSE_START=================================
-ORAN-OSC
+O-RAN-SC
 %%
 Copyright (C) 2019 AT&T Intellectual Property and Nokia
 %%
diff --git a/e2-mgr-client/src/main/resources/e2_manager_02052019.yaml b/e2-mgr-client/src/main/resources/e2_manager_02052019.yaml
index 3846b383..a5ff7f00 100644
--- a/e2-mgr-client/src/main/resources/e2_manager_02052019.yaml
+++ b/e2-mgr-client/src/main/resources/e2_manager_02052019.yaml
@@ -1,5 +1,5 @@
 # ========================LICENSE_START=================================
-# ORAN-OSC
+# O-RAN-SC
 # %%
 # Copyright (C) 2019 AT&T Intellectual Property and Nokia
 # %%
diff --git a/e2-mgr-client/src/main/resources/e2_manager_02052019_2.yaml b/e2-mgr-client/src/main/resources/e2_manager_02052019_2.yaml
index 04721627..324593c0 100644
--- a/e2-mgr-client/src/main/resources/e2_manager_02052019_2.yaml
+++ b/e2-mgr-client/src/main/resources/e2_manager_02052019_2.yaml
@@ -1,5 +1,5 @@
 # ========================LICENSE_START=================================
-# ORAN-OSC
+# O-RAN-SC
 # %%
 # Copyright (C) 2019 AT&T Intellectual Property and Nokia
 # %%
diff --git a/e2-mgr-client/src/main/resources/e2_mgr_rest_api_v0_0_1.yaml b/e2-mgr-client/src/main/resources/e2_mgr_rest_api_v0_0_1.yaml
index 2ab547ef..f6b73625 100644
--- a/e2-mgr-client/src/main/resources/e2_mgr_rest_api_v0_0_1.yaml
+++ b/e2-mgr-client/src/main/resources/e2_mgr_rest_api_v0_0_1.yaml
@@ -1,6 +1,6 @@
 ###
 # ========================LICENSE_START=================================
-# ORAN-OSC
+# O-RAN-SC
 # %%
 # Copyright (C) 2019 AT&T Intellectual Property and Nokia
 # %%
diff --git a/e2-mgr-client/src/test/java/org/oransc/ric/portal/dashboard/e2mgr/client/test/E2ManagerClientTest.java b/e2-mgr-client/src/test/java/org/oransc/ric/portal/dashboard/e2mgr/client/test/E2ManagerClientTest.java
index a740f05e..3bad7bb5 100644
--- a/e2-mgr-client/src/test/java/org/oransc/ric/portal/dashboard/e2mgr/client/test/E2ManagerClientTest.java
+++ b/e2-mgr-client/src/test/java/org/oransc/ric/portal/dashboard/e2mgr/client/test/E2ManagerClientTest.java
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/pom.xml b/pom.xml
index 8ad5487e..2d24455c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--<![CDATA[
 ========================LICENSE_START=================================
-ORAN-OSC
+O-RAN-SC
 %%
 Copyright (C) 2019 AT&T Intellectual Property and Nokia
 %%
@@ -36,7 +36,7 @@ limitations under the License.
 	<!-- Properties for the license-maven-plugin in child POMs -->
 	<properties>
 		<lmp.organization.name>AT&amp;T Intellectual Property and Nokia</lmp.organization.name>
-		<lmp.project.name>ORAN-OSC</lmp.project.name>
+		<lmp.project.name>O-RAN-SC</lmp.project.name>
 		<lmp.inception.year>2019</lmp.inception.year>
 		<lmp.license.name>apache_v2</lmp.license.name>
 		<lmp.process.start.tag>========================LICENSE_START=================================</lmp.process.start.tag>
diff --git a/webapp-backend/pom.xml b/webapp-backend/pom.xml
index 26d8f8aa..fb4406f9 100644
--- a/webapp-backend/pom.xml
+++ b/webapp-backend/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--<![CDATA[
 ========================LICENSE_START=================================
-ORAN-OSC
+O-RAN-SC
 %%
 Copyright (C) 2019 AT&T Intellectual Property and Nokia
 %%
@@ -31,8 +31,6 @@ limitations under the License.
 	<name>RIC Dashboard Webapp backend</name>
 	<properties>
 		<java.version>1.8</java.version>
-		<!-- this is not a library, don't publish javadoc -->
-		<maven.javadoc.skip>true</maven.javadoc.skip>
 		<springfox.version>2.9.2</springfox.version>
 	</properties>
 	<dependencies>
diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/DashboardApplication.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/DashboardApplication.java
index 15c082f9..8c86a609 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/DashboardApplication.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/DashboardApplication.java
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/DashboardConstants.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/DashboardConstants.java
index cd70a81a..e73f697d 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/DashboardConstants.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/DashboardConstants.java
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/A1MediatorConfiguration.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/A1MediatorConfiguration.java
index 3cd81ede..04ae8572 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/A1MediatorConfiguration.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/A1MediatorConfiguration.java
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/A1MediatorMockConfiguration.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/A1MediatorMockConfiguration.java
index d9301612..69e5d4bf 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/A1MediatorMockConfiguration.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/A1MediatorMockConfiguration.java
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/E2ManagerConfiguration.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/E2ManagerConfiguration.java
index 3026e870..cedee21a 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/E2ManagerConfiguration.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/E2ManagerConfiguration.java
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/E2ManagerMockConfiguration.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/E2ManagerMockConfiguration.java
index f5b59d4e..d2921482 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/E2ManagerMockConfiguration.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/E2ManagerMockConfiguration.java
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/SwaggerConfiguration.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/SwaggerConfiguration.java
index fe079365..07b16604 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/SwaggerConfiguration.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/SwaggerConfiguration.java
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
@@ -60,7 +60,7 @@ public class SwaggerConfiguration {
 				.termsOfServiceUrl("Terms of service") //
 				.contact(new Contact("RIC Dashboard Dev Team", //
 						"http://no-docs-yet.org/", //
-						"noreply@oran-osc.org")) //
+						"noreply@O-RAN-SC.org")) //
 				.license("Apache 2.0 License").licenseUrl("http://www.apache.org/licenses/LICENSE-2.0") //
 				.version(version == null ? "version not available" : version) //
 				.build();
diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/XappManagerConfiguration.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/XappManagerConfiguration.java
index 3714b824..6a7777f3 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/XappManagerConfiguration.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/XappManagerConfiguration.java
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/XappManagerMockConfiguration.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/XappManagerMockConfiguration.java
index 86988930..8f6cf6fc 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/XappManagerMockConfiguration.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/XappManagerMockConfiguration.java
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/A1MediationController.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/A1MediationController.java
index c63b6c1d..1cbda95e 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/A1MediationController.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/A1MediationController.java
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/E2ManagerController.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/E2ManagerController.java
index ad6ba793..fb1add86 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/E2ManagerController.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/E2ManagerController.java
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/SimpleErrorController.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/SimpleErrorController.java
index 334a88cb..a1678be0 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/SimpleErrorController.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/SimpleErrorController.java
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/XappManagerController.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/XappManagerController.java
index 1101ac68..8bcfb468 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/XappManagerController.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/controller/XappManagerController.java
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/DelayTransport.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/DelayTransport.java
index 909b0bc1..1e0db713 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/DelayTransport.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/DelayTransport.java
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/ErrorTransport.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/ErrorTransport.java
index ff801bb2..035b9efb 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/ErrorTransport.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/ErrorTransport.java
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/IDashboardResponse.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/IDashboardResponse.java
index 25c3fc52..6fa73036 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/IDashboardResponse.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/IDashboardResponse.java
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/LoadTransport.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/LoadTransport.java
index 0e75d523..13f20574 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/LoadTransport.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/LoadTransport.java
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/MetricsTransport.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/MetricsTransport.java
index 2809544e..ba0db05b 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/MetricsTransport.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/MetricsTransport.java
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/PathTransport.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/PathTransport.java
index e9a63f71..003260fc 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/PathTransport.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/PathTransport.java
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/SuccessTransport.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/SuccessTransport.java
index 4af67c3f..98806f6d 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/SuccessTransport.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/SuccessTransport.java
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/UrlTransport.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/UrlTransport.java
index 5067243a..3ce8acf3 100644
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/UrlTransport.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/model/UrlTransport.java
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-backend/src/main/resources/application.properties b/webapp-backend/src/main/resources/application.properties
index 0350ad6f..c4bd7f5b 100644
--- a/webapp-backend/src/main/resources/application.properties
+++ b/webapp-backend/src/main/resources/application.properties
@@ -1,6 +1,6 @@
 ###
 # ========================LICENSE_START=================================
-# ORAN-OSC
+# O-RAN-SC
 # %%
 # Copyright (C) 2019 AT&T Intellectual Property and Nokia
 # %%
diff --git a/webapp-backend/src/main/resources/logback.xml b/webapp-backend/src/main/resources/logback.xml
index 4f213aeb..0d2348f9 100644
--- a/webapp-backend/src/main/resources/logback.xml
+++ b/webapp-backend/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ========================LICENSE_START=================================
-  ORAN-OSC
+  O-RAN-SC
   %%
   Copyright (C) 2019 AT&T Intellectual Property and Nokia
   %%
@@ -63,6 +63,6 @@
 	</root>
 
 	<!-- Code under test should be chatty --> >
-	<logger name="org.oranosc.ric.portal.dash" level="INFO" />
+	<logger name="org.oransc.ric.portal.dashboard" level="DEBUG" />
 
 </configuration>
diff --git a/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/DashboardApplicationTest.java b/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/DashboardApplicationTest.java
index c4652576..439d6680 100644
--- a/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/DashboardApplicationTest.java
+++ b/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/DashboardApplicationTest.java
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/.gitignore b/webapp-frontend/.gitignore
index 9eacc902..a473c816 100644
--- a/webapp-frontend/.gitignore
+++ b/webapp-frontend/.gitignore
@@ -10,6 +10,7 @@
 /node_modules
 
 /.classpath
+/.externalToolBuilders
 /.project
 /.settings
 /target/
diff --git a/webapp-frontend/e2e/protractor.conf.js b/webapp-frontend/e2e/protractor.conf.js
index 2ee50af1..15e7433b 100644
--- a/webapp-frontend/e2e/protractor.conf.js
+++ b/webapp-frontend/e2e/protractor.conf.js
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/e2e/src/app.e2e-spec.ts b/webapp-frontend/e2e/src/app.e2e-spec.ts
index b3fba351..31bb883e 100644
--- a/webapp-frontend/e2e/src/app.e2e-spec.ts
+++ b/webapp-frontend/e2e/src/app.e2e-spec.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/e2e/src/app.po.ts b/webapp-frontend/e2e/src/app.po.ts
index ffb08618..19eebe91 100644
--- a/webapp-frontend/e2e/src/app.po.ts
+++ b/webapp-frontend/e2e/src/app.po.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/pom.xml b/webapp-frontend/pom.xml
index e738a127..180db42a 100644
--- a/webapp-frontend/pom.xml
+++ b/webapp-frontend/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--<![CDATA[
 ========================LICENSE_START=================================
-ORAN-OSC
+O-RAN-SC
 %%
 Copyright (C) 2019 AT&T Intellectual Property and Nokia
 %%
@@ -29,10 +29,6 @@ limitations under the License.
 	</parent>
 	<artifactId>ric-dash-fe</artifactId>
 	<name>RIC Dashboard Webapp frontend</name>
-	<properties>
-		<!-- No java here so skip javadoc -->
-		<maven.javadoc.skip>true</maven.javadoc.skip>
-	</properties>
 	<build>
 		<plugins>
 			<!-- do not deploy anything -->
diff --git a/webapp-frontend/src/app/admin/admin.component.css b/webapp-frontend/src/app/admin/admin.component.css
index 16843b36..6161ce0c 100644
--- a/webapp-frontend/src/app/admin/admin.component.css
+++ b/webapp-frontend/src/app/admin/admin.component.css
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/admin/admin.component.html b/webapp-frontend/src/app/admin/admin.component.html
index 8a6fe908..aba337c7 100644
--- a/webapp-frontend/src/app/admin/admin.component.html
+++ b/webapp-frontend/src/app/admin/admin.component.html
@@ -1,6 +1,6 @@
 <!--
   ========================LICENSE_START=================================
-  ORAN-OSC
+  O-RAN-SC
   %%
   Copyright (C) 2019 AT&T Intellectual Property and Nokia
   %%
diff --git a/webapp-frontend/src/app/admin/admin.component.spec.ts b/webapp-frontend/src/app/admin/admin.component.spec.ts
index 6cd94056..2bfc0c5b 100644
--- a/webapp-frontend/src/app/admin/admin.component.spec.ts
+++ b/webapp-frontend/src/app/admin/admin.component.spec.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/admin/admin.component.ts b/webapp-frontend/src/app/admin/admin.component.ts
index 14cd9481..6669079e 100644
--- a/webapp-frontend/src/app/admin/admin.component.ts
+++ b/webapp-frontend/src/app/admin/admin.component.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/app-routing.module.ts b/webapp-frontend/src/app/app-routing.module.ts
index 3b89f141..52d75586 100644
--- a/webapp-frontend/src/app/app-routing.module.ts
+++ b/webapp-frontend/src/app/app-routing.module.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/app.component.css b/webapp-frontend/src/app/app.component.css
index 7ae2691b..19ac23e1 100644
--- a/webapp-frontend/src/app/app.component.css
+++ b/webapp-frontend/src/app/app.component.css
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/app.component.html b/webapp-frontend/src/app/app.component.html
index cd5c10c2..ef2405a9 100644
--- a/webapp-frontend/src/app/app.component.html
+++ b/webapp-frontend/src/app/app.component.html
@@ -1,6 +1,6 @@
 <!--
   ========================LICENSE_START=================================
-  ORAN-OSC
+  O-RAN-SC
   %%
   Copyright (C) 2019 AT&T Intellectual Property and Nokia
   %%
diff --git a/webapp-frontend/src/app/app.component.spec.ts b/webapp-frontend/src/app/app.component.spec.ts
index c84231e7..d5c2a58a 100644
--- a/webapp-frontend/src/app/app.component.spec.ts
+++ b/webapp-frontend/src/app/app.component.spec.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/app.component.ts b/webapp-frontend/src/app/app.component.ts
index 9a0ccca2..796d6b3e 100644
--- a/webapp-frontend/src/app/app.component.ts
+++ b/webapp-frontend/src/app/app.component.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/app.module.ts b/webapp-frontend/src/app/app.module.ts
index 4fa952d3..4a84c854 100644
--- a/webapp-frontend/src/app/app.module.ts
+++ b/webapp-frontend/src/app/app.module.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/catalog/catalog.component.css b/webapp-frontend/src/app/catalog/catalog.component.css
index 508e70b1..f3454763 100644
--- a/webapp-frontend/src/app/catalog/catalog.component.css
+++ b/webapp-frontend/src/app/catalog/catalog.component.css
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/catalog/catalog.component.deploy-dialog.html b/webapp-frontend/src/app/catalog/catalog.component.deploy-dialog.html
index 4d547caf..467d2e46 100644
--- a/webapp-frontend/src/app/catalog/catalog.component.deploy-dialog.html
+++ b/webapp-frontend/src/app/catalog/catalog.component.deploy-dialog.html
@@ -1,6 +1,6 @@
 <!--
   ========================LICENSE_START=================================
-  ORAN-OSC
+  O-RAN-SC
   %%
   Copyright (C) 2019 AT&T Intellectual Property and Nokia
   %%
diff --git a/webapp-frontend/src/app/catalog/catalog.component.html b/webapp-frontend/src/app/catalog/catalog.component.html
index 5f250b48..86e925ef 100644
--- a/webapp-frontend/src/app/catalog/catalog.component.html
+++ b/webapp-frontend/src/app/catalog/catalog.component.html
@@ -1,6 +1,6 @@
 <!--
   ========================LICENSE_START=================================
-  ORAN-OSC
+  O-RAN-SC
   %%
   Copyright (C) 2019 AT&T Intellectual Property and Nokia
   %%
diff --git a/webapp-frontend/src/app/catalog/catalog.component.spec.ts b/webapp-frontend/src/app/catalog/catalog.component.spec.ts
index 556c45cb..4bd360d0 100644
--- a/webapp-frontend/src/app/catalog/catalog.component.spec.ts
+++ b/webapp-frontend/src/app/catalog/catalog.component.spec.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/catalog/catalog.component.ts b/webapp-frontend/src/app/catalog/catalog.component.ts
index c5aa195c..5bff77d9 100644
--- a/webapp-frontend/src/app/catalog/catalog.component.ts
+++ b/webapp-frontend/src/app/catalog/catalog.component.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/control/control.component.css b/webapp-frontend/src/app/control/control.component.css
index a3e97aab..472f8228 100644
--- a/webapp-frontend/src/app/control/control.component.css
+++ b/webapp-frontend/src/app/control/control.component.css
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/control/control.component.html b/webapp-frontend/src/app/control/control.component.html
index 4b2b0205..5ed5d751 100644
--- a/webapp-frontend/src/app/control/control.component.html
+++ b/webapp-frontend/src/app/control/control.component.html
@@ -1,6 +1,6 @@
 <!--
   ========================LICENSE_START=================================
-  ORAN-OSC
+  O-RAN-SC
   %%
   Copyright (C) 2019 AT&T Intellectual Property and Nokia
   %%
diff --git a/webapp-frontend/src/app/control/control.component.spec.ts b/webapp-frontend/src/app/control/control.component.spec.ts
index d6017ca2..caa1a732 100644
--- a/webapp-frontend/src/app/control/control.component.spec.ts
+++ b/webapp-frontend/src/app/control/control.component.spec.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/control/control.component.ts b/webapp-frontend/src/app/control/control.component.ts
index 15208620..fb987d48 100644
--- a/webapp-frontend/src/app/control/control.component.ts
+++ b/webapp-frontend/src/app/control/control.component.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/login/login.component.css b/webapp-frontend/src/app/login/login.component.css
index df808cf7..3befdac4 100644
--- a/webapp-frontend/src/app/login/login.component.css
+++ b/webapp-frontend/src/app/login/login.component.css
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/login/login.component.html b/webapp-frontend/src/app/login/login.component.html
index e92ab063..2eefce6a 100644
--- a/webapp-frontend/src/app/login/login.component.html
+++ b/webapp-frontend/src/app/login/login.component.html
@@ -1,6 +1,6 @@
 <!--
   ========================LICENSE_START=================================
-  ORAN-OSC
+  O-RAN-SC
   %%
   Copyright (C) 2019 AT&T Intellectual Property and Nokia
   %%
diff --git a/webapp-frontend/src/app/login/login.component.spec.ts b/webapp-frontend/src/app/login/login.component.spec.ts
index 04ab7796..8965fabe 100644
--- a/webapp-frontend/src/app/login/login.component.spec.ts
+++ b/webapp-frontend/src/app/login/login.component.spec.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/login/login.component.ts b/webapp-frontend/src/app/login/login.component.ts
index 997b4a0a..ba89c33c 100644
--- a/webapp-frontend/src/app/login/login.component.ts
+++ b/webapp-frontend/src/app/login/login.component.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/navigation/sidenav-list/sidenav-list.component.css b/webapp-frontend/src/app/navigation/sidenav-list/sidenav-list.component.css
index 967225e9..5cd701bb 100644
--- a/webapp-frontend/src/app/navigation/sidenav-list/sidenav-list.component.css
+++ b/webapp-frontend/src/app/navigation/sidenav-list/sidenav-list.component.css
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/navigation/sidenav-list/sidenav-list.component.html b/webapp-frontend/src/app/navigation/sidenav-list/sidenav-list.component.html
index 85088e2c..68f95ae8 100644
--- a/webapp-frontend/src/app/navigation/sidenav-list/sidenav-list.component.html
+++ b/webapp-frontend/src/app/navigation/sidenav-list/sidenav-list.component.html
@@ -1,6 +1,6 @@
 <!--
   ========================LICENSE_START=================================
-  ORAN-OSC
+  O-RAN-SC
   %%
   Copyright (C) 2019 AT&T Intellectual Property and Nokia
   %%
diff --git a/webapp-frontend/src/app/navigation/sidenav-list/sidenav-list.component.ts b/webapp-frontend/src/app/navigation/sidenav-list/sidenav-list.component.ts
index ac8256ac..d94b39bd 100644
--- a/webapp-frontend/src/app/navigation/sidenav-list/sidenav-list.component.ts
+++ b/webapp-frontend/src/app/navigation/sidenav-list/sidenav-list.component.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/services/admin/admin.service.spec.ts b/webapp-frontend/src/app/services/admin/admin.service.spec.ts
index 90f0be64..2d3de0fa 100644
--- a/webapp-frontend/src/app/services/admin/admin.service.spec.ts
+++ b/webapp-frontend/src/app/services/admin/admin.service.spec.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/services/admin/admin.service.ts b/webapp-frontend/src/app/services/admin/admin.service.ts
index 999fd230..41b2b220 100644
--- a/webapp-frontend/src/app/services/admin/admin.service.ts
+++ b/webapp-frontend/src/app/services/admin/admin.service.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/services/catalog/catalog.service.spec.ts b/webapp-frontend/src/app/services/catalog/catalog.service.spec.ts
index 92e51484..37fe1044 100644
--- a/webapp-frontend/src/app/services/catalog/catalog.service.spec.ts
+++ b/webapp-frontend/src/app/services/catalog/catalog.service.spec.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/services/catalog/catalog.service.ts b/webapp-frontend/src/app/services/catalog/catalog.service.ts
index a67e98a1..a5b2f9a5 100644
--- a/webapp-frontend/src/app/services/catalog/catalog.service.ts
+++ b/webapp-frontend/src/app/services/catalog/catalog.service.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/services/control/control.service.spec.ts b/webapp-frontend/src/app/services/control/control.service.spec.ts
index 3d2c536e..6ec98f82 100644
--- a/webapp-frontend/src/app/services/control/control.service.spec.ts
+++ b/webapp-frontend/src/app/services/control/control.service.spec.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/services/control/control.service.ts b/webapp-frontend/src/app/services/control/control.service.ts
index d75c2554..b2bdc5fb 100644
--- a/webapp-frontend/src/app/services/control/control.service.ts
+++ b/webapp-frontend/src/app/services/control/control.service.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/services/stats/stats.service.spec.ts b/webapp-frontend/src/app/services/stats/stats.service.spec.ts
index f5f003f4..4111d02f 100644
--- a/webapp-frontend/src/app/services/stats/stats.service.spec.ts
+++ b/webapp-frontend/src/app/services/stats/stats.service.spec.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/services/stats/stats.service.ts b/webapp-frontend/src/app/services/stats/stats.service.ts
index d0bdc4c1..1dcce6f1 100644
--- a/webapp-frontend/src/app/services/stats/stats.service.ts
+++ b/webapp-frontend/src/app/services/stats/stats.service.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/services/ui/ui.service.spec.ts b/webapp-frontend/src/app/services/ui/ui.service.spec.ts
index 413e3a93..8547e77f 100644
--- a/webapp-frontend/src/app/services/ui/ui.service.spec.ts
+++ b/webapp-frontend/src/app/services/ui/ui.service.spec.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/services/ui/ui.service.ts b/webapp-frontend/src/app/services/ui/ui.service.ts
index f826d200..a496c708 100644
--- a/webapp-frontend/src/app/services/ui/ui.service.ts
+++ b/webapp-frontend/src/app/services/ui/ui.service.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/stats/stats.component.html b/webapp-frontend/src/app/stats/stats.component.html
index 85c519f7..54c606b1 100644
--- a/webapp-frontend/src/app/stats/stats.component.html
+++ b/webapp-frontend/src/app/stats/stats.component.html
@@ -1,6 +1,6 @@
 <!--
   ========================LICENSE_START=================================
-  ORAN-OSC
+  O-RAN-SC
   %%
   Copyright (C) 2019 AT&T Intellectual Property and Nokia
   %%
diff --git a/webapp-frontend/src/app/stats/stats.component.spec.ts b/webapp-frontend/src/app/stats/stats.component.spec.ts
index 82eb9d9f..bbd69b4f 100644
--- a/webapp-frontend/src/app/stats/stats.component.spec.ts
+++ b/webapp-frontend/src/app/stats/stats.component.spec.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/stats/stats.component.ts b/webapp-frontend/src/app/stats/stats.component.ts
index 71bc6974..b4e96e17 100644
--- a/webapp-frontend/src/app/stats/stats.component.ts
+++ b/webapp-frontend/src/app/stats/stats.component.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/ui/catalog-card/catalog-card.component.css b/webapp-frontend/src/app/ui/catalog-card/catalog-card.component.css
index 7c69e9e3..5a9d9cbe 100644
--- a/webapp-frontend/src/app/ui/catalog-card/catalog-card.component.css
+++ b/webapp-frontend/src/app/ui/catalog-card/catalog-card.component.css
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/ui/catalog-card/catalog-card.component.html b/webapp-frontend/src/app/ui/catalog-card/catalog-card.component.html
index aac0c380..51c8d777 100644
--- a/webapp-frontend/src/app/ui/catalog-card/catalog-card.component.html
+++ b/webapp-frontend/src/app/ui/catalog-card/catalog-card.component.html
@@ -1,6 +1,6 @@
 <!--
   ========================LICENSE_START=================================
-  ORAN-OSC
+  O-RAN-SC
   %%
   Copyright (C) 2019 AT&T Intellectual Property and Nokia
   %%
diff --git a/webapp-frontend/src/app/ui/catalog-card/catalog-card.component.spec.ts b/webapp-frontend/src/app/ui/catalog-card/catalog-card.component.spec.ts
index 7a7330de..813610b1 100644
--- a/webapp-frontend/src/app/ui/catalog-card/catalog-card.component.spec.ts
+++ b/webapp-frontend/src/app/ui/catalog-card/catalog-card.component.spec.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/ui/catalog-card/catalog-card.component.ts b/webapp-frontend/src/app/ui/catalog-card/catalog-card.component.ts
index 9b7901e0..fa7811b6 100644
--- a/webapp-frontend/src/app/ui/catalog-card/catalog-card.component.ts
+++ b/webapp-frontend/src/app/ui/catalog-card/catalog-card.component.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/ui/config-event/config-event.component.html b/webapp-frontend/src/app/ui/config-event/config-event.component.html
index dcbd2ee0..2dec3443 100644
--- a/webapp-frontend/src/app/ui/config-event/config-event.component.html
+++ b/webapp-frontend/src/app/ui/config-event/config-event.component.html
@@ -1,6 +1,6 @@
 <!--
   ========================LICENSE_START=================================
-  ORAN-OSC
+  O-RAN-SC
   %%
   Copyright (C) 2019 AT&T Intellectual Property and Nokia
   %%
diff --git a/webapp-frontend/src/app/ui/config-event/config-event.component.spec.ts b/webapp-frontend/src/app/ui/config-event/config-event.component.spec.ts
index c0bd5d8a..458cacc2 100644
--- a/webapp-frontend/src/app/ui/config-event/config-event.component.spec.ts
+++ b/webapp-frontend/src/app/ui/config-event/config-event.component.spec.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/ui/config-event/config-event.component.ts b/webapp-frontend/src/app/ui/config-event/config-event.component.ts
index 6a4b6319..e44933d8 100644
--- a/webapp-frontend/src/app/ui/config-event/config-event.component.ts
+++ b/webapp-frontend/src/app/ui/config-event/config-event.component.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/ui/control-card/control-card.component.css b/webapp-frontend/src/app/ui/control-card/control-card.component.css
index 7c69e9e3..5a9d9cbe 100644
--- a/webapp-frontend/src/app/ui/control-card/control-card.component.css
+++ b/webapp-frontend/src/app/ui/control-card/control-card.component.css
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/ui/control-card/control-card.component.html b/webapp-frontend/src/app/ui/control-card/control-card.component.html
index 11740d06..0f071ddc 100644
--- a/webapp-frontend/src/app/ui/control-card/control-card.component.html
+++ b/webapp-frontend/src/app/ui/control-card/control-card.component.html
@@ -1,6 +1,6 @@
 <!--
   ========================LICENSE_START=================================
-  ORAN-OSC
+  O-RAN-SC
   %%
   Copyright (C) 2019 AT&T Intellectual Property and Nokia
   %%
diff --git a/webapp-frontend/src/app/ui/control-card/control-card.component.spec.ts b/webapp-frontend/src/app/ui/control-card/control-card.component.spec.ts
index 7a7330de..813610b1 100644
--- a/webapp-frontend/src/app/ui/control-card/control-card.component.spec.ts
+++ b/webapp-frontend/src/app/ui/control-card/control-card.component.spec.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/ui/control-card/control-card.component.ts b/webapp-frontend/src/app/ui/control-card/control-card.component.ts
index 82ba347e..04c4fb85 100644
--- a/webapp-frontend/src/app/ui/control-card/control-card.component.ts
+++ b/webapp-frontend/src/app/ui/control-card/control-card.component.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/ui/modal-event/modal-event.component.html b/webapp-frontend/src/app/ui/modal-event/modal-event.component.html
index 84d10ac3..dbef323c 100644
--- a/webapp-frontend/src/app/ui/modal-event/modal-event.component.html
+++ b/webapp-frontend/src/app/ui/modal-event/modal-event.component.html
@@ -1,6 +1,6 @@
 <!--
   ========================LICENSE_START=================================
-  ORAN-OSC
+  O-RAN-SC
   %%
   Copyright (C) 2019 AT&T Intellectual Property and Nokia
   %%
diff --git a/webapp-frontend/src/app/ui/modal-event/modal-event.component.spec.ts b/webapp-frontend/src/app/ui/modal-event/modal-event.component.spec.ts
index af0b8345..a4ba4218 100644
--- a/webapp-frontend/src/app/ui/modal-event/modal-event.component.spec.ts
+++ b/webapp-frontend/src/app/ui/modal-event/modal-event.component.spec.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/ui/modal-event/modal-event.component.ts b/webapp-frontend/src/app/ui/modal-event/modal-event.component.ts
index 90d8edc7..9a2c9817 100644
--- a/webapp-frontend/src/app/ui/modal-event/modal-event.component.ts
+++ b/webapp-frontend/src/app/ui/modal-event/modal-event.component.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/ui/stat-card/stat-card.component.css b/webapp-frontend/src/app/ui/stat-card/stat-card.component.css
index 7c69e9e3..5a9d9cbe 100644
--- a/webapp-frontend/src/app/ui/stat-card/stat-card.component.css
+++ b/webapp-frontend/src/app/ui/stat-card/stat-card.component.css
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/ui/stat-card/stat-card.component.html b/webapp-frontend/src/app/ui/stat-card/stat-card.component.html
index 49160eeb..02935636 100644
--- a/webapp-frontend/src/app/ui/stat-card/stat-card.component.html
+++ b/webapp-frontend/src/app/ui/stat-card/stat-card.component.html
@@ -1,6 +1,6 @@
 <!--
   ========================LICENSE_START=================================
-  ORAN-OSC
+  O-RAN-SC
   %%
   Copyright (C) 2019 AT&T Intellectual Property and Nokia
   %%
diff --git a/webapp-frontend/src/app/ui/stat-card/stat-card.component.spec.ts b/webapp-frontend/src/app/ui/stat-card/stat-card.component.spec.ts
index 7a7330de..813610b1 100644
--- a/webapp-frontend/src/app/ui/stat-card/stat-card.component.spec.ts
+++ b/webapp-frontend/src/app/ui/stat-card/stat-card.component.spec.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/ui/stat-card/stat-card.component.ts b/webapp-frontend/src/app/ui/stat-card/stat-card.component.ts
index 82d01a24..3f8277af 100644
--- a/webapp-frontend/src/app/ui/stat-card/stat-card.component.ts
+++ b/webapp-frontend/src/app/ui/stat-card/stat-card.component.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/xapp/xapp.component.html b/webapp-frontend/src/app/xapp/xapp.component.html
index 219e3228..5058c9d5 100644
--- a/webapp-frontend/src/app/xapp/xapp.component.html
+++ b/webapp-frontend/src/app/xapp/xapp.component.html
@@ -1,6 +1,6 @@
 <!--
   ========================LICENSE_START=================================
-  ORAN-OSC
+  O-RAN-SC
   %%
   Copyright (C) 2019 AT&T Intellectual Property and Nokia
   %%
diff --git a/webapp-frontend/src/app/xapp/xapp.component.spec.ts b/webapp-frontend/src/app/xapp/xapp.component.spec.ts
index 5c4ecb60..0e88e2ef 100644
--- a/webapp-frontend/src/app/xapp/xapp.component.spec.ts
+++ b/webapp-frontend/src/app/xapp/xapp.component.spec.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/app/xapp/xapp.component.ts b/webapp-frontend/src/app/xapp/xapp.component.ts
index 86b15f61..6e95b438 100644
--- a/webapp-frontend/src/app/xapp/xapp.component.ts
+++ b/webapp-frontend/src/app/xapp/xapp.component.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/environments/environment.prod.ts b/webapp-frontend/src/environments/environment.prod.ts
index 4be8f163..67bd4041 100644
--- a/webapp-frontend/src/environments/environment.prod.ts
+++ b/webapp-frontend/src/environments/environment.prod.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/environments/environment.ts b/webapp-frontend/src/environments/environment.ts
index 3f0e8d17..9f94b5ce 100644
--- a/webapp-frontend/src/environments/environment.ts
+++ b/webapp-frontend/src/environments/environment.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/index.html b/webapp-frontend/src/index.html
index a7fb606f..14d03e30 100644
--- a/webapp-frontend/src/index.html
+++ b/webapp-frontend/src/index.html
@@ -1,6 +1,6 @@
 <!--
   ========================LICENSE_START=================================
-  ORAN-OSC
+  O-RAN-SC
   %%
   Copyright (C) 2019 AT&T Intellectual Property and Nokia
   %%
diff --git a/webapp-frontend/src/karma.conf.js b/webapp-frontend/src/karma.conf.js
index 0ac17912..d133400a 100644
--- a/webapp-frontend/src/karma.conf.js
+++ b/webapp-frontend/src/karma.conf.js
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/main.ts b/webapp-frontend/src/main.ts
index 87a19b3f..ca13d086 100644
--- a/webapp-frontend/src/main.ts
+++ b/webapp-frontend/src/main.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/polyfills.ts b/webapp-frontend/src/polyfills.ts
index aa5f8422..baef4341 100644
--- a/webapp-frontend/src/polyfills.ts
+++ b/webapp-frontend/src/polyfills.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/webapp-frontend/src/test.ts b/webapp-frontend/src/test.ts
index 14553265..4f6bff9d 100644
--- a/webapp-frontend/src/test.ts
+++ b/webapp-frontend/src/test.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
diff --git a/xapp-mgr-client/pom.xml b/xapp-mgr-client/pom.xml
index 3f468a99..6e27cbec 100644
--- a/xapp-mgr-client/pom.xml
+++ b/xapp-mgr-client/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--<![CDATA[
 ========================LICENSE_START=================================
-ORAN-OSC
+O-RAN-SC
 %%
 Copyright (C) 2019 AT&T Intellectual Property and Nokia
 %%
@@ -107,7 +107,7 @@ limitations under the License.
 								<groupId>${project.groupId}</groupId>
 								<artifactId>${project.artifactId}</artifactId>
 								<artifactVersion>${project.version}</artifactVersion>
-								<artifactUrl>www.oran-osc.org</artifactUrl>
+								<artifactUrl>www.O-RAN-SC.org</artifactUrl>
 								<artifactDescription>xApp manager client library</artifactDescription>
 								<library>resttemplate</library>
 								<java8>true</java8>
diff --git a/xapp-mgr-client/src/test/java/org/oransc/ric/portal/dashboard/xappmgr/client/test/XappManagerClientTest.java b/xapp-mgr-client/src/test/java/org/oransc/ric/portal/dashboard/xappmgr/client/test/XappManagerClientTest.java
index 9a310bc2..e31244d0 100644
--- a/xapp-mgr-client/src/test/java/org/oransc/ric/portal/dashboard/xappmgr/client/test/XappManagerClientTest.java
+++ b/xapp-mgr-client/src/test/java/org/oransc/ric/portal/dashboard/xappmgr/client/test/XappManagerClientTest.java
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
-- 
2.16.6