diff --git a/packages/ui-button/src/components/Button/Button.tsx b/packages/ui-button/src/components/Button/Button.tsx
index 74ac8543..07d3f71c 100644
--- a/packages/ui-button/src/components/Button/Button.tsx
+++ b/packages/ui-button/src/components/Button/Button.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 
-import { BaseButton } from "../private/BaseButton";
+import { BaseButton_private as BaseButton } from "../private/BaseButton";
 import type { ButtonProps } from "./ButtonTypes";
 import { TYPE_BUTTON, getButtonClasses } from "./utilities";
 
diff --git a/packages/ui-button/src/components/Button/ButtonIcon.tsx b/packages/ui-button/src/components/Button/ButtonIcon.tsx
index c0eae186..8519b568 100644
--- a/packages/ui-button/src/components/Button/ButtonIcon.tsx
+++ b/packages/ui-button/src/components/Button/ButtonIcon.tsx
@@ -1,7 +1,7 @@
 import clsx from "clsx";
 import React from "react";
 
-import { BaseButton } from "../private/BaseButton";
+import { BaseButton_private as BaseButton } from "../private/BaseButton";
 import type { ButtonIconProps } from "./ButtonTypes";
 import { TYPE_ICON, getButtonClasses } from "./utilities";
 
diff --git a/packages/ui-button/src/components/index.ts b/packages/ui-button/src/components/index.ts
index b2f8a4df..34cf4f6a 100644
--- a/packages/ui-button/src/components/index.ts
+++ b/packages/ui-button/src/components/index.ts
@@ -1,7 +1,6 @@
+export * from "../common/constants";
+
 export * from "./Button/Button";
 export * from "./Button/ButtonIcon";
 export * from "./Button/ButtonLink";
-export * from "../common/constants";
-
-import { ButtonSort as ButtonSort_private } from "./private/ButtonSort";
-export { ButtonSort_private };
+export * from "./private/ButtonSort";
diff --git a/packages/ui-button/src/components/private/BaseButton.tsx b/packages/ui-button/src/components/private/BaseButton.tsx
index eb2ef760..982df680 100644
--- a/packages/ui-button/src/components/private/BaseButton.tsx
+++ b/packages/ui-button/src/components/private/BaseButton.tsx
@@ -33,19 +33,20 @@ const internalClick = (
 };
 /* c8 ignore end */
 
-export const BaseButton = React.forwardRef<HTMLButtonElement, ButtonProps>(
-	(buttonProps: any, ref) => {
-		const { onClick, noInternalClick = false, ...otherProps } = buttonProps;
-		return (
-			<button
-				ref={ref}
-				onClick={(e) => {
-					internalClick(e, noInternalClick, onClick);
-				}}
-				{...otherProps}
-			/>
-		);
-	},
-);
+export const BaseButton_private = React.forwardRef<
+	HTMLButtonElement,
+	ButtonProps
+>((buttonProps: any, ref) => {
+	const { onClick, noInternalClick = false, ...otherProps } = buttonProps;
+	return (
+		<button
+			ref={ref}
+			onClick={(e) => {
+				internalClick(e, noInternalClick, onClick);
+			}}
+			{...otherProps}
+		/>
+	);
+});
 
-BaseButton.displayName = "BaseButton";
+BaseButton_private.displayName = "BaseButton";
diff --git a/packages/ui-button/src/components/private/ButtonSort.tsx b/packages/ui-button/src/components/private/ButtonSort.tsx
index 12297c46..2009baaf 100644
--- a/packages/ui-button/src/components/private/ButtonSort.tsx
+++ b/packages/ui-button/src/components/private/ButtonSort.tsx
@@ -2,10 +2,13 @@ import clsx from "clsx";
 import React from "react";
 
 import { TYPE_ICON, getButtonClasses } from "../Button/utilities";
-import { BaseButton } from "./BaseButton";
+import { BaseButton_private as BaseButton } from "./BaseButton";
 import type { ButtonSortProps } from "./ButtonSortTypes";
 
-export const ButtonSort = React.forwardRef<HTMLButtonElement, ButtonSortProps>(
+export const ButtonSort_private = React.forwardRef<
+	HTMLButtonElement,
+	ButtonSortProps
+>(
 	(
 		{
 			children,
@@ -95,4 +98,4 @@ export const ButtonSort = React.forwardRef<HTMLButtonElement, ButtonSortProps>(
 	},
 );
 
-ButtonSort.displayName = "ButtonSort";
+ButtonSort_private.displayName = "ButtonSort";
diff --git a/packages/ui-button/src/components/private/__tests__/ButtonSort.test.tsx b/packages/ui-button/src/components/private/__tests__/ButtonSort.test.tsx
index 9fac6145..2ed7488b 100644
--- a/packages/ui-button/src/components/private/__tests__/ButtonSort.test.tsx
+++ b/packages/ui-button/src/components/private/__tests__/ButtonSort.test.tsx
@@ -4,7 +4,7 @@ import { IconSettings } from "@versini/ui-icons";
 
 import { expectToHaveClasses } from "../../../../../../configuration/tests-helpers";
 import { BUTTON_CLASSNAME } from "../../../common/constants";
-import { ButtonSort } from "../ButtonSort";
+import { ButtonSort_private as ButtonSort } from "../ButtonSort";
 
 describe("ButtonSort (exceptions)", () => {
 	it("should be able to require/import from root", () => {