diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricComponents.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricComponents.java
index eca177237c3..73d2c6f59bf 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricComponents.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricComponents.java
@@ -14,15 +14,15 @@ import java.util.Map;
 /**
  * Utility class for Fabric components, this will be removed
  *
- * <p>//TODO T31905686: remove this class when the component names are unified between JS - Android
- * - iOS - C++
+ * <p>TODO T97384889: remove this class when the component names are unified between JS - Android -
+ * iOS - C++
  */
 public class FabricComponents {
 
   private static @NonNull final Map<String, String> sComponentNames = new HashMap<>();
 
   static {
-    // TODO T31905686: unify component names between JS - Android - iOS - C++
+    // TODO T97384889: unify component names between JS - Android - iOS - C++
     sComponentNames.put("View", "RCTView");
     sComponentNames.put("Image", "RCTImageView");
     sComponentNames.put("ScrollView", "RCTScrollView");
diff --git a/ReactCommon/react/renderer/componentregistry/componentNameByReactViewName.cpp b/ReactCommon/react/renderer/componentregistry/componentNameByReactViewName.cpp
index 6ad7a8ebc63..d920adccdc3 100644
--- a/ReactCommon/react/renderer/componentregistry/componentNameByReactViewName.cpp
+++ b/ReactCommon/react/renderer/componentregistry/componentNameByReactViewName.cpp
@@ -14,6 +14,7 @@ std::string componentNameByReactViewName(std::string viewName) {
   // We need this function only for the transition period;
   // eventually, all names will be unified.
 
+  // TODO T97384889: unify component names between JS - Android - iOS - C++
   std::string rctPrefix("RCT");
   if (std::mismatch(rctPrefix.begin(), rctPrefix.end(), viewName.begin())
           .first == rctPrefix.end()) {