diff --git a/config/knl/bli_family_knl.h b/config/knl/bli_family_knl.h
index cc9c5304c..d784aed5c 100644
--- a/config/knl/bli_family_knl.h
+++ b/config/knl/bli_family_knl.h
@@ -38,11 +38,11 @@
 
 // -- THREADING PARAMETERS -----------------------------------------------------
 
-#define BLIS_DEFAULT_M_THREAD_RATIO     4
-#define BLIS_DEFAULT_N_THREAD_RATIO     1
+#define BLIS_THREAD_RATIO_M     4
+#define BLIS_THREAD_RATIO_N     1
 
-#define BLIS_DEFAULT_MR_THREAD_MAX      1
-#define BLIS_DEFAULT_NR_THREAD_MAX      1
+#define BLIS_THREAD_MAX_IR      1
+#define BLIS_THREAD_MAX_JR      1
 
 
 // -- MEMORY ALLOCATION --------------------------------------------------------
diff --git a/config/skx/bli_family_skx.h b/config/skx/bli_family_skx.h
index 96fdc12aa..d5071baa8 100644
--- a/config/skx/bli_family_skx.h
+++ b/config/skx/bli_family_skx.h
@@ -37,11 +37,11 @@
 
 // -- THREADING PARAMETERS -----------------------------------------------------
 
-#define BLIS_DEFAULT_M_THREAD_RATIO     3
-#define BLIS_DEFAULT_N_THREAD_RATIO     2
+#define BLIS_THREAD_RATIO_M     3
+#define BLIS_THREAD_RATIO_N     2
 
-#define BLIS_DEFAULT_MR_THREAD_MAX      1
-#define BLIS_DEFAULT_NR_THREAD_MAX      4
+#define BLIS_THREAD_MAX_IR      1
+#define BLIS_THREAD_MAX_JR      4
 
 // -- MEMORY ALLOCATION --------------------------------------------------------
 
diff --git a/config/zen/bli_family_zen.h b/config/zen/bli_family_zen.h
index 9bd44d16e..02e628017 100644
--- a/config/zen/bli_family_zen.h
+++ b/config/zen/bli_family_zen.h
@@ -39,8 +39,8 @@
 // By default, it is effective to parallelize the outer loops.
 // Setting these macros to 1 will force JR and IR inner loops
 // to be not paralleized.
-#define BLIS_DEFAULT_MR_THREAD_MAX 1
-#define BLIS_DEFAULT_NR_THREAD_MAX 1
+#define BLIS_THREAD_MAX_IR      1
+#define BLIS_THREAD_MAX_JR      1
 
 #define BLIS_ENABLE_ZEN_BLOCK_SIZES
 //#define BLIS_ENABLE_SMALL_MATRIX
diff --git a/config/zen/bli_kernel.h b/config/zen/old/bli_kernel.h
similarity index 100%
rename from config/zen/bli_kernel.h
rename to config/zen/old/bli_kernel.h
diff --git a/frame/base/bli_rntm.c b/frame/base/bli_rntm.c
index 8b0184240..6ccea7277 100644
--- a/frame/base/bli_rntm.c
+++ b/frame/base/bli_rntm.c
@@ -198,15 +198,15 @@ void bli_rntm_set_ways_from_rntm
 
 		pc = 1;
 
-		bli_partition_2x2( nt, m*BLIS_DEFAULT_M_THREAD_RATIO,
-		                       n*BLIS_DEFAULT_N_THREAD_RATIO, &ic, &jc );
+		bli_partition_2x2( nt, m*BLIS_THREAD_RATIO_M,
+		                       n*BLIS_THREAD_RATIO_N, &ic, &jc );
 
-		for ( ir = BLIS_DEFAULT_MR_THREAD_MAX ; ir > 1 ; ir-- )
+		for ( ir = BLIS_THREAD_MAX_IR ; ir > 1 ; ir-- )
 		{
 			if ( ic % ir == 0 ) { ic /= ir; break; }
 		}
 
-		for ( jr = BLIS_DEFAULT_NR_THREAD_MAX ; jr > 1 ; jr-- )
+		for ( jr = BLIS_THREAD_MAX_JR ; jr > 1 ; jr-- )
 		{
 			if ( jc % jr == 0 ) { jc /= jr; break; }
 		}
diff --git a/frame/include/bli_kernel_macro_defs.h b/frame/include/bli_kernel_macro_defs.h
index 137d3b375..1b67988d7 100644
--- a/frame/include/bli_kernel_macro_defs.h
+++ b/frame/include/bli_kernel_macro_defs.h
@@ -38,20 +38,20 @@
 
 // -- Define default threading parameters --------------------------------------
 
-#ifndef BLIS_DEFAULT_M_THREAD_RATIO
-#define BLIS_DEFAULT_M_THREAD_RATIO 2
+#ifndef BLIS_THREAD_RATIO_M
+#define BLIS_THREAD_RATIO_M     2
 #endif
 
-#ifndef BLIS_DEFAULT_N_THREAD_RATIO
-#define BLIS_DEFAULT_N_THREAD_RATIO 1
+#ifndef BLIS_THREAD_RATIO_N
+#define BLIS_THREAD_RATIO_N     1
 #endif
 
-#ifndef BLIS_DEFAULT_MR_THREAD_MAX
-#define BLIS_DEFAULT_MR_THREAD_MAX 1
+#ifndef BLIS_THREAD_MAX_IR
+#define BLIS_THREAD_MAX_IR      1
 #endif
 
-#ifndef BLIS_DEFAULT_NR_THREAD_MAX
-#define BLIS_DEFAULT_NR_THREAD_MAX 4
+#ifndef BLIS_THREAD_MAX_JR
+#define BLIS_THREAD_MAX_JR      4
 #endif