diff --git a/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel b/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel
--- a/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel
@@ -2311,6 +2311,7 @@
         ":ControlFlowToLLVM",
         ":ControlFlowToSPIRV",
         ":ConversionPassIncGen",
+        ":FuncToLLVM",
         ":FuncToSPIRV",
         ":GPUToGPURuntimeTransforms",
         ":GPUToNVVMTransforms",
@@ -2336,7 +2337,6 @@
         ":SCFToStandard",
         ":SPIRVToLLVM",
         ":ShapeToStandard",
-        ":StandardToLLVM",
         ":TensorToSPIRV",
         ":TosaToLinalg",
         ":TosaToSCF",
@@ -2362,12 +2362,12 @@
         ":Async",
         ":ConversionPassIncGen",
         ":FuncDialect",
+        ":FuncToLLVM",
         ":FuncTransforms",
         ":IR",
         ":LLVMCommonConversion",
         ":LLVMDialect",
         ":Pass",
-        ":StandardToLLVM",
         ":Support",
         ":Transforms",
         "//llvm:Support",
@@ -3452,6 +3452,7 @@
         ":ControlFlowOps",
         ":ControlFlowToLLVM",
         ":ConversionPassIncGen",
+        ":FuncToLLVM",
         ":GPUCommonTransforms",
         ":GPUDialect",
         ":GPUToNVVMGen",
@@ -3464,7 +3465,6 @@
         ":MemRefToLLVM",
         ":NVVMDialect",
         ":Pass",
-        ":StandardToLLVM",
         ":Transforms",
         "//llvm:Support",
     ],
@@ -3481,13 +3481,13 @@
     deps = [
         ":ConversionPassIncGen",
         ":FuncDialect",
+        ":FuncToLLVM",
         ":GPUDialect",
         ":LLVMCommonConversion",
         ":LLVMDialect",
         ":MemRefToLLVM",
         ":Pass",
         ":ROCDLDialect",
-        ":StandardToLLVM",
         ":Transforms",
         ":VectorOps",
     ],
@@ -3544,6 +3544,7 @@
         ":ArithmeticToLLVM",
         ":ControlFlowToLLVM",
         ":ConversionPassIncGen",
+        ":FuncToLLVM",
         ":GPUCommonTransforms",
         ":GPUDialect",
         ":GPUToROCDLTGen",
@@ -3553,7 +3554,6 @@
         ":MemRefToLLVM",
         ":Pass",
         ":ROCDLDialect",
-        ":StandardToLLVM",
         ":Transforms",
         ":VectorOps",
         ":VectorToLLVM",
@@ -3600,6 +3600,7 @@
         ":AsyncToLLVM",
         ":ControlFlowToLLVM",
         ":ConversionPassIncGen",
+        ":FuncToLLVM",
         ":GPUDialect",
         ":GPUTransforms",
         ":IR",
@@ -3608,7 +3609,6 @@
         ":MemRefToLLVM",
         ":NVVMToLLVMIRTranslation",
         ":Pass",
-        ":StandardToLLVM",
         ":Support",
         ":VectorToLLVM",
         "//llvm:Support",
@@ -3631,6 +3631,7 @@
     deps = [
         ":ArithmeticToSPIRV",
         ":ConversionPassIncGen",
+        ":FuncToSPIRV",
         ":GPUDialect",
         ":IR",
         ":MemRefToSPIRV",
@@ -3639,7 +3640,6 @@
         ":SCFToSPIRV",
         ":SPIRVConversion",
         ":SPIRVDialect",
-        ":FuncToSPIRV",
         ":Support",
         ":Transforms",
         ":VectorToSPIRV",
@@ -3680,6 +3680,7 @@
         ":ArithmeticToLLVM",
         ":ConversionPassIncGen",
         ":FuncDialect",
+        ":FuncToLLVM",
         ":GPUDialect",
         ":IR",
         ":LLVMCommonConversion",
@@ -3688,7 +3689,6 @@
         ":Pass",
         ":SPIRVDialect",
         ":SPIRVUtils",
-        ":StandardToLLVM",
         ":Support",
         ":Transforms",
         "//llvm:Support",
@@ -4981,13 +4981,13 @@
         ":ArithmeticToSPIRV",
         ":ConversionPassIncGen",
         ":FuncDialect",
+        ":FuncToSPIRV",
         ":IR",
         ":MemRefToSPIRV",
         ":Pass",
         ":SCFDialect",
         ":SPIRVConversion",
         ":SPIRVDialect",
-        ":FuncToSPIRV",
         ":Support",
         ":TransformUtils",
         ":Transforms",
@@ -5083,14 +5083,14 @@
 )
 
 cc_library(
-    name = "StandardToLLVM",
+    name = "FuncToLLVM",
     srcs = [
-        "lib/Conversion/StandardToLLVM/StandardToLLVM.cpp",
+        "lib/Conversion/FuncToLLVM/FuncToLLVM.cpp",
         ":ConversionPassDetail",
     ],
     hdrs = [
-        "include/mlir/Conversion/StandardToLLVM/ConvertStandardToLLVM.h",
-        "include/mlir/Conversion/StandardToLLVM/ConvertStandardToLLVMPass.h",
+        "include/mlir/Conversion/FuncToLLVM/ConvertFuncToLLVM.h",
+        "include/mlir/Conversion/FuncToLLVM/ConvertFuncToLLVMPass.h",
     ],
     includes = ["include"],
     deps = [
@@ -5274,7 +5274,7 @@
 
 alias(
     name = "LLVMTransforms",
-    actual = "StandardToLLVM",
+    actual = "FuncToLLVM",
 )
 
 gentbl_cc_library(
@@ -5847,6 +5847,8 @@
         ":DLTIDialect",
         ":EmitC",
         ":FuncDialect",
+        ":FuncToLLVM",
+        ":FuncToSPIRV",
         ":FuncTransforms",
         ":FuncTransformsPassIncGen",
         ":GPUDialect",
@@ -5904,8 +5906,6 @@
         ":SparseTensor",
         ":SparseTensorPipelines",
         ":SparseTensorTransforms",
-        ":StandardToLLVM",
-        ":FuncToSPIRV",
         ":TensorDialect",
         ":TensorInferTypeOpInterfaceImpl",
         ":TensorTilingInterfaceImpl",
@@ -5958,6 +5958,7 @@
         "//mlir/test:TestDLTI",
         "//mlir/test:TestDialect",
         "//mlir/test:TestFunc",
+        "//mlir/test:TestFuncToLLVM",
         "//mlir/test:TestGPU",
         "//mlir/test:TestIR",
         "//mlir/test:TestLinalg",
@@ -5969,7 +5970,6 @@
         "//mlir/test:TestSCF",
         "//mlir/test:TestSPIRV",
         "//mlir/test:TestShapeDialect",
-        "//mlir/test:TestStandardToLLVM",
         "//mlir/test:TestTensor",
         "//mlir/test:TestTosaDialect",
         "//mlir/test:TestTransforms",
@@ -6130,6 +6130,8 @@
         ":ArithmeticDialect",
         ":ExecutionEngineUtils",
         ":FuncDialect",
+        ":FuncToLLVM",
+        ":FuncToSPIRV",
         ":GPUDialect",
         ":GPUToSPIRV",
         ":GPUToVulkanTransforms",
@@ -6145,8 +6147,6 @@
         ":ReconcileUnrealizedCasts",
         ":SPIRVDialect",
         ":SPIRVTransforms",
-        ":StandardToLLVM",
-        ":FuncToSPIRV",
         ":ToLLVMIRTranslation",
         "//llvm:Support",
     ],
@@ -6159,6 +6159,7 @@
         ":ArithmeticDialect",
         ":ExecutionEngineUtils",
         ":FuncDialect",
+        ":FuncToLLVM",
         ":GPUDialect",
         ":GPUToSPIRV",
         ":GPUTransforms",
@@ -6171,7 +6172,6 @@
         ":SPIRVDialect",
         ":SPIRVToLLVM",
         ":SPIRVTransforms",
-        ":StandardToLLVM",
         ":ToLLVMIRTranslation",
         "//llvm:Core",
         "//llvm:Linker",
@@ -6547,13 +6547,13 @@
         ":ControlFlowToLLVM",
         ":ConversionPassIncGen",
         ":FuncDialect",
+        ":FuncToLLVM",
         ":IR",
         ":LLVMCommonConversion",
         ":LLVMDialect",
         ":MemRefToLLVM",
         ":OpenMPDialect",
         ":Pass",
-        ":StandardToLLVM",
         ":Transforms",
         "//llvm:Core",
         "//llvm:Support",
@@ -7223,13 +7223,13 @@
         ":ConversionPassIncGen",
         ":DialectUtils",
         ":FuncDialect",
+        ":FuncToLLVM",
         ":GPUDialect",
         ":IR",
         ":LLVMDialect",
         ":MemRefDialect",
         ":Pass",
         ":SCFDialect",
-        ":StandardToLLVM",
         ":Support",
         ":Transforms",
         ":VectorOps",
@@ -7255,12 +7255,12 @@
         ":ArithmeticDialect",
         ":ConversionPassIncGen",
         ":FuncDialect",
+        ":FuncToLLVM",
         ":IR",
         ":LLVMDialect",
         ":MemRefDialect",
         ":Pass",
         ":SCFDialect",
-        ":StandardToLLVM",
         ":Support",
         ":Transforms",
         ":VectorOps",
@@ -8418,8 +8418,8 @@
     deps = [
         ":IR",
         ":PDLLAST",
-        ":PDLLODS",
         ":PDLLCodeGen",
+        ":PDLLODS",
         ":PDLLParser",
         ":Support",
         "//llvm:Support",
diff --git a/utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel b/utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel
--- a/utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/mlir/test/BUILD.bazel
@@ -305,17 +305,17 @@
 )
 
 cc_library(
-    name = "TestStandardToLLVM",
-    srcs = glob(["lib/Conversion/StandardToLLVM/*.cpp"]),
+    name = "TestFuncToLLVM",
+    srcs = glob(["lib/Conversion/FuncToLLVM/*.cpp"]),
     defines = ["MLIR_CUDA_CONVERSIONS_ENABLED"],
     includes = ["lib/Dialect/Test"],
     deps = [
         ":TestDialect",
         "//mlir:FuncDialect",
+        "//mlir:FuncToLLVM",
         "//mlir:LLVMCommonConversion",
         "//mlir:LLVMDialect",
         "//mlir:Pass",
-        "//mlir:StandardToLLVM",
     ],
 )