diff --git a/src/derived.rs b/src/derived.rs
index 472e667a..8df16108 100644
--- a/src/derived.rs
+++ b/src/derived.rs
@@ -315,7 +315,7 @@ where
                 );
 
                 db.salsa_event(|| Event {
-                    id: runtime.id(),
+                    runtime_id: runtime.id(),
                     kind: EventKind::DidValidateMemoizedValue {
                         descriptor: descriptor.clone(),
                     },
@@ -464,9 +464,9 @@ where
                         std::mem::drop(map);
 
                         db.salsa_event(|| Event {
-                            id: db.salsa_runtime().id(),
+                            runtime_id: db.salsa_runtime().id(),
                             kind: EventKind::WillBlockOn {
-                                other_id,
+                                other_runtime_id: other_id,
                                 descriptor: descriptor.clone(),
                             },
                         });
diff --git a/src/input.rs b/src/input.rs
index f501a290..278f5b66 100644
--- a/src/input.rs
+++ b/src/input.rs
@@ -84,7 +84,7 @@ where
             let mut map = self.map.write();
 
             db.salsa_event(|| Event {
-                id: db.salsa_runtime().id(),
+                runtime_id: db.salsa_runtime().id(),
                 kind: EventKind::WillChangeInputValue {
                     descriptor: descriptor.clone(),
                 },
diff --git a/src/lib.rs b/src/lib.rs
index 22f1eaaa..5039e167 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -73,14 +73,14 @@ pub trait Database: plumbing::DatabaseStorageTypes + plumbing::DatabaseOps {
 }
 
 pub struct Event<DB: Database> {
-    pub id: RuntimeId,
+    pub runtime_id: RuntimeId,
     pub kind: EventKind<DB>,
 }
 
 impl<DB: Database> fmt::Debug for Event<DB> {
     fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         fmt.debug_struct("Event")
-            .field("id", &self.id)
+            .field("runtime_id", &self.runtime_id)
             .field("kind", &self.kind)
             .finish()
     }
@@ -94,7 +94,7 @@ pub enum EventKind<DB: Database> {
     /// Executes before the "re-used" value is returned.
     DidValidateMemoizedValue { descriptor: DB::QueryDescriptor },
 
-    /// Indicates that another thread (with id `other_id`) is processing the
+    /// Indicates that another thread (with id `other_runtime_id`) is processing the
     /// given query (`descriptor`), so we will block until they
     /// finish.
     ///
@@ -104,7 +104,7 @@ pub enum EventKind<DB: Database> {
     /// (NB: you can find the `id` of the current thread via the
     /// `salsa_runtime`)
     WillBlockOn {
-        other_id: RuntimeId,
+        other_runtime_id: RuntimeId,
         descriptor: DB::QueryDescriptor,
     },
 
@@ -126,11 +126,11 @@ impl<DB: Database> fmt::Debug for EventKind<DB> {
                 .field("descriptor", descriptor)
                 .finish(),
             EventKind::WillBlockOn {
-                other_id,
+                other_runtime_id,
                 descriptor,
             } => fmt
                 .debug_struct("WillBlockOn")
-                .field("other_id", other_id)
+                .field("other_runtime_id", other_runtime_id)
                 .field("descriptor", descriptor)
                 .finish(),
             EventKind::WillChangeInputValue { descriptor } => fmt
diff --git a/src/runtime.rs b/src/runtime.rs
index 41ae6461..1e158cb3 100644
--- a/src/runtime.rs
+++ b/src/runtime.rs
@@ -258,7 +258,7 @@ where
         debug!("{:?}: execute_query_implementation invoked", descriptor);
 
         db.salsa_event(|| Event {
-            id: db.salsa_runtime().id(),
+            runtime_id: db.salsa_runtime().id(),
             kind: EventKind::WillExecute {
                 descriptor: descriptor.clone(),
             },