diff --git a/Source/common/santa.proto b/Source/common/santa.proto
index 24077cc1..66141a27 100644
--- a/Source/common/santa.proto
+++ b/Source/common/santa.proto
@@ -763,13 +763,13 @@ message AuthenticationOD {
   optional ProcessInfoLight instigator = 1;
 
   // The process that triggered authentication
-  // Note: Due internal system limitations, the process that triggered the
+  // Note: Due to macOS system limitations, the process that triggered the
   // event may have already exited before the event could be generated. This
   // results in only a small subset of the information from the triggering
   // process to be reported.
   oneof auth_instigator {
-    ProcessInfoLight process = 2;
-    ProcessID fallback_id = 3;
+    ProcessInfoLight trigger_process = 2;
+    ProcessID trigger_id = 3;
   }
 
   // OD record type against which OD is authenticating
@@ -796,13 +796,13 @@ message AuthenticationTouchID {
   optional ProcessInfoLight instigator = 1;
 
   // The process that triggered authentication
-  // Note: Due internal system limitations, the process that triggered the
+  // Note: Due to macOS system limitations, the process that triggered the
   // event may have already exited before the event could be generated. This
   // results in only a small subset of the information from the triggering
   // process to be reported.
   oneof auth_instigator {
-    ProcessInfoLight process = 2;
-    ProcessID fallback_id = 3;
+    ProcessInfoLight trigger_process = 2;
+    ProcessID trigger_id = 3;
   }
 
   enum Mode {
@@ -825,13 +825,13 @@ message AuthenticationToken {
   optional ProcessInfoLight instigator = 1;
 
   // The process that triggered authentication
-  // Note: Due internal system limitations, the process that triggered the
+  // Note: Due to macOS system limitations, the process that triggered the
   // event may have already exited before the event could be generated. This
   // results in only a small subset of the information from the triggering
   // process to be reported.
   oneof auth_instigator {
-    ProcessInfoLight process = 2;
-    ProcessID fallback_id = 3;
+    ProcessInfoLight trigger_process = 2;
+    ProcessID trigger_id = 3;
   }
 
   // Hash of the public key which CryptoTokenKit is authenticating
diff --git a/Source/santad/Logs/EndpointSecurity/Serializers/Protobuf.mm b/Source/santad/Logs/EndpointSecurity/Serializers/Protobuf.mm
index 2a3e4432..d5c0564f 100644
--- a/Source/santad/Logs/EndpointSecurity/Serializers/Protobuf.mm
+++ b/Source/santad/Logs/EndpointSecurity/Serializers/Protobuf.mm
@@ -984,8 +984,8 @@ void EncodeAuthInstigatorOrFallback(
 
   EncodeProcessInfoLight(pb_od->mutable_instigator(), msg);
   EncodeAuthInstigatorOrFallback(
-    msg, [pb_od] { return pb_od->mutable_process(); },
-    [pb_od] { return pb_od->mutable_fallback_id(); });
+    msg, [pb_od] { return pb_od->mutable_trigger_process(); },
+    [pb_od] { return pb_od->mutable_trigger_id(); });
 
   EncodeStringToken([pb_od] { return pb_od->mutable_record_type(); }, es_od_event->record_type);
   EncodeStringToken([pb_od] { return pb_od->mutable_record_name(); }, es_od_event->record_name);
@@ -1015,8 +1015,8 @@ void EncodeAuthInstigatorOrFallback(
 
   EncodeProcessInfoLight(pb_touchid->mutable_instigator(), msg);
   EncodeAuthInstigatorOrFallback(
-    msg, [pb_touchid] { return pb_touchid->mutable_process(); },
-    [pb_touchid] { return pb_touchid->mutable_fallback_id(); });
+    msg, [pb_touchid] { return pb_touchid->mutable_trigger_process(); },
+    [pb_touchid] { return pb_touchid->mutable_trigger_id(); });
 
   pb_touchid->set_mode(GetAuthenticationTouchIDMode(es_touchid_event->touchid_mode));
   if (es_touchid_event->has_uid) {
@@ -1038,8 +1038,8 @@ void EncodeAuthInstigatorOrFallback(
 
   EncodeProcessInfoLight(pb_token->mutable_instigator(), msg);
   EncodeAuthInstigatorOrFallback(
-    msg, [pb_token] { return pb_token->mutable_process(); },
-    [pb_token] { return pb_token->mutable_fallback_id(); });
+    msg, [pb_token] { return pb_token->mutable_trigger_process(); },
+    [pb_token] { return pb_token->mutable_trigger_id(); });
 
   EncodeStringToken([pb_token] { return pb_token->mutable_pubkey_hash(); },
                     es_token_event->pubkey_hash);
diff --git a/Source/santad/testdata/protobuf/v6/authentication_od.json b/Source/santad/testdata/protobuf/v6/authentication_od.json
index d71956f4..1f3bbccf 100644
--- a/Source/santad/testdata/protobuf/v6/authentication_od.json
+++ b/Source/santad/testdata/protobuf/v6/authentication_od.json
@@ -34,7 +34,7 @@
     "truncated": false
    }
   },
-  "process": {
+  "trigger_process": {
    "id": {
     "pid": 23,
     "pidversion": 45
diff --git a/Source/santad/testdata/protobuf/v6/authentication_token.json b/Source/santad/testdata/protobuf/v6/authentication_token.json
index b50c9903..da0bc0f3 100644
--- a/Source/santad/testdata/protobuf/v6/authentication_token.json
+++ b/Source/santad/testdata/protobuf/v6/authentication_token.json
@@ -34,7 +34,7 @@
     "truncated": false
    }
   },
-  "process": {
+  "trigger_process": {
    "id": {
     "pid": 23,
     "pidversion": 45
diff --git a/Source/santad/testdata/protobuf/v6/authentication_touchid.json b/Source/santad/testdata/protobuf/v6/authentication_touchid.json
index 2f7d61c7..5cabed9d 100644
--- a/Source/santad/testdata/protobuf/v6/authentication_touchid.json
+++ b/Source/santad/testdata/protobuf/v6/authentication_touchid.json
@@ -34,7 +34,7 @@
     "truncated": false
    }
   },
-  "process": {
+  "trigger_process": {
    "id": {
     "pid": 23,
     "pidversion": 45
diff --git a/Source/santad/testdata/protobuf/v6/authentication_touchid_no_uid.json b/Source/santad/testdata/protobuf/v6/authentication_touchid_no_uid.json
index 8028b126..d3ce885f 100644
--- a/Source/santad/testdata/protobuf/v6/authentication_touchid_no_uid.json
+++ b/Source/santad/testdata/protobuf/v6/authentication_touchid_no_uid.json
@@ -34,7 +34,7 @@
     "truncated": false
    }
   },
-  "process": {
+  "trigger_process": {
    "id": {
     "pid": 23,
     "pidversion": 45
diff --git a/Source/santad/testdata/protobuf/v7/authentication_od.json b/Source/santad/testdata/protobuf/v7/authentication_od.json
index d71956f4..1f3bbccf 100644
--- a/Source/santad/testdata/protobuf/v7/authentication_od.json
+++ b/Source/santad/testdata/protobuf/v7/authentication_od.json
@@ -34,7 +34,7 @@
     "truncated": false
    }
   },
-  "process": {
+  "trigger_process": {
    "id": {
     "pid": 23,
     "pidversion": 45
diff --git a/Source/santad/testdata/protobuf/v7/authentication_token.json b/Source/santad/testdata/protobuf/v7/authentication_token.json
index b50c9903..da0bc0f3 100644
--- a/Source/santad/testdata/protobuf/v7/authentication_token.json
+++ b/Source/santad/testdata/protobuf/v7/authentication_token.json
@@ -34,7 +34,7 @@
     "truncated": false
    }
   },
-  "process": {
+  "trigger_process": {
    "id": {
     "pid": 23,
     "pidversion": 45
diff --git a/Source/santad/testdata/protobuf/v7/authentication_touchid.json b/Source/santad/testdata/protobuf/v7/authentication_touchid.json
index 2f7d61c7..5cabed9d 100644
--- a/Source/santad/testdata/protobuf/v7/authentication_touchid.json
+++ b/Source/santad/testdata/protobuf/v7/authentication_touchid.json
@@ -34,7 +34,7 @@
     "truncated": false
    }
   },
-  "process": {
+  "trigger_process": {
    "id": {
     "pid": 23,
     "pidversion": 45
diff --git a/Source/santad/testdata/protobuf/v7/authentication_touchid_no_uid.json b/Source/santad/testdata/protobuf/v7/authentication_touchid_no_uid.json
index 8028b126..d3ce885f 100644
--- a/Source/santad/testdata/protobuf/v7/authentication_touchid_no_uid.json
+++ b/Source/santad/testdata/protobuf/v7/authentication_touchid_no_uid.json
@@ -34,7 +34,7 @@
     "truncated": false
    }
   },
-  "process": {
+  "trigger_process": {
    "id": {
     "pid": 23,
     "pidversion": 45
diff --git a/Source/santad/testdata/protobuf/v8/authentication_od.json b/Source/santad/testdata/protobuf/v8/authentication_od.json
index d71956f4..1f3bbccf 100644
--- a/Source/santad/testdata/protobuf/v8/authentication_od.json
+++ b/Source/santad/testdata/protobuf/v8/authentication_od.json
@@ -34,7 +34,7 @@
     "truncated": false
    }
   },
-  "process": {
+  "trigger_process": {
    "id": {
     "pid": 23,
     "pidversion": 45
diff --git a/Source/santad/testdata/protobuf/v8/authentication_od_missing_auth_instigator.json b/Source/santad/testdata/protobuf/v8/authentication_od_missing_auth_instigator.json
index 10719ba2..62bb6951 100644
--- a/Source/santad/testdata/protobuf/v8/authentication_od_missing_auth_instigator.json
+++ b/Source/santad/testdata/protobuf/v8/authentication_od_missing_auth_instigator.json
@@ -34,7 +34,7 @@
     "truncated": false
    }
   },
-  "fallback_id": {
+  "trigger_id": {
    "pid": 98,
    "pidversion": 76
   },
diff --git a/Source/santad/testdata/protobuf/v8/authentication_token.json b/Source/santad/testdata/protobuf/v8/authentication_token.json
index b50c9903..da0bc0f3 100644
--- a/Source/santad/testdata/protobuf/v8/authentication_token.json
+++ b/Source/santad/testdata/protobuf/v8/authentication_token.json
@@ -34,7 +34,7 @@
     "truncated": false
    }
   },
-  "process": {
+  "trigger_process": {
    "id": {
     "pid": 23,
     "pidversion": 45
diff --git a/Source/santad/testdata/protobuf/v8/authentication_token_missing_auth_instigator.json b/Source/santad/testdata/protobuf/v8/authentication_token_missing_auth_instigator.json
index 94f16f41..a0a9a810 100644
--- a/Source/santad/testdata/protobuf/v8/authentication_token_missing_auth_instigator.json
+++ b/Source/santad/testdata/protobuf/v8/authentication_token_missing_auth_instigator.json
@@ -34,7 +34,7 @@
     "truncated": false
    }
   },
-  "fallback_id": {
+  "trigger_id": {
    "pid": 98,
    "pidversion": 76
   },
diff --git a/Source/santad/testdata/protobuf/v8/authentication_touchid.json b/Source/santad/testdata/protobuf/v8/authentication_touchid.json
index 2f7d61c7..5cabed9d 100644
--- a/Source/santad/testdata/protobuf/v8/authentication_touchid.json
+++ b/Source/santad/testdata/protobuf/v8/authentication_touchid.json
@@ -34,7 +34,7 @@
     "truncated": false
    }
   },
-  "process": {
+  "trigger_process": {
    "id": {
     "pid": 23,
     "pidversion": 45
diff --git a/Source/santad/testdata/protobuf/v8/authentication_touchid_missing_auth_instigator.json b/Source/santad/testdata/protobuf/v8/authentication_touchid_missing_auth_instigator.json
index f9bc1313..ccb3acac 100644
--- a/Source/santad/testdata/protobuf/v8/authentication_touchid_missing_auth_instigator.json
+++ b/Source/santad/testdata/protobuf/v8/authentication_touchid_missing_auth_instigator.json
@@ -34,7 +34,7 @@
     "truncated": false
    }
   },
-  "fallback_id": {
+  "trigger_id": {
    "pid": 98,
    "pidversion": 76
   },
diff --git a/Source/santad/testdata/protobuf/v8/authentication_touchid_no_uid.json b/Source/santad/testdata/protobuf/v8/authentication_touchid_no_uid.json
index 8028b126..d3ce885f 100644
--- a/Source/santad/testdata/protobuf/v8/authentication_touchid_no_uid.json
+++ b/Source/santad/testdata/protobuf/v8/authentication_touchid_no_uid.json
@@ -34,7 +34,7 @@
     "truncated": false
    }
   },
-  "process": {
+  "trigger_process": {
    "id": {
     "pid": 23,
     "pidversion": 45