73 files changed, 329 insertions, 338 deletions

diff --git a/README.md b/README.md
index 48f023d..fa8de71 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Portal BFF
+# bff
 Backend for Frontend (BFF) component of the portal-ng.
 
 ## Build
@@ -55,14 +55,14 @@ To start the service execute the `run.sh` in the development folder:
 development/run.sh
 ```
 
-Example request against the portal-prefs service can be run in your preferred IDE with the `request.http` file from the development folder.
+Example request against the preferences service can be run in your preferred IDE with the `request.http` file from the development folder.
 
 You can access the Keycloak UI via browser.
 URL: http://localhost:8080
 **username:** admin  
 **password:** password
 
-To stop the portal-prefs service, Keycloak and the databases run:
+To stop the preferences service, Keycloak and the databases run:
 ```sh
 development/stop.sh
 ```
diff --git a/app/build.gradle b/app/build.gradle
index 8602d9d..d219c24 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -40,7 +40,7 @@ dependencies {
     testImplementation 'io.rest-assured:rest-assured'
 }
 
-mainClassName = 'org.onap.portal.bff.Application'
+mainClassName = 'org.onap.portalng.bff.Application'
 
 bootJar {
     launchScript()
@@ -51,10 +51,10 @@ bootJar {
 springBoot {
     buildInfo {
         properties {
-            artifact = 'org-onap-portal-bff'
+            artifact = 'org-onap-portalng-bff'
             version = getVersion()
             group = rootProject.group
-            name = 'ONAP portal backend for frontend community edition'
+            name = 'portal-ng backend for frontend'
         }
     }
 }
diff --git a/app/src/main/java/org/onap/portal/bff/Application.java b/app/src/main/java/org/onap/portalng/bff/Application.java
index 32a07e8..679d103 100644
--- a/app/src/main/java/org/onap/portal/bff/Application.java
+++ b/app/src/main/java/org/onap/portalng/bff/Application.java
@@ -19,14 +19,14 @@
  *
  */
 
-package org.onap.portal.bff;
+package org.onap.portalng.bff;
 
-import org.onap.portal.bff.config.PortalBffConfig;
+import org.onap.portalng.bff.config.BffConfig;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 
-@EnableConfigurationProperties(PortalBffConfig.class)
+@EnableConfigurationProperties(BffConfig.class)
 @SpringBootApplication
 public class Application {
 
diff --git a/app/src/main/resources/application-access-control.yml b/app/src/main/resources/application-access-control.yml
index d967c53..450ab8a 100644
--- a/app/src/main/resources/application-access-control.yml
+++ b/app/src/main/resources/application-access-control.yml
@@ -1,4 +1,4 @@
-portal-bff.access-control:
+bff.access-control:
   ACTIONS_CREATE: [ onap_admin, onap_designer, onap_operator ]
   ACTIONS_GET: [ onap_admin, onap_designer, onap_operator ]
   ACTIONS_LIST: [ onap_admin, onap_designer, onap_operator ]
diff --git a/app/src/main/resources/application-development.yml b/app/src/main/resources/application-development.yml
index 50dfb51..c7e869f 100644
--- a/app/src/main/resources/application-development.yml
+++ b/app/src/main/resources/application-development.yml
@@ -9,7 +9,7 @@ spring:
         registration:
           keycloak:
             provider: keycloak
-            client-id: portal-bff
+            client-id: bff
             client-secret: 5933482a-9f4c-44e0-9814-dca17e0a9137
             authorization-grant-type: client_credentials
       resourceserver:
@@ -22,7 +22,7 @@ management:
       exposure:
         include: "*"
 
-portal-bff:
+bff:
   realm: ONAP
   portal-prefs-url: ${PORTAL_PREFS_URL}
   portal-history-url: ${PORTAL_HISTORY_URL}
diff --git a/app/src/main/resources/application-local.yml b/app/src/main/resources/application-local.yml
index e90a13b..0cb6e6b 100644
--- a/app/src/main/resources/application-local.yml
+++ b/app/src/main/resources/application-local.yml
@@ -9,7 +9,7 @@ spring:
         registration:
           keycloak:
             provider: keycloak
-            client-id: portal-bff
+            client-id: bff
             client-secret: pKOuVH1bwRZoNzp5P5t4GV8CqcCJYVtr
             authorization-grant-type: client_credentials
       resourceserver:
@@ -22,7 +22,7 @@ management:
       exposure:
         include: "*"
 
-portal-bff:
+bff:
   realm: ONAP
   portal-prefs-url: http://localhost:9001
   portal-history-url: http://localhost:9002
diff --git a/app/src/main/resources/application.yml b/app/src/main/resources/application.yml
index 83686b5..6e74453 100644
--- a/app/src/main/resources/application.yml
+++ b/app/src/main/resources/application.yml
@@ -16,7 +16,7 @@ management:
 
 spring:
   application:
-    name: portal-bff
+    name: bff
   profiles:
     include:
       - access-control
@@ -40,7 +40,7 @@ spring:
     serialization:
       FAIL_ON_EMPTY_BEANS: false
 
-portal-bff:
+bff:
   realm: ${KEYCLOAK_REALM}
   portal-prefs-url: ${PORTAL_PREFS_URL}
   portal-history-url: ${PORTAL_HISTORY_URL}
diff --git a/app/src/test/java/org/onap/portal/bff/ApiDocsIntegrationTest.java b/app/src/test/java/org/onap/portalng/bff/ApiDocsIntegrationTest.java
index 66edfee..98a5360 100644
--- a/app/src/test/java/org/onap/portal/bff/ApiDocsIntegrationTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/ApiDocsIntegrationTest.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.portal.bff;
+package org.onap.portalng.bff;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpStatus;
diff --git a/app/src/test/java/org/onap/portal/bff/BaseIntegrationTest.java b/app/src/test/java/org/onap/portalng/bff/BaseIntegrationTest.java
index c02082c..8821b76 100644
--- a/app/src/test/java/org/onap/portal/bff/BaseIntegrationTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/BaseIntegrationTest.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.portal.bff;
+package org.onap.portalng.bff;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.tomakehurst.wiremock.client.WireMock;
@@ -39,8 +39,8 @@ import java.util.UUID;
 import org.apache.http.client.utils.URIBuilder;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
-import org.onap.portal.bff.config.IdTokenExchangeFilterFunction;
-import org.onap.portal.bff.config.PortalBffConfig;
+import org.onap.portalng.bff.config.BffConfig;
+import org.onap.portalng.bff.config.IdTokenExchangeFilterFunction;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -66,13 +66,13 @@ public abstract class BaseIntegrationTest {
 
   @LocalServerPort protected int port;
 
-  @Value("${portal-bff.realm}")
+  @Value("${bff.realm}")
   protected String realm;
 
   @Autowired protected ObjectMapper objectMapper;
   @Autowired private TokenGenerator tokenGenerator;
 
-  @Autowired protected PortalBffConfig portalBffConfig;
+  @Autowired protected BffConfig bffConfig;
 
   @BeforeAll
   public static void setup() {
diff --git a/app/src/test/java/org/onap/portal/bff/HealthCheckIntegrationTest.java b/app/src/test/java/org/onap/portalng/bff/HealthCheckIntegrationTest.java
index cef85e1..3d3a1cd 100644
--- a/app/src/test/java/org/onap/portal/bff/HealthCheckIntegrationTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/HealthCheckIntegrationTest.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.portal.bff;
+package org.onap.portalng.bff;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/app/src/test/java/org/onap/portal/bff/TokenGenerator.java b/app/src/test/java/org/onap/portalng/bff/TokenGenerator.java
index 33b9207..051129f 100644
--- a/app/src/test/java/org/onap/portal/bff/TokenGenerator.java
+++ b/app/src/test/java/org/onap/portalng/bff/TokenGenerator.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.portal.bff;
+package org.onap.portalng.bff;
 
 import com.nimbusds.jose.JOSEObjectType;
 import com.nimbusds.jose.JWSAlgorithm;
diff --git a/app/src/test/java/org/onap/portal/bff/actions/ActionDto.java b/app/src/test/java/org/onap/portalng/bff/actions/ActionDto.java
index c88a0db..a80f7a1 100644
--- a/app/src/test/java/org/onap/portal/bff/actions/ActionDto.java
+++ b/app/src/test/java/org/onap/portalng/bff/actions/ActionDto.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.portal.bff.actions;
+package org.onap.portalng.bff.actions;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/app/src/test/java/org/onap/portal/bff/actions/ActionFixtures.java b/app/src/test/java/org/onap/portalng/bff/actions/ActionFixtures.java
index 3e7c917..0acd0eb 100644
--- a/app/src/test/java/org/onap/portal/bff/actions/ActionFixtures.java
+++ b/app/src/test/java/org/onap/portalng/bff/actions/ActionFixtures.java
@@ -19,14 +19,14 @@
  *
  */
 
-package org.onap.portal.bff.actions;
+package org.onap.portalng.bff.actions;
 
 import java.time.OffsetDateTime;
 import java.time.temporal.ChronoUnit;
-import org.onap.portal.bff.openapi.client_portal_history.model.ActionResponsePortalHistoryDto;
-import org.onap.portal.bff.openapi.client_portal_history.model.ActionsListResponsePortalHistoryDto;
-import org.onap.portal.bff.openapi.client_portal_history.model.CreateActionRequestPortalHistoryDto;
-import org.onap.portal.bff.openapi.server.model.CreateActionRequestApiDto;
+import org.onap.portalng.bff.openapi.client_portal_history.model.ActionResponsePortalHistoryDto;
+import org.onap.portalng.bff.openapi.client_portal_history.model.ActionsListResponsePortalHistoryDto;
+import org.onap.portalng.bff.openapi.client_portal_history.model.CreateActionRequestPortalHistoryDto;
+import org.onap.portalng.bff.openapi.server.model.CreateActionRequestApiDto;
 
 public class ActionFixtures {
 
diff --git a/app/src/test/java/org/onap/portal/bff/actions/ActionsMocks.java b/app/src/test/java/org/onap/portalng/bff/actions/ActionsMocks.java
index 0bb27d7..aa9e2f3 100644
--- a/app/src/test/java/org/onap/portal/bff/actions/ActionsMocks.java
+++ b/app/src/test/java/org/onap/portalng/bff/actions/ActionsMocks.java
@@ -19,21 +19,21 @@
  *
  */
 
-package org.onap.portal.bff.actions;
+package org.onap.portalng.bff.actions;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.github.tomakehurst.wiremock.client.WireMock;
 import com.github.tomakehurst.wiremock.matching.EqualToPattern;
 import io.restassured.http.Header;
 import org.apache.http.HttpHeaders;
-import org.onap.portal.bff.BaseIntegrationTest;
-import org.onap.portal.bff.openapi.client_portal_history.model.ActionResponsePortalHistoryDto;
-import org.onap.portal.bff.openapi.client_portal_history.model.ActionsListResponsePortalHistoryDto;
-import org.onap.portal.bff.openapi.client_portal_history.model.ProblemPortalHistoryDto;
-import org.onap.portal.bff.openapi.server.model.ActionsListResponseApiDto;
-import org.onap.portal.bff.openapi.server.model.ActionsResponseApiDto;
-import org.onap.portal.bff.openapi.server.model.CreateActionRequestApiDto;
-import org.onap.portal.bff.openapi.server.model.ProblemApiDto;
+import org.onap.portalng.bff.BaseIntegrationTest;
+import org.onap.portalng.bff.openapi.client_portal_history.model.ActionResponsePortalHistoryDto;
+import org.onap.portalng.bff.openapi.client_portal_history.model.ActionsListResponsePortalHistoryDto;
+import org.onap.portalng.bff.openapi.client_portal_history.model.ProblemPortalHistoryDto;
+import org.onap.portalng.bff.openapi.server.model.ActionsListResponseApiDto;
+import org.onap.portalng.bff.openapi.server.model.ActionsResponseApiDto;
+import org.onap.portalng.bff.openapi.server.model.CreateActionRequestApiDto;
+import org.onap.portalng.bff.openapi.server.model.ProblemApiDto;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 
diff --git a/app/src/test/java/org/onap/portal/bff/actions/CreateActionsIntegrationTest.java b/app/src/test/java/org/onap/portalng/bff/actions/CreateActionsIntegrationTest.java
index 0b6ec57..3508f19 100644
--- a/app/src/test/java/org/onap/portal/bff/actions/CreateActionsIntegrationTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/actions/CreateActionsIntegrationTest.java
@@ -19,18 +19,18 @@
  *
  */
 
-package org.onap.portal.bff.actions;
+package org.onap.portalng.bff.actions;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.time.OffsetDateTime;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.onap.portal.bff.openapi.client_portal_history.model.ActionResponsePortalHistoryDto;
-import org.onap.portal.bff.openapi.client_portal_history.model.ProblemPortalHistoryDto;
-import org.onap.portal.bff.openapi.server.model.ActionsResponseApiDto;
-import org.onap.portal.bff.openapi.server.model.CreateActionRequestApiDto;
-import org.onap.portal.bff.openapi.server.model.ProblemApiDto;
+import org.onap.portalng.bff.openapi.client_portal_history.model.ActionResponsePortalHistoryDto;
+import org.onap.portalng.bff.openapi.client_portal_history.model.ProblemPortalHistoryDto;
+import org.onap.portalng.bff.openapi.server.model.ActionsResponseApiDto;
+import org.onap.portalng.bff.openapi.server.model.CreateActionRequestApiDto;
+import org.onap.portalng.bff.openapi.server.model.ProblemApiDto;
 import org.springframework.http.HttpStatus;
 
 class CreateActionsIntegrationTest extends ActionsMocks {
diff --git a/app/src/test/java/org/onap/portal/bff/actions/GetActionsIntegrationTest.java b/app/src/test/java/org/onap/portalng/bff/actions/GetActionsIntegrationTest.java
index 1f77036..489a8d3 100644
--- a/app/src/test/java/org/onap/portal/bff/actions/GetActionsIntegrationTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/actions/GetActionsIntegrationTest.java
@@ -19,14 +19,14 @@
  *
  */
 
-package org.onap.portal.bff.actions;
+package org.onap.portalng.bff.actions;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.time.OffsetDateTime;
 import org.junit.jupiter.api.Test;
-import org.onap.portal.bff.openapi.client_portal_history.model.ActionsListResponsePortalHistoryDto;
-import org.onap.portal.bff.openapi.server.model.ActionsListResponseApiDto;
+import org.onap.portalng.bff.openapi.client_portal_history.model.ActionsListResponsePortalHistoryDto;
+import org.onap.portalng.bff.openapi.server.model.ActionsListResponseApiDto;
 
 class GetActionsIntegrationTest extends ActionsMocks {
 
diff --git a/app/src/test/java/org/onap/portal/bff/actions/ListActionsIntegrationTest.java b/app/src/test/java/org/onap/portalng/bff/actions/ListActionsIntegrationTest.java
index 7eb7078..8451641 100644
--- a/app/src/test/java/org/onap/portal/bff/actions/ListActionsIntegrationTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/actions/ListActionsIntegrationTest.java
@@ -19,17 +19,17 @@
  *
  */
 
-package org.onap.portal.bff.actions;
+package org.onap.portalng.bff.actions;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.time.OffsetDateTime;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.onap.portal.bff.openapi.client_portal_history.model.ActionsListResponsePortalHistoryDto;
-import org.onap.portal.bff.openapi.client_portal_history.model.ProblemPortalHistoryDto;
-import org.onap.portal.bff.openapi.server.model.ActionsListResponseApiDto;
-import org.onap.portal.bff.openapi.server.model.ProblemApiDto;
+import org.onap.portalng.bff.openapi.client_portal_history.model.ActionsListResponsePortalHistoryDto;
+import org.onap.portalng.bff.openapi.client_portal_history.model.ProblemPortalHistoryDto;
+import org.onap.portalng.bff.openapi.server.model.ActionsListResponseApiDto;
+import org.onap.portalng.bff.openapi.server.model.ProblemApiDto;
 import org.springframework.http.HttpStatus;
 
 class ListActionsIntegrationTest extends ActionsMocks {
diff --git a/app/src/test/java/org/onap/portal/bff/headers/XRequestIdHeaderTest.java b/app/src/test/java/org/onap/portalng/bff/headers/XRequestIdHeaderTest.java
index 50f75c7..6f82308 100644
--- a/app/src/test/java/org/onap/portal/bff/headers/XRequestIdHeaderTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/headers/XRequestIdHeaderTest.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.portal.bff.headers;
+package org.onap.portalng.bff.headers;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -27,8 +27,8 @@ import com.github.tomakehurst.wiremock.client.WireMock;
 import com.github.tomakehurst.wiremock.matching.EqualToPattern;
 import io.restassured.http.Header;
 import org.junit.jupiter.api.Test;
-import org.onap.portal.bff.BaseIntegrationTest;
-import org.onap.portal.bff.openapi.client_portal_prefs.model.PreferencesPortalPrefsDto;
+import org.onap.portalng.bff.BaseIntegrationTest;
+import org.onap.portalng.bff.openapi.client_portal_prefs.model.PreferencesPortalPrefsDto;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
diff --git a/app/src/test/java/org/onap/portal/bff/idtoken/IdTokenExchangeFilterFunctionTest.java b/app/src/test/java/org/onap/portalng/bff/idtoken/IdTokenExchangeFilterFunctionTest.java
index 7d65849..cb6694a 100644
--- a/app/src/test/java/org/onap/portal/bff/idtoken/IdTokenExchangeFilterFunctionTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/idtoken/IdTokenExchangeFilterFunctionTest.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.portal.bff.idtoken;
+package org.onap.portalng.bff.idtoken;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -28,8 +28,8 @@ import static org.mockito.Mockito.mock;
 import java.net.URI;
 import java.util.UUID;
 import org.junit.jupiter.api.Test;
-import org.onap.portal.bff.BaseIntegrationTest;
-import org.onap.portal.bff.config.IdTokenExchangeFilterFunction;
+import org.onap.portalng.bff.BaseIntegrationTest;
+import org.onap.portalng.bff.config.IdTokenExchangeFilterFunction;
 import org.springframework.http.HttpMethod;
 import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
 import org.springframework.mock.web.server.MockServerWebExchange;
diff --git a/app/src/test/java/org/onap/portal/bff/preferences/CreatePreferencesIntegrationTest.java b/app/src/test/java/org/onap/portalng/bff/preferences/CreatePreferencesIntegrationTest.java
index 5259de8..65a6f19 100644
--- a/app/src/test/java/org/onap/portal/bff/preferences/CreatePreferencesIntegrationTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/preferences/CreatePreferencesIntegrationTest.java
@@ -19,17 +19,17 @@
  *
  */
 
-package org.onap.portal.bff.preferences;
+package org.onap.portalng.bff.preferences;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
 import io.restassured.http.Header;
 import org.junit.jupiter.api.Test;
-import org.onap.portal.bff.openapi.client_portal_prefs.model.PreferencesPortalPrefsDto;
-import org.onap.portal.bff.openapi.client_portal_prefs.model.ProblemPortalPrefsDto;
-import org.onap.portal.bff.openapi.server.model.CreatePreferencesRequestApiDto;
-import org.onap.portal.bff.openapi.server.model.PreferencesResponseApiDto;
-import org.onap.portal.bff.openapi.server.model.ProblemApiDto;
+import org.onap.portalng.bff.openapi.client_portal_prefs.model.PreferencesPortalPrefsDto;
+import org.onap.portalng.bff.openapi.client_portal_prefs.model.ProblemPortalPrefsDto;
+import org.onap.portalng.bff.openapi.server.model.CreatePreferencesRequestApiDto;
+import org.onap.portalng.bff.openapi.server.model.PreferencesResponseApiDto;
+import org.onap.portalng.bff.openapi.server.model.ProblemApiDto;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 
diff --git a/app/src/test/java/org/onap/portal/bff/preferences/GetPreferencesIntegrationTest.java b/app/src/test/java/org/onap/portalng/bff/preferences/GetPreferencesIntegrationTest.java
index 1e1317b..06329d4 100644
--- a/app/src/test/java/org/onap/portal/bff/preferences/GetPreferencesIntegrationTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/preferences/GetPreferencesIntegrationTest.java
@@ -19,16 +19,16 @@
  *
  */
 
-package org.onap.portal.bff.preferences;
+package org.onap.portalng.bff.preferences;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.restassured.http.Header;
 import org.junit.jupiter.api.Test;
-import org.onap.portal.bff.openapi.client_portal_prefs.model.PreferencesPortalPrefsDto;
-import org.onap.portal.bff.openapi.client_portal_prefs.model.ProblemPortalPrefsDto;
-import org.onap.portal.bff.openapi.server.model.PreferencesResponseApiDto;
-import org.onap.portal.bff.openapi.server.model.ProblemApiDto;
+import org.onap.portalng.bff.openapi.client_portal_prefs.model.PreferencesPortalPrefsDto;
+import org.onap.portalng.bff.openapi.client_portal_prefs.model.ProblemPortalPrefsDto;
+import org.onap.portalng.bff.openapi.server.model.PreferencesResponseApiDto;
+import org.onap.portalng.bff.openapi.server.model.ProblemApiDto;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 
diff --git a/app/src/test/java/org/onap/portal/bff/preferences/PreferencesMocks.java b/app/src/test/java/org/onap/portalng/bff/preferences/PreferencesMocks.java
index e08c690..0d5b69a 100644
--- a/app/src/test/java/org/onap/portal/bff/preferences/PreferencesMocks.java
+++ b/app/src/test/java/org/onap/portalng/bff/preferences/PreferencesMocks.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.portal.bff.preferences;
+package org.onap.portalng.bff.preferences;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -29,11 +29,11 @@ import io.restassured.http.Header;
 import java.io.File;
 import java.io.IOException;
 import org.apache.http.HttpHeaders;
-import org.onap.portal.bff.BaseIntegrationTest;
-import org.onap.portal.bff.openapi.client_portal_prefs.model.PreferencesPortalPrefsDto;
-import org.onap.portal.bff.openapi.client_portal_prefs.model.ProblemPortalPrefsDto;
-import org.onap.portal.bff.openapi.server.model.CreatePreferencesRequestApiDto;
-import org.onap.portal.bff.openapi.server.model.PreferencesResponseApiDto;
+import org.onap.portalng.bff.BaseIntegrationTest;
+import org.onap.portalng.bff.openapi.client_portal_prefs.model.PreferencesPortalPrefsDto;
+import org.onap.portalng.bff.openapi.client_portal_prefs.model.ProblemPortalPrefsDto;
+import org.onap.portalng.bff.openapi.server.model.CreatePreferencesRequestApiDto;
+import org.onap.portalng.bff.openapi.server.model.PreferencesResponseApiDto;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 
diff --git a/app/src/test/java/org/onap/portal/bff/preferences/UpdatePreferencesIntegrationTest.java b/app/src/test/java/org/onap/portalng/bff/preferences/UpdatePreferencesIntegrationTest.java
index 74d902c..031726e 100644
--- a/app/src/test/java/org/onap/portal/bff/preferences/UpdatePreferencesIntegrationTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/preferences/UpdatePreferencesIntegrationTest.java
@@ -19,17 +19,17 @@
  *
  */
 
-package org.onap.portal.bff.preferences;
+package org.onap.portalng.bff.preferences;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
 import io.restassured.http.Header;
 import org.junit.jupiter.api.Test;
-import org.onap.portal.bff.openapi.client_portal_prefs.model.PreferencesPortalPrefsDto;
-import org.onap.portal.bff.openapi.client_portal_prefs.model.ProblemPortalPrefsDto;
-import org.onap.portal.bff.openapi.server.model.CreatePreferencesRequestApiDto;
-import org.onap.portal.bff.openapi.server.model.PreferencesResponseApiDto;
-import org.onap.portal.bff.openapi.server.model.ProblemApiDto;
+import org.onap.portalng.bff.openapi.client_portal_prefs.model.PreferencesPortalPrefsDto;
+import org.onap.portalng.bff.openapi.client_portal_prefs.model.ProblemPortalPrefsDto;
+import org.onap.portalng.bff.openapi.server.model.CreatePreferencesRequestApiDto;
+import org.onap.portalng.bff.openapi.server.model.PreferencesResponseApiDto;
+import org.onap.portalng.bff.openapi.server.model.ProblemApiDto;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 
diff --git a/app/src/test/java/org/onap/portal/bff/roles/ListRealmRolesIntegrationTest.java b/app/src/test/java/org/onap/portalng/bff/roles/ListRealmRolesIntegrationTest.java
index 8228ac9..df95e2c 100644
--- a/app/src/test/java/org/onap/portal/bff/roles/ListRealmRolesIntegrationTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/roles/ListRealmRolesIntegrationTest.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.portal.bff.roles;
+package org.onap.portalng.bff.roles;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -27,11 +27,11 @@ import com.github.tomakehurst.wiremock.client.WireMock;
 import io.restassured.http.Header;
 import java.util.List;
 import org.junit.jupiter.api.Test;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.ErrorResponseKeycloakDto;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.RoleKeycloakDto;
-import org.onap.portal.bff.openapi.server.model.ProblemApiDto;
-import org.onap.portal.bff.openapi.server.model.RoleApiDto;
-import org.onap.portal.bff.openapi.server.model.RoleListResponseApiDto;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.ErrorResponseKeycloakDto;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.RoleKeycloakDto;
+import org.onap.portalng.bff.openapi.server.model.ProblemApiDto;
+import org.onap.portalng.bff.openapi.server.model.RoleApiDto;
+import org.onap.portalng.bff.openapi.server.model.RoleListResponseApiDto;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 
diff --git a/app/src/test/java/org/onap/portal/bff/roles/RolesMocks.java b/app/src/test/java/org/onap/portalng/bff/roles/RolesMocks.java
index 3243497..fe065a7 100644
--- a/app/src/test/java/org/onap/portal/bff/roles/RolesMocks.java
+++ b/app/src/test/java/org/onap/portalng/bff/roles/RolesMocks.java
@@ -19,14 +19,14 @@
  *
  */
 
-package org.onap.portal.bff.roles;
+package org.onap.portalng.bff.roles;
 
 import com.github.tomakehurst.wiremock.client.WireMock;
 import io.restassured.http.Header;
 import java.util.List;
-import org.onap.portal.bff.BaseIntegrationTest;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.RoleKeycloakDto;
-import org.onap.portal.bff.openapi.server.model.RoleListResponseApiDto;
+import org.onap.portalng.bff.BaseIntegrationTest;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.RoleKeycloakDto;
+import org.onap.portalng.bff.openapi.server.model.RoleListResponseApiDto;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 
diff --git a/app/src/test/java/org/onap/portal/bff/users/CreateUserIntegrationTest.java b/app/src/test/java/org/onap/portalng/bff/users/CreateUserIntegrationTest.java
index 8fb1eba..aa67631 100644
--- a/app/src/test/java/org/onap/portal/bff/users/CreateUserIntegrationTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/users/CreateUserIntegrationTest.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.portal.bff.users;
+package org.onap.portalng.bff.users;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -29,16 +29,16 @@ import io.restassured.http.Header;
 import java.util.Collections;
 import java.util.List;
 import org.junit.jupiter.api.Test;
-import org.onap.portal.bff.BaseIntegrationTest;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.ErrorResponseKeycloakDto;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.RequiredActionsKeycloakDto;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.RoleKeycloakDto;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.UserKeycloakDto;
-import org.onap.portal.bff.openapi.server.model.CreateUserRequestApiDto;
-import org.onap.portal.bff.openapi.server.model.ProblemApiDto;
-import org.onap.portal.bff.openapi.server.model.RoleApiDto;
-import org.onap.portal.bff.openapi.server.model.RoleListResponseApiDto;
-import org.onap.portal.bff.openapi.server.model.UserResponseApiDto;
+import org.onap.portalng.bff.BaseIntegrationTest;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.ErrorResponseKeycloakDto;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.RequiredActionsKeycloakDto;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.RoleKeycloakDto;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.UserKeycloakDto;
+import org.onap.portalng.bff.openapi.server.model.CreateUserRequestApiDto;
+import org.onap.portalng.bff.openapi.server.model.ProblemApiDto;
+import org.onap.portalng.bff.openapi.server.model.RoleApiDto;
+import org.onap.portalng.bff.openapi.server.model.RoleListResponseApiDto;
+import org.onap.portalng.bff.openapi.server.model.UserResponseApiDto;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 
diff --git a/app/src/test/java/org/onap/portal/bff/users/DeleteUserIntegrationTest.java b/app/src/test/java/org/onap/portalng/bff/users/DeleteUserIntegrationTest.java
index 69f6906..639e5d3 100644
--- a/app/src/test/java/org/onap/portal/bff/users/DeleteUserIntegrationTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/users/DeleteUserIntegrationTest.java
@@ -19,16 +19,16 @@
  *
  */
 
-package org.onap.portal.bff.users;
+package org.onap.portalng.bff.users;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.github.tomakehurst.wiremock.client.WireMock;
 import io.restassured.http.Header;
 import org.junit.jupiter.api.Test;
-import org.onap.portal.bff.BaseIntegrationTest;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.ErrorResponseKeycloakDto;
-import org.onap.portal.bff.openapi.server.model.ProblemApiDto;
+import org.onap.portalng.bff.BaseIntegrationTest;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.ErrorResponseKeycloakDto;
+import org.onap.portalng.bff.openapi.server.model.ProblemApiDto;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 
diff --git a/app/src/test/java/org/onap/portal/bff/users/GetUserDetailIntegrationTest.java b/app/src/test/java/org/onap/portalng/bff/users/GetUserDetailIntegrationTest.java
index 7974549..6704cbc 100644
--- a/app/src/test/java/org/onap/portal/bff/users/GetUserDetailIntegrationTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/users/GetUserDetailIntegrationTest.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.portal.bff.users;
+package org.onap.portalng.bff.users;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -28,12 +28,12 @@ import com.github.tomakehurst.wiremock.client.WireMock;
 import io.restassured.http.Header;
 import java.util.List;
 import org.junit.jupiter.api.Test;
-import org.onap.portal.bff.BaseIntegrationTest;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.ErrorResponseKeycloakDto;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.RoleKeycloakDto;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.UserKeycloakDto;
-import org.onap.portal.bff.openapi.server.model.ProblemApiDto;
-import org.onap.portal.bff.openapi.server.model.UserResponseApiDto;
+import org.onap.portalng.bff.BaseIntegrationTest;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.ErrorResponseKeycloakDto;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.RoleKeycloakDto;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.UserKeycloakDto;
+import org.onap.portalng.bff.openapi.server.model.ProblemApiDto;
+import org.onap.portalng.bff.openapi.server.model.UserResponseApiDto;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
diff --git a/app/src/test/java/org/onap/portal/bff/users/ListAssignedRolesIntegrationTest.java b/app/src/test/java/org/onap/portalng/bff/users/ListAssignedRolesIntegrationTest.java
index 193f399..7d05c67 100644
--- a/app/src/test/java/org/onap/portal/bff/users/ListAssignedRolesIntegrationTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/users/ListAssignedRolesIntegrationTest.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.portal.bff.users;
+package org.onap.portalng.bff.users;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -27,12 +27,12 @@ import com.github.tomakehurst.wiremock.client.WireMock;
 import io.restassured.http.Header;
 import java.util.List;
 import org.junit.jupiter.api.Test;
-import org.onap.portal.bff.BaseIntegrationTest;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.ErrorResponseKeycloakDto;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.RoleKeycloakDto;
-import org.onap.portal.bff.openapi.server.model.ProblemApiDto;
-import org.onap.portal.bff.openapi.server.model.RoleApiDto;
-import org.onap.portal.bff.openapi.server.model.RoleListResponseApiDto;
+import org.onap.portalng.bff.BaseIntegrationTest;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.ErrorResponseKeycloakDto;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.RoleKeycloakDto;
+import org.onap.portalng.bff.openapi.server.model.ProblemApiDto;
+import org.onap.portalng.bff.openapi.server.model.RoleApiDto;
+import org.onap.portalng.bff.openapi.server.model.RoleListResponseApiDto;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 
diff --git a/app/src/test/java/org/onap/portal/bff/users/ListAvailableRolesIntegrationTest.java b/app/src/test/java/org/onap/portalng/bff/users/ListAvailableRolesIntegrationTest.java
index d5f9bbf..86f9ed8 100644
--- a/app/src/test/java/org/onap/portal/bff/users/ListAvailableRolesIntegrationTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/users/ListAvailableRolesIntegrationTest.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.portal.bff.users;
+package org.onap.portalng.bff.users;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -27,12 +27,12 @@ import com.github.tomakehurst.wiremock.client.WireMock;
 import io.restassured.http.Header;
 import java.util.List;
 import org.junit.jupiter.api.Test;
-import org.onap.portal.bff.BaseIntegrationTest;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.ErrorResponseKeycloakDto;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.RoleKeycloakDto;
-import org.onap.portal.bff.openapi.server.model.ProblemApiDto;
-import org.onap.portal.bff.openapi.server.model.RoleApiDto;
-import org.onap.portal.bff.openapi.server.model.RoleListResponseApiDto;
+import org.onap.portalng.bff.BaseIntegrationTest;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.ErrorResponseKeycloakDto;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.RoleKeycloakDto;
+import org.onap.portalng.bff.openapi.server.model.ProblemApiDto;
+import org.onap.portalng.bff.openapi.server.model.RoleApiDto;
+import org.onap.portalng.bff.openapi.server.model.RoleListResponseApiDto;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 
diff --git a/app/src/test/java/org/onap/portal/bff/users/ListUsersIntegrationTest.java b/app/src/test/java/org/onap/portalng/bff/users/ListUsersIntegrationTest.java
index 18c486a..27a8ecd 100644
--- a/app/src/test/java/org/onap/portal/bff/users/ListUsersIntegrationTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/users/ListUsersIntegrationTest.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.portal.bff.users;
+package org.onap.portalng.bff.users;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -29,13 +29,13 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import org.junit.jupiter.api.Test;
-import org.onap.portal.bff.BaseIntegrationTest;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.ErrorResponseKeycloakDto;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.RoleKeycloakDto;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.UserKeycloakDto;
-import org.onap.portal.bff.openapi.server.model.ProblemApiDto;
-import org.onap.portal.bff.openapi.server.model.UserListResponseApiDto;
-import org.onap.portal.bff.openapi.server.model.UserResponseApiDto;
+import org.onap.portalng.bff.BaseIntegrationTest;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.ErrorResponseKeycloakDto;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.RoleKeycloakDto;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.UserKeycloakDto;
+import org.onap.portalng.bff.openapi.server.model.ProblemApiDto;
+import org.onap.portalng.bff.openapi.server.model.UserListResponseApiDto;
+import org.onap.portalng.bff.openapi.server.model.UserResponseApiDto;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 
diff --git a/app/src/test/java/org/onap/portal/bff/users/UpdateAssignedRolesIntegrationTest.java b/app/src/test/java/org/onap/portalng/bff/users/UpdateAssignedRolesIntegrationTest.java
index 8abe781..a1a5ee3 100644
--- a/app/src/test/java/org/onap/portal/bff/users/UpdateAssignedRolesIntegrationTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/users/UpdateAssignedRolesIntegrationTest.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.portal.bff.users;
+package org.onap.portalng.bff.users;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -29,12 +29,12 @@ import io.restassured.http.Header;
 import java.util.Collections;
 import java.util.List;
 import org.junit.jupiter.api.Test;
-import org.onap.portal.bff.BaseIntegrationTest;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.ErrorResponseKeycloakDto;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.RoleKeycloakDto;
-import org.onap.portal.bff.openapi.server.model.ProblemApiDto;
-import org.onap.portal.bff.openapi.server.model.RoleApiDto;
-import org.onap.portal.bff.openapi.server.model.RoleListResponseApiDto;
+import org.onap.portalng.bff.BaseIntegrationTest;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.ErrorResponseKeycloakDto;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.RoleKeycloakDto;
+import org.onap.portalng.bff.openapi.server.model.ProblemApiDto;
+import org.onap.portalng.bff.openapi.server.model.RoleApiDto;
+import org.onap.portalng.bff.openapi.server.model.RoleListResponseApiDto;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 
diff --git a/app/src/test/java/org/onap/portal/bff/users/UpdateUserIntegrationTest.java b/app/src/test/java/org/onap/portalng/bff/users/UpdateUserIntegrationTest.java
index f75773c..f181c5e 100644
--- a/app/src/test/java/org/onap/portal/bff/users/UpdateUserIntegrationTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/users/UpdateUserIntegrationTest.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.portal.bff.users;
+package org.onap.portalng.bff.users;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -28,12 +28,12 @@ import com.github.tomakehurst.wiremock.client.WireMock;
 import io.restassured.http.Header;
 import java.util.List;
 import org.junit.jupiter.api.Test;
-import org.onap.portal.bff.BaseIntegrationTest;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.ErrorResponseKeycloakDto;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.RoleKeycloakDto;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.UserKeycloakDto;
-import org.onap.portal.bff.openapi.server.model.ProblemApiDto;
-import org.onap.portal.bff.openapi.server.model.UpdateUserRequestApiDto;
+import org.onap.portalng.bff.BaseIntegrationTest;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.ErrorResponseKeycloakDto;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.RoleKeycloakDto;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.UserKeycloakDto;
+import org.onap.portalng.bff.openapi.server.model.ProblemApiDto;
+import org.onap.portalng.bff.openapi.server.model.UpdateUserRequestApiDto;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 
diff --git a/app/src/test/java/org/onap/portal/bff/users/UpdateUserPasswordIntegrationTest.java b/app/src/test/java/org/onap/portalng/bff/users/UpdateUserPasswordIntegrationTest.java
index 200ad69..0bdaaa9 100644
--- a/app/src/test/java/org/onap/portal/bff/users/UpdateUserPasswordIntegrationTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/users/UpdateUserPasswordIntegrationTest.java
@@ -19,18 +19,18 @@
  *
  */
 
-package org.onap.portal.bff.users;
+package org.onap.portalng.bff.users;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.github.tomakehurst.wiremock.client.WireMock;
 import io.restassured.http.Header;
 import org.junit.jupiter.api.Test;
-import org.onap.portal.bff.BaseIntegrationTest;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.CredentialKeycloakDto;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.ErrorResponseKeycloakDto;
-import org.onap.portal.bff.openapi.server.model.ProblemApiDto;
-import org.onap.portal.bff.openapi.server.model.UpdateUserPasswordRequestApiDto;
+import org.onap.portalng.bff.BaseIntegrationTest;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.CredentialKeycloakDto;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.ErrorResponseKeycloakDto;
+import org.onap.portalng.bff.openapi.server.model.ProblemApiDto;
+import org.onap.portalng.bff.openapi.server.model.UpdateUserPasswordRequestApiDto;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 
diff --git a/app/src/test/resources/application-access-control.yml b/app/src/test/resources/application-access-control.yml
index 5454a15..1eb37b8 100644
--- a/app/src/test/resources/application-access-control.yml
+++ b/app/src/test/resources/application-access-control.yml
@@ -1,4 +1,4 @@
-portal-bff.access-control:
+bff.access-control:
   ACTIONS_CREATE: [ onap_admin, onap_designer, onap_operator ]
   ACTIONS_GET: [ onap_admin, onap_designer, onap_operator ]
   ACTIONS_LIST: [ onap_admin, onap_designer, onap_operator ]
diff --git a/app/src/test/resources/application-development.yml b/app/src/test/resources/application-development.yml
index 8e97b45..2f408fe 100644
--- a/app/src/test/resources/application-development.yml
+++ b/app/src/test/resources/application-development.yml
@@ -25,7 +25,7 @@ spring:
     serialization:
       FAIL_ON_EMPTY_BEANS: false
 
-portal-bff:
+bff:
   realm: ONAP
   portal-prefs-url: http://localhost:${wiremock.server.port}
   portal-history-url: http://localhost:${wiremock.server.port}
diff --git a/app/src/test/resources/application.yml b/app/src/test/resources/application.yml
index f9a82d8..b26e5d4 100644
--- a/app/src/test/resources/application.yml
+++ b/app/src/test/resources/application.yml
@@ -26,7 +26,7 @@ spring:
     serialization:
       FAIL_ON_EMPTY_BEANS: false
 
-portal-bff:
+bff:
   realm: ONAP
   portal-prefs-url: http://localhost:${wiremock.server.port}
   portal-history-url: http://localhost:${wiremock.server.port}
diff --git a/bin/sonarqube.sh b/bin/sonarqube.sh
deleted file mode 100755
index 0047966..0000000
--- a/bin/sonarqube.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-./gradlew sonarqube -Dsonar.branch.name=local-ce -Dsonar.host.url=https://sonarqube.devops.telekom.de -Dsonar.login=5392bed06c65e0bbce329ad625cf8554ce467052
diff --git a/build.gradle b/build.gradle
index 388d92a..7a01578 100755
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,6 @@ buildscript {
         redocVersion = '2.0.0-rc.65'
         spotlessVersion = '6.10.0'
         spotbugsVersion = '5.0.10'
-        sonarqubeVersion = '3.4.0.2513'
         problemVersion = '0.27.1'
         problemSpringVersion = '0.27.0'
         logstashLogbackVersion = '7.2'
@@ -32,7 +31,6 @@ buildscript {
         classpath "com.github.spotbugs.snom:spotbugs-gradle-plugin:$spotbugsVersion"
         classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion"
         classpath "org.openapitools:openapi-generator-gradle-plugin:$openapiVersion"
-        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:$sonarqubeVersion"
         classpath "com.gorylenko.gradle-git-properties:gradle-git-properties:$gorylenkoVersion"
         classpath "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:$licenseVersion"
         classpath "gradle.plugin.com.github.johnrengelman:shadow:$shadowVersion"
diff --git a/development/config/onap-realm.json b/development/config/onap-realm.json
index e47136b..8e6ff9c 100644
--- a/development/config/onap-realm.json
+++ b/development/config/onap-realm.json
@@ -71,7 +71,7 @@
         "microprofile-jwt"
       ]
     }, {
-      "clientId" : "portal-bff",
+      "clientId" : "bff",
       "surrogateAuthRequired" : false,
       "enabled" : true,
       "alwaysDisplayInConsole" : false,
@@ -202,11 +202,11 @@
       "groups" : [ ]
     }, {
       "createdTimestamp" : 1665048112458,
-      "username" : "service-account-portal-bff",
+      "username" : "service-account-bff",
       "enabled" : true,
       "totp" : false,
       "emailVerified" : false,
-      "serviceAccountClientId" : "portal-bff",
+      "serviceAccountClientId" : "bff",
       "credentials" : [ ],
       "disableableCredentialTypes" : [ ],
       "requiredActions" : [ ],
diff --git a/lib/build.gradle b/lib/build.gradle
index 594dd9c..ea7dc98 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -5,9 +5,8 @@ apply plugin: 'maven-publish'
 apply plugin: 'java-library'
 apply plugin: 'com.diffplug.spotless'
 apply plugin: 'com.github.spotbugs'
-apply plugin: 'org.sonarqube'
 
-group 'org.onap.portal-ng'
+group 'org.onap.portalng'
 version rootProject.file('version').text.trim()
 
 dependencies {
@@ -53,12 +52,21 @@ publishing {
             artifacts = ["build/libs/bff-$version-all.jar"]
             pom {
                 name = rootProject.name
-                description = 'ONAP community edition of bff'
+                description = 'portal-ng backend-for-frontend service'
             }
         }
     }
+    // https://gitlab.devops.telekom.de/tnap/development/tesla-team/portal-community/bff/-/blob/pipeline/lib/build.gradle#L60
     repositories{
         mavenCentral()
+        // maven {
+        //     url "${maven_central_url}"
+        //     credentials {
+        //         username = "${artifactory_user}"
+        //         password = "${artifactory_password}"
+        //     }
+        // }
+
     }
 }
 
@@ -84,13 +92,4 @@ spotbugs {
     effort = "max"
     reportLevel = "high"
     excludeFilter = file("$rootProject.projectDir/spotbugs-exclude.xml")
-}
-
-sonarqube {
-    properties {
-        property "sonar.projectKey", "tnap.SONAR.portal.portal-bff-ce"
-        property "sonar.projectName", "portal-bff-ce"
-        property "sonar.projectDescription", "Community edition of the the ONAP portal"
-        property "sonar.exclusions", "**/build**"
-    }
 }
\ No newline at end of file
diff --git a/lib/src/main/java/org/onap/portal/bff/config/BeansConfig.java b/lib/src/main/java/org/onap/portalng/bff/config/BeansConfig.java
index ca4333b..926108a 100644
--- a/lib/src/main/java/org/onap/portal/bff/config/BeansConfig.java
+++ b/lib/src/main/java/org/onap/portalng/bff/config/BeansConfig.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.portal.bff.config;
+package org.onap.portalng.bff.config;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -31,8 +31,8 @@ import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import java.time.Clock;
 import java.util.List;
 import lombok.extern.slf4j.Slf4j;
-import org.onap.portal.bff.exceptions.DownstreamApiProblemException;
-import org.onap.portal.bff.utils.Logger;
+import org.onap.portalng.bff.exceptions.DownstreamApiProblemException;
+import org.onap.portalng.bff.utils.Logger;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.context.annotation.Bean;
diff --git a/lib/src/main/java/org/onap/portal/bff/config/PortalBffConfig.java b/lib/src/main/java/org/onap/portalng/bff/config/BffConfig.java
index b80fe20..0a78da1 100644
--- a/lib/src/main/java/org/onap/portal/bff/config/PortalBffConfig.java
+++ b/lib/src/main/java/org/onap/portalng/bff/config/BffConfig.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.portal.bff.config;
+package org.onap.portalng.bff.config;
 
 import java.util.List;
 import java.util.Map;
@@ -39,9 +39,9 @@ import reactor.core.publisher.Mono;
  */
 @Valid
 @ConstructorBinding
-@ConfigurationProperties("portal-bff")
+@ConfigurationProperties("bff")
 @Data
-public class PortalBffConfig {
+public class BffConfig {
 
   @NotBlank private final String realm;
   @NotBlank private final String portalServiceUrl;
diff --git a/lib/src/main/java/org/onap/portal/bff/config/ConversionServiceConfig.java b/lib/src/main/java/org/onap/portalng/bff/config/ConversionServiceConfig.java
index 18830ef..517de13 100644
--- a/lib/src/main/java/org/onap/portal/bff/config/ConversionServiceConfig.java
+++ b/lib/src/main/java/org/onap/portalng/bff/config/ConversionServiceConfig.java
@@ -19,13 +19,13 @@
  *
  */
 
-package org.onap.portal.bff.config;
+package org.onap.portalng.bff.config;
 
 import java.util.List;
-import org.onap.portal.bff.mappers.ActionsMapper;
-import org.onap.portal.bff.mappers.PreferencesMapper;
-import org.onap.portal.bff.mappers.RolesMapper;
-import org.onap.portal.bff.mappers.UsersMapper;
+import org.onap.portalng.bff.mappers.ActionsMapper;
+import org.onap.portalng.bff.mappers.PreferencesMapper;
+import org.onap.portalng.bff.mappers.RolesMapper;
+import org.onap.portalng.bff.mappers.UsersMapper;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.convert.converter.Converter;
diff --git a/lib/src/main/java/org/onap/portal/bff/config/IdTokenExchangeFilterFunction.java b/lib/src/main/java/org/onap/portalng/bff/config/IdTokenExchangeFilterFunction.java
index 9cd8ac0..d747f3a 100644
--- a/lib/src/main/java/org/onap/portal/bff/config/IdTokenExchangeFilterFunction.java
+++ b/lib/src/main/java/org/onap/portalng/bff/config/IdTokenExchangeFilterFunction.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.portal.bff.config;
+package org.onap.portalng.bff.config;
 
 import com.nimbusds.jwt.JWTParser;
 import java.text.ParseException;
diff --git a/lib/src/main/java/org/onap/portal/bff/config/LoggerInterceptor.java b/lib/src/main/java/org/onap/portalng/bff/config/LoggerInterceptor.java
index 4fa2d82..5b9b492 100644
--- a/lib/src/main/java/org/onap/portal/bff/config/LoggerInterceptor.java
+++ b/lib/src/main/java/org/onap/portalng/bff/config/LoggerInterceptor.java
@@ -19,10 +19,10 @@
  *
  */
 
-package org.onap.portal.bff.config;
+package org.onap.portalng.bff.config;
 
 import java.util.List;
-import org.onap.portal.bff.utils.Logger;
+import org.onap.portalng.bff.utils.Logger;
 import org.springframework.stereotype.Component;
 import org.springframework.web.filter.reactive.ServerWebExchangeContextFilter;
 import org.springframework.web.server.ServerWebExchange;
diff --git a/lib/src/main/java/org/onap/portal/bff/config/MapperSpringConfig.java b/lib/src/main/java/org/onap/portalng/bff/config/MapperSpringConfig.java
index c7e3711..cc48080 100644
--- a/lib/src/main/java/org/onap/portal/bff/config/MapperSpringConfig.java
+++ b/lib/src/main/java/org/onap/portalng/bff/config/MapperSpringConfig.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.portal.bff.config;
+package org.onap.portalng.bff.config;
 
 import org.mapstruct.MapperConfig;
 import org.mapstruct.extensions.spring.converter.ConversionServiceAdapterGenerator;
diff --git a/lib/src/main/java/org/onap/portal/bff/config/SecurityConfig.java b/lib/src/main/java/org/onap/portalng/bff/config/SecurityConfig.java
index 0d33980..2a0f701 100644
--- a/lib/src/main/java/org/onap/portal/bff/config/SecurityConfig.java
+++ b/lib/src/main/java/org/onap/portalng/bff/config/SecurityConfig.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.portal.bff.config;
+package org.onap.portalng.bff.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/lib/src/main/java/org/onap/portal/bff/config/clients/AbstractClientConfig.java b/lib/src/main/java/org/onap/portalng/bff/config/clients/AbstractClientConfig.java
index 85ee8ba..75dce3d 100644
--- a/lib/src/main/java/org/onap/portal/bff/config/clients/AbstractClientConfig.java
+++ b/lib/src/main/java/org/onap/portalng/bff/config/clients/AbstractClientConfig.java
@@ -19,13 +19,13 @@
  *
  */
 
-package org.onap.portal.bff.config.clients;
+package org.onap.portalng.bff.config.clients;
 
 import java.time.Duration;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.onap.portal.bff.exceptions.DownstreamApiProblemException;
+import org.onap.portalng.bff.exceptions.DownstreamApiProblemException;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.client.reactive.ClientHttpConnector;
 import org.springframework.http.client.reactive.ReactorClientHttpConnector;
diff --git a/lib/src/main/java/org/onap/portal/bff/config/clients/KeycloakConfig.java b/lib/src/main/java/org/onap/portalng/bff/config/clients/KeycloakConfig.java
index 168c350..d96db71 100644
--- a/lib/src/main/java/org/onap/portal/bff/config/clients/KeycloakConfig.java
+++ b/lib/src/main/java/org/onap/portalng/bff/config/clients/KeycloakConfig.java
@@ -19,18 +19,18 @@
  *
  */
 
-package org.onap.portal.bff.config.clients;
+package org.onap.portalng.bff.config.clients;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.util.List;
 import java.util.function.Function;
-import org.onap.portal.bff.config.BeansConfig;
-import org.onap.portal.bff.config.PortalBffConfig;
-import org.onap.portal.bff.exceptions.DownstreamApiProblemException;
-import org.onap.portal.bff.openapi.client_portal_keycloak.ApiClient;
-import org.onap.portal.bff.openapi.client_portal_keycloak.api.KeycloakApi;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.ErrorResponseKeycloakDto;
-import org.onap.portal.bff.openapi.server.model.ProblemApiDto;
+import org.onap.portalng.bff.config.BeansConfig;
+import org.onap.portalng.bff.config.BffConfig;
+import org.onap.portalng.bff.exceptions.DownstreamApiProblemException;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.ApiClient;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.api.KeycloakApi;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.ErrorResponseKeycloakDto;
+import org.onap.portalng.bff.openapi.server.model.ProblemApiDto;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -42,14 +42,14 @@ import org.springframework.web.reactive.function.client.WebClient;
 @Configuration
 public class KeycloakConfig extends AbstractClientConfig<ErrorResponseKeycloakDto> {
   private final ObjectMapper objectMapper;
-  private final PortalBffConfig bffConfig;
+  private final BffConfig bffConfig;
   private final ExchangeFilterFunction oauth2ExchangeFilterFunction;
 
   public KeycloakConfig(
       @Qualifier(BeansConfig.OAUTH2_EXCHANGE_FILTER_FUNCTION)
           ExchangeFilterFunction oauth2ExchangeFilterFunction,
       ObjectMapper objectMapper,
-      PortalBffConfig bffConfig) {
+      BffConfig bffConfig) {
     super(ErrorResponseKeycloakDto.class);
     this.objectMapper = objectMapper;
     this.bffConfig = bffConfig;
diff --git a/lib/src/main/java/org/onap/portal/bff/config/clients/PortalHistoryConfig.java b/lib/src/main/java/org/onap/portalng/bff/config/clients/PortalHistoryConfig.java
index b71608f..00cda73 100644
--- a/lib/src/main/java/org/onap/portal/bff/config/clients/PortalHistoryConfig.java
+++ b/lib/src/main/java/org/onap/portalng/bff/config/clients/PortalHistoryConfig.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.portal.bff.config.clients;
+package org.onap.portalng.bff.config.clients;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.net.MalformedURLException;
@@ -27,13 +27,13 @@ import java.net.URL;
 import java.util.List;
 import java.util.function.Function;
 import lombok.extern.slf4j.Slf4j;
-import org.onap.portal.bff.config.BeansConfig;
-import org.onap.portal.bff.config.PortalBffConfig;
-import org.onap.portal.bff.exceptions.DownstreamApiProblemException;
-import org.onap.portal.bff.openapi.client_portal_history.ApiClient;
-import org.onap.portal.bff.openapi.client_portal_history.api.ActionsApi;
-import org.onap.portal.bff.openapi.client_portal_history.model.ProblemPortalHistoryDto;
-import org.onap.portal.bff.openapi.server.model.ProblemApiDto;
+import org.onap.portalng.bff.config.BeansConfig;
+import org.onap.portalng.bff.config.BffConfig;
+import org.onap.portalng.bff.exceptions.DownstreamApiProblemException;
+import org.onap.portalng.bff.openapi.client_portal_history.ApiClient;
+import org.onap.portalng.bff.openapi.client_portal_history.api.ActionsApi;
+import org.onap.portalng.bff.openapi.client_portal_history.model.ProblemPortalHistoryDto;
+import org.onap.portalng.bff.openapi.server.model.ProblemApiDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
@@ -46,7 +46,7 @@ import org.springframework.web.reactive.function.client.WebClient;
 @Configuration
 public class PortalHistoryConfig extends AbstractClientConfig<ProblemPortalHistoryDto> {
   private final ObjectMapper objectMapper;
-  private final PortalBffConfig bffConfig;
+  private final BffConfig bffConfig;
   private final ExchangeFilterFunction oauth2ExchangeFilterFunction;
 
   @Autowired
@@ -54,7 +54,7 @@ public class PortalHistoryConfig extends AbstractClientConfig<ProblemPortalHisto
       @Qualifier(BeansConfig.OAUTH2_EXCHANGE_FILTER_FUNCTION)
           ExchangeFilterFunction oauth2ExchangeFilterFunction,
       ObjectMapper objectMapper,
-      PortalBffConfig bffConfig) {
+      BffConfig bffConfig) {
     super(ProblemPortalHistoryDto.class);
     this.objectMapper = objectMapper;
     this.bffConfig = bffConfig;
diff --git a/lib/src/main/java/org/onap/portal/bff/config/clients/PortalPrefsConfig.java b/lib/src/main/java/org/onap/portalng/bff/config/clients/PortalPrefsConfig.java
index 5e23348..c1aacbe 100644
--- a/lib/src/main/java/org/onap/portal/bff/config/clients/PortalPrefsConfig.java
+++ b/lib/src/main/java/org/onap/portalng/bff/config/clients/PortalPrefsConfig.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.portal.bff.config.clients;
+package org.onap.portalng.bff.config.clients;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.net.MalformedURLException;
@@ -27,13 +27,13 @@ import java.net.URL;
 import java.util.List;
 import java.util.function.Function;
 import lombok.extern.slf4j.Slf4j;
-import org.onap.portal.bff.config.BeansConfig;
-import org.onap.portal.bff.config.PortalBffConfig;
-import org.onap.portal.bff.exceptions.DownstreamApiProblemException;
-import org.onap.portal.bff.openapi.client_portal_prefs.ApiClient;
-import org.onap.portal.bff.openapi.client_portal_prefs.api.PreferencesApi;
-import org.onap.portal.bff.openapi.client_portal_prefs.model.ProblemPortalPrefsDto;
-import org.onap.portal.bff.openapi.server.model.ProblemApiDto;
+import org.onap.portalng.bff.config.BeansConfig;
+import org.onap.portalng.bff.config.BffConfig;
+import org.onap.portalng.bff.exceptions.DownstreamApiProblemException;
+import org.onap.portalng.bff.openapi.client_portal_prefs.ApiClient;
+import org.onap.portalng.bff.openapi.client_portal_prefs.api.PreferencesApi;
+import org.onap.portalng.bff.openapi.client_portal_prefs.model.ProblemPortalPrefsDto;
+import org.onap.portalng.bff.openapi.server.model.ProblemApiDto;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -45,14 +45,14 @@ import org.springframework.web.reactive.function.client.WebClient;
 @Configuration
 public class PortalPrefsConfig extends AbstractClientConfig<ProblemPortalPrefsDto> {
   private final ObjectMapper objectMapper;
-  private final PortalBffConfig bffConfig;
+  private final BffConfig bffConfig;
   private final ExchangeFilterFunction oauth2ExchangeFilterFunction;
 
   public PortalPrefsConfig(
       @Qualifier(BeansConfig.OAUTH2_EXCHANGE_FILTER_FUNCTION)
           ExchangeFilterFunction oauth2ExchangeFilterFunction,
       ObjectMapper objectMapper,
-      PortalBffConfig bffConfig) {
+      BffConfig bffConfig) {
     super(ProblemPortalPrefsDto.class);
     this.objectMapper = objectMapper;
     this.bffConfig = bffConfig;
diff --git a/lib/src/main/java/org/onap/portal/bff/controller/AbstractBffController.java b/lib/src/main/java/org/onap/portalng/bff/controller/AbstractBffController.java
index bc92b68..afcb448 100644
--- a/lib/src/main/java/org/onap/portal/bff/controller/AbstractBffController.java
+++ b/lib/src/main/java/org/onap/portalng/bff/controller/AbstractBffController.java
@@ -19,18 +19,18 @@
  *
  */
 
-package org.onap.portal.bff.controller;
+package org.onap.portalng.bff.controller;
 
-import org.onap.portal.bff.config.IdTokenExchangeFilterFunction;
-import org.onap.portal.bff.config.PortalBffConfig;
+import org.onap.portalng.bff.config.BffConfig;
+import org.onap.portalng.bff.config.IdTokenExchangeFilterFunction;
 import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Mono;
 
 public abstract class AbstractBffController {
 
-  protected PortalBffConfig bffConfig;
+  protected BffConfig bffConfig;
 
-  protected AbstractBffController(PortalBffConfig bffConfig) {
+  protected AbstractBffController(BffConfig bffConfig) {
     this.bffConfig = bffConfig;
   }
 
diff --git a/lib/src/main/java/org/onap/portal/bff/controller/ActionsController.java b/lib/src/main/java/org/onap/portalng/bff/controller/ActionsController.java
index ece6683..8b8f615 100644
--- a/lib/src/main/java/org/onap/portal/bff/controller/ActionsController.java
+++ b/lib/src/main/java/org/onap/portalng/bff/controller/ActionsController.java
@@ -19,14 +19,14 @@
  *
  */
 
-package org.onap.portal.bff.controller;
+package org.onap.portalng.bff.controller;
 
-import org.onap.portal.bff.config.PortalBffConfig;
-import org.onap.portal.bff.openapi.server.api.ActionsApi;
-import org.onap.portal.bff.openapi.server.model.ActionsListResponseApiDto;
-import org.onap.portal.bff.openapi.server.model.ActionsResponseApiDto;
-import org.onap.portal.bff.openapi.server.model.CreateActionRequestApiDto;
-import org.onap.portal.bff.services.ActionService;
+import org.onap.portalng.bff.config.BffConfig;
+import org.onap.portalng.bff.openapi.server.api.ActionsApi;
+import org.onap.portalng.bff.openapi.server.model.ActionsListResponseApiDto;
+import org.onap.portalng.bff.openapi.server.model.ActionsResponseApiDto;
+import org.onap.portalng.bff.openapi.server.model.CreateActionRequestApiDto;
+import org.onap.portalng.bff.services.ActionService;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.server.ServerWebExchange;
@@ -40,7 +40,7 @@ public class ActionsController extends AbstractBffController implements ActionsA
 
   private final ActionService actionService;
 
-  public ActionsController(PortalBffConfig bffConfig, ActionService actionService) {
+  public ActionsController(BffConfig bffConfig, ActionService actionService) {
     super(bffConfig);
     this.actionService = actionService;
   }
diff --git a/lib/src/main/java/org/onap/portal/bff/controller/BffControllerAdvice.java b/lib/src/main/java/org/onap/portalng/bff/controller/BffControllerAdvice.java
index 3580495..7bd6efa 100644
--- a/lib/src/main/java/org/onap/portal/bff/controller/BffControllerAdvice.java
+++ b/lib/src/main/java/org/onap/portalng/bff/controller/BffControllerAdvice.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.portal.bff.controller;
+package org.onap.portalng.bff.controller;
 
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.zalando.problem.spring.webflux.advice.ProblemHandling;
diff --git a/lib/src/main/java/org/onap/portal/bff/controller/PreferencesController.java b/lib/src/main/java/org/onap/portalng/bff/controller/PreferencesController.java
index 625d034..c43b4c2 100644
--- a/lib/src/main/java/org/onap/portal/bff/controller/PreferencesController.java
+++ b/lib/src/main/java/org/onap/portalng/bff/controller/PreferencesController.java
@@ -19,14 +19,14 @@
  *
  */
 
-package org.onap.portal.bff.controller;
+package org.onap.portalng.bff.controller;
 
 import javax.validation.Valid;
-import org.onap.portal.bff.config.PortalBffConfig;
-import org.onap.portal.bff.openapi.server.api.PreferencesApi;
-import org.onap.portal.bff.openapi.server.model.CreatePreferencesRequestApiDto;
-import org.onap.portal.bff.openapi.server.model.PreferencesResponseApiDto;
-import org.onap.portal.bff.services.PreferencesService;
+import org.onap.portalng.bff.config.BffConfig;
+import org.onap.portalng.bff.openapi.server.api.PreferencesApi;
+import org.onap.portalng.bff.openapi.server.model.CreatePreferencesRequestApiDto;
+import org.onap.portalng.bff.openapi.server.model.PreferencesResponseApiDto;
+import org.onap.portalng.bff.services.PreferencesService;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.server.ServerWebExchange;
@@ -40,7 +40,7 @@ public class PreferencesController extends AbstractBffController implements Pref
 
   private final PreferencesService preferencesService;
 
-  public PreferencesController(PortalBffConfig bffConfig, PreferencesService preferencesService) {
+  public PreferencesController(BffConfig bffConfig, PreferencesService preferencesService) {
     super(bffConfig);
     this.preferencesService = preferencesService;
   }
diff --git a/lib/src/main/java/org/onap/portal/bff/controller/RolesController.java b/lib/src/main/java/org/onap/portalng/bff/controller/RolesController.java
index 34d495f..3958811 100644
--- a/lib/src/main/java/org/onap/portal/bff/controller/RolesController.java
+++ b/lib/src/main/java/org/onap/portalng/bff/controller/RolesController.java
@@ -19,12 +19,12 @@
  *
  */
 
-package org.onap.portal.bff.controller;
+package org.onap.portalng.bff.controller;
 
-import org.onap.portal.bff.config.PortalBffConfig;
-import org.onap.portal.bff.openapi.server.api.RolesApi;
-import org.onap.portal.bff.openapi.server.model.RoleListResponseApiDto;
-import org.onap.portal.bff.services.KeycloakService;
+import org.onap.portalng.bff.config.BffConfig;
+import org.onap.portalng.bff.openapi.server.api.RolesApi;
+import org.onap.portalng.bff.openapi.server.model.RoleListResponseApiDto;
+import org.onap.portalng.bff.services.KeycloakService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RestController;
@@ -39,7 +39,7 @@ public class RolesController extends AbstractBffController implements RolesApi {
   private final KeycloakService keycloakService;
 
   @Autowired
-  public RolesController(PortalBffConfig bffConfig, KeycloakService keycloakService) {
+  public RolesController(BffConfig bffConfig, KeycloakService keycloakService) {
     super(bffConfig);
     this.keycloakService = keycloakService;
   }
diff --git a/lib/src/main/java/org/onap/portal/bff/controller/UsersController.java b/lib/src/main/java/org/onap/portalng/bff/controller/UsersController.java
index 9214ebe..f2c5653 100644
--- a/lib/src/main/java/org/onap/portal/bff/controller/UsersController.java
+++ b/lib/src/main/java/org/onap/portalng/bff/controller/UsersController.java
@@ -19,18 +19,18 @@
  *
  */
 
-package org.onap.portal.bff.controller;
-
-import org.onap.portal.bff.config.PortalBffConfig;
-import org.onap.portal.bff.openapi.server.api.UsersApi;
-import org.onap.portal.bff.openapi.server.model.CreateUserRequestApiDto;
-import org.onap.portal.bff.openapi.server.model.RoleApiDto;
-import org.onap.portal.bff.openapi.server.model.RoleListResponseApiDto;
-import org.onap.portal.bff.openapi.server.model.UpdateUserPasswordRequestApiDto;
-import org.onap.portal.bff.openapi.server.model.UpdateUserRequestApiDto;
-import org.onap.portal.bff.openapi.server.model.UserListResponseApiDto;
-import org.onap.portal.bff.openapi.server.model.UserResponseApiDto;
-import org.onap.portal.bff.services.KeycloakService;
+package org.onap.portalng.bff.controller;
+
+import org.onap.portalng.bff.config.BffConfig;
+import org.onap.portalng.bff.openapi.server.api.UsersApi;
+import org.onap.portalng.bff.openapi.server.model.CreateUserRequestApiDto;
+import org.onap.portalng.bff.openapi.server.model.RoleApiDto;
+import org.onap.portalng.bff.openapi.server.model.RoleListResponseApiDto;
+import org.onap.portalng.bff.openapi.server.model.UpdateUserPasswordRequestApiDto;
+import org.onap.portalng.bff.openapi.server.model.UpdateUserRequestApiDto;
+import org.onap.portalng.bff.openapi.server.model.UserListResponseApiDto;
+import org.onap.portalng.bff.openapi.server.model.UserResponseApiDto;
+import org.onap.portalng.bff.services.KeycloakService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RestController;
@@ -54,7 +54,7 @@ public class UsersController extends AbstractBffController implements UsersApi {
   private final KeycloakService keycloakService;
 
   @Autowired
-  public UsersController(PortalBffConfig bffConfig, KeycloakService keycloakService) {
+  public UsersController(BffConfig bffConfig, KeycloakService keycloakService) {
     super(bffConfig);
     this.keycloakService = keycloakService;
   }
diff --git a/lib/src/main/java/org/onap/portal/bff/exceptions/DownstreamApiProblemException.java b/lib/src/main/java/org/onap/portalng/bff/exceptions/DownstreamApiProblemException.java
index 35b895e..0c90473 100644
--- a/lib/src/main/java/org/onap/portal/bff/exceptions/DownstreamApiProblemException.java
+++ b/lib/src/main/java/org/onap/portalng/bff/exceptions/DownstreamApiProblemException.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.portal.bff.exceptions;
+package org.onap.portalng.bff.exceptions;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -31,13 +31,13 @@ import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
-import org.onap.portal.bff.openapi.server.model.ConstraintViolationApiDto;
+import org.onap.portalng.bff.openapi.server.model.ConstraintViolationApiDto;
 import org.zalando.problem.AbstractThrowableProblem;
 import org.zalando.problem.Problem;
 import org.zalando.problem.Status;
 import org.zalando.problem.StatusType;
 
-/** The default portal-bff exception */
+/** The default bff exception */
 @Getter
 @Builder
 @AllArgsConstructor
diff --git a/lib/src/main/java/org/onap/portal/bff/mappers/ActionsMapper.java b/lib/src/main/java/org/onap/portalng/bff/mappers/ActionsMapper.java
index 588deba..3f0ebdf 100644
--- a/lib/src/main/java/org/onap/portal/bff/mappers/ActionsMapper.java
+++ b/lib/src/main/java/org/onap/portalng/bff/mappers/ActionsMapper.java
@@ -19,13 +19,13 @@
  *
  */
 
-package org.onap.portal.bff.mappers;
+package org.onap.portalng.bff.mappers;
 
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
-import org.onap.portal.bff.config.MapperSpringConfig;
-import org.onap.portal.bff.openapi.client_portal_history.model.ActionsListResponsePortalHistoryDto;
-import org.onap.portal.bff.openapi.server.model.ActionsListResponseApiDto;
+import org.onap.portalng.bff.config.MapperSpringConfig;
+import org.onap.portalng.bff.openapi.client_portal_history.model.ActionsListResponsePortalHistoryDto;
+import org.onap.portalng.bff.openapi.server.model.ActionsListResponseApiDto;
 import org.springframework.core.convert.converter.Converter;
 
 @Mapper(config = MapperSpringConfig.class)
diff --git a/lib/src/main/java/org/onap/portal/bff/mappers/CredentialMapper.java b/lib/src/main/java/org/onap/portalng/bff/mappers/CredentialMapper.java
index e1db8de..b3c7f05 100644
--- a/lib/src/main/java/org/onap/portal/bff/mappers/CredentialMapper.java
+++ b/lib/src/main/java/org/onap/portalng/bff/mappers/CredentialMapper.java
@@ -19,13 +19,13 @@
  *
  */
 
-package org.onap.portal.bff.mappers;
+package org.onap.portalng.bff.mappers;
 
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
-import org.onap.portal.bff.config.MapperSpringConfig;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.CredentialKeycloakDto;
-import org.onap.portal.bff.openapi.server.model.UpdateUserPasswordRequestApiDto;
+import org.onap.portalng.bff.config.MapperSpringConfig;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.CredentialKeycloakDto;
+import org.onap.portalng.bff.openapi.server.model.UpdateUserPasswordRequestApiDto;
 
 @Mapper(config = MapperSpringConfig.class, unmappedTargetPolicy = ReportingPolicy.IGNORE)
 public interface CredentialMapper {
diff --git a/lib/src/main/java/org/onap/portal/bff/mappers/PreferencesMapper.java b/lib/src/main/java/org/onap/portalng/bff/mappers/PreferencesMapper.java
index 8a554fe..6e615c3 100644
--- a/lib/src/main/java/org/onap/portal/bff/mappers/PreferencesMapper.java
+++ b/lib/src/main/java/org/onap/portalng/bff/mappers/PreferencesMapper.java
@@ -19,13 +19,13 @@
  *
  */
 
-package org.onap.portal.bff.mappers;
+package org.onap.portalng.bff.mappers;
 
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
-import org.onap.portal.bff.config.MapperSpringConfig;
-import org.onap.portal.bff.openapi.client_portal_prefs.model.PreferencesPortalPrefsDto;
-import org.onap.portal.bff.openapi.server.model.PreferencesResponseApiDto;
+import org.onap.portalng.bff.config.MapperSpringConfig;
+import org.onap.portalng.bff.openapi.client_portal_prefs.model.PreferencesPortalPrefsDto;
+import org.onap.portalng.bff.openapi.server.model.PreferencesResponseApiDto;
 import org.springframework.core.convert.converter.Converter;
 
 @Mapper(config = MapperSpringConfig.class)
diff --git a/lib/src/main/java/org/onap/portal/bff/mappers/RolesMapper.java b/lib/src/main/java/org/onap/portalng/bff/mappers/RolesMapper.java
index 68d00d8..6e14d7e 100644
--- a/lib/src/main/java/org/onap/portal/bff/mappers/RolesMapper.java
+++ b/lib/src/main/java/org/onap/portalng/bff/mappers/RolesMapper.java
@@ -19,13 +19,13 @@
  *
  */
 
-package org.onap.portal.bff.mappers;
+package org.onap.portalng.bff.mappers;
 
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
-import org.onap.portal.bff.config.MapperSpringConfig;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.RoleKeycloakDto;
-import org.onap.portal.bff.openapi.server.model.RoleApiDto;
+import org.onap.portalng.bff.config.MapperSpringConfig;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.RoleKeycloakDto;
+import org.onap.portalng.bff.openapi.server.model.RoleApiDto;
 import org.springframework.core.convert.converter.Converter;
 
 @Mapper(config = MapperSpringConfig.class, unmappedTargetPolicy = ReportingPolicy.IGNORE)
diff --git a/lib/src/main/java/org/onap/portal/bff/mappers/UsersMapper.java b/lib/src/main/java/org/onap/portalng/bff/mappers/UsersMapper.java
index 19cb4c7..f494c5d 100644
--- a/lib/src/main/java/org/onap/portal/bff/mappers/UsersMapper.java
+++ b/lib/src/main/java/org/onap/portalng/bff/mappers/UsersMapper.java
@@ -19,18 +19,18 @@
  *
  */
 
-package org.onap.portal.bff.mappers;
+package org.onap.portalng.bff.mappers;
 
 import java.util.List;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.ReportingPolicy;
-import org.onap.portal.bff.config.MapperSpringConfig;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.RequiredActionsKeycloakDto;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.UserKeycloakDto;
-import org.onap.portal.bff.openapi.server.model.CreateUserRequestApiDto;
-import org.onap.portal.bff.openapi.server.model.UpdateUserRequestApiDto;
-import org.onap.portal.bff.openapi.server.model.UserResponseApiDto;
+import org.onap.portalng.bff.config.MapperSpringConfig;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.RequiredActionsKeycloakDto;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.UserKeycloakDto;
+import org.onap.portalng.bff.openapi.server.model.CreateUserRequestApiDto;
+import org.onap.portalng.bff.openapi.server.model.UpdateUserRequestApiDto;
+import org.onap.portalng.bff.openapi.server.model.UserResponseApiDto;
 import org.springframework.core.convert.converter.Converter;
 
 @Mapper(config = MapperSpringConfig.class, unmappedTargetPolicy = ReportingPolicy.IGNORE)
diff --git a/lib/src/main/java/org/onap/portal/bff/services/ActionService.java b/lib/src/main/java/org/onap/portalng/bff/services/ActionService.java
index 0358d29..17afa39 100644
--- a/lib/src/main/java/org/onap/portal/bff/services/ActionService.java
+++ b/lib/src/main/java/org/onap/portalng/bff/services/ActionService.java
@@ -19,17 +19,17 @@
  *
  */
 
-package org.onap.portal.bff.services;
+package org.onap.portalng.bff.services;
 
 import lombok.RequiredArgsConstructor;
-import org.onap.portal.bff.exceptions.DownstreamApiProblemException;
-import org.onap.portal.bff.openapi.client_portal_history.api.ActionsApi;
-import org.onap.portal.bff.openapi.client_portal_history.model.CreateActionRequestPortalHistoryDto;
-import org.onap.portal.bff.openapi.server.model.ActionsListResponseApiDto;
-import org.onap.portal.bff.openapi.server.model.ActionsResponseApiDto;
-import org.onap.portal.bff.openapi.server.model.CreateActionRequestApiDto;
-import org.onap.portal.bff.openapi.server.model.ProblemApiDto;
-import org.onap.portal.bff.utils.Logger;
+import org.onap.portalng.bff.exceptions.DownstreamApiProblemException;
+import org.onap.portalng.bff.openapi.client_portal_history.api.ActionsApi;
+import org.onap.portalng.bff.openapi.client_portal_history.model.CreateActionRequestPortalHistoryDto;
+import org.onap.portalng.bff.openapi.server.model.ActionsListResponseApiDto;
+import org.onap.portalng.bff.openapi.server.model.ActionsResponseApiDto;
+import org.onap.portalng.bff.openapi.server.model.CreateActionRequestApiDto;
+import org.onap.portalng.bff.openapi.server.model.ProblemApiDto;
+import org.onap.portalng.bff.utils.Logger;
 import org.springframework.core.convert.support.ConfigurableConversionService;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Mono;
diff --git a/lib/src/main/java/org/onap/portal/bff/services/KeycloakService.java b/lib/src/main/java/org/onap/portalng/bff/services/KeycloakService.java
index 765efa7..b902128 100644
--- a/lib/src/main/java/org/onap/portal/bff/services/KeycloakService.java
+++ b/lib/src/main/java/org/onap/portalng/bff/services/KeycloakService.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.portal.bff.services;
+package org.onap.portalng.bff.services;
 
 import java.net.URI;
 import java.util.Collections;
@@ -29,14 +29,14 @@ import java.util.Optional;
 import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.onap.portal.bff.exceptions.DownstreamApiProblemException;
-import org.onap.portal.bff.mappers.CredentialMapper;
-import org.onap.portal.bff.mappers.RolesMapper;
-import org.onap.portal.bff.mappers.UsersMapper;
-import org.onap.portal.bff.openapi.client_portal_keycloak.api.KeycloakApi;
-import org.onap.portal.bff.openapi.client_portal_keycloak.model.RequiredActionsKeycloakDto;
-import org.onap.portal.bff.openapi.server.model.*;
-import org.onap.portal.bff.utils.Logger;
+import org.onap.portalng.bff.exceptions.DownstreamApiProblemException;
+import org.onap.portalng.bff.mappers.CredentialMapper;
+import org.onap.portalng.bff.mappers.RolesMapper;
+import org.onap.portalng.bff.mappers.UsersMapper;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.api.KeycloakApi;
+import org.onap.portalng.bff.openapi.client_portal_keycloak.model.RequiredActionsKeycloakDto;
+import org.onap.portalng.bff.openapi.server.model.*;
+import org.onap.portalng.bff.utils.Logger;
 import org.springframework.core.convert.support.ConfigurableConversionService;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
diff --git a/lib/src/main/java/org/onap/portal/bff/services/PreferencesService.java b/lib/src/main/java/org/onap/portalng/bff/services/PreferencesService.java
index ee0a5df..af62d28 100644
--- a/lib/src/main/java/org/onap/portal/bff/services/PreferencesService.java
+++ b/lib/src/main/java/org/onap/portalng/bff/services/PreferencesService.java
@@ -19,15 +19,15 @@
  *
  */
 
-package org.onap.portal.bff.services;
+package org.onap.portalng.bff.services;
 
 import lombok.RequiredArgsConstructor;
-import org.onap.portal.bff.exceptions.DownstreamApiProblemException;
-import org.onap.portal.bff.openapi.client_portal_prefs.api.PreferencesApi;
-import org.onap.portal.bff.openapi.client_portal_prefs.model.PreferencesPortalPrefsDto;
-import org.onap.portal.bff.openapi.server.model.CreatePreferencesRequestApiDto;
-import org.onap.portal.bff.openapi.server.model.PreferencesResponseApiDto;
-import org.onap.portal.bff.utils.Logger;
+import org.onap.portalng.bff.exceptions.DownstreamApiProblemException;
+import org.onap.portalng.bff.openapi.client_portal_prefs.api.PreferencesApi;
+import org.onap.portalng.bff.openapi.client_portal_prefs.model.PreferencesPortalPrefsDto;
+import org.onap.portalng.bff.openapi.server.model.CreatePreferencesRequestApiDto;
+import org.onap.portalng.bff.openapi.server.model.PreferencesResponseApiDto;
+import org.onap.portalng.bff.utils.Logger;
 import org.springframework.core.convert.support.ConfigurableConversionService;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Mono;
diff --git a/lib/src/main/java/org/onap/portal/bff/utils/ErrorHandler.java b/lib/src/main/java/org/onap/portalng/bff/utils/ErrorHandler.java
index 8bec189..0b198ac 100644
--- a/lib/src/main/java/org/onap/portal/bff/utils/ErrorHandler.java
+++ b/lib/src/main/java/org/onap/portalng/bff/utils/ErrorHandler.java
@@ -19,12 +19,12 @@
  *
  */
 
-package org.onap.portal.bff.utils;
+package org.onap.portalng.bff.utils;
 
 import java.util.List;
 import java.util.Objects;
-import org.onap.portal.bff.exceptions.DownstreamApiProblemException;
-import org.onap.portal.bff.openapi.server.model.ProblemApiDto;
+import org.onap.portalng.bff.exceptions.DownstreamApiProblemException;
+import org.onap.portalng.bff.openapi.server.model.ProblemApiDto;
 import org.springframework.http.HttpStatus;
 
 public class ErrorHandler {
diff --git a/lib/src/main/java/org/onap/portal/bff/utils/Logger.java b/lib/src/main/java/org/onap/portalng/bff/utils/Logger.java
index b985ad5..3c431fb 100644
--- a/lib/src/main/java/org/onap/portal/bff/utils/Logger.java
+++ b/lib/src/main/java/org/onap/portalng/bff/utils/Logger.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.portal.bff.utils;
+package org.onap.portalng.bff.utils;
 
 import java.net.URI;
 import lombok.extern.slf4j.Slf4j;
@@ -36,22 +36,21 @@ public class Logger {
   private Logger() {}
 
   public static void requestLog(String xRequestId, HttpMethod methode, URI path) {
-    log.info("Portal-bff - request - X-Request-Id {} {} {}", xRequestId, methode, path);
+    log.info("bff - request - X-Request-Id {} {} {}", xRequestId, methode, path);
   }
 
   public static void responseLog(String xRequestId, HttpStatus code) {
-    log.info("Portal-bff - response - X-Request-Id {} {}", xRequestId, code);
+    log.info("bff - response - X-Request-Id {} {}", xRequestId, code);
   }
 
   public static void errorLog(String xRequestId, String msg, String id, String app) {
-    log.info(
-        "Portal-bff - error - X-Request-Id {} {} {} not found in {}", xRequestId, msg, id, app);
+    log.info("bff - error - X-Request-Id {} {} {} not found in {}", xRequestId, msg, id, app);
   }
 
   public static void errorLog(
       String xRequestId, String msg, String id, String app, String errorDetails) {
     log.info(
-        "Portal-bff - error - X-Request-Id {} {} {} not found in {} error message: {}",
+        "bff - error - X-Request-Id {} {} {} not found in {} error message: {}",
         xRequestId,
         msg,
         id,
diff --git a/openapi/build.gradle b/openapi/build.gradle
index ee9ac96..eb39818 100644
--- a/openapi/build.gradle
+++ b/openapi/build.gradle
@@ -19,9 +19,9 @@ void createOpenApiGenerateClientTask(Project project, String apiDefinition, Stri
     generateApiDocumentation = false
     generateModelTests = false
     generateModelDocumentation = false
-    invokerPackage = "org.onap.portal.bff.openapi.$packageName"
-    apiPackage = "org.onap.portal.bff.openapi.${packageName}.api"
-    modelPackage = "org.onap.portal.bff.openapi.${packageName}.model"
+    invokerPackage = "org.onap.portalng.bff.openapi.$packageName"
+    apiPackage = "org.onap.portalng.bff.openapi.${packageName}.api"
+    modelPackage = "org.onap.portalng.bff.openapi.${packageName}.model"
     modelNameSuffix = dtoSuffix
   }
 }
diff --git a/openapi/server/build.gradle b/openapi/server/build.gradle
index e13bc20..f351a5c 100644
--- a/openapi/server/build.gradle
+++ b/openapi/server/build.gradle
@@ -30,9 +30,9 @@ openApiGenerate {
   generateApiDocumentation = true
   generateModelTests = false
   generateModelDocumentation = false
-  invokerPackage = "org.onap.portal.bff.openapi.server"
-  apiPackage =     "org.onap.portal.bff.openapi.server.api"
-  modelPackage =   "org.onap.portal.bff.openapi.server.model"
+  invokerPackage = "org.onap.portalng.bff.openapi.server"
+  apiPackage =     "org.onap.portalng.bff.openapi.server.api"
+  modelPackage =   "org.onap.portalng.bff.openapi.server.model"
   modelNameSuffix = "ApiDto"
 }
 
diff --git a/openapi/server/src/main/resources/static/api.yaml b/openapi/server/src/main/resources/static/api.yaml
index a7d4b74..be5ae0a 100644
--- a/openapi/server/src/main/resources/static/api.yaml
+++ b/openapi/server/src/main/resources/static/api.yaml
@@ -1,10 +1,8 @@
 openapi: 3.0.3
 info:
-  title: Portal BFF
+  title: bff api
   version: '1.0'
-  description: Portal BFF API
-  contact:
-    name: Team Tesla
+  description: bff api
 servers:
   - url: 'http://localhost:9080'
 tags:
diff --git a/version b/version
index 6e8bf73..17e51c3 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.1.0
+0.1.1