diff --git a/salt/elasticsearch/files/ingest/zeek.opcua b/salt/elasticsearch/files/ingest/zeek.opcua_binary
similarity index 98%
rename from salt/elasticsearch/files/ingest/zeek.opcua
rename to salt/elasticsearch/files/ingest/zeek.opcua_binary
index 78e44c47c..1dbffabc8 100644
--- a/salt/elasticsearch/files/ingest/zeek.opcua
+++ b/salt/elasticsearch/files/ingest/zeek.opcua_binary
@@ -1,5 +1,5 @@
 {
-  "description" : "zeek.opcua",
+  "description" : "zeek.opcua_binary",
   "processors" : [
     { "remove":   { "field": ["host"],                                                                                      "ignore_failure": true } },
     { "json":     { "field": "message",			          "target_field": "message2",		                    "ignore_failure": true} },
diff --git a/salt/elasticsearch/files/ingest/zeek.opcua_activate_session b/salt/elasticsearch/files/ingest/zeek.opcua_binary_activate_session
similarity index 97%
rename from salt/elasticsearch/files/ingest/zeek.opcua_activate_session
rename to salt/elasticsearch/files/ingest/zeek.opcua_binary_activate_session
index 466e34236..c4bfeeed1 100644
--- a/salt/elasticsearch/files/ingest/zeek.opcua_activate_session
+++ b/salt/elasticsearch/files/ingest/zeek.opcua_binary_activate_session
@@ -1,5 +1,5 @@
 {
-  "description" : "zeek.opcua.activate_session",
+  "description" : "zeek.opcua_binary_activate_session",
   "processors" : [
     { "remove":   { "field": ["host"],                                                                                  "ignore_failure": true } },
     { "json":     { "field": "message",			               "target_field": "message2",		        "ignore_failure": true} },
diff --git a/salt/elasticsearch/files/ingest/zeek.opcua_activate_session_client_software_cert b/salt/elasticsearch/files/ingest/zeek.opcua_binary_activate_session_client_software_cert
similarity index 91%
rename from salt/elasticsearch/files/ingest/zeek.opcua_activate_session_client_software_cert
rename to salt/elasticsearch/files/ingest/zeek.opcua_binary_activate_session_client_software_cert
index 2f2bb1196..612144c6e 100644
--- a/salt/elasticsearch/files/ingest/zeek.opcua_activate_session_client_software_cert
+++ b/salt/elasticsearch/files/ingest/zeek.opcua_binary_activate_session_client_software_cert
@@ -1,5 +1,5 @@
 {
-  "description" : "zeek.opcua.activate_session_client_software_cert",
+  "description" : "zeek.opcua_binary_activate_session_client_software_cert",
   "processors" : [
     { "remove":   { "field": ["host"],                                                                                  "ignore_failure": true } },
     { "json":     { "field": "message",			               "target_field": "message2",		        "ignore_failure": true} },
diff --git a/salt/elasticsearch/files/ingest/zeek.opcua_activate_session_diagnostic_info b/salt/elasticsearch/files/ingest/zeek.opcua_binary_activate_session_diagnostic_info
similarity index 90%
rename from salt/elasticsearch/files/ingest/zeek.opcua_activate_session_diagnostic_info
rename to salt/elasticsearch/files/ingest/zeek.opcua_binary_activate_session_diagnostic_info
index 86c4b5eb7..bd1266d39 100644
--- a/salt/elasticsearch/files/ingest/zeek.opcua_activate_session_diagnostic_info
+++ b/salt/elasticsearch/files/ingest/zeek.opcua_binary_activate_session_diagnostic_info
@@ -1,5 +1,5 @@
 {
-  "description" : "zeek.opcua.activate_session_diagnostic_info",
+  "description" : "zeek.opcua_binary_activate_session_diagnostic_info",
   "processors" : [
     { "remove":   { "field": ["host"],                                                                                  "ignore_failure": true } },
     { "json":     { "field": "message",			               "target_field": "message2",		        "ignore_failure": true} },
diff --git a/salt/elasticsearch/files/ingest/zeek.opcua_activate_session_locale_id b/salt/elasticsearch/files/ingest/zeek.opcua_binary_activate_session_locale_id
similarity index 90%
rename from salt/elasticsearch/files/ingest/zeek.opcua_activate_session_locale_id
rename to salt/elasticsearch/files/ingest/zeek.opcua_binary_activate_session_locale_id
index 42674c864..83469ef53 100644
--- a/salt/elasticsearch/files/ingest/zeek.opcua_activate_session_locale_id
+++ b/salt/elasticsearch/files/ingest/zeek.opcua_binary_activate_session_locale_id
@@ -1,5 +1,5 @@
 {
-  "description" : "zeek.opcua.activate_session_locale_id",
+  "description" : "zeek.opcua_binary_activate_session_locale_id",
   "processors" : [
     { "remove":   { "field": ["host"],                                                                                  "ignore_failure": true } },
     { "json":     { "field": "message",			               "target_field": "message2",		        "ignore_failure": true} },
diff --git a/salt/elasticsearch/files/ingest/zeek.opcua_browse b/salt/elasticsearch/files/ingest/zeek.opcua_binary_browse
similarity index 97%
rename from salt/elasticsearch/files/ingest/zeek.opcua_browse
rename to salt/elasticsearch/files/ingest/zeek.opcua_binary_browse
index 80cd86fd5..b9a5c1de6 100644
--- a/salt/elasticsearch/files/ingest/zeek.opcua_browse
+++ b/salt/elasticsearch/files/ingest/zeek.opcua_binary_browse
@@ -1,5 +1,5 @@
 {
-  "description" : "zeek.opcua.browse",
+  "description" : "zeek.opcua_binary_browse",
   "processors" : [
     { "remove":   { "field": ["host"],                                                                                          "ignore_failure": true } },
     { "json":     { "field": "message",			             "target_field": "message2",		                "ignore_failure": true} },
diff --git a/salt/elasticsearch/files/ingest/zeek.opcua_browse_description b/salt/elasticsearch/files/ingest/zeek.opcua_binary_browse_description
similarity index 96%
rename from salt/elasticsearch/files/ingest/zeek.opcua_browse_description
rename to salt/elasticsearch/files/ingest/zeek.opcua_binary_browse_description
index 56d6ac655..0065856d4 100644
--- a/salt/elasticsearch/files/ingest/zeek.opcua_browse_description
+++ b/salt/elasticsearch/files/ingest/zeek.opcua_binary_browse_description
@@ -1,5 +1,5 @@
 {
-  "description" : "zeek.opcua.browse_description",
+  "description" : "zeek.opcua_binary_browse_description",
   "processors" : [
     { "remove":   { "field": ["host"],                                                                                                "ignore_failure": true } },
     { "json":     { "field": "message",			             "target_field": "message2",		                      "ignore_failure": true } },
diff --git a/salt/elasticsearch/files/ingest/zeek.opcua_browse_response_references b/salt/elasticsearch/files/ingest/zeek.opcua_binary_browse_response_references
similarity index 97%
rename from salt/elasticsearch/files/ingest/zeek.opcua_browse_response_references
rename to salt/elasticsearch/files/ingest/zeek.opcua_binary_browse_response_references
index 07cec4813..6191020a7 100644
--- a/salt/elasticsearch/files/ingest/zeek.opcua_browse_response_references
+++ b/salt/elasticsearch/files/ingest/zeek.opcua_binary_browse_response_references
@@ -1,5 +1,5 @@
 {
-  "description" : "zeek.opcua_browse_response_references",
+  "description" : "zeek.opcua_binary_browse_response_references",
   "processors" : [
     { "remove":   { "field": ["host"],                                                                                      "ignore_failure": true } },
     { "json":     { "field": "message",			                        "target_field": "message2",		                    "ignore_failure": true} },
diff --git a/salt/elasticsearch/files/ingest/zeek.opcua_browse_result b/salt/elasticsearch/files/ingest/zeek.opcua_binary_browse_result
similarity index 94%
rename from salt/elasticsearch/files/ingest/zeek.opcua_browse_result
rename to salt/elasticsearch/files/ingest/zeek.opcua_binary_browse_result
index 7b29284f9..8c0bff894 100644
--- a/salt/elasticsearch/files/ingest/zeek.opcua_browse_result
+++ b/salt/elasticsearch/files/ingest/zeek.opcua_binary_browse_result
@@ -1,5 +1,5 @@
 {
-  "description" : "zeek.opcua_browse_result",
+  "description" : "zeek.opcua_binary_browse_result",
   "processors" : [
     { "remove":   { "field": ["host"],                                                                                                      "ignore_failure": true } },
     { "json":     { "field": "message",			                        "target_field": "message2",		                    "ignore_failure": true} },
diff --git a/salt/elasticsearch/files/ingest/zeek.opcua_create_session b/salt/elasticsearch/files/ingest/zeek.opcua_binary_create_session
similarity index 97%
rename from salt/elasticsearch/files/ingest/zeek.opcua_create_session
rename to salt/elasticsearch/files/ingest/zeek.opcua_binary_create_session
index 637e5a7bb..26c9c4f74 100644
--- a/salt/elasticsearch/files/ingest/zeek.opcua_create_session
+++ b/salt/elasticsearch/files/ingest/zeek.opcua_binary_create_session
@@ -1,5 +1,5 @@
 {
-  "description" : "zeek.opcua_create_session",
+  "description" : "zeek.opcua_binary_create_session",
   "processors" : [
     { "remove":   { "field": ["host"],                                                                                      "ignore_failure": true } },
     { "json":     { "field": "message",			            "target_field": "message2",		                    "ignore_failure": true} },
diff --git a/salt/elasticsearch/files/ingest/zeek.opcua_create_session_endpoints b/salt/elasticsearch/files/ingest/zeek.opcua_binary_create_session_endpoints
similarity index 98%
rename from salt/elasticsearch/files/ingest/zeek.opcua_create_session_endpoints
rename to salt/elasticsearch/files/ingest/zeek.opcua_binary_create_session_endpoints
index 2bee814b6..d62d92ea3 100644
--- a/salt/elasticsearch/files/ingest/zeek.opcua_create_session_endpoints
+++ b/salt/elasticsearch/files/ingest/zeek.opcua_binary_create_session_endpoints
@@ -1,5 +1,5 @@
 {
-  "description" : "zeek.opcua",
+  "description" : "zeek.opcua_binary",
   "processors" : [
     { "remove":   { "field": ["host"],                                                                                      "ignore_failure": true } },
     { "json":     { "field": "message",                           "target_field": "message2",                               "ignore_failure": true} },
diff --git a/salt/elasticsearch/files/ingest/zeek.opcua_create_session_user_token b/salt/elasticsearch/files/ingest/zeek.opcua_binary_create_session_user_token
similarity index 92%
rename from salt/elasticsearch/files/ingest/zeek.opcua_create_session_user_token
rename to salt/elasticsearch/files/ingest/zeek.opcua_binary_create_session_user_token
index ef621a5ff..45f0b8f43 100644
--- a/salt/elasticsearch/files/ingest/zeek.opcua_create_session_user_token
+++ b/salt/elasticsearch/files/ingest/zeek.opcua_binary_create_session_user_token
@@ -1,5 +1,5 @@
 {
-  "description" : "zeek.opcua_create_session_user_token",
+  "description" : "zeek.opcua_binary_create_session_user_token",
   "processors" : [
     { "remove":   { "field": ["host"],                                                                                      "ignore_failure": true } },
     { "json":     { "field": "message",			          "target_field": "message2",		                    "ignore_failure": true} },
diff --git a/salt/elasticsearch/files/ingest/zeek.opcua_create_subscription b/salt/elasticsearch/files/ingest/zeek.opcua_binary_create_subscription
similarity index 96%
rename from salt/elasticsearch/files/ingest/zeek.opcua_create_subscription
rename to salt/elasticsearch/files/ingest/zeek.opcua_binary_create_subscription
index 372e6b4fd..4087d7636 100644
--- a/salt/elasticsearch/files/ingest/zeek.opcua_create_subscription
+++ b/salt/elasticsearch/files/ingest/zeek.opcua_binary_create_subscription
@@ -1,5 +1,5 @@
 {
-  "description" : "zeek.opcua_create_subscription",
+  "description" : "zeek.opcua_binary_create_subscription",
   "processors" : [
     { "remove":   { "field": ["host"],                                                                                              "ignore_failure": true } },
     { "json":     { "field": "message",			                 "target_field": "message2",		                    "ignore_failure": true} },
diff --git a/salt/elasticsearch/files/ingest/zeek.opcua_get_endpoints b/salt/elasticsearch/files/ingest/zeek.opcua_binary_get_endpoints
similarity index 92%
rename from salt/elasticsearch/files/ingest/zeek.opcua_get_endpoints
rename to salt/elasticsearch/files/ingest/zeek.opcua_binary_get_endpoints
index a7b2b2f85..2b80c97a8 100644
--- a/salt/elasticsearch/files/ingest/zeek.opcua_get_endpoints
+++ b/salt/elasticsearch/files/ingest/zeek.opcua_binary_get_endpoints
@@ -1,5 +1,5 @@
 {
-  "description" : "zeek.opcua_get_endpoints",
+  "description" : "zeek.opcua_binary_get_endpoints",
   "processors" : [
     { "remove":   { "field": ["host"],                                                                                      "ignore_failure": true } },
     { "json":     { "field": "message",			          "target_field": "message2",		                    "ignore_failure": true} },
diff --git a/salt/elasticsearch/files/ingest/zeek.opcua_get_endpoints_description b/salt/elasticsearch/files/ingest/zeek.opcua_binary_get_endpoints_description
similarity index 97%
rename from salt/elasticsearch/files/ingest/zeek.opcua_get_endpoints_description
rename to salt/elasticsearch/files/ingest/zeek.opcua_binary_get_endpoints_description
index c84a9f16a..876b050a3 100644
--- a/salt/elasticsearch/files/ingest/zeek.opcua_get_endpoints_description
+++ b/salt/elasticsearch/files/ingest/zeek.opcua_binary_get_endpoints_description
@@ -1,5 +1,5 @@
 {
-  "description" : "zeek.opcua_get_endpoints_description",
+  "description" : "zeek.opcua_binary_get_endpoints_description",
   "processors" : [
     { "remove":   { "field": ["host"],                                                                                      "ignore_failure": true } },
     { "json":     { "field": "message",                               "target_field": "message2",                               "ignore_failure": true} },
diff --git a/salt/elasticsearch/files/ingest/zeek.opcua_get_endpoints_user_token b/salt/elasticsearch/files/ingest/zeek.opcua_binary_get_endpoints_user_token
similarity index 93%
rename from salt/elasticsearch/files/ingest/zeek.opcua_get_endpoints_user_token
rename to salt/elasticsearch/files/ingest/zeek.opcua_binary_get_endpoints_user_token
index 854c35cf0..539225b60 100644
--- a/salt/elasticsearch/files/ingest/zeek.opcua_get_endpoints_user_token
+++ b/salt/elasticsearch/files/ingest/zeek.opcua_binary_get_endpoints_user_token
@@ -1,5 +1,5 @@
 {
-  "description" : "zeek.opcua_get_endpoints_user_token",
+  "description" : "zeek.opcua_binary_get_endpoints_user_token",
   "processors" : [
     { "remove":   { "field": ["host"],                                                                                                         "ignore_failure": true } },
     { "json":     { "field": "message",			                 "target_field": "message2",		                               "ignore_failure": true} },
diff --git a/salt/elasticsearch/files/ingest/zeek.opcua_opensecure_channel b/salt/elasticsearch/files/ingest/zeek.opcua_binary_opensecure_channel
similarity index 96%
rename from salt/elasticsearch/files/ingest/zeek.opcua_opensecure_channel
rename to salt/elasticsearch/files/ingest/zeek.opcua_binary_opensecure_channel
index 4e8fb483a..e6baef81e 100644
--- a/salt/elasticsearch/files/ingest/zeek.opcua_opensecure_channel
+++ b/salt/elasticsearch/files/ingest/zeek.opcua_binary_opensecure_channel
@@ -1,5 +1,5 @@
 {
-  "description" : "zeek.opcua_opensecure_channel",
+  "description" : "zeek.opcua_binary_opensecure_channel",
   "processors" : [
     { "remove":   { "field": ["host"],                                                                                                 "ignore_failure": true } },
     { "json":     { "field": "message",			                "target_field": "message2",                                    "ignore_failure": true} },
diff --git a/salt/elasticsearch/files/ingest/zeek.opcua_read b/salt/elasticsearch/files/ingest/zeek.opcua_binary_read
similarity index 93%
rename from salt/elasticsearch/files/ingest/zeek.opcua_read
rename to salt/elasticsearch/files/ingest/zeek.opcua_binary_read
index e5d1c15fe..8d951e8d5 100644
--- a/salt/elasticsearch/files/ingest/zeek.opcua_read
+++ b/salt/elasticsearch/files/ingest/zeek.opcua_binary_read
@@ -1,5 +1,5 @@
 {
-  "description" : "zeek.opcua_read",
+  "description" : "zeek.opcua_binary_read",
   "processors" : [
     { "remove":   { "field": ["host"],                                                                                          "ignore_failure": true } },
     { "json":     { "field": "message",			             "target_field": "message2",		                "ignore_failure": true} },
diff --git a/salt/elasticsearch/files/ingest/zeek.opcua_read_nodes_to_read b/salt/elasticsearch/files/ingest/zeek.opcua_binary_read_nodes_to_read
similarity index 96%
rename from salt/elasticsearch/files/ingest/zeek.opcua_read_nodes_to_read
rename to salt/elasticsearch/files/ingest/zeek.opcua_binary_read_nodes_to_read
index a531531ef..c601a5dff 100644
--- a/salt/elasticsearch/files/ingest/zeek.opcua_read_nodes_to_read
+++ b/salt/elasticsearch/files/ingest/zeek.opcua_binary_read_nodes_to_read
@@ -1,5 +1,5 @@
 {
-  "description" : "zeek.opcua_read_nodes_to_read",
+  "description" : "zeek.opcua_binary_read_nodes_to_read",
   "processors" : [
     { "remove":   { "field": ["host"],                                                                                          "ignore_failure": true } },
     { "json":     { "field": "message",			             "target_field": "message2",		                "ignore_failure": true} },
diff --git a/salt/elasticsearch/files/ingest/zeek.opcua_read_results b/salt/elasticsearch/files/ingest/zeek.opcua_binary_read_results
similarity index 94%
rename from salt/elasticsearch/files/ingest/zeek.opcua_read_results
rename to salt/elasticsearch/files/ingest/zeek.opcua_binary_read_results
index 28c417eba..e54afc469 100644
--- a/salt/elasticsearch/files/ingest/zeek.opcua_read_results
+++ b/salt/elasticsearch/files/ingest/zeek.opcua_binary_read_results
@@ -1,5 +1,5 @@
 {
-  "description" : "zeek.opcua_read_results",
+  "description" : "zeek.opcua_binary_read_results",
   "processors" : [
     { "remove":   { "field": ["host"],                                                                                          "ignore_failure": true } },
     { "json":     { "field": "message",			             "target_field": "message2",		                "ignore_failure": true} },
diff --git a/salt/elasticsearch/files/ingest/zeek.opcua_read_results_link b/salt/elasticsearch/files/ingest/zeek.opcua_binary_read_results_link
similarity index 92%
rename from salt/elasticsearch/files/ingest/zeek.opcua_read_results_link
rename to salt/elasticsearch/files/ingest/zeek.opcua_binary_read_results_link
index 0a1edc57b..9f5275893 100644
--- a/salt/elasticsearch/files/ingest/zeek.opcua_read_results_link
+++ b/salt/elasticsearch/files/ingest/zeek.opcua_binary_read_results_link
@@ -1,5 +1,5 @@
 {
-  "description" : "zeek.opcua_read_results_link",
+  "description" : "zeek.opcua_binary_read_results_link",
   "processors" : [
     { "remove":   { "field": ["host"],                                                                                          "ignore_failure": true } },
     { "json":     { "field": "message",			             "target_field": "message2",		                "ignore_failure": true} },
diff --git a/salt/elasticsearch/files/ingest/zeek.opcua_status_code_detail b/salt/elasticsearch/files/ingest/zeek.opcua_binary_status_code_detail
similarity index 97%
rename from salt/elasticsearch/files/ingest/zeek.opcua_status_code_detail
rename to salt/elasticsearch/files/ingest/zeek.opcua_binary_status_code_detail
index 0d4ae984a..05f77fec2 100644
--- a/salt/elasticsearch/files/ingest/zeek.opcua_status_code_detail
+++ b/salt/elasticsearch/files/ingest/zeek.opcua_binary_status_code_detail
@@ -1,5 +1,5 @@
 {
-  "description" : "zeek.opcua_stats_code_detail",
+  "description" : "zeek.opcua_binary_stats_code_detail",
   "processors" : [
     { "remove":   { "field": ["host"],                                                                                              "ignore_failure": true } },
     { "json":     { "field": "message",			             "target_field": "message2",		                    "ignore_failure": true} },