diff --git a/package-lock.json b/package-lock.json
index deac53e..b3c09f6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -33,7 +33,7 @@
         "ngx-color": "^8.0.3",
         "primeflex": "^3.3.1",
         "primeicons": "^6.0.1",
-        "primeng": "^15.3.0",
+        "primeng": "15.2.1",
         "rxjs": "7.8.1",
         "tslib": "^2.5.0",
         "zod": "^3.22.1",
@@ -25038,9 +25038,9 @@
       "integrity": "sha512-KDeO94CbWI4pKsPnYpA1FPjo79EsY9I+M8ywoPBSf9XMXoe/0crjbUK7jcQEDHuc0ZMRIZsxH3TYLv4TUtHmAA=="
     },
     "node_modules/primeng": {
-      "version": "15.4.1",
-      "resolved": "https://registry.npmjs.org/primeng/-/primeng-15.4.1.tgz",
-      "integrity": "sha512-j2unOQZk6756l6SgkzcmlHF6JlawF0bIjKTgAPWwT+S5RYeWEjpCPg/ABV8TylwW7CTNQX2oCHbyqCAuhtr++w==",
+      "version": "15.2.1",
+      "resolved": "https://registry.npmjs.org/primeng/-/primeng-15.2.1.tgz",
+      "integrity": "sha512-O0yh31VIJRWmN5fjvCkkdLxNdWmGZOeKWay7zlyW1gDVB3FR0Mk7DPSuTgiJ1hevv/+nnj/yz6nkR5plw5uPyg==",
       "dependencies": {
         "tslib": "^2.3.0"
       },
@@ -25048,8 +25048,9 @@
         "@angular/common": "^15.2.1",
         "@angular/core": "^15.2.1",
         "@angular/forms": "^15.2.1",
+        "primeicons": "^6.0.1",
         "rxjs": "^6.0.0 || ^7.5.0",
-        "zone.js": "^0.10.2 || ^0.11.0 || ^0.12.0 || ^0.13.0"
+        "zone.js": "^0.10.2 || ^0.11.0 || ^0.12.0"
       }
     },
     "node_modules/proc-log": {
diff --git a/proxy.conf.js b/proxy.conf.js
index a572276..4456204 100644
--- a/proxy.conf.js
+++ b/proxy.conf.js
@@ -17,25 +17,15 @@ const bypassFn = function (req, res) {
 }
 
 const PROXY_CONFIG = {
-  '/themes-bff': {
+  '/theme-bff': {
     target: 'http://onecx-theme-bff',
     secure: false,
     pathRewrite: {
-      '^.*/themes-bff': ''
+      '^.*/theme-bff': ''
     },
     changeOrigin: true,
     logLevel: 'debug',
     bypass: bypassFn
-  },
-  '/ahm-api': {
-    target: 'http://ahm',
-    secure: false,
-    pathRewrite: {
-      '^.*/ahm-api': ''
-    },
-    changeOrigin: true,
-    logLevel: 'debug',
-    bypass: logFn
   }
 }
 
diff --git a/sonar-local-project.properties b/sonar-local-project.properties
index 44459a9..99cc1fb 100644
--- a/sonar-local-project.properties
+++ b/sonar-local-project.properties
@@ -18,7 +18,7 @@ sonar.testExecutionReportPaths=reports/sonarqube_report.xml
 sonar.sourceEncoding=UTF-8
 #sonar.sources=src/app
 #sonar.working.directory=dist/sonar
-sonar.coverage.exclusions=*.ts,*.js,src/*.ts,src/**/*.module.ts,src/environments/*,src/assets/**/*,src/app/generated/**/*,src/test/*
+sonar.coverage.exclusions=*.ts,*.js,src/*.ts,src/**/*.module.ts,src/environments/*,src/assets/**/*,src/app/generated/**/*,src/app/test/*
 #sonar.exclusions=src/app/generated/**/*
 #sonar.cpd.exclusions=
 #sonar.tests=src/app
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index cc6b58d..df4a53b 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -1,5 +1,5 @@
 export const environment = {
   production: true,
-  BASE_PATH: '/themes-bff',
-  apiPrefix: 'themes-bff'
+  BASE_PATH: '/theme-bff',
+  apiPrefix: 'theme-bff'
 }
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 808435c..30d6de1 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -9,7 +9,7 @@ export const environment = {
   KEYCLOAK_CLIENT_ID: 'portal-mf-shell',
   TKIT_PORTAL_ID: 'ADMIN',
   skipRemoteConfigLoad: true,
-  apiPrefix: 'themes-bff'
+  apiPrefix: 'theme-bff'
 }
 
 /*
diff --git a/webpack.config.js b/webpack.config.js
index e135939..3c8aaae 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -2,7 +2,7 @@ const { ModifyEntryPlugin } = require('@angular-architects/module-federation/src
 const { share, withModuleFederationPlugin } = require('@angular-architects/module-federation/webpack')
 
 const config = withModuleFederationPlugin({
-  name: 'theme-mgmt-ui',
+  name: 'onecx-theme-ui',
   filename: 'remoteEntry.js',
   exposes: {
     './ThemeMgmtModule': 'src/app/theme-mgmt-remote.module.ts'