diff --git a/frame/1/bli_l1v.h b/frame/1/bli_l1v.h
index 66047192f..a6a62e0f6 100644
--- a/frame/1/bli_l1v.h
+++ b/frame/1/bli_l1v.h
@@ -37,15 +37,15 @@
 #include "bli_l1v_ft.h"
 
 // Prototype object APIs (expert and non-expert).
-#include "bli_oapi_w_cntx.h"
+#include "bli_oapi_ex.h"
 #include "bli_l1v_oapi.h"
-#include "bli_oapi_wo_cntx.h"
+#include "bli_oapi_ba.h"
 #include "bli_l1v_oapi.h"
 
 // Prototype typed APIs (expert and non-expert).
-#include "bli_tapi_w_cntx.h"
+#include "bli_tapi_ex.h"
 #include "bli_l1v_tapi.h"
-#include "bli_tapi_wo_cntx.h"
+#include "bli_tapi_ba.h"
 #include "bli_l1v_tapi.h"
 
 // Pack-related
diff --git a/frame/1/bli_l1v_oapi_woc.c b/frame/1/bli_l1v_oapi_ba.c
similarity index 98%
rename from frame/1/bli_l1v_oapi_woc.c
rename to frame/1/bli_l1v_oapi_ba.c
index 7b916a8eb..e314446db 100644
--- a/frame/1/bli_l1v_oapi_woc.c
+++ b/frame/1/bli_l1v_oapi_ba.c
@@ -36,7 +36,7 @@
 
 // Include cpp macros that instantiate the API definition templates as
 // omitting expert parameters.
-#include "bli_oapi_wo_cntx.h"
+#include "bli_oapi_ba.h"
 
 // Define the macro protecting the object API definitions.
 #define BLIS_ENABLE_OAPI
diff --git a/frame/1/bli_l1v_oapi_wc.c b/frame/1/bli_l1v_oapi_ex.c
similarity index 98%
rename from frame/1/bli_l1v_oapi_wc.c
rename to frame/1/bli_l1v_oapi_ex.c
index 30c1c6454..0eaad99f2 100644
--- a/frame/1/bli_l1v_oapi_wc.c
+++ b/frame/1/bli_l1v_oapi_ex.c
@@ -36,7 +36,7 @@
 
 // Include cpp macros that instantiate the API definition templates as
 // having expert parameters.
-#include "bli_oapi_w_cntx.h"
+#include "bli_oapi_ex.h"
 
 // Define the macro protecting the object API definitions.
 #define BLIS_ENABLE_OAPI
diff --git a/frame/1/bli_l1v_tapi_woc.c b/frame/1/bli_l1v_tapi_ba.c
similarity index 98%
rename from frame/1/bli_l1v_tapi_woc.c
rename to frame/1/bli_l1v_tapi_ba.c
index 9a8cbdc87..e9057f578 100644
--- a/frame/1/bli_l1v_tapi_woc.c
+++ b/frame/1/bli_l1v_tapi_ba.c
@@ -36,7 +36,7 @@
 
 // Include cpp macros that instantiate the API definition templates as
 // omitting expert parameters.
-#include "bli_tapi_wo_cntx.h"
+#include "bli_tapi_ba.h"
 
 // Define the macro protecting the typed API definitions.
 #define BLIS_ENABLE_TAPI
diff --git a/frame/1/bli_l1v_tapi_wc.c b/frame/1/bli_l1v_tapi_ex.c
similarity index 98%
rename from frame/1/bli_l1v_tapi_wc.c
rename to frame/1/bli_l1v_tapi_ex.c
index f2982409e..f38b16c78 100644
--- a/frame/1/bli_l1v_tapi_wc.c
+++ b/frame/1/bli_l1v_tapi_ex.c
@@ -36,7 +36,7 @@
 
 // Include cpp macros that instantiate the API definition templates as
 // having expert parameters.
-#include "bli_tapi_w_cntx.h"
+#include "bli_tapi_ex.h"
 
 // Define the macro protecting the typed API definitions.
 #define BLIS_ENABLE_TAPI
diff --git a/frame/1d/bli_l1d.h b/frame/1d/bli_l1d.h
index ee6146004..3f95b457b 100644
--- a/frame/1d/bli_l1d.h
+++ b/frame/1d/bli_l1d.h
@@ -35,15 +35,15 @@
 #include "bli_l1d_check.h"
 
 // Prototype object APIs (expert and non-expert).
-#include "bli_oapi_w_cntx.h"
+#include "bli_oapi_ex.h"
 #include "bli_l1d_oapi.h"
-#include "bli_oapi_wo_cntx.h"
+#include "bli_oapi_ba.h"
 #include "bli_l1d_oapi.h"
 
 // Prototype typed APIs (expert and non-expert).
-#include "bli_tapi_w_cntx.h"
+#include "bli_tapi_ex.h"
 #include "bli_l1d_tapi.h"
-#include "bli_tapi_wo_cntx.h"
+#include "bli_tapi_ba.h"
 #include "bli_l1d_tapi.h"
 
 
diff --git a/frame/1d/bli_l1d_oapi_woc.c b/frame/1d/bli_l1d_oapi_ba.c
similarity index 98%
rename from frame/1d/bli_l1d_oapi_woc.c
rename to frame/1d/bli_l1d_oapi_ba.c
index e6d9d380c..c13619108 100644
--- a/frame/1d/bli_l1d_oapi_woc.c
+++ b/frame/1d/bli_l1d_oapi_ba.c
@@ -36,7 +36,7 @@
 
 // Include cpp macros that instantiate the API definition templates as
 // omitting expert parameters.
-#include "bli_oapi_wo_cntx.h"
+#include "bli_oapi_ba.h"
 
 // Define the macro protecting the object API definitions.
 #define BLIS_ENABLE_OAPI
diff --git a/frame/1d/bli_l1d_oapi_wc.c b/frame/1d/bli_l1d_oapi_ex.c
similarity index 98%
rename from frame/1d/bli_l1d_oapi_wc.c
rename to frame/1d/bli_l1d_oapi_ex.c
index 804970a2a..8683ed9e0 100644
--- a/frame/1d/bli_l1d_oapi_wc.c
+++ b/frame/1d/bli_l1d_oapi_ex.c
@@ -36,7 +36,7 @@
 
 // Include cpp macros that instantiate the API definition templates as
 // having expert parameters.
-#include "bli_oapi_w_cntx.h"
+#include "bli_oapi_ex.h"
 
 // Define the macro protecting the object API definitions.
 #define BLIS_ENABLE_OAPI
diff --git a/frame/1d/bli_l1d_tapi_woc.c b/frame/1d/bli_l1d_tapi_ba.c
similarity index 98%
rename from frame/1d/bli_l1d_tapi_woc.c
rename to frame/1d/bli_l1d_tapi_ba.c
index 6133ff0aa..9ca567b03 100644
--- a/frame/1d/bli_l1d_tapi_woc.c
+++ b/frame/1d/bli_l1d_tapi_ba.c
@@ -36,7 +36,7 @@
 
 // Include cpp macros that instantiate the API definition templates as
 // omitting expert parameters.
-#include "bli_tapi_wo_cntx.h"
+#include "bli_tapi_ba.h"
 
 // Define the macro protecting the typed API definitions.
 #define BLIS_ENABLE_TAPI
diff --git a/frame/1d/bli_l1d_tapi_wc.c b/frame/1d/bli_l1d_tapi_ex.c
similarity index 98%
rename from frame/1d/bli_l1d_tapi_wc.c
rename to frame/1d/bli_l1d_tapi_ex.c
index bcbe1b088..4421bd9c4 100644
--- a/frame/1d/bli_l1d_tapi_wc.c
+++ b/frame/1d/bli_l1d_tapi_ex.c
@@ -36,7 +36,7 @@
 
 // Include cpp macros that instantiate the API definition templates as
 // having expert parameters.
-#include "bli_tapi_w_cntx.h"
+#include "bli_tapi_ex.h"
 
 // Define the macro protecting the typed API definitions.
 #define BLIS_ENABLE_TAPI
diff --git a/frame/1f/bli_l1f.h b/frame/1f/bli_l1f.h
index 9f79db734..8642a3023 100644
--- a/frame/1f/bli_l1f.h
+++ b/frame/1f/bli_l1f.h
@@ -37,15 +37,15 @@
 #include "bli_l1f_ft.h"
 
 // Prototype object APIs (expert and non-expert).
-#include "bli_oapi_w_cntx.h"
+#include "bli_oapi_ex.h"
 #include "bli_l1f_oapi.h"
-#include "bli_oapi_wo_cntx.h"
+#include "bli_oapi_ba.h"
 #include "bli_l1f_oapi.h"
 
 // Prototype typed APIs (expert and non-expert).
-#include "bli_tapi_w_cntx.h"
+#include "bli_tapi_ex.h"
 #include "bli_l1f_tapi.h"
-#include "bli_tapi_wo_cntx.h"
+#include "bli_tapi_ba.h"
 #include "bli_l1f_tapi.h"
 
 // Reference kernel headers
diff --git a/frame/1f/bli_l1f_oapi_woc.c b/frame/1f/bli_l1f_oapi_ba.c
similarity index 98%
rename from frame/1f/bli_l1f_oapi_woc.c
rename to frame/1f/bli_l1f_oapi_ba.c
index 763ce88d7..389f9bb09 100644
--- a/frame/1f/bli_l1f_oapi_woc.c
+++ b/frame/1f/bli_l1f_oapi_ba.c
@@ -36,7 +36,7 @@
 
 // Include cpp macros that instantiate the API definition templates as
 // omitting expert parameters.
-#include "bli_oapi_wo_cntx.h"
+#include "bli_oapi_ba.h"
 
 // Define the macro protecting the object API definitions.
 #define BLIS_ENABLE_OAPI
diff --git a/frame/1f/bli_l1f_oapi_wc.c b/frame/1f/bli_l1f_oapi_ex.c
similarity index 98%
rename from frame/1f/bli_l1f_oapi_wc.c
rename to frame/1f/bli_l1f_oapi_ex.c
index 6afde6918..d7d25a785 100644
--- a/frame/1f/bli_l1f_oapi_wc.c
+++ b/frame/1f/bli_l1f_oapi_ex.c
@@ -36,7 +36,7 @@
 
 // Include cpp macros that instantiate the API definition templates as
 // having expert parameters.
-#include "bli_oapi_w_cntx.h"
+#include "bli_oapi_ex.h"
 
 // Define the macro protecting the object API definitions.
 #define BLIS_ENABLE_OAPI
diff --git a/frame/1f/bli_l1f_tapi_woc.c b/frame/1f/bli_l1f_tapi_ba.c
similarity index 98%
rename from frame/1f/bli_l1f_tapi_woc.c
rename to frame/1f/bli_l1f_tapi_ba.c
index 138d2e186..d66885882 100644
--- a/frame/1f/bli_l1f_tapi_woc.c
+++ b/frame/1f/bli_l1f_tapi_ba.c
@@ -36,7 +36,7 @@
 
 // Include cpp macros that instantiate the API definition templates as
 // omitting expert parameters.
-#include "bli_tapi_wo_cntx.h"
+#include "bli_tapi_ba.h"
 
 // Define the macro protecting the typed API definitions.
 #define BLIS_ENABLE_TAPI
diff --git a/frame/1f/bli_l1f_tapi_wc.c b/frame/1f/bli_l1f_tapi_ex.c
similarity index 98%
rename from frame/1f/bli_l1f_tapi_wc.c
rename to frame/1f/bli_l1f_tapi_ex.c
index 691764be5..e27d2d0a6 100644
--- a/frame/1f/bli_l1f_tapi_wc.c
+++ b/frame/1f/bli_l1f_tapi_ex.c
@@ -36,7 +36,7 @@
 
 // Include cpp macros that instantiate the API definition templates as
 // having expert parameters.
-#include "bli_tapi_w_cntx.h"
+#include "bli_tapi_ex.h"
 
 // Define the macro protecting the typed API definitions.
 #define BLIS_ENABLE_TAPI
diff --git a/frame/1m/bli_l1m.h b/frame/1m/bli_l1m.h
index e39cbd1ab..9fb7f194f 100644
--- a/frame/1m/bli_l1m.h
+++ b/frame/1m/bli_l1m.h
@@ -38,15 +38,15 @@
 #include "bli_l1m_voft.h"
 
 // Prototype object APIs (expert and non-expert).
-#include "bli_oapi_w_cntx.h"
+#include "bli_oapi_ex.h"
 #include "bli_l1m_oapi.h"
-#include "bli_oapi_wo_cntx.h"
+#include "bli_oapi_ba.h"
 #include "bli_l1m_oapi.h"
 
 // Prototype typed APIs (expert and non-expert).
-#include "bli_tapi_w_cntx.h"
+#include "bli_tapi_ex.h"
 #include "bli_l1m_tapi.h"
-#include "bli_tapi_wo_cntx.h"
+#include "bli_tapi_ba.h"
 #include "bli_l1m_tapi.h"
 
 #include "bli_l1m_unb_var1.h"
diff --git a/frame/1m/bli_l1m_oapi_woc.c b/frame/1m/bli_l1m_oapi_ba.c
similarity index 98%
rename from frame/1m/bli_l1m_oapi_woc.c
rename to frame/1m/bli_l1m_oapi_ba.c
index 0886dc744..8838d58ef 100644
--- a/frame/1m/bli_l1m_oapi_woc.c
+++ b/frame/1m/bli_l1m_oapi_ba.c
@@ -36,7 +36,7 @@
 
 // Include cpp macros that instantiate the API definition templates as
 // omitting expert parameters.
-#include "bli_oapi_wo_cntx.h"
+#include "bli_oapi_ba.h"
 
 // Define the macro protecting the object API definitions.
 #define BLIS_ENABLE_OAPI
diff --git a/frame/1m/bli_l1m_oapi_wc.c b/frame/1m/bli_l1m_oapi_ex.c
similarity index 98%
rename from frame/1m/bli_l1m_oapi_wc.c
rename to frame/1m/bli_l1m_oapi_ex.c
index fcffd90fa..7b8fba0e0 100644
--- a/frame/1m/bli_l1m_oapi_wc.c
+++ b/frame/1m/bli_l1m_oapi_ex.c
@@ -36,7 +36,7 @@
 
 // Include cpp macros that instantiate the API definition templates as
 // having expert parameters.
-#include "bli_oapi_w_cntx.h"
+#include "bli_oapi_ex.h"
 
 // Define the macro protecting the object API definitions.
 #define BLIS_ENABLE_OAPI
diff --git a/frame/1m/bli_l1m_tapi_woc.c b/frame/1m/bli_l1m_tapi_ba.c
similarity index 98%
rename from frame/1m/bli_l1m_tapi_woc.c
rename to frame/1m/bli_l1m_tapi_ba.c
index f1399a0a1..64d75f22c 100644
--- a/frame/1m/bli_l1m_tapi_woc.c
+++ b/frame/1m/bli_l1m_tapi_ba.c
@@ -36,7 +36,7 @@
 
 // Include cpp macros that instantiate the API definition templates as
 // omitting expert parameters.
-#include "bli_tapi_wo_cntx.h"
+#include "bli_tapi_ba.h"
 
 // Define the macro protecting the typed API definitions.
 #define BLIS_ENABLE_TAPI
diff --git a/frame/1m/bli_l1m_tapi_wc.c b/frame/1m/bli_l1m_tapi_ex.c
similarity index 98%
rename from frame/1m/bli_l1m_tapi_wc.c
rename to frame/1m/bli_l1m_tapi_ex.c
index 0ebcd6918..7d2256a83 100644
--- a/frame/1m/bli_l1m_tapi_wc.c
+++ b/frame/1m/bli_l1m_tapi_ex.c
@@ -36,7 +36,7 @@
 
 // Include cpp macros that instantiate the API definition templates as
 // having expert parameters.
-#include "bli_tapi_w_cntx.h"
+#include "bli_tapi_ex.h"
 
 // Define the macro protecting the typed API definitions.
 #define BLIS_ENABLE_TAPI
diff --git a/frame/2/bli_l2.h b/frame/2/bli_l2.h
index b30a56018..e0094b16a 100644
--- a/frame/2/bli_l2.h
+++ b/frame/2/bli_l2.h
@@ -37,15 +37,15 @@
 #include "bli_l2_ft.h"
 
 // Prototype object APIs (expert and non-expert).
-#include "bli_oapi_w_cntx.h"
+#include "bli_oapi_ex.h"
 #include "bli_l2_oapi.h"
-#include "bli_oapi_wo_cntx.h"
+#include "bli_oapi_ba.h"
 #include "bli_l2_oapi.h"
 
 // Prototype typed APIs (expert and non-expert).
-#include "bli_tapi_w_cntx.h"
+#include "bli_tapi_ex.h"
 #include "bli_l2_tapi.h"
-#include "bli_tapi_wo_cntx.h"
+#include "bli_tapi_ba.h"
 #include "bli_l2_tapi.h"
 
 // Operation-specific headers
diff --git a/frame/2/bli_l2_oapi_woc.c b/frame/2/bli_l2_oapi_ba.c
similarity index 98%
rename from frame/2/bli_l2_oapi_woc.c
rename to frame/2/bli_l2_oapi_ba.c
index d795c0734..417f2808b 100644
--- a/frame/2/bli_l2_oapi_woc.c
+++ b/frame/2/bli_l2_oapi_ba.c
@@ -36,7 +36,7 @@
 
 // Include cpp macros that instantiate the API definition templates as
 // omitting expert parameters.
-#include "bli_oapi_wo_cntx.h"
+#include "bli_oapi_ba.h"
 
 // Define the macro protecting the object API definitions.
 #define BLIS_ENABLE_OAPI
diff --git a/frame/2/bli_l2_oapi_wc.c b/frame/2/bli_l2_oapi_ex.c
similarity index 98%
rename from frame/2/bli_l2_oapi_wc.c
rename to frame/2/bli_l2_oapi_ex.c
index 84241d731..f4fbc40c5 100644
--- a/frame/2/bli_l2_oapi_wc.c
+++ b/frame/2/bli_l2_oapi_ex.c
@@ -36,7 +36,7 @@
 
 // Include cpp macros that instantiate the API definition templates as
 // having expert parameters.
-#include "bli_oapi_w_cntx.h"
+#include "bli_oapi_ex.h"
 
 // Define the macro protecting the object API definitions.
 #define BLIS_ENABLE_OAPI
diff --git a/frame/2/bli_l2_tapi_woc.c b/frame/2/bli_l2_tapi_ba.c
similarity index 98%
rename from frame/2/bli_l2_tapi_woc.c
rename to frame/2/bli_l2_tapi_ba.c
index 64886c360..4877c1f06 100644
--- a/frame/2/bli_l2_tapi_woc.c
+++ b/frame/2/bli_l2_tapi_ba.c
@@ -36,7 +36,7 @@
 
 // Include cpp macros that instantiate the API definition templates as
 // omitting expert parameters.
-#include "bli_tapi_wo_cntx.h"
+#include "bli_tapi_ba.h"
 
 // Define the macro protecting the typed API definitions.
 #define BLIS_ENABLE_TAPI
diff --git a/frame/2/bli_l2_tapi_wc.c b/frame/2/bli_l2_tapi_ex.c
similarity index 98%
rename from frame/2/bli_l2_tapi_wc.c
rename to frame/2/bli_l2_tapi_ex.c
index 9e1cb0db7..854f9e22d 100644
--- a/frame/2/bli_l2_tapi_wc.c
+++ b/frame/2/bli_l2_tapi_ex.c
@@ -36,7 +36,7 @@
 
 // Include cpp macros that instantiate the API definition templates as
 // having expert parameters.
-#include "bli_tapi_w_cntx.h"
+#include "bli_tapi_ex.h"
 
 // Define the macro protecting the typed API definitions.
 #define BLIS_ENABLE_TAPI
diff --git a/frame/3/bli_l3.h b/frame/3/bli_l3.h
index 4ca4e1d50..f8a55201a 100644
--- a/frame/3/bli_l3.h
+++ b/frame/3/bli_l3.h
@@ -45,15 +45,15 @@
 #include "bli_l3_packm.h"
 
 // Prototype object APIs (expert and non-expert).
-#include "bli_oapi_w_cntx.h"
+#include "bli_oapi_ex.h"
 #include "bli_l3_oapi.h"
-#include "bli_oapi_wo_cntx.h"
+#include "bli_oapi_ba.h"
 #include "bli_l3_oapi.h"
 
 // Prototype typed APIs (expert and non-expert).
-#include "bli_tapi_w_cntx.h"
+#include "bli_tapi_ex.h"
 #include "bli_l3_tapi.h"
-#include "bli_tapi_wo_cntx.h"
+#include "bli_tapi_ba.h"
 #include "bli_l3_tapi.h"
 
 #include "bli_l3_ukr_oapi.h"
diff --git a/frame/3/bli_l3_oapi_woc.c b/frame/3/bli_l3_oapi_ba.c
similarity index 98%
rename from frame/3/bli_l3_oapi_woc.c
rename to frame/3/bli_l3_oapi_ba.c
index 0802f9b76..169007a24 100644
--- a/frame/3/bli_l3_oapi_woc.c
+++ b/frame/3/bli_l3_oapi_ba.c
@@ -36,7 +36,7 @@
 
 // Include cpp macros that instantiate the API definition templates as
 // omitting expert parameters.
-#include "bli_oapi_wo_cntx.h"
+#include "bli_oapi_ba.h"
 
 // Define the macro protecting the object API definitions.
 #define BLIS_ENABLE_OAPI
diff --git a/frame/3/bli_l3_oapi_wc.c b/frame/3/bli_l3_oapi_ex.c
similarity index 98%
rename from frame/3/bli_l3_oapi_wc.c
rename to frame/3/bli_l3_oapi_ex.c
index b98af17fb..b6f4c306c 100644
--- a/frame/3/bli_l3_oapi_wc.c
+++ b/frame/3/bli_l3_oapi_ex.c
@@ -36,7 +36,7 @@
 
 // Include cpp macros that instantiate the API definition templates as
 // having expert parameters.
-#include "bli_oapi_w_cntx.h"
+#include "bli_oapi_ex.h"
 
 // Define the macro protecting the object API definitions.
 #define BLIS_ENABLE_OAPI
diff --git a/frame/3/bli_l3_tapi_woc.c b/frame/3/bli_l3_tapi_ba.c
similarity index 98%
rename from frame/3/bli_l3_tapi_woc.c
rename to frame/3/bli_l3_tapi_ba.c
index cbdbbc715..3c52d9ea6 100644
--- a/frame/3/bli_l3_tapi_woc.c
+++ b/frame/3/bli_l3_tapi_ba.c
@@ -36,7 +36,7 @@
 
 // Include cpp macros that instantiate the API definition templates as
 // omitting expert parameters.
-#include "bli_tapi_wo_cntx.h"
+#include "bli_tapi_ba.h"
 
 // Define the macro protecting the typed API definitions.
 #define BLIS_ENABLE_TAPI
diff --git a/frame/3/bli_l3_tapi_wc.c b/frame/3/bli_l3_tapi_ex.c
similarity index 98%
rename from frame/3/bli_l3_tapi_wc.c
rename to frame/3/bli_l3_tapi_ex.c
index 5120bbec9..62d065417 100644
--- a/frame/3/bli_l3_tapi_wc.c
+++ b/frame/3/bli_l3_tapi_ex.c
@@ -36,7 +36,7 @@
 
 // Include cpp macros that instantiate the API definition templates as
 // having expert parameters.
-#include "bli_tapi_w_cntx.h"
+#include "bli_tapi_ex.h"
 
 // Define the macro protecting the typed API definitions.
 #define BLIS_ENABLE_TAPI
diff --git a/frame/include/bli_oapi_wo_cntx.h b/frame/include/bli_oapi_ba.h
similarity index 88%
rename from frame/include/bli_oapi_wo_cntx.h
rename to frame/include/bli_oapi_ba.h
index 21bc89f9e..91f34d1c3 100644
--- a/frame/include/bli_oapi_wo_cntx.h
+++ b/frame/include/bli_oapi_ba.h
@@ -32,20 +32,20 @@
 
 */
 
-// This file defines macros used to allow the _oapi.c files to
-// produce object APIs that omit context parameters.
+// This file defines macros used to allow the _oapi.c files to produce
+// object APIs that omit expert parameters.
 
 // Define the macro to remove the function name suffix (in function
 // definitions).
 #undef  EX_SUF
 #define EX_SUF
 
-// Define the macro to omit cntx_t* arguments from function signatures
+// Define the macro to omit expert arguments from function signatures
 // and prototypes.
 #undef  BLIS_OAPI_EX_PARAMS
 #define BLIS_OAPI_EX_PARAMS
 
-// Define the macro to declare a local cntx_t pointer that is initialized
+// Define the macro to declare a local expert variables that are initialized
 // to NULL.
 #undef  BLIS_OAPI_EX_DECLS
 #define BLIS_OAPI_EX_DECLS   cntx_t* cntx = NULL; ( void )cntx;
diff --git a/frame/include/bli_oapi_w_cntx.h b/frame/include/bli_oapi_ex.h
similarity index 85%
rename from frame/include/bli_oapi_w_cntx.h
rename to frame/include/bli_oapi_ex.h
index 36f306188..299f5e344 100644
--- a/frame/include/bli_oapi_w_cntx.h
+++ b/frame/include/bli_oapi_ex.h
@@ -32,21 +32,21 @@
 
 */
 
-// This file defines macros used to allow the _oapi.c files to
-// produce object APIs that contain context parameters.
+// This file defines macros used to allow the _oapi.c files to produce
+// object APIs that contain context parameters.
 
 // Define the macro to add a suffix to the object API function names
 // (in function definitions).
 #undef  EX_SUF
 #define EX_SUF BLIS_OAPI_EX_SUF
 
-// Define the macro to add cntx_t* arguments to function signatures
+// Define the macro to add expert arguments to function signatures
 // and prototypes.
 #undef  BLIS_OAPI_EX_PARAMS
 #define BLIS_OAPI_EX_PARAMS   ,cntx_t* cntx
 
-// Define the macro to omit the cntx_t declaration block, since it is
-// not needed when cntx_t's are passed in through the API.
+// Define the macro to omit the expert variable declaration block, since
+// it is not needed when expert parameters are passed in through the API.
 #undef  BLIS_OAPI_EX_DECLS
 #define BLIS_OAPI_EX_DECLS
 
diff --git a/frame/include/bli_tapi_wo_cntx.h b/frame/include/bli_tapi_ba.h
similarity index 88%
rename from frame/include/bli_tapi_wo_cntx.h
rename to frame/include/bli_tapi_ba.h
index b4e2beb94..fc2fd827d 100644
--- a/frame/include/bli_tapi_wo_cntx.h
+++ b/frame/include/bli_tapi_ba.h
@@ -32,20 +32,20 @@
 
 */
 
-// This file defines macros used to allow the _tapi.c files to
-// produce typed APIs that omit context parameters.
+// This file defines macros used to allow the _oapi.c files to produce
+// typed APIs that omit expert parameters.
 
 // Define the macro to remove the function name suffix (in function
 // definitions).
 #undef  EX_SUF
 #define EX_SUF
 
-// Define the macro to omit cntx_t* arguments from function signatures
+// Define the macro to omit expert arguments from function signatures
 // and prototypes.
 #undef  BLIS_TAPI_EX_PARAMS
 #define BLIS_TAPI_EX_PARAMS
 
-// Define the macro to declare a local cntx_t pointer that is initialized
+// Define the macro to declare a local expert variables that are initialized
 // to NULL.
 #undef  BLIS_TAPI_EX_DECLS
 #define BLIS_TAPI_EX_DECLS   cntx_t* cntx = NULL; ( void )cntx;
diff --git a/frame/include/bli_tapi_w_cntx.h b/frame/include/bli_tapi_ex.h
similarity index 85%
rename from frame/include/bli_tapi_w_cntx.h
rename to frame/include/bli_tapi_ex.h
index ce9091552..262963c2a 100644
--- a/frame/include/bli_tapi_w_cntx.h
+++ b/frame/include/bli_tapi_ex.h
@@ -32,21 +32,21 @@
 
 */
 
-// This file defines macros used to allow the _tapi.c files to
-// produce typed APIs that contain context parameters.
+// This file defines macros used to allow the _tapi.c files to produce
+// typed APIs that contain context parameters.
 
 // Define the macro to add a suffix to the typed API function names
 // (in function definitions).
 #undef  EX_SUF
 #define EX_SUF BLIS_TAPI_EX_SUF
 
-// Define the macro to add cntx_t* arguments to function signatures
+// Define the macro to add expert arguments to function signatures
 // and prototypes.
 #undef  BLIS_TAPI_EX_PARAMS
 #define BLIS_TAPI_EX_PARAMS   ,cntx_t* cntx
 
-// Define the macro to omit the cntx_t declaration block, since it is
-// not needed when cntx_t's are passed in through the API.
+// Define the macro to omit the expert variable declaration block, since
+// it is not needed when expert parameters are passed in through the API.
 #undef  BLIS_TAPI_EX_DECLS
 #define BLIS_TAPI_EX_DECLS
 
diff --git a/frame/util/bli_util.h b/frame/util/bli_util.h
index 7fe68c16b..f3523e86f 100644
--- a/frame/util/bli_util.h
+++ b/frame/util/bli_util.h
@@ -35,15 +35,15 @@
 #include "bli_util_check.h"
 
 // Prototype object APIs (expert and non-expert).
-#include "bli_oapi_w_cntx.h"
+#include "bli_oapi_ex.h"
 #include "bli_util_oapi.h"
-#include "bli_oapi_wo_cntx.h"
+#include "bli_oapi_ba.h"
 #include "bli_util_oapi.h"
 
 // Prototype typed APIs (expert and non-expert).
-#include "bli_tapi_w_cntx.h"
+#include "bli_tapi_ex.h"
 #include "bli_util_tapi.h"
-#include "bli_tapi_wo_cntx.h"
+#include "bli_tapi_ba.h"
 #include "bli_util_tapi.h"
 
 #include "bli_util_unb_var1.h"
diff --git a/frame/util/bli_util_oapi_woc.c b/frame/util/bli_util_oapi_ba.c
similarity index 98%
rename from frame/util/bli_util_oapi_woc.c
rename to frame/util/bli_util_oapi_ba.c
index 5f7c04524..878c7964d 100644
--- a/frame/util/bli_util_oapi_woc.c
+++ b/frame/util/bli_util_oapi_ba.c
@@ -36,7 +36,7 @@
 
 // Include cpp macros that instantiate the API definition templates as
 // omitting expert parameters.
-#include "bli_oapi_wo_cntx.h"
+#include "bli_oapi_ba.h"
 
 // Define the macro protecting the object API definitions.
 #define BLIS_ENABLE_OAPI
diff --git a/frame/util/bli_util_oapi_wc.c b/frame/util/bli_util_oapi_ex.c
similarity index 98%
rename from frame/util/bli_util_oapi_wc.c
rename to frame/util/bli_util_oapi_ex.c
index 19de39508..f488d2e3e 100644
--- a/frame/util/bli_util_oapi_wc.c
+++ b/frame/util/bli_util_oapi_ex.c
@@ -36,7 +36,7 @@
 
 // Include cpp macros that instantiate the API definition templates as
 // having expert parameters.
-#include "bli_oapi_w_cntx.h"
+#include "bli_oapi_ex.h"
 
 // Define the macro protecting the object API definitions.
 #define BLIS_ENABLE_OAPI
diff --git a/frame/util/bli_util_tapi_woc.c b/frame/util/bli_util_tapi_ba.c
similarity index 98%
rename from frame/util/bli_util_tapi_woc.c
rename to frame/util/bli_util_tapi_ba.c
index f6c2dc614..c540d2e75 100644
--- a/frame/util/bli_util_tapi_woc.c
+++ b/frame/util/bli_util_tapi_ba.c
@@ -36,7 +36,7 @@
 
 // Include cpp macros that instantiate the API definition templates as
 // omitting expert parameters.
-#include "bli_tapi_wo_cntx.h"
+#include "bli_tapi_ba.h"
 
 // Define the macro protecting the typed API definitions.
 #define BLIS_ENABLE_TAPI
diff --git a/frame/util/bli_util_tapi_wc.c b/frame/util/bli_util_tapi_ex.c
similarity index 98%
rename from frame/util/bli_util_tapi_wc.c
rename to frame/util/bli_util_tapi_ex.c
index 41e3e5907..8de4ebe6f 100644
--- a/frame/util/bli_util_tapi_wc.c
+++ b/frame/util/bli_util_tapi_ex.c
@@ -36,7 +36,7 @@
 
 // Include cpp macros that instantiate the API definition templates as
 // having expert parameters.
-#include "bli_tapi_w_cntx.h"
+#include "bli_tapi_ex.h"
 
 // Define the macro protecting the typed API definitions.
 #define BLIS_ENABLE_TAPI