diff --git a/doc/button/ButtonSetDoc.vue b/doc/button/ButtonGroupDoc.vue
similarity index 86%
rename from doc/button/ButtonSetDoc.vue
rename to doc/button/ButtonGroupDoc.vue
index 3d7bbe2be..b8c5aac22 100644
--- a/doc/button/ButtonSetDoc.vue
+++ b/doc/button/ButtonGroupDoc.vue
@@ -1,13 +1,13 @@
 <template>
     <DocSectionText v-bind="$attrs">
-        <p>Multiple buttons are grouped when wrapped inside an element with <i>ButtonSet</i> component.</p>
+        <p>Multiple buttons are grouped when wrapped inside an element with <i>ButtonGroup</i> component.</p>
     </DocSectionText>
     <div class="card flex justify-content-center">
-        <ButtonSet>
+        <ButtonGroup>
             <Button label="Save" icon="pi pi-check" />
             <Button label="Delete" icon="pi pi-trash" />
             <Button label="Cancel" icon="pi pi-times" />
-        </ButtonSet>
+        </ButtonGroup>
     </div>
     <DocSectionCode :code="code" />
 </template>
@@ -18,20 +18,20 @@ export default {
         return {
             code: {
                 basic: `
-<ButtonSet>
+<ButtonGroup>
     <Button label="Save" icon="pi pi-check" />
     <Button label="Delete" icon="pi pi-trash" />
     <Button label="Cancel" icon="pi pi-times" />
-</ButtonSet>
+</ButtonGroup>
 `,
                 options: `
 <template>
     <div class="card flex justify-content-center">
-        <ButtonSet>
+        <ButtonGroup>
             <Button label="Save" icon="pi pi-check" />
             <Button label="Delete" icon="pi pi-trash" />
             <Button label="Cancel" icon="pi pi-times" />
-        </ButtonSet>
+        </ButtonGroup>
     </div>
 </template>
 
@@ -41,11 +41,11 @@ export default {
                 composition: `
 <template>
     <div class="card flex justify-content-center">
-        <ButtonSet>
+        <ButtonGroup>
             <Button label="Save" icon="pi pi-check" />
             <Button label="Delete" icon="pi pi-trash" />
             <Button label="Cancel" icon="pi pi-times" />
-        </ButtonSet>
+        </ButtonGroup>
     </div>
 </template>
 
diff --git a/doc/common/apidoc/index.json b/doc/common/apidoc/index.json
index 806726352..4aaa0b8e2 100644
--- a/doc/common/apidoc/index.json
+++ b/doc/common/apidoc/index.json
@@ -5371,7 +5371,7 @@
                         }
                     ],
                     "methods": [],
-                    "extendedBy": "AccordionStyle,AccordionTabStyle,AnimateOnScrollStyle,AutoCompleteStyle,AvatarStyle,AvatarGroupStyle,BadgeStyle,BadgeDirectiveStyle,BaseComponentStyle,BaseIconStyle,BlockUIStyle,BreadcrumbStyle,ButtonStyle,ButtonStyle,CalendarStyle,CardStyle,CarouselStyle,CascadeSelectStyle,ChartStyle,CheckboxStyle,ChipStyle,ChipsStyle,ColorPickerStyle,ColumnStyle,ColumnGroupStyle,ConfirmDialogStyle,ConfirmPopupStyle,ContextMenuStyle,DataTableStyle,DataViewStyle,DataViewLayoutOptionsStyle,DeferredContentStyle,DialogStyle,DividerStyle,DockStyle,DropdownStyle,DynamicDialogStyle,EditorStyle,FieldsetStyle,AccordionStyle,FloatLabelStyle,FocusTrapStyle,GalleriaStyle,IconFieldStyle,ImageStyle,InlineMessageStyle,InplaceStyle,InputGroupStyle,InputGroupAddonStyle,InputIconStyle,InputMaskStyle,InputNumberStyle,InputSwitchStyle,InputTextStyle,KnobStyle,ListboxStyle,MegaMenuStyle,MenuStyle,MenubarStyle,MessageStyle,MeterGroupStyle,MultiSelectStyle,OrderListStyle,OrganizationChartStyle,OverlayPanelStyle,PaginatorStyle,PanelStyle,PanelMenuStyle,PasswordStyle,PickListStyle,PortalStyle,ProgressBarStyle,ProgressSpinnerStyle,RadioButtonStyle,RatingStyle,AccordionStyle,RowStyle,ScrollPanelStyle,ScrollTopStyle,SelectButtonStyle,SidebarStyle,SkeletonStyle,SliderStyle,SpeedDialStyle,SplitButtonStyle,SplitterStyle,SplitterPanelStyle,StepperStyle,StepperPanelStyle,StepsStyle,StyleClassStyle,TabMenuStyle,TabPanelStyle,TabViewStyle,TagStyle,TerminalStyle,TextareaStyle,TieredMenuStyle,TimelineStyle,ToastStyle,ToggleButtonStyle,ToolbarStyle,TooltipStyle,TreeStyle,TreeSelectStyle,TreeTableStyle,TriStateCheckboxStyle,VirtualScrollerStyle"
+                    "extendedBy": "AccordionStyle,AccordionTabStyle,AnimateOnScrollStyle,AutoCompleteStyle,AvatarStyle,AvatarGroupStyle,BadgeStyle,BadgeDirectiveStyle,BaseComponentStyle,BaseIconStyle,BlockUIStyle,BreadcrumbStyle,ButtonStyle,ButtonGroupStyle,CalendarStyle,CardStyle,CarouselStyle,CascadeSelectStyle,ChartStyle,CheckboxStyle,ChipStyle,ChipsStyle,ColorPickerStyle,ColumnStyle,ColumnGroupStyle,ConfirmDialogStyle,ConfirmPopupStyle,ContextMenuStyle,DataTableStyle,DataViewStyle,DataViewLayoutOptionsStyle,DeferredContentStyle,DialogStyle,DividerStyle,DockStyle,DropdownStyle,DynamicDialogStyle,EditorStyle,FieldsetStyle,AccordionStyle,FloatLabelStyle,FocusTrapStyle,GalleriaStyle,IconFieldStyle,ImageStyle,InlineMessageStyle,InplaceStyle,InputGroupStyle,InputGroupAddonStyle,InputIconStyle,InputMaskStyle,InputNumberStyle,InputSwitchStyle,InputTextStyle,KnobStyle,ListboxStyle,MegaMenuStyle,MenuStyle,MenubarStyle,MessageStyle,MeterGroupStyle,MultiSelectStyle,OrderListStyle,OrganizationChartStyle,OverlayPanelStyle,PaginatorStyle,PanelStyle,PanelMenuStyle,PasswordStyle,PickListStyle,PortalStyle,ProgressBarStyle,ProgressSpinnerStyle,RadioButtonStyle,RatingStyle,AccordionStyle,RowStyle,ScrollPanelStyle,ScrollTopStyle,SelectButtonStyle,SidebarStyle,SkeletonStyle,SliderStyle,SpeedDialStyle,SplitButtonStyle,SplitterStyle,SplitterPanelStyle,StepperStyle,StepperPanelStyle,StepsStyle,StyleClassStyle,TabMenuStyle,TabPanelStyle,TabViewStyle,TagStyle,TerminalStyle,TextareaStyle,TieredMenuStyle,TimelineStyle,ToastStyle,ToggleButtonStyle,ToolbarStyle,TooltipStyle,TreeStyle,TreeSelectStyle,TreeTableStyle,TriStateCheckboxStyle,VirtualScrollerStyle"
                 }
             }
         }
@@ -6911,11 +6911,11 @@
             }
         }
     },
-    "buttonset": {
-        "description": "A set of Buttons can be displayed together using the ButtonSet component.\n\n[Live Demo](https://www.primevue.org/button/)",
+    "buttongroup": {
+        "description": "A set of Buttons can be displayed together using the ButtonGroup component.\n\n[Live Demo](https://www.primevue.org/button/)",
         "components": {
             "default": {
-                "description": "A set of Buttons can be displayed together using the ButtonSet component.",
+                "description": "A set of Buttons can be displayed together using the ButtonGroup component.",
                 "methods": {
                     "description": "Defines methods that can be accessed by the component's reference.",
                     "values": []
@@ -6928,7 +6928,7 @@
             "methodDescription": "Defines methods that can be accessed by the component's reference.",
             "typeDescription": "Defines the custom types used by the module.",
             "values": {
-                "ButtonSetPassThroughMethodOptions": {
+                "ButtonGroupPassThroughMethodOptions": {
                     "description": "Custom passthrough(pt) option method.",
                     "relatedProp": "",
                     "props": [
@@ -6944,7 +6944,7 @@
                             "name": "props",
                             "optional": false,
                             "readonly": false,
-                            "type": "ButtonSetProps",
+                            "type": "ButtonGroupProps",
                             "default": "",
                             "description": "Defines valid properties."
                         },
@@ -6959,15 +6959,15 @@
                     ],
                     "methods": []
                 },
-                "ButtonSetPassThroughOptions": {
+                "ButtonGroupPassThroughOptions": {
                     "description": "Custom passthrough(pt) options.",
-                    "relatedProp": "ButtonSetProps.pt",
+                    "relatedProp": "ButtonGroupProps.pt",
                     "props": [
                         {
                             "name": "root",
                             "optional": true,
                             "readonly": false,
-                            "type": "ButtonSetPassThroughOptionType",
+                            "type": "ButtonGroupPassThroughOptionType",
                             "default": "",
                             "description": "Used to pass attributes to the root's DOM element."
                         },
@@ -6982,7 +6982,7 @@
                     ],
                     "methods": []
                 },
-                "ButtonSetPassThroughAttributes": {
+                "ButtonGroupPassThroughAttributes": {
                     "description": "Custom passthrough attributes for each DOM elements",
                     "relatedProp": "",
                     "props": [
@@ -6995,15 +6995,15 @@
                     ],
                     "methods": []
                 },
-                "ButtonSetProps": {
-                    "description": "Defines valid properties in ButtonSet component.",
+                "ButtonGroupProps": {
+                    "description": "Defines valid properties in ButtonGroup component.",
                     "relatedProp": "",
                     "props": [
                         {
                             "name": "pt",
                             "optional": true,
                             "readonly": false,
-                            "type": "PassThrough<ButtonSetPassThroughOptions>",
+                            "type": "PassThrough<ButtonGroupPassThroughOptions>",
                             "default": "",
                             "description": "Used to pass attributes to DOM elements inside the component."
                         },
@@ -7026,8 +7026,8 @@
                     ],
                     "methods": []
                 },
-                "ButtonSetSlots": {
-                    "description": "Defines valid slots in ButtonSet component.",
+                "ButtonGroupSlots": {
+                    "description": "Defines valid slots in ButtonGroup component.",
                     "relatedProp": "",
                     "props": [],
                     "methods": [
@@ -7039,8 +7039,8 @@
                         }
                     ]
                 },
-                "ButtonSetEmits": {
-                    "description": "Defines valid emits in ButtonSet component.",
+                "ButtonGroupEmits": {
+                    "description": "Defines valid emits in ButtonGroup component.",
                     "relatedProp": "",
                     "props": [],
                     "methods": []
@@ -7050,20 +7050,20 @@
         "types": {
             "description": "Defines the custom types used by the module.",
             "values": {
-                "ButtonSetPassThroughOptionType": {
-                    "values": "ButtonSetPassThroughAttributes | (options: ButtonSetPassThroughMethodOptions) => undefined | string | null | undefined"
+                "ButtonGroupPassThroughOptionType": {
+                    "values": "ButtonGroupPassThroughAttributes | (options: ButtonGroupPassThroughMethodOptions) => undefined | string | null | undefined"
                 }
             }
         }
     },
-    "buttonset/style/ButtonSetStyle": {
+    "buttongroup/style/ButtonGroupStyle": {
         "interfaces": {
             "description": "Defines the custom interfaces used by the module.",
             "eventDescription": "Defines the custom events used by the component's emit.",
             "methodDescription": "Defines methods that can be accessed by the component's reference.",
             "typeDescription": "Defines the custom types used by the module.",
             "values": {
-                "ButtonStyle": {
+                "ButtonGroupStyle": {
                     "relatedProp": "",
                     "props": [
                         {
diff --git a/modules/nuxt-primevue/runtime/core/components/index.js b/modules/nuxt-primevue/runtime/core/components/index.js
index b34b0964b..037a7c5ff 100644
--- a/modules/nuxt-primevue/runtime/core/components/index.js
+++ b/modules/nuxt-primevue/runtime/core/components/index.js
@@ -30,7 +30,7 @@ const form = [
     'TriStateCheckbox'
 ];
 
-const button = ['Button', 'ButtonSet', 'SpeedDial', 'SplitButton'];
+const button = ['Button', 'ButtonGroup', 'SpeedDial', 'SplitButton'];
 
 const data = ['Column', 'Row', 'ColumnGroup', 'DataTable', 'DataView', 'DataViewLayoutOptions', 'OrderList', 'OrganizationChart', 'Paginator', 'PickList', 'Tree', 'TreeTable', 'Timeline', 'VirtualScroller'];
 
diff --git a/pages/button/index.vue b/pages/button/index.vue
index 7b331b076..533712394 100755
--- a/pages/button/index.vue
+++ b/pages/button/index.vue
@@ -4,7 +4,7 @@
         header="Button"
         description="Button is an extension to standard input element with icons and theming."
         :componentDocs="docs"
-        :apiDocs="['Button', 'ButtonSet']"
+        :apiDocs="['Button', 'ButtonGroup']"
         :ptTabComponent="ptComponent"
         :themingDocs="themingDoc"
     />
@@ -14,7 +14,7 @@
 import AccessibilityDoc from '@/doc/button/AccessibilityDoc.vue';
 import BadgesDoc from '@/doc/button/BadgesDoc.vue';
 import BasicDoc from '@/doc/button/BasicDoc.vue';
-import ButtonSetDoc from '@/doc/button/ButtonSetDoc.vue';
+import ButtonGroupDoc from '@/doc/button/ButtonGroupDoc.vue';
 import DisabledDoc from '@/doc/button/DisabledDoc.vue';
 import IconOnlyDoc from '@/doc/button/IconOnlyDoc.vue';
 import IconsDoc from '@/doc/button/IconsDoc.vue';
@@ -106,9 +106,9 @@ export default {
                     component: BadgesDoc
                 },
                 {
-                    id: 'buttonset',
-                    label: 'Button Set',
-                    component: ButtonSetDoc
+                    id: 'buttongroup',
+                    label: 'Button Group',
+                    component: ButtonGroupDoc
                 } /*
                 {
                     id: 'sizes',