diff --git a/http_src/vue/page-exporters.vue b/http_src/vue/page-exporters.vue
index 8564ca9259..5b76850cb9 100644
--- a/http_src/vue/page-exporters.vue
+++ b/http_src/vue/page-exporters.vue
@@ -154,9 +154,8 @@ const map_table_def_columns = (columns) => {
     let map_columns = {
         "ip": (value, row) => {
             let exporter_ip = value;
-            // Add interface name if defined
-            if (!dataUtils.isEmptyOrNull(row['interface_name'])) {
-                exporter_ip = `${exporter_ip} ${row['interface_name']}`;
+            if (!dataUtils.isEmptyOrNull(row['name'])) {
+                exporter_ip = `${row['name']}`;
             }
 
             let timeseries_link = ""
@@ -175,7 +174,12 @@ const map_table_def_columns = (columns) => {
             return `<a href="${exporter_interfaces_url}ip=${value}&exporter_uuid=${row.exporter_uuid}&probe_uuid=${row.probe_uuid}&probe_ip=${row.probe_ip}">${exporter_ip}</a>${host_link}${timeseries_link}`;
         },
         "probe_ip": (value, row) => {
-            return value;
+            let probe_ip = value;
+            if (!dataUtils.isEmptyOrNull(row['probe_name'])) {
+                probe_ip = `${row['probe_name']}`;
+            }
+
+            return probe_ip;
         },
         "name": (value, row) => {
             return value
diff --git a/http_src/vue/page-probes.vue b/http_src/vue/page-probes.vue
index 3c04051fa1..5923aa479e 100644
--- a/http_src/vue/page-probes.vue
+++ b/http_src/vue/page-probes.vue
@@ -36,6 +36,7 @@ import { default as Sankey } from "./sankey.vue";
 import { default as SelectSearch } from "./select-search.vue";
 import { default as sortingFunctions } from "../utilities/sorting-utils.js";
 import { default as TableWithConfig } from "./table-with-config.vue";
+import { default as dataUtils } from "../utilities/data-utils.js";
 import formatterUtils from "../utilities/formatter-utils";
 
 const props = defineProps({
@@ -145,11 +146,16 @@ const get_extra_params_obj = () => {
 const map_table_def_columns = (columns) => {
     let map_columns = {
         "probe_ip": (value, row) => {
+            let probe_ip = value;
+            if (!dataUtils.isEmptyOrNull(row['probe_name'])) {
+                probe_ip = `${row['probe_name']}`;
+            }
+
             let host_link = ""
             if (row.is_in_memory) {
                 host_link = ` <a href=${host_url}host=${value}> <i class="fas fa-laptop"></i></a>`
             }
-            return `<a href=${exporter_url}probe_uuid=${row.probe_uuid_num}>${value}</a>${host_link}`
+            return `<a href=${exporter_url}probe_uuid=${row.probe_uuid_num}>${probe_ip}</a>${host_link}`
         },
         "probe_public_ip": (value, row) => {
             return value
@@ -325,4 +331,4 @@ function columns_sorting(col, r0, r1) {
         }
     }
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/httpdocs/dist b/httpdocs/dist
index 1e1d45eab8..11fa7483bc 160000
--- a/httpdocs/dist
+++ b/httpdocs/dist
@@ -1 +1 @@
-Subproject commit 1e1d45eab88ba566b24873bf2c271c12f27a8871
+Subproject commit 11fa7483bc2fecf9a45f0353834ff28c73d2edf2
diff --git a/httpdocs/tables_config/probes.json b/httpdocs/tables_config/probes.json
index cee8d4e17c..9d972e0079 100644
--- a/httpdocs/tables_config/probes.json
+++ b/httpdocs/tables_config/probes.json
@@ -12,7 +12,7 @@
 	"columns": [
 		{
 			"id": "probe_ip",
-			"title_i18n": "if_stats_overview.probe_ip",
+			"title_i18n": "flow_devices.probe",
 			"data_field": "probe_ip",
 			"sortable": true,
 			"min-width": "80px",
diff --git a/scripts/lua/rest/v2/get/interface/nprobes/data.lua b/scripts/lua/rest/v2/get/interface/nprobes/data.lua
index 97eee345e3..838dbf9750 100644
--- a/scripts/lua/rest/v2/get/interface/nprobes/data.lua
+++ b/scripts/lua/rest/v2/get/interface/nprobes/data.lua
@@ -41,6 +41,8 @@ for interface_id, probes_list in pairs(ifstats.probes or {}) do
         local num_ports = 0
         local flow_exporters_num = table.len(probe_info.exporters)
         local is_probe_in_memory = false
+        local probe_ip = probe_info["probe.ip"]
+        local probe_name = getProbeName(probe_ip, true, true, false)  
 
         if probe_info["probe.mode"] == "packet_collection" then
             flow_exporters_num = 1 -- Packet exporter
@@ -66,14 +68,15 @@ for interface_id, probes_list in pairs(ifstats.probes or {}) do
             probe_interface = i18n("if_stats_overview.remote_probe_collector_mode")
         end
         
-        if interface.getHostInfo(probe_info["probe.ip"]) then
+        if interface.getHostInfo(probe_ip) then
             is_probe_in_memory = true
         end
 
         res[#res + 1] = {
             probe_interface = probe_interface,
             probe_version = probe_info["probe.probe_version"],
-            probe_ip = probe_info["probe.ip"],
+            probe_ip = probe_ip,
+            probe_name = probe_name,
             probe_uuid = probe_info["probe.uuid"],
             probe_uuid_num = probe_info["probe.uuid_num"],
             probe_public_ip = probe_info["probe.public_ip"],