diff --git a/src/components/LanguageSwitcher.vue b/src/components/DxpLanguageSwitcher.vue
similarity index 100%
rename from src/components/LanguageSwitcher.vue
rename to src/components/DxpLanguageSwitcher.vue
diff --git a/src/components/OmsInstanceNavigator.vue b/src/components/DxpOmsInstanceNavigator.vue
similarity index 100%
rename from src/components/OmsInstanceNavigator.vue
rename to src/components/DxpOmsInstanceNavigator.vue
diff --git a/src/components/ProductIdentifier.vue b/src/components/DxpProductIdentifier.vue
similarity index 100%
rename from src/components/ProductIdentifier.vue
rename to src/components/DxpProductIdentifier.vue
diff --git a/src/components/ShopifyImg.vue b/src/components/DxpShopifyImg.vue
similarity index 100%
rename from src/components/ShopifyImg.vue
rename to src/components/DxpShopifyImg.vue
diff --git a/src/components/index.ts b/src/components/index.ts
index 67d87dcf..39cf5250 100644
--- a/src/components/index.ts
+++ b/src/components/index.ts
@@ -14,12 +14,12 @@ import '@ionic/vue/css/text-transformation.css';
 import '@ionic/vue/css/flex-utils.css';
 import '@ionic/vue/css/display.css';
 
-export { default as DxpImage } from './DxpImage.vue';
-export { default as DxpUserProfile } from './DxpUserProfile.vue'
 export { default as DxpAppVersionInfo } from './DxpAppVersionInfo.vue';
-export { default as LanguageSwitcher } from './LanguageSwitcher.vue';
-export { default as DxpMenuFooterNavigation } from './DxpMenuFooterNavigation.vue';
+export { default as DxpImage } from './DxpImage.vue';
+export { default as DxpLanguageSwitcher } from './DxpLanguageSwitcher.vue';
 export { default as DxpLogin } from './DxpLogin.vue';
-export { default as OmsInstanceNavigator } from './OmsInstanceNavigator.vue'
-export { default as ProductIdentifier } from "./ProductIdentifier.vue";
-export { default as ShopifyImg } from './ShopifyImg.vue';
+export { default as DxpMenuFooterNavigation } from './DxpMenuFooterNavigation.vue';
+export { default as DxpOmsInstanceNavigator } from './DxpOmsInstanceNavigator.vue'
+export { default as DxpProductIdentifier } from "./DxpProductIdentifier.vue";
+export { default as DxpShopifyImg } from './DxpShopifyImg.vue';
+export { default as DxpUserProfile } from './DxpUserProfile.vue'
diff --git a/src/index.ts b/src/index.ts
index 61c3eea3..e5983e79 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -3,7 +3,7 @@ declare var process: any;
 import { createPinia } from "pinia";
 import { useProductIdentificationStore } from "./store/productIdentification";
 import { useAuthStore } from "./store/auth";
-import { DxpAppVersionInfo, DxpImage, DxpLogin, DxpUserProfile, LanguageSwitcher, DxpMenuFooterNavigation, OmsInstanceNavigator, ProductIdentifier, ShopifyImg } from "./components";
+import { DxpAppVersionInfo, DxpImage, DxpLanguageSwitcher, DxpLogin, DxpMenuFooterNavigation, DxpOmsInstanceNavigator, DxpProductIdentifier, DxpShopifyImg, DxpUserProfile } from "./components";
 import { goToOms, getProductIdentificationValue } from "./utils";
 import { initialiseFirebaseApp } from "./utils/firebase"
 import piniaPluginPersistedstate from 'pinia-plugin-persistedstate'
@@ -63,13 +63,13 @@ export let dxpComponents = {
 
     app.component('DxpAppVersionInfo', DxpAppVersionInfo)
     app.component('DxpImage', DxpImage)
-    app.component('DxpUserProfile', DxpUserProfile)
-    app.component('LanguageSwitcher', LanguageSwitcher)
-    app.component('DxpMenuFooterNavigation', DxpMenuFooterNavigation)
+    app.component('DxpLanguageSwitcher', DxpLanguageSwitcher)
     app.component('DxpLogin', DxpLogin)
-    app.component('OmsInstanceNavigator', OmsInstanceNavigator)
-    app.component('ProductIdentifier', ProductIdentifier)
-    app.component('ShopifyImg', ShopifyImg)
+    app.component('DxpMenuFooterNavigation', DxpMenuFooterNavigation)
+    app.component('DxpOmsInstanceNavigator', DxpOmsInstanceNavigator)
+    app.component('DxpProductIdentifier', DxpProductIdentifier)
+    app.component('DxpShopifyImg', DxpShopifyImg)
+    app.component('DxpUserProfile', DxpUserProfile)
 
     showToast = options.showToast
 
@@ -104,20 +104,20 @@ export let dxpComponents = {
 export {
   appContext,
   DxpImage,
-  DxpUserProfile,
+  DxpLogin,
   DxpMenuFooterNavigation,
+  DxpOmsInstanceNavigator,
+  DxpProductIdentifier,
+  DxpShopifyImg,
+  DxpUserProfile,
   getProductIdentificationValue,
   goToOms,
   i18n,
   imageContext,
   initialiseFirebaseApp,
-  DxpLogin,
   loginContext,
   notificationContext,
-  OmsInstanceNavigator,
-  ProductIdentifier,
   productIdentificationContext,
-  ShopifyImg,
   shopifyImgContext,
   translate,
   useAuthStore,