diff --git a/ui_automator/ui_automator.py b/ui_automator/ui_automator.py
index 1281786..21ecbe2 100644
--- a/ui_automator/ui_automator.py
+++ b/ui_automator/ui_automator.py
@@ -316,7 +316,7 @@
           _GOOGLE_HOME_APP, matter_device
       )
       self._logger.info('Successfully commission the device on GHA.')
-    # TODO(b/298903492): Narrow exception type.
+    # TODO(google-home-testsuite-dev+ui-automator): Narrow exception type.
     except Exception as e:
       raise errors.MoblySnippetError(
           'Unable to continue automated commissioning process on'
@@ -345,7 +345,7 @@
     try:
       self._connected_device.mbs.removeDevice(device_name)
       self._logger.info('Successfully remove the device on GHA.')
-    # TODO(b/298903492): Narrow exception type.
+    # TODO(google-home-testsuite-dev+ui-automator): Narrow exception type.
     except Exception as e:
       raise errors.MoblySnippetError(
           f'Unable to remove {device_name} from GHA'
@@ -537,7 +537,7 @@
       raise flags.IllegalFlagValueError(_REGRESSION_TESTS_FLAG_USAGE_GUIDE)
 
 
-# TODO(b/309745485): Type of argv should be Sequence[str].
+# TODO(google-home-testsuite-dev+ui-automator): Type of argv should be Sequence[str].
 def _main(argv) -> None:
   if argv and len(argv) > 1:
     raise app.UsageError(f'Too many command-line arguments: {argv!r}')