diff --git a/mlir/include/mlir/Dialect/CMakeLists.txt b/mlir/include/mlir/Dialect/CMakeLists.txt
index db9de7b7ea3a..c35f68dfcf7d 100644
--- a/mlir/include/mlir/Dialect/CMakeLists.txt
+++ b/mlir/include/mlir/Dialect/CMakeLists.txt
@@ -5,7 +5,7 @@ add_subdirectory(Linalg)
 add_subdirectory(LLVMIR)
 add_subdirectory(LoopOps)
 add_subdirectory(OpenMP)
-add_subdirectory(QuantOps)
+add_subdirectory(Quant)
 add_subdirectory(Shape)
 add_subdirectory(SPIRV)
 add_subdirectory(StandardOps)
diff --git a/mlir/include/mlir/Dialect/FxpMathOps/FxpMathOps.td b/mlir/include/mlir/Dialect/FxpMathOps/FxpMathOps.td
index 7e6625d04ef4..ea93f3b16f12 100644
--- a/mlir/include/mlir/Dialect/FxpMathOps/FxpMathOps.td
+++ b/mlir/include/mlir/Dialect/FxpMathOps/FxpMathOps.td
@@ -15,7 +15,7 @@
 #define DIALECT_FXPMATHOPS_FXPMATH_OPS_
 
 include "mlir/IR/OpBase.td"
-include "mlir/Dialect/QuantOps/QuantOpsBase.td"
+include "mlir/Dialect/Quant/QuantOpsBase.td"
 include "mlir/Interfaces/SideEffects.td"
 
 def FxpMathOps_Dialect : Dialect {
diff --git a/mlir/include/mlir/Dialect/QuantOps/CMakeLists.txt b/mlir/include/mlir/Dialect/Quant/CMakeLists.txt
similarity index 100%
rename from mlir/include/mlir/Dialect/QuantOps/CMakeLists.txt
rename to mlir/include/mlir/Dialect/Quant/CMakeLists.txt
diff --git a/mlir/include/mlir/Dialect/QuantOps/FakeQuantSupport.h b/mlir/include/mlir/Dialect/Quant/FakeQuantSupport.h
similarity index 94%
rename from mlir/include/mlir/Dialect/QuantOps/FakeQuantSupport.h
rename to mlir/include/mlir/Dialect/Quant/FakeQuantSupport.h
index d4d9c3987ea9..367d468b2acf 100644
--- a/mlir/include/mlir/Dialect/QuantOps/FakeQuantSupport.h
+++ b/mlir/include/mlir/Dialect/Quant/FakeQuantSupport.h
@@ -34,10 +34,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_DIALECT_QUANTOPS_FAKEQUANTSUPPORT_H_
-#define MLIR_DIALECT_QUANTOPS_FAKEQUANTSUPPORT_H_
+#ifndef MLIR_DIALECT_QUANT_FAKEQUANTSUPPORT_H_
+#define MLIR_DIALECT_QUANT_FAKEQUANTSUPPORT_H_
 
-#include "mlir/Dialect/QuantOps/QuantTypes.h"
+#include "mlir/Dialect/Quant/QuantTypes.h"
 
 namespace mlir {
 namespace quant {
@@ -64,4 +64,4 @@ fakeQuantAttrsToType(Location loc, unsigned numBits, int32_t quantizedDimension,
 } // namespace quant
 } // namespace mlir
 
-#endif // MLIR_DIALECT_QUANTOPS_FAKEQUANTSUPPORT_H_
+#endif // MLIR_DIALECT_QUANT_FAKEQUANTSUPPORT_H_
diff --git a/mlir/include/mlir/Dialect/QuantOps/Passes.h b/mlir/include/mlir/Dialect/Quant/Passes.h
similarity index 92%
rename from mlir/include/mlir/Dialect/QuantOps/Passes.h
rename to mlir/include/mlir/Dialect/Quant/Passes.h
index 6b2d6c72e6b9..34c7c1f011a7 100644
--- a/mlir/include/mlir/Dialect/QuantOps/Passes.h
+++ b/mlir/include/mlir/Dialect/Quant/Passes.h
@@ -13,8 +13,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_DIALECT_QUANTOPS_PASSES_H
-#define MLIR_DIALECT_QUANTOPS_PASSES_H
+#ifndef MLIR_DIALECT_QUANT_PASSES_H
+#define MLIR_DIALECT_QUANT_PASSES_H
 
 #include <memory>
 
@@ -38,4 +38,4 @@ std::unique_ptr<OpPassBase<FuncOp>> createConvertConstPass();
 } // namespace quant
 } // namespace mlir
 
-#endif // MLIR_DIALECT_QUANTOPS_PASSES_H
+#endif // MLIR_DIALECT_QUANT_PASSES_H
diff --git a/mlir/include/mlir/Dialect/QuantOps/QuantOps.h b/mlir/include/mlir/Dialect/Quant/QuantOps.h
similarity index 76%
rename from mlir/include/mlir/Dialect/QuantOps/QuantOps.h
rename to mlir/include/mlir/Dialect/Quant/QuantOps.h
index 802be083e30a..fba6203cf2f3 100644
--- a/mlir/include/mlir/Dialect/QuantOps/QuantOps.h
+++ b/mlir/include/mlir/Dialect/Quant/QuantOps.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_DIALECT_QUANTOPS_QUANTOPS_H_
-#define MLIR_DIALECT_QUANTOPS_QUANTOPS_H_
+#ifndef MLIR_DIALECT_QUANT_QUANTOPS_H_
+#define MLIR_DIALECT_QUANT_QUANTOPS_H_
 
 #include "mlir/IR/Attributes.h"
 #include "mlir/IR/Builders.h"
@@ -21,12 +21,12 @@
 namespace mlir {
 namespace quant {
 
-#include "mlir/Dialect/QuantOps/QuantOpsDialect.h.inc"
+#include "mlir/Dialect/Quant/QuantOpsDialect.h.inc"
 
 #define GET_OP_CLASSES
-#include "mlir/Dialect/QuantOps/QuantOps.h.inc"
+#include "mlir/Dialect/Quant/QuantOps.h.inc"
 
 } // namespace quant
 } // namespace mlir
 
-#endif // MLIR_DIALECT_QUANTOPS_QUANTOPS_H_
+#endif // MLIR_DIALECT_QUANT_QUANTOPS_H_
diff --git a/mlir/include/mlir/Dialect/QuantOps/QuantOps.td b/mlir/include/mlir/Dialect/Quant/QuantOps.td
similarity index 98%
rename from mlir/include/mlir/Dialect/QuantOps/QuantOps.td
rename to mlir/include/mlir/Dialect/Quant/QuantOps.td
index 0047b41efd60..57e37534efb7 100644
--- a/mlir/include/mlir/Dialect/QuantOps/QuantOps.td
+++ b/mlir/include/mlir/Dialect/Quant/QuantOps.td
@@ -10,10 +10,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DIALECT_QUANTOPS_QUANT_OPS_
-#define DIALECT_QUANTOPS_QUANT_OPS_
+#ifndef DIALECT_QUANT_QUANT_OPS_
+#define DIALECT_QUANT_QUANT_OPS_
 
-include "mlir/Dialect/QuantOps/QuantOpsBase.td"
+include "mlir/Dialect/Quant/QuantOpsBase.td"
 include "mlir/Interfaces/SideEffects.td"
 
 //===----------------------------------------------------------------------===//
@@ -281,4 +281,4 @@ def quant_CoupledRefOp : quant_Op<"coupled_ref", [SameOperandsAndResultType]> {
   let results = (outs quant_RealValueType);
 }
 
-#endif // DIALECT_QUANTOPS_QUANT_OPS_
+#endif // DIALECT_QUANT_QUANT_OPS_
diff --git a/mlir/include/mlir/Dialect/QuantOps/QuantOpsBase.td b/mlir/include/mlir/Dialect/Quant/QuantOpsBase.td
similarity index 95%
rename from mlir/include/mlir/Dialect/QuantOps/QuantOpsBase.td
rename to mlir/include/mlir/Dialect/Quant/QuantOpsBase.td
index 84efcc1c8fc0..aa7c311e20a3 100644
--- a/mlir/include/mlir/Dialect/QuantOps/QuantOpsBase.td
+++ b/mlir/include/mlir/Dialect/Quant/QuantOpsBase.td
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef DIALECT_QUANTOPS_QUANT_OPS_BASE_
-#define DIALECT_QUANTOPS_QUANT_OPS_BASE_
+#ifndef DIALECT_QUANT_QUANT_OPS_BASE_
+#define DIALECT_QUANT_QUANT_OPS_BASE_
 
 include "mlir/IR/OpBase.td"
 
@@ -68,4 +68,4 @@ def quant_UniformQuantizedType :
 def quant_UniformQuantizedValueType :
     quant_TypedPrimitiveOrContainer<quant_UniformQuantizedType>;
 
-#endif // DIALECT_QUANTOPS_QUANT_OPS_BASE_
+#endif // DIALECT_QUANT_QUANT_OPS_BASE_
diff --git a/mlir/include/mlir/Dialect/QuantOps/QuantTypes.h b/mlir/include/mlir/Dialect/Quant/QuantTypes.h
similarity index 99%
rename from mlir/include/mlir/Dialect/QuantOps/QuantTypes.h
rename to mlir/include/mlir/Dialect/Quant/QuantTypes.h
index b533198ef078..6062da0a0d5b 100644
--- a/mlir/include/mlir/Dialect/QuantOps/QuantTypes.h
+++ b/mlir/include/mlir/Dialect/Quant/QuantTypes.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_DIALECT_QUANTOPS_QUANT_TYPES_H_
-#define MLIR_DIALECT_QUANTOPS_QUANT_TYPES_H_
+#ifndef MLIR_DIALECT_QUANT_QUANT_TYPES_H_
+#define MLIR_DIALECT_QUANT_QUANT_TYPES_H_
 
 #include "mlir/IR/Attributes.h"
 #include "mlir/IR/Builders.h"
@@ -399,4 +399,4 @@ public:
 } // namespace quant
 } // namespace mlir
 
-#endif // MLIR_DIALECT_QUANTOPS_QUANT_TYPES_H_
+#endif // MLIR_DIALECT_QUANT_QUANT_TYPES_H_
diff --git a/mlir/include/mlir/Dialect/QuantOps/QuantizeUtils.h b/mlir/include/mlir/Dialect/Quant/QuantizeUtils.h
similarity index 94%
rename from mlir/include/mlir/Dialect/QuantOps/QuantizeUtils.h
rename to mlir/include/mlir/Dialect/Quant/QuantizeUtils.h
index 3847695ce692..4f4714f3aadf 100644
--- a/mlir/include/mlir/Dialect/QuantOps/QuantizeUtils.h
+++ b/mlir/include/mlir/Dialect/Quant/QuantizeUtils.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_DIALECT_QUANTOPS_QUANTIZEUTILS_H_
-#define MLIR_DIALECT_QUANTOPS_QUANTIZEUTILS_H_
+#ifndef MLIR_DIALECT_QUANT_QUANTIZEUTILS_H_
+#define MLIR_DIALECT_QUANT_QUANTIZEUTILS_H_
 
 namespace mlir {
 class Attribute;
@@ -58,4 +58,4 @@ Attribute quantizeAttrUniform(Attribute realValue,
 } // namespace quant
 } // namespace mlir
 
-#endif // MLIR_DIALECT_QUANTOPS_QUANTIZEUTILS_H_
+#endif // MLIR_DIALECT_QUANT_QUANTIZEUTILS_H_
diff --git a/mlir/include/mlir/Dialect/QuantOps/UniformSupport.h b/mlir/include/mlir/Dialect/Quant/UniformSupport.h
similarity index 97%
rename from mlir/include/mlir/Dialect/QuantOps/UniformSupport.h
rename to mlir/include/mlir/Dialect/Quant/UniformSupport.h
index 23d900b7367e..30c4db0abc8e 100644
--- a/mlir/include/mlir/Dialect/QuantOps/UniformSupport.h
+++ b/mlir/include/mlir/Dialect/Quant/UniformSupport.h
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef MLIR_DIALECT_QUANTOPS_UNIFORMSUPPORT_H_
-#define MLIR_DIALECT_QUANTOPS_UNIFORMSUPPORT_H_
+#ifndef MLIR_DIALECT_QUANT_UNIFORMSUPPORT_H_
+#define MLIR_DIALECT_QUANT_UNIFORMSUPPORT_H_
 
-#include "mlir/Dialect/QuantOps/QuantTypes.h"
+#include "mlir/Dialect/Quant/QuantTypes.h"
 #include "mlir/IR/StandardTypes.h"
 #include "mlir/IR/Types.h"
 #include "llvm/ADT/APFloat.h"
@@ -215,4 +215,4 @@ private:
 } // namespace quant
 } // namespace mlir
 
-#endif // MLIR_DIALECT_QUANTOPS_UNIFORMSUPPORT_H_
+#endif // MLIR_DIALECT_QUANT_UNIFORMSUPPORT_H_
diff --git a/mlir/include/mlir/InitAllDialects.h b/mlir/include/mlir/InitAllDialects.h
index f2615e8caccf..690e421f8abc 100644
--- a/mlir/include/mlir/InitAllDialects.h
+++ b/mlir/include/mlir/InitAllDialects.h
@@ -23,7 +23,7 @@
 #include "mlir/Dialect/Linalg/IR/LinalgOps.h"
 #include "mlir/Dialect/LoopOps/LoopOps.h"
 #include "mlir/Dialect/OpenMP/OpenMPDialect.h"
-#include "mlir/Dialect/QuantOps/QuantOps.h"
+#include "mlir/Dialect/Quant/QuantOps.h"
 #include "mlir/Dialect/SDBM/SDBMDialect.h"
 #include "mlir/Dialect/SPIRV/SPIRVDialect.h"
 #include "mlir/Dialect/Shape/IR/Shape.h"
diff --git a/mlir/include/mlir/InitAllPasses.h b/mlir/include/mlir/InitAllPasses.h
index 9db334a76b64..b358cfa8802e 100644
--- a/mlir/include/mlir/InitAllPasses.h
+++ b/mlir/include/mlir/InitAllPasses.h
@@ -29,7 +29,7 @@
 #include "mlir/Dialect/LLVMIR/Transforms/LegalizeForExport.h"
 #include "mlir/Dialect/Linalg/Passes.h"
 #include "mlir/Dialect/LoopOps/Passes.h"
-#include "mlir/Dialect/QuantOps/Passes.h"
+#include "mlir/Dialect/Quant/Passes.h"
 #include "mlir/Dialect/SPIRV/Passes.h"
 #include "mlir/Quantizer/Transforms/Passes.h"
 #include "mlir/Transforms/LocationSnapshot.h"
diff --git a/mlir/include/mlir/Quantizer/Support/Configuration.h b/mlir/include/mlir/Quantizer/Support/Configuration.h
index 1d70b40f6cd4..3ca5aa334a63 100644
--- a/mlir/include/mlir/Quantizer/Support/Configuration.h
+++ b/mlir/include/mlir/Quantizer/Support/Configuration.h
@@ -17,7 +17,7 @@
 
 #include <functional>
 
-#include "mlir/Dialect/QuantOps/QuantTypes.h"
+#include "mlir/Dialect/Quant/QuantTypes.h"
 #include "mlir/IR/Identifier.h"
 #include "mlir/Quantizer/Support/ConstraintAnalysisGraph.h"
 #include "mlir/Quantizer/Support/Metadata.h"
diff --git a/mlir/include/mlir/Quantizer/Support/Metadata.h b/mlir/include/mlir/Quantizer/Support/Metadata.h
index 1a80ac036215..7f16670748ec 100644
--- a/mlir/include/mlir/Quantizer/Support/Metadata.h
+++ b/mlir/include/mlir/Quantizer/Support/Metadata.h
@@ -17,7 +17,7 @@
 
 #include <limits>
 
-#include "mlir/Dialect/QuantOps/QuantTypes.h"
+#include "mlir/Dialect/Quant/QuantTypes.h"
 #include "mlir/IR/MLIRContext.h"
 #include "mlir/Quantizer/Support/Rules.h"
 #include "llvm/ADT/SmallBitVector.h"
diff --git a/mlir/lib/Dialect/CMakeLists.txt b/mlir/lib/Dialect/CMakeLists.txt
index 2bb137f4795b..1371fcd3baf0 100644
--- a/mlir/lib/Dialect/CMakeLists.txt
+++ b/mlir/lib/Dialect/CMakeLists.txt
@@ -5,7 +5,7 @@ add_subdirectory(Linalg)
 add_subdirectory(LLVMIR)
 add_subdirectory(LoopOps)
 add_subdirectory(OpenMP)
-add_subdirectory(QuantOps)
+add_subdirectory(Quant)
 add_subdirectory(SDBM)
 add_subdirectory(Shape)
 add_subdirectory(SPIRV)
diff --git a/mlir/lib/Dialect/FxpMathOps/IR/FxpMathOps.cpp b/mlir/lib/Dialect/FxpMathOps/IR/FxpMathOps.cpp
index 3cc4f7710e10..069f431238bc 100644
--- a/mlir/lib/Dialect/FxpMathOps/IR/FxpMathOps.cpp
+++ b/mlir/lib/Dialect/FxpMathOps/IR/FxpMathOps.cpp
@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "mlir/Dialect/FxpMathOps/FxpMathOps.h"
-#include "mlir/Dialect/QuantOps/QuantTypes.h"
+#include "mlir/Dialect/Quant/QuantTypes.h"
 #include "mlir/IR/MLIRContext.h"
 #include "mlir/IR/StandardTypes.h"
 #include "llvm/ADT/StringRef.h"
diff --git a/mlir/lib/Dialect/FxpMathOps/Transforms/UniformKernelUtils.h b/mlir/lib/Dialect/FxpMathOps/Transforms/UniformKernelUtils.h
index 1f52156533f2..e41eeea5b2f3 100644
--- a/mlir/lib/Dialect/FxpMathOps/Transforms/UniformKernelUtils.h
+++ b/mlir/lib/Dialect/FxpMathOps/Transforms/UniformKernelUtils.h
@@ -9,9 +9,9 @@
 #ifndef MLIR_FXPMATH_UNIFORM_KERNEL_UTILS_H_
 #define MLIR_FXPMATH_UNIFORM_KERNEL_UTILS_H_
 
-#include "mlir/Dialect/QuantOps/QuantOps.h"
-#include "mlir/Dialect/QuantOps/QuantTypes.h"
-#include "mlir/Dialect/QuantOps/UniformSupport.h"
+#include "mlir/Dialect/Quant/QuantOps.h"
+#include "mlir/Dialect/Quant/QuantTypes.h"
+#include "mlir/Dialect/Quant/UniformSupport.h"
 #include "mlir/IR/Operation.h"
 
 #include <cmath>
diff --git a/mlir/lib/Dialect/QuantOps/CMakeLists.txt b/mlir/lib/Dialect/Quant/CMakeLists.txt
similarity index 100%
rename from mlir/lib/Dialect/QuantOps/CMakeLists.txt
rename to mlir/lib/Dialect/Quant/CMakeLists.txt
diff --git a/mlir/lib/Dialect/QuantOps/IR/QuantOps.cpp b/mlir/lib/Dialect/Quant/IR/QuantOps.cpp
similarity index 94%
rename from mlir/lib/Dialect/QuantOps/IR/QuantOps.cpp
rename to mlir/lib/Dialect/Quant/IR/QuantOps.cpp
index f87330cff016..f67a9f7fbc22 100644
--- a/mlir/lib/Dialect/QuantOps/IR/QuantOps.cpp
+++ b/mlir/lib/Dialect/Quant/IR/QuantOps.cpp
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "mlir/Dialect/QuantOps/QuantOps.h"
+#include "mlir/Dialect/Quant/QuantOps.h"
 #include "TypeDetail.h"
 
-#include "mlir/Dialect/QuantOps/QuantTypes.h"
+#include "mlir/Dialect/Quant/QuantTypes.h"
 #include "mlir/IR/MLIRContext.h"
 #include "mlir/IR/Matchers.h"
 #include "mlir/IR/PatternMatch.h"
@@ -29,7 +29,7 @@ QuantizationDialect::QuantizationDialect(MLIRContext *context)
            UniformQuantizedPerAxisType>();
   addOperations<
 #define GET_OP_LIST
-#include "mlir/Dialect/QuantOps/QuantOps.cpp.inc"
+#include "mlir/Dialect/Quant/QuantOps.cpp.inc"
       >();
 }
 
@@ -93,4 +93,4 @@ static LogicalResult verifyRegionOp(QuantizeRegionOp op) {
 }
 
 #define GET_OP_CLASSES
-#include "mlir/Dialect/QuantOps/QuantOps.cpp.inc"
+#include "mlir/Dialect/Quant/QuantOps.cpp.inc"
diff --git a/mlir/lib/Dialect/QuantOps/IR/QuantTypes.cpp b/mlir/lib/Dialect/Quant/IR/QuantTypes.cpp
similarity index 99%
rename from mlir/lib/Dialect/QuantOps/IR/QuantTypes.cpp
rename to mlir/lib/Dialect/Quant/IR/QuantTypes.cpp
index d8cee1afe255..7ef5b4a77c54 100644
--- a/mlir/lib/Dialect/QuantOps/IR/QuantTypes.cpp
+++ b/mlir/lib/Dialect/Quant/IR/QuantTypes.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "mlir/Dialect/QuantOps/QuantTypes.h"
+#include "mlir/Dialect/Quant/QuantTypes.h"
 #include "TypeDetail.h"
 
 #include "mlir/IR/MLIRContext.h"
diff --git a/mlir/lib/Dialect/QuantOps/IR/TypeDetail.h b/mlir/lib/Dialect/Quant/IR/TypeDetail.h
similarity index 100%
rename from mlir/lib/Dialect/QuantOps/IR/TypeDetail.h
rename to mlir/lib/Dialect/Quant/IR/TypeDetail.h
diff --git a/mlir/lib/Dialect/QuantOps/IR/TypeParser.cpp b/mlir/lib/Dialect/Quant/IR/TypeParser.cpp
similarity index 99%
rename from mlir/lib/Dialect/QuantOps/IR/TypeParser.cpp
rename to mlir/lib/Dialect/Quant/IR/TypeParser.cpp
index 7252f14aa509..5f382f2dbc3d 100644
--- a/mlir/lib/Dialect/QuantOps/IR/TypeParser.cpp
+++ b/mlir/lib/Dialect/Quant/IR/TypeParser.cpp
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "mlir/Dialect/QuantOps/QuantOps.h"
-#include "mlir/Dialect/QuantOps/QuantTypes.h"
+#include "mlir/Dialect/Quant/QuantOps.h"
+#include "mlir/Dialect/Quant/QuantTypes.h"
 #include "mlir/IR/DialectImplementation.h"
 #include "mlir/IR/Location.h"
 #include "mlir/IR/StandardTypes.h"
diff --git a/mlir/lib/Dialect/QuantOps/Transforms/ConvertConst.cpp b/mlir/lib/Dialect/Quant/Transforms/ConvertConst.cpp
similarity index 95%
rename from mlir/lib/Dialect/QuantOps/Transforms/ConvertConst.cpp
rename to mlir/lib/Dialect/Quant/Transforms/ConvertConst.cpp
index 6716bbcdddb0..a415e58002a1 100644
--- a/mlir/lib/Dialect/QuantOps/Transforms/ConvertConst.cpp
+++ b/mlir/lib/Dialect/Quant/Transforms/ConvertConst.cpp
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "mlir/Dialect/QuantOps/Passes.h"
-#include "mlir/Dialect/QuantOps/QuantOps.h"
-#include "mlir/Dialect/QuantOps/QuantizeUtils.h"
-#include "mlir/Dialect/QuantOps/UniformSupport.h"
+#include "mlir/Dialect/Quant/Passes.h"
+#include "mlir/Dialect/Quant/QuantOps.h"
+#include "mlir/Dialect/Quant/QuantizeUtils.h"
+#include "mlir/Dialect/Quant/UniformSupport.h"
 #include "mlir/Dialect/StandardOps/IR/Ops.h"
 #include "mlir/IR/Attributes.h"
 #include "mlir/IR/Matchers.h"
diff --git a/mlir/lib/Dialect/QuantOps/Transforms/ConvertSimQuant.cpp b/mlir/lib/Dialect/Quant/Transforms/ConvertSimQuant.cpp
similarity index 96%
rename from mlir/lib/Dialect/QuantOps/Transforms/ConvertSimQuant.cpp
rename to mlir/lib/Dialect/Quant/Transforms/ConvertSimQuant.cpp
index b9502bd9c063..8d3097e0717c 100644
--- a/mlir/lib/Dialect/QuantOps/Transforms/ConvertSimQuant.cpp
+++ b/mlir/lib/Dialect/Quant/Transforms/ConvertSimQuant.cpp
@@ -6,10 +6,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "mlir/Dialect/QuantOps/FakeQuantSupport.h"
-#include "mlir/Dialect/QuantOps/Passes.h"
-#include "mlir/Dialect/QuantOps/QuantOps.h"
-#include "mlir/Dialect/QuantOps/UniformSupport.h"
+#include "mlir/Dialect/Quant/FakeQuantSupport.h"
+#include "mlir/Dialect/Quant/Passes.h"
+#include "mlir/Dialect/Quant/QuantOps.h"
+#include "mlir/Dialect/Quant/UniformSupport.h"
 #include "mlir/IR/Attributes.h"
 #include "mlir/IR/PatternMatch.h"
 #include "mlir/IR/StandardTypes.h"
diff --git a/mlir/lib/Dialect/QuantOps/Utils/FakeQuantSupport.cpp b/mlir/lib/Dialect/Quant/Utils/FakeQuantSupport.cpp
similarity index 98%
rename from mlir/lib/Dialect/QuantOps/Utils/FakeQuantSupport.cpp
rename to mlir/lib/Dialect/Quant/Utils/FakeQuantSupport.cpp
index 24f05e0426ed..51ed4414f75c 100644
--- a/mlir/lib/Dialect/QuantOps/Utils/FakeQuantSupport.cpp
+++ b/mlir/lib/Dialect/Quant/Utils/FakeQuantSupport.cpp
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "mlir/Dialect/QuantOps/FakeQuantSupport.h"
-#include "mlir/Dialect/QuantOps/QuantTypes.h"
+#include "mlir/Dialect/Quant/FakeQuantSupport.h"
+#include "mlir/Dialect/Quant/QuantTypes.h"
 
 using namespace mlir;
 using namespace mlir::quant;
diff --git a/mlir/lib/Dialect/QuantOps/Utils/QuantizeUtils.cpp b/mlir/lib/Dialect/Quant/Utils/QuantizeUtils.cpp
similarity index 98%
rename from mlir/lib/Dialect/QuantOps/Utils/QuantizeUtils.cpp
rename to mlir/lib/Dialect/Quant/Utils/QuantizeUtils.cpp
index bcd1b6b26711..1fbc60962fd1 100644
--- a/mlir/lib/Dialect/QuantOps/Utils/QuantizeUtils.cpp
+++ b/mlir/lib/Dialect/Quant/Utils/QuantizeUtils.cpp
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "mlir/Dialect/QuantOps/QuantizeUtils.h"
-#include "mlir/Dialect/QuantOps/UniformSupport.h"
+#include "mlir/Dialect/Quant/QuantizeUtils.h"
+#include "mlir/Dialect/Quant/UniformSupport.h"
 #include "mlir/IR/Attributes.h"
 #include "mlir/IR/StandardTypes.h"
 
diff --git a/mlir/lib/Dialect/QuantOps/Utils/UniformSupport.cpp b/mlir/lib/Dialect/Quant/Utils/UniformSupport.cpp
similarity index 98%
rename from mlir/lib/Dialect/QuantOps/Utils/UniformSupport.cpp
rename to mlir/lib/Dialect/Quant/Utils/UniformSupport.cpp
index fcb8c24c1e07..4d5db81e326d 100644
--- a/mlir/lib/Dialect/QuantOps/Utils/UniformSupport.cpp
+++ b/mlir/lib/Dialect/Quant/Utils/UniformSupport.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "mlir/Dialect/QuantOps/UniformSupport.h"
+#include "mlir/Dialect/Quant/UniformSupport.h"
 #include "mlir/IR/StandardTypes.h"
 #include <numeric>
 
diff --git a/mlir/lib/Quantizer/Configurations/FxpMathConfig.cpp b/mlir/lib/Quantizer/Configurations/FxpMathConfig.cpp
index d4b3b7404773..4131a114d7cd 100644
--- a/mlir/lib/Quantizer/Configurations/FxpMathConfig.cpp
+++ b/mlir/lib/Quantizer/Configurations/FxpMathConfig.cpp
@@ -15,8 +15,8 @@
 #include "mlir/Quantizer/Configurations/FxpMathConfig.h"
 
 #include "mlir/Dialect/FxpMathOps/FxpMathOps.h"
-#include "mlir/Dialect/QuantOps/QuantOps.h"
-#include "mlir/Dialect/QuantOps/QuantTypes.h"
+#include "mlir/Dialect/Quant/QuantOps.h"
+#include "mlir/Dialect/Quant/QuantTypes.h"
 #include "mlir/Dialect/StandardOps/IR/Ops.h"
 #include "mlir/IR/Matchers.h"
 #include "mlir/IR/StandardTypes.h"
diff --git a/mlir/lib/Quantizer/Support/UniformConstraints.cpp b/mlir/lib/Quantizer/Support/UniformConstraints.cpp
index fc8f8fc97a54..2372cdb005aa 100644
--- a/mlir/lib/Quantizer/Support/UniformConstraints.cpp
+++ b/mlir/lib/Quantizer/Support/UniformConstraints.cpp
@@ -8,7 +8,7 @@
 
 #include "mlir/Quantizer/Support/UniformConstraints.h"
 
-#include "mlir/Dialect/QuantOps/QuantTypes.h"
+#include "mlir/Dialect/Quant/QuantTypes.h"
 #include "mlir/IR/Diagnostics.h"
 #include "mlir/IR/Location.h"
 #include "mlir/IR/MLIRContext.h"
diff --git a/mlir/lib/Quantizer/Transforms/AddDefaultStatsTestPass.cpp b/mlir/lib/Quantizer/Transforms/AddDefaultStatsTestPass.cpp
index 51c3e185637f..7a9627dd144e 100644
--- a/mlir/lib/Quantizer/Transforms/AddDefaultStatsTestPass.cpp
+++ b/mlir/lib/Quantizer/Transforms/AddDefaultStatsTestPass.cpp
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "mlir/Dialect/QuantOps/QuantOps.h"
-#include "mlir/Dialect/QuantOps/QuantTypes.h"
+#include "mlir/Dialect/Quant/QuantOps.h"
+#include "mlir/Dialect/Quant/QuantTypes.h"
 #include "mlir/IR/Attributes.h"
 #include "mlir/IR/Builders.h"
 #include "mlir/Quantizer/Configurations/FxpMathConfig.h"
diff --git a/mlir/lib/Quantizer/Transforms/InferQuantizedTypesPass.cpp b/mlir/lib/Quantizer/Transforms/InferQuantizedTypesPass.cpp
index 48c2ca2c075e..1876b33b8421 100644
--- a/mlir/lib/Quantizer/Transforms/InferQuantizedTypesPass.cpp
+++ b/mlir/lib/Quantizer/Transforms/InferQuantizedTypesPass.cpp
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "mlir/Dialect/QuantOps/QuantOps.h"
-#include "mlir/Dialect/QuantOps/QuantTypes.h"
+#include "mlir/Dialect/Quant/QuantOps.h"
+#include "mlir/Dialect/Quant/QuantTypes.h"
 #include "mlir/IR/Builders.h"
 #include "mlir/Quantizer/Configurations/FxpMathConfig.h"
 #include "mlir/Quantizer/Support/Configuration.h"
diff --git a/mlir/lib/Quantizer/Transforms/RemoveInstrumentationPass.cpp b/mlir/lib/Quantizer/Transforms/RemoveInstrumentationPass.cpp
index 4307c776fa15..f16c767eea81 100644
--- a/mlir/lib/Quantizer/Transforms/RemoveInstrumentationPass.cpp
+++ b/mlir/lib/Quantizer/Transforms/RemoveInstrumentationPass.cpp
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "mlir/Dialect/QuantOps/QuantOps.h"
+#include "mlir/Dialect/Quant/QuantOps.h"
 #include "mlir/IR/MLIRContext.h"
 #include "mlir/IR/PatternMatch.h"
 #include "mlir/Pass/Pass.h"
diff --git a/mlir/test/Dialect/QuantOps/canonicalize.mlir b/mlir/test/Dialect/Quant/canonicalize.mlir
similarity index 100%
rename from mlir/test/Dialect/QuantOps/canonicalize.mlir
rename to mlir/test/Dialect/Quant/canonicalize.mlir
diff --git a/mlir/test/Dialect/QuantOps/convert-const.mlir b/mlir/test/Dialect/Quant/convert-const.mlir
similarity index 100%
rename from mlir/test/Dialect/QuantOps/convert-const.mlir
rename to mlir/test/Dialect/Quant/convert-const.mlir
diff --git a/mlir/test/Dialect/QuantOps/convert-fakequant-invalid.mlir b/mlir/test/Dialect/Quant/convert-fakequant-invalid.mlir
similarity index 100%
rename from mlir/test/Dialect/QuantOps/convert-fakequant-invalid.mlir
rename to mlir/test/Dialect/Quant/convert-fakequant-invalid.mlir
diff --git a/mlir/test/Dialect/QuantOps/convert-fakequant.mlir b/mlir/test/Dialect/Quant/convert-fakequant.mlir
similarity index 100%
rename from mlir/test/Dialect/QuantOps/convert-fakequant.mlir
rename to mlir/test/Dialect/Quant/convert-fakequant.mlir
diff --git a/mlir/test/Dialect/QuantOps/parse-any-invalid.mlir b/mlir/test/Dialect/Quant/parse-any-invalid.mlir
similarity index 100%
rename from mlir/test/Dialect/QuantOps/parse-any-invalid.mlir
rename to mlir/test/Dialect/Quant/parse-any-invalid.mlir
diff --git a/mlir/test/Dialect/QuantOps/parse-any.mlir b/mlir/test/Dialect/Quant/parse-any.mlir
similarity index 100%
rename from mlir/test/Dialect/QuantOps/parse-any.mlir
rename to mlir/test/Dialect/Quant/parse-any.mlir
diff --git a/mlir/test/Dialect/QuantOps/parse-ops-invalid.mlir b/mlir/test/Dialect/Quant/parse-ops-invalid.mlir
similarity index 100%
rename from mlir/test/Dialect/QuantOps/parse-ops-invalid.mlir
rename to mlir/test/Dialect/Quant/parse-ops-invalid.mlir
diff --git a/mlir/test/Dialect/QuantOps/parse-ops.mlir b/mlir/test/Dialect/Quant/parse-ops.mlir
similarity index 100%
rename from mlir/test/Dialect/QuantOps/parse-ops.mlir
rename to mlir/test/Dialect/Quant/parse-ops.mlir
diff --git a/mlir/test/Dialect/QuantOps/parse-uniform-invalid.mlir b/mlir/test/Dialect/Quant/parse-uniform-invalid.mlir
similarity index 100%
rename from mlir/test/Dialect/QuantOps/parse-uniform-invalid.mlir
rename to mlir/test/Dialect/Quant/parse-uniform-invalid.mlir
diff --git a/mlir/test/Dialect/QuantOps/parse-uniform.mlir b/mlir/test/Dialect/Quant/parse-uniform.mlir
similarity index 100%
rename from mlir/test/Dialect/QuantOps/parse-uniform.mlir
rename to mlir/test/Dialect/Quant/parse-uniform.mlir
diff --git a/mlir/test/Dialect/QuantOps/quant_region.mlir b/mlir/test/Dialect/Quant/quant_region.mlir
similarity index 100%
rename from mlir/test/Dialect/QuantOps/quant_region.mlir
rename to mlir/test/Dialect/Quant/quant_region.mlir
diff --git a/mlir/unittests/Dialect/QuantOps/QuantizationUtilsTest.cpp b/mlir/unittests/Dialect/Quant/QuantizationUtilsTest.cpp
similarity index 97%
rename from mlir/unittests/Dialect/QuantOps/QuantizationUtilsTest.cpp
rename to mlir/unittests/Dialect/Quant/QuantizationUtilsTest.cpp
index e6188ea0de7e..68e43d45ab42 100644
--- a/mlir/unittests/Dialect/QuantOps/QuantizationUtilsTest.cpp
+++ b/mlir/unittests/Dialect/Quant/QuantizationUtilsTest.cpp
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "mlir/Dialect/QuantOps/QuantOps.h"
-#include "mlir/Dialect/QuantOps/QuantizeUtils.h"
-#include "mlir/Dialect/QuantOps/UniformSupport.h"
+#include "mlir/Dialect/Quant/QuantOps.h"
+#include "mlir/Dialect/Quant/QuantizeUtils.h"
+#include "mlir/Dialect/Quant/UniformSupport.h"
 #include "mlir/IR/Attributes.h"
 #include "mlir/IR/StandardTypes.h"
 #include "gmock/gmock.h"