diff --git a/testsuite/src/test_addm.c b/testsuite/src/test_addm.c
index c957e4dc9..f7c21b733 100644
--- a/testsuite/src/test_addm.c
+++ b/testsuite/src/test_addm.c
@@ -275,7 +275,7 @@ void libblis_test_addm_check
 	//
 	// is functioning correctly if
 	//
-	//   normfv(y) - sqrt( absqsc( beta + conjx(alpha) ) * m * n )
+	//   normfm(y) - sqrt( absqsc( beta + conjx(alpha) ) * m * n )
 	//
 	// is negligible.
 	//
diff --git a/testsuite/src/test_axpbyv.c b/testsuite/src/test_axpbyv.c
index 2cfdd416c..a82ff6e25 100644
--- a/testsuite/src/test_axpbyv.c
+++ b/testsuite/src/test_axpbyv.c
@@ -296,7 +296,7 @@ void libblis_test_axpbyv_check
 	//
 	// is functioning correctly if
 	//
-	//   normf( y - ( beta * y_orig + alpha * conjx(x) ) )
+	//   normfv( y - ( beta * y_orig + alpha * conjx(x) ) )
 	//
 	// is negligible.
 	//
diff --git a/testsuite/src/test_axpy2v.c b/testsuite/src/test_axpy2v.c
index f310d5cb6..eeebf15e7 100644
--- a/testsuite/src/test_axpy2v.c
+++ b/testsuite/src/test_axpy2v.c
@@ -314,7 +314,7 @@ void libblis_test_axpy2v_check
 	//
 	// is functioning correctly if
 	//
-	//   normf( z - v )
+	//   normfv( z - v )
 	//
 	// is negligible, where v contains z as computed by two calls to axpyv.
 	//
diff --git a/testsuite/src/test_axpyf.c b/testsuite/src/test_axpyf.c
index 7572b3a48..7a85b2212 100644
--- a/testsuite/src/test_axpyf.c
+++ b/testsuite/src/test_axpyf.c
@@ -319,7 +319,7 @@ void libblis_test_axpyf_check
 	//
 	// is functioning correctly if
 	//
-	//   normf( y - v )
+	//   normfv( y - v )
 	//
 	// is negligible, where v contains y as computed by repeated calls to
 	// axpyv.
diff --git a/testsuite/src/test_axpym.c b/testsuite/src/test_axpym.c
index 9097043a4..222fda33d 100644
--- a/testsuite/src/test_axpym.c
+++ b/testsuite/src/test_axpym.c
@@ -289,7 +289,7 @@ void libblis_test_axpym_check
 	//
 	// is functioning correctly if
 	//
-	//   normf( y - ( y_orig + alpha * conjx(x) ) )
+	//   normfm( y - ( y_orig + alpha * conjx(x) ) )
 	//
 	// is negligible.
 	//
diff --git a/testsuite/src/test_axpyv.c b/testsuite/src/test_axpyv.c
index 5f3f991ef..81d4f3770 100644
--- a/testsuite/src/test_axpyv.c
+++ b/testsuite/src/test_axpyv.c
@@ -286,7 +286,7 @@ void libblis_test_axpyv_check
 	//
 	// is functioning correctly if
 	//
-	//   normf( y - ( y_orig + alpha * conjx(x) ) )
+	//   normfv( y - ( y_orig + alpha * conjx(x) ) )
 	//
 	// is negligible.
 	//
diff --git a/testsuite/src/test_dotaxpyv.c b/testsuite/src/test_dotaxpyv.c
index 28d6c6916..391c119bb 100644
--- a/testsuite/src/test_dotaxpyv.c
+++ b/testsuite/src/test_dotaxpyv.c
@@ -345,7 +345,7 @@ void libblis_test_dotaxpyv_check
 	//
 	// and
 	//
-	//   normf( z - z_temp )
+	//   normfv( z - z_temp )
 	//
 	// are negligible, where rho_temp and z_temp contain rho and z as
 	// computed by dotv and axpyv, respectively.
diff --git a/testsuite/src/test_dotv.c b/testsuite/src/test_dotv.c
index bc4ad54f9..347ce9e62 100644
--- a/testsuite/src/test_dotv.c
+++ b/testsuite/src/test_dotv.c
@@ -278,7 +278,7 @@ void libblis_test_dotv_check
 	//
 	// is functioning correctly if
 	//
-	//   sqrtsc( rho.real ) - normf( x )
+	//   sqrtsc( rho.real ) - normfv( x )
 	//
 	// and
 	//
diff --git a/testsuite/src/test_dotxaxpyf.c b/testsuite/src/test_dotxaxpyf.c
index ca57ca39b..c73ab6c9d 100644
--- a/testsuite/src/test_dotxaxpyf.c
+++ b/testsuite/src/test_dotxaxpyf.c
@@ -366,11 +366,11 @@ void libblis_test_dotxaxpyf_check
 	//
 	// is functioning correctly if
 	//
-	//   normf( y - v )
+	//   normfv( y - v )
 	//
 	// and
 	//
-	//   normf( z - q )
+	//   normfv( z - q )
 	//
 	// are negligible, where v and q contain y and z as computed by repeated
 	// calls to dotxv and axpyv, respectively.
diff --git a/testsuite/src/test_dotxf.c b/testsuite/src/test_dotxf.c
index eefe2bb77..8a1eca4eb 100644
--- a/testsuite/src/test_dotxf.c
+++ b/testsuite/src/test_dotxf.c
@@ -324,7 +324,7 @@ void libblis_test_dotxf_check
 	//
 	// is functioning correctly if
 	//
-	//   normf( y - v )
+	//   normfv( y - v )
 	//
 	// is negligible, where v contains y as computed by repeated calls to
 	// dotxv.
diff --git a/testsuite/src/test_dotxv.c b/testsuite/src/test_dotxv.c
index fb677a06d..da42e6ae4 100644
--- a/testsuite/src/test_dotxv.c
+++ b/testsuite/src/test_dotxv.c
@@ -304,7 +304,7 @@ void libblis_test_dotxv_check
 	//
 	// is functioning correctly if
 	//
-	//   sqrtsc( rho.real ) - sqrtsc( alpha ) * normf( x )
+	//   sqrtsc( rho.real ) - sqrtsc( alpha ) * normfv( x )
 	//
 	// and
 	//
diff --git a/testsuite/src/test_gemm.c b/testsuite/src/test_gemm.c
index 935f5031a..e941946e1 100644
--- a/testsuite/src/test_gemm.c
+++ b/testsuite/src/test_gemm.c
@@ -625,7 +625,7 @@ void libblis_test_gemm_check
 	//
 	// is functioning correctly if
 	//
-	//   normf( v - z )
+	//   normfv( v - z )
 	//
 	// is negligible, where
 	//
diff --git a/testsuite/src/test_gemm_ukr.c b/testsuite/src/test_gemm_ukr.c
index 8de3f144b..66e84d644 100644
--- a/testsuite/src/test_gemm_ukr.c
+++ b/testsuite/src/test_gemm_ukr.c
@@ -390,7 +390,7 @@ void libblis_test_gemm_ukr_check
 	//
 	// is functioning correctly if
 	//
-	//   normf( v - z )
+	//   normfv( v - z )
 	//
 	// is negligible, where
 	//
diff --git a/testsuite/src/test_gemmtrsm_ukr.c b/testsuite/src/test_gemmtrsm_ukr.c
index 58da5410a..e2cf10ab3 100644
--- a/testsuite/src/test_gemmtrsm_ukr.c
+++ b/testsuite/src/test_gemmtrsm_ukr.c
@@ -465,7 +465,7 @@ void libblis_test_gemmtrsm_ukr_check
 	//
 	// is functioning correctly if
 	//
-	//   normf( v - z )
+	//   normfv( v - z )
 	//
 	// is negligible, where
 	//
diff --git a/testsuite/src/test_gemv.c b/testsuite/src/test_gemv.c
index 7df4c3fc8..e6090e1c5 100644
--- a/testsuite/src/test_gemv.c
+++ b/testsuite/src/test_gemv.c
@@ -324,7 +324,7 @@ void libblis_test_gemv_check
 	//
 	// is functioning correctly if
 	//
-	//   normf( y - z )
+	//   normfv( y - z )
 	//
 	// is negligible, where
 	//
diff --git a/testsuite/src/test_ger.c b/testsuite/src/test_ger.c
index 961247e84..b44fe6ba6 100644
--- a/testsuite/src/test_ger.c
+++ b/testsuite/src/test_ger.c
@@ -303,7 +303,7 @@ void libblis_test_ger_check
 	//
 	// is functioning correctly if
 	//
-	//   normf( v - w )
+	//   normfv( v - w )
 	//
 	// is negligible, where
 	//
diff --git a/testsuite/src/test_hemm.c b/testsuite/src/test_hemm.c
index 8eeb2ad34..0145dd0df 100644
--- a/testsuite/src/test_hemm.c
+++ b/testsuite/src/test_hemm.c
@@ -338,7 +338,7 @@ void libblis_test_hemm_check
 	//
 	// is functioning correctly if
 	//
-	//   normf( v - z )
+	//   normfv( v - z )
 	//
 	// is negligible, where
 	//
diff --git a/testsuite/src/test_hemv.c b/testsuite/src/test_hemv.c
index 5aca22239..02e205392 100644
--- a/testsuite/src/test_hemv.c
+++ b/testsuite/src/test_hemv.c
@@ -322,7 +322,7 @@ void libblis_test_hemv_check
 	//
 	// is functioning correctly if
 	//
-	//   normf( y - v )
+	//   normfv( y - v )
 	//
 	// is negligible, where
 	//
diff --git a/testsuite/src/test_her.c b/testsuite/src/test_her.c
index 855679cf8..c122f6ce5 100644
--- a/testsuite/src/test_her.c
+++ b/testsuite/src/test_her.c
@@ -301,7 +301,7 @@ void libblis_test_her_check
 	//
 	// is functioning correctly if
 	//
-	//   normf( v - w )
+	//   normfv( v - w )
 	//
 	// is negligible, where
 	//
diff --git a/testsuite/src/test_her2.c b/testsuite/src/test_her2.c
index ee35cc93f..1ed6b3bb9 100644
--- a/testsuite/src/test_her2.c
+++ b/testsuite/src/test_her2.c
@@ -311,7 +311,7 @@ void libblis_test_her2_check
 	//
 	// is functioning correctly if
 	//
-	//   normf( v - w )
+	//   normfv( v - w )
 	//
 	// is negligible, where
 	//
diff --git a/testsuite/src/test_her2k.c b/testsuite/src/test_her2k.c
index 717bbdd34..0158e25a2 100644
--- a/testsuite/src/test_her2k.c
+++ b/testsuite/src/test_her2k.c
@@ -336,7 +336,7 @@ void libblis_test_her2k_check
 	//
 	// is functioning correctly if
 	//
-	//   normf( v - z )
+	//   normfv( v - z )
 	//
 	// is negligible, where
 	//
diff --git a/testsuite/src/test_herk.c b/testsuite/src/test_herk.c
index 9b557e022..abe4e70b1 100644
--- a/testsuite/src/test_herk.c
+++ b/testsuite/src/test_herk.c
@@ -323,7 +323,7 @@ void libblis_test_herk_check
 	//
 	// is functioning correctly if
 	//
-	//   normf( v - z )
+	//   normfv( v - z )
 	//
 	// is negligible, where
 	//
diff --git a/testsuite/src/test_normfm.c b/testsuite/src/test_normfm.c
index 8cee0332e..c4b9a0105 100644
--- a/testsuite/src/test_normfm.c
+++ b/testsuite/src/test_normfm.c
@@ -259,7 +259,7 @@ void libblis_test_normfm_check
 	//
 	// Under these conditions, we assume that the implementation for
 	//
-	//   norm := normf( x )
+	//   norm := normfm( x )
 	//
 	// is functioning correctly if
 	//
diff --git a/testsuite/src/test_normfv.c b/testsuite/src/test_normfv.c
index 8a473f5fd..3bcce35af 100644
--- a/testsuite/src/test_normfv.c
+++ b/testsuite/src/test_normfv.c
@@ -256,7 +256,7 @@ void libblis_test_normfv_check
 	//
 	// Under these conditions, we assume that the implementation for
 	//
-	//   norm := normf( x )
+	//   norm := normfv( x )
 	//
 	// is functioning correctly if
 	//
diff --git a/testsuite/src/test_scal2m.c b/testsuite/src/test_scal2m.c
index 3dcff3d78..e8440fc46 100644
--- a/testsuite/src/test_scal2m.c
+++ b/testsuite/src/test_scal2m.c
@@ -288,7 +288,7 @@ void libblis_test_scal2m_check
 	//
 	// is functioning correctly if
 	//
-	//   normf( y - alpha * conjx(x) )
+	//   normfm( y - alpha * conjx(x) )
 	//
 	// is negligible.
 	//
diff --git a/testsuite/src/test_scal2v.c b/testsuite/src/test_scal2v.c
index 94af24502..c200e13fc 100644
--- a/testsuite/src/test_scal2v.c
+++ b/testsuite/src/test_scal2v.c
@@ -285,7 +285,7 @@ void libblis_test_scal2v_check
 	//
 	// is functioning correctly if
 	//
-	//   normf( y - alpha * conjx(x) )
+	//   normfv( y - alpha * conjx(x) )
 	//
 	// is negligible.
 	//
diff --git a/testsuite/src/test_scalm.c b/testsuite/src/test_scalm.c
index b3f2066e0..6219c71df 100644
--- a/testsuite/src/test_scalm.c
+++ b/testsuite/src/test_scalm.c
@@ -280,7 +280,7 @@ void libblis_test_scalm_check
 	//
 	// is functioning correctly if
 	//
-	//   normf( y + -conjbeta(beta) * y_orig )
+	//   normfm( y + -conjbeta(beta) * y_orig )
 	//
 	// is negligible.
 	//
diff --git a/testsuite/src/test_scalv.c b/testsuite/src/test_scalv.c
index fefb23b4a..142b5e410 100644
--- a/testsuite/src/test_scalv.c
+++ b/testsuite/src/test_scalv.c
@@ -276,7 +276,7 @@ void libblis_test_scalv_check
 	//
 	// is functioning correctly if
 	//
-	//   normf( y + -conjbeta(beta) * y_orig )
+	//   normfv( y + -conjbeta(beta) * y_orig )
 	//
 	// is negligible.
 	//
diff --git a/testsuite/src/test_symm.c b/testsuite/src/test_symm.c
index 6e1f7938a..2ac7b4106 100644
--- a/testsuite/src/test_symm.c
+++ b/testsuite/src/test_symm.c
@@ -338,7 +338,7 @@ void libblis_test_symm_check
 	//
 	// is functioning correctly if
 	//
-	//   normf( v - z )
+	//   normfv( v - z )
 	//
 	// is negligible, where
 	//
diff --git a/testsuite/src/test_symv.c b/testsuite/src/test_symv.c
index c99941ea0..5ae5f30be 100644
--- a/testsuite/src/test_symv.c
+++ b/testsuite/src/test_symv.c
@@ -322,7 +322,7 @@ void libblis_test_symv_check
 	//
 	// is functioning correctly if
 	//
-	//   normf( y - v )
+	//   normfv( y - v )
 	//
 	// is negligible, where
 	//
diff --git a/testsuite/src/test_syr.c b/testsuite/src/test_syr.c
index b3a6a356d..69376b970 100644
--- a/testsuite/src/test_syr.c
+++ b/testsuite/src/test_syr.c
@@ -301,7 +301,7 @@ void libblis_test_syr_check
 	//
 	// is functioning correctly if
 	//
-	//   normf( v - w )
+	//   normfv( v - w )
 	//
 	// is negligible, where
 	//
diff --git a/testsuite/src/test_syr2.c b/testsuite/src/test_syr2.c
index 6b5d72e76..42d65c00e 100644
--- a/testsuite/src/test_syr2.c
+++ b/testsuite/src/test_syr2.c
@@ -313,7 +313,7 @@ void libblis_test_syr2_check
 	//
 	// is functioning correctly if
 	//
-	//   normf( v - w )
+	//   normfv( v - w )
 	//
 	// is negligible, where
 	//
diff --git a/testsuite/src/test_syr2k.c b/testsuite/src/test_syr2k.c
index 4ed2957eb..4d83bb88c 100644
--- a/testsuite/src/test_syr2k.c
+++ b/testsuite/src/test_syr2k.c
@@ -335,7 +335,7 @@ void libblis_test_syr2k_check
 	//
 	// is functioning correctly if
 	//
-	//   normf( v - z )
+	//   normfv( v - z )
 	//
 	// is negligible, where
 	//
diff --git a/testsuite/src/test_syrk.c b/testsuite/src/test_syrk.c
index 9be08484e..65d978bb0 100644
--- a/testsuite/src/test_syrk.c
+++ b/testsuite/src/test_syrk.c
@@ -324,7 +324,7 @@ void libblis_test_syrk_check
 	//
 	// is functioning correctly if
 	//
-	//   normf( v - z )
+	//   normfv( v - z )
 	//
 	// is negligible, where
 	//
diff --git a/testsuite/src/test_trmm.c b/testsuite/src/test_trmm.c
index 965c85669..a1decd37c 100644
--- a/testsuite/src/test_trmm.c
+++ b/testsuite/src/test_trmm.c
@@ -320,7 +320,7 @@ void libblis_test_trmm_check
 	//
 	// is functioning correctly if
 	//
-	//   normf( v - z )
+	//   normfv( v - z )
 	//
 	// is negligible, where
 	//
diff --git a/testsuite/src/test_trmm3.c b/testsuite/src/test_trmm3.c
index 7eccec83b..17ba2190b 100644
--- a/testsuite/src/test_trmm3.c
+++ b/testsuite/src/test_trmm3.c
@@ -339,7 +339,7 @@ void libblis_test_trmm3_check
 	//
 	// is functioning correctly if
 	//
-	//   normf( v - z )
+	//   normfv( v - z )
 	//
 	// is negligible, where
 	//
diff --git a/testsuite/src/test_trmv.c b/testsuite/src/test_trmv.c
index 85ee1e802..71acc90ba 100644
--- a/testsuite/src/test_trmv.c
+++ b/testsuite/src/test_trmv.c
@@ -304,7 +304,7 @@ void libblis_test_trmv_check
 	//
 	// is functioning correctly if
 	//
-	//   normf( y - x )
+	//   normfv( y - x )
 	//
 	// is negligible, where
 	//
diff --git a/testsuite/src/test_trsm.c b/testsuite/src/test_trsm.c
index 01d2d53a4..fa0d8e7c3 100644
--- a/testsuite/src/test_trsm.c
+++ b/testsuite/src/test_trsm.c
@@ -327,7 +327,7 @@ void libblis_test_trsm_check
 	//
 	// is functioning correctly if
 	//
-	//   normf( v - z )
+	//   normfv( v - z )
 	//
 	// is negligible, where
 	//
diff --git a/testsuite/src/test_trsm_ukr.c b/testsuite/src/test_trsm_ukr.c
index 1f81400c9..ee468dbd3 100644
--- a/testsuite/src/test_trsm_ukr.c
+++ b/testsuite/src/test_trsm_ukr.c
@@ -401,7 +401,7 @@ void libblis_test_trsm_ukr_check
 	//
 	// is functioning correctly if
 	//
-	//   normf( v - z )
+	//   normfv( v - z )
 	//
 	// is negligible, where
 	//
diff --git a/testsuite/src/test_trsv.c b/testsuite/src/test_trsv.c
index 15398b193..12543cd9a 100644
--- a/testsuite/src/test_trsv.c
+++ b/testsuite/src/test_trsv.c
@@ -305,7 +305,7 @@ void libblis_test_trsv_check
 	//
 	// is functioning correctly if
 	//
-	//   normf( y - x_orig )
+	//   normfv( y - x_orig )
 	//
 	// is negligible, where
 	//
diff --git a/testsuite/src/test_xpbym.c b/testsuite/src/test_xpbym.c
index b7acc654e..2340b4e11 100644
--- a/testsuite/src/test_xpbym.c
+++ b/testsuite/src/test_xpbym.c
@@ -288,7 +288,7 @@ void libblis_test_xpbym_check
 	//
 	// is functioning correctly if
 	//
-	//   normf( y - ( beta * y_orig + conjx(x) ) )
+	//   normfm( y - ( beta * y_orig + conjx(x) ) )
 	//
 	// is negligible.
 	//
diff --git a/testsuite/src/test_xpbyv.c b/testsuite/src/test_xpbyv.c
index 6b2f21734..197de86e7 100644
--- a/testsuite/src/test_xpbyv.c
+++ b/testsuite/src/test_xpbyv.c
@@ -283,7 +283,7 @@ void libblis_test_xpbyv_check
 	//
 	// is functioning correctly if
 	//
-	//   normf( y - ( beta * y_orig + conjx(x) ) )
+	//   normfv( y - ( beta * y_orig + conjx(x) ) )
 	//
 	// is negligible.
 	//