diff --git a/components/lib/accordion/Accordion.vue b/components/lib/accordion/Accordion.vue
index 37345e781..a298f256b 100755
--- a/components/lib/accordion/Accordion.vue
+++ b/components/lib/accordion/Accordion.vue
@@ -41,7 +41,7 @@
 </template>
 
 <script>
-import ComponentBase from 'primevue/base';
+import ComponentBase from 'primevue/componentbase';
 import Ripple from 'primevue/ripple';
 import { DomHandler, UniqueComponentId } from 'primevue/utils';
 
diff --git a/components/lib/accordiontab/AccordionTab.vue b/components/lib/accordiontab/AccordionTab.vue
index eaa666861..325861602 100755
--- a/components/lib/accordiontab/AccordionTab.vue
+++ b/components/lib/accordiontab/AccordionTab.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script>
-import ComponentBase from 'primevue/base';
+import ComponentBase from 'primevue/componentbase';
 
 export default {
     name: 'AccordionTab',
diff --git a/components/lib/card/Card.vue b/components/lib/card/Card.vue
index 13f6fb00b..ead3c5b81 100755
--- a/components/lib/card/Card.vue
+++ b/components/lib/card/Card.vue
@@ -21,7 +21,7 @@
 </template>
 
 <script>
-import ComponentBase from 'primevue/base';
+import ComponentBase from 'primevue/componentbase';
 
 export default {
     name: 'Card',
diff --git a/components/lib/base/ComponentBase.vue b/components/lib/componentbase/ComponentBase.vue
similarity index 100%
rename from components/lib/base/ComponentBase.vue
rename to components/lib/componentbase/ComponentBase.vue
diff --git a/components/lib/base/package.json b/components/lib/componentbase/package.json
similarity index 100%
rename from components/lib/base/package.json
rename to components/lib/componentbase/package.json
diff --git a/components/lib/deferredcontent/DeferredContent.vue b/components/lib/deferredcontent/DeferredContent.vue
index 7688d7896..6c5944151 100755
--- a/components/lib/deferredcontent/DeferredContent.vue
+++ b/components/lib/deferredcontent/DeferredContent.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import ComponentBase from 'primevue/base';
+import ComponentBase from 'primevue/componentbase';
 
 export default {
     name: 'DeferredContent',
diff --git a/components/lib/divider/Divider.vue b/components/lib/divider/Divider.vue
index f7876d0cd..872dfb375 100644
--- a/components/lib/divider/Divider.vue
+++ b/components/lib/divider/Divider.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script>
-import ComponentBase from 'primevue/base';
+import ComponentBase from 'primevue/componentbase';
 export default {
     name: 'Divider',
     extends: ComponentBase,
diff --git a/components/lib/fieldset/Fieldset.vue b/components/lib/fieldset/Fieldset.vue
index 8ef53bbad..0002258b5 100755
--- a/components/lib/fieldset/Fieldset.vue
+++ b/components/lib/fieldset/Fieldset.vue
@@ -36,7 +36,7 @@
 </template>
 
 <script>
-import ComponentBase from 'primevue/base';
+import ComponentBase from 'primevue/componentbase';
 import Ripple from 'primevue/ripple';
 import { UniqueComponentId } from 'primevue/utils';
 
diff --git a/components/lib/panel/Panel.vue b/components/lib/panel/Panel.vue
index 364deae4e..e2afbca46 100755
--- a/components/lib/panel/Panel.vue
+++ b/components/lib/panel/Panel.vue
@@ -37,7 +37,7 @@
 </template>
 
 <script>
-import ComponentBase from 'primevue/base';
+import ComponentBase from 'primevue/componentbase';
 import Ripple from 'primevue/ripple';
 import { UniqueComponentId } from 'primevue/utils';
 
diff --git a/components/lib/scrollpanel/ScrollPanel.vue b/components/lib/scrollpanel/ScrollPanel.vue
index dd694ef5d..eda656b99 100644
--- a/components/lib/scrollpanel/ScrollPanel.vue
+++ b/components/lib/scrollpanel/ScrollPanel.vue
@@ -36,7 +36,7 @@
 </template>
 
 <script>
-import ComponentBase from 'primevue/base';
+import ComponentBase from 'primevue/componentbase';
 import { DomHandler, UniqueComponentId } from 'primevue/utils';
 
 export default {
diff --git a/components/lib/splitter/Splitter.vue b/components/lib/splitter/Splitter.vue
index 1edf943a6..99f65a70c 100644
--- a/components/lib/splitter/Splitter.vue
+++ b/components/lib/splitter/Splitter.vue
@@ -20,7 +20,7 @@
 </template>
 
 <script>
-import ComponentBase from 'primevue/base';
+import ComponentBase from 'primevue/componentbase';
 import { DomHandler, ObjectUtils } from 'primevue/utils';
 
 export default {
diff --git a/components/lib/splitterpanel/SplitterPanel.vue b/components/lib/splitterpanel/SplitterPanel.vue
index 82b8c3958..35a2341e2 100644
--- a/components/lib/splitterpanel/SplitterPanel.vue
+++ b/components/lib/splitterpanel/SplitterPanel.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import ComponentBase from 'primevue/base';
+import ComponentBase from 'primevue/componentbase';
 
 export default {
     name: 'SplitterPanel',
diff --git a/components/lib/tabpanel/TabPanel.vue b/components/lib/tabpanel/TabPanel.vue
index ad3efb657..48719cf54 100755
--- a/components/lib/tabpanel/TabPanel.vue
+++ b/components/lib/tabpanel/TabPanel.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script>
-import ComponentBase from 'primevue/base';
+import ComponentBase from 'primevue/componentbase';
 export default {
     name: 'TabPanel',
     extends: ComponentBase,
diff --git a/components/lib/tabview/TabView.vue b/components/lib/tabview/TabView.vue
index 8c917123d..3662ec28f 100755
--- a/components/lib/tabview/TabView.vue
+++ b/components/lib/tabview/TabView.vue
@@ -82,7 +82,7 @@
 </template>
 
 <script>
-import ComponentBase from 'primevue/base';
+import ComponentBase from 'primevue/componentbase';
 import Ripple from 'primevue/ripple';
 import { DomHandler, UniqueComponentId } from 'primevue/utils';
 
diff --git a/components/lib/toolbar/Toolbar.vue b/components/lib/toolbar/Toolbar.vue
index d646cbabc..1fac574f9 100755
--- a/components/lib/toolbar/Toolbar.vue
+++ b/components/lib/toolbar/Toolbar.vue
@@ -13,7 +13,7 @@
 </template>
 
 <script>
-import ComponentBase from 'primevue/base';
+import ComponentBase from 'primevue/componentbase';
 export default {
     name: 'Toolbar',
     extends: ComponentBase,
diff --git a/nuxt.config.js b/nuxt.config.js
index 56868d5ea..7161bf52a 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -85,7 +85,7 @@ export default defineNuxtConfig({
                 'primevue/utils': path.resolve(__dirname, './components/lib/utils/Utils.js'),
                 'primevue/api': path.resolve(__dirname, './components/lib/api/Api.js'),
                 'primevue/portal': path.resolve(__dirname, './components/lib/portal/Portal.vue'),
-                'primevue/base': path.resolve(__dirname, './components/lib/base/ComponentBase.vue'),
+                'primevue/componentbase': path.resolve(__dirname, './components/lib/componentbase/ComponentBase.vue'),
                 'primevue/button': path.resolve(__dirname, './components/lib/button/Button.vue'),
                 'primevue/inputtext': path.resolve(__dirname, './components/lib/inputtext/InputText.vue'),
                 'primevue/dialog': path.resolve(__dirname, './components/lib/dialog/Dialog.vue'),
diff --git a/rollup.config.js b/rollup.config.js
index 42ba1b20a..6cdab5f61 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -15,6 +15,7 @@ let coreDependencies = {
     'primevue/config': 'primevue.config',
     'primevue/ripple': 'primevue.ripple',
     'primevue/portal': 'primevue.portal',
+    'primevue/componentbase': 'primevue.componentbase',
     'primevue/tooltip': 'primevue.tooltip',
     'primevue/focustrap': 'primevue.focustrap',
     'primevue/virtualscroller': 'primevue.virtualscroller',
diff --git a/vitest.config.js b/vitest.config.js
index 8109259aa..46b94afcf 100644
--- a/vitest.config.js
+++ b/vitest.config.js
@@ -23,7 +23,7 @@ export default {
             'primevue/utils': path.resolve(__dirname, './components/lib/utils/Utils.js'),
             'primevue/api': path.resolve(__dirname, './components/lib/api/Api.js'),
             'primevue/portal': path.resolve(__dirname, './components/lib/portal/Portal.vue'),
-            'primevue/base': path.resolve(__dirname, './components/lib/base/ComponentBase.vue'),
+            'primevue/componentbase': path.resolve(__dirname, './components/lib/componentbase/ComponentBase.vue'),
             'primevue/button': path.resolve(__dirname, './components/lib/button/Button.vue'),
             'primevue/inputtext': path.resolve(__dirname, './components/lib/inputtext/InputText.vue'),
             'primevue/dialog': path.resolve(__dirname, './components/lib/dialog/Dialog.vue'),