diff --git a/kernels/x86_64/penryn/1/bli_axpyv_int_var1.c b/kernels/x86_64/penryn/1/bli_axpyv_opt_var1.c
similarity index 97%
rename from kernels/x86_64/penryn/1/bli_axpyv_int_var1.c
rename to kernels/x86_64/penryn/1/bli_axpyv_opt_var1.c
index f9a923bed..121068bd5 100644
--- a/kernels/x86_64/penryn/1/bli_axpyv_int_var1.c
+++ b/kernels/x86_64/penryn/1/bli_axpyv_opt_var1.c
@@ -43,7 +43,7 @@ typedef union
 } v2df_t;
 
 
-void bli_daxpyv_int_var1
+void bli_daxpyv_opt_var1
      ( 
        conj_t  conjx,
        dim_t   n,
@@ -106,7 +106,8 @@ void bli_daxpyv_int_var1
 		                        n,
 		                        alpha,
 		                        x, incx,
-		                        y, incy );
+		                        y, incy,
+		                        cntx );
 		return;
 	}
 
diff --git a/kernels/x86_64/penryn/1/bli_dotv_int_var1.c b/kernels/x86_64/penryn/1/bli_dotv_opt_var1.c
similarity index 97%
rename from kernels/x86_64/penryn/1/bli_dotv_int_var1.c
rename to kernels/x86_64/penryn/1/bli_dotv_opt_var1.c
index 53310273f..4ce09c4e3 100644
--- a/kernels/x86_64/penryn/1/bli_dotv_int_var1.c
+++ b/kernels/x86_64/penryn/1/bli_dotv_opt_var1.c
@@ -43,7 +43,7 @@ typedef union
 } v2df_t;
 
 
-void bli_ddotv_int_var1 
+void bli_ddotv_opt_var1 
      ( 
        conj_t  conjx,
        conj_t  conjy,
@@ -109,7 +109,8 @@ void bli_ddotv_int_var1
 		                       n,
 		                       x, incx,
 		                       y, incy,
-		                       rho );
+		                       rho,
+		                       cntx );
 		return;
 	}
 
diff --git a/kernels/x86_64/penryn/1f/bli_axpy2v_opt_var1.c b/kernels/x86_64/penryn/1f/bli_axpy2v_opt_var1.c
index 3d88d3f26..9674dc4d8 100644
--- a/kernels/x86_64/penryn/1f/bli_axpy2v_opt_var1.c
+++ b/kernels/x86_64/penryn/1f/bli_axpy2v_opt_var1.c
@@ -117,7 +117,8 @@ void bli_daxpy2v_int_var1
 		                         beta,
 		                         x, incx,
 		                         y, incy,
-		                         z, incz );
+		                         z, incz,
+		                         cntx );
 		return;
 	}
 
diff --git a/kernels/x86_64/penryn/1f/bli_axpyf_opt_var1.c b/kernels/x86_64/penryn/1f/bli_axpyf_opt_var1.c
index 41bf5f1c4..7c04b0efb 100644
--- a/kernels/x86_64/penryn/1f/bli_axpyf_opt_var1.c
+++ b/kernels/x86_64/penryn/1f/bli_axpyf_opt_var1.c
@@ -90,7 +90,7 @@ void bli_daxpyf_int_var1
 
 	// If there is anything that would interfere with our use of aligned
 	// vector loads/stores, call the reference implementation.
-	if ( b_n < PASTEMAC(d,axpyf_fusefac) )
+	if ( b_n < bli_cntx_get_blksz_def_dt( BLIS_DOUBLE, BLIS_AF, cntx ) )
 	{
 		use_ref = TRUE;
 	}
@@ -122,7 +122,8 @@ void bli_daxpyf_int_var1
 		                        alpha_cast,
 		                        a_cast, inca, lda,
 		                        x_cast, incx,
-		                        y_cast, incy );
+		                        y_cast, incy,
+		                        cntx );
 		return;
 	}
 
diff --git a/kernels/x86_64/penryn/1f/bli_dotaxpyv_opt_var1.c b/kernels/x86_64/penryn/1f/bli_dotaxpyv_opt_var1.c
index f90f1ae83..b42edef0b 100644
--- a/kernels/x86_64/penryn/1f/bli_dotaxpyv_opt_var1.c
+++ b/kernels/x86_64/penryn/1f/bli_dotaxpyv_opt_var1.c
@@ -120,7 +120,8 @@ void bli_ddotaxpyv_int_var1
 		                           x, incx,
 		                           y, incy,
 		                           rho,
-		                           z, incz );
+		                           z, incz,
+		                           cntx );
 		return;
 	}
 
diff --git a/kernels/x86_64/penryn/1f/bli_dotxaxpyf_opt_var1.c b/kernels/x86_64/penryn/1f/bli_dotxaxpyf_opt_var1.c
index cec491bc9..fc073b49b 100644
--- a/kernels/x86_64/penryn/1f/bli_dotxaxpyf_opt_var1.c
+++ b/kernels/x86_64/penryn/1f/bli_dotxaxpyf_opt_var1.c
@@ -104,10 +104,11 @@ void bli_ddotxaxpyf_int_var1
 	// If the vector lengths are zero, scale y by beta and return.
 	if ( bli_zero_dim1( m ) ) 
 	{ 
-		PASTEMAC2(d,d,scalv)( BLIS_NO_CONJUGATE,
-		                      b_n,
-		                      beta,
-		                      y, incy );
+		bli_dscalv( BLIS_NO_CONJUGATE,
+		            b_n,
+		            beta,
+		            y, incy,
+		            cntx );
 		return; 
 	} 
 
@@ -115,7 +116,7 @@ void bli_ddotxaxpyf_int_var1
 
     // If there is anything that would interfere with our use of aligned
     // vector loads/stores, call the reference implementation.
-	if ( b_n < PASTEMAC(d,dotxaxpyf_fusefac) )
+	if ( b_n < bli_cntx_get_blksz_def_dt( BLIS_DOUBLE, BLIS_XF, cntx ) )
 	{
 		use_ref = TRUE;
 	}
@@ -155,7 +156,8 @@ void bli_ddotxaxpyf_int_var1
 		                            x_cast, incx,
 		                            beta_cast,
 		                            y_cast, incy,
-		                            z_cast, incz );
+		                            z_cast, incz,
+		                            cntx );
 		return;
 	}
 
diff --git a/kernels/x86_64/penryn/1f/bli_dotxf_opt_var1.c b/kernels/x86_64/penryn/1f/bli_dotxf_opt_var1.c
index d104d0b01..af7f0ecbb 100644
--- a/kernels/x86_64/penryn/1f/bli_dotxf_opt_var1.c
+++ b/kernels/x86_64/penryn/1f/bli_dotxf_opt_var1.c
@@ -90,10 +90,11 @@ void bli_ddotxf_int_var1
 	// If the vector lengths are zero, scale r by beta and return.
 	if ( bli_zero_dim1( m ) ) 
 	{ 
-		PASTEMAC2(d,d,scalv)( BLIS_NO_CONJUGATE,
-		                      b_n,
-		                      beta_cast,
-		                      y_cast, incy );
+		bli_dscalv( BLIS_NO_CONJUGATE,
+		            b_n,
+		            beta_cast,
+		            y_cast, incy,
+		            cntx );
 		return; 
 	} 
 
@@ -101,7 +102,7 @@ void bli_ddotxf_int_var1
 
     // If there is anything that would interfere with our use of aligned
     // vector loads/stores, call the reference implementation.
-	if ( b_n < PASTEMAC(d,dotxf_fusefac) )
+	if ( b_n < bli_cntx_get_blksz_def_dt( BLIS_DOUBLE, BLIS_DF, cntx ) )
 	{
 		use_ref = TRUE;
 	}
@@ -136,7 +137,8 @@ void bli_ddotxf_int_var1
 		                        a_cast, inca, lda,
 		                        x_cast, incx,
 		                        beta_cast,
-		                        y_cast, incy );
+		                        y_cast, incy,
+		                        cntx );
 		return;
 	}