diff --git a/.gitignore b/.gitignore
index 3596477d..dcff5022 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,6 @@ node_modules/
 thumbs.db
 .idea/
 .vscode
-TODO.md
+NOTES.md
 *.txt
 package-lock.json
\ No newline at end of file
diff --git a/src/renderer/components/ModalProcessesList.vue b/src/renderer/components/ModalProcessesList.vue
index f5f46a7f..8de12674 100644
--- a/src/renderer/components/ModalProcessesList.vue
+++ b/src/renderer/components/ModalProcessesList.vue
@@ -83,7 +83,7 @@
                      :scroll-element="scrollElement"
                   >
                      <template slot-scope="{ items }">
-                        <ProcessesListRow
+                        <ModalProcessesListRow
                            v-for="row in items"
                            :key="row._id"
                            class="process-row"
@@ -104,13 +104,13 @@
 import { mapGetters, mapActions } from 'vuex';
 import Schema from '@/ipc-api/Schema';
 import BaseVirtualScroll from '@/components/BaseVirtualScroll';
-import ProcessesListRow from '@/components/ProcessesListRow';
+import ModalProcessesListRow from '@/components/ModalProcessesListRow';
 
 export default {
    name: 'ModalProcessesList',
    components: {
       BaseVirtualScroll,
-      ProcessesListRow
+      ModalProcessesListRow
    },
    props: {
       connection: Object
diff --git a/src/renderer/components/ProcessesListRow.vue b/src/renderer/components/ModalProcessesListRow.vue
similarity index 99%
rename from src/renderer/components/ProcessesListRow.vue
rename to src/renderer/components/ModalProcessesListRow.vue
index 2a79dbbf..29b78f13 100644
--- a/src/renderer/components/ProcessesListRow.vue
+++ b/src/renderer/components/ModalProcessesListRow.vue
@@ -51,7 +51,7 @@ import ConfirmModal from '@/components/BaseConfirmModal';
 import TextEditor from '@/components/BaseTextEditor';
 
 export default {
-   name: 'ProcessesListRow',
+   name: 'ModalProcessesListRow',
    components: {
       ConfirmModal,
       TextEditor
diff --git a/src/renderer/components/Workspace.vue b/src/renderer/components/Workspace.vue
index 847333dc..5cc76088 100644
--- a/src/renderer/components/Workspace.vue
+++ b/src/renderer/components/Workspace.vue
@@ -186,14 +186,14 @@
          </Draggable>
          <WorkspaceEmptyState v-if="!workspace.tabs.length" @new-tab="addQueryTab" />
          <template v-for="tab of workspace.tabs">
-            <WorkspaceQueryTab
+            <WorkspaceTabQuery
                v-if="tab.type==='query'"
                :key="tab.uid"
                :tab="tab"
                :is-selected="selectedTab === tab.uid"
                :connection="connection"
             />
-            <WorkspaceTableTab
+            <WorkspaceTabTable
                v-else-if="['temp-data', 'data'].includes(tab.type)"
                :key="tab.uid"
                :connection="connection"
@@ -202,7 +202,7 @@
                :schema="tab.schema"
                :element-type="tab.elementType"
             />
-            <WorkspacePropsTab
+            <WorkspaceTabPropsTable
                v-else-if="tab.type === 'table-props'"
                :key="tab.uid"
                :connection="connection"
@@ -210,7 +210,7 @@
                :table="tab.elementName"
                :schema="tab.schema"
             />
-            <WorkspacePropsTabView
+            <WorkspaceTabPropsView
                v-else-if="tab.type === 'view-props'"
                :key="tab.uid"
                :is-selected="selectedTab === tab.uid"
@@ -218,7 +218,7 @@
                :view="tab.elementName"
                :schema="tab.schema"
             />
-            <WorkspacePropsTabTrigger
+            <WorkspaceTabPropsTrigger
                v-else-if="['temp-trigger-props', 'trigger-props'].includes(tab.type)"
                :key="tab.uid"
                :connection="connection"
@@ -226,7 +226,7 @@
                :trigger="tab.elementName"
                :schema="tab.schema"
             />
-            <WorkspacePropsTabTriggerFunction
+            <WorkspaceTabPropsTriggerFunction
                v-else-if="['temp-trigger-function-props', 'trigger-function-props'].includes(tab.type)"
                :key="tab.uid"
                :connection="connection"
@@ -234,7 +234,7 @@
                :function="tab.elementName"
                :schema="tab.schema"
             />
-            <WorkspacePropsTabRoutine
+            <WorkspaceTabPropsRoutine
                v-else-if="['temp-routine-props', 'routine-props'].includes(tab.type)"
                :key="tab.uid"
                :connection="connection"
@@ -242,7 +242,7 @@
                :routine="tab.elementName"
                :schema="tab.schema"
             />
-            <WorkspacePropsTabFunction
+            <WorkspaceTabPropsFunction
                v-else-if="['temp-function-props', 'function-props'].includes(tab.type)"
                :key="tab.uid"
                :connection="connection"
@@ -250,7 +250,7 @@
                :function="tab.elementName"
                :schema="tab.schema"
             />
-            <WorkspacePropsTabScheduler
+            <WorkspaceTabPropsScheduler
                v-else-if="['temp-scheduler-props', 'scheduler-props'].includes(tab.type)"
                :key="tab.uid"
                :connection="connection"
@@ -282,15 +282,15 @@ import Connection from '@/ipc-api/Connection';
 import WorkspaceEmptyState from '@/components/WorkspaceEmptyState';
 import WorkspaceExploreBar from '@/components/WorkspaceExploreBar';
 import WorkspaceEditConnectionPanel from '@/components/WorkspaceEditConnectionPanel';
-import WorkspaceQueryTab from '@/components/WorkspaceQueryTab';
-import WorkspaceTableTab from '@/components/WorkspaceTableTab';
-import WorkspacePropsTab from '@/components/WorkspacePropsTab';
-import WorkspacePropsTabView from '@/components/WorkspacePropsTabView';
-import WorkspacePropsTabTrigger from '@/components/WorkspacePropsTabTrigger';
-import WorkspacePropsTabTriggerFunction from '@/components/WorkspacePropsTabTriggerFunction';
-import WorkspacePropsTabRoutine from '@/components/WorkspacePropsTabRoutine';
-import WorkspacePropsTabFunction from '@/components/WorkspacePropsTabFunction';
-import WorkspacePropsTabScheduler from '@/components/WorkspacePropsTabScheduler';
+import WorkspaceTabQuery from '@/components/WorkspaceTabQuery';
+import WorkspaceTabTable from '@/components/WorkspaceTabTable';
+import WorkspaceTabPropsTable from '@/components/WorkspaceTabPropsTable';
+import WorkspaceTabPropsView from '@/components/WorkspaceTabPropsView';
+import WorkspaceTabPropsTrigger from '@/components/WorkspaceTabPropsTrigger';
+import WorkspaceTabPropsTriggerFunction from '@/components/WorkspaceTabPropsTriggerFunction';
+import WorkspaceTabPropsRoutine from '@/components/WorkspaceTabPropsRoutine';
+import WorkspaceTabPropsFunction from '@/components/WorkspaceTabPropsFunction';
+import WorkspaceTabPropsScheduler from '@/components/WorkspaceTabPropsScheduler';
 import ModalProcessesList from '@/components/ModalProcessesList';
 import ModalDiscardChanges from '@/components/ModalDiscardChanges';
 
@@ -301,15 +301,15 @@ export default {
       WorkspaceEmptyState,
       WorkspaceExploreBar,
       WorkspaceEditConnectionPanel,
-      WorkspaceQueryTab,
-      WorkspaceTableTab,
-      WorkspacePropsTab,
-      WorkspacePropsTabView,
-      WorkspacePropsTabTrigger,
-      WorkspacePropsTabTriggerFunction,
-      WorkspacePropsTabRoutine,
-      WorkspacePropsTabFunction,
-      WorkspacePropsTabScheduler,
+      WorkspaceTabQuery,
+      WorkspaceTabTable,
+      WorkspaceTabPropsTable,
+      WorkspaceTabPropsView,
+      WorkspaceTabPropsTrigger,
+      WorkspaceTabPropsTriggerFunction,
+      WorkspaceTabPropsRoutine,
+      WorkspaceTabPropsFunction,
+      WorkspaceTabPropsScheduler,
       ModalProcessesList,
       ModalDiscardChanges
    },
diff --git a/src/renderer/components/WorkspacePropsFunctionOptionsModal.vue b/src/renderer/components/WorkspacePropsFunctionOptionsModal.vue
deleted file mode 100644
index 3feccc1f..00000000
--- a/src/renderer/components/WorkspacePropsFunctionOptionsModal.vue
+++ /dev/null
@@ -1,213 +0,0 @@
-<template>
-   <ConfirmModal
-      :confirm-text="$t('word.confirm')"
-      size="400"
-      @confirm="confirmOptionsChange"
-      @hide="$emit('hide')"
-   >
-      <template :slot="'header'">
-         <div class="d-flex">
-            <i class="mdi mdi-24px mdi-cogs mr-1" />
-            <span class="cut-text">{{ $t('word.options') }} "{{ localOptions.name }}"</span>
-         </div>
-      </template>
-      <div :slot="'body'">
-         <form class="form-horizontal">
-            <div class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.name') }}
-               </label>
-               <div class="column">
-                  <input
-                     ref="firstInput"
-                     v-model="optionsProxy.name"
-                     class="form-input"
-                     :class="{'is-error': !isTableNameValid}"
-                     type="text"
-                  >
-               </div>
-            </div>
-            <div v-if="customizations.languages" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.language') }}
-               </label>
-               <div class="column">
-                  <select v-model="optionsProxy.language" class="form-select">
-                     <option v-for="language in customizations.languages" :key="language">
-                        {{ language }}
-                     </option>
-                  </select>
-               </div>
-            </div>
-            <div v-if="customizations.definer" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.definer') }}
-               </label>
-               <div class="column">
-                  <select
-                     v-if="workspace.users.length"
-                     v-model="optionsProxy.definer"
-                     class="form-select"
-                  >
-                     <option value="">
-                        {{ $t('message.currentUser') }}
-                     </option>
-                     <option
-                        v-for="user in workspace.users"
-                        :key="`${user.name}@${user.host}`"
-                        :value="`\`${user.name}\`@\`${user.host}\``"
-                     >
-                        {{ user.name }}@{{ user.host }}
-                     </option>
-                  </select>
-                  <select v-if="!workspace.users.length" class="form-select">
-                     <option value="">
-                        {{ $t('message.currentUser') }}
-                     </option>
-                  </select>
-               </div>
-            </div>
-            <div class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.returns') }}
-               </label>
-               <div class="column">
-                  <div class="input-group">
-                     <select
-                        v-model="optionsProxy.returns"
-                        class="form-select text-uppercase"
-                        style="width: 0;"
-                     >
-                        <option v-if="localOptions.returns === 'VOID'">
-                           VOID
-                        </option>
-                        <option v-if="!isInDataTypes">
-                           {{ localOptions.returns }}
-                        </option>
-                        <optgroup
-                           v-for="group in workspace.dataTypes"
-                           :key="group.group"
-                           :label="group.group"
-                        >
-                           <option
-                              v-for="type in group.types"
-                              :key="type.name"
-                              :selected="optionsProxy.returns === type.name"
-                              :value="type.name"
-                           >
-                              {{ type.name }}
-                           </option>
-                        </optgroup>
-                     </select>
-                     <input
-                        v-if="customizations.parametersLength"
-                        v-model="optionsProxy.returnsLength"
-                        class="form-input"
-                        type="number"
-                        min="0"
-                     >
-                  </div>
-               </div>
-            </div>
-            <div v-if="customizations.comment" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.comment') }}
-               </label>
-               <div class="column">
-                  <input
-                     v-model="optionsProxy.comment"
-                     class="form-input"
-                     type="text"
-                  >
-               </div>
-            </div>
-            <div class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('message.sqlSecurity') }}
-               </label>
-               <div class="column">
-                  <select v-model="optionsProxy.security" class="form-select">
-                     <option>DEFINER</option>
-                     <option>INVOKER</option>
-                  </select>
-               </div>
-            </div>
-            <div v-if="customizations.functionDataAccess" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('message.dataAccess') }}
-               </label>
-               <div class="column">
-                  <select v-model="optionsProxy.dataAccess" class="form-select">
-                     <option>CONTAINS SQL</option>
-                     <option>NO SQL</option>
-                     <option>READS SQL DATA</option>
-                     <option>MODIFIES SQL DATA</option>
-                  </select>
-               </div>
-            </div>
-            <div v-if="customizations.functionDeterministic" class="form-group">
-               <div class="col-4" />
-               <div class="column">
-                  <label class="form-checkbox form-inline">
-                     <input v-model="optionsProxy.deterministic" type="checkbox"><i class="form-icon" /> {{ $t('word.deterministic') }}
-                  </label>
-               </div>
-            </div>
-         </form>
-      </div>
-   </ConfirmModal>
-</template>
-
-<script>
-import ConfirmModal from '@/components/BaseConfirmModal';
-
-export default {
-   name: 'WorkspacePropsFunctionOptionsModal',
-   components: {
-      ConfirmModal
-   },
-   props: {
-      localOptions: Object,
-      workspace: Object
-   },
-   data () {
-      return {
-         optionsProxy: {},
-         isOptionsChanging: false
-      };
-   },
-   computed: {
-      isTableNameValid () {
-         return this.optionsProxy.name !== '';
-      },
-      customizations () {
-         return this.workspace.customizations;
-      },
-      isInDataTypes () {
-         let typeNames = [];
-         for (const group of this.workspace.dataTypes) {
-            typeNames = group.types.reduce((acc, curr) => {
-               acc.push(curr.name);
-               return acc;
-            }, []);
-         }
-         return typeNames.includes(this.localOptions.returns);
-      }
-   },
-   created () {
-      this.optionsProxy = JSON.parse(JSON.stringify(this.localOptions));
-
-      setTimeout(() => {
-         this.$refs.firstInput.focus();
-      }, 20);
-   },
-   methods: {
-      confirmOptionsChange () {
-         if (!this.isTableNameValid)
-            this.optionsProxy.name = this.localOptions.name;
-
-         this.$emit('options-update', this.optionsProxy);
-      }
-   }
-};
-</script>
diff --git a/src/renderer/components/WorkspacePropsOptionsModal.vue b/src/renderer/components/WorkspacePropsOptionsModal.vue
deleted file mode 100644
index c1c304d5..00000000
--- a/src/renderer/components/WorkspacePropsOptionsModal.vue
+++ /dev/null
@@ -1,132 +0,0 @@
-<template>
-   <ConfirmModal
-      :confirm-text="$t('word.confirm')"
-      size="400"
-      @confirm="confirmOptionsChange"
-      @hide="$emit('hide')"
-   >
-      <template :slot="'header'">
-         <div class="d-flex">
-            <i class="mdi mdi-24px mdi-cogs mr-1" />
-            <span class="cut-text">{{ $t('word.options') }} "{{ table }}"</span>
-         </div>
-      </template>
-      <div :slot="'body'">
-         <form class="form-horizontal">
-            <div class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.name') }}
-               </label>
-               <div class="column">
-                  <input
-                     ref="firstInput"
-                     v-model="optionsProxy.name"
-                     class="form-input"
-                     :class="{'is-error': !isTableNameValid}"
-                     type="text"
-                  >
-               </div>
-            </div>
-            <div v-if="workspace.customizations.comment" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.comment') }}
-               </label>
-               <div class="column">
-                  <input
-                     v-model="optionsProxy.comment"
-                     class="form-input"
-                     type="text"
-                  >
-               </div>
-            </div>
-            <div v-if="workspace.customizations.autoIncrement" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.autoIncrement') }}
-               </label>
-               <div class="column">
-                  <input
-                     v-model="optionsProxy.autoIncrement"
-                     class="form-input"
-                     type="number"
-                     :disabled="optionsProxy.autoIncrement === null"
-                  >
-               </div>
-            </div>
-            <div v-if="workspace.customizations.collations" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.collation') }}
-               </label>
-               <div class="column">
-                  <select v-model="optionsProxy.collation" class="form-select">
-                     <option
-                        v-for="collation in workspace.collations"
-                        :key="collation.id"
-                        :value="collation.collation"
-                     >
-                        {{ collation.collation }}
-                     </option>
-                  </select>
-               </div>
-            </div>
-            <div v-if="workspace.customizations.engines" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.engine') }}
-               </label>
-               <div class="column">
-                  <select v-model="optionsProxy.engine" class="form-select">
-                     <option
-                        v-for="engine in workspace.engines"
-                        :key="engine.name"
-                        :value="engine.name"
-                     >
-                        {{ engine.name }}
-                     </option>
-                  </select>
-               </div>
-            </div>
-         </form>
-      </div>
-   </ConfirmModal>
-</template>
-
-<script>
-import ConfirmModal from '@/components/BaseConfirmModal';
-
-export default {
-   name: 'WorkspacePropsOptionsModal',
-   components: {
-      ConfirmModal
-   },
-   props: {
-      localOptions: Object,
-      table: String,
-      workspace: Object
-   },
-   data () {
-      return {
-         optionsProxy: {},
-         isOptionsChanging: false
-      };
-   },
-   computed: {
-      isTableNameValid () {
-         return this.optionsProxy.name !== '';
-      }
-   },
-   created () {
-      this.optionsProxy = JSON.parse(JSON.stringify(this.localOptions));
-
-      setTimeout(() => {
-         this.$refs.firstInput.focus();
-      }, 20);
-   },
-   methods: {
-      confirmOptionsChange () {
-         if (!this.isTableNameValid)
-            this.optionsProxy.name = this.localOptions.name;
-
-         this.$emit('options-update', this.optionsProxy);
-      }
-   }
-};
-</script>
diff --git a/src/renderer/components/WorkspacePropsRoutineOptionsModal.vue b/src/renderer/components/WorkspacePropsRoutineOptionsModal.vue
deleted file mode 100644
index 96be15e7..00000000
--- a/src/renderer/components/WorkspacePropsRoutineOptionsModal.vue
+++ /dev/null
@@ -1,161 +0,0 @@
-<template>
-   <ConfirmModal
-      :confirm-text="$t('word.confirm')"
-      size="400"
-      @confirm="confirmOptionsChange"
-      @hide="$emit('hide')"
-   >
-      <template :slot="'header'">
-         <div class="d-flex">
-            <i class="mdi mdi-24px mdi-cogs mr-1" />
-            <span class="cut-text">{{ $t('word.options') }} "{{ localOptions.name }}"</span>
-         </div>
-      </template>
-      <div :slot="'body'">
-         <form class="form-horizontal">
-            <div class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.name') }}
-               </label>
-               <div class="column">
-                  <input
-                     ref="firstInput"
-                     v-model="optionsProxy.name"
-                     class="form-input"
-                     :class="{'is-error': !isTableNameValid}"
-                     type="text"
-                  >
-               </div>
-            </div>
-            <div v-if="customizations.languages" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.language') }}
-               </label>
-               <div class="column">
-                  <select v-model="optionsProxy.language" class="form-select">
-                     <option v-for="language in customizations.languages" :key="language">
-                        {{ language }}
-                     </option>
-                  </select>
-               </div>
-            </div>
-            <div v-if="customizations.definer" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.definer') }}
-               </label>
-               <div class="column">
-                  <select
-                     v-if="workspace.users.length"
-                     v-model="optionsProxy.definer"
-                     class="form-select"
-                  >
-                     <option value="">
-                        {{ $t('message.currentUser') }}
-                     </option>
-                     <option
-                        v-for="user in workspace.users"
-                        :key="`${user.name}@${user.host}`"
-                        :value="`\`${user.name}\`@\`${user.host}\``"
-                     >
-                        {{ user.name }}@{{ user.host }}
-                     </option>
-                  </select>
-                  <select v-if="!workspace.users.length" class="form-select">
-                     <option value="">
-                        {{ $t('message.currentUser') }}
-                     </option>
-                  </select>
-               </div>
-            </div>
-            <div v-if="customizations.comment" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.comment') }}
-               </label>
-               <div class="column">
-                  <input
-                     v-model="optionsProxy.comment"
-                     class="form-input"
-                     type="text"
-                  >
-               </div>
-            </div>
-            <div class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('message.sqlSecurity') }}
-               </label>
-               <div class="column">
-                  <select v-model="optionsProxy.security" class="form-select">
-                     <option>DEFINER</option>
-                     <option>INVOKER</option>
-                  </select>
-               </div>
-            </div>
-            <div v-if="customizations.procedureDataAccess" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('message.dataAccess') }}
-               </label>
-               <div class="column">
-                  <select v-model="optionsProxy.dataAccess" class="form-select">
-                     <option>CONTAINS SQL</option>
-                     <option>NO SQL</option>
-                     <option>READS SQL DATA</option>
-                     <option>MODIFIES SQL DATA</option>
-                  </select>
-               </div>
-            </div>
-            <div v-if="customizations.procedureDeterministic" class="form-group">
-               <div class="col-4" />
-               <div class="column">
-                  <label class="form-checkbox form-inline">
-                     <input v-model="optionsProxy.deterministic" type="checkbox"><i class="form-icon" /> {{ $t('word.deterministic') }}
-                  </label>
-               </div>
-            </div>
-         </form>
-      </div>
-   </ConfirmModal>
-</template>
-
-<script>
-import ConfirmModal from '@/components/BaseConfirmModal';
-
-export default {
-   name: 'WorkspacePropsRoutineOptionsModal',
-   components: {
-      ConfirmModal
-   },
-   props: {
-      localOptions: Object,
-      workspace: Object
-   },
-   data () {
-      return {
-         optionsProxy: {},
-         isOptionsChanging: false
-      };
-   },
-   computed: {
-      isTableNameValid () {
-         return this.optionsProxy.name !== '';
-      },
-      customizations () {
-         return this.workspace.customizations;
-      }
-   },
-   created () {
-      this.optionsProxy = JSON.parse(JSON.stringify(this.localOptions));
-
-      setTimeout(() => {
-         this.$refs.firstInput.focus();
-      }, 20);
-   },
-   methods: {
-      confirmOptionsChange () {
-         if (!this.isTableNameValid)
-            this.optionsProxy.name = this.localOptions.name;
-
-         this.$emit('options-update', this.optionsProxy);
-      }
-   }
-};
-</script>
diff --git a/src/renderer/components/WorkspacePropsTriggerFunctionOptionsModal.vue b/src/renderer/components/WorkspacePropsTriggerFunctionOptionsModal.vue
deleted file mode 100644
index 345aa25a..00000000
--- a/src/renderer/components/WorkspacePropsTriggerFunctionOptionsModal.vue
+++ /dev/null
@@ -1,125 +0,0 @@
-<template>
-   <ConfirmModal
-      :confirm-text="$t('word.confirm')"
-      size="400"
-      @confirm="confirmOptionsChange"
-      @hide="$emit('hide')"
-   >
-      <template :slot="'header'">
-         <div class="d-flex">
-            <i class="mdi mdi-24px mdi-cogs mr-1" />
-            <span class="cut-text">{{ $t('word.options') }} "{{ localOptions.name }}"</span>
-         </div>
-      </template>
-      <div :slot="'body'">
-         <form class="form-horizontal">
-            <div v-if="customizations.triggerFunctionlanguages" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.language') }}
-               </label>
-               <div class="column">
-                  <select v-model="optionsProxy.language" class="form-select">
-                     <option v-for="language in customizations.triggerFunctionlanguages" :key="language">
-                        {{ language }}
-                     </option>
-                  </select>
-               </div>
-            </div>
-            <div v-if="customizations.definer" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.definer') }}
-               </label>
-               <div class="column">
-                  <select
-                     v-if="workspace.users.length"
-                     v-model="optionsProxy.definer"
-                     class="form-select"
-                  >
-                     <option value="">
-                        {{ $t('message.currentUser') }}
-                     </option>
-                     <option
-                        v-for="user in workspace.users"
-                        :key="`${user.name}@${user.host}`"
-                        :value="`\`${user.name}\`@\`${user.host}\``"
-                     >
-                        {{ user.name }}@{{ user.host }}
-                     </option>
-                  </select>
-                  <select v-if="!workspace.users.length" class="form-select">
-                     <option value="">
-                        {{ $t('message.currentUser') }}
-                     </option>
-                  </select>
-               </div>
-            </div>
-            <div v-if="customizations.comment" class="form-group">
-               <label class="form-label col-4">
-                  {{ $t('word.comment') }}
-               </label>
-               <div class="column">
-                  <input
-                     v-model="optionsProxy.comment"
-                     class="form-input"
-                     type="text"
-                  >
-               </div>
-            </div>
-         </form>
-      </div>
-   </ConfirmModal>
-</template>
-
-<script>
-import ConfirmModal from '@/components/BaseConfirmModal';
-
-export default {
-   name: 'WorkspacePropsTriggerFunctionOptionsModal',
-   components: {
-      ConfirmModal
-   },
-   props: {
-      localOptions: Object,
-      workspace: Object
-   },
-   data () {
-      return {
-         optionsProxy: {},
-         isOptionsChanging: false
-      };
-   },
-   computed: {
-      isTableNameValid () {
-         return this.optionsProxy.name !== '';
-      },
-      customizations () {
-         return this.workspace.customizations;
-      },
-      isInDataTypes () {
-         let typeNames = [];
-         for (const group of this.workspace.dataTypes) {
-            typeNames = group.types.reduce((acc, curr) => {
-               acc.push(curr.name);
-               return acc;
-            }, []);
-         }
-         return typeNames.includes(this.localOptions.returns);
-      }
-   },
-   created () {
-      this.optionsProxy = JSON.parse(JSON.stringify(this.localOptions));
-
-      setTimeout(() => {
-         this.$refs.firstInput.focus();
-      }, 20);
-   },
-   methods: {
-      confirmOptionsChange () {
-         if (!this.isTableNameValid)
-            this.optionsProxy.name = this.localOptions.name;
-
-         this.$emit('options-update', this.optionsProxy);
-      }
-   }
-};
-</script>
diff --git a/src/renderer/components/WorkspacePropsTabFunction.vue b/src/renderer/components/WorkspaceTabPropsFunction.vue
similarity index 97%
rename from src/renderer/components/WorkspacePropsTabFunction.vue
rename to src/renderer/components/WorkspaceTabPropsFunction.vue
index 1defe796..0524f417 100644
--- a/src/renderer/components/WorkspacePropsTabFunction.vue
+++ b/src/renderer/components/WorkspaceTabPropsFunction.vue
@@ -207,14 +207,14 @@
             :height="editorHeight"
          />
       </div>
-      <!-- <WorkspacePropsFunctionOptionsModal
+      <!-- <WorkspaceTabPropsFunctionOptionsModal
          v-if="isOptionsModal"
          :local-options="localFunction"
          :workspace="workspace"
          @hide="hideOptionsModal"
          @options-update="optionsUpdate"
       /> -->
-      <WorkspacePropsFunctionParamsModal
+      <WorkspaceTabPropsFunctionParamsModal
          v-if="isParamsModal"
          :local-parameters="localFunction.parameters"
          :workspace="workspace"
@@ -237,18 +237,18 @@ import { mapGetters, mapActions } from 'vuex';
 import { uidGen } from 'common/libs/uidGen';
 import BaseLoader from '@/components/BaseLoader';
 import QueryEditor from '@/components/QueryEditor';
-// import WorkspacePropsFunctionOptionsModal from '@/components/WorkspacePropsFunctionOptionsModal';
-import WorkspacePropsFunctionParamsModal from '@/components/WorkspacePropsFunctionParamsModal';
+// import WorkspaceTabPropsFunctionOptionsModal from '@/components/WorkspaceTabPropsFunctionOptionsModal';
+import WorkspaceTabPropsFunctionParamsModal from '@/components/WorkspaceTabPropsFunctionParamsModal';
 import ModalAskParameters from '@/components/ModalAskParameters';
 import Functions from '@/ipc-api/Functions';
 
 export default {
-   name: 'WorkspacePropsTabFunction',
+   name: 'WorkspaceTabPropsFunction',
    components: {
       BaseLoader,
       QueryEditor,
-      // WorkspacePropsFunctionOptionsModal,
-      WorkspacePropsFunctionParamsModal,
+      // WorkspaceTabPropsFunctionOptionsModal,
+      WorkspaceTabPropsFunctionParamsModal,
       ModalAskParameters
    },
    props: {
diff --git a/src/renderer/components/WorkspacePropsFunctionParamsModal.vue b/src/renderer/components/WorkspaceTabPropsFunctionParamsModal.vue
similarity index 99%
rename from src/renderer/components/WorkspacePropsFunctionParamsModal.vue
rename to src/renderer/components/WorkspaceTabPropsFunctionParamsModal.vue
index a53b7fec..cd6fa7dd 100644
--- a/src/renderer/components/WorkspacePropsFunctionParamsModal.vue
+++ b/src/renderer/components/WorkspaceTabPropsFunctionParamsModal.vue
@@ -176,7 +176,7 @@ import { uidGen } from 'common/libs/uidGen';
 import ConfirmModal from '@/components/BaseConfirmModal';
 
 export default {
-   name: 'WorkspacePropsRoutineParamsModal',
+   name: 'WorkspaceTabPropsRoutineParamsModal',
    components: {
       ConfirmModal
    },
diff --git a/src/renderer/components/WorkspacePropsTabRoutine.vue b/src/renderer/components/WorkspaceTabPropsRoutine.vue
similarity index 97%
rename from src/renderer/components/WorkspacePropsTabRoutine.vue
rename to src/renderer/components/WorkspaceTabPropsRoutine.vue
index 76f38eda..295b2f5c 100644
--- a/src/renderer/components/WorkspacePropsTabRoutine.vue
+++ b/src/renderer/components/WorkspaceTabPropsRoutine.vue
@@ -164,14 +164,14 @@
             :height="editorHeight"
          />
       </div>
-      <!-- <WorkspacePropsRoutineOptionsModal
+      <!-- <WorkspaceTabPropsRoutineOptionsModal
          v-if="isOptionsModal"
          :local-options="localRoutine"
          :workspace="workspace"
          @hide="hideOptionsModal"
          @options-update="optionsUpdate"
       /> -->
-      <WorkspacePropsRoutineParamsModal
+      <WorkspaceTabPropsRoutineParamsModal
          v-if="isParamsModal"
          :local-parameters="localRoutine.parameters"
          :workspace="workspace"
@@ -194,18 +194,18 @@ import { mapGetters, mapActions } from 'vuex';
 import { uidGen } from 'common/libs/uidGen';
 import QueryEditor from '@/components/QueryEditor';
 import BaseLoader from '@/components/BaseLoader';
-// import WorkspacePropsRoutineOptionsModal from '@/components/WorkspacePropsRoutineOptionsModal';
-import WorkspacePropsRoutineParamsModal from '@/components/WorkspacePropsRoutineParamsModal';
+// import WorkspaceTabPropsRoutineOptionsModal from '@/components/WorkspaceTabPropsRoutineOptionsModal';
+import WorkspaceTabPropsRoutineParamsModal from '@/components/WorkspaceTabPropsRoutineParamsModal';
 import ModalAskParameters from '@/components/ModalAskParameters';
 import Routines from '@/ipc-api/Routines';
 
 export default {
-   name: 'WorkspacePropsTabRoutine',
+   name: 'WorkspaceTabPropsRoutine',
    components: {
       QueryEditor,
       BaseLoader,
-      // WorkspacePropsRoutineOptionsModal,
-      WorkspacePropsRoutineParamsModal,
+      // WorkspaceTabPropsRoutineOptionsModal,
+      WorkspaceTabPropsRoutineParamsModal,
       ModalAskParameters
    },
    props: {
diff --git a/src/renderer/components/WorkspacePropsRoutineParamsModal.vue b/src/renderer/components/WorkspaceTabPropsRoutineParamsModal.vue
similarity index 99%
rename from src/renderer/components/WorkspacePropsRoutineParamsModal.vue
rename to src/renderer/components/WorkspaceTabPropsRoutineParamsModal.vue
index 975ad3ea..5802511c 100644
--- a/src/renderer/components/WorkspacePropsRoutineParamsModal.vue
+++ b/src/renderer/components/WorkspaceTabPropsRoutineParamsModal.vue
@@ -176,7 +176,7 @@ import { uidGen } from 'common/libs/uidGen';
 import ConfirmModal from '@/components/BaseConfirmModal';
 
 export default {
-   name: 'WorkspacePropsRoutineParamsModal',
+   name: 'WorkspaceTabPropsRoutineParamsModal',
    components: {
       ConfirmModal
    },
diff --git a/src/renderer/components/WorkspacePropsTabScheduler.vue b/src/renderer/components/WorkspaceTabPropsScheduler.vue
similarity index 98%
rename from src/renderer/components/WorkspacePropsTabScheduler.vue
rename to src/renderer/components/WorkspaceTabPropsScheduler.vue
index 824a5463..d0207f0b 100644
--- a/src/renderer/components/WorkspacePropsTabScheduler.vue
+++ b/src/renderer/components/WorkspaceTabPropsScheduler.vue
@@ -130,7 +130,7 @@
             :height="editorHeight"
          />
       </div>
-      <WorkspacePropsSchedulerTimingModal
+      <WorkspaceTabPropsSchedulerTimingModal
          v-if="isTimingModal"
          :local-options="localScheduler"
          :workspace="workspace"
@@ -144,15 +144,15 @@
 import { mapGetters, mapActions } from 'vuex';
 import BaseLoader from '@/components/BaseLoader';
 import QueryEditor from '@/components/QueryEditor';
-import WorkspacePropsSchedulerTimingModal from '@/components/WorkspacePropsSchedulerTimingModal';
+import WorkspaceTabPropsSchedulerTimingModal from '@/components/WorkspaceTabPropsSchedulerTimingModal';
 import Schedulers from '@/ipc-api/Schedulers';
 
 export default {
-   name: 'WorkspacePropsTabScheduler',
+   name: 'WorkspaceTabPropsScheduler',
    components: {
       BaseLoader,
       QueryEditor,
-      WorkspacePropsSchedulerTimingModal
+      WorkspaceTabPropsSchedulerTimingModal
    },
    props: {
       connection: Object,
diff --git a/src/renderer/components/WorkspacePropsSchedulerTimingModal.vue b/src/renderer/components/WorkspaceTabPropsSchedulerTimingModal.vue
similarity index 99%
rename from src/renderer/components/WorkspacePropsSchedulerTimingModal.vue
rename to src/renderer/components/WorkspaceTabPropsSchedulerTimingModal.vue
index 0693b9d6..1b785bc9 100644
--- a/src/renderer/components/WorkspacePropsSchedulerTimingModal.vue
+++ b/src/renderer/components/WorkspaceTabPropsSchedulerTimingModal.vue
@@ -143,7 +143,7 @@ import { VueMaskDirective } from 'v-mask';
 import moment from 'moment';
 
 export default {
-   name: 'WorkspacePropsSchedulerTimingModal',
+   name: 'WorkspaceTabPropsSchedulerTimingModal',
    components: {
       ConfirmModal
    },
diff --git a/src/renderer/components/WorkspacePropsTab.vue b/src/renderer/components/WorkspaceTabPropsTable.vue
similarity index 97%
rename from src/renderer/components/WorkspacePropsTab.vue
rename to src/renderer/components/WorkspaceTabPropsTable.vue
index a7312fd4..84664708 100644
--- a/src/renderer/components/WorkspacePropsTab.vue
+++ b/src/renderer/components/WorkspaceTabPropsTable.vue
@@ -141,7 +141,7 @@
       </div>
       <div class="workspace-query-results column col-12 p-relative">
          <BaseLoader v-if="isLoading" />
-         <WorkspacePropsTable
+         <WorkspaceTabPropsTableFIelds
             v-if="localFields"
             ref="indexTable"
             :fields="localFields"
@@ -160,7 +160,7 @@
             @rename-field="renameField"
          />
       </div>
-      <!-- <WorkspacePropsOptionsModal
+      <!-- <WorkspaceTabPropsTableOptionsModal
          v-if="isOptionsModal"
          :local-options="localOptions"
          :table="table"
@@ -168,7 +168,7 @@
          @hide="hideOptionsModal"
          @options-update="optionsUpdate"
       /> -->
-      <WorkspacePropsIndexesModal
+      <WorkspaceTabPropsTableIndexesModal
          v-if="isIndexesModal"
          :local-indexes="localIndexes"
          :table="table"
@@ -178,7 +178,7 @@
          @hide="hideIndexesModal"
          @indexes-update="indexesUpdate"
       />
-      <WorkspacePropsForeignModal
+      <WorkspaceTabPropsTableForeignModal
          v-if="isForeignModal"
          :local-key-usage="localKeyUsage"
          :connection="connection"
@@ -198,19 +198,19 @@ import { mapGetters, mapActions } from 'vuex';
 import { uidGen } from 'common/libs/uidGen';
 import Tables from '@/ipc-api/Tables';
 import BaseLoader from '@/components/BaseLoader';
-import WorkspacePropsTable from '@/components/WorkspacePropsTable';
-// import WorkspacePropsOptionsModal from '@/components/WorkspacePropsOptionsModal';
-import WorkspacePropsIndexesModal from '@/components/WorkspacePropsIndexesModal';
-import WorkspacePropsForeignModal from '@/components/WorkspacePropsForeignModal';
+import WorkspaceTabPropsTableFIelds from '@/components/WorkspaceTabPropsTableFIelds';
+// import WorkspaceTabPropsTableOptionsModal from '@/components/WorkspaceTabPropsTableOptionsModal';
+import WorkspaceTabPropsTableIndexesModal from '@/components/WorkspaceTabPropsTableIndexesModal';
+import WorkspaceTabPropsTableForeignModal from '@/components/WorkspaceTabPropsTableForeignModal';
 
 export default {
-   name: 'WorkspacePropsTab',
+   name: 'WorkspaceTabPropsTable',
    components: {
       BaseLoader,
-      WorkspacePropsTable,
-      // WorkspacePropsOptionsModal,
-      WorkspacePropsIndexesModal,
-      WorkspacePropsForeignModal
+      WorkspaceTabPropsTableFIelds,
+      // WorkspaceTabPropsTableOptionsModal,
+      WorkspaceTabPropsTableIndexesModal,
+      WorkspaceTabPropsTableForeignModal
    },
    props: {
       connection: Object,
diff --git a/src/renderer/components/WorkspacePropsTableContext.vue b/src/renderer/components/WorkspaceTabPropsTableContext.vue
similarity index 98%
rename from src/renderer/components/WorkspacePropsTableContext.vue
rename to src/renderer/components/WorkspaceTabPropsTableContext.vue
index 0a9d32dc..3e8b2982 100644
--- a/src/renderer/components/WorkspacePropsTableContext.vue
+++ b/src/renderer/components/WorkspaceTabPropsTableContext.vue
@@ -46,7 +46,7 @@
 import BaseContextMenu from '@/components/BaseContextMenu';
 
 export default {
-   name: 'WorkspaceQueryTableContext',
+   name: 'WorkspaceTabQueryTableContext',
    components: {
       BaseContextMenu
    },
diff --git a/src/renderer/components/WorkspacePropsTable.vue b/src/renderer/components/WorkspaceTabPropsTableFIelds.vue
similarity index 97%
rename from src/renderer/components/WorkspacePropsTable.vue
rename to src/renderer/components/WorkspaceTabPropsTableFIelds.vue
index 2e8a7105..30a3a755 100644
--- a/src/renderer/components/WorkspacePropsTable.vue
+++ b/src/renderer/components/WorkspaceTabPropsTableFIelds.vue
@@ -126,11 +126,11 @@
 <script>
 import { mapActions, mapGetters } from 'vuex';
 import Draggable from 'vuedraggable';
-import TableRow from '@/components/WorkspacePropsTableRow';
-import TableContext from '@/components/WorkspacePropsTableContext';
+import TableRow from '@/components/WorkspaceTabPropsTableRow';
+import TableContext from '@/components/WorkspaceTabPropsTableContext';
 
 export default {
-   name: 'WorkspacePropsTable',
+   name: 'WorkspaceTabPropsTableFIelds',
    components: {
       TableRow,
       TableContext,
diff --git a/src/renderer/components/WorkspacePropsForeignModal.vue b/src/renderer/components/WorkspaceTabPropsTableForeignModal.vue
similarity index 99%
rename from src/renderer/components/WorkspacePropsForeignModal.vue
rename to src/renderer/components/WorkspaceTabPropsTableForeignModal.vue
index 762d3387..5dcdd8ed 100644
--- a/src/renderer/components/WorkspacePropsForeignModal.vue
+++ b/src/renderer/components/WorkspaceTabPropsTableForeignModal.vue
@@ -208,7 +208,7 @@ import Tables from '@/ipc-api/Tables';
 import ConfirmModal from '@/components/BaseConfirmModal';
 
 export default {
-   name: 'WorkspacePropsForeignModal',
+   name: 'WorkspaceTabPropsTableForeignModal',
    components: {
       ConfirmModal
    },
diff --git a/src/renderer/components/WorkspacePropsIndexesModal.vue b/src/renderer/components/WorkspaceTabPropsTableIndexesModal.vue
similarity index 99%
rename from src/renderer/components/WorkspacePropsIndexesModal.vue
rename to src/renderer/components/WorkspaceTabPropsTableIndexesModal.vue
index ee14b01e..4b520a98 100644
--- a/src/renderer/components/WorkspacePropsIndexesModal.vue
+++ b/src/renderer/components/WorkspaceTabPropsTableIndexesModal.vue
@@ -142,7 +142,7 @@ import { uidGen } from 'common/libs/uidGen';
 import ConfirmModal from '@/components/BaseConfirmModal';
 
 export default {
-   name: 'WorkspacePropsIndexesModal',
+   name: 'WorkspaceTabPropsTableIndexesModal',
    components: {
       ConfirmModal
    },
diff --git a/src/renderer/components/WorkspacePropsTableRow.vue b/src/renderer/components/WorkspaceTabPropsTableRow.vue
similarity index 99%
rename from src/renderer/components/WorkspacePropsTableRow.vue
rename to src/renderer/components/WorkspaceTabPropsTableRow.vue
index 65bd7465..af55643a 100644
--- a/src/renderer/components/WorkspacePropsTableRow.vue
+++ b/src/renderer/components/WorkspaceTabPropsTableRow.vue
@@ -334,7 +334,7 @@ import { mapGetters } from 'vuex';
 import ConfirmModal from '@/components/BaseConfirmModal';
 
 export default {
-   name: 'WorkspacePropsTableRow',
+   name: 'WorkspaceTabPropsTableRow',
    components: {
       ConfirmModal
    },
diff --git a/src/renderer/components/WorkspacePropsTabTrigger.vue b/src/renderer/components/WorkspaceTabPropsTrigger.vue
similarity index 99%
rename from src/renderer/components/WorkspacePropsTabTrigger.vue
rename to src/renderer/components/WorkspaceTabPropsTrigger.vue
index 976dffd9..cf3d5f21 100644
--- a/src/renderer/components/WorkspacePropsTabTrigger.vue
+++ b/src/renderer/components/WorkspaceTabPropsTrigger.vue
@@ -137,7 +137,7 @@ import BaseLoader from '@/components/BaseLoader';
 import Triggers from '@/ipc-api/Triggers';
 
 export default {
-   name: 'WorkspacePropsTabTrigger',
+   name: 'WorkspaceTabPropsTrigger',
    components: {
       BaseLoader,
       QueryEditor
diff --git a/src/renderer/components/WorkspacePropsTabTriggerFunction.vue b/src/renderer/components/WorkspaceTabPropsTriggerFunction.vue
similarity index 97%
rename from src/renderer/components/WorkspacePropsTabTriggerFunction.vue
rename to src/renderer/components/WorkspaceTabPropsTriggerFunction.vue
index f820d78f..ed29a8fc 100644
--- a/src/renderer/components/WorkspacePropsTabTriggerFunction.vue
+++ b/src/renderer/components/WorkspaceTabPropsTriggerFunction.vue
@@ -98,7 +98,7 @@
             :height="editorHeight"
          />
       </div>
-      <!-- <WorkspacePropsTriggerFunctionOptionsModal
+      <!-- <WorkspaceTabPropsTriggerFunctionOptionsModal
          v-if="isOptionsModal"
          :local-options="localFunction"
          :workspace="workspace"
@@ -120,16 +120,16 @@ import { mapGetters, mapActions } from 'vuex';
 import { uidGen } from 'common/libs/uidGen';
 import BaseLoader from '@/components/BaseLoader';
 import QueryEditor from '@/components/QueryEditor';
-// import WorkspacePropsTriggerFunctionOptionsModal from '@/components/WorkspacePropsTriggerFunctionOptionsModal';
+// import WorkspaceTabPropsTriggerFunctionOptionsModal from '@/components/WorkspaceTabPropsTriggerFunctionOptionsModal';
 import ModalAskParameters from '@/components/ModalAskParameters';
 import Functions from '@/ipc-api/Functions';
 
 export default {
-   name: 'WorkspacePropsTabTriggerFunction',
+   name: 'WorkspaceTabPropsTriggerFunction',
    components: {
       BaseLoader,
       QueryEditor,
-      // WorkspacePropsTriggerFunctionOptionsModal,
+      // WorkspaceTabPropsTriggerFunctionOptionsModal,
       ModalAskParameters
    },
    props: {
diff --git a/src/renderer/components/WorkspacePropsTabView.vue b/src/renderer/components/WorkspaceTabPropsView.vue
similarity index 99%
rename from src/renderer/components/WorkspacePropsTabView.vue
rename to src/renderer/components/WorkspaceTabPropsView.vue
index ecf12aec..a444a7c3 100644
--- a/src/renderer/components/WorkspacePropsTabView.vue
+++ b/src/renderer/components/WorkspaceTabPropsView.vue
@@ -184,7 +184,7 @@ import QueryEditor from '@/components/QueryEditor';
 import Views from '@/ipc-api/Views';
 
 export default {
-   name: 'WorkspacePropsTabView',
+   name: 'WorkspaceTabPropsView',
    components: {
       BaseLoader,
       QueryEditor
diff --git a/src/renderer/components/WorkspaceQueryTab.vue b/src/renderer/components/WorkspaceTabQuery.vue
similarity index 96%
rename from src/renderer/components/WorkspaceQueryTab.vue
rename to src/renderer/components/WorkspaceTabQuery.vue
index 0876d9a0..1fd576b3 100644
--- a/src/renderer/components/WorkspaceQueryTab.vue
+++ b/src/renderer/components/WorkspaceTabQuery.vue
@@ -100,10 +100,10 @@
             </div>
          </div>
       </div>
-      <WorkspaceQueryEmptyState v-if="!results.length && !isQuering" />
+      <WorkspaceTabQueryEmptyState v-if="!results.length && !isQuering" />
       <div class="workspace-query-results p-relative column col-12">
          <BaseLoader v-if="isQuering" />
-         <WorkspaceQueryTable
+         <WorkspaceTabQueryTable
             v-if="results"
             v-show="!isQuering"
             ref="queryTable"
@@ -124,18 +124,18 @@ import { format } from 'sql-formatter';
 import Schema from '@/ipc-api/Schema';
 import QueryEditor from '@/components/QueryEditor';
 import BaseLoader from '@/components/BaseLoader';
-import WorkspaceQueryTable from '@/components/WorkspaceQueryTable';
-import WorkspaceQueryEmptyState from '@/components/WorkspaceQueryEmptyState';
+import WorkspaceTabQueryTable from '@/components/WorkspaceTabQueryTable';
+import WorkspaceTabQueryEmptyState from '@/components/WorkspaceTabQueryEmptyState';
 import { mapGetters, mapActions } from 'vuex';
 import tableTabs from '@/mixins/tableTabs';
 
 export default {
-   name: 'WorkspaceQueryTab',
+   name: 'WorkspaceTabQuery',
    components: {
       BaseLoader,
       QueryEditor,
-      WorkspaceQueryTable,
-      WorkspaceQueryEmptyState
+      WorkspaceTabQueryTable,
+      WorkspaceTabQueryEmptyState
    },
    mixins: [tableTabs],
    props: {
diff --git a/src/renderer/components/WorkspaceQueryEmptyState.vue b/src/renderer/components/WorkspaceTabQueryEmptyState.vue
similarity index 95%
rename from src/renderer/components/WorkspaceQueryEmptyState.vue
rename to src/renderer/components/WorkspaceTabQueryEmptyState.vue
index 82e7789e..add31b6c 100644
--- a/src/renderer/components/WorkspaceQueryEmptyState.vue
+++ b/src/renderer/components/WorkspaceTabQueryEmptyState.vue
@@ -29,7 +29,7 @@
 
 <script>
 export default {
-   name: 'WorkspaceQueryEmptyState'
+   name: 'WorkspaceTabQueryEmptyState'
 };
 </script>
 
diff --git a/src/renderer/components/WorkspaceQueryTable.vue b/src/renderer/components/WorkspaceTabQueryTable.vue
similarity index 98%
rename from src/renderer/components/WorkspaceQueryTable.vue
rename to src/renderer/components/WorkspaceTabQueryTable.vue
index 3bf27780..dbeb2c0c 100644
--- a/src/renderer/components/WorkspaceQueryTable.vue
+++ b/src/renderer/components/WorkspaceTabQueryTable.vue
@@ -66,7 +66,7 @@
             :scroll-element="scrollElement"
          >
             <template slot-scope="{ items }">
-               <WorkspaceQueryTableRow
+               <WorkspaceTabQueryTableRow
                   v-for="row in items"
                   :key="row._id"
                   :row="row"
@@ -107,17 +107,17 @@ import { uidGen } from 'common/libs/uidGen';
 import arrayToFile from '../libs/arrayToFile';
 import { TEXT, LONG_TEXT, BLOB } from 'common/fieldTypes';
 import BaseVirtualScroll from '@/components/BaseVirtualScroll';
-import WorkspaceQueryTableRow from '@/components/WorkspaceQueryTableRow';
-import TableContext from '@/components/WorkspaceQueryTableContext';
+import WorkspaceTabQueryTableRow from '@/components/WorkspaceTabQueryTableRow';
+import TableContext from '@/components/WorkspaceTabQueryTableContext';
 import ConfirmModal from '@/components/BaseConfirmModal';
 import { mapActions, mapGetters } from 'vuex';
 import moment from 'moment';
 
 export default {
-   name: 'WorkspaceQueryTable',
+   name: 'WorkspaceTabQueryTable',
    components: {
       BaseVirtualScroll,
-      WorkspaceQueryTableRow,
+      WorkspaceTabQueryTableRow,
       TableContext,
       ConfirmModal
    },
diff --git a/src/renderer/components/WorkspaceQueryTableContext.vue b/src/renderer/components/WorkspaceTabQueryTableContext.vue
similarity index 98%
rename from src/renderer/components/WorkspaceQueryTableContext.vue
rename to src/renderer/components/WorkspaceTabQueryTableContext.vue
index 82e4a249..ba7e3f11 100644
--- a/src/renderer/components/WorkspaceQueryTableContext.vue
+++ b/src/renderer/components/WorkspaceTabQueryTableContext.vue
@@ -52,7 +52,7 @@
 import BaseContextMenu from '@/components/BaseContextMenu';
 
 export default {
-   name: 'WorkspaceQueryTableContext',
+   name: 'WorkspaceTabQueryTableContext',
    components: {
       BaseContextMenu
    },
diff --git a/src/renderer/components/WorkspaceQueryTableRow.vue b/src/renderer/components/WorkspaceTabQueryTableRow.vue
similarity index 99%
rename from src/renderer/components/WorkspaceQueryTableRow.vue
rename to src/renderer/components/WorkspaceTabQueryTableRow.vue
index 83fa4b4d..8110c598 100644
--- a/src/renderer/components/WorkspaceQueryTableRow.vue
+++ b/src/renderer/components/WorkspaceTabQueryTableRow.vue
@@ -200,7 +200,7 @@ import TextEditor from '@/components/BaseTextEditor';
 import ForeignKeySelect from '@/components/ForeignKeySelect';
 
 export default {
-   name: 'WorkspaceQueryTableRow',
+   name: 'WorkspaceTabQueryTableRow',
    components: {
       ConfirmModal,
       TextEditor,
diff --git a/src/renderer/components/WorkspaceTableTab.vue b/src/renderer/components/WorkspaceTabTable.vue
similarity index 98%
rename from src/renderer/components/WorkspaceTableTab.vue
rename to src/renderer/components/WorkspaceTabTable.vue
index cb4f0f9d..36ad9e31 100644
--- a/src/renderer/components/WorkspaceTableTab.vue
+++ b/src/renderer/components/WorkspaceTabTable.vue
@@ -123,7 +123,7 @@
       </div>
       <div class="workspace-query-results p-relative column col-12">
          <BaseLoader v-if="isQuering" />
-         <WorkspaceQueryTable
+         <WorkspaceTabQueryTable
             v-if="results"
             ref="queryTable"
             :results="results"
@@ -159,17 +159,17 @@
 <script>
 import Tables from '@/ipc-api/Tables';
 import BaseLoader from '@/components/BaseLoader';
-import WorkspaceQueryTable from '@/components/WorkspaceQueryTable';
+import WorkspaceTabQueryTable from '@/components/WorkspaceTabQueryTable';
 import ModalNewTableRow from '@/components/ModalNewTableRow';
 import ModalFakerRows from '@/components/ModalFakerRows';
 import { mapGetters, mapActions } from 'vuex';
 import tableTabs from '@/mixins/tableTabs';
 
 export default {
-   name: 'WorkspaceTableTab',
+   name: 'WorkspaceTabTable',
    components: {
       BaseLoader,
-      WorkspaceQueryTable,
+      WorkspaceTabQueryTable,
       ModalNewTableRow,
       ModalFakerRows
    },