From fb34fba01c568180ecbff04a05d82c6df7e011ce Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Thu, 24 Dec 2020 00:47:38 -0800
Subject: [PATCH] Use native_module_spec_name to name codegen targets

Summary:
## Description
Suppose this was the codegen declaration before:

```
rn_library(
  name = "FooModule",
  native_module_spec_name = "FBReactNativeSpec",
  codegen_modules = True,
  # ...
)
```

Previously, this would generate the following BUCK targets:
- generated_objcpp_modules-FooModuleApple
- generated_java_modules-FooModuleAndroid
- generated_java_modules-FooModule-jniAndroid

## Changes
We will now generate:
- FBReactNativeSpecApple
- FBReactNativeSpecAndroid
- FBReactNativeSpec-jniAndroid

This matches the naming scheme of the old codegen.

Changelog: [Internal]

Reviewed By: fkgozali

Differential Revision: D25680224

fbshipit-source-id: 617ac18fd915f3277f6bd98072d147f20fb193e5
---
 React/CoreModules/BUCK                                    | 2 +-
 .../src/main/java/com/facebook/react/animated/BUCK        | 2 +-
 .../src/main/java/com/facebook/react/devsupport/BUCK      | 2 +-
 .../com/facebook/react/modules/accessibilityinfo/BUCK     | 2 +-
 .../main/java/com/facebook/react/modules/appearance/BUCK  | 2 +-
 .../main/java/com/facebook/react/modules/appstate/BUCK    | 2 +-
 .../src/main/java/com/facebook/react/modules/blob/BUCK    | 2 +-
 .../java/com/facebook/react/modules/bundleloader/BUCK     | 2 +-
 .../src/main/java/com/facebook/react/modules/camera/BUCK  | 2 +-
 .../src/main/java/com/facebook/react/modules/core/BUCK    | 2 +-
 .../main/java/com/facebook/react/modules/datepicker/BUCK  | 2 +-
 .../src/main/java/com/facebook/react/modules/debug/BUCK   | 2 +-
 .../main/java/com/facebook/react/modules/deviceinfo/BUCK  | 2 +-
 .../src/main/java/com/facebook/react/modules/dialog/BUCK  | 2 +-
 .../src/main/java/com/facebook/react/modules/image/BUCK   | 2 +-
 .../src/main/java/com/facebook/react/modules/intent/BUCK  | 2 +-
 .../src/main/java/com/facebook/react/modules/network/BUCK | 2 +-
 .../main/java/com/facebook/react/modules/permissions/BUCK | 2 +-
 .../src/main/java/com/facebook/react/modules/share/BUCK   | 2 +-
 .../src/main/java/com/facebook/react/modules/sound/BUCK   | 2 +-
 .../main/java/com/facebook/react/modules/statusbar/BUCK   | 2 +-
 .../src/main/java/com/facebook/react/modules/storage/BUCK | 2 +-
 .../main/java/com/facebook/react/modules/systeminfo/BUCK  | 4 ++--
 .../src/main/java/com/facebook/react/modules/toast/BUCK   | 2 +-
 .../main/java/com/facebook/react/modules/vibration/BUCK   | 2 +-
 .../main/java/com/facebook/react/modules/websocket/BUCK   | 2 +-
 packages/react-native-codegen/BUCK                        | 2 +-
 packages/react-native-codegen/DEFS.bzl                    | 8 ++++----
 28 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/React/CoreModules/BUCK b/React/CoreModules/BUCK
index e07b6ff6f12..d9475c86bb5 100644
--- a/React/CoreModules/BUCK
+++ b/React/CoreModules/BUCK
@@ -131,6 +131,6 @@ rn_apple_library(
         "//xplat/js:RCTLinkingApple",
         "//xplat/js:RCTPushNotificationApple",
         "//xplat/js/react-native-github:ReactInternalApple",
-        "//xplat/js/react-native-github/Libraries:generated_objcpp_modules-FBReactNativeSpecApple",
+        "//xplat/js/react-native-github/Libraries:FBReactNativeSpecApple",
     ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/BUCK b/ReactAndroid/src/main/java/com/facebook/react/animated/BUCK
index 81527da4f69..da22b9787c3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/BUCK
@@ -29,5 +29,5 @@ rn_android_library(
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
         react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
     ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK b/ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK
index 0240a2666fa..2c919248ab8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/BUCK
@@ -40,7 +40,7 @@ rn_android_library(
         react_native_target("res:devsupport"),
     ],
     exported_deps = [
-        react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
+        react_native_root_target("Libraries:FBReactNativeSpec"),
     ],
 )
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/BUCK
index d032844ae7b..b8c3a1b9b31 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/BUCK
@@ -19,5 +19,5 @@ rn_android_library(
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
         react_native_target("java/com/facebook/react/modules/core:core"),
     ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/appearance/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/appearance/BUCK
index ee8429aa991..640c535e0a0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/appearance/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/appearance/BUCK
@@ -17,5 +17,5 @@ rn_android_library(
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
         react_native_target("java/com/facebook/react/modules/core:core"),
     ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/BUCK
index 295c630477a..cacb0a3ca2c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/BUCK
@@ -17,5 +17,5 @@ rn_android_library(
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
         react_native_target("java/com/facebook/react/modules/core:core"),
     ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BUCK
index 95b880422d1..df5de6afb47 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BUCK
@@ -32,6 +32,6 @@ rn_android_library(
         react_native_target("java/com/facebook/react/modules/websocket:websocket"),
     ],
     exported_deps = [
-        react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
+        react_native_root_target("Libraries:FBReactNativeSpec"),
     ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/bundleloader/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/bundleloader/BUCK
index 0a129c6c7a6..b16ad7c7570 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/bundleloader/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/bundleloader/BUCK
@@ -18,5 +18,5 @@ rn_android_library(
         react_native_target("java/com/facebook/react/devsupport:interfaces"),
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
     ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/camera/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/camera/BUCK
index f679963f074..e516ebe6638 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/camera/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/camera/BUCK
@@ -19,6 +19,6 @@ rn_android_library(
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
     ],
     exported_deps = [
-        react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
+        react_native_root_target("Libraries:FBReactNativeSpec"),
     ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/core/BUCK
index 118339191a1..31207dd6315 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/BUCK
@@ -22,6 +22,6 @@ rn_android_library(
         react_native_target("java/com/facebook/react/util:util"),
     ],
     exported_deps = [
-        react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
+        react_native_root_target("Libraries:FBReactNativeSpec"),
     ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/BUCK
index 02bc5fbc3eb..e1c276c6757 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/datepicker/BUCK
@@ -23,5 +23,5 @@ rn_android_library(
         react_native_target("java/com/facebook/react/common:common"),
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
     ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/BUCK
index 034c8e312bc..525683f3596 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/BUCK
@@ -24,7 +24,7 @@ rn_android_library(
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
     ],
     exported_deps = [
-        react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
+        react_native_root_target("Libraries:FBReactNativeSpec"),
     ],
 )
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/BUCK
index da57d487662..46f482370c3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/BUCK
@@ -20,6 +20,6 @@ rn_android_library(
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
     ],
     exported_deps = [
-        react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
+        react_native_root_target("Libraries:FBReactNativeSpec"),
     ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/BUCK
index 40a7d8c6e99..e80e77f2aa3 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/BUCK
@@ -24,5 +24,5 @@ rn_android_library(
         react_native_target("java/com/facebook/react/common:common"),
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
     ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/image/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/image/BUCK
index 4fba41ae0fd..bc4e575b2be 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/image/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/image/BUCK
@@ -25,6 +25,6 @@ rn_android_library(
         react_native_target("java/com/facebook/react/views/image:image"),
     ],
     exported_deps = [
-        react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
+        react_native_root_target("Libraries:FBReactNativeSpec"),
     ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/intent/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/intent/BUCK
index d89eb671861..fb94f3fb365 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/intent/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/intent/BUCK
@@ -17,5 +17,5 @@ rn_android_library(
         react_native_target("java/com/facebook/react/common:common"),
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
     ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/network/BUCK
index 0d7020d1a9f..703d1b7b72a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/BUCK
@@ -29,5 +29,5 @@ rn_android_library(
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
         react_native_target("java/com/facebook/react/modules/core:core"),
     ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/permissions/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/permissions/BUCK
index 54e9a48eab1..14d1f89fa2b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/permissions/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/permissions/BUCK
@@ -16,5 +16,5 @@ rn_android_library(
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
         react_native_target("java/com/facebook/react/modules/core:core"),
     ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/share/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/share/BUCK
index d3ead4b3ae4..d3e98217f6e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/share/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/share/BUCK
@@ -16,5 +16,5 @@ rn_android_library(
         react_native_target("java/com/facebook/react/common:common"),
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
     ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/sound/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/sound/BUCK
index 411ade4a0ef..dc76a82b932 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/sound/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/sound/BUCK
@@ -20,5 +20,5 @@ rn_android_library(
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
     ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/BUCK
index 2b6cf951aef..21e2ecf7700 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/BUCK
@@ -25,5 +25,5 @@ rn_android_library(
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
     ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/storage/BUCK
index ed16e94bb9b..c74d5354d7e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/storage/BUCK
@@ -19,5 +19,5 @@ rn_android_library(
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
         react_native_target("java/com/facebook/react/modules/common:common"),
     ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/BUCK
index 695140160c8..efda55325a7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/BUCK
@@ -22,7 +22,7 @@ rn_android_library(
         react_native_target("java/com/facebook/react/turbomodule/core/interfaces:interfaces"),
     ],
     exported_deps = [
-        react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
+        react_native_root_target("Libraries:FBReactNativeSpec"),
         ":systeminfo-moduleless",
     ],
 )
@@ -45,5 +45,5 @@ rn_android_library(
         react_native_dep("third-party/java/jsr-305:jsr-305"),
         react_native_target("res:systeminfo"),
     ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/toast/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/toast/BUCK
index f0c2b1dae8a..79edb9b7dc4 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/toast/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/toast/BUCK
@@ -15,5 +15,5 @@ rn_android_library(
         react_native_target("java/com/facebook/react/common:common"),
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
     ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/vibration/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/vibration/BUCK
index e80dbb0ce5d..bcf7ea3376f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/vibration/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/vibration/BUCK
@@ -17,5 +17,5 @@ rn_android_library(
         react_native_target("java/com/facebook/react/module/annotations:annotations"),
         react_native_target("java/com/facebook/react/modules/core:core"),
     ],
-    exported_deps = [react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec")],
+    exported_deps = [react_native_root_target("Libraries:FBReactNativeSpec")],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/BUCK
index 9bf4b604c8a..18879f21d4a 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/BUCK
@@ -23,6 +23,6 @@ rn_android_library(
         react_native_target("java/com/facebook/react/modules/network:network"),
     ],
     exported_deps = [
-        react_native_root_target("Libraries:generated_java_modules-FBReactNativeSpec"),
+        react_native_root_target("Libraries:FBReactNativeSpec"),
     ],
 )
diff --git a/packages/react-native-codegen/BUCK b/packages/react-native-codegen/BUCK
index 07fb2bfeb96..07b517fc2f7 100644
--- a/packages/react-native-codegen/BUCK
+++ b/packages/react-native-codegen/BUCK
@@ -94,8 +94,8 @@ rn_xplat_cxx_library(
         "PUBLIC",
     ],
     deps = [
+        ":FBReactNativeTestSpec",
         ":generated_components-codegen_tests",
-        ":generated_objcpp_modules-codegen_tests",
     ],
 )
 
diff --git a/packages/react-native-codegen/DEFS.bzl b/packages/react-native-codegen/DEFS.bzl
index 0e71c3e37f1..06a9ef6c937 100644
--- a/packages/react-native-codegen/DEFS.bzl
+++ b/packages/react-native-codegen/DEFS.bzl
@@ -103,8 +103,8 @@ def rn_codegen_cli():
         )
 
 def rn_codegen_modules(
+        name,
         native_module_spec_name,
-        name = "",
         library_labels = [],
         schema_target = ""):
     generate_fixtures_rule_name = "generate_fixtures_modules-{}".format(name)
@@ -157,7 +157,7 @@ def rn_codegen_modules(
     )
 
     rn_android_library(
-        name = "generated_java_modules-{}".format(name),
+        name = "{}".format(native_module_spec_name),
         srcs = [
             ":{}".format(generate_module_java_zip_name),
         ],
@@ -176,7 +176,7 @@ def rn_codegen_modules(
     )
 
     rn_xplat_cxx_library(
-        name = "generated_java_modules-{}-jni".format(name),
+        name = "{}-jni".format(native_module_spec_name),
         srcs = [
             ":{}".format(generate_module_jni_cpp_name),
         ],
@@ -229,7 +229,7 @@ def rn_codegen_modules(
         )
 
         rn_apple_library(
-            name = "generated_objcpp_modules-{}Apple".format(name),
+            name = "{}Apple".format(native_module_spec_name),
             extension_api_only = True,
             header_namespace = "",
             sdks = (IOS),