Renaming HAL module.

diff --git a/bindings/python/iree/runtime/vm.cc b/bindings/python/iree/runtime/vm.cc
index 003dac6..2474010 100644
--- a/bindings/python/iree/runtime/vm.cc
+++ b/bindings/python/iree/runtime/vm.cc

@@ -10,7 +10,7 @@
 #include "iree/base/api.h"
 #include "iree/base/status.h"
 #include "iree/hal/api.h"
-#include "iree/modules/hal/hal_module.h"
+#include "iree/modules/hal/module.h"
 #include "iree/vm/api.h"
 #include "pybind11/numpy.h"
 

diff --git a/bindings/tflite/interpreter.c b/bindings/tflite/interpreter.c
index 7277a75..259293d 100644
--- a/bindings/tflite/interpreter.c
+++ b/bindings/tflite/interpreter.c

@@ -12,7 +12,7 @@
 #include "iree/base/internal/call_once.h"
 #include "iree/base/tracing.h"
 #include "iree/hal/drivers/init.h"
-#include "iree/modules/hal/hal_module.h"
+#include "iree/modules/hal/module.h"
 
 //===----------------------------------------------------------------------===//
 // HAL / driver support

diff --git a/bindings/tflite/model.c b/bindings/tflite/model.c
index 9e1051c..d7d809a 100644
--- a/bindings/tflite/model.c
+++ b/bindings/tflite/model.c

@@ -10,7 +10,7 @@
 #include <string.h>
 
 #include "iree/base/tracing.h"
-#include "iree/modules/hal/hal_module.h"
+#include "iree/modules/hal/module.h"
 #include "iree/vm/bytecode_module.h"
 
 static iree_status_t _TfLiteModelPrepareRuntime() {

diff --git a/docs/website/docs/bindings/c-api.md b/docs/website/docs/bindings/c-api.md
index 2c82f2b..63e6ac1 100644
--- a/docs/website/docs/bindings/c-api.md
+++ b/docs/website/docs/bindings/c-api.md

@@ -70,7 +70,7 @@
 // The VM bytecode and HAL modules will typically be included, along
 // with those for the specific HAL drivers your application uses.
 // Functionality extensions can be used via custom modules.
-#include "iree/modules/hal/hal_module.h"
+#include "iree/modules/hal/module.h"
 #include "iree/hal/dylib/registration/driver_module.h"
 #include "iree/vm/bytecode_module.h"
 ```

diff --git a/iree/modules/check/check_test.cc b/iree/modules/check/check_test.cc
index 7fb551c..730ba58 100644
--- a/iree/modules/check/check_test.cc
+++ b/iree/modules/check/check_test.cc

@@ -18,7 +18,7 @@
 #include "iree/hal/api.h"
 #include "iree/hal/vmvx/registration/driver_module.h"
 #include "iree/modules/check/native_module.h"
-#include "iree/modules/hal/hal_module.h"
+#include "iree/modules/hal/module.h"
 #include "iree/testing/gtest.h"
 #include "iree/testing/status_matchers.h"
 #include "iree/vm/api.h"

diff --git a/iree/modules/check/native_module.cc b/iree/modules/check/native_module.cc
index b1dcfe2..1c01b71 100644
--- a/iree/modules/check/native_module.cc
+++ b/iree/modules/check/native_module.cc

@@ -21,7 +21,7 @@
 #include "iree/base/internal/math.h"
 #include "iree/base/status.h"
 #include "iree/hal/api.h"
-#include "iree/modules/hal/hal_module.h"
+#include "iree/modules/hal/module.h"
 #include "iree/testing/gtest.h"
 #include "iree/vm/native_module_cc.h"
 #include "iree/vm/ref_cc.h"

diff --git a/iree/modules/hal/BUILD b/iree/modules/hal/BUILD
index e66a960..3003cfb 100644
--- a/iree/modules/hal/BUILD
+++ b/iree/modules/hal/BUILD

@@ -13,10 +13,10 @@
 cc_library(
     name = "hal",
     srcs = [
-        "hal_module.c",
+        "module.c",
     ],
     hdrs = [
-        "hal_module.h",
+        "module.h",
     ],
     textual_hdrs = [
         "exports.inl",

diff --git a/iree/modules/hal/CMakeLists.txt b/iree/modules/hal/CMakeLists.txt
index a226065..903a3a6 100644
--- a/iree/modules/hal/CMakeLists.txt
+++ b/iree/modules/hal/CMakeLists.txt

@@ -14,11 +14,11 @@
   NAME
     hal
   HDRS
-    "hal_module.h"
+    "module.h"
   TEXTUAL_HDRS
     "exports.inl"
   SRCS
-    "hal_module.c"
+    "module.c"
   DEPS
     iree::base
     iree::base::tracing

diff --git a/iree/modules/hal/hal_module.c b/iree/modules/hal/module.c
similarity index 99%
rename from iree/modules/hal/hal_module.c
rename to iree/modules/hal/module.c
index 24d598a..a172fb8 100644
--- a/iree/modules/hal/hal_module.c
+++ b/iree/modules/hal/module.c

@@ -4,7 +4,7 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "iree/modules/hal/hal_module.h"
+#include "iree/modules/hal/module.h"
 
 #include <inttypes.h>
 #include <stdbool.h>

diff --git a/iree/modules/hal/hal_module.h b/iree/modules/hal/module.h
similarity index 95%
rename from iree/modules/hal/hal_module.h
rename to iree/modules/hal/module.h
index 9642cba..4a66ccd 100644
--- a/iree/modules/hal/hal_module.h
+++ b/iree/modules/hal/module.h

@@ -4,8 +4,8 @@
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef IREE_MODULES_HAL_HAL_MODULE_H_
-#define IREE_MODULES_HAL_HAL_MODULE_H_
+#ifndef IREE_MODULES_HAL_MODULE_H_
+#define IREE_MODULES_HAL_MODULE_H_
 
 #include <stdint.h>
 
@@ -66,4 +66,4 @@
 }  // extern "C"
 #endif  // __cplusplus
 
-#endif  // IREE_MODULES_HAL_HAL_MODULE_H_
+#endif  // IREE_MODULES_HAL_MODULE_H_

diff --git a/iree/runtime/call.c b/iree/runtime/call.c
index 6508927..764668a 100644
--- a/iree/runtime/call.c
+++ b/iree/runtime/call.c

@@ -10,7 +10,7 @@
 #include <string.h>
 
 #include "iree/base/api.h"
-#include "iree/modules/hal/hal_module.h"
+#include "iree/modules/hal/module.h"
 #include "iree/runtime/session.h"
 
 //===----------------------------------------------------------------------===//

diff --git a/iree/runtime/instance.c b/iree/runtime/instance.c
index 9b68c04..352bfc5 100644
--- a/iree/runtime/instance.c
+++ b/iree/runtime/instance.c

@@ -13,7 +13,7 @@
 #include "iree/base/tracing.h"
 #include "iree/hal/api.h"
 #include "iree/hal/drivers/init.h"
-#include "iree/modules/hal/hal_module.h"
+#include "iree/modules/hal/module.h"
 #include "iree/vm/api.h"
 
 //===----------------------------------------------------------------------===//

diff --git a/iree/runtime/session.c b/iree/runtime/session.c
index 685e296..ba40aa4 100644
--- a/iree/runtime/session.c
+++ b/iree/runtime/session.c

@@ -13,7 +13,7 @@
 #include "iree/base/internal/file_io.h"
 #include "iree/base/tracing.h"
 #include "iree/hal/api.h"
-#include "iree/modules/hal/hal_module.h"
+#include "iree/modules/hal/module.h"
 #include "iree/runtime/instance.h"
 #include "iree/vm/api.h"
 #include "iree/vm/bytecode_module.h"

diff --git a/iree/samples/custom_modules/custom_modules_test.cc b/iree/samples/custom_modules/custom_modules_test.cc
index 9667784..a3c406a 100644
--- a/iree/samples/custom_modules/custom_modules_test.cc
+++ b/iree/samples/custom_modules/custom_modules_test.cc

@@ -9,7 +9,7 @@
 #include "iree/base/api.h"
 #include "iree/hal/api.h"
 #include "iree/hal/vmvx/registration/driver_module.h"
-#include "iree/modules/hal/hal_module.h"
+#include "iree/modules/hal/module.h"
 #include "iree/samples/custom_modules/custom_modules_test_module_c.h"
 #include "iree/samples/custom_modules/native_module.h"
 #include "iree/testing/gtest.h"

diff --git a/iree/samples/custom_modules/native_module.cc b/iree/samples/custom_modules/native_module.cc
index 9aff5db..12600f4 100644
--- a/iree/samples/custom_modules/native_module.cc
+++ b/iree/samples/custom_modules/native_module.cc

@@ -18,7 +18,7 @@
 #include "iree/base/api.h"
 #include "iree/base/status.h"
 #include "iree/hal/api.h"
-#include "iree/modules/hal/hal_module.h"
+#include "iree/modules/hal/module.h"
 #include "iree/vm/native_module_cc.h"
 #include "iree/vm/ref_cc.h"
 

diff --git a/iree/samples/simple_embedding/simple_embedding.c b/iree/samples/simple_embedding/simple_embedding.c
index 8e36c0f..ecc54d0 100644
--- a/iree/samples/simple_embedding/simple_embedding.c
+++ b/iree/samples/simple_embedding/simple_embedding.c

@@ -12,7 +12,7 @@
 
 #include "iree/base/api.h"
 #include "iree/hal/api.h"
-#include "iree/modules/hal/hal_module.h"
+#include "iree/modules/hal/module.h"
 #include "iree/vm/api.h"
 #include "iree/vm/bytecode_module.h"
 

diff --git a/iree/samples/vulkan/vulkan_inference_gui.cc b/iree/samples/vulkan/vulkan_inference_gui.cc
index cc5fc68..c688a9f 100644
--- a/iree/samples/vulkan/vulkan_inference_gui.cc
+++ b/iree/samples/vulkan/vulkan_inference_gui.cc

@@ -16,7 +16,7 @@
 #include "iree/hal/api.h"
 #include "iree/hal/vulkan/api.h"
 #include "iree/hal/vulkan/registration/driver_module.h"
-#include "iree/modules/hal/hal_module.h"
+#include "iree/modules/hal/module.h"
 #include "iree/vm/api.h"
 #include "iree/vm/bytecode_module.h"
 #include "iree/vm/ref_cc.h"

diff --git a/iree/testing/vulkan/iree-run-module-vulkan-gui-main.cc b/iree/testing/vulkan/iree-run-module-vulkan-gui-main.cc
index 7098cf6..a50ae27 100644
--- a/iree/testing/vulkan/iree-run-module-vulkan-gui-main.cc
+++ b/iree/testing/vulkan/iree-run-module-vulkan-gui-main.cc

@@ -15,7 +15,7 @@
 #include "iree/base/internal/main.h"
 #include "iree/base/status.h"
 #include "iree/hal/vulkan/registration/driver_module.h"
-#include "iree/modules/hal/hal_module.h"
+#include "iree/modules/hal/module.h"
 #include "iree/tools/utils/vm_util.h"
 #include "iree/vm/api.h"
 #include "iree/vm/bytecode_module.h"

diff --git a/iree/tools/android/run_module_app/src/main.cc b/iree/tools/android/run_module_app/src/main.cc
index 39b3368..13734bc 100644
--- a/iree/tools/android/run_module_app/src/main.cc
+++ b/iree/tools/android/run_module_app/src/main.cc

@@ -14,7 +14,7 @@
 
 #include "iree/base/status.h"
 #include "iree/hal/drivers/init.h"
-#include "iree/modules/hal/hal_module.h"
+#include "iree/modules/hal/module.h"
 #include "iree/tools/utils/vm_util.h"
 #include "iree/vm/api.h"
 #include "iree/vm/bytecode_module.h"

diff --git a/iree/tools/iree-benchmark-module-main.cc b/iree/tools/iree-benchmark-module-main.cc
index 1c2f572..db8331e 100644
--- a/iree/tools/iree-benchmark-module-main.cc
+++ b/iree/tools/iree-benchmark-module-main.cc

@@ -21,7 +21,7 @@
 #include "iree/base/tracing.h"
 #include "iree/hal/api.h"
 #include "iree/hal/drivers/init.h"
-#include "iree/modules/hal/hal_module.h"
+#include "iree/modules/hal/module.h"
 #include "iree/tools/utils/vm_util.h"
 #include "iree/vm/api.h"
 #include "iree/vm/bytecode_module.h"

diff --git a/iree/tools/iree-check-module-main.cc b/iree/tools/iree-check-module-main.cc
index c38be3a..90aadc0 100644
--- a/iree/tools/iree-check-module-main.cc
+++ b/iree/tools/iree-check-module-main.cc

@@ -22,7 +22,7 @@
 #include "iree/hal/api.h"
 #include "iree/hal/drivers/init.h"
 #include "iree/modules/check/native_module.h"
-#include "iree/modules/hal/hal_module.h"
+#include "iree/modules/hal/module.h"
 #include "iree/testing/gtest.h"
 #include "iree/testing/status_matchers.h"
 #include "iree/tools/utils/vm_util.h"

diff --git a/iree/tools/iree-run-mlir-main.cc b/iree/tools/iree-run-mlir-main.cc
index 35f5fb0..bbe47bb 100644
--- a/iree/tools/iree-run-mlir-main.cc
+++ b/iree/tools/iree-run-mlir-main.cc

@@ -50,7 +50,7 @@
 #include "iree/compiler/Translation/IREEVM.h"
 #include "iree/hal/api.h"
 #include "iree/hal/drivers/init.h"
-#include "iree/modules/hal/hal_module.h"
+#include "iree/modules/hal/module.h"
 #include "iree/tools/init_dialects.h"
 #include "iree/tools/init_targets.h"
 #include "iree/tools/utils/vm_util.h"

diff --git a/iree/tools/iree-run-module-main.cc b/iree/tools/iree-run-module-main.cc
index c303ac8..4dc4e71 100644
--- a/iree/tools/iree-run-module-main.cc
+++ b/iree/tools/iree-run-module-main.cc

@@ -19,7 +19,7 @@
 #include "iree/base/tracing.h"
 #include "iree/hal/api.h"
 #include "iree/hal/drivers/init.h"
-#include "iree/modules/hal/hal_module.h"
+#include "iree/modules/hal/module.h"
 #include "iree/tools/utils/vm_util.h"
 #include "iree/vm/api.h"
 #include "iree/vm/bytecode_module.h"

diff --git a/iree/tools/utils/vm_util.cc b/iree/tools/utils/vm_util.cc
index cae61c5..e9c98be 100644
--- a/iree/tools/utils/vm_util.cc
+++ b/iree/tools/utils/vm_util.cc

@@ -19,7 +19,7 @@
 #include "iree/base/status.h"
 #include "iree/base/tracing.h"
 #include "iree/hal/api.h"
-#include "iree/modules/hal/hal_module.h"
+#include "iree/modules/hal/module.h"
 #include "iree/vm/ref_cc.h"
 
 namespace iree {

diff --git a/iree/tools/utils/vm_util_test.cc b/iree/tools/utils/vm_util_test.cc
index e9fdb82..29df93b 100644
--- a/iree/tools/utils/vm_util_test.cc
+++ b/iree/tools/utils/vm_util_test.cc

@@ -9,7 +9,7 @@
 #include "iree/base/api.h"
 #include "iree/hal/api.h"
 #include "iree/hal/vmvx/registration/driver_module.h"
-#include "iree/modules/hal/hal_module.h"
+#include "iree/modules/hal/module.h"
 #include "iree/testing/gtest.h"
 #include "iree/testing/status_matchers.h"
 #include "iree/vm/api.h"