diff --git a/application/src/main/data/json/demo/dashboards/firmware.json b/application/src/main/data/json/demo/dashboards/firmware.json
index cfd0ed68c4..779f2cb93c 100644
--- a/application/src/main/data/json/demo/dashboards/firmware.json
+++ b/application/src/main/data/json/demo/dashboards/firmware.json
@@ -33,15 +33,15 @@
             "enableSearch": true,
             "displayPagination": true,
             "defaultPageSize": 10,
-            "defaultSortOrder": "entityLabel",
-            "displayEntityName": false,
+            "defaultSortOrder": "entityName",
+            "displayEntityName": true,
             "displayEntityType": false,
             "enableSelectColumnDisplay": false,
             "enableStickyHeader": true,
             "enableStickyAction": false,
             "entitiesTitle": "Devices",
-            "displayEntityLabel": true,
-            "entityLabelColumnTitle": "Device"
+            "displayEntityLabel": false,
+            "entityNameColumnTitle": "Device"
           },
           "title": "New Entities table",
           "dropShadow": true,
@@ -828,15 +828,15 @@
             "enableSearch": true,
             "displayPagination": true,
             "defaultPageSize": 10,
-            "defaultSortOrder": "entityLabel",
-            "displayEntityName": false,
+            "defaultSortOrder": "entityName",
+            "displayEntityName": true,
             "displayEntityType": false,
             "enableSelectColumnDisplay": false,
             "enableStickyHeader": true,
             "enableStickyAction": true,
             "entitiesTitle": "Devices",
-            "displayEntityLabel": true,
-            "entityLabelColumnTitle": "Device"
+            "displayEntityLabel": false,
+            "entityNameColumnTitle": "Device"
           },
           "title": "New Entities table",
           "dropShadow": true,
@@ -1125,15 +1125,15 @@
             "enableSearch": true,
             "displayPagination": true,
             "defaultPageSize": 10,
-            "defaultSortOrder": "entityLabel",
-            "displayEntityName": false,
+            "defaultSortOrder": "entityName",
+            "displayEntityName": true,
             "displayEntityType": false,
             "enableSelectColumnDisplay": false,
             "enableStickyHeader": true,
             "enableStickyAction": true,
             "entitiesTitle": "Devices",
-            "displayEntityLabel": true,
-            "entityLabelColumnTitle": "Device"
+            "displayEntityLabel": false,
+            "entityNameColumnTitle": "Device"
           },
           "title": "New Entities table",
           "dropShadow": true,
@@ -1422,15 +1422,15 @@
             "enableSearch": true,
             "displayPagination": true,
             "defaultPageSize": 10,
-            "defaultSortOrder": "entityLabel",
-            "displayEntityName": false,
+            "defaultSortOrder": "entityName",
+            "displayEntityName": true,
             "displayEntityType": false,
             "enableSelectColumnDisplay": false,
             "enableStickyHeader": true,
             "enableStickyAction": true,
             "entitiesTitle": "Devices",
-            "displayEntityLabel": true,
-            "entityLabelColumnTitle": "Device"
+            "displayEntityLabel": false,
+            "entityNameColumnTitle": "Device"
           },
           "title": "New Entities table",
           "dropShadow": true,
@@ -1719,15 +1719,15 @@
             "enableSearch": true,
             "displayPagination": true,
             "defaultPageSize": 10,
-            "defaultSortOrder": "entityLabel",
-            "displayEntityName": false,
+            "defaultSortOrder": "entityName",
+            "displayEntityName": true,
             "displayEntityType": false,
             "enableSelectColumnDisplay": false,
             "enableStickyHeader": true,
             "enableStickyAction": true,
             "entitiesTitle": "Devices",
-            "displayEntityLabel": true,
-            "entityLabelColumnTitle": "Device"
+            "displayEntityLabel": false,
+            "entityNameColumnTitle": "Device"
           },
           "title": "New Entities table",
           "dropShadow": true,
diff --git a/application/src/main/data/json/demo/dashboards/software.json b/application/src/main/data/json/demo/dashboards/software.json
index 84316fa5fd..e9d7e9bbbd 100644
--- a/application/src/main/data/json/demo/dashboards/software.json
+++ b/application/src/main/data/json/demo/dashboards/software.json
@@ -33,15 +33,15 @@
             "enableSearch": true,
             "displayPagination": true,
             "defaultPageSize": 10,
-            "defaultSortOrder": "entityLabel",
-            "displayEntityName": false,
+            "defaultSortOrder": "entityName",
+            "displayEntityName": true,
             "displayEntityType": false,
             "enableSelectColumnDisplay": false,
             "enableStickyHeader": true,
             "enableStickyAction": false,
             "entitiesTitle": "Devices",
-            "displayEntityLabel": true,
-            "entityLabelColumnTitle": "Device"
+            "displayEntityLabel": false,
+            "entityNameColumnTitle": "Device"
           },
           "title": "New Entities table",
           "dropShadow": true,
@@ -828,15 +828,15 @@
             "enableSearch": true,
             "displayPagination": true,
             "defaultPageSize": 10,
-            "defaultSortOrder": "entityLabel",
-            "displayEntityName": false,
+            "defaultSortOrder": "entityName",
+            "displayEntityName": true,
             "displayEntityType": false,
             "enableSelectColumnDisplay": false,
             "enableStickyHeader": true,
             "enableStickyAction": true,
             "entitiesTitle": "Devices",
-            "displayEntityLabel": true,
-            "entityLabelColumnTitle": "Device"
+            "displayEntityLabel": false,
+            "entityNameColumnTitle": "Device"
           },
           "title": "New Entities table",
           "dropShadow": true,
@@ -1125,15 +1125,15 @@
             "enableSearch": true,
             "displayPagination": true,
             "defaultPageSize": 10,
-            "defaultSortOrder": "entityLabel",
-            "displayEntityName": false,
+            "defaultSortOrder": "entityName",
+            "displayEntityName": true,
             "displayEntityType": false,
             "enableSelectColumnDisplay": false,
             "enableStickyHeader": true,
             "enableStickyAction": true,
             "entitiesTitle": "Devices",
-            "displayEntityLabel": true,
-            "entityLabelColumnTitle": "Device"
+            "displayEntityLabel": false,
+            "entityNameColumnTitle": "Device"
           },
           "title": "New Entities table",
           "dropShadow": true,
@@ -1422,15 +1422,15 @@
             "enableSearch": true,
             "displayPagination": true,
             "defaultPageSize": 10,
-            "defaultSortOrder": "entityLabel",
-            "displayEntityName": false,
+            "defaultSortOrder": "entityName",
+            "displayEntityName": true,
             "displayEntityType": false,
             "enableSelectColumnDisplay": false,
             "enableStickyHeader": true,
             "enableStickyAction": true,
             "entitiesTitle": "Devices",
-            "displayEntityLabel": true,
-            "entityLabelColumnTitle": "Device"
+            "displayEntityLabel": false,
+            "entityNameColumnTitle": "Device"
           },
           "title": "New Entities table",
           "dropShadow": true,
@@ -1719,15 +1719,15 @@
             "enableSearch": true,
             "displayPagination": true,
             "defaultPageSize": 10,
-            "defaultSortOrder": "entityLabel",
-            "displayEntityName": false,
+            "defaultSortOrder": "entityName",
+            "displayEntityName": true,
             "displayEntityType": false,
             "enableSelectColumnDisplay": false,
             "enableStickyHeader": true,
             "enableStickyAction": true,
             "entitiesTitle": "Devices",
-            "displayEntityLabel": true,
-            "entityLabelColumnTitle": "Device"
+            "displayEntityLabel": false,
+            "entityNameColumnTitle": "Device"
           },
           "title": "New Entities table",
           "dropShadow": true,