diff --git a/.github/workflows/factors.yml b/.github/workflows/factors.yml
index e7b2c080cc..68ecf8fb60 100644
--- a/.github/workflows/factors.yml
+++ b/.github/workflows/factors.yml
@@ -1,4 +1,4 @@
-# TODO: remove after factors branch passes regular CI
+# TODO(factors): remove after factors branch passes regular CI
 name: Factors
 on:
   push:
diff --git a/crates/key-value/src/lib.rs b/crates/key-value/src/lib.rs
index 08a656c5d4..78e4940009 100644
--- a/crates/key-value/src/lib.rs
+++ b/crates/key-value/src/lib.rs
@@ -5,7 +5,7 @@ use spin_world::v2::key_value;
 use std::{collections::HashSet, sync::Arc};
 use table::Table;
 
-// TODO: Code left for reference; remove after migration to factors
+// TODO(factors): Code left for reference; remove after migration to factors
 // mod host_component;
 mod util;
 
diff --git a/crates/sqlite/src/lib.rs b/crates/sqlite/src/lib.rs
index a56f404743..110dfaca0a 100644
--- a/crates/sqlite/src/lib.rs
+++ b/crates/sqlite/src/lib.rs
@@ -1,4 +1,4 @@
-// TODO: Code left for reference; remove after migration to factors
+// TODO(factors): Code left for reference; remove after migration to factors
 // mod host_component;
 
 use spin_app::MetadataKey;