diff --git a/include/mlir-hlo/Dialect/mhlo/IR/hlo_ops.h b/include/mlir-hlo/Dialect/mhlo/IR/hlo_ops.h
index ee55325..e57aa60 100644
--- a/include/mlir-hlo/Dialect/mhlo/IR/hlo_ops.h
+++ b/include/mlir-hlo/Dialect/mhlo/IR/hlo_ops.h
@@ -39,9 +39,9 @@ class OpBuilder;
 
 namespace mhlo {
 
-class XlaHloDialect : public Dialect {
+class MhloDialect : public Dialect {
  public:
-  explicit XlaHloDialect(MLIRContext *context);
+  explicit MhloDialect(MLIRContext *context);
   static StringRef getDialectNamespace() { return "mhlo"; }
 
   // Registered hook to materialize a constant operation from a given attribute
diff --git a/lib/Dialect/mhlo/IR/dialect_registration.cc b/lib/Dialect/mhlo/IR/dialect_registration.cc
index 743fb81..44c68b8 100644
--- a/lib/Dialect/mhlo/IR/dialect_registration.cc
+++ b/lib/Dialect/mhlo/IR/dialect_registration.cc
@@ -18,6 +18,6 @@ limitations under the License.
 #include "third_party/tensorflow/compiler/mlir/hlo/include/mlir-hlo/Dialect/mhlo/IR/lhlo_ops.h"
 
 // Static initialization for XLA dialect registration.
-static mlir::DialectRegistration<mlir::mhlo::XlaHloDialect> mhlo_ops;
+static mlir::DialectRegistration<mlir::mhlo::MhloDialect> mhlo_ops;
 static mlir::DialectRegistration<mlir::chlo::HloClientDialect> chlo_ops;
 static mlir::DialectRegistration<mlir::lmhlo::LmhloDialect> lmhlo_ops;
diff --git a/lib/Dialect/mhlo/IR/hlo_ops.cc b/lib/Dialect/mhlo/IR/hlo_ops.cc
index 93f9ad7..645bffc 100644
--- a/lib/Dialect/mhlo/IR/hlo_ops.cc
+++ b/lib/Dialect/mhlo/IR/hlo_ops.cc
@@ -62,9 +62,8 @@ namespace mlir {
 #include "third_party/tensorflow/compiler/mlir/hlo/include/mlir-hlo/Dialect/mhlo/IR/hlo_structs.cc.inc"
 namespace mhlo {
 
-Operation* XlaHloDialect::materializeConstant(OpBuilder& builder,
-                                              Attribute value, Type type,
-                                              Location loc) {
+Operation* MhloDialect::materializeConstant(OpBuilder& builder, Attribute value,
+                                            Type type, Location loc) {
   // HLO dialect constants only support ElementsAttr unlike standard dialect
   // constant which supports all attributes.
   if (value.isa<ElementsAttr>())
@@ -2128,7 +2127,7 @@ struct HLOInlinerInterface : public DialectInlinerInterface {
 // mhlo Dialect Constructor
 //===----------------------------------------------------------------------===//
 
-XlaHloDialect::XlaHloDialect(MLIRContext* context)
+MhloDialect::MhloDialect(MLIRContext* context)
     : Dialect(getDialectNamespace(), context) {
   addOperations<
 #define GET_OP_LIST
@@ -2140,7 +2139,7 @@ XlaHloDialect::XlaHloDialect(MLIRContext* context)
   // allowUnknownOperations();
 }
 
-Type XlaHloDialect::parseType(DialectAsmParser& parser) const {
+Type MhloDialect::parseType(DialectAsmParser& parser) const {
   StringRef data_type;
   if (parser.parseKeyword(&data_type)) return Type();
 
@@ -2149,7 +2148,7 @@ Type XlaHloDialect::parseType(DialectAsmParser& parser) const {
   return nullptr;
 }
 
-void XlaHloDialect::printType(Type type, DialectAsmPrinter& os) const {
+void MhloDialect::printType(Type type, DialectAsmPrinter& os) const {
   if (type.isa<TokenType>()) {
     os << "token";
     return;
diff --git a/lib/Dialect/mhlo/transforms/chlo_legalize_to_hlo_pass.cc b/lib/Dialect/mhlo/transforms/chlo_legalize_to_hlo_pass.cc
index 11be2cc..e006072 100644
--- a/lib/Dialect/mhlo/transforms/chlo_legalize_to_hlo_pass.cc
+++ b/lib/Dialect/mhlo/transforms/chlo_legalize_to_hlo_pass.cc
@@ -33,7 +33,7 @@ struct TestChloLegalizeToHloPass
 
     conversionTarget.addIllegalDialect<HloClientDialect>();
     // Consider the mhlo dialect legal for tests.
-    conversionTarget.addLegalDialect<mhlo::XlaHloDialect>();
+    conversionTarget.addLegalDialect<mhlo::MhloDialect>();
     // The conversion uses helpers from the Standard dialect.
     conversionTarget.addLegalDialect<mlir::StandardOpsDialect>();
     conversionTarget.addLegalDialect<mlir::shape::ShapeDialect>();
diff --git a/lib/Dialect/mhlo/transforms/hlo_legalize_to_lhlo.cc b/lib/Dialect/mhlo/transforms/hlo_legalize_to_lhlo.cc
index fb5dfc4..8425f0f 100644
--- a/lib/Dialect/mhlo/transforms/hlo_legalize_to_lhlo.cc
+++ b/lib/Dialect/mhlo/transforms/hlo_legalize_to_lhlo.cc
@@ -413,7 +413,7 @@ struct HloLegalizeToLhlo
     target.addIllegalOp<mlir::TensorStoreOp>();
     target.addLegalOp<ModuleTerminatorOp>();
     target.addLegalOp<TensorFromElementsOp>();
-    target.addIllegalDialect<mhlo::XlaHloDialect>();
+    target.addIllegalDialect<mhlo::MhloDialect>();
 
     BufferAssignmentTypeConverter converter;
     auto isMemRefType = [](Type type) { return type.isa<BaseMemRefType>(); };
diff --git a/lib/Dialect/mhlo/transforms/materialize_broadcasts_pass.cc b/lib/Dialect/mhlo/transforms/materialize_broadcasts_pass.cc
index 1f55bfa..b267642 100644
--- a/lib/Dialect/mhlo/transforms/materialize_broadcasts_pass.cc
+++ b/lib/Dialect/mhlo/transforms/materialize_broadcasts_pass.cc
@@ -34,7 +34,7 @@ struct TestMaterializeBroadcastsPass
     OwningRewritePatternList conversionPatterns;
 
     // Consider the mhlo dialect legal for tests.
-    conversionTarget.addLegalDialect<XlaHloDialect>();
+    conversionTarget.addLegalDialect<MhloDialect>();
     // The conversion uses helpers from the Standard dialect.
     conversionTarget.addLegalDialect<mlir::StandardOpsDialect>();
 
diff --git a/lib/Dialect/mhlo/transforms/xla_transform_unranked_hlo.cc b/lib/Dialect/mhlo/transforms/xla_transform_unranked_hlo.cc
index c238085..fb8630a 100644
--- a/lib/Dialect/mhlo/transforms/xla_transform_unranked_hlo.cc
+++ b/lib/Dialect/mhlo/transforms/xla_transform_unranked_hlo.cc
@@ -152,7 +152,7 @@ struct TransformUnrankedHloPass
     // Setup conversion target.
     MLIRContext &ctx = getContext();
     ConversionTarget target(ctx);
-    target.addLegalDialect<XlaHloDialect, StandardOpsDialect,
+    target.addLegalDialect<MhloDialect, StandardOpsDialect,
                            shape::ShapeDialect>();
     target.addLegalOp<FuncOp>();
     AddLegalOpOnRankedTensor<SqrtOp>(&target);