diff --git a/MODULE.bazel b/MODULE.bazel
index 44d7ca27..0879f774 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -9,7 +9,7 @@ bazel_dep(name = "protobuf", version = "31.1")
 bazel_dep(name = "rules_kotlin", version = "2.1.9")
 bazel_dep(name = "rules_java", version = "8.15.1")
 bazel_dep(name = "rules_jvm_external", version = "6.8")
-bazel_dep(name = "grpc-java", repo_name = "io_grpc_grpc_java", version = "1.71.0")
+bazel_dep(name = "grpc-java", version = "1.71.0")
 
 grpc_kotlin_maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
 grpc_kotlin_maven.install(
diff --git a/compiler/src/main/java/io/grpc/kotlin/generator/BUILD.bazel b/compiler/src/main/java/io/grpc/kotlin/generator/BUILD.bazel
index a5b31b96..f6dddca3 100644
--- a/compiler/src/main/java/io/grpc/kotlin/generator/BUILD.bazel
+++ b/compiler/src/main/java/io/grpc/kotlin/generator/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_binary")
 load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
 
 licenses(["notice"])
@@ -14,7 +15,7 @@ kt_jvm_library(
         "//stub/src/main/java/io/grpc/kotlin:context",
         "//stub/src/main/java/io/grpc/kotlin:stub",
         "@protobuf//:protobuf_java",
-        "@io_grpc_grpc_java//core",
+        "@grpc-java//core",
         "@grpc_kotlin_maven//:com_google_guava_guava",
         "@grpc_kotlin_maven//:com_squareup_kotlinpoet",
         "@grpc_kotlin_maven//:org_jetbrains_kotlinx_kotlinx_coroutines_core",
diff --git a/examples/client/src/main/kotlin/io/grpc/examples/animals/BUILD.bazel b/examples/client/src/main/kotlin/io/grpc/examples/animals/BUILD.bazel
index b7c1dd8b..1cde758a 100644
--- a/examples/client/src/main/kotlin/io/grpc/examples/animals/BUILD.bazel
+++ b/examples/client/src/main/kotlin/io/grpc/examples/animals/BUILD.bazel
@@ -12,6 +12,6 @@ kt_jvm_binary(
         "//examples/protos/src/main/proto/io/grpc/examples/animals:animals_kt_grpc",
         "//examples/protos/src/main/proto/io/grpc/examples/animals:animals_kt_proto",
         "@protobuf//:protobuf_java_util",
-        "@io_grpc_grpc_java//netty",
+        "@grpc-java//netty",
     ],
 )
diff --git a/examples/client/src/main/kotlin/io/grpc/examples/helloworld/BUILD.bazel b/examples/client/src/main/kotlin/io/grpc/examples/helloworld/BUILD.bazel
index 8f6785d2..0c9898d3 100644
--- a/examples/client/src/main/kotlin/io/grpc/examples/helloworld/BUILD.bazel
+++ b/examples/client/src/main/kotlin/io/grpc/examples/helloworld/BUILD.bazel
@@ -11,6 +11,6 @@ kt_jvm_binary(
     deps = [
         "//examples/protos/src/main/proto/io/grpc/examples/helloworld:hello_world_kt_grpc",
         "//examples/protos/src/main/proto/io/grpc/examples/helloworld:hello_world_kt_proto",
-        "@io_grpc_grpc_java//netty",
+        "@grpc-java//netty",
     ],
 )
diff --git a/examples/client/src/main/kotlin/io/grpc/examples/routeguide/BUILD.bazel b/examples/client/src/main/kotlin/io/grpc/examples/routeguide/BUILD.bazel
index 2fdb6b62..915bd1af 100644
--- a/examples/client/src/main/kotlin/io/grpc/examples/routeguide/BUILD.bazel
+++ b/examples/client/src/main/kotlin/io/grpc/examples/routeguide/BUILD.bazel
@@ -14,6 +14,6 @@ kt_jvm_binary(
         "//examples/protos/src/main/proto/io/grpc/examples/routeguide:route_guide_kt_proto",
         "//examples/stub/src/main/kotlin/io/grpc/examples/routeguide:route_guide_stub",
         "@protobuf//:protobuf_java_util",
-        "@io_grpc_grpc_java//netty",
+        "@grpc-java//netty",
     ],
 )
diff --git a/examples/native-client/src/main/kotlin/io/grpc/examples/helloworld/BUILD.bazel b/examples/native-client/src/main/kotlin/io/grpc/examples/helloworld/BUILD.bazel
index ab4bf3ae..39119100 100644
--- a/examples/native-client/src/main/kotlin/io/grpc/examples/helloworld/BUILD.bazel
+++ b/examples/native-client/src/main/kotlin/io/grpc/examples/helloworld/BUILD.bazel
@@ -10,6 +10,6 @@ kt_jvm_binary(
     main_class = "io.grpc.examples.helloworld.HelloWorldClientKt",
     deps = [
         "//examples/protos/src/main/proto/io/grpc/examples/helloworld:hello_world_kt_grpc",
-        "@io_grpc_grpc_java//netty",
+        "@grpc-java//netty",
     ],
 )
diff --git a/examples/server/src/main/kotlin/io/grpc/examples/animals/BUILD.bazel b/examples/server/src/main/kotlin/io/grpc/examples/animals/BUILD.bazel
index 2cec87f4..1f28ee0b 100644
--- a/examples/server/src/main/kotlin/io/grpc/examples/animals/BUILD.bazel
+++ b/examples/server/src/main/kotlin/io/grpc/examples/animals/BUILD.bazel
@@ -12,6 +12,6 @@ kt_jvm_binary(
         "//examples/protos/src/main/proto/io/grpc/examples/animals:animals_kt_grpc",
         "//examples/protos/src/main/proto/io/grpc/examples/animals:animals_kt_proto",
         "@protobuf//:protobuf_java_util",
-        "@io_grpc_grpc_java//netty",
+        "@grpc-java//netty",
     ],
 )
diff --git a/examples/server/src/main/kotlin/io/grpc/examples/helloworld/BUILD.bazel b/examples/server/src/main/kotlin/io/grpc/examples/helloworld/BUILD.bazel
index 4a644916..35a02bd4 100644
--- a/examples/server/src/main/kotlin/io/grpc/examples/helloworld/BUILD.bazel
+++ b/examples/server/src/main/kotlin/io/grpc/examples/helloworld/BUILD.bazel
@@ -11,6 +11,6 @@ kt_jvm_binary(
     deps = [
         "//examples/protos/src/main/proto/io/grpc/examples/helloworld:hello_world_kt_grpc",
         "//examples/protos/src/main/proto/io/grpc/examples/helloworld:hello_world_kt_proto",
-        "@io_grpc_grpc_java//netty",
+        "@grpc-java//netty",
     ],
 )
diff --git a/examples/server/src/main/kotlin/io/grpc/examples/routeguide/BUILD.bazel b/examples/server/src/main/kotlin/io/grpc/examples/routeguide/BUILD.bazel
index f1f6be13..ee2e683c 100644
--- a/examples/server/src/main/kotlin/io/grpc/examples/routeguide/BUILD.bazel
+++ b/examples/server/src/main/kotlin/io/grpc/examples/routeguide/BUILD.bazel
@@ -14,6 +14,6 @@ kt_jvm_binary(
         "//examples/protos/src/main/proto/io/grpc/examples/routeguide:route_guide_kt_proto",
         "//examples/stub/src/main/kotlin/io/grpc/examples/routeguide:route_guide_stub",
         "@protobuf//:protobuf_java_util",
-        "@io_grpc_grpc_java//netty",
+        "@grpc-java//netty",
     ],
 )
diff --git a/kt_jvm_grpc.bzl b/kt_jvm_grpc.bzl
index b8d90bed..35d1fc42 100644
--- a/kt_jvm_grpc.bzl
+++ b/kt_jvm_grpc.bzl
@@ -1,6 +1,8 @@
 load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
-load("@io_grpc_grpc_java//:java_grpc_library.bzl", "java_grpc_library")
+load("@grpc-java//:java_grpc_library.bzl", "java_grpc_library")
 load("@protobuf//bazel/common:proto_info.bzl", "ProtoInfo")
+load("@protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
+load("@protobuf//bazel:java_proto_library.bzl", "java_proto_library")
 load("@rules_java//java:defs.bzl", "JavaInfo")
 
 def _invoke_generator(ctx, proto_dep, output_dir):
@@ -364,7 +366,7 @@ def kt_jvm_proto_library(
     else:
         java_proto_target = ":%s_DO_NOT_DEPEND_java_proto" % name
         if flavor == "lite":
-            native.java_lite_proto_library(
+            java_lite_proto_library(
                 name = java_proto_target[1:],
                 deps = deps,
                 testonly = testonly,
@@ -376,7 +378,7 @@ def kt_jvm_proto_library(
                 features = features,
             )
         else:
-            native.java_proto_library(
+            java_proto_library(
                 name = java_proto_target[1:],
                 deps = deps,
                 testonly = testonly,
diff --git a/stub/src/main/java/io/grpc/kotlin/BUILD.bazel b/stub/src/main/java/io/grpc/kotlin/BUILD.bazel
index ccb67443..ab8c65a8 100644
--- a/stub/src/main/java/io/grpc/kotlin/BUILD.bazel
+++ b/stub/src/main/java/io/grpc/kotlin/BUILD.bazel
@@ -14,8 +14,8 @@ kt_jvm_library(
     ),
     deps = [
         ":context",
-        "@io_grpc_grpc_java//core",
-        "@io_grpc_grpc_java//stub",
+        "@grpc-java//core",
+        "@grpc-java//stub",
         "@grpc_kotlin_maven//:org_jetbrains_kotlinx_kotlinx_coroutines_core",
         "@grpc_kotlin_maven//:org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm",
     ],
@@ -25,7 +25,7 @@ kt_jvm_library(
     name = "context",
     srcs = ["GrpcContextElement.kt"],
     deps = [
-        "@io_grpc_grpc_java//context",
+        "@grpc-java//context",
         "@grpc_kotlin_maven//:org_jetbrains_kotlinx_kotlinx_coroutines_core",
         "@grpc_kotlin_maven//:org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm",
     ],
diff --git a/stub/src/test/java/io/grpc/kotlin/BUILD.bazel b/stub/src/test/java/io/grpc/kotlin/BUILD.bazel
index b950f4b7..b764dcc3 100644
--- a/stub/src/test/java/io/grpc/kotlin/BUILD.bazel
+++ b/stub/src/test/java/io/grpc/kotlin/BUILD.bazel
@@ -10,7 +10,7 @@ kt_jvm_library(
     srcs = [":AbstractCallsTest.kt"],
     deps = [
         "//stub/src/test/proto/helloworld:hello_world_kt_grpc",
-        "@io_grpc_grpc_java//testing",
+        "@grpc-java//testing",
     ],
 )
 
@@ -53,7 +53,7 @@ kt_jvm_test(
     test_class = "io.grpc.kotlin.GrpcContextElementTest",
     deps = [
         "//stub/src/main/java/io/grpc/kotlin:context",
-        "@io_grpc_grpc_java//core",
+        "@grpc-java//core",
         "@grpc_kotlin_maven//:com_google_truth_truth",
         "@grpc_kotlin_maven//:org_jetbrains_kotlinx_kotlinx_coroutines_core",
     ],