diff --git a/crates/factor-observe/src/lib.rs b/crates/factor-observe/src/lib.rs
index cc8fbfb6f..0f6f884c5 100644
--- a/crates/factor-observe/src/lib.rs
+++ b/crates/factor-observe/src/lib.rs
@@ -77,7 +77,7 @@ pub(crate) struct State {
     ///
     /// Only a reference ID to the guest span is held here. The actual guest span must be looked up
     /// in the `guest_spans` table using the reference ID.
-    /// TODO: Fix comment
+    /// TODO(Caleb): Fix comment
     pub(crate) active_spans: IndexMap<String, u32>,
 
     /// Id of the last span emitted from within the host before entering the guest.
@@ -93,13 +93,13 @@ pub struct GuestSpan {
     pub inner: opentelemetry::global::BoxedSpan,
 }
 
-/// TODO comment
+/// TODO(Caleb): comment
 pub struct ObserveContext {
     pub(crate) state: Option<Arc<RwLock<State>>>,
 }
 
 impl ObserveContext {
-    /// TODO: Comment
+    /// TODO(Caleb): Comment
     pub fn from_prepare_context<T: RuntimeFactors, F: Factor>(
         prepare_context: &mut PrepareContext<T, F>,
     ) -> anyhow::Result<Self> {
diff --git a/crates/factor-sqlite/Cargo.toml b/crates/factor-sqlite/Cargo.toml
index 89524b118..372a7fed2 100644
--- a/crates/factor-sqlite/Cargo.toml
+++ b/crates/factor-sqlite/Cargo.toml
@@ -26,4 +26,4 @@ tokio = { version = "1", features = ["macros", "rt"] }
 [lints]
 workspace = true
 
-# TODO: Setup observe reparenting
\ No newline at end of file
+# TODO(Caleb): Setup observe reparenting
\ No newline at end of file
diff --git a/crates/factor-variables/Cargo.toml b/crates/factor-variables/Cargo.toml
index c14467de8..e2b5a7666 100644
--- a/crates/factor-variables/Cargo.toml
+++ b/crates/factor-variables/Cargo.toml
@@ -25,4 +25,4 @@ tokio = { version = "1", features = ["macros", "rt"] }
 [lints]
 workspace = true
 
-# TODO: Move instruments up a level
\ No newline at end of file
+# TODO(Caleb): Move instruments up a level
\ No newline at end of file
diff --git a/crates/world/src/conversions.rs b/crates/world/src/conversions.rs
index 70851c48e..12fc3dac7 100644
--- a/crates/world/src/conversions.rs
+++ b/crates/world/src/conversions.rs
@@ -271,7 +271,7 @@ mod observe {
         type Error = wasmtime::Error;
 
         fn try_from(sc: traces::SpanContext) -> anyhow::Result<Self> {
-            // TODO: Endianess
+            // TODO(Caleb): Endianess
             let trace_id: [u8; 16] = {
                 let mut whole: [u8; 16] = [0; 16];
                 let (one, two) = whole.split_at_mut(8);
diff --git a/tests/integration.rs b/tests/integration.rs
index 7d9caec24..b0a6c0eaf 100644
--- a/tests/integration.rs
+++ b/tests/integration.rs
@@ -155,10 +155,11 @@ mod integration_tests {
         Ok(())
     }
 
-    // TODO: Cleanup the fake collectors somehow
+    // TODO(Caleb): Cleanup the fake collectors somehow
+    // TODO(Caleb): Move these integration tests to the observe crate
 
     #[tokio::test]
-    // Test that basic otel tracing and context propagation works
+    // Test that basic otel tracing and inbound/outbound context propagation works
     async fn otel_smoke_test() -> anyhow::Result<()> {
         let collector = FakeCollectorServer::start()
             .await
@@ -582,14 +583,9 @@ mod integration_tests {
         Ok(())
     }
 
-    // TODO: wasi_observe_set_event
-    // TODO: wasi_observe_update_name
-    // TODO: wasi_observe_set_link
-    // TODO: wasi_observe_host_guest_host
-    // TODO: semantics of closing a parent doesn't close child
-    // TODO: inbound trace propagation
-    // TODO: outbound trace propagation
-    // TODO: Weird edge cases where a span is closed before we try to load it implicitly as parent or as observecontext thing.
+    // TODO(Caleb): wasi_observe_set_link
+    // TODO(Caleb): semantics of closing a parent doesn't close child
+    // TODO(Caleb): Weird edge cases where a span is closed before we try to load it implicitly as parent or as observecontext thing.
 
     #[test]
     /// Test dynamic environment variables