diff --git a/WORKSPACE b/WORKSPACE
index e0ae4f079a..65bf26a8b2 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1,4 +1,4 @@
-workspace(name = "grpc_java")
+workspace(name = "io_grpc_grpc_java")
 
 load("//:repositories.bzl", "grpc_java_repositories")
 
diff --git a/examples/BUILD.bazel b/examples/BUILD.bazel
index 4d69004979..dce466cb78 100644
--- a/examples/BUILD.bazel
+++ b/examples/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@grpc_java//:java_grpc_library.bzl", "java_grpc_library")
+load("@io_grpc_grpc_java//:java_grpc_library.bzl", "java_grpc_library")
 
 proto_library(
     name = "helloworld_proto",
@@ -71,11 +71,11 @@ java_library(
         "@com_google_guava_guava//jar",
         "@com_google_protobuf//:protobuf_java",
         "@com_google_protobuf//:protobuf_java_util",
-        "@grpc_java//alts",
-        "@grpc_java//core",
-        "@grpc_java//netty",
-        "@grpc_java//protobuf",
-        "@grpc_java//stub",
+        "@io_grpc_grpc_java//alts",
+        "@io_grpc_grpc_java//core",
+        "@io_grpc_grpc_java//netty",
+        "@io_grpc_grpc_java//protobuf",
+        "@io_grpc_grpc_java//stub",
         "@io_netty_netty_handler//jar",
     ],
 )
@@ -104,8 +104,8 @@ java_binary(
     main_class = "io.grpc.examples.alts.HelloWorldAltsClient",
     runtime_deps = [
         ":examples",
-        "@grpc_java//alts",
-        "@grpc_java//netty",
+        "@io_grpc_grpc_java//alts",
+        "@io_grpc_grpc_java//netty",
     ],
 )
 
@@ -115,10 +115,9 @@ java_binary(
     main_class = "io.grpc.examples.alts.HelloWorldAltsServer",
     runtime_deps = [
         ":examples",
-        "@grpc_java//alts",
-        "@grpc_java//netty",
+        "@io_grpc_grpc_java//alts",
+        "@io_grpc_grpc_java//netty",
     ],
-
 )
 
 java_binary(
diff --git a/examples/WORKSPACE b/examples/WORKSPACE
index cbcd86bb7c..b86f705e6f 100644
--- a/examples/WORKSPACE
+++ b/examples/WORKSPACE
@@ -2,16 +2,15 @@ workspace(name = "examples")
 
 # For released versions, use the tagged git-repository:
 # git_repository(
-#     name = "grpc_java",
+#     name = "io_grpc_grpc_java",
 #     remote = "https://github.com/grpc/grpc-java.git",
 #     tag = "<TAG>",
 # )
 local_repository(
-    name = "grpc_java",
+    name = "io_grpc_grpc_java",
     path = "..",
 )
 
-load("@grpc_java//:repositories.bzl", "grpc_java_repositories")
+load("@io_grpc_grpc_java//:repositories.bzl", "grpc_java_repositories")
 
 grpc_java_repositories()
-