diff --git a/src/components/TheSettingsMenu.vue b/src/components/TheSettingsMenu.vue
index 2e2c8ee4..88a32a9c 100644
--- a/src/components/TheSettingsMenu.vue
+++ b/src/components/TheSettingsMenu.vue
@@ -106,7 +106,7 @@ export default class TheSettingsMenu extends Mixins(BaseMixin) {
                 title: this.$t('Settings.DashboardTab.Dashboard')
             },
             {
-                icon: 'mdi-webcam',
+                icon: 'mdi-webcams',
                 name: 'webcam',
                 title: this.$t('Settings.WebcamTab.Webcams')
             },
diff --git a/src/components/panels/WebcamPanel.vue b/src/components/panels/WebcamPanel.vue
index e6b78843..41eb540a 100644
--- a/src/components/panels/WebcamPanel.vue
+++ b/src/components/panels/WebcamPanel.vue
@@ -76,7 +76,7 @@ import Component from 'vue-class-component'
 import {Mixins, Prop} from 'vue-property-decorator'
 import BaseMixin from '../mixins/base'
 import Panel from '@/components/ui/Panel.vue'
-import {GuiWebcamStateWebcam} from '@/store/gui/webcam/types'
+import {GuiWebcamStateWebcam} from '@/store/gui/webcams/types'
 
 @Component({
     components: {
diff --git a/src/components/settings/SettingsWebcamTab.vue b/src/components/settings/SettingsWebcamTab.vue
index 0f0c8f5d..4856d3b9 100644
--- a/src/components/settings/SettingsWebcamTab.vue
+++ b/src/components/settings/SettingsWebcamTab.vue
@@ -157,7 +157,7 @@
 import {Component, Mixins} from 'vue-property-decorator'
 import BaseMixin from '../mixins/base'
 import SettingsRow from '@/components/settings/SettingsRow.vue'
-import {GuiWebcamStateWebcam} from '@/store/gui/webcam/types'
+import {GuiWebcamStateWebcam} from '@/store/gui/webcams/types'
 
 interface webcamForm {
     bool: boolean
@@ -207,7 +207,7 @@ export default class SettingsWebcamTab extends Mixins(BaseMixin) {
             { value: 'mdi-printer-3d',          text: this.$t('Settings.WebcamTab.IconPrinter') },
             { value: 'mdi-printer-3d-nozzle',   text: this.$t('Settings.WebcamTab.IconNozzle') },
             { value: 'mdi-radiator-disabled',   text: this.$t('Settings.WebcamTab.IconBed') },
-            { value: 'mdi-webcam',              text: this.$t('Settings.WebcamTab.IconCam') },
+            { value: 'mdi-webcams',              text: this.$t('Settings.WebcamTab.IconCam') },
             { value: 'mdi-album',               text: this.$t('Settings.WebcamTab.IconFilament') },
             { value: 'mdi-door',                text: this.$t('Settings.WebcamTab.IconDoor') },
             { value: 'mdi-raspberry-pi',        text: this.$t('Settings.WebcamTab.IconMcu') },
@@ -292,11 +292,11 @@ export default class SettingsWebcamTab extends Mixins(BaseMixin) {
         this.form.bool = false
         this.form.id = null
         this.form.name = ''
-        this.form.icon = 'mdi-webcam'
+        this.form.icon = 'mdi-webcams'
         this.form.service = 'mjpegstreamer-adaptive'
         this.form.targetFps = 15
-        this.form.urlStream = '/webcam/?action=stream'
-        this.form.urlSnapshot = '/webcam/?action=snapshot'
+        this.form.urlStream = '/webcams/?action=stream'
+        this.form.urlSnapshot = '/webcams/?action=snapshot'
         this.form.flipX = false
         this.form.flipY = false
     }
diff --git a/src/components/webcams/Uv4lMjpeg.vue b/src/components/webcams/Uv4lMjpeg.vue
index 23392b7a..c1ed4a4a 100644
--- a/src/components/webcams/Uv4lMjpeg.vue
+++ b/src/components/webcams/Uv4lMjpeg.vue
@@ -20,7 +20,7 @@
 <script lang="ts">
 import {Component, Mixins, Prop} from 'vue-property-decorator'
 import BaseMixin from '@/components/mixins/base'
-import {GuiWebcamStateWebcam} from '@/store/gui/webcam/types'
+import {GuiWebcamStateWebcam} from '@/store/gui/webcams/types'
 
 @Component
 export default class Uv4lMjpeg extends Mixins(BaseMixin) {
diff --git a/src/components/webcams/WebcamGrid.vue b/src/components/webcams/WebcamGrid.vue
index 92467134..084c109f 100644
--- a/src/components/webcams/WebcamGrid.vue
+++ b/src/components/webcams/WebcamGrid.vue
@@ -37,7 +37,7 @@ import Mjpegstreamer from '@/components/webcams/Mjpegstreamer.vue'
 import MjpegstreamerAdaptive from '@/components/webcams/MjpegstreamerAdaptive.vue'
 import Uv4lMjpeg from '@/components/webcams/Uv4lMjpeg.vue'
 import Ipstreamer from '@/components/webcams/Ipstreamer.vue'
-import {GuiWebcamStateWebcam} from '@/store/gui/webcam/types'
+import {GuiWebcamStateWebcam} from '@/store/gui/webcams/types'
 
 @Component({
     components: {
diff --git a/src/plugins/helpers.ts b/src/plugins/helpers.ts
index 4f2178f7..cfbf893b 100644
--- a/src/plugins/helpers.ts
+++ b/src/plugins/helpers.ts
@@ -38,7 +38,7 @@ export const convertPanelnameToIcon = (name: string): string => {
     if (name.startsWith('macrogroup_')) return 'mdi-code-tags'
 
     switch (name) {
-    case 'webcam': return 'mdi-webcam'
+    case 'webcam': return 'mdi-webcams'
     case 'zoffset': return 'mdi-arrow-collapse-vertical'
     case 'control': return 'mdi-gamepad'
     case 'macros': return 'mdi-code-tags'
diff --git a/src/store/farm/printer/getters.ts b/src/store/farm/printer/getters.ts
index e8070113..a9567fa4 100644
--- a/src/store/farm/printer/getters.ts
+++ b/src/store/farm/printer/getters.ts
@@ -2,7 +2,7 @@ import {defaultLogoColor, themeDir, thumbnailBigMin} from '@/store/variables'
 import {convertName} from '@/plugins/helpers'
 import {GetterTree} from 'vuex'
 import {FarmPrinterState} from '@/store/farm/printer/types'
-import {GuiWebcamStateWebcam} from '@/store/gui/webcam/types'
+import {GuiWebcamStateWebcam} from '@/store/gui/webcams/types'
 
 // eslint-disable-next-line
 export const getters: GetterTree<FarmPrinterState, any> = {
diff --git a/src/store/farm/printer/types.ts b/src/store/farm/printer/types.ts
index 4b6efc74..45673665 100644
--- a/src/store/farm/printer/types.ts
+++ b/src/store/farm/printer/types.ts
@@ -1,6 +1,6 @@
 import { GuiState } from '@/store/gui/types'
 import { FileStateFile } from '@/store/files/types'
-import {GuiWebcamStateWebcam} from '@/store/gui/webcam/types'
+import {GuiWebcamStateWebcam} from '@/store/gui/webcams/types'
 
 export interface FarmPrinterState {
     _namespace: string
diff --git a/src/store/gui/actions.ts b/src/store/gui/actions.ts
index 68740354..6b90275f 100644
--- a/src/store/gui/actions.ts
+++ b/src/store/gui/actions.ts
@@ -25,7 +25,7 @@ export const actions: ActionTree<GuiState, RootState> = {
 
         //added in V2.1
         if (payload.value.webcam) {
-            window.console.debug('convert old webcam')
+            window.console.debug('convert old webcams')
 
             if (payload.value.webcam.configs && payload.value.webcam.configs.length) {
                 payload.value.webcam.configs.forEach((oldWebcam: any) => {
diff --git a/src/store/gui/index.ts b/src/store/gui/index.ts
index c5da0a2f..6e0485d9 100644
--- a/src/store/gui/index.ts
+++ b/src/store/gui/index.ts
@@ -6,7 +6,7 @@ import { getters } from '@/store/gui/getters'
 import {defaultLogoColor, defaultPrimaryColor} from '@/store/variables'
 
 // load modules
-import { webcam } from '@/store/gui/webcam'
+import { webcam } from '@/store/gui/webcams'
 import { presets } from '@/store/gui/presets'
 
 export const getDefaultState = (): GuiState => {
diff --git a/src/store/gui/webcam/actions.ts b/src/store/gui/webcams/actions.ts
similarity index 88%
rename from src/store/gui/webcam/actions.ts
rename to src/store/gui/webcams/actions.ts
index a52ad841..daf65d35 100644
--- a/src/store/gui/webcam/actions.ts
+++ b/src/store/gui/webcams/actions.ts
@@ -1,6 +1,6 @@
 import { ActionTree } from 'vuex'
 import {RootState} from '@/store/types'
-import {GuiWebcamState} from '@/store/gui/webcam/types'
+import {GuiWebcamState} from '@/store/gui/webcams/types'
 import { v4 as uuidv4 } from 'uuid'
 import Vue from 'vue'
 
@@ -10,8 +10,8 @@ export const actions: ActionTree<GuiWebcamState, RootState> = {
     },
 
     init() {
-        window.console.debug('init gui/webcam')
-        Vue.$socket.emit('server.database.get_item', { namespace: 'webcams' }, { action: 'gui/webcam/initStore' })
+        window.console.debug('init gui/webcams')
+        Vue.$socket.emit('server.database.get_item', { namespace: 'webcams' }, { action: 'gui/webcams/initStore' })
     },
 
     initStore({ commit }, payload) {
diff --git a/src/store/gui/webcam/getters.ts b/src/store/gui/webcams/getters.ts
similarity index 96%
rename from src/store/gui/webcam/getters.ts
rename to src/store/gui/webcams/getters.ts
index 283b039b..e114f309 100644
--- a/src/store/gui/webcam/getters.ts
+++ b/src/store/gui/webcams/getters.ts
@@ -1,5 +1,5 @@
 import { GetterTree } from 'vuex'
-import {GuiWebcamState, GuiWebcamStateWebcam} from '@/store/gui/webcam/types'
+import {GuiWebcamState, GuiWebcamStateWebcam} from '@/store/gui/webcams/types'
 
 // eslint-disable-next-line
 export const getters: GetterTree<GuiWebcamState, any> = {
diff --git a/src/store/gui/webcam/index.ts b/src/store/gui/webcams/index.ts
similarity index 59%
rename from src/store/gui/webcam/index.ts
rename to src/store/gui/webcams/index.ts
index b5a083fd..4bd01b4e 100644
--- a/src/store/gui/webcam/index.ts
+++ b/src/store/gui/webcams/index.ts
@@ -1,8 +1,8 @@
 import { Module } from 'vuex'
-import { actions } from '@/store/gui/webcam/actions'
-import { mutations } from '@/store/gui/webcam/mutations'
-import { getters } from '@/store/gui/webcam/getters'
-import {GuiWebcamState} from '@/store/gui/webcam/types'
+import { actions } from '@/store/gui/webcams/actions'
+import { mutations } from '@/store/gui/webcams/mutations'
+import { getters } from '@/store/gui/webcams/getters'
+import {GuiWebcamState} from '@/store/gui/webcams/types'
 
 export const getDefaultState = (): GuiWebcamState => {
     return {
diff --git a/src/store/gui/webcam/mutations.ts b/src/store/gui/webcams/mutations.ts
similarity index 93%
rename from src/store/gui/webcam/mutations.ts
rename to src/store/gui/webcams/mutations.ts
index 197f26a3..d74bb04b 100644
--- a/src/store/gui/webcam/mutations.ts
+++ b/src/store/gui/webcams/mutations.ts
@@ -1,6 +1,6 @@
 import { getDefaultState } from './index'
 import {MutationTree} from 'vuex'
-import {GuiWebcamState} from '@/store/gui/webcam/types'
+import {GuiWebcamState} from '@/store/gui/webcams/types'
 import Vue from 'vue'
 
 export const mutations: MutationTree<GuiWebcamState> = {
diff --git a/src/store/gui/webcam/types.ts b/src/store/gui/webcams/types.ts
similarity index 100%
rename from src/store/gui/webcam/types.ts
rename to src/store/gui/webcams/types.ts
diff --git a/src/store/server/actions.ts b/src/store/server/actions.ts
index b16e00e1..7a8447ec 100644
--- a/src/store/server/actions.ts
+++ b/src/store/server/actions.ts
@@ -30,7 +30,7 @@ export const actions: ActionTree<ServerState, RootState> = {
             dispatch('printer/init', null, { root: true })
         }
 
-        if (payload.namespaces?.includes('webcams')) dispatch('gui/webcam/init', null, { root: true })
+        if (payload.namespaces?.includes('webcams')) dispatch('gui/webcams/init', null, { root: true })
         if (payload.namespaces?.includes('mainsail_presets')) dispatch('gui/presets/init', null, { root: true })
     },