diff --git a/src/Layout.vue b/src/Layout.vue
index f62789c7c..2b8e1c3cc 100644
--- a/src/Layout.vue
+++ b/src/Layout.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import { useLoadingContext } from '@/state/loadingState';
+import { useLoadingContext } from '@/state/loading';
 // Components
 import BIMDataSpinner from "@bimdata/design-system/dist/js/BIMDataComponents/vue3/BIMDataSpinner.js";
 import PlatformHeader from '@/components/platform-header/PlatformHeader';
diff --git a/src/components/dashboard-welcome-tile/DashboardWelcomeTile.vue b/src/components/dashboard-welcome-tile/DashboardWelcomeTile.vue
index 01ee5ea8e..a6bac38de 100644
--- a/src/components/dashboard-welcome-tile/DashboardWelcomeTile.vue
+++ b/src/components/dashboard-welcome-tile/DashboardWelcomeTile.vue
@@ -15,7 +15,7 @@
 
 <script>
 import { ref } from 'vue';
-import { useGlobalState } from '@/state/globalState';
+import { useGlobalState } from '@/state/global';
 
 export default {
   setup() {
diff --git a/src/components/recent-spaces-list/RecentSpacesList.vue b/src/components/recent-spaces-list/RecentSpacesList.vue
index 98ee3c646..7de6e52aa 100644
--- a/src/components/recent-spaces-list/RecentSpacesList.vue
+++ b/src/components/recent-spaces-list/RecentSpacesList.vue
@@ -12,7 +12,7 @@
 
 <script>
 import { ref, watchEffect } from 'vue';
-import { useSpacesState } from '@/state/spacesState';
+import { useSpaces } from '@/state/spaces';
 // Components
 import SpaceCard from '@/components/space-card/SpaceCard';
 
@@ -21,7 +21,7 @@ export default {
     SpaceCard
   },
   setup() {
-    const { spaces } = useSpacesState();
+    const { spaces } = useSpaces();
 
     const recentSpaces = ref([]);
 
diff --git a/src/components/space-action-menu/SpaceActionMenu.vue b/src/components/space-action-menu/SpaceActionMenu.vue
index 5f6c3318d..c9385b18d 100644
--- a/src/components/space-action-menu/SpaceActionMenu.vue
+++ b/src/components/space-action-menu/SpaceActionMenu.vue
@@ -56,8 +56,8 @@
 
 <script>
 import { ref } from 'vue';
-import { createLoadingContext } from '@/state/loadingState'
-import { useSpacesState } from '@/state/spacesState';
+import { createLoadingContext } from '@/state/loading'
+import { useSpaces } from '@/state/spaces';
 // Components
 import BIMDataButton from '@bimdata/design-system/dist/js/BIMDataComponents/vue3/BIMDataButton.js';
 import BIMDataIcon from '@bimdata/design-system/dist/js/BIMDataComponents/vue3/BIMDataIcon.js';
@@ -82,7 +82,7 @@ export default {
     }
   },
   setup(props) {
-    const { removeSpaceImage } = useSpacesState();
+    const { removeSpaceImage } = useSpaces();
 
     const loading = createLoadingContext(`space-action-${props.space.id}`);
 
diff --git a/src/components/space-creation-card/SpaceCreationCard.vue b/src/components/space-creation-card/SpaceCreationCard.vue
index 05c2a0708..254adba6b 100644
--- a/src/components/space-creation-card/SpaceCreationCard.vue
+++ b/src/components/space-creation-card/SpaceCreationCard.vue
@@ -32,7 +32,7 @@
 
 <script>
 import { onMounted, reactive, ref } from 'vue';
-import { useSpacesState } from '@/state/spacesState';
+import { useSpaces } from '@/state/spaces';
 // Components
 import BIMDataCard from '@bimdata/design-system/dist/js/BIMDataComponents/vue3/BIMDataCard.js';
 import BIMDataButton from '@bimdata/design-system/dist/js/BIMDataComponents/vue3/BIMDataButton.js';
@@ -52,7 +52,7 @@ export default {
     'close'
   ],
   setup(props, { emit }) {
-    const { createSpace: create } = useSpacesState();
+    const { createSpace: create } = useSpaces();
 
     const loading = ref(false);
     const nameInput = ref(null);
diff --git a/src/components/space-delete-guard/SpaceDeleteGuard.vue b/src/components/space-delete-guard/SpaceDeleteGuard.vue
index cea57fcc0..ca3e5ea44 100644
--- a/src/components/space-delete-guard/SpaceDeleteGuard.vue
+++ b/src/components/space-delete-guard/SpaceDeleteGuard.vue
@@ -20,8 +20,8 @@
 </template>
 
 <script>
-import { useLoadingContext } from '@/state/loadingState';
-import { useSpacesState } from '@/state/spacesState';
+import { useLoadingContext } from '@/state/loading';
+import { useSpaces } from '@/state/spaces';
 // Components
 import BIMDataButton from '@bimdata/design-system/dist/js/BIMDataComponents/vue3/BIMDataButton.js';
 import BIMDataIcon from '@bimdata/design-system/dist/js/BIMDataComponents/vue3/BIMDataIcon.js';
@@ -41,7 +41,7 @@ export default {
     'close'
   ],
   setup(props, { emit }) {
-    const { deleteSpace } = useSpacesState();
+    const { deleteSpace } = useSpaces();
 
     const loading = useLoadingContext(`space-action-${props.space.id}`);
 
diff --git a/src/components/space-image-input/SpaceImageInput.vue b/src/components/space-image-input/SpaceImageInput.vue
index a0a9a8909..8bd6c1c7c 100644
--- a/src/components/space-image-input/SpaceImageInput.vue
+++ b/src/components/space-image-input/SpaceImageInput.vue
@@ -13,9 +13,9 @@
 import Uppy from '@uppy/core';
 import XHRUpload from '@uppy/xhr-upload';
 import { ref } from 'vue';
-import { useGlobalState } from '@/state/globalState';
-import { useLoadingContext } from '@/state/loadingState';
-import { useSpacesState } from '@/state/spacesState';
+import { useGlobalState } from '@/state/global';
+import { useLoadingContext } from '@/state/loading';
+import { useSpaces } from '@/state/spaces';
 // Components
 import BIMDataButton from '@bimdata/design-system/dist/js/BIMDataComponents/vue3/BIMDataButton.js';
 
@@ -35,7 +35,7 @@ export default {
   ],
   setup(props, { emit }) {
     const { user } = useGlobalState();
-    const { softUpdateSpace } = useSpacesState();
+    const { softUpdateSpace } = useSpaces();
 
     const loading = useLoadingContext(`space-action-${props.space.id}`);
 
diff --git a/src/components/space-update-form/SpaceUpdateForm.vue b/src/components/space-update-form/SpaceUpdateForm.vue
index 53ba97fb2..ef09d01f8 100644
--- a/src/components/space-update-form/SpaceUpdateForm.vue
+++ b/src/components/space-update-form/SpaceUpdateForm.vue
@@ -23,8 +23,8 @@
 
 <script>
 import { onMounted, ref } from 'vue';
-import { useLoadingContext } from '@/state/loadingState';
-import { useSpacesState } from '@/state/spacesState';
+import { useLoadingContext } from '@/state/loading';
+import { useSpaces } from '@/state/spaces';
 // Components
 import BIMDataButton from '@bimdata/design-system/dist/js/BIMDataComponents/vue3/BIMDataButton.js';
 import BIMDataIcon from '@bimdata/design-system/dist/js/BIMDataComponents/vue3/BIMDataIcon.js';
@@ -48,7 +48,7 @@ export default {
     'error',
   ],
   setup(props, { emit }) {
-    const { updateSpace } = useSpacesState();
+    const { updateSpace } = useSpaces();
 
     const loading = useLoadingContext(`space-action-${props.space.id}`);
 
diff --git a/src/components/user-menu/UserMenu.vue b/src/components/user-menu/UserMenu.vue
index 9f36894ff..7b36bf120 100644
--- a/src/components/user-menu/UserMenu.vue
+++ b/src/components/user-menu/UserMenu.vue
@@ -26,7 +26,7 @@
 
 <script>
 import { computed, ref } from 'vue';
-import { useGlobalState } from '@/state/globalState';
+import { useGlobalState } from '@/state/global';
 // Components
 import BIMDataButton from '@bimdata/design-system/dist/js/BIMDataComponents/vue3/BIMDataButton.js';
 import BIMDataIcon from '@bimdata/design-system/dist/js/BIMDataComponents/vue3/BIMDataIcon.js';
diff --git a/src/router/guards.js b/src/router/guards.js
index 637867b47..007cc9279 100644
--- a/src/router/guards.js
+++ b/src/router/guards.js
@@ -1,4 +1,4 @@
-import { useGlobalState } from '@/state/globalState';
+import { useGlobalState } from '@/state/global';
 
 const authGuard = async (to, from, next) => {
   const { isAuthenticated, authenticate } = useGlobalState();
diff --git a/src/router/resolvers.js b/src/router/resolvers.js
index b4086180b..9eb9dc3e8 100644
--- a/src/router/resolvers.js
+++ b/src/router/resolvers.js
@@ -1,6 +1,6 @@
-import { useLoadingContext } from '@/state/loadingState';
-import { useProjectsState } from '@/state/projectsState';
-import { useSpacesState } from '@/state/spacesState';
+import { useLoadingContext } from '@/state/loading';
+import { useProjects } from '@/state/projects';
+import { useSpaces } from '@/state/spaces';
 
 const createViewResolver = (resolver) => {
   return (route) => {
@@ -13,17 +13,17 @@ const createViewResolver = (resolver) => {
 };
 
 const dashboardResolver = createViewResolver(
-  () => useSpacesState().fetchSpaces()
+  () => useSpaces().fetchSpaces()
 );
 
 const spacesResolver = createViewResolver(
-  () => useSpacesState().fetchSpaces()
+  () => useSpaces().fetchSpaces()
 );
 
 const projectsResolver = createViewResolver(
   (route) => {
-    const { currentSpace, fetchSpaces, selectSpace } = useSpacesState();
-    const { fetchProjects } = useProjectsState();
+    const { currentSpace, fetchSpaces, selectSpace } = useSpaces();
+    const { fetchProjects } = useProjects();
 
     return fetchSpaces()
       .then(() => selectSpace(+route.params.spaceID))
diff --git a/src/state/globalState.js b/src/state/global.js
similarity index 100%
rename from src/state/globalState.js
rename to src/state/global.js
diff --git a/src/state/loadingState.js b/src/state/loading.js
similarity index 100%
rename from src/state/loadingState.js
rename to src/state/loading.js
diff --git a/src/state/projectsState.js b/src/state/projects.js
similarity index 97%
rename from src/state/projectsState.js
rename to src/state/projects.js
index 51435040c..a72d6c751 100644
--- a/src/state/projectsState.js
+++ b/src/state/projects.js
@@ -39,7 +39,7 @@ const selectProject = (id) => {
   return state.currentProject;
 };
 
-export function useProjectsState() {
+export function useProjects() {
   const readonlyState = readonly(state);
   return {
     ...toRefs(readonlyState),
diff --git a/src/state/spacesState.js b/src/state/spaces.js
similarity index 97%
rename from src/state/spacesState.js
rename to src/state/spaces.js
index 8faa16bdb..043dbf6f5 100644
--- a/src/state/spacesState.js
+++ b/src/state/spaces.js
@@ -45,7 +45,7 @@ const selectSpace = (id) => {
   return state.currentSpace;
 };
 
-export function useSpacesState() {
+export function useSpaces() {
   const readonlyState = readonly(state);
   return {
     ...toRefs(readonlyState),
diff --git a/src/views/dashboard/Dashboard.vue b/src/views/dashboard/Dashboard.vue
index a4fcd7c08..0e1152074 100644
--- a/src/views/dashboard/Dashboard.vue
+++ b/src/views/dashboard/Dashboard.vue
@@ -23,7 +23,7 @@
 <script>
 import { ref, watchEffect } from 'vue';
 import { useRouter } from 'vue-router';
-import { useSpacesState } from '@/state/spacesState';
+import { useSpaces } from '@/state/spaces';
 // Components
 import DashboardButtonTile from '@/components/dashboard-button-tile/DashboardButtonTile';
 import DashboardInfoTile from '@/components/dashboard-info-tile/DashboardInfoTile';
@@ -39,7 +39,7 @@ export default {
   },
   setup() {
     const router = useRouter();
-    const { spaces } = useSpacesState();
+    const { spaces } = useSpaces();
 
     const nbSpaces = ref(0);
     watchEffect(() => {
diff --git a/src/views/oidc-callback/OidcCallback.vue b/src/views/oidc-callback/OidcCallback.vue
index 58b304f60..35049fa3e 100644
--- a/src/views/oidc-callback/OidcCallback.vue
+++ b/src/views/oidc-callback/OidcCallback.vue
@@ -7,7 +7,7 @@
 <script>
 import { onMounted } from 'vue';
 import { useRouter } from 'vue-router';
-import { useGlobalState } from '@/state/globalState';
+import { useGlobalState } from '@/state/global';
 // Components
 import BIMDataBigSpinner from '@bimdata/design-system/dist/js/BIMDataComponents/vue3/BIMDataBigSpinner.js';
 
diff --git a/src/views/projects/Projects.vue b/src/views/projects/Projects.vue
index c96378e3a..b7d4a1df6 100644
--- a/src/views/projects/Projects.vue
+++ b/src/views/projects/Projects.vue
@@ -26,7 +26,7 @@
 </template>
 
 <script>
-import { useProjectsState } from '@/state/projectsState';
+import { useProjects } from '@/state/projects';
 // Components
 import GoBackButton from '@/components/go-back-button/GoBackButton';
 import ProjectCard from '@/components/project-card/ProjectCard';
@@ -39,7 +39,7 @@ export default {
     ProjectCreationCard,
   },
   setup() {
-    const { projects } = useProjectsState();
+    const { projects } = useProjects();
 
     return {
       // References
diff --git a/src/views/spaces/Spaces.vue b/src/views/spaces/Spaces.vue
index b60dc4189..6d66dfce9 100644
--- a/src/views/spaces/Spaces.vue
+++ b/src/views/spaces/Spaces.vue
@@ -41,7 +41,7 @@
 
 <script>
 import { ref, watchEffect } from 'vue';
-import { useSpacesState } from '@/state/spacesState';
+import { useSpaces } from '@/state/spaces';
 // Components
 import BIMDataButton from '@bimdata/design-system/dist/js/BIMDataComponents/vue3/BIMDataButton.js';
 import BIMDataIcon from '@bimdata/design-system/dist/js/BIMDataComponents/vue3/BIMDataIcon.js';
@@ -60,7 +60,7 @@ export default {
     SpaceCreationCard,
   },
   setup() {
-    const { spaces } = useSpacesState();
+    const { spaces } = useSpaces();
 
     const displayedSpaces = ref([]);
     watchEffect(