Rename to OOM (no more ecd)

- Change to OOM Dashboard (no more ECOMP Controller)
- Rework some exception handling

Issue: CCSDK-61
Change-Id: Id5379e8b272b651373c79f46b20da1d32de013ed
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>

145 files changed, 275 insertions, 272 deletions

diff --git a/README.md b/README.md
index b01124c..b6f8e86 100755
--- a/README.md
+++ b/README.md
@@ -4,9 +4,9 @@
 
 This is the web UI for the ONAP Operations Manager, also known as the OOM Dashboard. 
 It consists of the following Maven projects:
-- ecd-app-common:  Java classes that run in a web container like Tomcat
-- ecd-app-overlay: CSS, HTML and Javascript resources for the web application
-- ecd-app-os:      Web application project with featurers for ONAP use
+- oom-app-common:  Java classes that run in a web container like Tomcat
+- oom-app-overlay: CSS, HTML and Javascript resources for the web application
+- oom-app-os:      Web application project with featurers for ONAP use
 
 ### Prerequites
 
diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/exception/OOMDashboardException.java b/ecd-app-common/src/main/java/org/onap/oom/dashboard/exception/OOMDashboardException.java
deleted file mode 100644
index 5fac7c5..0000000
--- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/exception/OOMDashboardException.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.onap.oom.dashboard.exception;
-
-/**
- * A little something to placate the Sonar code-analysis tool.
- */
-public class OOMDashboardException extends Exception {
-
-	private static final long serialVersionUID = -1373841666122351816L;
-
-	public OOMDashboardException() {
-		super();
-	}
-
-	public OOMDashboardException(String message) {
-		super(message);
-	}
-
-	public OOMDashboardException(String message, Throwable cause) {
-		super(message, cause);
-	}
-
-	public OOMDashboardException(Throwable cause) {
-		super(cause);
-	}
-
-}
diff --git a/ecd-app-common/.gitignore b/oom-app-common/.gitignore
index 6a47a7c..6a47a7c 100644
--- a/ecd-app-common/.gitignore
+++ b/oom-app-common/.gitignore
diff --git a/ecd-app-common/README.md b/oom-app-common/README.md
index 3bb1a66..fa3eb19 100644
--- a/ecd-app-common/README.md
+++ b/oom-app-common/README.md
@@ -6,5 +6,4 @@ The ONAP Operations Manager Dashboard provides a front-end GUI to view and
 manage executions (virtual machines) inside the ONAP Operations Manager (OOM). 
 
 This application is based on the ONAP Portal SDK.  Use Apache Maven to build 
-and package this webapp for deployment.  See the file ecd-app-deployment-guide.txt 
-for complete  details.
+and package this webapp for deployment.
diff --git a/ecd-app-common/db-scripts/README.md b/oom-app-common/db-scripts/README.md
index 474e438..dc9379d 100644
--- a/ecd-app-common/db-scripts/README.md
+++ b/oom-app-common/db-scripts/README.md
@@ -1,7 +1,7 @@
-# ECOMP-C Dashboard Database Scripts
+# ONAP Operations Manager Dashboard Database Scripts
 
 This directory has a DDL to create tables and and DML scripts to populate tables
-in Postgresql for the ECOMP-C Dashboard web application.
+in Postgresql for the ONAP Operations Manager Dashboard web application.
 
 ## Internal deployments
 
@@ -20,4 +20,4 @@ To create a database for ONAP use:
 
 Set default schema for user:
 	ALTER USER <the-user-name> SET search_path to <the-schema-name>;
-	(the above statement is not needed for version 9.4 and above)
\ No newline at end of file
+	(the above statement is not needed for version 9.4 and above)
diff --git a/ecd-app-common/db-scripts/ecd-ddl-postgres-1707-common.sql b/oom-app-common/db-scripts/oom-ddl-postgres-1707-common.sql
index c9f9e42..c42eb0f 100644
--- a/ecd-app-common/db-scripts/ecd-ddl-postgres-1707-common.sql
+++ b/oom-app-common/db-scripts/oom-ddl-postgres-1707-common.sql
@@ -1,10 +1,11 @@
 -- ---------------------------------------------------------------------------------------------------------------
--- This script creates tables for the ECOMP Controller Dashboard web app.
--- in the 1707 release, same tables for both internal and external use.
+-- This script creates tables for the ONAP Operations Manager Dashboard web app.
+-- Same tables for both internal and external use.
 -- ------------------------------------------------------------------------------------------------------------------
-CREATE SCHEMA (schema name);
 
-SET SEARCH_PATH = (schema name);
+-- Assumes no schema name for maximum flexibility
+-- CREATE SCHEMA (schema name);
+-- SET SEARCH_PATH = (schema name);
 
 create table fn_lu_timezone (
     timezone_id serial primary key,
diff --git a/ecd-app-common/db-scripts/ecd-dml-postgres-1707-common.sql b/oom-app-common/db-scripts/oom-dml-postgres-1707-common.sql
index 865248d..4503531 100644
--- a/ecd-app-common/db-scripts/ecd-dml-postgres-1707-common.sql
+++ b/oom-app-common/db-scripts/oom-dml-postgres-1707-common.sql
@@ -1,9 +1,9 @@
 -- ---------------------------------------------------------------------------------------------------------------
--- This script populates tables for the ECOMP Controller Dashboard web app.
--- in the 1707 release with data for all versions.
+-- This script populates tables for the ONAP Operations Manager Dashboard web app.
 -- ---------------------------------------------------------------------------------------------------------------
 
-SET SEARCH_PATH = (schema name);
+-- Assumes no schema for maximum flexibility
+-- SET SEARCH_PATH = (schema name);
 
 -- fn_lu_activity
 Insert into fn_lu_activity (ACTIVITY_CD,ACTIVITY) values ('add_role','add_role');
diff --git a/ecd-app-common/pom.xml b/oom-app-common/pom.xml
index 07aea5d..fa61c01 100644
--- a/ecd-app-common/pom.xml
+++ b/oom-app-common/pom.xml
@@ -1,23 +1,11 @@
 <?xml version="1.0"?>
-<!-- =============LICENSE_START========================================================= 
-	================================================================================= 
-	Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. ================================================================================ 
-	Licensed under the Apache License, Version 2.0 (the "License"); you may not 
-	use this file except in compliance with the License. You may obtain a copy 
-	of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
-	by applicable law or agreed to in writing, software distributed under the 
-	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
-	OF ANY KIND, either express or implied. See the License for the specific 
-	language governing permissions and limitations under the License. ============LICENSE_END========================================================= 
-	ECOMP is a trademark and service mark of AT&T Intellectual Property. -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>org.onap.oom.dashboard</groupId>
-	<artifactId>ecd-app-common</artifactId>
-	<version>1707.4.1-SNAPSHOT</version>
+	<artifactId>oom-app-common</artifactId>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>ONAP Operations Manager Dashboard common</name>
 	<description>OOM Dashboard common Java code</description>
diff --git a/ecd-app-common/src/main/java/org/onap/fusionapp/model/Result.java b/oom-app-common/src/main/java/org/onap/fusionapp/model/Result.java
index 1f6328d..1f6328d 100644
--- a/ecd-app-common/src/main/java/org/onap/fusionapp/model/Result.java
+++ b/oom-app-common/src/main/java/org/onap/fusionapp/model/Result.java
diff --git a/ecd-app-common/src/main/java/org/onap/fusionapp/service/AdminAuthExtension.java b/oom-app-common/src/main/java/org/onap/fusionapp/service/AdminAuthExtension.java
index 8a64ab5..8a64ab5 100644
--- a/ecd-app-common/src/main/java/org/onap/fusionapp/service/AdminAuthExtension.java
+++ b/oom-app-common/src/main/java/org/onap/fusionapp/service/AdminAuthExtension.java
diff --git a/ecd-app-common/src/main/java/org/onap/fusionapp/util/CustomLoggingFilter.java b/oom-app-common/src/main/java/org/onap/fusionapp/util/CustomLoggingFilter.java
index 5ae372f..5ae372f 100644
--- a/ecd-app-common/src/main/java/org/onap/fusionapp/util/CustomLoggingFilter.java
+++ b/oom-app-common/src/main/java/org/onap/fusionapp/util/CustomLoggingFilter.java
diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/controller/CloudifyController.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/CloudifyController.java
index ed2c903..241a8cf 100644
--- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/controller/CloudifyController.java
+++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/CloudifyController.java
@@ -31,7 +31,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.onap.oom.dashboard.exception.OOMDashboardException;
+import org.onap.oom.dashboard.exception.DashboardControllerException;
 import org.onap.oom.dashboard.model.CloudifyBlueprint;
 import org.onap.oom.dashboard.model.CloudifyBlueprintUpload;
 import org.onap.oom.dashboard.model.CloudifyDeployment;
@@ -124,12 +124,12 @@ public class CloudifyController extends DashboardRestrictedBaseController {
 	 * @param pageSize
 	 *            Number of items per browser page
 	 * @return JSON block as String, see above.
-	 * @throws OOMDashboardException
+	 * @throws DashboardControllerException
 	 *             On any error; e.g., Network failure.
 	 */
 	@SuppressWarnings({ "rawtypes", "unchecked" })
 	private String getItemListForPage(long userId, CloudifyDataItem option, int pageNum, int pageSize)
-			throws Exception {
+			throws DashboardControllerException, JsonProcessingException {
 		IControllerRestClient restClient = getControllerRestClient(userId);
 		List itemList = null;
 		switch (option) {
@@ -142,7 +142,7 @@ public class CloudifyController extends DashboardRestrictedBaseController {
 			Collections.sort(itemList, deploymentComparator);
 			break;
 		default:
-			throw new OOMDashboardException("getItemListForPage failed: unimplemented case: " + option.name());
+			throw new DashboardControllerException("getItemListForPage failed: unimplemented case: " + option.name());
 		}
 
 		// Shrink if needed
@@ -170,7 +170,7 @@ public class CloudifyController extends DashboardRestrictedBaseController {
 		try {
 			User appUser = UserUtils.getUserSession(request);
 			if (appUser == null || appUser.getLoginId() == null || appUser.getLoginId().length() == 0)
-				throw new OOMDashboardException("getItemListForPageWrapper: Failed to get application user");
+				throw new DashboardControllerException("getItemListForPageWrapper: Failed to get application user");
 			int pageNum = getRequestPageNumber(request);
 			int pageSize = getRequestPageSize(request);
 			outboundJson = getItemListForPage(appUser.getId(), option, pageNum, pageSize);
@@ -235,13 +235,13 @@ public class CloudifyController extends DashboardRestrictedBaseController {
 	 * @param request
 	 *            HttpServletRequest
 	 * @return Blueprint as JSON; or error.
-	 * @throws Exception
+	 * @throws JsonProcessingException
 	 *             on serialization error
 	 * 
 	 */
 	@RequestMapping(value = { BLUEPRINTS_PATH + "/{id}" }, method = RequestMethod.GET, produces = "application/json")
 	@ResponseBody
-	public String getBlueprintById(@PathVariable("id") String id, HttpServletRequest request) throws Exception {
+	public String getBlueprintById(@PathVariable("id") String id, HttpServletRequest request) throws JsonProcessingException {
 		MDC.put(SystemProperties.AUDITLOG_BEGIN_TIMESTAMP, logDateFormat.format(new Date()));
 		logger.setRequestBasedDefaultsIntoGlobalLoggingContext(request, APP_NAME);
 		ECTransportModel result = null;
@@ -266,14 +266,14 @@ public class CloudifyController extends DashboardRestrictedBaseController {
 	 * @param request
 	 *            HttpServletRequest
 	 * @return Blueprint as YAML; or error.
-	 * @throws Exception
+	 * @throws JsonProcessingException
 	 *             on serialization error
 	 * 
 	 */
 	@RequestMapping(value = {
 			VIEW_BLUEPRINTS_PATH + "/{id}" }, method = RequestMethod.GET, produces = "application/yaml")
 	@ResponseBody
-	public String viewBlueprintContentById(@PathVariable("id") String id, HttpServletRequest request) throws Exception {
+	public String viewBlueprintContentById(@PathVariable("id") String id, HttpServletRequest request) throws JsonProcessingException {
 		MDC.put(SystemProperties.AUDITLOG_BEGIN_TIMESTAMP, logDateFormat.format(new Date()));
 		logger.setRequestBasedDefaultsIntoGlobalLoggingContext(request, APP_NAME);
 		ECTransportModel result = null;
@@ -298,13 +298,13 @@ public class CloudifyController extends DashboardRestrictedBaseController {
 	 * @param blueprint
 	 *            Cloudify blueprint
 	 * @return Blueprint as uploaded; or error.
-	 * @throws Exception
+	 * @throws JsonProcessingException
 	 *             on serialization error
 	 */
 	@RequestMapping(value = { BLUEPRINTS_PATH }, method = RequestMethod.POST, produces = "application/json")
 	@ResponseBody
 	public String uploadBlueprint(HttpServletRequest request, @RequestBody CloudifyBlueprintUpload blueprint)
-			throws Exception {
+			throws JsonProcessingException {
 		MDC.put(SystemProperties.AUDITLOG_BEGIN_TIMESTAMP, logDateFormat.format(new Date()));
 		logger.setRequestBasedDefaultsIntoGlobalLoggingContext(request, APP_NAME);
 		ECTransportModel result = null;
@@ -331,13 +331,13 @@ public class CloudifyController extends DashboardRestrictedBaseController {
 	 * @param response
 	 *            HttpServletResponse
 	 * @return No content on success; error on failure.
-	 * @throws Exception
+	 * @throws JsonProcessingException
 	 *             On serialization failure
 	 */
 	@RequestMapping(value = { BLUEPRINTS_PATH + "/{id}" }, method = RequestMethod.DELETE, produces = "application/json")
 	@ResponseBody
 	public String deleteBlueprint(@PathVariable("id") String id, HttpServletRequest request,
-			HttpServletResponse response) throws Exception {
+			HttpServletResponse response) throws JsonProcessingException {
 		MDC.put(SystemProperties.AUDITLOG_BEGIN_TIMESTAMP, logDateFormat.format(new Date()));
 		logger.setRequestBasedDefaultsIntoGlobalLoggingContext(request, APP_NAME);
 		ECTransportModel result = null;
@@ -366,13 +366,13 @@ public class CloudifyController extends DashboardRestrictedBaseController {
 	 * @param request
 	 *            HttpServletRequest
 	 * @return Deployment for the specified ID; error on failure.
-	 * @throws Exception
+	 * @throws JsonProcessingException
 	 *             On serialization failure
 	 * 
 	 */
 	@RequestMapping(value = { DEPLOYMENTS_PATH + "/{id}" }, method = RequestMethod.GET, produces = "application/json")
 	@ResponseBody
-	public String getDeploymentById(@PathVariable("id") String id, HttpServletRequest request) throws Exception {
+	public String getDeploymentById(@PathVariable("id") String id, HttpServletRequest request) throws JsonProcessingException {
 		MDC.put(SystemProperties.AUDITLOG_BEGIN_TIMESTAMP, logDateFormat.format(new Date()));
 		logger.setRequestBasedDefaultsIntoGlobalLoggingContext(request, APP_NAME);
 		ECTransportModel result = null;
@@ -397,13 +397,13 @@ public class CloudifyController extends DashboardRestrictedBaseController {
 	 * @param deployment
 	 *            Deployment to upload
 	 * @return Body of deployment; error on failure
-	 * @throws Exception
+	 * @throws JsonProcessingException
 	 *             On serialization failure
 	 */
 	@RequestMapping(value = { DEPLOYMENTS_PATH }, method = RequestMethod.POST, produces = "application/json")
 	@ResponseBody
 	public String createDeployment(HttpServletRequest request, @RequestBody CloudifyDeploymentRequest deployment)
-			throws Exception {
+			throws JsonProcessingException {
 		MDC.put(SystemProperties.AUDITLOG_BEGIN_TIMESTAMP, logDateFormat.format(new Date()));
 		logger.setRequestBasedDefaultsIntoGlobalLoggingContext(request, APP_NAME);
 		ECTransportModel result = null;
@@ -434,7 +434,7 @@ public class CloudifyController extends DashboardRestrictedBaseController {
 	 *            HttpServletResponse
 	 * @return Passes thru HTTP status code from remote endpoint; no body on
 	 *         success
-	 * @throws Exception
+	 * @throws JsonProcessingException
 	 *             on serialization failure
 	 */
 	@RequestMapping(value = {
@@ -442,7 +442,7 @@ public class CloudifyController extends DashboardRestrictedBaseController {
 	@ResponseBody
 	public String deleteDeployment(@PathVariable("id") String id,
 			@RequestParam(value = "ignore_live_nodes", required = false) Boolean ignoreLiveNodes,
-			HttpServletRequest request, HttpServletResponse response) throws Exception {
+			HttpServletRequest request, HttpServletResponse response) throws JsonProcessingException {
 		MDC.put(SystemProperties.AUDITLOG_BEGIN_TIMESTAMP, logDateFormat.format(new Date()));
 		logger.setRequestBasedDefaultsIntoGlobalLoggingContext(request, APP_NAME);
 		ECTransportModel result = null;
@@ -484,7 +484,7 @@ public class CloudifyController extends DashboardRestrictedBaseController {
 	 *            Optional request parameter; if found, only executions with
 	 *            that status are returned.
 	 * @return List of CloudifyExecution objects
-	 * @throws Exception
+	 * @throws JsonProcessingException
 	 *             on serialization failure
 	 */
 	@SuppressWarnings("unchecked")
@@ -492,7 +492,7 @@ public class CloudifyController extends DashboardRestrictedBaseController {
 	@ResponseBody
 	public String getExecutionsByPage(HttpServletRequest request,
 			@RequestParam(value = "deployment_id", required = false) String deployment_id,
-			@RequestParam(value = "status", required = false) String status) throws Exception {
+			@RequestParam(value = "status", required = false) String status) throws JsonProcessingException {
 		MDC.put(SystemProperties.AUDITLOG_BEGIN_TIMESTAMP, logDateFormat.format(new Date()));
 		logger.setRequestBasedDefaultsIntoGlobalLoggingContext(request, APP_NAME);
 		ECTransportModel result = null;
@@ -551,13 +551,13 @@ public class CloudifyController extends DashboardRestrictedBaseController {
 	 * @param request
 	 *            HttpServletRequest
 	 * @return CloudifyExecutionList
-	 * @throws Exception
+	 * @throws JsonProcessingException
 	 *             on serialization failure
 	 */
 	@RequestMapping(value = { EXECUTIONS_PATH + "/{id}" }, method = RequestMethod.GET, produces = "application/json")
 	@ResponseBody
 	public String getExecutionByIdAndDeploymentId(@PathVariable("id") String execution_id,
-			@RequestParam("deployment_id") String deployment_id, HttpServletRequest request) throws Exception {
+			@RequestParam("deployment_id") String deployment_id, HttpServletRequest request) throws JsonProcessingException {
 		MDC.put(SystemProperties.AUDITLOG_BEGIN_TIMESTAMP, logDateFormat.format(new Date()));
 		logger.setRequestBasedDefaultsIntoGlobalLoggingContext(request, APP_NAME);
 		ECTransportModel result = null;
@@ -582,13 +582,13 @@ public class CloudifyController extends DashboardRestrictedBaseController {
 	 * @param execution
 	 *            Execution model
 	 * @return Information about the execution
-	 * @throws Exception
+	 * @throws JsonProcessingException
 	 *             on serialization failure
 	 */
 	@RequestMapping(value = { EXECUTIONS_PATH }, method = RequestMethod.POST, produces = "application/json")
 	@ResponseBody
 	public String startExecution(HttpServletRequest request, @RequestBody CloudifyExecutionRequest execution)
-			throws Exception {
+			throws JsonProcessingException {
 		MDC.put(SystemProperties.AUDITLOG_BEGIN_TIMESTAMP, logDateFormat.format(new Date()));
 		logger.setRequestBasedDefaultsIntoGlobalLoggingContext(request, APP_NAME);
 		ECTransportModel result = null;
@@ -618,16 +618,15 @@ public class CloudifyController extends DashboardRestrictedBaseController {
 	 *            HttpServletRequest
 	 * @param response
 	 *            HttpServletRequest
-	 * @return Passes thru HTTP status code from remote endpoint; no body on
-	 *         success
-	 * @throws Exception
+	 * @return Passes thru HTTP status code from remote endpoint; no body on success
+	 * @throws JsonProcessingException
 	 *             on serialization failure
 	 */
 	@RequestMapping(value = { EXECUTIONS_PATH + "/{id}" }, method = RequestMethod.DELETE, produces = "application/json")
 	@ResponseBody
 	public String cancelExecution(@PathVariable("id") String id,
 			@RequestParam(value = "deployment_id") String deploymentId, @RequestParam(value = "action") String action,
-			HttpServletRequest request, HttpServletResponse response) throws Exception {
+			HttpServletRequest request, HttpServletResponse response) throws JsonProcessingException {
 		MDC.put(SystemProperties.AUDITLOG_BEGIN_TIMESTAMP, logDateFormat.format(new Date()));
 		logger.setRequestBasedDefaultsIntoGlobalLoggingContext(request, APP_NAME);
 		ECTransportModel result = null;
diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/controller/ConsulController.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/ConsulController.java
index 5d75759..6c2cfb0 100644
--- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/controller/ConsulController.java
+++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/ConsulController.java
@@ -31,7 +31,7 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.onap.oom.dashboard.exception.OOMDashboardException;
+import org.onap.oom.dashboard.exception.DashboardControllerException;
 import org.onap.oom.dashboard.model.ConsulHealthServiceRegistration;
 import org.onap.oom.dashboard.model.ConsulNodeInfo;
 import org.onap.oom.dashboard.model.ConsulServiceHealth;
@@ -109,8 +109,8 @@ public class ConsulController extends DashboardRestrictedBaseController {
 	};
 
 	/**
-	 * Gets one page of objects and supporting information via the REST client.
-	 * On success, returns a page of objects as String.
+	 * Gets one page of objects and supporting information via the REST client. On
+	 * success, returns a page of objects as String.
 	 * 
 	 * @param option
 	 *            Specifies which item type to get
@@ -119,11 +119,12 @@ public class ConsulController extends DashboardRestrictedBaseController {
 	 * @param pageSize
 	 *            Number of items per browser page
 	 * @return JSON block as String, see above.
-	 * @throws Exception
-	 *             On any error; e.g., Network failure.
+	 * @throws DashboardControllerException,
+	 *             JsonProcessingException On any error; e.g., Network failure.
 	 */
 	@SuppressWarnings({ "unchecked", "rawtypes" })
-	private String getItemListForPage(long userId, ConsulDataItem option, int pageNum, int pageSize) throws Exception {
+	private String getItemListForPage(long userId, ConsulDataItem option, int pageNum, int pageSize)
+			throws DashboardControllerException, JsonProcessingException {
 		IControllerRestClient restClient = getControllerRestClient(userId);
 		List itemList = null;
 		switch (option) {
@@ -135,7 +136,7 @@ public class ConsulController extends DashboardRestrictedBaseController {
 			itemList = restClient.getDatacenters();
 			break;
 		default:
-			throw new OOMDashboardException("getItemListForPage failed: unimplemented case: " + option.name());
+			throw new DashboardControllerException("getItemListForPage failed: unimplemented case: " + option.name());
 		}
 
 		// Shrink if needed
@@ -162,7 +163,7 @@ public class ConsulController extends DashboardRestrictedBaseController {
 		try {
 			User appUser = UserUtils.getUserSession(request);
 			if (appUser == null || appUser.getLoginId() == null || appUser.getLoginId().length() == 0)
-				throw new OOMDashboardException("getItemListForPageWrapper: Failed to get application user");
+				throw new DashboardControllerException("getItemListForPageWrapper: Failed to get application user");
 			int pageNum = getRequestPageNumber(request);
 			int pageSize = getRequestPageSize(request);
 			outboundJson = getItemListForPage(appUser.getId(), option, pageNum, pageSize);
@@ -186,12 +187,12 @@ public class ConsulController extends DashboardRestrictedBaseController {
 	 * @param request
 	 *            HttpServletRequest
 	 * @return List of ConsulServiceInfo objects, as JSON
-	 * @throws Exception
+	 * @throws JsonProcessingException
 	 *             if serialization fails
 	 */
 	@RequestMapping(value = { SERVICES_PATH }, method = RequestMethod.GET, produces = "application/json")
 	@ResponseBody
-	public String getServices(HttpServletRequest request) throws Exception {
+	public String getServices(HttpServletRequest request) throws JsonProcessingException {
 		MDC.put(SystemProperties.AUDITLOG_BEGIN_TIMESTAMP, logDateFormat.format(new Date()));
 		logger.setRequestBasedDefaultsIntoGlobalLoggingContext(request, APP_NAME);
 		Object result = null;
@@ -216,13 +217,14 @@ public class ConsulController extends DashboardRestrictedBaseController {
 	 * @param serviceId
 	 *            Service ID
 	 * @return List of ConsulServiceHealth objects as JSON
-	 * @throws Exception
+	 * @throws JsonProcessingException
 	 *             if serialization fails
 	 */
 	@RequestMapping(value = {
 			SERVICES_PATH + "/{serviceId}" }, method = RequestMethod.GET, produces = "application/json")
 	@ResponseBody
-	public String getServiceHealthDetails(HttpServletRequest request, @PathVariable String serviceId) throws Exception {
+	public String getServiceHealthDetails(HttpServletRequest request, @PathVariable String serviceId)
+			throws JsonProcessingException {
 		MDC.put(SystemProperties.AUDITLOG_BEGIN_TIMESTAMP, logDateFormat.format(new Date()));
 		logger.setRequestBasedDefaultsIntoGlobalLoggingContext(request, APP_NAME);
 		Object result = null;
@@ -251,7 +253,7 @@ public class ConsulController extends DashboardRestrictedBaseController {
 	 *            Latest date-time as an ISO 8061 value, such as
 	 *            2007-12-03T10:15:30+01:00
 	 * @return List of ConsulServiceHealth objects as JSON
-	 * @throws Exception
+	 * @throws JsonProcessingException
 	 *             if serialization fails
 	 */
 	@RequestMapping(value = { "/svchist/{serviceName}" }, method = RequestMethod.GET, produces = "application/json")
@@ -259,7 +261,7 @@ public class ConsulController extends DashboardRestrictedBaseController {
 	public String getServiceHealthHistory(HttpServletRequest request, //
 			@PathVariable String serviceName, //
 			@RequestParam String start, //
-			@RequestParam String end) throws Exception {
+			@RequestParam String end) throws JsonProcessingException {
 		MDC.put(SystemProperties.AUDITLOG_BEGIN_TIMESTAMP, logDateFormat.format(new Date()));
 		logger.setRequestBasedDefaultsIntoGlobalLoggingContext(request, APP_NAME);
 		Object result = null;
@@ -273,7 +275,7 @@ public class ConsulController extends DashboardRestrictedBaseController {
 			result = new RestResponseError(e.getResponseBodyAsString());
 		} catch (Throwable t) {
 			// Work around the hack to report no-match.
-			result = new RestResponseError("getServiceHealthHistory failed: " + t.getMessage());		
+			result = new RestResponseError("getServiceHealthHistory failed: " + t.getMessage());
 		}
 		MDC.put(SystemProperties.AUDITLOG_END_TIMESTAMP, logDateFormat.format(new Date()));
 		logger.info(EELFLoggerDelegate.auditLogger, request.getMethod() + request.getRequestURI());
@@ -281,8 +283,8 @@ public class ConsulController extends DashboardRestrictedBaseController {
 	}
 
 	/**
-	 * Serves one page of service health information by getting all service
-	 * names, then iterating over them to get the health of each service.
+	 * Serves one page of service health information by getting all service names,
+	 * then iterating over them to get the health of each service.
 	 * 
 	 * ECOMP-C does NOT provide an API to get the health of all services in one
 	 * request.
@@ -290,13 +292,13 @@ public class ConsulController extends DashboardRestrictedBaseController {
 	 * @param request
 	 *            HttpServletRequest
 	 * @return List of ConsulServiceHealth objects, as JSON
-	 * @throws Exception
+	 * @throws JsonProcessingException
 	 *             on serialization exception
 	 */
 	@SuppressWarnings("unchecked")
 	@RequestMapping(value = { "/serviceshealth" }, method = RequestMethod.GET, produces = "application/json")
 	@ResponseBody
-	public String getServicesHealth(HttpServletRequest request) throws Exception {
+	public String getServicesHealth(HttpServletRequest request) throws JsonProcessingException {
 		MDC.put(SystemProperties.AUDITLOG_BEGIN_TIMESTAMP, logDateFormat.format(new Date()));
 		logger.setRequestBasedDefaultsIntoGlobalLoggingContext(request, APP_NAME);
 		ECTransportModel result = null;
@@ -352,12 +354,13 @@ public class ConsulController extends DashboardRestrictedBaseController {
 	 * @param nodeName
 	 *            Node name
 	 * @return List of ConsulServiceHealth objects as JSON
-	 * @throws Exception
+	 * @throws JsonProcessingException
 	 *             if serialization fails
 	 */
 	@RequestMapping(value = { NODES_PATH + "/{nodeName}" }, method = RequestMethod.GET, produces = "application/json")
 	@ResponseBody
-	public String getNodeServicesHealth(HttpServletRequest request, @PathVariable String nodeName) throws Exception {
+	public String getNodeServicesHealth(HttpServletRequest request, @PathVariable String nodeName)
+			throws JsonProcessingException {
 		MDC.put(SystemProperties.AUDITLOG_BEGIN_TIMESTAMP, logDateFormat.format(new Date()));
 		logger.setRequestBasedDefaultsIntoGlobalLoggingContext(request, APP_NAME);
 		Object result = null;
@@ -398,13 +401,13 @@ public class ConsulController extends DashboardRestrictedBaseController {
 	 * @param registration
 	 *            Consul service registration
 	 * @return URI of the newly registered resource
-	 * @throws Exception
+	 * @throws JsonProcessingException
 	 *             on serialization error
 	 */
 	@RequestMapping(value = { "/register" }, method = RequestMethod.POST, produces = "application/json")
 	@ResponseBody
 	public String registerService(HttpServletRequest request, @RequestBody ConsulHealthServiceRegistration registration)
-			throws Exception {
+			throws JsonProcessingException {
 		MDC.put(SystemProperties.AUDITLOG_BEGIN_TIMESTAMP, logDateFormat.format(new Date()));
 		logger.setRequestBasedDefaultsIntoGlobalLoggingContext(request, APP_NAME);
 		ECTransportModel result = null;
@@ -430,13 +433,14 @@ public class ConsulController extends DashboardRestrictedBaseController {
 	 * @param serviceName
 	 *            Consul service name to deregister
 	 * @return Success or error indicator
-	 * @throws Exception
+	 * @throws JsonProcessingException
 	 *             on serialization error
 	 */
-	@RequestMapping(value = { "/deregister" + "/{serviceName}" }, method = RequestMethod.POST, produces = "application/json")
+	@RequestMapping(value = {
+			"/deregister" + "/{serviceName}" }, method = RequestMethod.POST, produces = "application/json")
 	@ResponseBody
-	public String deregisterService(HttpServletRequest request,
-			@PathVariable String serviceName) throws Exception {
+	public String deregisterService(HttpServletRequest request, @PathVariable String serviceName)
+			throws JsonProcessingException {
 		MDC.put(SystemProperties.AUDITLOG_BEGIN_TIMESTAMP, logDateFormat.format(new Date()));
 		logger.setRequestBasedDefaultsIntoGlobalLoggingContext(request, APP_NAME);
 		ECTransportModel result = null;
diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/controller/DashboardHomeController.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/DashboardHomeController.java
index a0c521d..bebf0dd 100644
--- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/controller/DashboardHomeController.java
+++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/DashboardHomeController.java
@@ -26,7 +26,7 @@ import java.util.ArrayList;
 import javax.servlet.http.HttpServletRequest;
 
 import org.onap.oom.dashboard.domain.ControllerEndpoint;
-import org.onap.oom.dashboard.exception.OOMDashboardException;
+import org.onap.oom.dashboard.exception.DashboardControllerException;
 import org.onap.oom.dashboard.model.ControllerEndpointCredentials;
 import org.onap.oom.dashboard.model.ControllerEndpointTransport;
 import org.onap.oom.dashboard.model.RestResponseError;
@@ -44,16 +44,22 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 /**
- * This controller maps requests for the application's landing page, which is
- * an Angular single-page application.
+ * This controller maps requests for the application's landing page, which is an
+ * Angular single-page application.
  */
 @Controller
 @RequestMapping("/")
 public class DashboardHomeController extends DashboardRestrictedBaseController {
 
+	/**
+	 * This path is embedded in the database, so it's nontrivial to change.
+	 */
+	public static final String APP_CONTEXT_PATH = "/ecd";
+
 	private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(DashboardHomeController.class);
 
 	@Autowired
@@ -67,8 +73,7 @@ public class DashboardHomeController extends DashboardRestrictedBaseController {
 	private static final String CONTROLLERS_PATH = "controllers";
 
 	/**
-	 * Never forget that Spring autowires fields AFTER the constructor is
-	 * called.
+	 * Spring autowires fields AFTER the constructor is called.
 	 */
 	public DashboardHomeController() {
 		mapper = new ObjectMapper();
@@ -80,10 +85,10 @@ public class DashboardHomeController extends DashboardRestrictedBaseController {
 	 * @return View name key, which is resolved to a file using an Apache tiles
 	 *         "definitions.xml" file.
 	 */
-	@RequestMapping(value = { "/ecd" }, method = RequestMethod.GET)
+	@RequestMapping(value = { APP_CONTEXT_PATH }, method = RequestMethod.GET)
 	public ModelAndView dbcDefaultController() {
 		// a model is only useful for JSP; this app is angular.
-		return new ModelAndView("ecd_home_tdkey");
+		return new ModelAndView("oom_home_tdkey");
 	}
 
 	/**
@@ -91,10 +96,7 @@ public class DashboardHomeController extends DashboardRestrictedBaseController {
 	 * 
 	 * @param request
 	 *            HttpServletRequest
-	 * @return List of ControllerEndpointTransport objects, or an error on
-	 *         failure
-	 * @throws Exception
-	 *             if application user is not found
+	 * @return List of ControllerEndpointTransport objects, or an error on failure
 	 */
 	@RequestMapping(value = { CONTROLLERS_PATH }, method = RequestMethod.GET, produces = "application/json")
 	@ResponseBody
@@ -107,7 +109,7 @@ public class DashboardHomeController extends DashboardRestrictedBaseController {
 		try {
 			User appUser = UserUtils.getUserSession(request);
 			if (appUser == null || appUser.getLoginId() == null || appUser.getLoginId().length() == 0)
-				throw new OOMDashboardException("getControllers: Failed to get application user");
+				throw new DashboardControllerException("getControllers: Failed to get application user");
 			ControllerEndpointCredentials selectedInDb = getOrSetControllerEndpointSelection(appUser.getId());
 			// Built result from properties
 			ArrayList<ControllerEndpointTransport> list = new ArrayList<>();
@@ -136,19 +138,21 @@ public class DashboardHomeController extends DashboardRestrictedBaseController {
 	 * @param endpoint
 	 *            Body with endpoint details
 	 * @return Result indicating success or failure
-	 * @throws Exception
+	 * @throws DashboardControllerException,
 	 *             if application user is not found
+	 * @throws JsonProcessingException
+	 *             If serialization fails
 	 */
 	@RequestMapping(value = { CONTROLLERS_PATH }, method = RequestMethod.POST, produces = "application/json")
 	@ResponseBody
 	public String setControllerSelection(HttpServletRequest request, @RequestBody ControllerEndpointTransport endpoint)
-			throws Exception {
+			throws DashboardControllerException, JsonProcessingException {
 		logger.setRequestBasedDefaultsIntoGlobalLoggingContext(request, APP_NAME);
 		logger.info(EELFLoggerDelegate.auditLogger, request.getMethod() + request.getRequestURI());
 		String outboundJson = null;
 		User appUser = UserUtils.getUserSession(request);
 		if (appUser == null || appUser.getLoginId() == null || appUser.getLoginId().length() == 0)
-			throw new OOMDashboardException("setControllerSelection: Failed to get application user");
+			throw new DashboardControllerException("setControllerSelection: Failed to get application user");
 		ControllerEndpoint dbEntry = new ControllerEndpoint(appUser.getId(), endpoint.getName(), endpoint.getUrl());
 		controllerEndpointService.updateControllerEndpointSelection(dbEntry);
 		RestResponseSuccess success = new RestResponseSuccess("Updated selection to " + endpoint.getName());
diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/controller/DashboardRestrictedBaseController.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/DashboardRestrictedBaseController.java
index 28b336c..cdf0f0e 100644
--- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/controller/DashboardRestrictedBaseController.java
+++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/DashboardRestrictedBaseController.java
@@ -28,7 +28,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 
 import org.onap.oom.dashboard.domain.ControllerEndpoint;
-import org.onap.oom.dashboard.exception.OOMDashboardException;
+import org.onap.oom.dashboard.exception.DashboardControllerException;
 import org.onap.oom.dashboard.model.ControllerEndpointCredentials;
 import org.onap.oom.dashboard.rest.ControllerRestClientImpl;
 import org.onap.oom.dashboard.rest.ControllerRestClientMockImpl;
@@ -234,11 +234,12 @@ public class DashboardRestrictedBaseController extends RestrictedBaseController
 	 * @param request
 	 *            HttpServletRequest
 	 * @return REST client appropriate for the user
+	 * @throws DashboardControllerException
 	 */
-	protected IControllerRestClient getControllerRestClient(HttpServletRequest request) throws Exception {
+	protected IControllerRestClient getControllerRestClient(HttpServletRequest request) throws DashboardControllerException {
 		User appUser = UserUtils.getUserSession(request);
 		if (appUser == null || appUser.getLoginId() == null || appUser.getLoginId().length() == 0)
-			throw new OOMDashboardException("getControllerRestClient: Failed to get application user");
+			throw new DashboardControllerException("getControllerRestClient: Failed to get application user");
 		return getControllerRestClient(appUser.getId());
 	}
 
@@ -247,8 +248,9 @@ public class DashboardRestrictedBaseController extends RestrictedBaseController
 	 * client with appropriate credentials from properties.
 	 * 
 	 * @return REST client.
+	 * @throws DashboardControllerException on any failure; e.g., if the password cannot be decrypted.
 	 */
-	protected IControllerRestClient getControllerRestClient(long userId) throws Exception {
+	protected IControllerRestClient getControllerRestClient(long userId) throws DashboardControllerException {
 		IControllerRestClient result = null;
 		// Be robust to missing development-only property
 		boolean mock = false;
@@ -257,9 +259,15 @@ public class DashboardRestrictedBaseController extends RestrictedBaseController
 		if (mock) {
 			result = new ControllerRestClientMockImpl();
 		} else {
+			try {
 			ControllerEndpointCredentials details = getOrSetControllerEndpointSelection(userId);
 			final String clearText = details.getEncryptedPassword() ? details.decryptPassword() : details.getPassword();
 			result = new ControllerRestClientImpl(details.getUrl(), details.getUsername(), clearText);
+			}
+			catch (Exception ex) {
+				logger.error("getControllerRestClient failed", ex);
+				throw new DashboardControllerException(ex);
+			}
 		}
 		return result;
 	}
diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/controller/ECDSingleSignOnController.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/ECDSingleSignOnController.java
index 499cb73..0e0f096 100644
--- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/controller/ECDSingleSignOnController.java
+++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/ECDSingleSignOnController.java
@@ -1,5 +1,7 @@
 package org.onap.oom.dashboard.controller;
 
+import java.io.UnsupportedEncodingException;
+
 /*-
  * ================================================================================
  * ECOMP Portal SDK
@@ -30,12 +32,14 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import org.onap.oom.dashboard.exception.DashboardControllerException;
 import org.openecomp.portalsdk.core.auth.LoginStrategy;
 import org.openecomp.portalsdk.core.command.LoginBean;
 import org.openecomp.portalsdk.core.controller.UnRestrictedBaseController;
 import org.openecomp.portalsdk.core.domain.User;
 import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.openecomp.portalsdk.core.menu.MenuProperties;
+import org.openecomp.portalsdk.core.onboarding.exception.PortalAPIException;
 import org.openecomp.portalsdk.core.onboarding.listener.PortalTimeoutHandler;
 import org.openecomp.portalsdk.core.onboarding.util.PortalApiConstants;
 import org.openecomp.portalsdk.core.onboarding.util.PortalApiProperties;
@@ -75,19 +79,24 @@ public class ECDSingleSignOnController extends UnRestrictedBaseController {
 	private String welcomeView;
 
 	/**
-	 * Handles requests directed to the single sign-on page by the session
-	 * timeout interceptor.
+	 * Handles requests directed to the single sign-on page by the session timeout
+	 * interceptor.
 	 * 
 	 * @param request
 	 *            HttpServletRequest
 	 * @param response
 	 *            HttpServletResponse
 	 * @return Redirect to an appropriate address
-	 * @throws Exception
-	 * On any failure
+	 * @throws DashboardControllerException
+	 *             User not found
+	 * @throws PortalAPIException
+	 *             User ID can't be fetched
+	 * @throws UnsupportedEncodingException
+	 *             Encoding fails
 	 */
 	@RequestMapping(value = { "/single_signon.htm" }, method = RequestMethod.GET)
-	public ModelAndView singleSignOnLogin(HttpServletRequest request, HttpServletResponse response) throws Exception {
+	public ModelAndView singleSignOnLogin(HttpServletRequest request, HttpServletResponse response)
+			throws DashboardControllerException, PortalAPIException, UnsupportedEncodingException {
 
 		Map<String, String> model = new HashMap<String, String>();
 		HashMap<String, String> additionalParamsMap = new HashMap<String, String>();
@@ -106,9 +115,14 @@ public class ECDSingleSignOnController extends UnRestrictedBaseController {
 				final String authMech = SystemProperties.getProperty(SystemProperties.AUTHENTICATION_MECHANISM);
 				String userId = loginStrategy.getUserId(request);
 				commandBean.setUserid(userId);
-				commandBean = getLoginService().findUser(commandBean,
-						(String) request.getAttribute(MenuProperties.MENU_PROPERTIES_FILENAME_KEY),
-						additionalParamsMap);
+				try {
+					commandBean = getLoginService().findUser(commandBean,
+							(String) request.getAttribute(MenuProperties.MENU_PROPERTIES_FILENAME_KEY),
+							additionalParamsMap);
+				} catch (Exception ex) {
+					logger.error("singleSignOnLogin failed", ex);
+					throw new DashboardControllerException(ex);
+				}
 				if (commandBean.getUser() == null) {
 					String loginErrorMessage = (commandBean.getLoginErrorMessage() != null)
 							? commandBean.getLoginErrorMessage()
@@ -146,20 +160,17 @@ public class ECDSingleSignOnController extends UnRestrictedBaseController {
 			}
 		} else {
 			/*
-			 * Login cookie not found, or redirect-to-portal parameter was
-			 * found.
+			 * Login cookie not found, or redirect-to-portal parameter was found.
 			 */
 			if (isPortalAvailable()) {
 				/*
-				 * Redirect the user to the portal with a suitable return URL.
-				 * The forwardURL parameter that arrives as a parameter is a
-				 * partial (not absolute) request path for a page in the
-				 * application. The challenge here is to compute the correct
-				 * absolute path for the original request so the portal can
-				 * redirect the user back to the right place. If the application
-				 * sits behind WebJunction, or if separate FE-BE hosts are used,
-				 * then the URL yielded by the request has a host name that is
-				 * not reachable by the user.
+				 * Redirect the user to the portal with a suitable return URL. The forwardURL
+				 * parameter that arrives as a parameter is a partial (not absolute) request
+				 * path for a page in the application. The challenge here is to compute the
+				 * correct absolute path for the original request so the portal can redirect the
+				 * user back to the right place. If the application sits behind WebJunction, or
+				 * if separate FE-BE hosts are used, then the URL yielded by the request has a
+				 * host name that is not reachable by the user.
 				 */
 				String returnToAppUrl = null;
 				if (SystemProperties.containsProperty(SystemProperties.APP_BASE_URL)) {
@@ -171,10 +182,9 @@ public class ECDSingleSignOnController extends UnRestrictedBaseController {
 							"singleSignOnLogin: using app base URL {} and redirectURL {}", appUrl, returnToAppUrl);
 				} else {
 					/**
-					 * Be backward compatible with applications that don't need
-					 * this feature. This is the controller for the
-					 * single_signon.htm page, so the replace should always find
-					 * the specified token.
+					 * Be backward compatible with applications that don't need this feature. This
+					 * is the controller for the single_signon.htm page, so the replace should
+					 * always find the specified token.
 					 */
 					returnToAppUrl = ((HttpServletRequest) request).getRequestURL().toString()
 							.replace("single_signon.htm", forwardURL);
@@ -196,8 +206,8 @@ public class ECDSingleSignOnController extends UnRestrictedBaseController {
 
 			else {
 				/*
-				 * Portal is not available. Redirect user to the login page,
-				 * ignoring the forwardURL parameter.
+				 * Portal is not available. Redirect user to the login page, ignoring the
+				 * forwardURL parameter.
 				 */
 				return new ModelAndView("redirect:login.htm");
 			}
@@ -206,8 +216,8 @@ public class ECDSingleSignOnController extends UnRestrictedBaseController {
 	}
 
 	/**
-	 * Discover if the portal is available by GET-ing a resource from the REST
-	 * URL specified in portal.properties, using a very short timeout.
+	 * Discover if the portal is available by GET-ing a resource from the REST URL
+	 * specified in portal.properties, using a very short timeout.
 	 * 
 	 * @return True if the portal answers, otherwise false.
 	 */
diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/controller/HealthCheckController.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/HealthCheckController.java
index fe54790..fe54790 100644
--- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/controller/HealthCheckController.java
+++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/controller/HealthCheckController.java
diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/domain/ControllerEndpoint.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/domain/ControllerEndpoint.java
index 33a22d0..33a22d0 100644
--- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/domain/ControllerEndpoint.java
+++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/domain/ControllerEndpoint.java
diff --git a/oom-app-common/src/main/java/org/onap/oom/dashboard/exception/DashboardControllerException.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/exception/DashboardControllerException.java
new file mode 100644
index 0000000..ce2d169
--- /dev/null
+++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/exception/DashboardControllerException.java
@@ -0,0 +1,26 @@
+package org.onap.oom.dashboard.exception;
+
+/**
+ * A little something to placate the Sonar code-analysis tool.
+ */
+public class DashboardControllerException extends Exception {
+
+	private static final long serialVersionUID = -1373841666122351816L;
+
+	public DashboardControllerException() {
+		super();
+	}
+
+	public DashboardControllerException(String message) {
+		super(message);
+	}
+
+	public DashboardControllerException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
+	public DashboardControllerException(Throwable cause) {
+		super(cause);
+	}
+
+}
diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprint.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprint.java
index df02cc2..df02cc2 100644
--- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprint.java
+++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprint.java
diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprintContent.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprintContent.java
index 89c3c38..89c3c38 100644
--- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprintContent.java
+++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprintContent.java
diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprintList.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprintList.java
index 933d0d3..933d0d3 100644
--- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprintList.java
+++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprintList.java
diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprintUpload.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprintUpload.java
index 2d63d92..2d63d92 100644
--- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprintUpload.java
+++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyBlueprintUpload.java
diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyDeployment.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyDeployment.java
index b4dc65c..b4dc65c 100644
--- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyDeployment.java
+++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyDeployment.java
diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyDeploymentList.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyDeploymentList.java
index f57784f..f57784f 100644
--- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyDeploymentList.java
+++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyDeploymentList.java
diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyDeploymentRequest.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyDeploymentRequest.java
index 0bc7b44..0bc7b44 100644
--- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyDeploymentRequest.java
+++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyDeploymentRequest.java
diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyExecution.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyExecution.java
index d580ef0..d580ef0 100644
--- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyExecution.java
+++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyExecution.java
diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyExecutionList.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyExecutionList.java
index 6d97c94..6d97c94 100644
--- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyExecutionList.java
+++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyExecutionList.java
diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyExecutionRequest.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyExecutionRequest.java
index 13b6826..13b6826 100644
--- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyExecutionRequest.java
+++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/CloudifyExecutionRequest.java
diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulDatacenter.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulDatacenter.java
index 93eb224..93eb224 100644
--- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulDatacenter.java
+++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulDatacenter.java
diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulHealthServiceRegistration.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulHealthServiceRegistration.java
index 1385de9..1385de9 100644
--- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulHealthServiceRegistration.java
+++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulHealthServiceRegistration.java
diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulNodeInfo.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulNodeInfo.java
index 4235cd9..4235cd9 100644
--- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulNodeInfo.java
+++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulNodeInfo.java
diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulServiceHealth.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulServiceHealth.java
index 5d019cf..5d019cf 100644
--- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulServiceHealth.java
+++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulServiceHealth.java
diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulServiceHealthHistory.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulServiceHealthHistory.java
index 4ad75e6..4ad75e6 100644
--- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulServiceHealthHistory.java
+++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulServiceHealthHistory.java
diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulServiceInfo.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulServiceInfo.java
index 3b4ad40..3b4ad40 100644
--- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulServiceInfo.java
+++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ConsulServiceInfo.java
diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/ControllerEndpointCredentials.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ControllerEndpointCredentials.java
index caa8aa7..1d5c1d4 100644
--- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/ControllerEndpointCredentials.java
+++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ControllerEndpointCredentials.java
@@ -21,6 +21,8 @@
  *******************************************************************************/
 package org.onap.oom.dashboard.model;
 
+import org.onap.oom.dashboard.exception.DashboardControllerException;
+import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.openecomp.portalsdk.core.onboarding.util.CipherUtil;
 
 /**
@@ -29,6 +31,8 @@ import org.openecomp.portalsdk.core.onboarding.util.CipherUtil;
  */
 public class ControllerEndpointCredentials extends ControllerEndpointTransport {
 
+	private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(ControllerEndpointCredentials.class);
+
 	public String username;
 	public String password;
 	public boolean isEncryptedPass;
@@ -75,17 +79,22 @@ public class ControllerEndpointCredentials extends ControllerEndpointTransport {
 	}
 
 	/**
-	 * Accepts clear text and stores an encrypted value; as a side effect, sets
-	 * the encrypted flag to true.
+	 * Accepts clear text and stores an encrypted value; as a side effect, sets the
+	 * encrypted flag to true.
 	 * 
 	 * @param plainText
 	 *            Clear-text password
-	 * @throws Exception
+	 * @throws DashboardControllerException
 	 *             If encryption fails
 	 */
-	public void encryptPassword(final String plainText) throws Exception {
-		this.password = CipherUtil.encrypt(plainText);
-		this.isEncryptedPass = true;
+	public void encryptPassword(final String plainText) throws DashboardControllerException {
+		try {
+			this.password = CipherUtil.encrypt(plainText);
+			this.isEncryptedPass = true;
+		} catch (Exception ex) {
+			logger.error("encryptPassword failed", ex);
+			throw new DashboardControllerException(ex);
+		}
 	}
 
 	/**
@@ -93,10 +102,15 @@ public class ControllerEndpointCredentials extends ControllerEndpointTransport {
 	 * true.
 	 * 
 	 * @return Clear-text password.
-	 * @throws Exception
+	 * @throws DashboardControllerException
 	 *             If decryption fails
 	 */
-	public String decryptPassword() throws Exception {
-		return CipherUtil.decrypt(password);
+	public String decryptPassword() throws DashboardControllerException {
+		try {
+			return CipherUtil.decrypt(password);
+		} catch (Exception ex) {
+			logger.error("decryptPassword failed", ex);
+			throw new DashboardControllerException(ex);
+		}
 	}
 }
\ No newline at end of file
diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/ControllerEndpointTransport.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ControllerEndpointTransport.java
index 94a88f8..94a88f8 100644
--- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/ControllerEndpointTransport.java
+++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ControllerEndpointTransport.java
diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/ECTransportModel.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ECTransportModel.java
index 1c498eb..1c498eb 100644
--- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/ECTransportModel.java
+++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/ECTransportModel.java
diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/HealthStatus.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/HealthStatus.java
index 6d6a0e4..6d6a0e4 100644
--- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/HealthStatus.java
+++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/HealthStatus.java
diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/RestResponseError.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/RestResponseError.java
index 0b4f5b8..0b4f5b8 100644
--- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/RestResponseError.java
+++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/RestResponseError.java
diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/RestResponsePage.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/RestResponsePage.java
index 1fe8e29..1fe8e29 100644
--- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/RestResponsePage.java
+++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/RestResponsePage.java
diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/RestResponseSuccess.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/RestResponseSuccess.java
index 655fcf0..655fcf0 100644
--- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/model/RestResponseSuccess.java
+++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/model/RestResponseSuccess.java
diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/rest/ControllerRestClientImpl.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/rest/ControllerRestClientImpl.java
index 13889b2..858ed5a 100644
--- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/rest/ControllerRestClientImpl.java
+++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/rest/ControllerRestClientImpl.java
@@ -402,10 +402,10 @@ public class ControllerRestClientImpl implements IControllerRestClient {
 	 * 
 	 * @param args
 	 *            blueprint ID
-	 * @throws Exception
-	 *             On any failure
+	 * @throws IllegalArgumentException
+	 *             On bad arguments
 	 */
-	public static void main(String[] args) throws Exception {
+	public static void main(String[] args) throws IllegalArgumentException {
 		if (args.length != 1)
 			throw new IllegalArgumentException("Single argument expected: blueprint-id");
 		ControllerRestClientImpl client = new ControllerRestClientImpl("http://localhost:8081/controller", "dbus_user",
diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/rest/ControllerRestClientMockImpl.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/rest/ControllerRestClientMockImpl.java
index b8f5d77..217f878 100644
--- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/rest/ControllerRestClientMockImpl.java
+++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/rest/ControllerRestClientMockImpl.java
@@ -30,7 +30,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Scanner;
 
-import org.onap.oom.dashboard.exception.OOMDashboardException;
+import org.onap.oom.dashboard.exception.DashboardControllerException;
 import org.onap.oom.dashboard.model.CloudifyBlueprintContent;
 import org.onap.oom.dashboard.model.CloudifyBlueprintList;
 import org.onap.oom.dashboard.model.CloudifyBlueprintUpload;
@@ -74,7 +74,7 @@ public class ControllerRestClientMockImpl implements IControllerRestClient {
 		try {
 			InputStream is = getClass().getResourceAsStream(path);
 			if (is == null)
-				throw new OOMDashboardException("Failed to find resource at path " + path);
+				throw new DashboardControllerException("Failed to find resource at path " + path);
 			Scanner scanner = new Scanner(is, "UTF-8");
 			result = scanner.useDelimiter("\\A").next();
 			scanner.close();
@@ -287,10 +287,10 @@ public class ControllerRestClientMockImpl implements IControllerRestClient {
 	 * 
 	 * @param args
 	 *            blueprint ID
-	 * @throws Exception
+	 * @throws DashboardControllerException
 	 *             On any failure
 	 */
-	public static void main(String[] args) throws Exception {
+	public static void main(String[] args) throws DashboardControllerException {
 		System.out.println("Testing paths and parsing mock data");
 		ControllerRestClientMockImpl client = new ControllerRestClientMockImpl();
 		CloudifyBlueprintList list1 = client.getBlueprints();
@@ -304,7 +304,7 @@ public class ControllerRestClientMockImpl implements IControllerRestClient {
 		List<ConsulServiceHealthHistory> list9 = client.getServiceHealthHistory("mock", Instant.now(), Instant.now());
 		if (list1 == null || list2 == null || list3 == null || list4 == null || list5 == null || list6 == null
 				|| list7 == null || list8 == null || list9 == null)
-			throw new OOMDashboardException("Failed");
+			throw new DashboardControllerException("Failed");
 		System.out.println("Pass.");
 	}
 
diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/rest/HttpComponentsClientHttpRequestFactoryBasicAuth.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/rest/HttpComponentsClientHttpRequestFactoryBasicAuth.java
index 7ad1d46..7ad1d46 100644
--- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/rest/HttpComponentsClientHttpRequestFactoryBasicAuth.java
+++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/rest/HttpComponentsClientHttpRequestFactoryBasicAuth.java
diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/rest/IControllerRestClient.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/rest/IControllerRestClient.java
index a9b1a2d..a9b1a2d 100644
--- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/rest/IControllerRestClient.java
+++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/rest/IControllerRestClient.java
diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/service/ControllerEndpointService.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/service/ControllerEndpointService.java
index 5cec49d..5cec49d 100644
--- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/service/ControllerEndpointService.java
+++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/service/ControllerEndpointService.java
diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/service/ControllerEndpointServiceImpl.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/service/ControllerEndpointServiceImpl.java
index 6b657e1..6b657e1 100644
--- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/service/ControllerEndpointServiceImpl.java
+++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/service/ControllerEndpointServiceImpl.java
diff --git a/ecd-app-common/src/main/java/org/onap/oom/dashboard/util/DashboardProperties.java b/oom-app-common/src/main/java/org/onap/oom/dashboard/util/DashboardProperties.java
index 2dbd103..2dbd103 100644
--- a/ecd-app-common/src/main/java/org/onap/oom/dashboard/util/DashboardProperties.java
+++ b/oom-app-common/src/main/java/org/onap/oom/dashboard/util/DashboardProperties.java
diff --git a/ecd-app-common/src/test/java/org/onap/fusion/core/MockApplicationContextTestSuite.java b/oom-app-common/src/test/java/org/onap/fusion/core/MockApplicationContextTestSuite.java
index f3d55e2..f3d55e2 100644
--- a/ecd-app-common/src/test/java/org/onap/fusion/core/MockApplicationContextTestSuite.java
+++ b/oom-app-common/src/test/java/org/onap/fusion/core/MockApplicationContextTestSuite.java
diff --git a/ecd-app-common/src/test/java/org/onap/fusionapp/SanityTest.java b/oom-app-common/src/test/java/org/onap/fusionapp/SanityTest.java
index c859c28..c859c28 100644
--- a/ecd-app-common/src/test/java/org/onap/fusionapp/SanityTest.java
+++ b/oom-app-common/src/test/java/org/onap/fusionapp/SanityTest.java
diff --git a/ecd-app-common/src/test/java/org/onap/fusionapp/service/ProfileServiceTest.java b/oom-app-common/src/test/java/org/onap/fusionapp/service/ProfileServiceTest.java
index 4a661da..4a661da 100644
--- a/ecd-app-common/src/test/java/org/onap/fusionapp/service/ProfileServiceTest.java
+++ b/oom-app-common/src/test/java/org/onap/fusionapp/service/ProfileServiceTest.java
diff --git a/ecd-app-os/.gitignore b/oom-app-os/.gitignore
index 0a897e3..0a897e3 100644
--- a/ecd-app-os/.gitignore
+++ b/oom-app-os/.gitignore
diff --git a/ecd-app-os/README.md b/oom-app-os/README.md
index eba22e5..eba22e5 100644
--- a/ecd-app-os/README.md
+++ b/oom-app-os/README.md
diff --git a/ecd-app-os/pom.xml b/oom-app-os/pom.xml
index 12368b1..29ef713 100644
--- a/ecd-app-os/pom.xml
+++ b/oom-app-os/pom.xml
@@ -1,23 +1,11 @@
 <?xml version="1.0"?>
-<!-- =============LICENSE_START========================================================= 
-	================================================================================= 
-	Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. ================================================================================ 
-	Licensed under the Apache License, Version 2.0 (the "License"); you may not 
-	use this file except in compliance with the License. You may obtain a copy 
-	of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
-	by applicable law or agreed to in writing, software distributed under the 
-	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
-	OF ANY KIND, either express or implied. See the License for the specific 
-	language governing permissions and limitations under the License. ============LICENSE_END========================================================= 
-	ECOMP is a trademark and service mark of AT&T Intellectual Property. -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>org.onap.oom.dashboard</groupId>
-	<artifactId>ecd-app-os</artifactId>
-	<version>1707.4.1-SNAPSHOT</version>
+	<artifactId>oom-app-os</artifactId>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>war</packaging>
 	<name>ONAP Operations Manager Dashboard app</name>
 	<description>OOM Dashboard Web Application for external release</description>
@@ -27,7 +15,7 @@
 		<springframework.version>4.2.0.RELEASE</springframework.version>
 		<hibernate.version>4.3.11.Final</hibernate.version>
 		<epsdk.version>1.1.0</epsdk.version>
-		<ecd.version>1707.4.1-SNAPSHOT</ecd.version>
+		<oom.version>1.1.0-SNAPSHOT</oom.version>
 		<nexusproxy>https://nexus.onap.org</nexusproxy>
 		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
 		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
@@ -86,7 +74,7 @@
 					<overlays>
 						<overlay>
 							<groupId>org.onap.oom.dashboard</groupId>
-							<artifactId>ecd-app-overlay</artifactId>
+							<artifactId>oom-app-overlay</artifactId>
 						</overlay>
 						<overlay>
 							<groupId>org.openecomp.ecompsdkos</groupId>
@@ -122,15 +110,15 @@
 		<!-- ECD webapp resources -->
 		<dependency>
 			<groupId>org.onap.oom.dashboard</groupId>
-			<artifactId>ecd-app-overlay</artifactId>
-			<version>${ecd.version}</version>
+			<artifactId>oom-app-overlay</artifactId>
+			<version>${oom.version}</version>
 			<type>war</type>
 		</dependency>
 		<!-- ECD webapp controllers -->
 		<dependency>
 			<groupId>org.onap.oom.dashboard</groupId>
-			<artifactId>ecd-app-common</artifactId>
-			<version>${ecd.version}</version>
+			<artifactId>oom-app-common</artifactId>
+			<version>${oom.version}</version>
 		</dependency>
 		<!-- SDK webapp resources -->
 		<dependency>
diff --git a/ecd-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java b/oom-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
index ae8c2ac..e532b5f 100644
--- a/ecd-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
+++ b/oom-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
@@ -118,7 +118,7 @@ public class ExternalAppConfig extends AppConfig implements Configurable {
 		List<String> definitions = new ArrayList<String>();
 		// DBC does not need the sample page:
 		// definitions.add("/WEB-INF/defs/definitions.xml");
-		definitions.add("/WEB-INF/ecd-app-definitions.xml");
+		definitions.add("/WEB-INF/oom-app-definitions.xml");
 		if (logger.isDebugEnabled())
 			logger.debug(EELFLoggerDelegate.debugLogger, "addTileDefinitions: list is " + definitions);
 		return definitions;
diff --git a/ecd-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java b/oom-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java
index 347bb51..347bb51 100644
--- a/ecd-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java
+++ b/oom-app-os/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java
diff --git a/ecd-app-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java b/oom-app-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java
index bcc7f04..6432478 100644
--- a/ecd-app-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java
+++ b/oom-app-os/src/main/java/org/onap/portalapp/conf/HibernateMappingLocations.java
@@ -44,7 +44,7 @@ public class HibernateMappingLocations implements HibernateMappingLocatable {
 				// new ClassPathResource("../fusion/orm/Fusion.hbm.xml"),
 				// This is a COPY to work around a bug in the 1.1.0 release.
 				new ClassPathResource("../fusion-110-copy.hbm.xml"),
-				new ClassPathResource("../ecd-app.hbm.xml")
+				new ClassPathResource("../oom-app.hbm.xml")
 		};
 	}
 
diff --git a/ecd-app-os/src/main/java/org/onap/portalapp/lm/FusionLicenseManagerImpl.java b/oom-app-os/src/main/java/org/onap/portalapp/lm/FusionLicenseManagerImpl.java
index 7a08f54..7a08f54 100644
--- a/ecd-app-os/src/main/java/org/onap/portalapp/lm/FusionLicenseManagerImpl.java
+++ b/oom-app-os/src/main/java/org/onap/portalapp/lm/FusionLicenseManagerImpl.java
diff --git a/ecd-app-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java b/oom-app-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java
index 22fca6d..22fca6d 100644
--- a/ecd-app-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java
+++ b/oom-app-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java
diff --git a/ecd-app-os/src/main/java/org/onap/portalapp/service/AdminAuthExtension.java b/oom-app-os/src/main/java/org/onap/portalapp/service/AdminAuthExtension.java
index e3dbdf8..e3dbdf8 100644
--- a/ecd-app-os/src/main/java/org/onap/portalapp/service/AdminAuthExtension.java
+++ b/oom-app-os/src/main/java/org/onap/portalapp/service/AdminAuthExtension.java
diff --git a/ecd-app-os/src/main/resources/logback.xml b/oom-app-os/src/main/resources/logback.xml
index aefffa4..474dd7c 100644
--- a/ecd-app-os/src/main/resources/logback.xml
+++ b/oom-app-os/src/main/resources/logback.xml
@@ -31,7 +31,7 @@
   <!--<jmxConfigurator /> -->
 
   <!--  specify the component name -->
-  <property name="componentName" value="ecd_app_os"></property>
+  <property name="componentName" value="oom_app_os"></property>
   
   <!--  specify the base path of the log directory -->
   <property name="logDirPrefix" value="${catalina.base}/logs"></property>
diff --git a/ecd-app-os/src/main/resources/portal.properties b/oom-app-os/src/main/resources/portal.properties
index c9bde0a..c9bde0a 100644
--- a/ecd-app-os/src/main/resources/portal.properties
+++ b/oom-app-os/src/main/resources/portal.properties
diff --git a/ecd-app-os/src/main/webapp/WEB-INF/conf/.gitignore b/oom-app-os/src/main/webapp/WEB-INF/conf/.gitignore
index 2dc7bb0..2dc7bb0 100644
--- a/ecd-app-os/src/main/webapp/WEB-INF/conf/.gitignore
+++ b/oom-app-os/src/main/webapp/WEB-INF/conf/.gitignore
diff --git a/ecd-app-os/src/main/webapp/WEB-INF/conf/dashboard.properties b/oom-app-os/src/main/webapp/WEB-INF/conf/dashboard.properties
index 735afe6..735afe6 100644
--- a/ecd-app-os/src/main/webapp/WEB-INF/conf/dashboard.properties
+++ b/oom-app-os/src/main/webapp/WEB-INF/conf/dashboard.properties
diff --git a/ecd-app-os/src/main/webapp/WEB-INF/conf/sql.properties b/oom-app-os/src/main/webapp/WEB-INF/conf/sql.properties
index d19402f..d19402f 100644
--- a/ecd-app-os/src/main/webapp/WEB-INF/conf/sql.properties
+++ b/oom-app-os/src/main/webapp/WEB-INF/conf/sql.properties
diff --git a/ecd-app-os/src/main/webapp/WEB-INF/conf/system.properties.template b/oom-app-os/src/main/webapp/WEB-INF/conf/system.properties.template
index 387dbee..a4e0d5d 100644
--- a/ecd-app-os/src/main/webapp/WEB-INF/conf/system.properties.template
+++ b/oom-app-os/src/main/webapp/WEB-INF/conf/system.properties.template
@@ -70,4 +70,4 @@ contact_us_link = https://www.onap.org/
 instance_uuid = 12345678-90ab-cdef-1234-567890abcdef
 
 # Application base URL is a proper prefix of the on-boarded URL.
-app_base_url = http://www.oom.onap.org:8080/ecd-app-os/
+app_base_url = http://www.oom.onap.org:8080/oom-app-os/
diff --git a/ecd-app-os/src/main/webapp/WEB-INF/fusion/conf/fusion.properties b/oom-app-os/src/main/webapp/WEB-INF/fusion/conf/fusion.properties
index 881fdd1..881fdd1 100644
--- a/ecd-app-os/src/main/webapp/WEB-INF/fusion/conf/fusion.properties
+++ b/oom-app-os/src/main/webapp/WEB-INF/fusion/conf/fusion.properties
diff --git a/ecd-app-os/src/main/webapp/WEB-INF/jsp/login.jsp b/oom-app-os/src/main/webapp/WEB-INF/jsp/login.jsp
index 564a572..564a572 100644
--- a/ecd-app-os/src/main/webapp/WEB-INF/jsp/login.jsp
+++ b/oom-app-os/src/main/webapp/WEB-INF/jsp/login.jsp
diff --git a/ecd-app-os/src/main/webapp/WEB-INF/jsp/login_external.jsp b/oom-app-os/src/main/webapp/WEB-INF/jsp/login_external.jsp
index 7aa7f5e..935c6aa 100644
--- a/ecd-app-os/src/main/webapp/WEB-INF/jsp/login_external.jsp
+++ b/oom-app-os/src/main/webapp/WEB-INF/jsp/login_external.jsp
@@ -77,7 +77,7 @@
 	</head>
 	<body>
 		<div class="login">
-			<img src="app/ecdapp/images/onap_logo_2257x496.png" style="height: 150px;" />
+			<img src="app/oom/images/onap_logo_2257x496.png" style="height: 150px;" />
 			<h2>
 				<%=appDisplayName%>
 			</h2>
diff --git a/ecd-app-os/src/main/webapp/WEB-INF/web.xml b/oom-app-os/src/main/webapp/WEB-INF/web.xml
index 80c5da9..c2ec2ea 100644
--- a/ecd-app-os/src/main/webapp/WEB-INF/web.xml
+++ b/oom-app-os/src/main/webapp/WEB-INF/web.xml
@@ -22,7 +22,7 @@
  -->
 
 <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" version="3.1">
-  <display-name>ecd-app-os</display-name>
+  <display-name>oom-os</display-name>
   <session-config>
     <session-timeout>60</session-timeout>
     <tracking-mode>COOKIE</tracking-mode>
diff --git a/ecd-app-os/src/main/webapp/app/fusion/external/b2b/css/b2b-angular/font_icons.css b/oom-app-os/src/main/webapp/app/fusion/external/b2b/css/b2b-angular/font_icons.css
index 26308ae..26308ae 100644
--- a/ecd-app-os/src/main/webapp/app/fusion/external/b2b/css/b2b-angular/font_icons.css
+++ b/oom-app-os/src/main/webapp/app/fusion/external/b2b/css/b2b-angular/font_icons.css
diff --git a/ecd-app-os/src/main/webapp/app/fusion/external/ds2/css/digital-ng-library/ecomp-ionicons.css b/oom-app-os/src/main/webapp/app/fusion/external/ds2/css/digital-ng-library/ecomp-ionicons.css
index 8a27586..8a27586 100644
--- a/ecd-app-os/src/main/webapp/app/fusion/external/ds2/css/digital-ng-library/ecomp-ionicons.css
+++ b/oom-app-os/src/main/webapp/app/fusion/external/ds2/css/digital-ng-library/ecomp-ionicons.css
diff --git a/ecd-app-os/src/main/webapp/app/fusion/external/ds2/css/digital-ng-library/ionicons.css b/oom-app-os/src/main/webapp/app/fusion/external/ds2/css/digital-ng-library/ionicons.css
index 885aa6b..885aa6b 100644
--- a/ecd-app-os/src/main/webapp/app/fusion/external/ds2/css/digital-ng-library/ionicons.css
+++ b/oom-app-os/src/main/webapp/app/fusion/external/ds2/css/digital-ng-library/ionicons.css
diff --git a/ecd-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.eot b/oom-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.eot
index 92a3f20..92a3f20 100644
--- a/ecd-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.eot
+++ b/oom-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.eot
diff --git a/ecd-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.svg b/oom-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.svg
index 49fc8f3..49fc8f3 100644
--- a/ecd-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.svg
+++ b/oom-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.svg
diff --git a/ecd-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.ttf b/oom-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.ttf
index c4e4632..c4e4632 100644
--- a/ecd-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.ttf
+++ b/oom-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.ttf
diff --git a/ecd-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.woff b/oom-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.woff
index 5f3a14e..5f3a14e 100644
--- a/ecd-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.woff
+++ b/oom-app-os/src/main/webapp/app/fusion/external/ds2/css/fonts/ionicons.woff
diff --git a/ecd-app-os/src/main/webapp/app/fusion/scripts/DS2-controllers/ds-profile/post-controller.js b/oom-app-os/src/main/webapp/app/fusion/scripts/DS2-controllers/ds-profile/post-controller.js
index 432df78..432df78 100644
--- a/ecd-app-os/src/main/webapp/app/fusion/scripts/DS2-controllers/ds-profile/post-controller.js
+++ b/oom-app-os/src/main/webapp/app/fusion/scripts/DS2-controllers/ds-profile/post-controller.js
diff --git a/ecd-app-os/src/main/webapp/app/fusion/scripts/DS2-services/postSearch.js b/oom-app-os/src/main/webapp/app/fusion/scripts/DS2-services/postSearch.js
index 650dae5..650dae5 100644
--- a/ecd-app-os/src/main/webapp/app/fusion/scripts/DS2-services/postSearch.js
+++ b/oom-app-os/src/main/webapp/app/fusion/scripts/DS2-services/postSearch.js
diff --git a/ecd-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/profile_searchDS2.html b/oom-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/profile_searchDS2.html
index 669139d..669139d 100644
--- a/ecd-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/profile_searchDS2.html
+++ b/oom-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/profile_searchDS2.html
diff --git a/ecd-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/self_profile.html b/oom-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/self_profile.html
index 3b5ef52..3b5ef52 100644
--- a/ecd-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/self_profile.html
+++ b/oom-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/self_profile.html
diff --git a/ecd-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/footer.html b/oom-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/footer.html
index f4d8d7e..f4d8d7e 100644
--- a/ecd-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/footer.html
+++ b/oom-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/footer.html
diff --git a/ecd-app-overlay/.gitignore b/oom-app-overlay/.gitignore
index 0a897e3..0a897e3 100644
--- a/ecd-app-overlay/.gitignore
+++ b/oom-app-overlay/.gitignore
diff --git a/ecd-app-overlay/README.md b/oom-app-overlay/README.md
index 930e9b9..930e9b9 100644
--- a/ecd-app-overlay/README.md
+++ b/oom-app-overlay/README.md
diff --git a/ecd-app-overlay/pom.xml b/oom-app-overlay/pom.xml
index fc0f6bd..fe0ee5c 100644
--- a/ecd-app-overlay/pom.xml
+++ b/oom-app-overlay/pom.xml
@@ -1,23 +1,11 @@
 <?xml version="1.0"?>
-<!-- =============LICENSE_START========================================================= 
-	================================================================================= 
-	Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. ================================================================================ 
-	Licensed under the Apache License, Version 2.0 (the "License"); you may not 
-	use this file except in compliance with the License. You may obtain a copy 
-	of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
-	by applicable law or agreed to in writing, software distributed under the 
-	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
-	OF ANY KIND, either express or implied. See the License for the specific 
-	language governing permissions and limitations under the License. ============LICENSE_END========================================================= 
-	ECOMP is a trademark and service mark of AT&T Intellectual Property. -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>org.onap.oom.dashboard</groupId>
-	<artifactId>ecd-app-overlay</artifactId>
-	<version>1707.4.1-SNAPSHOT</version>
+	<artifactId>oom-app-overlay</artifactId>
+	<version>1.1.0-SNAPSHOT</version>
 	<packaging>war</packaging>
 	<name>ONAP Operations Manager Dashboard overlay</name>
 	<description>OOM Dashboard web resources</description>
diff --git a/ecd-app-overlay/src/main/webapp/WEB-INF/fusion-110-copy.hbm.xml b/oom-app-overlay/src/main/webapp/WEB-INF/fusion-110-copy.hbm.xml
index a827e6c..a827e6c 100644
--- a/ecd-app-overlay/src/main/webapp/WEB-INF/fusion-110-copy.hbm.xml
+++ b/oom-app-overlay/src/main/webapp/WEB-INF/fusion-110-copy.hbm.xml
diff --git a/ecd-app-overlay/src/main/webapp/WEB-INF/jsp/error.jsp b/oom-app-overlay/src/main/webapp/WEB-INF/jsp/error.jsp
index 9583314..9583314 100644
--- a/ecd-app-overlay/src/main/webapp/WEB-INF/jsp/error.jsp
+++ b/oom-app-overlay/src/main/webapp/WEB-INF/jsp/error.jsp
diff --git a/ecd-app-overlay/src/main/webapp/WEB-INF/ecd-app-definitions.xml b/oom-app-overlay/src/main/webapp/WEB-INF/oom-app-definitions.xml
index 5aa25f6..69f7a05 100644
--- a/ecd-app-overlay/src/main/webapp/WEB-INF/ecd-app-definitions.xml
+++ b/oom-app-overlay/src/main/webapp/WEB-INF/oom-app-definitions.xml
@@ -27,6 +27,6 @@
 <tiles-definitions>
 
 	<!-- Main page for the single-page app -->
-    <definition name="ecd_home_tdkey"   template="/app/ecdapp/home/ecd_spa.html"/>
+    <definition name="oom_home_tdkey"   template="/app/oom/home/oom_spa.html"/>
 	
 </tiles-definitions>
diff --git a/ecd-app-overlay/src/main/webapp/WEB-INF/ecd-app.hbm.xml b/oom-app-overlay/src/main/webapp/WEB-INF/oom-app.hbm.xml
index f92261d..f92261d 100644
--- a/ecd-app-overlay/src/main/webapp/WEB-INF/ecd-app.hbm.xml
+++ b/oom-app-overlay/src/main/webapp/WEB-INF/oom-app.hbm.xml
diff --git a/ecd-app-overlay/src/main/webapp/WEB-INF/web.xml b/oom-app-overlay/src/main/webapp/WEB-INF/web.xml
index 3a90041..3a90041 100644
--- a/ecd-app-overlay/src/main/webapp/WEB-INF/web.xml
+++ b/oom-app-overlay/src/main/webapp/WEB-INF/web.xml
diff --git a/ecd-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/welcome.html b/oom-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/welcome.html
index a52c9ab..66c38e0 100644
--- a/ecd-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/welcome.html
+++ b/oom-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/welcome.html
@@ -10,7 +10,7 @@
   </head>    
   <body> 
     <p>
-    	Redirecting to the <a href="ecd#">ECOMP-C Dashboard</a>..
+    	Redirecting to the <a href="ecd#">ONAP Operations Manager Dashboard</a>..
     </p> 
   </body>  
 </html>
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/cloudify/blueprint-controllers.js b/oom-app-overlay/src/main/webapp/app/oom/cloudify/blueprint-controllers.js
index 2845782..2845782 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/cloudify/blueprint-controllers.js
+++ b/oom-app-overlay/src/main/webapp/app/oom/cloudify/blueprint-controllers.js
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/cloudify/blueprint-service.js b/oom-app-overlay/src/main/webapp/app/oom/cloudify/blueprint-service.js
index 422e53d..422e53d 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/cloudify/blueprint-service.js
+++ b/oom-app-overlay/src/main/webapp/app/oom/cloudify/blueprint-service.js
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/cloudify/blueprint_popups.html b/oom-app-overlay/src/main/webapp/app/oom/cloudify/blueprint_popups.html
index ee92d84..ee92d84 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/cloudify/blueprint_popups.html
+++ b/oom-app-overlay/src/main/webapp/app/oom/cloudify/blueprint_popups.html
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/cloudify/blueprint_table.html b/oom-app-overlay/src/main/webapp/app/oom/cloudify/blueprint_table.html
index 3ce60b9..3ce60b9 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/cloudify/blueprint_table.html
+++ b/oom-app-overlay/src/main/webapp/app/oom/cloudify/blueprint_table.html
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/cloudify/deployment-controllers.js b/oom-app-overlay/src/main/webapp/app/oom/cloudify/deployment-controllers.js
index b46d242..b46d242 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/cloudify/deployment-controllers.js
+++ b/oom-app-overlay/src/main/webapp/app/oom/cloudify/deployment-controllers.js
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/cloudify/deployment-service.js b/oom-app-overlay/src/main/webapp/app/oom/cloudify/deployment-service.js
index 886cba1..886cba1 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/cloudify/deployment-service.js
+++ b/oom-app-overlay/src/main/webapp/app/oom/cloudify/deployment-service.js
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/cloudify/deployment_popups.html b/oom-app-overlay/src/main/webapp/app/oom/cloudify/deployment_popups.html
index f4a4cdd..f4a4cdd 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/cloudify/deployment_popups.html
+++ b/oom-app-overlay/src/main/webapp/app/oom/cloudify/deployment_popups.html
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/cloudify/deployment_table.html b/oom-app-overlay/src/main/webapp/app/oom/cloudify/deployment_table.html
index c414484..c414484 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/cloudify/deployment_table.html
+++ b/oom-app-overlay/src/main/webapp/app/oom/cloudify/deployment_table.html
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/cloudify/execution-service.js b/oom-app-overlay/src/main/webapp/app/oom/cloudify/execution-service.js
index f1a5698..f1a5698 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/cloudify/execution-service.js
+++ b/oom-app-overlay/src/main/webapp/app/oom/cloudify/execution-service.js
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/cloudify/execution-table-controller.js b/oom-app-overlay/src/main/webapp/app/oom/cloudify/execution-table-controller.js
index a9c8574..a9c8574 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/cloudify/execution-table-controller.js
+++ b/oom-app-overlay/src/main/webapp/app/oom/cloudify/execution-table-controller.js
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/cloudify/execution_table.html b/oom-app-overlay/src/main/webapp/app/oom/cloudify/execution_table.html
index f29e90d..f29e90d 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/cloudify/execution_table.html
+++ b/oom-app-overlay/src/main/webapp/app/oom/cloudify/execution_table.html
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/cloudify/tosca-table-controller.js b/oom-app-overlay/src/main/webapp/app/oom/cloudify/tosca-table-controller.js
index cafc517..cafc517 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/cloudify/tosca-table-controller.js
+++ b/oom-app-overlay/src/main/webapp/app/oom/cloudify/tosca-table-controller.js
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/cloudify/tosca_table.html b/oom-app-overlay/src/main/webapp/app/oom/cloudify/tosca_table.html
index affec91..affec91 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/cloudify/tosca_table.html
+++ b/oom-app-overlay/src/main/webapp/app/oom/cloudify/tosca_table.html
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/consul/datacenter-health-service.js b/oom-app-overlay/src/main/webapp/app/oom/consul/datacenter-health-service.js
index 66f934e..66f934e 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/consul/datacenter-health-service.js
+++ b/oom-app-overlay/src/main/webapp/app/oom/consul/datacenter-health-service.js
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/consul/datacenter-table-controller.js b/oom-app-overlay/src/main/webapp/app/oom/consul/datacenter-table-controller.js
index f1c8820..f1c8820 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/consul/datacenter-table-controller.js
+++ b/oom-app-overlay/src/main/webapp/app/oom/consul/datacenter-table-controller.js
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/consul/datacenter_table.html b/oom-app-overlay/src/main/webapp/app/oom/consul/datacenter_table.html
index 73a1b82..73a1b82 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/consul/datacenter_table.html
+++ b/oom-app-overlay/src/main/webapp/app/oom/consul/datacenter_table.html
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/consul/node-health-service.js b/oom-app-overlay/src/main/webapp/app/oom/consul/node-health-service.js
index 3f3c8f6..3f3c8f6 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/consul/node-health-service.js
+++ b/oom-app-overlay/src/main/webapp/app/oom/consul/node-health-service.js
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/consul/node-services-controller.js b/oom-app-overlay/src/main/webapp/app/oom/consul/node-services-controller.js
index b82ba40..b82ba40 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/consul/node-services-controller.js
+++ b/oom-app-overlay/src/main/webapp/app/oom/consul/node-services-controller.js
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/consul/node-table-controller.js b/oom-app-overlay/src/main/webapp/app/oom/consul/node-table-controller.js
index 61ececb..61ececb 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/consul/node-table-controller.js
+++ b/oom-app-overlay/src/main/webapp/app/oom/consul/node-table-controller.js
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/consul/node_popups.html b/oom-app-overlay/src/main/webapp/app/oom/consul/node_popups.html
index 63b5e5f..63b5e5f 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/consul/node_popups.html
+++ b/oom-app-overlay/src/main/webapp/app/oom/consul/node_popups.html
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/consul/node_table.html b/oom-app-overlay/src/main/webapp/app/oom/consul/node_table.html
index 231d331..231d331 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/consul/node_table.html
+++ b/oom-app-overlay/src/main/webapp/app/oom/consul/node_table.html
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/consul/service-controllers.js b/oom-app-overlay/src/main/webapp/app/oom/consul/service-controllers.js
index 339c436..339c436 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/consul/service-controllers.js
+++ b/oom-app-overlay/src/main/webapp/app/oom/consul/service-controllers.js
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/consul/service-health-service.js b/oom-app-overlay/src/main/webapp/app/oom/consul/service-health-service.js
index 010cc11..010cc11 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/consul/service-health-service.js
+++ b/oom-app-overlay/src/main/webapp/app/oom/consul/service-health-service.js
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/consul/service_health_table.html b/oom-app-overlay/src/main/webapp/app/oom/consul/service_health_table.html
index b6a4557..b6a4557 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/consul/service_health_table.html
+++ b/oom-app-overlay/src/main/webapp/app/oom/consul/service_health_table.html
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/consul/service_popups.html b/oom-app-overlay/src/main/webapp/app/oom/consul/service_popups.html
index 8fd92b3..8fd92b3 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/consul/service_popups.html
+++ b/oom-app-overlay/src/main/webapp/app/oom/consul/service_popups.html
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/external/bootstrap.min.css b/oom-app-overlay/src/main/webapp/app/oom/external/bootstrap.min.css
index ed3905e..ed3905e 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/external/bootstrap.min.css
+++ b/oom-app-overlay/src/main/webapp/app/oom/external/bootstrap.min.css
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/external/bootstrap.min.css.map b/oom-app-overlay/src/main/webapp/app/oom/external/bootstrap.min.css.map
index 6c7fa40..6c7fa40 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/external/bootstrap.min.css.map
+++ b/oom-app-overlay/src/main/webapp/app/oom/external/bootstrap.min.css.map
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/external/bootstrap.min.js b/oom-app-overlay/src/main/webapp/app/oom/external/bootstrap.min.js
index 07cf295..07cf295 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/external/bootstrap.min.js
+++ b/oom-app-overlay/src/main/webapp/app/oom/external/bootstrap.min.js
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/external/yaml.js b/oom-app-overlay/src/main/webapp/app/oom/external/yaml.js
index 61b8476..61b8476 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/external/yaml.js
+++ b/oom-app-overlay/src/main/webapp/app/oom/external/yaml.js
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/home/appDS2.js b/oom-app-overlay/src/main/webapp/app/oom/home/appDS2.js
index 80ee672..80ee672 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/home/appDS2.js
+++ b/oom-app-overlay/src/main/webapp/app/oom/home/appDS2.js
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/home/controller-service.js b/oom-app-overlay/src/main/webapp/app/oom/home/controller-service.js
index 6c4c45d..6c4c45d 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/home/controller-service.js
+++ b/oom-app-overlay/src/main/webapp/app/oom/home/controller-service.js
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/home/controller_table.html b/oom-app-overlay/src/main/webapp/app/oom/home/controller_table.html
index c2a0ca9..c2a0ca9 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/home/controller_table.html
+++ b/oom-app-overlay/src/main/webapp/app/oom/home/controller_table.html
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/home/executions-view-controller.js b/oom-app-overlay/src/main/webapp/app/oom/home/executions-view-controller.js
index 4b28fed..4b28fed 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/home/executions-view-controller.js
+++ b/oom-app-overlay/src/main/webapp/app/oom/home/executions-view-controller.js
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/home/executions_view.html b/oom-app-overlay/src/main/webapp/app/oom/home/executions_view.html
index f527b2f..9f3e113 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/home/executions_view.html
+++ b/oom-app-overlay/src/main/webapp/app/oom/home/executions_view.html
@@ -1,4 +1,4 @@
-<link rel="stylesheet" href="app/ecdapp/external/bootstrap.min.css" />
+<link rel="stylesheet" href="app/oom/external/bootstrap.min.css" />
 <style>
 .csep-root1 {
 	background: white;
@@ -112,7 +112,7 @@
 							</div>
 						</div>
 						<div>
-							<img src="app/ecdapp/images/ecomp-login-550x360.jpg">
+							<img src="app/oom/images/ecomp-login-550x360.jpg">
 						</div>
 						<div class="col-sm-12 text-center line-height">
 							<span ng-if="orgChartData.length"></span>
@@ -153,7 +153,7 @@
 							</div>
 						</div>
 						<div>
-							<img src="app/ecdapp/images/ecomp.png">
+							<img src="app/oom/images/ecomp.png">
 						</div>
 						<div class="col-sm-12 text-center line-height"></div>
 					</div>
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/home/modal-service.js b/oom-app-overlay/src/main/webapp/app/oom/home/modal-service.js
index 07b5d77..07b5d77 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/home/modal-service.js
+++ b/oom-app-overlay/src/main/webapp/app/oom/home/modal-service.js
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/home/ecompc-instances-controller.js b/oom-app-overlay/src/main/webapp/app/oom/home/oom-instances-controller.js
index f07d1b3..f07d1b3 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/home/ecompc-instances-controller.js
+++ b/oom-app-overlay/src/main/webapp/app/oom/home/oom-instances-controller.js
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/home/ecd-router.js b/oom-app-overlay/src/main/webapp/app/oom/home/oom-router.js
index 8b23121..e598487 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/home/ecd-router.js
+++ b/oom-app-overlay/src/main/webapp/app/oom/home/oom-router.js
@@ -23,35 +23,35 @@ appDS2.config(function($routeProvider) {
 	$routeProvider
 	.when('/orgchart', {
 		/* horizontal layout */
-		templateUrl: 'app/ecdapp/home/tree_view.html',
+		templateUrl: 'app/oom/home/tree_view.html',
 		controller : 'treeViewController'
 	})
 	.when('/tosca', { 
-		templateUrl: 'app/ecdapp/cloudify/tosca_table.html',
+		templateUrl: 'app/oom/cloudify/tosca_table.html',
 		controller : 'toscaTableController'
 	})
 	.when('/bp', { 
-		templateUrl: 'app/ecdapp/cloudify/blueprint_table.html',
+		templateUrl: 'app/oom/cloudify/blueprint_table.html',
 		controller : 'blueprintTableController'
 	})
 	.when('/dep', { 
-		templateUrl: 'app/ecdapp/cloudify/deployment_table.html',
+		templateUrl: 'app/oom/cloudify/deployment_table.html',
 		controller : 'deploymentTableController'
 	})
 	.when('/exe', { 
-		templateUrl: 'app/ecdapp/cloudify/execution_table.html',
+		templateUrl: 'app/oom/cloudify/execution_table.html',
 		controller : 'executionTableController'
 	})
 	.when('/sh', { 
-		templateUrl: 'app/ecdapp/consul/service_health_table.html',
+		templateUrl: 'app/oom/consul/service_health_table.html',
 		controller : 'serviceHealthTableController'
 	})
 	.when('/nh', { 
-		templateUrl: 'app/ecdapp/consul/node_table.html',
+		templateUrl: 'app/oom/consul/node_table.html',
 		controller : 'nodeTableController'
 	})
 	.when('/dc', { 
-		templateUrl: 'app/ecdapp/consul/datacenter_table.html',
+		templateUrl: 'app/oom/consul/datacenter_table.html',
 		controller : 'datacenterTableController'
 	})
 	.when('/profile/:profileId', {
@@ -91,7 +91,7 @@ appDS2.config(function($routeProvider) {
 		controller: 'usageListControllerDS2'
 	})
 	.otherwise({
-		templateUrl: 'app/ecdapp/home/executions_view.html',
+		templateUrl: 'app/oom/home/executions_view.html',
 		controller : 'executionsViewController'
 	})
 	;
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/home/ecd-style.css b/oom-app-overlay/src/main/webapp/app/oom/home/oom-style.css
index e08fc31..e08fc31 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/home/ecd-style.css
+++ b/oom-app-overlay/src/main/webapp/app/oom/home/oom-style.css
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/home/ecompc_instances_popup.html b/oom-app-overlay/src/main/webapp/app/oom/home/oom_instances_popup.html
index bc523aa..bc523aa 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/home/ecompc_instances_popup.html
+++ b/oom-app-overlay/src/main/webapp/app/oom/home/oom_instances_popup.html
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/home/ecd_popup_templates.html b/oom-app-overlay/src/main/webapp/app/oom/home/oom_popup_templates.html
index fe4d505..fe4d505 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/home/ecd_popup_templates.html
+++ b/oom-app-overlay/src/main/webapp/app/oom/home/oom_popup_templates.html
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/home/ecd_spa.html b/oom-app-overlay/src/main/webapp/app/oom/home/oom_spa.html
index e715e05..47eac2d 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/home/ecd_spa.html
+++ b/oom-app-overlay/src/main/webapp/app/oom/home/oom_spa.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
-<!-- ECOMP Controller Dashboard single-page application using B2B/DS2. -->	
+<!-- ONAP Operations Manager Dashboard single-page application using B2B/DS2. -->	
 <html>
 	<head>
 	<meta charset="UTF-8">
-	<title>ECOMP-C Dashboard</title>
-    <link rel="icon" type="image/ico" href="app/ecdapp/images/onap_32x32.ico" />
+	<title>OOM Dashboard</title>
+    <link rel="icon" type="image/ico" href="app/oom/images/onap_32x32.ico" />
 
 	<!-- Third-party scripts from EPSDK overlay -->	
 	<script src="app/fusion/external/angular-1.4.8/angular.js"></script>	
@@ -18,9 +18,9 @@
 	<script src="app/fusion/external/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
 	
 	<!-- Third-party scripts from app -->
-	<script src="app/ecdapp/external/bootstrap.min.js" type="text/javascript"></script>
+	<script src="app/oom/external/bootstrap.min.js" type="text/javascript"></script>
 	<!-- https://github.com/jeremyfa/yaml.js -->
-	<script src="app/ecdapp/external/yaml.js" type="text/javascript"></script>
+	<script src="app/oom/external/yaml.js" type="text/javascript"></script>
 	
 	<script src="app/fusion/external/b2b/js/b2b-angular/b2b-library.min.js"></script>
 	<!-- Tweaked CSS -->
@@ -34,8 +34,8 @@
 	<link rel="stylesheet" type="text/css" href="app/fusion/styles/ecomp.css">
 	
     <!-- main app -->
-	<script src="app/ecdapp/home/modal-service.js"></script>
-	<script src="app/ecdapp/home/appDS2.js"></script> 
+	<script src="app/oom/home/modal-service.js"></script>
+	<script src="app/oom/home/appDS2.js"></script> 
 
 	<!-- directives and services -->
 	<script src="app/fusion/scripts/DS2-services/userInfoServiceDS2.js"></script>
@@ -48,31 +48,31 @@
 	<script src="app/fusion/scripts/DS2-directives/b2b-leftnav-ext.js"></script> 
 	 
 	<!-- ECD home -->
-	<script src="app/ecdapp/home/tree-view-controller.js"></script>
-	<script src="app/ecdapp/home/tree-view-directive.js"></script>
-	<script src="app/ecdapp/home/controller-service.js"></script>
-	<script src="app/ecdapp/home/ecompc-instances-controller.js"></script>
-	<script src="app/ecdapp/home/executions-view-controller.js"></script>
-	<link rel="stylesheet" href="app/ecdapp/home/tree-view-style.css"/>
-	<link rel="stylesheet" href="app/ecdapp/home/ecd-style.css"/>	
+	<script src="app/oom/home/tree-view-controller.js"></script>
+	<script src="app/oom/home/tree-view-directive.js"></script>
+	<script src="app/oom/home/controller-service.js"></script>
+	<script src="app/oom/home/oom-instances-controller.js"></script>
+	<script src="app/oom/home/executions-view-controller.js"></script>
+	<link rel="stylesheet" href="app/oom/home/tree-view-style.css"/>
+	<link rel="stylesheet" href="app/oom/home/oom-style.css"/>	
 
 	<!-- Cloudify -->
-	<script src="app/ecdapp/cloudify/blueprint-service.js"></script>
-	<script src="app/ecdapp/cloudify/deployment-service.js"></script>
-	<script src="app/ecdapp/cloudify/execution-service.js"></script>
-	<script src="app/ecdapp/cloudify/tosca-table-controller.js"></script>
-	<script src="app/ecdapp/cloudify/blueprint-controllers.js"></script>
-	<script src="app/ecdapp/cloudify/deployment-controllers.js"></script>
-	<script src="app/ecdapp/cloudify/execution-table-controller.js"></script>
+	<script src="app/oom/cloudify/blueprint-service.js"></script>
+	<script src="app/oom/cloudify/deployment-service.js"></script>
+	<script src="app/oom/cloudify/execution-service.js"></script>
+	<script src="app/oom/cloudify/tosca-table-controller.js"></script>
+	<script src="app/oom/cloudify/blueprint-controllers.js"></script>
+	<script src="app/oom/cloudify/deployment-controllers.js"></script>
+	<script src="app/oom/cloudify/execution-table-controller.js"></script>
 	
 	<!-- Consul -->
-	<script src="app/ecdapp/consul/service-health-service.js"></script>	
-	<script src="app/ecdapp/consul/service-controllers.js"></script>
-	<script src="app/ecdapp/consul/node-table-controller.js"></script>
-	<script src="app/ecdapp/consul/node-health-service.js"></script>	
-	<script src="app/ecdapp/consul/node-services-controller.js"></script>
-	<script src="app/ecdapp/consul/datacenter-table-controller.js"></script>
-	<script src="app/ecdapp/consul/datacenter-health-service.js"></script>
+	<script src="app/oom/consul/service-health-service.js"></script>	
+	<script src="app/oom/consul/service-controllers.js"></script>
+	<script src="app/oom/consul/node-table-controller.js"></script>
+	<script src="app/oom/consul/node-health-service.js"></script>	
+	<script src="app/oom/consul/node-services-controller.js"></script>
+	<script src="app/oom/consul/datacenter-table-controller.js"></script>
+	<script src="app/oom/consul/datacenter-health-service.js"></script>
 
 	<!-- user admin pages --> 
 	<script src="app/fusion/scripts/DS2-services/adminService.js"></script>
@@ -91,7 +91,7 @@
 	<script src="app/fusion/scripts/DS2-controllers/fn-menu-add-popup-controller.js"></script>
 	
 	<!-- main page -->
-	<script src="app/ecdapp/home/ecd-router.js"></script>
+	<script src="app/oom/home/oom-router.js"></script>
 
 	<style>
 		.csep-root1{
@@ -111,12 +111,12 @@
 	</head>
 	<body class="appBody" ng-app="abs">
 		<!-- double quotation marks are required for the popup templates - values are string literals -->
-  	  	<div ng-include src="'app/ecdapp/home/ecd_popup_templates.html'"></div>
-		<div ng-include src="'app/ecdapp/home/ecompc_instances_popup.html'"></div>
-  	  	<div ng-include src="'app/ecdapp/cloudify/blueprint_popups.html'"></div>
-  	  	<div ng-include src="'app/ecdapp/cloudify/deployment_popups.html'"></div>
-	    <div ng-include src="'app/ecdapp/consul/service_popups.html'"></div>
-	    <div ng-include src="'app/ecdapp/consul/node_popups.html'"></div>
+  	  	<div ng-include src="'app/oom/home/oom_popup_templates.html'"></div>
+		<div ng-include src="'app/oom/home/oom_instances_popup.html'"></div>
+  	  	<div ng-include src="'app/oom/cloudify/blueprint_popups.html'"></div>
+  	  	<div ng-include src="'app/oom/cloudify/deployment_popups.html'"></div>
+	    <div ng-include src="'app/oom/consul/service_popups.html'"></div>
+	    <div ng-include src="'app/oom/consul/node_popups.html'"></div>
 		<div ds2-header id="header" class="header-container"></div>
 		<div ds2-menu id="menu-container" class="menu-container"></div>
 		<div ng-view id="rightContentProfile" class="content-container"></div>		
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/home/tree-view-controller.js b/oom-app-overlay/src/main/webapp/app/oom/home/tree-view-controller.js
index 577ebe1..577ebe1 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/home/tree-view-controller.js
+++ b/oom-app-overlay/src/main/webapp/app/oom/home/tree-view-controller.js
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/home/tree-view-directive.js b/oom-app-overlay/src/main/webapp/app/oom/home/tree-view-directive.js
index 64b41ec..06f2959 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/home/tree-view-directive.js
+++ b/oom-app-overlay/src/main/webapp/app/oom/home/tree-view-directive.js
@@ -85,7 +85,7 @@
                                             "type='button' data-toggle='dropdown'>"+
                                             "</button>"+
                                 "</div></div></br>"+
-                                "<div style='padding-top:25px'><img src='app/ecdapp/images/ecomp-login-550x360.jpg' width='180' height='100'></div>"+
+                                "<div style='padding-top:25px'><img src='app/oom/images/ecomp-login-550x360.jpg' width='180' height='100'></div>"+
                                 "<div class='expandBtn'><span id='exp_"+root.id+"'><i class='icon-controls-add-maximize'></i></span></div><ul>");
                         } else {
                             itemHtml = "<li class='child'>"+
@@ -106,7 +106,7 @@
                                   "</div>"+
                             "</span>"+
                             "</span></div></br>"+
-                            "<div style='padding-top:35px'><img src='app/ecdapp/images/ecomp.png' width='180' height='100'></div></li>";
+                            "<div style='padding-top:35px'><img src='app/oom/images/ecomp.png' width='180' height='100'></div></li>";
                             items.push(itemHtml);
                         }
                     } // End the generate html code
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/home/tree-view-style.css b/oom-app-overlay/src/main/webapp/app/oom/home/tree-view-style.css
index 5a3e056..5a3e056 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/home/tree-view-style.css
+++ b/oom-app-overlay/src/main/webapp/app/oom/home/tree-view-style.css
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/home/tree_view.html b/oom-app-overlay/src/main/webapp/app/oom/home/tree_view.html
index 76cfc87..a4ab27d 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/home/tree_view.html
+++ b/oom-app-overlay/src/main/webapp/app/oom/home/tree_view.html
@@ -1,6 +1,6 @@
 <!-- Included bootstrap files at a page level to avoid issues with DS2 library -->
-<script src="app/ecdapp/external/bootstrap.min.js"></script>	
-<link rel="stylesheet" href="app/ecdapp/external/bootstrap.min.css"/>
+<script src="app/oom/external/bootstrap.min.js"></script>	
+<link rel="stylesheet" href="app/oom/external/bootstrap.min.css"/>
 
 <div id="page-content">
 	
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/images/ecomp-login-550x360.jpg b/oom-app-overlay/src/main/webapp/app/oom/images/ecomp-login-550x360.jpg
index 618b1a9..618b1a9 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/images/ecomp-login-550x360.jpg
+++ b/oom-app-overlay/src/main/webapp/app/oom/images/ecomp-login-550x360.jpg
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/images/ecomp.png b/oom-app-overlay/src/main/webapp/app/oom/images/ecomp.png
index b355f10..b355f10 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/images/ecomp.png
+++ b/oom-app-overlay/src/main/webapp/app/oom/images/ecomp.png
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/images/onap_16x16.ico b/oom-app-overlay/src/main/webapp/app/oom/images/onap_16x16.ico
index 8eb0495..8eb0495 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/images/onap_16x16.ico
+++ b/oom-app-overlay/src/main/webapp/app/oom/images/onap_16x16.ico
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/images/onap_32x32.ico b/oom-app-overlay/src/main/webapp/app/oom/images/onap_32x32.ico
index e434286..e434286 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/images/onap_32x32.ico
+++ b/oom-app-overlay/src/main/webapp/app/oom/images/onap_32x32.ico
diff --git a/ecd-app-overlay/src/main/webapp/app/ecdapp/images/onap_logo_2257x496.png b/oom-app-overlay/src/main/webapp/app/oom/images/onap_logo_2257x496.png
index 36ee1f5..36ee1f5 100644
--- a/ecd-app-overlay/src/main/webapp/app/ecdapp/images/onap_logo_2257x496.png
+++ b/oom-app-overlay/src/main/webapp/app/oom/images/onap_logo_2257x496.png
diff --git a/ecd-app-overlay/src/main/webapp/index.jsp b/oom-app-overlay/src/main/webapp/index.jsp
index e02bb6b..e02bb6b 100644
--- a/ecd-app-overlay/src/main/webapp/index.jsp
+++ b/oom-app-overlay/src/main/webapp/index.jsp
diff --git a/ecd-app-overlay/src/main/webapp/manifest.jsp b/oom-app-overlay/src/main/webapp/manifest.jsp
index 417825f..417825f 100644
--- a/ecd-app-overlay/src/main/webapp/manifest.jsp
+++ b/oom-app-overlay/src/main/webapp/manifest.jsp
diff --git a/pom.xml b/pom.xml
index 7e64417..a2cc3f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,16 +4,16 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<!-- Maven parent project for convenience of building and cleaning -->
-	<groupId>org.openecomp.controller.dashboard</groupId>
-	<artifactId>ecd-app-parent</artifactId>
+	<groupId>org.onap.oom.dashboard</groupId>
+	<artifactId>oom-app-parent</artifactId>
 	<version>0</version>
 	<packaging>pom</packaging>
 	<name>ONAP Operations Manager Dashboard project</name>
 
 	<modules>
-		<module>ecd-app-common</module>
-		<module>ecd-app-overlay</module>
-		<module>ecd-app-os</module>
+		<module>oom-app-common</module>
+		<module>oom-app-overlay</module>
+		<module>oom-app-os</module>
 	</modules>
 
 	<build>