diff --git a/src/common/src/system_param/local_manager.rs b/src/common/src/system_param/local_manager.rs
index 96f690610a244..8a81959219704 100644
--- a/src/common/src/system_param/local_manager.rs
+++ b/src/common/src/system_param/local_manager.rs
@@ -48,7 +48,7 @@ impl LocalSystemParamsManager {
         let this = Self::new_inner(initial_params.clone());
 
         // Spawn a task to run the common handler.
-        // TODO: this may be spawned multiple times under standalone deployment, though idempotent.
+        // TODO(bugen): this may be spawned multiple times under standalone deployment, though idempotent.
         tokio::spawn({
             let mut rx = this.tx.subscribe();
             async move {
diff --git a/src/license/src/manager.rs b/src/license/src/manager.rs
index 2864eb251233a..f815a145ba01d 100644
--- a/src/license/src/manager.rs
+++ b/src/license/src/manager.rs
@@ -32,7 +32,7 @@ pub enum Tier {
     Free,
 
     /// Paid tier.
-    // TODO: Add more tiers if needed.
+    // TODO(license): Add more tiers if needed.
     Paid,
 }
 
@@ -55,7 +55,7 @@ pub enum Issuer {
 /// The content of a license.
 ///
 /// We use JSON Web Token (JWT) to represent the license. This struct is the payload.
-// TODO: Shall we add a version field?
+// TODO(license): Shall we add a version field?
 #[derive(Debug, Clone, Deserialize)]
 #[serde(rename_all = "snake_case")]
 pub(super) struct License {
@@ -139,7 +139,7 @@ impl LicenseManager {
             return;
         }
 
-        // TODO: shall we also validate `nbf`(Not Before)?
+        // TODO(license): shall we also validate `nbf`(Not Before)?
         let mut validation = Validation::new(Algorithm::RS512);
         // Only accept `prod` issuer in production, so that we can use license keys issued by
         // the `test` issuer in development without leaking them to production.