diff --git a/src/components/Dashboard/Dashboard.tsx b/src/components/Dashboard/Dashboard.tsx
index 8bde2af95..a41e7e3f5 100644
--- a/src/components/Dashboard/Dashboard.tsx
+++ b/src/components/Dashboard/Dashboard.tsx
@@ -1,6 +1,6 @@
 import { DashboardDetailView } from './Views/DetailView';
 import { DashboardEditView } from './Views/EditView';
-import { useEditModeStore } from './Views/store';
+import { useEditModeStore } from './Views/useEditModeStore';
 
 interface DashboardProps {}
 
diff --git a/src/components/Dashboard/Tiles/Service/Service.tsx b/src/components/Dashboard/Tiles/Service/Service.tsx
index 1f326aff8..d85041285 100644
--- a/src/components/Dashboard/Tiles/Service/Service.tsx
+++ b/src/components/Dashboard/Tiles/Service/Service.tsx
@@ -3,7 +3,7 @@ import { NextLink } from '@mantine/next';
 import { createStyles } from '@mantine/styles';
 import { ServiceType } from '../../../../types/service';
 import { useCardStyles } from '../../../layout/useCardStyles';
-import { useEditModeStore } from '../../Views/store';
+import { useEditModeStore } from '../../Views/useEditModeStore';
 import { BaseTileProps } from '../type';
 
 interface ServiceTileProps extends BaseTileProps {
diff --git a/src/components/Dashboard/Tiles/definition.tsx b/src/components/Dashboard/Tiles/tilesDefinitions.tsx
similarity index 100%
rename from src/components/Dashboard/Tiles/definition.tsx
rename to src/components/Dashboard/Tiles/tilesDefinitions.tsx
diff --git a/src/components/Dashboard/Views/main.tsx b/src/components/Dashboard/Views/DashboardView.tsx
similarity index 100%
rename from src/components/Dashboard/Views/main.tsx
rename to src/components/Dashboard/Views/DashboardView.tsx
diff --git a/src/components/Dashboard/Views/DetailView.tsx b/src/components/Dashboard/Views/DetailView.tsx
index ff7f93168..e367dd9df 100644
--- a/src/components/Dashboard/Views/DetailView.tsx
+++ b/src/components/Dashboard/Views/DetailView.tsx
@@ -1,4 +1,4 @@
-import { DashboardView } from './main';
+import { DashboardView } from './DashboardView';
 
 export const DashboardDetailView = () => {
   return <DashboardView />;
diff --git a/src/components/Dashboard/Views/EditView.tsx b/src/components/Dashboard/Views/EditView.tsx
index 1d9689152..c70de574f 100644
--- a/src/components/Dashboard/Views/EditView.tsx
+++ b/src/components/Dashboard/Views/EditView.tsx
@@ -1,4 +1,4 @@
-import { DashboardView } from './main';
+import { DashboardView } from './DashboardView';
 
 export const DashboardEditView = () => {
   return <DashboardView />;
diff --git a/src/components/Dashboard/Views/store.ts b/src/components/Dashboard/Views/useEditModeStore.ts
similarity index 100%
rename from src/components/Dashboard/Views/store.ts
rename to src/components/Dashboard/Views/useEditModeStore.ts
diff --git a/src/components/Dashboard/Wrappers/Sidebar/Sidebar.tsx b/src/components/Dashboard/Wrappers/Sidebar/Sidebar.tsx
index fc11cc99f..6b79953be 100644
--- a/src/components/Dashboard/Wrappers/Sidebar/Sidebar.tsx
+++ b/src/components/Dashboard/Wrappers/Sidebar/Sidebar.tsx
@@ -1,6 +1,6 @@
 import { Card } from '@mantine/core';
 import { RefObject } from 'react';
-import { Tiles } from '../../Tiles/definition';
+import { Tiles } from '../../Tiles/tilesDefinitions';
 import { GridstackTileWrapper } from '../../Tiles/TileWrapper';
 import { useGridstack } from '../gridstack/use-gridstack';
 
diff --git a/src/components/Dashboard/Wrappers/gridstack/use-gridstack.ts b/src/components/Dashboard/Wrappers/gridstack/use-gridstack.ts
index 5f75d1adb..39564945c 100644
--- a/src/components/Dashboard/Wrappers/gridstack/use-gridstack.ts
+++ b/src/components/Dashboard/Wrappers/gridstack/use-gridstack.ts
@@ -15,7 +15,7 @@ import { useResize } from '../../../../hooks/use-resize';
 import { IntegrationsType } from '../../../../types/integration';
 import { ServiceType } from '../../../../types/service';
 import { TileBaseType } from '../../../../types/tile';
-import { useEditModeStore } from '../../Views/store';
+import { useEditModeStore } from '../../Views/useEditModeStore';
 import { initializeGridstack } from './init-gridstack';
 
 interface UseGristackReturnType {