diff --git a/mlir/test/EDSC/builder-api-test.cpp b/mlir/test/EDSC/builder-api-test.cpp
@@ -37,15 +37,17 @@ using namespace mlir::edsc::intrinsics;
 
 static MLIRContext &globalContext() {
   static thread_local MLIRContext context(/*loadAllDialects=*/false);
-  static thread_local bool init_once = [&]() {
-    context.getOrLoadDialect<AffineDialect>();
-    context.getOrLoadDialect<scf::SCFDialect>();
-    context.getOrLoadDialect<linalg::LinalgDialect>();
-    context.getOrLoadDialect<StandardOpsDialect>();
-    context.getOrLoadDialect<vector::VectorDialect>();
+  static thread_local bool initOnce = [&]() {
+    // clang-format off
+    context.loadDialect<AffineDialect,
+                        scf::SCFDialect,
+                        linalg::LinalgDialect,
+                        StandardOpsDialect,
+                        vector::VectorDialect>();
+    // clang-format on
     return true;
   }();
-  (void)init_once;
+  (void)initOnce;
   context.allowUnregisteredDialects();
   return context;
 }

diff --git a/mlir/test/lib/Transforms/TestGpuMemoryPromotion.cpp b/mlir/test/lib/Transforms/TestGpuMemoryPromotion.cpp
@@ -30,8 +30,7 @@ class TestGpuMemoryPromotionPass
     : public PassWrapper<TestGpuMemoryPromotionPass,
                          OperationPass<gpu::GPUFuncOp>> {
   void getDependentDialects(DialectRegistry &registry) const override {
-    registry.insert<StandardOpsDialect>();
-    registry.insert<scf::SCFDialect>();
+    registry.insert<StandardOpsDialect, scf::SCFDialect>();
   }
 
   void runOnOperation() override {

diff --git a/mlir/test/lib/Transforms/TestLinalgTransforms.cpp b/mlir/test/lib/Transforms/TestLinalgTransforms.cpp
@@ -32,11 +32,13 @@ struct TestLinalgTransforms
   TestLinalgTransforms(const TestLinalgTransforms &pass) {}
 
   void getDependentDialects(DialectRegistry &registry) const override {
-    registry.insert<AffineDialect>();
-    registry.insert<scf::SCFDialect>();
-    registry.insert<StandardOpsDialect>();
-    registry.insert<vector::VectorDialect>();
-    registry.insert<gpu::GPUDialect>();
+    // clang-format off
+    registry.insert<AffineDialect,
+                    scf::SCFDialect,
+                    StandardOpsDialect,
+                    vector::VectorDialect,
+                    gpu::GPUDialect>();
+    // clang-format on
   }
 
   void runOnFunction() override;

diff --git a/mlir/test/lib/Transforms/TestVectorTransforms.cpp b/mlir/test/lib/Transforms/TestVectorTransforms.cpp
@@ -133,9 +133,7 @@ struct TestVectorTransferFullPartialSplitPatterns
       const TestVectorTransferFullPartialSplitPatterns &pass) {}
 
   void getDependentDialects(DialectRegistry &registry) const override {
-    registry.insert<AffineDialect>();
-    registry.insert<linalg::LinalgDialect>();
-    registry.insert<scf::SCFDialect>();
+    registry.insert<AffineDialect, linalg::LinalgDialect, scf::SCFDialect>();
   }
 
   Option<bool> useLinalgOps{

diff --git a/mlir/tools/mlir-tblgen/DialectGen.cpp b/mlir/tools/mlir-tblgen/DialectGen.cpp
@@ -148,10 +148,10 @@ static void emitDialectDecl(Dialect &dialect,
   /// Build the list of dependent dialects
   std::string dependentDialectRegistrations;
   {
-    llvm::raw_string_ostream dialects_os(dependentDialectRegistrations);
+    llvm::raw_string_ostream dialectsOs(dependentDialectRegistrations);
     for (StringRef dependentDialect : dialect.getDependentDialects())
-      dialects_os << llvm::formatv(dialectRegistrationTemplate,
-                                   dependentDialect);
+      dialectsOs << llvm::formatv(dialectRegistrationTemplate,
+                                  dependentDialect);
   }
   // Emit the start of the decl.
   std::string cppName = dialect.getCppClassName();

diff --git a/mlir/tools/mlir-tblgen/PassGen.cpp b/mlir/tools/mlir-tblgen/PassGen.cpp
@@ -108,10 +108,10 @@ static void emitPassDecl(const Pass &pass, raw_ostream &os) {
   StringRef defName = pass.getDef()->getName();
   std::string dependentDialectRegistrations;
   {
-    llvm::raw_string_ostream dialects_os(dependentDialectRegistrations);
+    llvm::raw_string_ostream dialectsOs(dependentDialectRegistrations);
     for (StringRef dependentDialect : pass.getDependentDialects())
-      dialects_os << llvm::formatv(dialectRegistrationTemplate,
-                                   dependentDialect);
+      dialectsOs << llvm::formatv(dialectRegistrationTemplate,
+                                  dependentDialect);
   }
   os << llvm::formatv(passDeclBegin, defName, pass.getBaseClass(),
                       pass.getArgument(), dependentDialectRegistrations);

diff --git a/mlir/unittests/IR/DialectTest.cpp b/mlir/unittests/IR/DialectTest.cpp
@@ -30,8 +30,8 @@ TEST(DialectDeathTest, MultipleDialectsWithSameNamespace) {
 
   // Registering a dialect with the same namespace twice should result in a
   // failure.
-  context.getOrLoadDialect<TestDialect>();
-  ASSERT_DEATH(context.getOrLoadDialect<AnotherTestDialect>(), "");
+  context.loadDialect<TestDialect>();
+  ASSERT_DEATH(context.loadDialect<AnotherTestDialect>(), "");
 }
 
 } // end namespace