diff --git a/scripts/locales/en.lua b/scripts/locales/en.lua
index 9cfc7dbb4461..bd04e5d9d448 100644
--- a/scripts/locales/en.lua
+++ b/scripts/locales/en.lua
@@ -126,7 +126,7 @@ local lang = {
     ["client_count"] = "Clients Contacts",
     ["client_fingerprint"] = "Client Fingerprint",
     ["client_fingerprint_type"] = "Type",
-    ["client_hash.hassh"] = "HASSH Client Fingerprint",
+    ["hassh_client_hash"] = "HASSH Client Fingerprint",
     ["client_name"] = "Client Name",
     ["client_requested_server_name"] = "Requested Server Name",
     ["client_server"] = "Client / Server",
@@ -633,7 +633,7 @@ local lang = {
     ["serial"] = "Serial",
     ["server"] = "Server",
     ["server_count"] = "Contacted Servers",
-    ["server_hash.hassh"] = "HASSH Server Fingerprint",
+    ["hassh_server_hash"] = "HASSH Server Fingerprint",
     ["server_name"] = "Server Name",
     ["server_names"] = "Server Names",
     ["server_ports_analysis"] = "Server Ports Analysis",
diff --git a/scripts/lua/modules/lua_utils_gui.lua b/scripts/lua/modules/lua_utils_gui.lua
index 3a8458467359..fc35acc31e4e 100644
--- a/scripts/lua/modules/lua_utils_gui.lua
+++ b/scripts/lua/modules/lua_utils_gui.lua
@@ -1213,14 +1213,14 @@ function format_ssh_info(ssh_info)
     if not isEmptyString(ssh_info["client_signature"]) then
         formatted_ssh_info["client_signature"] = string.format('<span>%s</span>', ssh_info["client_signature"])
     end
-    if not isEmptyString(ssh_info["client_hash.hassh"]) then
-        formatted_ssh_info["client_hash.hassh"] = string.format('<span>%s</span>', ssh_info["client_hash.hassh"])
+    if not isEmptyString(ssh_info["hassh_client_hash"]) then
+        formatted_ssh_info["hassh_client_hash"] = string.format('<span>%s</span>', ssh_info["hassh_client_hash"])
     end
     if not isEmptyString(ssh_info["server_signature"]) then
         formatted_ssh_info["server_signature"] = string.format('<span>%s</span>', ssh_info["server_signature"])
     end
-    if not isEmptyString(ssh_info["server_hash.hassh"]) then
-        formatted_ssh_info["server_hash.hassh"] = string.format('<span>%s</span>', ssh_info["server_hash.hassh"])
+    if not isEmptyString(ssh_info["hassh_server_hash"]) then
+        formatted_ssh_info["hassh_server_hash"] = string.format('<span>%s</span>', ssh_info["hassh_server_hash"])
     end
 
     return formatted_ssh_info
diff --git a/src/Flow.cpp b/src/Flow.cpp
index 482d143eed2b..d3ce9dfc1876 100644
--- a/src/Flow.cpp
+++ b/src/Flow.cpp
@@ -7667,10 +7667,10 @@ void Flow::getSSHInfo(ndpi_serializer *serializer) const {
                                    protos.ssh.server_signature);
 
     if (protos.ssh.hassh.client_hash)
-      ndpi_serialize_string_string(serializer, "client_hash.hassh",
+      ndpi_serialize_string_string(serializer, "hassh_client_hash",
                                    protos.ssh.hassh.client_hash);
     if (protos.ssh.hassh.server_hash)
-      ndpi_serialize_string_string(serializer, "server_hash.hassh",
+      ndpi_serialize_string_string(serializer, "hassh_server_hash",
                                    protos.ssh.hassh.server_hash);
   }
 }