diff --git a/live_monitor_vue/src/components/5_pages/Main/Machines/Filters.vue b/live_monitor_vue/src/components/5_pages/Main/Machines/Filters.vue
index 7984199..9f908e8 100644
--- a/live_monitor_vue/src/components/5_pages/Main/Machines/Filters.vue
+++ b/live_monitor_vue/src/components/5_pages/Main/Machines/Filters.vue
@@ -17,14 +17,14 @@ export default {
     }
   },
   computed: {
-    ...mapGetters('machines', ['selectedSelects', 'selectsData', 'toggleFilter', 'selectedData']),
+    ...mapGetters('layoutMachines', ['selectedSelects', 'selectsData', 'toggleFilter', 'selectedData']),
   },
   mounted () {
     
   },
   methods: {
-    ...mapMutations('machines', ['setSelectedSelect', 'setToggleFilter']),
-    ...mapActions('machines', ['updateSelects']),
+    ...mapMutations('layoutMachines', ['setSelectedSelect', 'setToggleFilter']),
+    ...mapActions('layoutMachines', ['updateSelects']),
     updateSelectedSelects: function(value) {
       if (value.length > 0) {
         this.updateSelects({key: 'set', value: value})
diff --git a/live_monitor_vue/src/components/5_pages/Main/Machines/HistoryViews.vue b/live_monitor_vue/src/components/5_pages/Main/Machines/HistoryViews.vue
index 4733c7b..739cf79 100644
--- a/live_monitor_vue/src/components/5_pages/Main/Machines/HistoryViews.vue
+++ b/live_monitor_vue/src/components/5_pages/Main/Machines/HistoryViews.vue
@@ -13,10 +13,10 @@ export default {
     // const updatedData = historyData.filter((el, idx, arr) => arr.findIndex((item) => item.machine_id === el.machine_id) === idx).slice(0, 50) // uniq values
     const updatedData = isHistoryData ? historyData.slice(0, 50) : []
     const store = useStore()
-    store.commit('machines/setHistoryData', updatedData)
+    store.commit('layoutMachines/setHistoryData', updatedData)
   },
   computed: {
-    ...mapGetters('machines', ['historyData']),
+    ...mapGetters('layoutMachines', ['historyData']),
     tabulatorOtps() {
       return {
         dataSource: this.historyData,
@@ -51,7 +51,7 @@ export default {
     }
   },
   methods: {
-    ...mapMutations('machines', ['setHistoryData']),
+    ...mapMutations('layoutMachines', ['setHistoryData']),
   }
 }
 
diff --git a/live_monitor_vue/src/components/5_pages/Main/Machines/Machine.vue b/live_monitor_vue/src/components/5_pages/Main/Machines/Machine.vue
index dd90039..e1a73f3 100644
--- a/live_monitor_vue/src/components/5_pages/Main/Machines/Machine.vue
+++ b/live_monitor_vue/src/components/5_pages/Main/Machines/Machine.vue
@@ -29,14 +29,14 @@ export default {
     }
   },
   computed: {
-    ...mapGetters('machines', ['machinesData', 'historyData', 'historyMachines']),
+    ...mapGetters('layoutMachines', ['machinesData', 'historyData', 'historyMachines']),
   },
   mounted () {
     
   },
   methods: {
-    ...mapMutations('machines', ['setInitHistory', 'setHistoryData', 'setHistoryMachines']),
-    ...mapActions('machines', ['openMapModal', 'openDataModal']),
+    ...mapMutations('layoutMachines', ['setInitHistory', 'setHistoryData', 'setHistoryMachines']),
+    ...mapActions('layoutMachines', ['openMapModal', 'openDataModal']),
     buttonClass: function(value) {
       return `border border-slate-400 flex items-center justify-center cursor-pointer rounded transition-all text-xs text-center py-[5px] px-2 ${value}`
     },
diff --git a/live_monitor_vue/src/components/5_pages/Main/Machines/Table.vue b/live_monitor_vue/src/components/5_pages/Main/Machines/Table.vue
index 738c46e..daa708c 100644
--- a/live_monitor_vue/src/components/5_pages/Main/Machines/Table.vue
+++ b/live_monitor_vue/src/components/5_pages/Main/Machines/Table.vue
@@ -11,7 +11,7 @@ export default {
     }
   },
   computed: {
-    ...mapGetters('machines', ['tableData', 'pagination']),
+    ...mapGetters('layoutMachines', ['tableData', 'pagination']),
     tabulatorOtps() {
       return {
         dataSource: this.tableData,
@@ -81,8 +81,8 @@ export default {
     }
   },
   methods: {
-    ...mapMutations('machines', ['setHistoryData']),
-    ...mapActions('machines', ['updatePagination']),
+    ...mapMutations('layoutMachines', ['setHistoryData']),
+    ...mapActions('layoutMachines', ['updatePagination']),
   }
 }