5 files changed, 10 insertions, 10 deletions
diff --git a/lib/src/main/java/org/onap/portalng/bff/mappers/ActionsMapper.java b/lib/src/main/java/org/onap/portalng/bff/mappers/ActionsMapper.java
index 3f0ebdf..bc4f550 100644
--- a/lib/src/main/java/org/onap/portalng/bff/mappers/ActionsMapper.java
+++ b/lib/src/main/java/org/onap/portalng/bff/mappers/ActionsMapper.java
@@ -24,14 +24,14 @@ package org.onap.portalng.bff.mappers;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.onap.portalng.bff.config.MapperSpringConfig;
-import org.onap.portalng.bff.openapi.client_portal_history.model.ActionsListResponsePortalHistoryDto;
+import org.onap.portalng.bff.openapi.client_history.model.ActionsListResponseHistoryDto;
 import org.onap.portalng.bff.openapi.server.model.ActionsListResponseApiDto;
 import org.springframework.core.convert.converter.Converter;
 
 @Mapper(config = MapperSpringConfig.class)
 public interface ActionsMapper
-    extends Converter<ActionsListResponsePortalHistoryDto, ActionsListResponseApiDto> {
+    extends Converter<ActionsListResponseHistoryDto, ActionsListResponseApiDto> {
 
   @Mapping(source = "actionsList", target = "items")
-  ActionsListResponseApiDto convert(ActionsListResponsePortalHistoryDto source);
+  ActionsListResponseApiDto convert(ActionsListResponseHistoryDto source);
 }
diff --git a/lib/src/main/java/org/onap/portalng/bff/mappers/CredentialMapper.java b/lib/src/main/java/org/onap/portalng/bff/mappers/CredentialMapper.java
index b3c7f05..6b05ae3 100644
--- a/lib/src/main/java/org/onap/portalng/bff/mappers/CredentialMapper.java
+++ b/lib/src/main/java/org/onap/portalng/bff/mappers/CredentialMapper.java
@@ -24,7 +24,7 @@ package org.onap.portalng.bff.mappers;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 import org.onap.portalng.bff.config.MapperSpringConfig;
-import org.onap.portalng.bff.openapi.client_portal_keycloak.model.CredentialKeycloakDto;
+import org.onap.portalng.bff.openapi.client_keycloak.model.CredentialKeycloakDto;
 import org.onap.portalng.bff.openapi.server.model.UpdateUserPasswordRequestApiDto;
 
 @Mapper(config = MapperSpringConfig.class, unmappedTargetPolicy = ReportingPolicy.IGNORE)
diff --git a/lib/src/main/java/org/onap/portalng/bff/mappers/PreferencesMapper.java b/lib/src/main/java/org/onap/portalng/bff/mappers/PreferencesMapper.java
index 6e615c3..13f9e3f 100644
--- a/lib/src/main/java/org/onap/portalng/bff/mappers/PreferencesMapper.java
+++ b/lib/src/main/java/org/onap/portalng/bff/mappers/PreferencesMapper.java
@@ -24,14 +24,14 @@ package org.onap.portalng.bff.mappers;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.onap.portalng.bff.config.MapperSpringConfig;
-import org.onap.portalng.bff.openapi.client_portal_prefs.model.PreferencesPortalPrefsDto;
+import org.onap.portalng.bff.openapi.client_preferences.model.PreferencesPreferencesDto;
 import org.onap.portalng.bff.openapi.server.model.PreferencesResponseApiDto;
 import org.springframework.core.convert.converter.Converter;
 
 @Mapper(config = MapperSpringConfig.class)
 public interface PreferencesMapper
-    extends Converter<PreferencesPortalPrefsDto, PreferencesResponseApiDto> {
+    extends Converter<PreferencesPreferencesDto, PreferencesResponseApiDto> {
 
   @Mapping(source = "properties", target = "properties")
-  PreferencesResponseApiDto convert(PreferencesPortalPrefsDto source);
+  PreferencesResponseApiDto convert(PreferencesPreferencesDto source);
 }
diff --git a/lib/src/main/java/org/onap/portalng/bff/mappers/RolesMapper.java b/lib/src/main/java/org/onap/portalng/bff/mappers/RolesMapper.java
index 6e14d7e..ca3ee4c 100644
--- a/lib/src/main/java/org/onap/portalng/bff/mappers/RolesMapper.java
+++ b/lib/src/main/java/org/onap/portalng/bff/mappers/RolesMapper.java
@@ -24,7 +24,7 @@ package org.onap.portalng.bff.mappers;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 import org.onap.portalng.bff.config.MapperSpringConfig;
-import org.onap.portalng.bff.openapi.client_portal_keycloak.model.RoleKeycloakDto;
+import org.onap.portalng.bff.openapi.client_keycloak.model.RoleKeycloakDto;
 import org.onap.portalng.bff.openapi.server.model.RoleApiDto;
 import org.springframework.core.convert.converter.Converter;
 
diff --git a/lib/src/main/java/org/onap/portalng/bff/mappers/UsersMapper.java b/lib/src/main/java/org/onap/portalng/bff/mappers/UsersMapper.java
index f494c5d..78ba804 100644
--- a/lib/src/main/java/org/onap/portalng/bff/mappers/UsersMapper.java
+++ b/lib/src/main/java/org/onap/portalng/bff/mappers/UsersMapper.java
@@ -26,8 +26,8 @@ import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.ReportingPolicy;
 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.client_keycloak.model.RequiredActionsKeycloakDto;
+import org.onap.portalng.bff.openapi.client_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;