diff --git a/driver/device_implicit_gemm_convolution_2_cnhw_srck_knhw.cuh b/driver/device_implicit_gemm_convolution_2_cnhw_srck_knhw.cuh
index 892eff2083..18c639ea1b 100644
--- a/driver/device_implicit_gemm_convolution_2_cnhw_srck_knhw.cuh
+++ b/driver/device_implicit_gemm_convolution_2_cnhw_srck_knhw.cuh
@@ -102,8 +102,8 @@ void device_implicit_gemm_convolution_2_cnhw_srck_knhw(InDesc,
     constexpr unsigned KPerThread = 8;
     constexpr unsigned CPerThread = 1;
 
-    constexpr unsigned GemmThreadPerClusterRow    = 4;
-    constexpr unsigned GemmThreadPerClusterColumn = 4;
+    constexpr unsigned GemmRowThreadPerCluster    = 4;
+    constexpr unsigned GemmColumnThreadPerCluster = 4;
 
     constexpr unsigned InBlockCopyThreadPerDim0 = 2;
     constexpr unsigned InBlockCopyThreadPerDim1 = 64;
@@ -149,8 +149,8 @@ void device_implicit_gemm_convolution_2_cnhw_srck_knhw(InDesc,
                                                             BPerThread,
                                                             KPerThread,
                                                             CPerThread,
-                                                            GemmThreadPerClusterRow,
-                                                            GemmThreadPerClusterColumn,
+                                                            GemmRowThreadPerCluster,
+                                                            GemmColumnThreadPerCluster,
                                                             InBlockCopyThreadPerDim0,
                                                             InBlockCopyThreadPerDim1>
             <<<grid_dim, block_dim>>>(in_cnhw_desc,
diff --git a/src/include/gridwise_implicit_gemm_convolution_3_cnhw_srck_knhw.cuh b/src/include/gridwise_implicit_gemm_convolution_3_cnhw_srck_knhw.cuh
index d0d5797790..0d1b0fca0b 100644
--- a/src/include/gridwise_implicit_gemm_convolution_3_cnhw_srck_knhw.cuh
+++ b/src/include/gridwise_implicit_gemm_convolution_3_cnhw_srck_knhw.cuh
@@ -20,8 +20,8 @@ template <unsigned GridSize,
           unsigned BPerThread,
           unsigned KPerThread,
           unsigned CPerThread,
-          unsigned GemmThreadPerClusterRow,
-          unsigned GemmThreadPerClusterColumn,
+          unsigned GemmRowThreadPerCluster,
+          unsigned GemmColumnThreadPerCluster,
           unsigned InBlockCopyThreadPerDim0,
           unsigned InBlockCopyThreadPerDim1>
 __global__ void
@@ -177,8 +177,8 @@ gridwise_implicit_gemm_convolution_3_cnhw_srck_knhw(InGlobalDesc,
                                                 false,
                                                 false,
                                                 CPerThread,
-                                                GemmThreadPerClusterRow,
-                                                GemmThreadPerClusterColumn,
+                                                GemmRowThreadPerCluster,
+                                                GemmColumnThreadPerCluster,
                                                 true>{};
 
     // LDS