diff --git a/lib/Conversion/DistToStandard/CMakeLists.txt b/lib/Conversion/DistToStandard/CMakeLists.txt
index 3870c1397..7f3abf29d 100644
--- a/lib/Conversion/DistToStandard/CMakeLists.txt
+++ b/lib/Conversion/DistToStandard/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_conversion_library(IMEXDistToStandard
+add_imex_conversion_library(IMEXDistToStandard
   DistToStandard.cpp
 
   ADDITIONAL_HEADER_DIRS
diff --git a/lib/Conversion/DropRegions/CMakeLists.txt b/lib/Conversion/DropRegions/CMakeLists.txt
index 9e1cf4614..810e0b14b 100644
--- a/lib/Conversion/DropRegions/CMakeLists.txt
+++ b/lib/Conversion/DropRegions/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_conversion_library(IMEXDropRegions
+add_imex_conversion_library(IMEXDropRegions
   DropRegions.cpp
 
   ADDITIONAL_HEADER_DIRS
diff --git a/lib/Conversion/GPUToGPUX/CMakeLists.txt b/lib/Conversion/GPUToGPUX/CMakeLists.txt
index 397b07e4b..dacec7fa6 100644
--- a/lib/Conversion/GPUToGPUX/CMakeLists.txt
+++ b/lib/Conversion/GPUToGPUX/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_conversion_library(IMEXGPUToGPUX
+add_imex_conversion_library(IMEXGPUToGPUX
   GPUToGPUX.cpp
 
   ADDITIONAL_HEADER_DIRS
diff --git a/lib/Conversion/GPUToSPIRV/CMakeLists.txt b/lib/Conversion/GPUToSPIRV/CMakeLists.txt
index 4fa56b2a9..2637fb057 100644
--- a/lib/Conversion/GPUToSPIRV/CMakeLists.txt
+++ b/lib/Conversion/GPUToSPIRV/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_conversion_library(IMEXGPUToSPIRV
+add_imex_conversion_library(IMEXGPUToSPIRV
   GPUToSPIRVPass.cpp
 
   ADDITIONAL_HEADER_DIRS
diff --git a/lib/Conversion/GPUXToLLVM/CMakeLists.txt b/lib/Conversion/GPUXToLLVM/CMakeLists.txt
index 56515be75..fa1e1c344 100644
--- a/lib/Conversion/GPUXToLLVM/CMakeLists.txt
+++ b/lib/Conversion/GPUXToLLVM/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_conversion_library(IMEXGPUXToLLVM
+add_imex_conversion_library(IMEXGPUXToLLVM
   GPUXToLLVMPass.cpp
 
   ADDITIONAL_HEADER_DIRS
diff --git a/lib/Conversion/NDArrayToLinalg/CMakeLists.txt b/lib/Conversion/NDArrayToLinalg/CMakeLists.txt
index 5262839d5..03a14c8c1 100644
--- a/lib/Conversion/NDArrayToLinalg/CMakeLists.txt
+++ b/lib/Conversion/NDArrayToLinalg/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_conversion_library(IMEXNDArrayToLinalg
+add_imex_conversion_library(IMEXNDArrayToLinalg
   NDArrayToLinalg.cpp
 
   ADDITIONAL_HEADER_DIRS
diff --git a/lib/Conversion/XeGPUToSPIRV/CMakeLists.txt b/lib/Conversion/XeGPUToSPIRV/CMakeLists.txt
index ceec32ed8..ce32355c2 100644
--- a/lib/Conversion/XeGPUToSPIRV/CMakeLists.txt
+++ b/lib/Conversion/XeGPUToSPIRV/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_conversion_library(XeGPUToSPIRV
+add_imex_conversion_library(XeGPUToSPIRV
   XeGPUToSPIRV.cpp
 
   DEPENDS
diff --git a/lib/Conversion/XeTileToXeGPU/CMakeLists.txt b/lib/Conversion/XeTileToXeGPU/CMakeLists.txt
index ec85a4362..1fd8e1f06 100644
--- a/lib/Conversion/XeTileToXeGPU/CMakeLists.txt
+++ b/lib/Conversion/XeTileToXeGPU/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_conversion_library(IMEXXeTileToXeGPU
+add_imex_conversion_library(IMEXXeTileToXeGPU
   ArithOpConversion.cpp
   SCFOpConversion.cpp
   XeTileToXeGPU.cpp
diff --git a/lib/Dialect/Dist/IR/CMakeLists.txt b/lib/Dialect/Dist/IR/CMakeLists.txt
index 472bb92f5..b0a0f8be8 100644
--- a/lib/Dialect/Dist/IR/CMakeLists.txt
+++ b/lib/Dialect/Dist/IR/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(IMEXDistDialect
+add_imex_dialect_library(IMEXDistDialect
   DistOps.cpp
 
   ADDITIONAL_HEADER_DIRS
diff --git a/lib/Dialect/Dist/Transforms/CMakeLists.txt b/lib/Dialect/Dist/Transforms/CMakeLists.txt
index affa23edd..5363b8540 100644
--- a/lib/Dialect/Dist/Transforms/CMakeLists.txt
+++ b/lib/Dialect/Dist/Transforms/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(IMEXDistTransforms
+add_imex_dialect_library(IMEXDistTransforms
   DistCoalesce.cpp
   DistInferElementwiseCores.cpp
 
diff --git a/lib/Dialect/DistRuntime/IR/CMakeLists.txt b/lib/Dialect/DistRuntime/IR/CMakeLists.txt
index 012aa1019..9a05e4b48 100644
--- a/lib/Dialect/DistRuntime/IR/CMakeLists.txt
+++ b/lib/Dialect/DistRuntime/IR/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(IMEXDistRuntimeDialect
+add_imex_dialect_library(IMEXDistRuntimeDialect
   DistRuntimeOps.cpp
   GetHaloOp.cpp
 
diff --git a/lib/Dialect/DistRuntime/Transforms/CMakeLists.txt b/lib/Dialect/DistRuntime/Transforms/CMakeLists.txt
index acea134f0..d3957ca36 100644
--- a/lib/Dialect/DistRuntime/Transforms/CMakeLists.txt
+++ b/lib/Dialect/DistRuntime/Transforms/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(IMEXDistRuntimeTransforms
+add_imex_dialect_library(IMEXDistRuntimeTransforms
   DistRuntimeToIDTR.cpp
   OverlapCommAndCompute.cpp
   AddCommCacheKeys.cpp
diff --git a/lib/Dialect/NDArray/IR/CMakeLists.txt b/lib/Dialect/NDArray/IR/CMakeLists.txt
index b8663ccc7..2d0496fc9 100644
--- a/lib/Dialect/NDArray/IR/CMakeLists.txt
+++ b/lib/Dialect/NDArray/IR/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(IMEXNDArrayDialect
+add_imex_dialect_library(IMEXNDArrayDialect
   NDArrayOps.cpp
   SubviewOp.cpp
   InsertSliceOp.cpp
diff --git a/lib/Dialect/NDArray/Transforms/CMakeLists.txt b/lib/Dialect/NDArray/Transforms/CMakeLists.txt
index c8d074750..ba1d8d026 100644
--- a/lib/Dialect/NDArray/Transforms/CMakeLists.txt
+++ b/lib/Dialect/NDArray/Transforms/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(IMEXNDArrayTransforms
+add_imex_dialect_library(IMEXNDArrayTransforms
   NDArrayDist.cpp
   AddGPURegions.cpp
 
diff --git a/lib/Dialect/Region/IR/CMakeLists.txt b/lib/Dialect/Region/IR/CMakeLists.txt
index 2097ca670..5f540e650 100644
--- a/lib/Dialect/Region/IR/CMakeLists.txt
+++ b/lib/Dialect/Region/IR/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(IMEXRegionDialect
+add_imex_dialect_library(IMEXRegionDialect
   RegionOps.cpp
 
   ADDITIONAL_HEADER_DIRS
diff --git a/lib/Dialect/Region/Transforms/CMakeLists.txt b/lib/Dialect/Region/Transforms/CMakeLists.txt
index 6de00c0b0..13b81d409 100644
--- a/lib/Dialect/Region/Transforms/CMakeLists.txt
+++ b/lib/Dialect/Region/Transforms/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_mlir_dialect_library(IMEXRegionTransforms
+add_imex_dialect_library(IMEXRegionTransforms
   RegionConversions.cpp
   RegionBufferize.cpp
 
diff --git a/scripts/add_conversion.py b/scripts/add_conversion.py
index 13d10a986..a5721a0ef 100644
--- a/scripts/add_conversion.py
+++ b/scripts/add_conversion.py
@@ -47,7 +47,7 @@
 
 # Create CMakeLists.txt
 with open(jp(libroot, name, f"CMakeLists.txt"), "w") as f:
-    f.write(f"""add_mlir_conversion_library(IMEX{name}
+    f.write(f"""add_imex_conversion_library(IMEX{name}
   {name}.cpp
 
   ADDITIONAL_HEADER_DIRS