diff --git a/WORKSPACE b/WORKSPACE.bazel
similarity index 98%
rename from WORKSPACE
rename to WORKSPACE.bazel
index b9253ea..e586263 100644
--- a/WORKSPACE
+++ b/WORKSPACE.bazel
@@ -132,7 +132,7 @@
     llvm_configure,
     name = "llvm-project",
     src_path = "third_party/llvm-project",
-    src_workspace = "@iree_core//:WORKSPACE",
+    src_workspace = "@iree_core//:WORKSPACE.bazel",
 )
 ###############################################################################
 
diff --git a/build_tools/bazel/iree.bazelrc b/build_tools/bazel/iree.bazelrc
index 16cf8a4..ec3f7c4 100644
--- a/build_tools/bazel/iree.bazelrc
+++ b/build_tools/bazel/iree.bazelrc
@@ -207,7 +207,7 @@
 # These flags must be adapted to work with toolchain containers other than
 # rbe-ubuntu16-04
 # References to "rbe_default" matches rbe_autoconfig(name="rbe_default") in
-# WORKSPACE
+# WORKSPACE.bazel
 build:rbe --host_javabase=@rbe_default//java:jdk
 build:rbe --javabase=@rbe_default//java:jdk
 build:rbe --host_java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8
diff --git a/build_tools/docker/manage_images.py b/build_tools/docker/manage_images.py
index 6a2165f..0852f62 100755
--- a/build_tools/docker/manage_images.py
+++ b/build_tools/docker/manage_images.py
@@ -162,9 +162,9 @@
 
 
 def update_rbe_reference(digest: str, dry_run: bool = False):
-  print('Updating WORKSPACE file for rbe-toolchain')
+  print('Updating WORKSPACE.bazel file for rbe-toolchain')
   digest_updates = 0
-  for line in fileinput.input(files=['WORKSPACE'], inplace=True):
+  for line in fileinput.input(files=['WORKSPACE.bazel'], inplace=True):
     if line.strip().startswith('digest ='):
       digest_updates += 1
       if dry_run:
@@ -176,8 +176,8 @@
 
   if digest_updates > 1:
     raise RuntimeError(
-        "There is more than one instance of 'digest =' in the WORKSPACE file. "
-        "This means that more than just the 'rbe_toolchain' digest was "
+        "There is more than one instance of 'digest =' in the WORKSPACE.bazel "
+        " file. This means that more than just the 'rbe_toolchain' digest was "
         "overwritten, and the file should be restored.")