diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl
index 35d77d14e93..3099caad362 100755
--- a/tensorflow/workspace.bzl
+++ b/tensorflow/workspace.bzl
@@ -722,8 +722,8 @@ def tf_repositories(path_prefix = "", tf_repo_name = ""):
 
     # Intel openMP that is part of LLVM sources.
     tf_http_archive(
-        name = "llvm-openmp",
-	build_file = clean_dep("//third_party/llvm-openmp:BUILD"),
+        name = "llvm_openmp",
+        build_file = clean_dep("//third_party/llvm_openmp:BUILD"),
         sha256 = "d19f728c8e04fb1e94566c8d76aef50ec926cd2f95ef3bf1e0a5de4909b28b44",
         strip_prefix = "openmp-10.0.1.src",
         urls = [
diff --git a/third_party/llvm/BUILD b/third_party/llvm/BUILD
index 46cf18dd3da..d027832669d 100644
--- a/third_party/llvm/BUILD
+++ b/third_party/llvm/BUILD
@@ -3,7 +3,7 @@ py_binary(
     srcs = ["expand_cmake_vars.py"],
     srcs_version = "PY2AND3",
     visibility = [
-        "@llvm-openmp//:__subpackages__",
+        "@llvm_openmp//:__subpackages__",
         "@llvm-project//:__subpackages__",
     ],
 )
diff --git a/third_party/llvm-openmp/BUILD b/third_party/llvm_openmp/BUILD
similarity index 100%
rename from third_party/llvm-openmp/BUILD
rename to third_party/llvm_openmp/BUILD
diff --git a/third_party/mkl/BUILD b/third_party/mkl/BUILD
index 8b9e0e6b0bc..61c06ba4d6b 100644
--- a/third_party/mkl/BUILD
+++ b/third_party/mkl/BUILD
@@ -34,7 +34,7 @@ filegroup(
     name = "LICENSE",
     srcs = ["MKL_LICENSE"] + select({
         "@org_tensorflow//tensorflow:linux_x86_64": [
-            "@llvm-openmp//:LICENSE.txt",
+            "@llvm_openmp//:LICENSE.txt",
         ],
         "@org_tensorflow//tensorflow:macos": [
             "@mkl_darwin//:LICENSE",
@@ -48,12 +48,12 @@ filegroup(
 )
 
 # TODO(Intel-tf) Remove the following call to cc_library and replace all uses
-# of mkl_libs_linux with @llvm-openmp//:libiomp5.so directly.
+# of mkl_libs_linux with @llvm_openmp//:libiomp5.so directly.
 
 cc_library(
     name = "mkl_libs_linux",
     srcs = [
-        "@llvm-openmp//:libiomp5.so",
+        "@llvm_openmp//:libiomp5.so",
     ],
     visibility = ["//visibility:public"],
 )