diff --git a/packages/react/src/components/DataGrid/DataList.spec.tsx b/packages/react/src/components/DataGrid/DataList.spec.tsx
index ef59a41..4ba5e2d 100644
--- a/packages/react/src/components/DataGrid/DataList.spec.tsx
+++ b/packages/react/src/components/DataGrid/DataList.spec.tsx
@@ -10,8 +10,8 @@ describe("<DataList/>", () => {
   it("should render a DataList", async () => {
     const rows = Array.from(Array(3)).map((_value, index) => ({
       id: `list key for element ${index}`,
-      firstName: faker.name.firstName(),
-      lastName: faker.name.lastName(),
+      firstName: faker.person.firstName(),
+      lastName: faker.person.lastName(),
     }));
     render(
       <CunninghamProvider>
diff --git a/packages/react/src/components/DataGrid/SimpleDataGrid.spec.tsx b/packages/react/src/components/DataGrid/SimpleDataGrid.spec.tsx
index 0cb35c3..45959a7 100644
--- a/packages/react/src/components/DataGrid/SimpleDataGrid.spec.tsx
+++ b/packages/react/src/components/DataGrid/SimpleDataGrid.spec.tsx
@@ -13,11 +13,11 @@ import { Row } from ":/components/DataGrid/index";
 describe("<SimpleDataGrid/>", () => {
   it("should render a grid without pagination", async () => {
     const rows = Array.from(Array(23)).map(() => ({
-      id: faker.datatype.uuid(),
-      firstName: faker.name.firstName(),
-      lastName: faker.name.lastName(),
+      id: faker.string.uuid(),
+      firstName: faker.person.firstName(),
+      lastName: faker.person.lastName(),
       email: faker.internet.email(),
-      address: faker.address.streetAddress(),
+      address: faker.location.streetAddress(),
     }));
     render(
       <CunninghamProvider>
@@ -67,11 +67,11 @@ describe("<SimpleDataGrid/>", () => {
   it("should render a grid with working pagination", async () => {
     const rows = Array.from(Array(23))
       .map(() => ({
-        id: faker.datatype.uuid(),
-        firstName: faker.name.firstName(),
-        lastName: faker.name.lastName(),
+        id: faker.string.uuid(),
+        firstName: faker.person.firstName(),
+        lastName: faker.person.lastName(),
         email: faker.internet.email(),
-        address: faker.address.streetAddress(),
+        address: faker.location.streetAddress(),
       }))
       .sort((a, b) => a.firstName.localeCompare(b.firstName));
     render(
@@ -187,11 +187,11 @@ describe("<SimpleDataGrid/>", () => {
   it("should render a grid with working rows selection", async () => {
     const rows = Array.from(Array(23))
       .map(() => ({
-        id: faker.datatype.uuid(),
-        firstName: faker.name.firstName(),
-        lastName: faker.name.lastName(),
+        id: faker.string.uuid(),
+        firstName: faker.person.firstName(),
+        lastName: faker.person.lastName(),
         email: faker.internet.email(),
-        address: faker.address.streetAddress(),
+        address: faker.location.streetAddress(),
       }))
       .sort((a, b) => a.firstName.localeCompare(b.firstName));
 
@@ -270,11 +270,11 @@ describe("<SimpleDataGrid/>", () => {
   it("should render a grid with working sortable columns", async () => {
     const rows = Array.from(Array(23))
       .map(() => ({
-        id: faker.datatype.uuid(),
-        firstName: faker.name.firstName(),
-        lastName: faker.name.lastName(),
+        id: faker.string.uuid(),
+        firstName: faker.person.firstName(),
+        lastName: faker.person.lastName(),
         email: faker.internet.email(),
-        address: faker.address.streetAddress(),
+        address: faker.location.streetAddress(),
       }))
       .sort((a, b) => a.firstName.localeCompare(b.firstName));
     render(
@@ -421,11 +421,11 @@ describe("<SimpleDataGrid/>", () => {
   it("should render a grid with non-sortable columns", async () => {
     const rows = Array.from(Array(23))
       .map(() => ({
-        id: faker.datatype.uuid(),
-        firstName: faker.name.firstName(),
-        lastName: faker.name.lastName(),
+        id: faker.string.uuid(),
+        firstName: faker.person.firstName(),
+        lastName: faker.person.lastName(),
         email: faker.internet.email(),
-        address: faker.address.streetAddress(),
+        address: faker.location.streetAddress(),
       }))
       .sort((a, b) => a.firstName.localeCompare(b.firstName));
     render(
diff --git a/packages/react/src/components/DataGrid/index.spec.tsx b/packages/react/src/components/DataGrid/index.spec.tsx
index 802f190..50e8e12 100644
--- a/packages/react/src/components/DataGrid/index.spec.tsx
+++ b/packages/react/src/components/DataGrid/index.spec.tsx
@@ -15,11 +15,11 @@ describe("<DataGrid/>", () => {
 
   it("should render a grid with server-side loading", async () => {
     const database = Array.from(Array(23)).map(() => ({
-      id: faker.datatype.uuid(),
-      firstName: faker.name.firstName(),
-      lastName: faker.name.lastName(),
+      id: faker.string.uuid(),
+      firstName: faker.person.firstName(),
+      lastName: faker.person.lastName(),
       email: faker.internet.email(),
-      address: faker.address.streetAddress(),
+      address: faker.location.streetAddress(),
     }));
 
     const Component = () => {
@@ -216,11 +216,11 @@ describe("<DataGrid/>", () => {
   });
   it("should render custom cells", async () => {
     const database = Array.from(Array(10)).map(() => ({
-      id: faker.datatype.uuid(),
-      firstName: faker.name.firstName(),
-      lastName: faker.name.lastName(),
+      id: faker.string.uuid(),
+      firstName: faker.person.firstName(),
+      lastName: faker.person.lastName(),
       email: faker.internet.email(),
-      address: faker.address.streetAddress(),
+      address: faker.location.streetAddress(),
     }));
 
     const Component = () => {
@@ -263,11 +263,11 @@ describe("<DataGrid/>", () => {
   });
   it("should render highlighted column", async () => {
     const database = Array.from(Array(10)).map(() => ({
-      id: faker.datatype.uuid(),
-      firstName: faker.name.firstName(),
-      lastName: faker.name.lastName(),
+      id: faker.string.uuid(),
+      firstName: faker.person.firstName(),
+      lastName: faker.person.lastName(),
       email: faker.internet.email(),
-      address: faker.address.streetAddress(),
+      address: faker.location.streetAddress(),
     }));
 
     const Component = () => {
diff --git a/packages/react/src/components/DataGrid/index.stories.tsx b/packages/react/src/components/DataGrid/index.stories.tsx
index 13487f2..5ae6f16 100644
--- a/packages/react/src/components/DataGrid/index.stories.tsx
+++ b/packages/react/src/components/DataGrid/index.stories.tsx
@@ -52,11 +52,11 @@ export const ClientSideWithoutPagination = () => {
   const database = useMemo(
     () =>
       Array.from(Array(23)).map(() => ({
-        id: faker.datatype.uuid(),
-        firstName: faker.name.firstName(),
-        lastName: faker.name.lastName(),
+        id: faker.string.uuid(),
+        firstName: faker.person.firstName(),
+        lastName: faker.person.lastName(),
         email: faker.internet.email(),
-        address: faker.address.streetAddress(),
+        address: faker.location.streetAddress(),
       })),
     []
   );
@@ -104,7 +104,7 @@ export const ClientSideWithPagination = () => {
   const database = useMemo(
     () =>
       Array.from(Array(23)).map(() => ({
-        id: faker.datatype.uuid(),
+        id: faker.string.uuid(),
         carName: faker.company.name(),
         year: faker.date.past().getFullYear(),
         price: +faker.commerce.price(5000, 5005),
@@ -156,11 +156,11 @@ export const FullServerSide = () => {
   const database = useMemo(
     () =>
       Array.from(Array(191)).map(() => ({
-        id: faker.datatype.uuid(),
-        firstName: faker.name.firstName(),
-        lastName: faker.name.lastName(),
+        id: faker.string.uuid(),
+        firstName: faker.person.firstName(),
+        lastName: faker.person.lastName(),
         email: faker.internet.email(),
-        address: faker.address.streetAddress(),
+        address: faker.location.streetAddress(),
       })),
     []
   );
diff --git a/packages/react/src/components/Forms/Select/mono.stories.tsx b/packages/react/src/components/Forms/Select/mono.stories.tsx
index 746eb0f..b7f13b5 100644
--- a/packages/react/src/components/Forms/Select/mono.stories.tsx
+++ b/packages/react/src/components/Forms/Select/mono.stories.tsx
@@ -18,7 +18,7 @@ const Template: ComponentStory<typeof Select> = (args) => (
   </div>
 );
 
-const CITIES = Array.from({ length: 10 }).map(() => faker.address.city());
+const CITIES = Array.from({ length: 10 }).map(() => faker.location.city());
 const OPTIONS = CITIES.map((city) => ({
   label: city,
   value: city.toLowerCase(),