diff --git a/package.json b/package.json
index c8035d1..734d99c 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "ra-i18n-polyglot": "^3.11.1",
     "ra-language-english": "^3.11.1",
     "ra-language-french": "^3.11.1",
-    "react": "16.13.0",
+    "react": "18.2.0",
     "react-admin": "^3.19.0",
     "react-dom": "npm:@hot-loader/react-dom",
     "react-hook-form": "^7.12.2",
diff --git a/src/components/admin/clinicians/ClinicianCreate.js b/src/components/admin/clinicians/ClinicianCreate.js
index 290ecfd..6dd0740 100644
--- a/src/components/admin/clinicians/ClinicianCreate.js
+++ b/src/components/admin/clinicians/ClinicianCreate.js
@@ -34,7 +34,7 @@ import {
   useNotify,
 } from 'react-admin';
 
-import SimpleFormToolBar from '../shared/toolbars/SimpleFormToolBar';
+import SimpleFormToolBar from '../shared/toolbars/SimpleFormToolbar';
 import {
   validateEmail,
   validateFirstName,
diff --git a/src/components/admin/clinicians/ClinicianEdit.js b/src/components/admin/clinicians/ClinicianEdit.js
index 73a3d86..b67ef5a 100644
--- a/src/components/admin/clinicians/ClinicianEdit.js
+++ b/src/components/admin/clinicians/ClinicianEdit.js
@@ -35,7 +35,7 @@ import {
   useNotify,
 } from 'react-admin';
 
-import SimpleFormToolBar from '../shared/toolbars/SimpleFormToolBar';
+import SimpleFormToolBar from '../shared/toolbars/SimpleFormToolbar';
 import {
   validateEmail,
   validateFirstName,
diff --git a/src/components/admin/exercises/ExerciseCreate.js b/src/components/admin/exercises/ExerciseCreate.js
index 66b17eb..0303b8e 100644
--- a/src/components/admin/exercises/ExerciseCreate.js
+++ b/src/components/admin/exercises/ExerciseCreate.js
@@ -49,7 +49,7 @@ import {
 import SubCategoryInput from '@components/admin/exercises/SubCategoryInput';
 import { LANGUAGES } from '../../../locales';
 import {requiredLocalizedField} from '@components/admin/shared/validators';
-import SimpleFormToolBar from '@components/admin/shared/toolbars/SimpleFormToolBar';
+import SimpleFormToolBar from '@components/admin/shared/toolbars/SimpleFormToolbar';
 import {
   preSave
 } from '@components/admin/exercises/callbacks';
diff --git a/src/components/admin/exercises/ExerciseEdit.js b/src/components/admin/exercises/ExerciseEdit.js
index a7d4d93..18b11d0 100644
--- a/src/components/admin/exercises/ExerciseEdit.js
+++ b/src/components/admin/exercises/ExerciseEdit.js
@@ -38,7 +38,7 @@ import {
   useTranslate,
 } from 'react-admin';
 
-import SimpleFormToolBar from '@components/admin/shared/toolbars/SimpleFormToolBar';
+import SimpleFormToolBar from '@components/admin/shared/toolbars/SimpleFormToolbar';
 import {
   validateCategory,
   validateSubCategory,
diff --git a/src/components/admin/patients/PatientCreate.js b/src/components/admin/patients/PatientCreate.js
index 225c07d..a5e702f 100644
--- a/src/components/admin/patients/PatientCreate.js
+++ b/src/components/admin/patients/PatientCreate.js
@@ -33,7 +33,7 @@ import {
   useTranslate,
   useNotify,
 } from 'react-admin';
-import SimpleFormToolBar from '../shared/toolbars/SimpleFormToolBar';
+import SimpleFormToolBar from '../shared/toolbars/SimpleFormToolbar';
 import {
   validateAudio,
   validateClinician,
diff --git a/src/components/admin/patients/PatientEdit.js b/src/components/admin/patients/PatientEdit.js
index 0b8a4c2..35b4ff7 100644
--- a/src/components/admin/patients/PatientEdit.js
+++ b/src/components/admin/patients/PatientEdit.js
@@ -35,7 +35,7 @@ import {
   useNotify,
 } from 'react-admin';
 
-import SimpleFormToolBar from '@components/admin/shared/toolbars/SimpleFormToolBar';
+import SimpleFormToolBar from '@components/admin/shared/toolbars/SimpleFormToolbar';
 import {
   validateAudio,
   validateClinician,
diff --git a/src/components/admin/plans/PlanCreate.js b/src/components/admin/plans/PlanCreate.js
index e36a77e..7b60550 100644
--- a/src/components/admin/plans/PlanCreate.js
+++ b/src/components/admin/plans/PlanCreate.js
@@ -44,7 +44,7 @@ import { validateNumber } from '@components/admin/shared/validators';
 import IsSystemInput from '@components/admin/plans/IsSystem';
 import ExerciseRow from '@components/admin/plans/ExerciseRow';
 import { LANGUAGES } from '../../../locales';
-import SimpleFormToolBar from '@components/admin/shared/toolbars/SimpleFormToolBar';
+import SimpleFormToolBar from '@components/admin/shared/toolbars/SimpleFormToolbar';
 import {
   useGetCategories,
   useGetSubCategories,
diff --git a/src/components/admin/plans/PlanEdit.js b/src/components/admin/plans/PlanEdit.js
index b92a679..7d51362 100644
--- a/src/components/admin/plans/PlanEdit.js
+++ b/src/components/admin/plans/PlanEdit.js
@@ -46,7 +46,7 @@ import { LANGUAGES } from "../../../locales";
 import { validateExercises } from '@components/admin/plans/validators';
 import { validateNumber } from '@components/admin/shared/validators';
 
-import SimpleFormToolBar from '@components/admin/shared/toolbars/SimpleFormToolBar';
+import SimpleFormToolBar from '@components/admin/shared/toolbars/SimpleFormToolbar';
 import ExerciseRow from './ExerciseRow';
 import IsSystemInput from '@components/admin/plans/IsSystem';
 import TopToolbar from '@components/admin/shared/toolbars/TopToolbar';
diff --git a/src/components/exercises/ExerciseProvider.js b/src/components/exercises/ExerciseProvider.js
index 4897ac5..eb44be5 100644
--- a/src/components/exercises/ExerciseProvider.js
+++ b/src/components/exercises/ExerciseProvider.js
@@ -22,7 +22,7 @@
 
 import React, { createContext, useEffect, useState } from 'react';
 
-import { useApi } from '@hooks/useAPI';
+import { useApi } from '@hooks/useApi';
 
 import { RequestEndpoint, RequestMethod } from '@utils/constants';
 import { fetchData } from '@utils/fetch';
diff --git a/src/components/forms/ForgotPwdForm.jsx b/src/components/forms/ForgotPwdForm.jsx
index f3f8bc0..6958d17 100644
--- a/src/components/forms/ForgotPwdForm.jsx
+++ b/src/components/forms/ForgotPwdForm.jsx
@@ -28,7 +28,7 @@ import styled from 'styled-components';
 import { spacings } from '@styles/configs/spacings';
 import { FlexAlignCenter, FlexAlignMiddle } from '@styles/tools';
 
-import { useApi } from '@hooks/useAPI';
+import { useApi } from '@hooks/useApi';
 
 import { RequestEndpoint } from '@utils/constants';
 
diff --git a/src/components/forms/ProfileForm.jsx b/src/components/forms/ProfileForm.jsx
index c2fb6a1..fb3ede6 100644
--- a/src/components/forms/ProfileForm.jsx
+++ b/src/components/forms/ProfileForm.jsx
@@ -30,7 +30,7 @@ import { spacings } from '@styles/configs/spacings';
 import { FlexAlignCenter } from '@styles/tools';
 import { rem } from '@styles/utils/rem';
 
-import { useApi } from '@hooks/useAPI';
+import { useApi } from '@hooks/useApi';
 
 import { RequestEndpoint } from '@utils/constants';
 
diff --git a/src/components/forms/ResetPasswordForm.jsx b/src/components/forms/ResetPasswordForm.jsx
index 39759e8..9803daa 100644
--- a/src/components/forms/ResetPasswordForm.jsx
+++ b/src/components/forms/ResetPasswordForm.jsx
@@ -28,7 +28,7 @@ import styled from 'styled-components';
 import { spacings } from '@styles/configs/spacings';
 import { FlexAlignMiddle, FlexAlignCenter } from '@styles/tools';
 
-import { useApi } from '@hooks/useAPI';
+import { useApi } from '@hooks/useApi';
 
 import { RequestEndpoint } from '@utils/constants';
 
diff --git a/yarn.lock b/yarn.lock
index 0adccb3..840b4c9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6929,14 +6929,12 @@ react-transition-group@^4.4.0, react-transition-group@^4.4.1:
     loose-envify "^1.4.0"
     prop-types "^15.6.2"
 
-react@16.13.0:
-  version "16.13.0"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.13.0.tgz#d046eabcdf64e457bbeed1e792e235e1b9934cf7"
-  integrity sha512-TSavZz2iSLkq5/oiE7gnFzmURKZMltmi193rm5HEoUDAXpzT9Kzw6oNZnGoai/4+fUnm7FqS5dwgUL34TujcWQ==
+react@18.2.0:
+  version "18.2.0"
+  resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz#555bd98592883255fa00de14f1151a917b5d77d5"
+  integrity sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==
   dependencies:
     loose-envify "^1.1.0"
-    object-assign "^4.1.1"
-    prop-types "^15.6.2"
 
 "readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
   version "2.3.7"