diff --git a/src/views/Overview/OverviewDumps.vue b/src/views/Overview/OverviewDumps.vue
index 6fe5996..35ab567 100644
--- a/src/views/Overview/OverviewDumps.vue
+++ b/src/views/Overview/OverviewDumps.vue
@@ -11,7 +11,7 @@
       <b-col sm="6">
         <dl>
           <dt>{{ $t('pageOverview.total') }}</dt>
-          <dd class="h3">{{ tableFormatter(dumps.length) }}</dd>
+          <dd class="h3">{{ dataFormatter(dumps.length) }}</dd>
         </dl>
       </b-col>
     </b-row>
@@ -20,14 +20,14 @@
 
 <script>
 import OverviewCard from './OverviewCard';
-import TableDataFormatterMixin from '@/components/Mixins/TableDataFormatterMixin';
+import DataFormatterMixin from '@/components/Mixins/DataFormatterMixin';
 
 export default {
   name: 'Dumps',
   components: {
     OverviewCard,
   },
-  mixins: [TableDataFormatterMixin],
+  mixins: [DataFormatterMixin],
   computed: {
     dumps() {
       return this.$store.getters['dumps/bmcDumps'];
diff --git a/src/views/Overview/OverviewEvents.vue b/src/views/Overview/OverviewEvents.vue
index 84eadd1..b73c0b4 100644
--- a/src/views/Overview/OverviewEvents.vue
+++ b/src/views/Overview/OverviewEvents.vue
@@ -12,7 +12,7 @@
         <dl>
           <dt>{{ $t('pageOverview.criticalEvents') }}</dt>
           <dd class="h3">
-            {{ tableFormatter(criticalEvents.length) }}
+            {{ dataFormatter(criticalEvents.length) }}
             <status-icon status="danger" />
           </dd>
         </dl>
@@ -21,7 +21,7 @@
         <dl>
           <dt>{{ $t('pageOverview.warningEvents') }}</dt>
           <dd class="h3">
-            {{ tableFormatter(warningEvents.length) }}
+            {{ dataFormatter(warningEvents.length) }}
             <status-icon status="warning" />
           </dd>
         </dl>
@@ -33,12 +33,12 @@
 <script>
 import OverviewCard from './OverviewCard';
 import StatusIcon from '@/components/Global/StatusIcon';
-import TableDataFormatterMixin from '@/components/Mixins/TableDataFormatterMixin';
+import DataFormatterMixin from '@/components/Mixins/DataFormatterMixin';
 
 export default {
   name: 'Events',
   components: { OverviewCard, StatusIcon },
-  mixins: [TableDataFormatterMixin],
+  mixins: [DataFormatterMixin],
   computed: {
     eventLogData() {
       return this.$store.getters['eventLog/allEvents'];
diff --git a/src/views/Overview/OverviewFirmware.vue b/src/views/Overview/OverviewFirmware.vue
index ec9dfff..f1f9ce5 100644
--- a/src/views/Overview/OverviewFirmware.vue
+++ b/src/views/Overview/OverviewFirmware.vue
@@ -7,9 +7,9 @@
       <b-col>
         <dl>
           <dt>{{ $t('pageOverview.runningVersion') }}</dt>
-          <dd>{{ tableFormatter(runningVersion) }}</dd>
+          <dd>{{ dataFormatter(runningVersion) }}</dd>
           <dt>{{ $t('pageOverview.backupVersion') }}</dt>
-          <dd>{{ tableFormatter(backupVersion) }}</dd>
+          <dd>{{ dataFormatter(backupVersion) }}</dd>
         </dl>
       </b-col>
     </b-row>
@@ -18,14 +18,14 @@
 
 <script>
 import OverviewCard from './OverviewCard';
-import TableDataFormatterMixin from '@/components/Mixins/TableDataFormatterMixin';
+import DataFormatterMixin from '@/components/Mixins/DataFormatterMixin';
 
 export default {
   name: 'Firmware',
   components: {
     OverviewCard,
   },
-  mixins: [TableDataFormatterMixin],
+  mixins: [DataFormatterMixin],
   computed: {
     backupBmcFirmware() {
       return this.$store.getters['firmware/backupBmcFirmware'];
diff --git a/src/views/Overview/OverviewNetwork.vue b/src/views/Overview/OverviewNetwork.vue
index fbb81c6..1c1001e 100644
--- a/src/views/Overview/OverviewNetwork.vue
+++ b/src/views/Overview/OverviewNetwork.vue
@@ -7,14 +7,14 @@
       <b-col sm="6">
         <dl>
           <dt>{{ $t('pageOverview.hostname') }}</dt>
-          <dd>{{ tableFormatter(hostname) }}</dd>
+          <dd>{{ dataFormatter(hostname) }}</dd>
         </dl>
       </b-col>
       <b-col sm="6">
         <dl>
           <dt>{{ $t('pageOverview.linkStatus') }}</dt>
           <dd>
-            {{ tableFormatter(linkStatus) }}
+            {{ dataFormatter(linkStatus) }}
           </dd>
         </dl>
       </b-col>
@@ -24,7 +24,7 @@
         <dl>
           <dt>{{ $t('pageOverview.ipv4') }}</dt>
           <dd>
-            {{ tableFormatter(ipStaticAddress) }}
+            {{ dataFormatter(ipStaticAddress) }}
           </dd>
         </dl>
       </b-col>
@@ -32,7 +32,7 @@
         <dl>
           <dt>{{ $t('pageOverview.dhcp') }}</dt>
           <dd>
-            {{ tableFormatter(ipDhcpAddress) }}
+            {{ dataFormatter(ipDhcpAddress) }}
           </dd>
         </dl>
       </b-col>
@@ -42,7 +42,7 @@
 
 <script>
 import OverviewCard from './OverviewCard';
-import TableDataFormatterMixin from '@/components/Mixins/TableDataFormatterMixin';
+import DataFormatterMixin from '@/components/Mixins/DataFormatterMixin';
 import { mapState } from 'vuex';
 
 export default {
@@ -50,7 +50,7 @@
   components: {
     OverviewCard,
   },
-  mixins: [TableDataFormatterMixin],
+  mixins: [DataFormatterMixin],
   data() {
     return {
       ipDhcpAddress: '',
diff --git a/src/views/Overview/OverviewPower.vue b/src/views/Overview/OverviewPower.vue
index a8a630a..a3bd194 100644
--- a/src/views/Overview/OverviewPower.vue
+++ b/src/views/Overview/OverviewPower.vue
@@ -21,9 +21,9 @@
       <b-col>
         <dl>
           <dt>{{ $t('pageOverview.idlePower') }}</dt>
-          <dd>{{ tableFormatter(idlePower) }}</dd>
+          <dd>{{ dataFormatter(idlePower) }}</dd>
           <dt>{{ $t('pageOverview.powerMode') }}</dt>
-          <dd>{{ tableFormatter(powerMode) }}</dd>
+          <dd>{{ dataFormatter(powerMode) }}</dd>
         </dl>
       </b-col>
     </b-row>
@@ -32,7 +32,7 @@
 
 <script>
 import OverviewCard from './OverviewCard';
-import TableDataFormatterMixin from '@/components/Mixins/TableDataFormatterMixin';
+import DataFormatterMixin from '@/components/Mixins/DataFormatterMixin';
 import { mapGetters } from 'vuex';
 
 export default {
@@ -40,7 +40,7 @@
   components: {
     OverviewCard,
   },
-  mixins: [TableDataFormatterMixin],
+  mixins: [DataFormatterMixin],
   computed: {
     ...mapGetters({
       powerCapValue: 'powerControl/powerCapValue',
diff --git a/src/views/Overview/OverviewServer.vue b/src/views/Overview/OverviewServer.vue
index 6d1d430..d066d39 100644
--- a/src/views/Overview/OverviewServer.vue
+++ b/src/views/Overview/OverviewServer.vue
@@ -7,9 +7,9 @@
       <b-col lg="6">
         <dl>
           <dt>{{ $t('pageOverview.model') }}</dt>
-          <dd>{{ tableFormatter(serverModel) }}</dd>
+          <dd>{{ dataFormatter(serverModel) }}</dd>
           <dt>{{ $t('pageOverview.serialNumber') }}</dt>
-          <dd>{{ tableFormatter(serverSerialNumber) }}</dd>
+          <dd>{{ dataFormatter(serverSerialNumber) }}</dd>
         </dl>
       </b-col>
     </b-row>
@@ -18,7 +18,7 @@
 
 <script>
 import OverviewCard from './OverviewCard';
-import TableDataFormatterMixin from '@/components/Mixins/TableDataFormatterMixin';
+import DataFormatterMixin from '@/components/Mixins/DataFormatterMixin';
 import { mapState } from 'vuex';
 
 export default {
@@ -26,7 +26,7 @@
   components: {
     OverviewCard,
   },
-  mixins: [TableDataFormatterMixin],
+  mixins: [DataFormatterMixin],
   computed: {
     ...mapState({
       server: (state) => state.system.systems[0],