diff --git a/packages/react/src/components/Forms/DatePicker/DatePicker.spec.tsx b/packages/react/src/components/Forms/DatePicker/DatePicker.spec.tsx
index 497f6eb..c05e1b1 100644
--- a/packages/react/src/components/Forms/DatePicker/DatePicker.spec.tsx
+++ b/packages/react/src/components/Forms/DatePicker/DatePicker.spec.tsx
@@ -3,7 +3,7 @@ import { render, screen, within } from "@testing-library/react";
 import React, { FormEvent, useState } from "react";
 import { expect, vi, afterEach } from "vitest";
 import { CunninghamProvider } from ":/components/Provider";
-import DatePicker from ":/components/Forms/DatePicker/DatePicker";
+import { DatePicker } from ":/components/Forms/DatePicker/DatePicker";
 import { Button } from ":/components/Button";
 
 describe("<DatePicker/>", () => {
diff --git a/packages/react/src/components/Forms/DatePicker/DatePicker.tsx b/packages/react/src/components/Forms/DatePicker/DatePicker.tsx
index 3117655..62452c3 100644
--- a/packages/react/src/components/Forms/DatePicker/DatePicker.tsx
+++ b/packages/react/src/components/Forms/DatePicker/DatePicker.tsx
@@ -23,7 +23,7 @@ export type DatePickerProps = DatePickerAuxSubProps & {
   onChange?: (value: string | null) => void | undefined;
 };
 
-const DatePicker = (props: DatePickerProps) => {
+export const DatePicker = (props: DatePickerProps) => {
   if (props.defaultValue && props.value) {
     throw new Error(
       "You cannot use both defaultValue and value props on DatePicker component"
@@ -82,5 +82,3 @@ const DatePicker = (props: DatePickerProps) => {
     </DatePickerAux>
   );
 };
-
-export default DatePicker;
diff --git a/packages/react/src/components/Forms/DatePicker/DateRangePicker.tsx b/packages/react/src/components/Forms/DatePicker/DateRangePicker.tsx
index 26d395f..2457318 100644
--- a/packages/react/src/components/Forms/DatePicker/DateRangePicker.tsx
+++ b/packages/react/src/components/Forms/DatePicker/DateRangePicker.tsx
@@ -24,7 +24,7 @@ export type DateRangePickerProps = DatePickerAuxSubProps & {
   onChange?: (value: [string, string] | null) => void;
 };
 
-const DateRangePicker = ({
+export const DateRangePicker = ({
   startLabel,
   endLabel,
   ...props
@@ -103,5 +103,3 @@ const DateRangePicker = ({
     </DatePickerAux>
   );
 };
-
-export default DateRangePicker;
diff --git a/packages/react/src/components/Forms/DatePicker/index.stories.tsx b/packages/react/src/components/Forms/DatePicker/index.stories.tsx
index b75cee0..059226c 100644
--- a/packages/react/src/components/Forms/DatePicker/index.stories.tsx
+++ b/packages/react/src/components/Forms/DatePicker/index.stories.tsx
@@ -2,8 +2,8 @@ import { Meta, StoryFn } from "@storybook/react";
 import React, { useState } from "react";
 import { CunninghamProvider } from ":/components/Provider";
 import { Button } from ":/components/Button";
-import DateRangePicker from ":/components/Forms/DatePicker/DateRangePicker";
-import DatePicker from ":/components/Forms/DatePicker/DatePicker";
+import { DateRangePicker } from ":/components/Forms/DatePicker/DateRangePicker";
+import { DatePicker } from ":/components/Forms/DatePicker/DatePicker";
 import {
   StringOrDate,
   StringsOrDateRange,
diff --git a/packages/react/src/components/Forms/DatePicker/index.tsx b/packages/react/src/components/Forms/DatePicker/index.tsx
index 220021b..001eb97 100644
--- a/packages/react/src/components/Forms/DatePicker/index.tsx
+++ b/packages/react/src/components/Forms/DatePicker/index.tsx
@@ -1 +1,5 @@
-// todo : what do we export ?
+export * from "./DatePicker";
+export * from "./DateRangePicker";
+
+export * from "./types";
+export * from "./utils";