diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Operations/AverageAllTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Operations/AverageAllTest.cs
index f3dc1570f..6dd9009b8 100644
--- a/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Operations/AverageAllTest.cs
+++ b/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Operations/AverageAllTest.cs
@@ -276,7 +276,7 @@ public void TestSqlConnectionAverageAllTypedResultViaTableNameWithHints()
         #region AverageAllAsync(TableName)
 
         [TestMethod]
-        public void TestSqlConnectionAverageAllTableNameAsync()
+        public void TestSqlConnectionAverageAllAsyncViaTableName()
         {
             // Setup
             var tables = Helper.CreateIdentityTables(10);
@@ -296,7 +296,7 @@ public void TestSqlConnectionAverageAllTableNameAsync()
         }
 
         [TestMethod]
-        public void TestSqlConnectionAverageAllTableNameAsyncWithHints()
+        public void TestSqlConnectionAverageAllAsyncViaTableNameWithHints()
         {
             // Setup
             var tables = Helper.CreateIdentityTables(10);
@@ -317,7 +317,7 @@ public void TestSqlConnectionAverageAllTableNameAsyncWithHints()
         }
 
         [TestMethod]
-        public void TestSqlConnectionAverageAllTypedResultTableNameAsync()
+        public void TestSqlConnectionAverageAllTypedResultAsyncViaTableName()
         {
             // Setup
             var tables = Helper.CreateIdentityTables(10);
@@ -337,7 +337,7 @@ public void TestSqlConnectionAverageAllTypedResultTableNameAsync()
         }
 
         [TestMethod]
-        public void TestSqlConnectionAverageAllTypedResultTableNameAsyncWithHints()
+        public void TestSqlConnectionAverageAllTypedResultAsyncViaTableNameWithHints()
         {
             // Setup
             var tables = Helper.CreateIdentityTables(10);
diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Operations/CountAll.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Operations/CountAll.cs
index 8e8913b33..23e4aa1a2 100644
--- a/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Operations/CountAll.cs
+++ b/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Operations/CountAll.cs
@@ -108,7 +108,7 @@ public void TestSqlConnectionCountAllAsyncWithHints()
         #region CountAll(TableName)
 
         [TestMethod]
-        public void TestSqlConnectionCountViaAllTaleName()
+        public void TestSqlConnectionCountViaAllTableName()
         {
             // Setup
             var tables = Helper.CreateIdentityTables(10);
@@ -127,7 +127,7 @@ public void TestSqlConnectionCountViaAllTaleName()
         }
 
         [TestMethod]
-        public void TestSqlConnectionCountAllViaTaleNameWithHints()
+        public void TestSqlConnectionCountAllViaTableNameWithHints()
         {
             // Setup
             var tables = Helper.CreateIdentityTables(10);
@@ -151,7 +151,7 @@ public void TestSqlConnectionCountAllViaTaleNameWithHints()
         #region CountAllAsync(TableName)
 
         [TestMethod]
-        public void TestSqlConnectionCountAllTaleNameAsync()
+        public void TestSqlConnectionCountAllAsyncViaTableName()
         {
             // Setup
             var tables = Helper.CreateIdentityTables(10);
@@ -170,7 +170,7 @@ public void TestSqlConnectionCountAllTaleNameAsync()
         }
 
         [TestMethod]
-        public void TestSqlConnectionCountAllTaleNameAsyncWithHints()
+        public void TestSqlConnectionCountAllAsyncViaTableNameWithHints()
         {
             // Setup
             var tables = Helper.CreateIdentityTables(10);
diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Operations/CountTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Operations/CountTest.cs
index f1d21b1ef..5981825a8 100644
--- a/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Operations/CountTest.cs
+++ b/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Operations/CountTest.cs
@@ -401,7 +401,7 @@ public void TestSqlConnectionCountViaTableNameViaQueryGroup()
         #region CountAsync(TableName)
 
         [TestMethod]
-        public void TestSqlConnectionCountViaTableNameAsyncWithoutCondition()
+        public void TestSqlConnectionCountViaAsyncViaTableNameWithoutCondition()
         {
             // Setup
             var tables = Helper.CreateIdentityTables(10);
@@ -421,7 +421,7 @@ public void TestSqlConnectionCountViaTableNameAsyncWithoutCondition()
         }
 
         [TestMethod]
-        public void TestSqlConnectionCountViaTableNameAsyncViaDynamic()
+        public void TestSqlConnectionCountViaAsyncViaTableNameViaDynamic()
         {
             // Setup
             var tables = Helper.CreateIdentityTables(10);
@@ -440,7 +440,7 @@ public void TestSqlConnectionCountViaTableNameAsyncViaDynamic()
         }
 
         [TestMethod]
-        public void TestSqlConnectionCountViaTableNameAsyncViaQueryField()
+        public void TestSqlConnectionCountViaAsyncViaTableNameViaQueryField()
         {
             // Setup
             var tables = Helper.CreateIdentityTables(10);
@@ -461,7 +461,7 @@ public void TestSqlConnectionCountViaTableNameAsyncViaQueryField()
         }
 
         [TestMethod]
-        public void TestSqlConnectionCountViaTableNameAsyncViaQueryFields()
+        public void TestSqlConnectionCountViaAsyncViaTableNameViaQueryFields()
         {
             // Setup
             var tables = Helper.CreateIdentityTables(10);
@@ -486,7 +486,7 @@ public void TestSqlConnectionCountViaTableNameAsyncViaQueryFields()
         }
 
         [TestMethod]
-        public void TestSqlConnectionCountViaTableNameAsyncViaQueryGroup()
+        public void TestSqlConnectionCountViaAsyncViaTableNameViaQueryGroup()
         {
             // Setup
             var tables = Helper.CreateIdentityTables(10);
diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Operations/ExistsTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Operations/ExistsTest.cs
index e2b3f0468..da4a7700b 100644
--- a/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Operations/ExistsTest.cs
+++ b/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Operations/ExistsTest.cs
@@ -401,7 +401,7 @@ public void TestSqlConnectionExistsViaTableNameViaQueryGroup()
         #region ExistsAsync(TableName)
 
         [TestMethod]
-        public void TestSqlConnectionExistsViaTableNameAsyncWithoutCondition()
+        public void TestSqlConnectionExistsViaAsyncViaTableNameWithoutCondition()
         {
             // Setup
             var tables = Helper.CreateIdentityTables(10);
@@ -421,7 +421,7 @@ public void TestSqlConnectionExistsViaTableNameAsyncWithoutCondition()
         }
 
         [TestMethod]
-        public void TestSqlConnectionExistsViaTableNameAsyncViaDynamic()
+        public void TestSqlConnectionExistsViaAsyncViaTableNameViaDynamic()
         {
             // Setup
             var tables = Helper.CreateIdentityTables(10);
@@ -440,7 +440,7 @@ public void TestSqlConnectionExistsViaTableNameAsyncViaDynamic()
         }
 
         [TestMethod]
-        public void TestSqlConnectionExistsViaTableNameAsyncViaQueryField()
+        public void TestSqlConnectionExistsViaAsyncViaTableNameViaQueryField()
         {
             // Setup
             var tables = Helper.CreateIdentityTables(10);
@@ -461,7 +461,7 @@ public void TestSqlConnectionExistsViaTableNameAsyncViaQueryField()
         }
 
         [TestMethod]
-        public void TestSqlConnectionExistsViaTableNameAsyncViaQueryFields()
+        public void TestSqlConnectionExistsViaAsyncViaTableNameViaQueryFields()
         {
             // Setup
             var tables = Helper.CreateIdentityTables(10);
@@ -486,7 +486,7 @@ public void TestSqlConnectionExistsViaTableNameAsyncViaQueryFields()
         }
 
         [TestMethod]
-        public void TestSqlConnectionExistsViaTableNameAsyncViaQueryGroup()
+        public void TestSqlConnectionExistsViaAsyncViaTableNameViaQueryGroup()
         {
             // Setup
             var tables = Helper.CreateIdentityTables(10);
diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Operations/MaxAllTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Operations/MaxAllTest.cs
index 7add71b99..58bf6e120 100644
--- a/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Operations/MaxAllTest.cs
+++ b/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Operations/MaxAllTest.cs
@@ -276,7 +276,7 @@ public void TestSqlConnectionMaxAllTypedResultViaTableNameWithHints()
         #region MaxAllAsync(TableName)
 
         [TestMethod]
-        public void TestSqlConnectionMaxAllTableNameAsync()
+        public void TestSqlConnectionMaxAllAsyncViaTableName()
         {
             // Setup
             var tables = Helper.CreateIdentityTables(10);
@@ -296,7 +296,7 @@ public void TestSqlConnectionMaxAllTableNameAsync()
         }
 
         [TestMethod]
-        public void TestSqlConnectionMaxAllTableNameAsyncWithHints()
+        public void TestSqlConnectionMaxAllAsyncViaTableNameWithHints()
         {
             // Setup
             var tables = Helper.CreateIdentityTables(10);
@@ -317,7 +317,7 @@ public void TestSqlConnectionMaxAllTableNameAsyncWithHints()
         }
 
         [TestMethod]
-        public void TestSqlConnectionMaxAllTypedResultTableNameAsync()
+        public void TestSqlConnectionMaxAllTypedResultAsyncViaTableName()
         {
             // Setup
             var tables = Helper.CreateIdentityTables(10);
@@ -337,7 +337,7 @@ public void TestSqlConnectionMaxAllTypedResultTableNameAsync()
         }
 
         [TestMethod]
-        public void TestSqlConnectionMaxAllTypedResultTableNameAsyncWithHints()
+        public void TestSqlConnectionMaxAllTypedResultAsyncViaTableNameWithHints()
         {
             // Setup
             var tables = Helper.CreateIdentityTables(10);
diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Operations/MinAllTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Operations/MinAllTest.cs
index ff25e1f44..96d7c1b02 100644
--- a/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Operations/MinAllTest.cs
+++ b/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Operations/MinAllTest.cs
@@ -276,7 +276,7 @@ public void TestSqlConnectionMinAllTypedResultViaTableNameWithHints()
         #region MinAllAsync(TableName)
 
         [TestMethod]
-        public void TestSqlConnectionMinAllTableNameAsync()
+        public void TestSqlConnectionMinAllAsyncViaTableName()
         {
             // Setup
             var tables = Helper.CreateIdentityTables(10);
@@ -296,7 +296,7 @@ public void TestSqlConnectionMinAllTableNameAsync()
         }
 
         [TestMethod]
-        public void TestSqlConnectionMinAllTableNameAsyncWithHints()
+        public void TestSqlConnectionMinAllAsyncViaTableNameWithHints()
         {
             // Setup
             var tables = Helper.CreateIdentityTables(10);
@@ -317,7 +317,7 @@ public void TestSqlConnectionMinAllTableNameAsyncWithHints()
         }
 
         [TestMethod]
-        public void TestSqlConnectionMinAllTypedResultTableNameAsync()
+        public void TestSqlConnectionMinAllTypedResultAsyncViaTableName()
         {
             // Setup
             var tables = Helper.CreateIdentityTables(10);
@@ -337,7 +337,7 @@ public void TestSqlConnectionMinAllTypedResultTableNameAsync()
         }
 
         [TestMethod]
-        public void TestSqlConnectionMinAllTypedResultTableNameAsyncWithHints()
+        public void TestSqlConnectionMinAllTypedResultAsyncViaTableNameWithHints()
         {
             // Setup
             var tables = Helper.CreateIdentityTables(10);
diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Operations/SumAllTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Operations/SumAllTest.cs
index 31c2007b9..7677cebf9 100644
--- a/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Operations/SumAllTest.cs
+++ b/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Operations/SumAllTest.cs
@@ -276,7 +276,7 @@ public void TestSqlConnectionSumAllTypedResultViaTableNameWithHints()
         #region SumAllAsync(TableName)
 
         [TestMethod]
-        public void TestSqlConnectionSumAllTableNameAsync()
+        public void TestSqlConnectionSumAllAsyncViaTableName()
         {
             // Setup
             var tables = Helper.CreateIdentityTables(10);
@@ -296,7 +296,7 @@ public void TestSqlConnectionSumAllTableNameAsync()
         }
 
         [TestMethod]
-        public void TestSqlConnectionSumAllTableNameAsyncWithHints()
+        public void TestSqlConnectionSumAllAsyncViaTableNameWithHints()
         {
             // Setup
             var tables = Helper.CreateIdentityTables(10);
@@ -317,7 +317,7 @@ public void TestSqlConnectionSumAllTableNameAsyncWithHints()
         }
 
         [TestMethod]
-        public void TestSqlConnectionSumAllTypedResultTableNameAsync()
+        public void TestSqlConnectionSumAllTypedResultAsyncViaTableName()
         {
             // Setup
             var tables = Helper.CreateIdentityTables(10);
@@ -337,7 +337,7 @@ public void TestSqlConnectionSumAllTypedResultTableNameAsync()
         }
 
         [TestMethod]
-        public void TestSqlConnectionSumAllTypedResultTableNameAsyncWithHints()
+        public void TestSqlConnectionSumAllTypedResultAsyncViaTableNameWithHints()
         {
             // Setup
             var tables = Helper.CreateIdentityTables(10);
diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Operations/UpdateTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Operations/UpdateTest.cs
index d64a71194..978dde0b5 100644
--- a/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Operations/UpdateTest.cs
+++ b/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Operations/UpdateTest.cs
@@ -1364,7 +1364,7 @@ public void TestSqlConnectionUpdateViaTableNameWithFields()
         }
 
         [TestMethod]
-        public void TestSqlConnectionUpdateViaDynamicTableNameAsyncViaPrimaryKey()
+        public void TestSqlConnectionUpdateViaDynamicAsyncViaTableNameViaPrimaryKey()
         {
             // Setup
             var table = Helper.CreateNonIdentityTable();
@@ -1802,7 +1802,7 @@ public void TestSqlConnectionUpdateAsyncViaTableNameWithFields()
         }
 
         [TestMethod]
-        public void TestSqlConnectionUpdateAsyncViaDynamicTableNameAsyncViaPrimaryKey()
+        public void TestSqlConnectionUpdateAsyncViaDynamicAsyncViaTableNameViaPrimaryKey()
         {
             // Setup
             var table = Helper.CreateNonIdentityTable();
@@ -1832,7 +1832,7 @@ public void TestSqlConnectionUpdateAsyncViaDynamicTableNameAsyncViaPrimaryKey()
         }
 
         [TestMethod]
-        public void TestSqlConnectionUpdateViaTableNameAsyncViaPrimaryKey()
+        public void TestSqlConnectionUpdateViaAsyncViaTableNameViaPrimaryKey()
         {
             // Setup
             var table = Helper.CreateNonIdentityTable();
@@ -1858,7 +1858,7 @@ public void TestSqlConnectionUpdateViaTableNameAsyncViaPrimaryKey()
         }
 
         [TestMethod]
-        public void TestSqlConnectionUpdateViaTableNameAsyncViaDynamic()
+        public void TestSqlConnectionUpdateViaAsyncViaTableNameViaDynamic()
         {
             // Setup
             var table = Helper.CreateIdentityTable();
@@ -1890,7 +1890,7 @@ public void TestSqlConnectionUpdateViaTableNameAsyncViaDynamic()
         }
 
         [TestMethod]
-        public void TestSqlConnectionUpdateViaTableNameAsyncViaQueryField()
+        public void TestSqlConnectionUpdateViaAsyncViaTableNameViaQueryField()
         {
             // Setup
             var table = Helper.CreateIdentityTable();
@@ -1925,7 +1925,7 @@ public void TestSqlConnectionUpdateViaTableNameAsyncViaQueryField()
         }
 
         [TestMethod]
-        public void TestSqlConnectionUpdateViaTableNameAsyncViaQueryFields()
+        public void TestSqlConnectionUpdateViaAsyncViaTableNameViaQueryFields()
         {
             // Setup
             var table = Helper.CreateIdentityTable();
@@ -1965,7 +1965,7 @@ public void TestSqlConnectionUpdateViaTableNameAsyncViaQueryFields()
         }
 
         [TestMethod]
-        public void TestSqlConnectionUpdateViaTableNameAsyncViaQueryGroup()
+        public void TestSqlConnectionUpdateViaAsyncViaTableNameViaQueryGroup()
         {
             // Setup
             var table = Helper.CreateIdentityTable();
diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Types/SqlConnectionBytesTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Types/SqlConnectionBytesTest.cs
index 026b4f101..e51841d3a 100644
--- a/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Types/SqlConnectionBytesTest.cs
+++ b/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Types/SqlConnectionBytesTest.cs
@@ -24,7 +24,7 @@ public void Cleanup()
             Database.Cleanup();
         }
 
-        #region <TEntity>
+        #region Operation<TEntity>
 
         [TestMethod]
         public void TestSqlConnectionBytesCrud()
@@ -284,7 +284,7 @@ public void TestSqlConnectionBytesMappedNullCrudAsync()
 
         #endregion
 
-        #region (TableName)
+        #region Operation(TableName)
 
         [TestMethod]
         public void TestSqlConnectionBytesCrudViaTableName()
@@ -349,7 +349,7 @@ public void TestSqlConnectionBytesNullCrudViaTableName()
         }
 
         [TestMethod]
-        public void TestSqlConnectionBytesCrudViaTableNameAsync()
+        public void TestSqlConnectionBytesCrudViaAsyncViaTableName()
         {
             // Setup
             var text = "RepoDb"; // Helper.GetAssemblyDescription();
@@ -383,7 +383,7 @@ public void TestSqlConnectionBytesCrudViaTableNameAsync()
         }
 
         [TestMethod]
-        public void TestSqlConnectionBytesNullCrudViaTableNameAsync()
+        public void TestSqlConnectionBytesNullCrudViaAsyncViaTableName()
         {
             // Setup
             var entity = new
diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Types/SqlConnectionDatesTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Types/SqlConnectionDatesTest.cs
index 003400896..9326ae703 100644
--- a/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Types/SqlConnectionDatesTest.cs
+++ b/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Types/SqlConnectionDatesTest.cs
@@ -386,7 +386,7 @@ public void TestSqlConnectionDatesNullCrudViaTableName()
         }
 
         [TestMethod]
-        public void TestSqlConnectionDatesCrudViaTableNameAsync()
+        public void TestSqlConnectionDatesCrudViaAsyncViaTableName()
         {
             // Setup
             var dateTime = new DateTime(1970, 1, 1, 12, 50, 30, DateTimeKind.Utc);
@@ -424,7 +424,7 @@ public void TestSqlConnectionDatesCrudViaTableNameAsync()
         }
 
         [TestMethod]
-        public void TestSqlConnectionDatesNullCrudViaTableNameAsync()
+        public void TestSqlConnectionDatesNullCrudViaAsyncViaTableName()
         {
             // Setup
             var entity = new
diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Types/SqlConnectionNumbersTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Types/SqlConnectionNumbersTest.cs
index 472eb384a..e5c5bc4be 100644
--- a/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Types/SqlConnectionNumbersTest.cs
+++ b/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Types/SqlConnectionNumbersTest.cs
@@ -458,7 +458,7 @@ public void TestSqlConnectionNumbersNullViaTableNameCrud()
         }
 
         [TestMethod]
-        public void TestSqlConnectionNumbersCrudViaTableNameAsync()
+        public void TestSqlConnectionNumbersCrudViaAsyncViaTableName()
         {
             // Setup
             var entity = new
@@ -502,7 +502,7 @@ public void TestSqlConnectionNumbersCrudViaTableNameAsync()
         }
 
         [TestMethod]
-        public void TestSqlConnectionNumbersNullCrudViaTableNameAsync()
+        public void TestSqlConnectionNumbersNullCrudViaAsyncViaTableName()
         {
             // Setup
             var entity = new
diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Types/SqlConnectionOthersTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Types/SqlConnectionOthersTest.cs
index 7a049b8cc..0e459863e 100644
--- a/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Types/SqlConnectionOthersTest.cs
+++ b/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Types/SqlConnectionOthersTest.cs
@@ -338,7 +338,7 @@ public void TestSqlConnectionOthersNullCrudViaTableName()
         }
 
         [TestMethod]
-        public void TestSqlConnectionOthersCrudViaTableNameAsync()
+        public void TestSqlConnectionOthersCrudViaAsyncViaTableName()
         {
             // Setup
             var entity = new
@@ -370,7 +370,7 @@ public void TestSqlConnectionOthersCrudViaTableNameAsync()
         }
 
         [TestMethod]
-        public void TestSqlConnectionOthersNullCrudViaTableNameAsync()
+        public void TestSqlConnectionOthersNullCrudViaAsyncViaTableName()
         {
             // Setup
             var entity = new
diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Types/SqlConnectionSpatialsTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Types/SqlConnectionSpatialsTest.cs
index 2e398378d..d8e02cf7d 100644
--- a/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Types/SqlConnectionSpatialsTest.cs
+++ b/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Types/SqlConnectionSpatialsTest.cs
@@ -298,7 +298,7 @@ public void TestSqlConnectionSpatialsNullCrudViaTableName()
         }
 
         [TestMethod]
-        public void TestSqlConnectionSpatialsCrudViaTableNameAsync()
+        public void TestSqlConnectionSpatialsCrudViaAsyncViaTableName()
         {
             // Setup
             var entity = new
@@ -326,7 +326,7 @@ public void TestSqlConnectionSpatialsCrudViaTableNameAsync()
         }
 
         [TestMethod]
-        public void TestSqlConnectionSpatialsNullCrudViaTableNameAsync()
+        public void TestSqlConnectionSpatialsNullCrudViaAsyncViaTableName()
         {
             // Setup
             var entity = new
diff --git a/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Types/SqlConnectionStringsTest.cs b/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Types/SqlConnectionStringsTest.cs
index 2bf3506a1..30977f0de 100644
--- a/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Types/SqlConnectionStringsTest.cs
+++ b/RepoDb.Core/RepoDb.Tests/RepoDb.IntegrationTests/Types/SqlConnectionStringsTest.cs
@@ -383,7 +383,7 @@ public void TestSqlConnectionStringsNullCrudViaTableName()
         }
 
         [TestMethod]
-        public void TestSqlConnectionStringsCrudViaTableNameAsync()
+        public void TestSqlConnectionStringsCrudViaAsyncViaTableName()
         {
             // Setup
             var text = Helper.GetUnicodeString();
@@ -420,7 +420,7 @@ public void TestSqlConnectionStringsCrudViaTableNameAsync()
         }
 
         [TestMethod]
-        public void TestSqlConnectionStringsNullCrudViaTableNameAsync()
+        public void TestSqlConnectionStringsNullCrudViaAsyncViaTableName()
         {
             // Setup
             var entity = new