diff --git a/src/components/Avatar/AvatarGroup.tsx b/src/components/Avatar/AvatarGroup.tsx
index 346b4de250..4d4d8eda69 100644
--- a/src/components/Avatar/AvatarGroup.tsx
+++ b/src/components/Avatar/AvatarGroup.tsx
@@ -4,6 +4,9 @@ export type AvatarGroupProps = PropsWithChildren<{
   children: ReactNode;
 }>;
 
-export const AvatarGroup: React.FC<AvatarGroupProps> = ({ children }) => {
+const AvatarGroup: React.FC<AvatarGroupProps> = ({ children }) => {
   return <div className="mb-5 flex -space-x-4">{children}</div>;
 };
+
+AvatarGroup.displayName = 'Avatar.Group';
+export default AvatarGroup;
diff --git a/src/components/Avatar/AvatarGroupCounter.tsx b/src/components/Avatar/AvatarGroupCounter.tsx
index 081a134ad0..ba8969d237 100644
--- a/src/components/Avatar/AvatarGroupCounter.tsx
+++ b/src/components/Avatar/AvatarGroupCounter.tsx
@@ -5,7 +5,7 @@ export type AvatarGroupdCounterProps = PropsWithChildren<{
   href: string;
 }>;
 
-export const AvatarGroupCounter: React.FC<AvatarGroupdCounterProps> = ({ total, href }) => {
+const AvatarGroupCounter: React.FC<AvatarGroupdCounterProps> = ({ total, href }) => {
   return (
     <a
       className="relative flex h-10 w-10 items-center justify-center rounded-full bg-gray-700 text-xs font-medium text-white ring-2 ring-gray-300 hover:bg-gray-600  dark:ring-gray-500 "
@@ -15,3 +15,6 @@ export const AvatarGroupCounter: React.FC<AvatarGroupdCounterProps> = ({ total,
     </a>
   );
 };
+
+AvatarGroupCounter.displayName = 'Avatar.GroupCounter';
+export default AvatarGroupCounter;
diff --git a/src/components/Avatar/index.tsx b/src/components/Avatar/index.tsx
index 41da8997fc..5aac52edb7 100644
--- a/src/components/Avatar/index.tsx
+++ b/src/components/Avatar/index.tsx
@@ -1,7 +1,7 @@
 import classNames from 'classnames';
 import { FC, PropsWithChildren } from 'react';
-import { AvatarGroup } from './AvatarGroup';
-import { AvatarGroupCounter } from './AvatarGroupCounter';
+import AvatarGroup from './AvatarGroup';
+import AvatarGroupCounter from './AvatarGroupCounter';
 
 export type AvatarProps = PropsWithChildren<{
   alt?: string;
@@ -99,6 +99,7 @@ const AvatarComponent: FC<AvatarProps> = ({
   );
 };
 
+AvatarComponent.displayName = 'Avatar';
 export const Avatar = Object.assign(AvatarComponent, {
   Group: AvatarGroup,
   Counter: AvatarGroupCounter,
diff --git a/src/components/Button/ButtonGroup.tsx b/src/components/Button/ButtonGroup.tsx
index 7c9412b096..5768a4efa9 100644
--- a/src/components/Button/ButtonGroup.tsx
+++ b/src/components/Button/ButtonGroup.tsx
@@ -7,7 +7,7 @@ export type ButtonGroupProps = PropsWithChildren<{
   outline?: boolean;
 }>;
 
-export const ButtonGroup: FC<ButtonGroupProps> = ({ children, pill, outline }) => {
+const ButtonGroup: FC<ButtonGroupProps> = ({ children, pill, outline }) => {
   const items = useMemo(
     () =>
       Children.map(children as ReactElement<ButtonComponentProps>[], (child, index) =>
@@ -31,3 +31,6 @@ export const ButtonGroup: FC<ButtonGroupProps> = ({ children, pill, outline }) =
     </div>
   );
 };
+
+ButtonGroup.displayName = 'Button.Group';
+export default ButtonGroup;
diff --git a/src/components/Button/index.tsx b/src/components/Button/index.tsx
index 4f5fd76aaa..d39638db7f 100644
--- a/src/components/Button/index.tsx
+++ b/src/components/Button/index.tsx
@@ -1,6 +1,6 @@
 import { ComponentProps, FC, ReactNode } from 'react';
 import classNames from 'classnames';
-import { ButtonGroup } from './ButtonGroup';
+import ButtonGroup from './ButtonGroup';
 
 type Color = 'blue' | 'alternative' | 'dark' | 'light' | 'green' | 'red' | 'yellow' | 'purple';
 type GradientMonochrome = 'blue' | 'green' | 'cyan' | 'teal' | 'lime' | 'red' | 'pink' | 'purple';
@@ -152,6 +152,7 @@ const ButtonComponent: FC<ButtonComponentProps> = ({
   </button>
 );
 
+ButtonComponent.displayName = 'Button';
 export const Button = Object.assign(ButtonComponent, {
   Group: ButtonGroup,
 });