From 8c8fa11104a1715ebbcbf75dfe11a5931ab41654 Mon Sep 17 00:00:00 2001
From: "C. Guy Yarvin" <cgyarvin@gmail.com>
Date: Thu, 6 Nov 2014 11:13:57 -0800
Subject: [PATCH] Rename.

---
 Spec/u3.md    |  39 +++++-
 g/j.c         |  36 +++---
 g/m.c         |   4 +-
 g/v.c         |  10 +-
 i/j/k.h       |  80 ++++++-------
 i/j/q.h       | 306 +++++++++++++++++++++++-----------------------
 i/j/w.h       | 326 +++++++++++++++++++++++++-------------------------
 j/1/add.c     |  10 +-
 j/1/dec.c     |   8 +-
 j/1/div.c     |   6 +-
 j/1/gte.c     |   6 +-
 j/1/gth.c     |  10 +-
 j/1/lte.c     |  10 +-
 j/1/lth.c     |   6 +-
 j/1/mod.c     |   6 +-
 j/1/mul.c     |  10 +-
 j/1/sub.c     |  10 +-
 j/2/bind.c    |   6 +-
 j/2/clap.c    |   6 +-
 j/2/drop.c    |   6 +-
 j/2/flop.c    |  10 +-
 j/2/lent.c    |  10 +-
 j/2/levy.c    |   8 +-
 j/2/lien.c    |   8 +-
 j/2/need.c    |   6 +-
 j/2/reel.c    |   8 +-
 j/2/roll.c    |   8 +-
 j/2/scag.c    |   8 +-
 j/2/skim.c    |   8 +-
 j/2/skip.c    |   8 +-
 j/2/slag.c    |   6 +-
 j/2/snag.c    |   6 +-
 j/2/sort.c    |   6 +-
 j/2/turn.c    |   8 +-
 j/2/weld.c    |  12 +-
 j/3/bex.c     |   6 +-
 j/3/can.c     |   6 +-
 j/3/cap.c     |   6 +-
 j/3/cat.c     |   6 +-
 j/3/con.c     |   6 +-
 j/3/cut.c     |   6 +-
 j/3/dis.c     |   6 +-
 j/3/dor.c     |  12 +-
 j/3/end.c     |   6 +-
 j/3/gor.c     |   8 +-
 j/3/hor.c     |  12 +-
 j/3/lsh.c     |  10 +-
 j/3/mas.c     |  14 +--
 j/3/met.c     |   6 +-
 j/3/mix.c     |   6 +-
 j/3/mug.c     |   2 +-
 j/3/peg.c     |  16 +--
 j/3/po.c      |   8 +-
 j/3/rap.c     |   6 +-
 j/3/rip.c     |   6 +-
 j/3/rsh.c     |  10 +-
 j/3/vor.c     |   8 +-
 j/4/by_gas.c  |  14 +--
 j/4/by_get.c  |  20 ++--
 j/4/by_has.c  |  16 +--
 j/4/by_int.c  |  44 +++----
 j/4/by_put.c  |  20 ++--
 j/4/by_uni.c  |  36 +++---
 j/4/in_gas.c  |  14 +--
 j/4/in_has.c  |  16 +--
 j/4/in_int.c  |  26 ++--
 j/4/in_mer.c  |  22 ++--
 j/4/in_put.c  |  20 ++--
 j/4/in_tap.c  |  10 +-
 j/4/in_uni.c  |  36 +++---
 j/5/aesc.c    |  12 +-
 j/5/cue.c     |  34 +++---
 j/5/ed_puck.c |   2 +-
 j/5/ed_sign.c |   2 +-
 j/5/ed_veri.c |   2 +-
 j/5/jam.c     |  36 +++---
 j/5/lore.c    |   8 +-
 j/5/loss.c    |  20 ++--
 j/5/mat.c     |  26 ++--
 j/5/mink.c    |   2 +-
 j/5/mule.c    |   2 +-
 j/5/parse.c   |  38 +++---
 j/5/rd.c      |  54 ++++-----
 j/5/repg.c    |  12 +-
 j/5/rexp.c    |  10 +-
 j/5/rub.c     |  36 +++---
 j/5/shax.c    |  46 +++----
 j/5/tape.c    |   6 +-
 j/5/trip.c    |  12 +-
 j/6/al.c      |   4 +-
 j/6/ap.c      |  38 +++---
 j/6/bull.c    |   6 +-
 j/6/cell.c    |   6 +-
 j/6/comb.c    |  12 +-
 j/6/cons.c    |  10 +-
 j/6/core.c    |   6 +-
 j/6/cube.c    |   6 +-
 j/6/face.c    |   6 +-
 j/6/fine.c    |   6 +-
 j/6/fitz.c    |   6 +-
 j/6/flan.c    |   6 +-
 j/6/flay.c    |   8 +-
 j/6/flip.c    |   6 +-
 j/6/flor.c    |   6 +-
 j/6/fork.c    |   6 +-
 j/6/hike.c    |  24 ++--
 j/6/look.c    |  26 ++--
 j/6/slot.c    |   8 +-
 j/6/ut.c      |  12 +-
 j/6/ut_burn.c |  14 +--
 j/6/ut_busk.c |   8 +-
 j/6/ut_bust.c |   8 +-
 j/6/ut_conk.c |  18 +--
 j/6/ut_crop.c |  30 ++---
 j/6/ut_cull.c |  32 ++---
 j/6/ut_find.c |  90 +++++++-------
 j/6/ut_fink.c |  12 +-
 j/6/ut_fire.c |  26 ++--
 j/6/ut_firm.c |   6 +-
 j/6/ut_fish.c |  26 ++--
 j/6/ut_fuse.c |  28 ++---
 j/6/ut_gain.c |   2 +-
 j/6/ut_heal.c |  36 +++---
 j/6/ut_lose.c |   2 +-
 j/6/ut_mint.c | 110 ++++++++---------
 j/6/ut_mull.c | 130 ++++++++++----------
 j/6/ut_nest.c |  40 +++----
 j/6/ut_park.c |  10 +-
 j/6/ut_peek.c |  26 ++--
 j/6/ut_play.c |  56 ++++-----
 j/6/ut_repo.c |   8 +-
 j/6/ut_rest.c |  20 ++--
 j/6/ut_seek.c |  30 ++---
 j/6/ut_sift.c |   6 +-
 j/6/ut_swab.c |   6 +-
 j/6/ut_tack.c |   2 +-
 j/6/ut_tock.c |   6 +-
 j/6/ut_wrap.c |   8 +-
 j/dash.c      | 322 ++++++++++++++++++++++++-------------------------
 v/cttp.c      |   2 +-
 v/raft.c      |  10 +-
 v/sist.c      |   4 +-
 v/term.c      |   4 +-
 v/time.c      |   4 +-
 v/unix.c      |  20 ++--
 v/walk.c      |  10 +-
 146 files changed, 1628 insertions(+), 1599 deletions(-)

diff --git a/Spec/u3.md b/Spec/u3.md
index b6fa4428ae..44c54cea9d 100644
--- a/Spec/u3.md
+++ b/Spec/u3.md
@@ -18,17 +18,17 @@ to compute both efficiently and correctly.
 
 Two: `u3` is designed to support "permanent computing," ie, a
 single-level store which is transparently checkpointed.  This
-implies a specialized memory-management model.
+implies a specialized memory-management model, etc, etc.
 
-Does `u3` depend on the higher levels of Urbit, Arvo and Hoon?
+(Does `u3` depend on the higher levels of Urbit, Arvo and Hoon?
 Yes and no.  It expects you to load something shaped like an Arvo
 kernel, and use it as an event-processing function.  But you
 don't need to use this feature if you don't want, and your kernel
-can be anything you want.
+can be anything you want.)
  
 ## c3: C in Urbit
 
-Below `u3` is the simple `c3` layer, which is just how we write C 
+Under `u3` is the simple `c3` layer, which is just how we write C 
 in Urbit.
 
 When writing C in u3, please of course follow the conventions of
@@ -132,7 +132,36 @@ the other way.  Use `!` as usual, `c3y` for yes and `c3n` for no,
 
 ## u3: introduction to the noun world
 
-u3 is the 
+The division between `c3` and `u3` is that you could theoretically
+imagine using `c3` as just a generic C environment.  Anything to do
+with nouns is in `u3`.
+
+### u3: a map of the system
+
+There are two kinds of symbols in `u3`: regular and irregular.
+They all start with `u3`, but the regular names follow this
+pattern:
+
+    prefix   purpose                      header
+    ---------------------------------------------------
+    u3a_    allocation
+    u3e_    persistence
+    u3h_    hashtables
+    u3i_    noun construction
+    u3j_    jet control
+    u3m_    system management
+    u3n_    nock computation
+    u3r_    noun access (error returns)
+    u3t_    profiling
+    u3v_    arvo
+    u3x_    noun access (error crashes)
+    u3z_    memoization
+
+
+u3 deals with reference-counted, immutable, acyclic nouns.  90%
+of what you need to know to program in u3 is just how to get your
+refcounts right.
+
 
     /**  Prefix definitions:
     ***
diff --git a/g/j.c b/g/j.c
index 4b15b94636..acfc23bca8 100644
--- a/g/j.c
+++ b/g/j.c
@@ -93,7 +93,7 @@ _cj_by_gut(u3_noun a, u3_noun b)
         return qn_a;
       }
       else {
-        if ( c3y == u3_cqc_gor(b, pn_a) ) {
+        if ( c3y == u3qc_gor(b, pn_a) ) {
           return _cj_by_gut(l_a, b);
         }
         else return _cj_by_gut(r_a, b);
@@ -173,7 +173,7 @@ _cj_je_fsck(u3_noun clu)
       {
         u3z(huk); u3z(clu); free(nam_c); return u3_none;
       }
-      huk = u3_ckdb_put(huk, u3k(pir_clu), u3k(qir_clu));
+      huk = u3kdb_put(huk, u3k(pir_clu), u3k(qir_clu));
       r_clu = tr_clu;
     }
   }
@@ -186,9 +186,9 @@ _cj_je_fsck(u3_noun clu)
 static u3_atom
 _cj_sham(u3_noun som)       //  XX wrong, does not match ++sham
 {
-  u3_atom jam = u3_cke_jam(som);
-  u3_noun sha = u3_cqe_shax(jam);
-  u3_noun haf = u3_cqc_end(7, 1, sha);
+  u3_atom jam = u3ke_jam(som);
+  u3_noun sha = u3qe_shax(jam);
+  u3_noun haf = u3qc_end(7, 1, sha);
 
   u3z(jam); u3z(sha);
   return haf;
@@ -258,21 +258,21 @@ _cj_cold_mine(u3_noun cey, u3_noun cor)
     //
     {
       u3_noun soh = _cj_sham(u3k(mop));
-      u3_noun hoe = u3_ckdb_get(u3k(u3t(u3R->jed.das)), u3k(soh));
+      u3_noun hoe = u3kdb_get(u3k(u3t(u3R->jed.das)), u3k(soh));
       u3_noun sab;
 
       if ( u3_none == hoe ) {
         sab = u3nt(u3nc(u3k(bat), u3k(r_cey)), u3_nul, u3_nul);
       }
       else {
-        sab = u3_ckdb_put(u3k(u3t(hoe)), u3k(bat), u3k(r_cey));
+        sab = u3kdb_put(u3k(u3t(hoe)), u3k(bat), u3k(r_cey));
         u3z(hoe);
       }
       {
         u3_noun sad, h_sad, t_sad;
 
-        h_sad = u3_ckdb_put(u3k(u3h(u3R->jed.das)), u3k(bat), u3k(soh));
-        t_sad = u3_ckdb_put(u3k(u3t(u3R->jed.das)), soh,
+        h_sad = u3kdb_put(u3k(u3h(u3R->jed.das)), u3k(bat), u3k(soh));
+        t_sad = u3kdb_put(u3k(u3t(u3R->jed.das)), soh,
                                                     u3nc(u3k(mop), sab));
         sad = u3nc(h_sad, t_sad);
 
@@ -337,7 +337,7 @@ _cj_warm_hump(c3_l jax_l, u3_noun huc)
       }
       else {
         u3_noun nam = u3i_string(jet_u->fcs_c);
-        u3_noun fol = u3_ckdb_get(u3k(huc), nam);
+        u3_noun fol = u3kdb_get(u3k(huc), nam);
 
         if ( u3_none == fol ) {
           fprintf(stderr, "jets: activate: bad fcs %s\r\n", jet_u->fcs_c);
@@ -348,7 +348,7 @@ _cj_warm_hump(c3_l jax_l, u3_noun huc)
         }
       }
       if ( 0 != axe_l ) {
-        hap = u3_ckdb_put(hap, axe_l, i_l);
+        hap = u3kdb_put(hap, axe_l, i_l);
       }
     }
   }
@@ -463,7 +463,7 @@ _cj_warm_ream_is(c3_l    jax_l,
 static c3_l
 _cj_warm_ream_un(u3_noun soh)
 {
-  u3_noun cag = u3_ckdb_got(u3k(u3t(u3R->jed.das)), u3k(soh));
+  u3_noun cag = u3kdb_got(u3k(u3t(u3R->jed.das)), u3k(soh));
   u3_noun sab = u3t(cag);
   u3_noun cax;
   c3_l    jax_l;
@@ -733,7 +733,7 @@ _cj_hook_in(u3_noun     cor,
       {
         c3_l        jax_l = jax;
         u3e_core* cop_u = &u3D.ray_u[jax_l];
-        u3_noun     fol   = u3_ckdb_get(u3k(huc), u3i_string(tam_c));
+        u3_noun     fol   = u3kdb_get(u3k(huc), u3i_string(tam_c));
 
         if ( u3_none == fol ) {
           //  The caller wants a deeper core.
@@ -753,7 +753,7 @@ _cj_hook_in(u3_noun     cor,
  
           if ( (0 == axe_l) || 
                (c3n == jet_o) ||
-               (u3_none == (inx_l = u3_ckdb_get(u3k(hap), axe_l))) ||
+               (u3_none == (inx_l = u3kdb_get(u3k(hap), axe_l))) ||
                (u3_none == (pro = _cj_kick_z(cor, 
                                              cop_u, 
                                              &cop_u->arm_u[inx_l],
@@ -820,7 +820,7 @@ u3j_kick(u3_noun cor, u3_noun axe)
     if ( u3_none == cax ) { return u3_none; }
     {
       u3_noun hap = u3h(u3t(u3t(cax)));
-      u3_noun inx = u3_ckdb_get(u3k(hap), u3k(axe));
+      u3_noun inx = u3kdb_get(u3k(hap), u3k(axe));
 
       if ( u3_none == inx ) {
         u3z(cax); return u3_none;
@@ -880,7 +880,7 @@ _cj_cold_reap_un(u3_noun soh, u3_noun sab, u3_noun sys)
     {
       sys = _cj_cold_reap_un(soh, l_sab, sys);
       sys = _cj_cold_reap_un(soh, r_sab, sys);
-      sys = u3_ckdb_put(sys, u3a_take(pn_sab), u3k(soh));
+      sys = u3kdb_put(sys, u3a_take(pn_sab), u3k(soh));
 
       return sys;
     }
@@ -910,7 +910,7 @@ _cj_cold_reap_to(u3_noun sab, u3_noun bas)
       if ( _(u3a_left(pn_sab)) ) {
         u3_noun bat = u3a_take(pn_sab);
 
-        bas = u3_ckdb_put(bas, bat, u3a_take(qn_sab));
+        bas = u3kdb_put(bas, bat, u3a_take(qn_sab));
       }
       return bas;
     }
@@ -931,7 +931,7 @@ _cj_cold_reap_at(u3_noun soh, u3_noun cag)
     cag = u3nc(u3a_take(u3h(cag)), sab);
 
     sys = _cj_cold_reap_un(soh, sab, u3k(u3h(u3R->jed.das)));
-    haw = u3_ckdb_put(u3k(u3t(u3R->jed.das)), soh, cag);
+    haw = u3kdb_put(u3k(u3t(u3R->jed.das)), soh, cag);
 
     das = u3nc(sys, haw);
     u3z(u3R->jed.das);
diff --git a/g/m.c b/g/m.c
index fab87979ee..f5767e2011 100644
--- a/g/m.c
+++ b/g/m.c
@@ -171,7 +171,7 @@ _cm_signal_recover(c3_l sig_l, u3_noun arg)
       rod_u = u3R;
       
       while ( rod_u->kid_u ) {
-        tax = u3_ckb_weld(u3a_take(rod_u->kid_u->bug.tax), tax);
+        tax = u3kb_weld(u3a_take(rod_u->kid_u->bug.tax), tax);
         rod_u = rod_u->kid_u;
       }
     }
@@ -875,7 +875,7 @@ u3m_soft_run(u3_noun fly,
           u3m_bail
             (u3nt(3, 
                   u3a_take(u3h(yod)),
-                  u3_ckb_weld(u3t(yod), u3k(u3R->bug.tax))));
+                  u3kb_weld(u3t(yod), u3k(u3R->bug.tax))));
         } break;
 
         case 4: {                             //  meta-bail
diff --git a/g/v.c b/g/v.c
index bf05b239a0..4d496f12b8 100644
--- a/g/v.c
+++ b/g/v.c
@@ -26,7 +26,7 @@ _cv_nock_wish(u3_noun txt)
 void
 u3v_make(c3_c* pas_c)
 {
-  u3_noun sys = u3_cke_cue(u3m_file(pas_c));
+  u3_noun sys = u3ke_cue(u3m_file(pas_c));
 
   printf("cv_make: loaded pill %s, as %x\n", pas_c, u3r_mug(sys));
 
@@ -103,11 +103,11 @@ u3v_wish(const c3_c* str_c)
   if ( u3R == &u3H->rod_u ) {
     u3_noun txt = u3i_string(str_c);
     
-    exp = u3_ckdb_get(u3k(u3A->yot), u3k(txt));
+    exp = u3kdb_get(u3k(u3A->yot), u3k(txt));
 
     if ( u3_none == exp ) {
       exp = _cv_nock_wish(u3k(txt));
-      u3A->yot = u3_ckdb_put(u3A->yot, u3k(txt), u3k(exp));
+      u3A->yot = u3kdb_put(u3A->yot, u3k(txt), u3k(exp));
     }
     u3z(txt);
     return exp;
@@ -179,7 +179,7 @@ u3v_nick(u3_noun vir, u3_noun cor)
         cor = u3k(u3t(u3t(gon)));
         u3z(gon);
 
-        viz = u3_ckb_weld(vix, u3k(u3t(vir)));
+        viz = u3kb_weld(vix, u3k(u3t(vir)));
         u3z(vir);
 
         return u3v_nick(viz, cor);
@@ -325,7 +325,7 @@ _cv_time_bump(u3_reck* rec_u)
 {
   c3_d bum_d = (1ULL << 48ULL);
 
-  u3A->now = u3_cka_add(u3A->now, u3i_chubs(1, &bum_d));
+  u3A->now = u3ka_add(u3A->now, u3i_chubs(1, &bum_d));
 }
 #endif
 
diff --git a/i/j/k.h b/i/j/k.h
index be6d0b19a2..96b31e14a5 100644
--- a/i/j/k.h
+++ b/i/j/k.h
@@ -4,93 +4,93 @@
 */
   /** Tier 1.
   **/
-    u3_noun u3_cka_add(u3_noun a, u3_noun b); 
-    u3_noun u3_cka_sub(u3_noun a, u3_noun b);
-    u3_noun u3_cka_mul(u3_noun a, u3_noun b);
-    u3_noun u3_cka_gth(u3_noun a, u3_noun b);
-    u3_noun u3_cka_lte(u3_noun a, u3_noun b);
+    u3_noun u3ka_add(u3_noun a, u3_noun b); 
+    u3_noun u3ka_sub(u3_noun a, u3_noun b);
+    u3_noun u3ka_mul(u3_noun a, u3_noun b);
+    u3_noun u3ka_gth(u3_noun a, u3_noun b);
+    u3_noun u3ka_lte(u3_noun a, u3_noun b);
 
   /** Tier 2.
   **/
-    u3_noun u3_ckb_lent(u3_noun a);
-    u3_noun u3_ckb_weld(u3_noun a, u3_noun b);
-    u3_noun u3_ckb_flop(u3_noun a);
+    u3_noun u3kb_lent(u3_noun a);
+    u3_noun u3kb_weld(u3_noun a, u3_noun b);
+    u3_noun u3kb_flop(u3_noun a);
 
-/* u3_ckc: tier 3 functions
+/* u3kc: tier 3 functions
 */
-  /* u3_ckc_lsh(): left shift.
+  /* u3kc_lsh(): left shift.
   */
     u3_noun
-    u3_ckc_lsh(u3_noun a, u3_noun b, u3_noun c);
+    u3kc_lsh(u3_noun a, u3_noun b, u3_noun c);
 
-  /* u3_ckc_rsh(): right shift.
+  /* u3kc_rsh(): right shift.
   */
     u3_noun
-    u3_ckc_rsh(u3_noun a, u3_noun b, u3_noun c);
+    u3kc_rsh(u3_noun a, u3_noun b, u3_noun c);
 
-/* u3_ckd: tier 4 functions
+/* u3kd: tier 4 functions
 */
-  /* u3_ckdb_get(): map get for key `b` in map `a` with u3_none.
+  /* u3kdb_get(): map get for key `b` in map `a` with u3_none.
   */
     u3_weak
-    u3_ckdb_get(u3_noun a, u3_noun b);
+    u3kdb_get(u3_noun a, u3_noun b);
 
-  /* u3_ckdb_got(): map get for key `b` in map `a` with bail.
+  /* u3kdb_got(): map get for key `b` in map `a` with bail.
   */
     u3_noun
-    u3_ckdb_got(u3_noun a, u3_noun b);
+    u3kdb_got(u3_noun a, u3_noun b);
 
-  /* u3_ckdb_put(): map put for key `b`, value `c` in map `a`.
+  /* u3kdb_put(): map put for key `b`, value `c` in map `a`.
   */
     u3_weak
-    u3_ckdb_put(u3_noun a, u3_noun b, u3_noun c);
+    u3kdb_put(u3_noun a, u3_noun b, u3_noun c);
 
-  /* u3_ckdb_has(): test for get.
+  /* u3kdb_has(): test for get.
   */
     u3_noun
-    u3_ckdb_has(u3_noun a, u3_noun b);
+    u3kdb_has(u3_noun a, u3_noun b);
 
-  /* u3_ckdb_gas(): list to map.
+  /* u3kdb_gas(): list to map.
   */
     u3_noun
-    u3_ckdb_gas(u3_noun a, u3_noun b);
+    u3kdb_gas(u3_noun a, u3_noun b);
 
-  /* u3_ckdi_gas(): list to map.
+  /* u3kdi_gas(): list to map.
   */
     u3_noun
-    u3_ckdi_gas(u3_noun a, u3_noun b);
+    u3kdi_gas(u3_noun a, u3_noun b);
 
-  /* u3_ckdi_has(): test for presence.
+  /* u3kdi_has(): test for presence.
   */
     u3_noun
-    u3_ckdi_has(u3_noun a, u3_noun b);
+    u3kdi_has(u3_noun a, u3_noun b);
 
-  /* u3_ckdi_tap(): map/set convert to list.  (solves by_tap also.)
+  /* u3kdi_tap(): map/set convert to list.  (solves by_tap also.)
   */
     u3_noun
-    u3_ckdi_tap(u3_noun a, u3_noun b);
+    u3kdi_tap(u3_noun a, u3_noun b);
 
-  /* u3_ckdi_put(): put in set.
+  /* u3kdi_put(): put in set.
   */
   u3_weak
-  u3_ckdi_put(u3_noun a, u3_noun b);
+  u3kdi_put(u3_noun a, u3_noun b);
 
-#   define u3_ckdb_tap(a, b) u3_ckdi_tap(a, b)
+#   define u3kdb_tap(a, b) u3kdi_tap(a, b)
 
-/* u3_cke: tier 5 functions
+/* u3ke: tier 5 functions
 */
-  /* u3_cke_cue(): expand saved pill.
+  /* u3ke_cue(): expand saved pill.
   */
     u3_noun
-    u3_cke_cue(u3_atom a);
+    u3ke_cue(u3_atom a);
 
-  /* u3_cke_jam(): pack noun as atom.
+  /* u3ke_jam(): pack noun as atom.
   */
     u3_atom
-    u3_cke_jam(u3_noun a);
+    u3ke_jam(u3_noun a);
 
-  /* u3_cke_trip: atom to tape.
+  /* u3ke_trip: atom to tape.
   */
     u3_noun
-    u3_cke_trip(u3_noun a);
+    u3ke_trip(u3_noun a);
 
diff --git a/i/j/q.h b/i/j/q.h
index b9d15ea2b1..5134f6dd0a 100644
--- a/i/j/q.h
+++ b/i/j/q.h
@@ -4,181 +4,181 @@
 */
   /** Tier 1.
   **/
-    u3_noun u3_cqa_add(u3_atom, u3_atom);
-    u3_noun u3_cqa_dec(u3_atom);
-    u3_noun u3_cqa_div(u3_atom, u3_atom);
-    u3_noun u3_cqa_gte(u3_atom, u3_atom);
-    u3_noun u3_cqa_gth(u3_atom, u3_atom);
-    u3_noun u3_cqa_inc(u3_atom);
-    u3_noun u3_cqa_lte(u3_atom, u3_atom);
-    u3_noun u3_cqa_lth(u3_atom, u3_atom);
-    u3_noun u3_cqa_mod(u3_atom, u3_atom);
-    u3_noun u3_cqa_mul(u3_atom, u3_atom);
-    u3_noun u3_cqa_sub(u3_atom, u3_atom);
+    u3_noun u3qa_add(u3_atom, u3_atom);
+    u3_noun u3qa_dec(u3_atom);
+    u3_noun u3qa_div(u3_atom, u3_atom);
+    u3_noun u3qa_gte(u3_atom, u3_atom);
+    u3_noun u3qa_gth(u3_atom, u3_atom);
+    u3_noun u3qa_inc(u3_atom);
+    u3_noun u3qa_lte(u3_atom, u3_atom);
+    u3_noun u3qa_lth(u3_atom, u3_atom);
+    u3_noun u3qa_mod(u3_atom, u3_atom);
+    u3_noun u3qa_mul(u3_atom, u3_atom);
+    u3_noun u3qa_sub(u3_atom, u3_atom);
 
   /** Tier 2.
   **/
-    u3_noun u3_cqb_bind(u3_noun, u3_noun);
-    u3_noun u3_cqb_clap(u3_noun, u3_noun, u3_noun);
-    u3_noun u3_cqb_drop(u3_noun);
-    u3_noun u3_cqb_flop(u3_noun);
-    u3_noun u3_cqb_lent(u3_noun);
-    u3_noun u3_cqb_levy(u3_noun, u3_noun);
-    u3_noun u3_cqb_lien(u3_noun, u3_noun);
-    u3_noun u3_cqb_need(u3_noun);
-    u3_noun u3_cqb_reel(u3_noun, u3_noun);
-    u3_noun u3_cqb_roll(u3_noun, u3_noun); 
-    u3_noun u3_cqb_skim(u3_noun, u3_noun);
-    u3_noun u3_cqb_skip(u3_noun, u3_noun);
-    u3_noun u3_cqb_scag(u3_atom, u3_noun);
-    u3_noun u3_cqb_slag(u3_atom, u3_noun);
-    u3_noun u3_cqb_snag(u3_atom, u3_noun);
-    u3_noun u3_cqb_sort(u3_noun, u3_noun);
-    u3_noun u3_cqb_turn(u3_noun, u3_noun);
-    u3_noun u3_cqb_weld(u3_noun, u3_noun);
+    u3_noun u3qb_bind(u3_noun, u3_noun);
+    u3_noun u3qb_clap(u3_noun, u3_noun, u3_noun);
+    u3_noun u3qb_drop(u3_noun);
+    u3_noun u3qb_flop(u3_noun);
+    u3_noun u3qb_lent(u3_noun);
+    u3_noun u3qb_levy(u3_noun, u3_noun);
+    u3_noun u3qb_lien(u3_noun, u3_noun);
+    u3_noun u3qb_need(u3_noun);
+    u3_noun u3qb_reel(u3_noun, u3_noun);
+    u3_noun u3qb_roll(u3_noun, u3_noun); 
+    u3_noun u3qb_skim(u3_noun, u3_noun);
+    u3_noun u3qb_skip(u3_noun, u3_noun);
+    u3_noun u3qb_scag(u3_atom, u3_noun);
+    u3_noun u3qb_slag(u3_atom, u3_noun);
+    u3_noun u3qb_snag(u3_atom, u3_noun);
+    u3_noun u3qb_sort(u3_noun, u3_noun);
+    u3_noun u3qb_turn(u3_noun, u3_noun);
+    u3_noun u3qb_weld(u3_noun, u3_noun);
 
   /** Tier 3.
   **/
-    u3_noun u3_cqc_bex(u3_atom);
-    u3_noun u3_cqc_can(u3_atom, u3_noun);
-    u3_noun u3_cqc_cap(u3_atom);
-    u3_noun u3_cqc_cat(u3_atom, u3_atom, u3_atom);
-    u3_noun u3_cqc_con(u3_atom, u3_atom);
-    u3_noun u3_cqc_cut(u3_atom, u3_atom, u3_atom, u3_atom);
-    u3_noun u3_cqc_dis(u3_atom, u3_atom);
-    u3_noun u3_cqc_dor(u3_atom, u3_atom);
-    u3_noun u3_cqc_end(u3_atom, u3_atom, u3_atom);
-    u3_noun u3_cqc_gor(u3_atom, u3_atom);
-    u3_noun u3_cqc_hor(u3_atom, u3_atom);
-    u3_noun u3_cqc_lsh(u3_atom, u3_atom, u3_atom);
-    u3_noun u3_cqc_mas(u3_atom);
-    u3_noun u3_cqc_met(u3_atom, u3_atom);
-    u3_noun u3_cqc_mix(u3_atom, u3_atom);
-    u3_noun u3_cqc_peg(u3_atom, u3_atom);
-    u3_noun u3_cqc_rap(u3_atom, u3_noun);
-    u3_noun u3_cqc_rip(u3_atom, u3_atom);
-    u3_noun u3_cqc_rsh(u3_atom, u3_atom, u3_atom);
-    u3_noun u3_cqc_vor(u3_atom, u3_atom);
+    u3_noun u3qc_bex(u3_atom);
+    u3_noun u3qc_can(u3_atom, u3_noun);
+    u3_noun u3qc_cap(u3_atom);
+    u3_noun u3qc_cat(u3_atom, u3_atom, u3_atom);
+    u3_noun u3qc_con(u3_atom, u3_atom);
+    u3_noun u3qc_cut(u3_atom, u3_atom, u3_atom, u3_atom);
+    u3_noun u3qc_dis(u3_atom, u3_atom);
+    u3_noun u3qc_dor(u3_atom, u3_atom);
+    u3_noun u3qc_end(u3_atom, u3_atom, u3_atom);
+    u3_noun u3qc_gor(u3_atom, u3_atom);
+    u3_noun u3qc_hor(u3_atom, u3_atom);
+    u3_noun u3qc_lsh(u3_atom, u3_atom, u3_atom);
+    u3_noun u3qc_mas(u3_atom);
+    u3_noun u3qc_met(u3_atom, u3_atom);
+    u3_noun u3qc_mix(u3_atom, u3_atom);
+    u3_noun u3qc_peg(u3_atom, u3_atom);
+    u3_noun u3qc_rap(u3_atom, u3_noun);
+    u3_noun u3qc_rip(u3_atom, u3_atom);
+    u3_noun u3qc_rsh(u3_atom, u3_atom, u3_atom);
+    u3_noun u3qc_vor(u3_atom, u3_atom);
 
   /** Tier 4.
   **/
-    u3_noun u3_cqdb_gas(u3_noun, u3_noun);
-    u3_noun u3_cqdb_get(u3_noun, u3_noun);
-    u3_noun u3_cqdb_has(u3_noun, u3_noun);
-    u3_noun u3_cqdb_int(u3_noun, u3_noun);
-    u3_noun u3_cqdb_put(u3_noun, u3_noun, u3_noun);
-#   define u3_cqdb_tap u3_cqdi_tap
-    u3_noun u3_cqdb_uni(u3_noun, u3_noun);
+    u3_noun u3qdb_gas(u3_noun, u3_noun);
+    u3_noun u3qdb_get(u3_noun, u3_noun);
+    u3_noun u3qdb_has(u3_noun, u3_noun);
+    u3_noun u3qdb_int(u3_noun, u3_noun);
+    u3_noun u3qdb_put(u3_noun, u3_noun, u3_noun);
+#   define u3qdb_tap u3qdi_tap
+    u3_noun u3qdb_uni(u3_noun, u3_noun);
 
-    u3_noun u3_cqdi_gas(u3_noun, u3_noun);
-    u3_noun u3_cqdi_has(u3_noun, u3_noun);
-    u3_noun u3_cqdi_int(u3_noun, u3_noun);
-    u3_noun u3_cqdi_mer(u3_noun, u3_noun);
-    u3_noun u3_cqdi_put(u3_noun, u3_noun);
-    u3_noun u3_cqdi_tap(u3_noun, u3_noun);
-    u3_noun u3_cqdi_uni(u3_noun, u3_noun);
+    u3_noun u3qdi_gas(u3_noun, u3_noun);
+    u3_noun u3qdi_has(u3_noun, u3_noun);
+    u3_noun u3qdi_int(u3_noun, u3_noun);
+    u3_noun u3qdi_mer(u3_noun, u3_noun);
+    u3_noun u3qdi_put(u3_noun, u3_noun);
+    u3_noun u3qdi_tap(u3_noun, u3_noun);
+    u3_noun u3qdi_uni(u3_noun, u3_noun);
 
   /** Tier 5.
   **/
-    u3_noun u3_cqe_cue(u3_atom);
-    u3_noun u3_cqe_jam(u3_atom);
-    u3_noun u3_cqe_mat(u3_atom);
-    u3_noun u3_cqe_rub(u3_atom, u3_atom);
-    u3_noun u3_cqe_lore(u3_atom);
-    u3_noun u3_cqe_loss(u3_noun, u3_noun);
-    u3_noun u3_cqe_repg(u3_noun, u3_noun, u3_noun);
-    u3_noun u3_cqe_rexp(u3_noun, u3_noun);
-    u3_noun u3_cqe_trip(u3_atom);
+    u3_noun u3qe_cue(u3_atom);
+    u3_noun u3qe_jam(u3_atom);
+    u3_noun u3qe_mat(u3_atom);
+    u3_noun u3qe_rub(u3_atom, u3_atom);
+    u3_noun u3qe_lore(u3_atom);
+    u3_noun u3qe_loss(u3_noun, u3_noun);
+    u3_noun u3qe_repg(u3_noun, u3_noun, u3_noun);
+    u3_noun u3qe_rexp(u3_noun, u3_noun);
+    u3_noun u3qe_trip(u3_atom);
 
-    u3_noun u3_cqea_de(u3_atom, u3_atom);
-    u3_noun u3_cqea_en(u3_atom, u3_atom);
+    u3_noun u3qea_de(u3_atom, u3_atom);
+    u3_noun u3qea_en(u3_atom, u3_atom);
 
-    u3_noun u3_cqe_shax(u3_atom);
-    u3_noun u3_cqe_shas(u3_atom, u3_atom);
-    u3_noun u3_cqe_shal(u3_atom, u3_atom);
+    u3_noun u3qe_shax(u3_atom);
+    u3_noun u3qe_shas(u3_atom, u3_atom);
+    u3_noun u3qe_shal(u3_atom, u3_atom);
 
-    u3_noun u3_cqeo_raw(u3_atom, u3_atom);
+    u3_noun u3qeo_raw(u3_atom, u3_atom);
 
-    u3_noun u3_cqer_sun(u3_atom);
-    u3_noun u3_cqer_mul(u3_atom, u3_atom);
-    u3_noun u3_cqer_div(u3_atom, u3_atom);
-    u3_noun u3_cqer_add(u3_atom, u3_atom);
-    u3_noun u3_cqer_sub(u3_atom, u3_atom);
-    u3_noun u3_cqer_lte(u3_atom, u3_atom);
-    u3_noun u3_cqer_lth(u3_atom, u3_atom);
-    u3_noun u3_cqer_gte(u3_atom, u3_atom);
-    u3_noun u3_cqer_gth(u3_atom, u3_atom);
+    u3_noun u3qer_sun(u3_atom);
+    u3_noun u3qer_mul(u3_atom, u3_atom);
+    u3_noun u3qer_div(u3_atom, u3_atom);
+    u3_noun u3qer_add(u3_atom, u3_atom);
+    u3_noun u3qer_sub(u3_atom, u3_atom);
+    u3_noun u3qer_lte(u3_atom, u3_atom);
+    u3_noun u3qer_lth(u3_atom, u3_atom);
+    u3_noun u3qer_gte(u3_atom, u3_atom);
+    u3_noun u3qer_gth(u3_atom, u3_atom);
 
 
   /** Tier 6.
   **/
-    u3_noun u3_cqf_bull(u3_noun, u3_noun);
-    u3_noun u3_cqf_cell(u3_noun, u3_noun);
-    u3_noun u3_cqf_comb(u3_noun, u3_noun);
-    u3_noun u3_cqf_cons(u3_noun, u3_noun);
-    u3_noun u3_cqf_core(u3_noun, u3_noun);
-    u3_noun u3_cqf_cube(u3_noun, u3_noun);
-    u3_noun u3_cqf_face(u3_noun, u3_noun);
-    u3_noun u3_cqf_fine(u3_noun, u3_noun, u3_noun);
-    u3_noun u3_cqf_fitz(u3_noun, u3_noun);
-    u3_noun u3_cqf_flan(u3_noun, u3_noun);
-    u3_noun u3_cqf_flay(u3_noun);
-    u3_noun u3_cqf_flip(u3_noun);
-    u3_noun u3_cqf_flor(u3_noun, u3_noun);
-    u3_noun u3_cqf_fork(u3_noun, u3_noun);
-    u3_noun u3_cqf_hike(u3_noun, u3_noun);
-    u3_noun u3_cqf_look(u3_noun, u3_noun);
-    u3_noun u3_cqf_slot(u3_atom, u3_noun);
-    u3_noun u3_cqf_type(u3_noun);
+    u3_noun u3qf_bull(u3_noun, u3_noun);
+    u3_noun u3qf_cell(u3_noun, u3_noun);
+    u3_noun u3qf_comb(u3_noun, u3_noun);
+    u3_noun u3qf_cons(u3_noun, u3_noun);
+    u3_noun u3qf_core(u3_noun, u3_noun);
+    u3_noun u3qf_cube(u3_noun, u3_noun);
+    u3_noun u3qf_face(u3_noun, u3_noun);
+    u3_noun u3qf_fine(u3_noun, u3_noun, u3_noun);
+    u3_noun u3qf_fitz(u3_noun, u3_noun);
+    u3_noun u3qf_flan(u3_noun, u3_noun);
+    u3_noun u3qf_flay(u3_noun);
+    u3_noun u3qf_flip(u3_noun);
+    u3_noun u3qf_flor(u3_noun, u3_noun);
+    u3_noun u3qf_fork(u3_noun, u3_noun);
+    u3_noun u3qf_hike(u3_noun, u3_noun);
+    u3_noun u3qf_look(u3_noun, u3_noun);
+    u3_noun u3qf_slot(u3_atom, u3_noun);
+    u3_noun u3qf_type(u3_noun);
 
-    u3_noun u3_cqfl_bunt(u3_noun, u3_noun); 
-    u3_noun u3_cqfl_whip(u3_noun, u3_noun, u3_noun);
+    u3_noun u3qfl_bunt(u3_noun, u3_noun); 
+    u3_noun u3qfl_whip(u3_noun, u3_noun, u3_noun);
 
-    u3_noun u3_cqfp_hack(u3_noun, u3_noun);
-    u3_noun u3_cqfp_late(u3_noun);
-    u3_noun u3_cqfp_open(u3_noun, u3_noun);
-    u3_noun u3_cqfp_rake(u3_noun);
+    u3_noun u3qfp_hack(u3_noun, u3_noun);
+    u3_noun u3qfp_late(u3_noun);
+    u3_noun u3qfp_open(u3_noun, u3_noun);
+    u3_noun u3qfp_rake(u3_noun);
 
-#   define u3_cqfu_van_fan  28
-#   define u3_cqfu_van_rib  58
-#   define u3_cqfu_van_vrf  59
-#   define u3_cqfu_van_vet  118
-#   define u3_cqfu_van_fab  119
+#   define u3qfu_van_fan  28
+#   define u3qfu_van_rib  58
+#   define u3qfu_van_vrf  59
+#   define u3qfu_van_vet  118
+#   define u3qfu_van_fab  119
 
-    u3_noun u3_cqfu_burn(u3_noun, u3_noun);
-    u3_noun u3_cqfu_busk(u3_noun, u3_noun, u3_noun, u3_noun);
-    u3_noun u3_cqfu_bust(u3_noun, u3_noun, u3_noun);
-    u3_noun u3_cqfu_conk(u3_noun, u3_noun, u3_noun);
-    u3_noun u3_cqfu_crop(u3_noun, u3_noun, u3_noun);
-    u3_noun u3_cqfu_cull(u3_noun, u3_noun, u3_noun, u3_atom, u3_noun);
-    u3_noun u3_cqfu_duck(u3_noun, u3_noun); 
-    u3_noun u3_cqfu_dung(u3_noun, u3_noun cap, u3_noun);
-    u3_noun u3_cqfu_dunq(u3_noun, const c3_c*, u3_noun);
-    u3_noun u3_cqfu_find(u3_noun, u3_noun, u3_noun, u3_noun, u3_noun);
-    u3_noun u3_cqfu_fino(u3_noun, u3_noun, u3_noun, u3_noun, u3_noun);
-    u3_noun u3_cqfu_fink(u3_noun, u3_noun, u3_noun, u3_noun, u3_noun);
-    u3_noun u3_cqfu_fire(u3_noun, u3_noun, u3_noun);
-    u3_noun u3_cqfu_firm(u3_noun, u3_noun, u3_noun);
-    u3_noun u3_cqfu_fish(u3_noun, u3_noun, u3_atom);
-    u3_noun u3_cqfu_fuse(u3_noun, u3_noun, u3_noun);
-    u3_noun u3_cqfu_gain(u3_noun, u3_noun, u3_noun);
-    u3_noun u3_cqfu_heal(u3_noun, u3_noun, u3_noun, u3_noun, u3_noun);
-    u3_noun u3_cqfu_lose(u3_noun, u3_noun, u3_noun);
-    u3_noun u3_cqfu_mint(u3_noun, u3_noun, u3_noun, u3_noun);
-    u3_noun u3_cqfu_mull(u3_noun, u3_noun, u3_noun, u3_noun, u3_noun);
-    u3_noun u3_cqfu_nest(u3_noun, u3_noun, u3_noun, u3_noun);
-    u3_noun u3_cqfu_orth(u3_noun, u3_noun, u3_noun);
-    u3_noun u3_cqfu_park(u3_noun, u3_noun, u3_noun, u3_noun);
-    u3_noun u3_cqfu_peek(u3_noun, u3_noun, u3_noun, u3_noun);
-    u3_noun u3_cqfu_play(u3_noun, u3_noun, u3_noun);
-    u3_noun u3_cqfu_repo(u3_noun, u3_noun);
-    u3_noun u3_cqfu_rest(u3_noun, u3_noun, u3_noun);
-    u3_noun u3_cqfu_seek(u3_noun, u3_noun, u3_noun, u3_noun);
-    u3_noun u3_cqfu_seep(u3_noun, u3_noun, u3_noun, u3_noun);
-    u3_noun u3_cqfu_shep(u3_noun, const c3_c*, u3_noun, u3_noun);
-    u3_noun u3_cqfu_shew(u3_noun, u3_noun); 
-    u3_noun u3_cqfu_sift(u3_noun, u3_noun, u3_noun);
-    u3_noun u3_cqfu_snub(u3_noun, u3_noun, u3_noun);
-    u3_noun u3_cqfu_tack(u3_noun, u3_noun, u3_noun, u3_noun);
-    u3_noun u3_cqfu_tock(u3_noun, u3_noun, u3_noun, u3_noun, u3_noun);
-    u3_noun u3_cqfu_wrap(u3_noun, u3_noun, u3_noun);
+    u3_noun u3qfu_burn(u3_noun, u3_noun);
+    u3_noun u3qfu_busk(u3_noun, u3_noun, u3_noun, u3_noun);
+    u3_noun u3qfu_bust(u3_noun, u3_noun, u3_noun);
+    u3_noun u3qfu_conk(u3_noun, u3_noun, u3_noun);
+    u3_noun u3qfu_crop(u3_noun, u3_noun, u3_noun);
+    u3_noun u3qfu_cull(u3_noun, u3_noun, u3_noun, u3_atom, u3_noun);
+    u3_noun u3qfu_duck(u3_noun, u3_noun); 
+    u3_noun u3qfu_dung(u3_noun, u3_noun cap, u3_noun);
+    u3_noun u3qfu_dunq(u3_noun, const c3_c*, u3_noun);
+    u3_noun u3qfu_find(u3_noun, u3_noun, u3_noun, u3_noun, u3_noun);
+    u3_noun u3qfu_fino(u3_noun, u3_noun, u3_noun, u3_noun, u3_noun);
+    u3_noun u3qfu_fink(u3_noun, u3_noun, u3_noun, u3_noun, u3_noun);
+    u3_noun u3qfu_fire(u3_noun, u3_noun, u3_noun);
+    u3_noun u3qfu_firm(u3_noun, u3_noun, u3_noun);
+    u3_noun u3qfu_fish(u3_noun, u3_noun, u3_atom);
+    u3_noun u3qfu_fuse(u3_noun, u3_noun, u3_noun);
+    u3_noun u3qfu_gain(u3_noun, u3_noun, u3_noun);
+    u3_noun u3qfu_heal(u3_noun, u3_noun, u3_noun, u3_noun, u3_noun);
+    u3_noun u3qfu_lose(u3_noun, u3_noun, u3_noun);
+    u3_noun u3qfu_mint(u3_noun, u3_noun, u3_noun, u3_noun);
+    u3_noun u3qfu_mull(u3_noun, u3_noun, u3_noun, u3_noun, u3_noun);
+    u3_noun u3qfu_nest(u3_noun, u3_noun, u3_noun, u3_noun);
+    u3_noun u3qfu_orth(u3_noun, u3_noun, u3_noun);
+    u3_noun u3qfu_park(u3_noun, u3_noun, u3_noun, u3_noun);
+    u3_noun u3qfu_peek(u3_noun, u3_noun, u3_noun, u3_noun);
+    u3_noun u3qfu_play(u3_noun, u3_noun, u3_noun);
+    u3_noun u3qfu_repo(u3_noun, u3_noun);
+    u3_noun u3qfu_rest(u3_noun, u3_noun, u3_noun);
+    u3_noun u3qfu_seek(u3_noun, u3_noun, u3_noun, u3_noun);
+    u3_noun u3qfu_seep(u3_noun, u3_noun, u3_noun, u3_noun);
+    u3_noun u3qfu_shep(u3_noun, const c3_c*, u3_noun, u3_noun);
+    u3_noun u3qfu_shew(u3_noun, u3_noun); 
+    u3_noun u3qfu_sift(u3_noun, u3_noun, u3_noun);
+    u3_noun u3qfu_snub(u3_noun, u3_noun, u3_noun);
+    u3_noun u3qfu_tack(u3_noun, u3_noun, u3_noun, u3_noun);
+    u3_noun u3qfu_tock(u3_noun, u3_noun, u3_noun, u3_noun, u3_noun);
+    u3_noun u3qfu_wrap(u3_noun, u3_noun, u3_noun);
diff --git a/i/j/w.h b/i/j/w.h
index bb4d30a1cd..f9a7ea2fc1 100644
--- a/i/j/w.h
+++ b/i/j/w.h
@@ -4,194 +4,194 @@
 */
   /** Tier 1.
   **/
-    u3_noun u3_cwa_add(u3_noun);
-    u3_noun u3_cwa_dec(u3_noun);
-    u3_noun u3_cwa_div(u3_noun);
-    u3_noun u3_cwa_gte(u3_noun);
-    u3_noun u3_cwa_gth(u3_noun);
-    u3_noun u3_cwa_lte(u3_noun);
-    u3_noun u3_cwa_lth(u3_noun);
-    u3_noun u3_cwa_mod(u3_noun);
-    u3_noun u3_cwa_mul(u3_noun);
-    u3_noun u3_cwa_sub(u3_noun);
+    u3_noun u3wa_add(u3_noun);
+    u3_noun u3wa_dec(u3_noun);
+    u3_noun u3wa_div(u3_noun);
+    u3_noun u3wa_gte(u3_noun);
+    u3_noun u3wa_gth(u3_noun);
+    u3_noun u3wa_lte(u3_noun);
+    u3_noun u3wa_lth(u3_noun);
+    u3_noun u3wa_mod(u3_noun);
+    u3_noun u3wa_mul(u3_noun);
+    u3_noun u3wa_sub(u3_noun);
 
   /** Tier 2.
   **/
-    u3_noun u3_cwb_bind(u3_noun);
-    u3_noun u3_cwb_clap(u3_noun);
-    u3_noun u3_cwb_drop(u3_noun);
-    u3_noun u3_cwb_flop(u3_noun);
-    u3_noun u3_cwb_lent(u3_noun);
-    u3_noun u3_cwb_levy(u3_noun);
-    u3_noun u3_cwb_lien(u3_noun);
-    u3_noun u3_cwb_need(u3_noun);
-    u3_noun u3_cwb_reel(u3_noun);
-    u3_noun u3_cwb_roll(u3_noun);
-    u3_noun u3_cwb_skim(u3_noun);
-    u3_noun u3_cwb_skip(u3_noun);
-    u3_noun u3_cwb_scag(u3_noun);
-    u3_noun u3_cwb_slag(u3_noun);
-    u3_noun u3_cwb_snag(u3_noun);
-    u3_noun u3_cwb_sort(u3_noun);
-    u3_noun u3_cwb_turn(u3_noun);
-    u3_noun u3_cwb_weld(u3_noun);
+    u3_noun u3wb_bind(u3_noun);
+    u3_noun u3wb_clap(u3_noun);
+    u3_noun u3wb_drop(u3_noun);
+    u3_noun u3wb_flop(u3_noun);
+    u3_noun u3wb_lent(u3_noun);
+    u3_noun u3wb_levy(u3_noun);
+    u3_noun u3wb_lien(u3_noun);
+    u3_noun u3wb_need(u3_noun);
+    u3_noun u3wb_reel(u3_noun);
+    u3_noun u3wb_roll(u3_noun);
+    u3_noun u3wb_skim(u3_noun);
+    u3_noun u3wb_skip(u3_noun);
+    u3_noun u3wb_scag(u3_noun);
+    u3_noun u3wb_slag(u3_noun);
+    u3_noun u3wb_snag(u3_noun);
+    u3_noun u3wb_sort(u3_noun);
+    u3_noun u3wb_turn(u3_noun);
+    u3_noun u3wb_weld(u3_noun);
 
   /** Tier 3.
   **/
-    u3_noun u3_cwc_bex(u3_noun);
-    u3_noun u3_cwc_can(u3_noun);
-    u3_noun u3_cwc_cap(u3_noun);
-    u3_noun u3_cwc_cat(u3_noun);
-    u3_noun u3_cwc_con(u3_noun);
-    u3_noun u3_cwc_cut(u3_noun);
-    u3_noun u3_cwc_dis(u3_noun);
-    u3_noun u3_cwc_dor(u3_noun);
-    u3_noun u3_cwc_end(u3_noun);
-    u3_noun u3_cwc_gor(u3_noun);
-    u3_noun u3_cwc_hor(u3_noun);
-    u3_noun u3_cwc_lsh(u3_noun);
-    u3_noun u3_cwc_mas(u3_noun);
-    u3_noun u3_cwc_met(u3_noun);
-    u3_noun u3_cwc_mix(u3_noun);
-    u3_noun u3_cwc_mug(u3_noun);
-    u3_noun u3_cwc_peg(u3_noun);
-    u3_noun u3_cwc_rap(u3_noun);
-    u3_noun u3_cwc_rip(u3_noun);
-    u3_noun u3_cwc_rsh(u3_noun);
-    u3_noun u3_cwc_vor(u3_noun);
+    u3_noun u3wc_bex(u3_noun);
+    u3_noun u3wc_can(u3_noun);
+    u3_noun u3wc_cap(u3_noun);
+    u3_noun u3wc_cat(u3_noun);
+    u3_noun u3wc_con(u3_noun);
+    u3_noun u3wc_cut(u3_noun);
+    u3_noun u3wc_dis(u3_noun);
+    u3_noun u3wc_dor(u3_noun);
+    u3_noun u3wc_end(u3_noun);
+    u3_noun u3wc_gor(u3_noun);
+    u3_noun u3wc_hor(u3_noun);
+    u3_noun u3wc_lsh(u3_noun);
+    u3_noun u3wc_mas(u3_noun);
+    u3_noun u3wc_met(u3_noun);
+    u3_noun u3wc_mix(u3_noun);
+    u3_noun u3wc_mug(u3_noun);
+    u3_noun u3wc_peg(u3_noun);
+    u3_noun u3wc_rap(u3_noun);
+    u3_noun u3wc_rip(u3_noun);
+    u3_noun u3wc_rsh(u3_noun);
+    u3_noun u3wc_vor(u3_noun);
 
-    u3_noun u3_cwcp_ins(u3_noun);
-    u3_noun u3_cwcp_ind(u3_noun);
-    u3_noun u3_cwcp_tos(u3_noun);
-    u3_noun u3_cwcp_tod(u3_noun);
+    u3_noun u3wcp_ins(u3_noun);
+    u3_noun u3wcp_ind(u3_noun);
+    u3_noun u3wcp_tos(u3_noun);
+    u3_noun u3wcp_tod(u3_noun);
 
   /** Tier 4.
   **/
-    u3_noun u3_cwdb_gas(u3_noun);
-    u3_noun u3_cwdb_get(u3_noun);
-    u3_noun u3_cwdb_has(u3_noun);
-    u3_noun u3_cwdb_int(u3_noun);
-    u3_noun u3_cwdb_put(u3_noun);
-#   define u3_cwdb_tap u3_cwdi_tap
-    u3_noun u3_cwdb_uni(u3_noun);
+    u3_noun u3wdb_gas(u3_noun);
+    u3_noun u3wdb_get(u3_noun);
+    u3_noun u3wdb_has(u3_noun);
+    u3_noun u3wdb_int(u3_noun);
+    u3_noun u3wdb_put(u3_noun);
+#   define u3wdb_tap u3wdi_tap
+    u3_noun u3wdb_uni(u3_noun);
 
-    u3_noun u3_cwdi_gas(u3_noun);
-    u3_noun u3_cwdi_has(u3_noun);
-    u3_noun u3_cwdi_int(u3_noun);
-    u3_noun u3_cwdi_mer(u3_noun);
-    u3_noun u3_cwdi_put(u3_noun);
-    u3_noun u3_cwdi_tap(u3_noun);
-    u3_noun u3_cwdi_uni(u3_noun);
+    u3_noun u3wdi_gas(u3_noun);
+    u3_noun u3wdi_has(u3_noun);
+    u3_noun u3wdi_int(u3_noun);
+    u3_noun u3wdi_mer(u3_noun);
+    u3_noun u3wdi_put(u3_noun);
+    u3_noun u3wdi_tap(u3_noun);
+    u3_noun u3wdi_uni(u3_noun);
 
   /** Tier 5.
   **/
-    u3_noun u3_cwe_cue(u3_noun);
-    u3_noun u3_cwe_jam(u3_noun);
-    u3_noun u3_cwe_mat(u3_noun);
-    u3_noun u3_cwe_rub(u3_noun);
-    u3_noun u3_cwe_lore(u3_noun);
-    u3_noun u3_cwe_loss(u3_noun);
-    u3_noun u3_cwe_mink(u3_noun);
-    u3_noun u3_cwe_mule(u3_noun);
-    u3_noun u3_cwe_repg(u3_noun);
-    u3_noun u3_cwe_rexp(u3_noun);
-    u3_noun u3_cwe_trip(u3_noun);
+    u3_noun u3we_cue(u3_noun);
+    u3_noun u3we_jam(u3_noun);
+    u3_noun u3we_mat(u3_noun);
+    u3_noun u3we_rub(u3_noun);
+    u3_noun u3we_lore(u3_noun);
+    u3_noun u3we_loss(u3_noun);
+    u3_noun u3we_mink(u3_noun);
+    u3_noun u3we_mule(u3_noun);
+    u3_noun u3we_repg(u3_noun);
+    u3_noun u3we_rexp(u3_noun);
+    u3_noun u3we_trip(u3_noun);
 
-    u3_noun u3_cwe_pfix(u3_noun);
-    u3_noun u3_cwe_plug(u3_noun);
-    u3_noun u3_cwe_pose(u3_noun);
-    u3_noun u3_cwe_sfix(u3_noun);
+    u3_noun u3we_pfix(u3_noun);
+    u3_noun u3we_plug(u3_noun);
+    u3_noun u3we_pose(u3_noun);
+    u3_noun u3we_sfix(u3_noun);
 
-    u3_noun u3_cwea_de(u3_noun);
-    u3_noun u3_cwea_en(u3_noun);
+    u3_noun u3wea_de(u3_noun);
+    u3_noun u3wea_en(u3_noun);
 
-    u3_noun u3_cwe_shax(u3_noun);
-    u3_noun u3_cwe_shas(u3_noun);
-    u3_noun u3_cwe_shal(u3_noun);
+    u3_noun u3we_shax(u3_noun);
+    u3_noun u3we_shas(u3_noun);
+    u3_noun u3we_shal(u3_noun);
 
-    u3_noun u3_cweo_raw(u3_noun);
+    u3_noun u3weo_raw(u3_noun);
 
-    u3_noun u3_cwee_puck(u3_noun);
-    u3_noun u3_cwee_sign(u3_noun);
-    u3_noun u3_cwee_veri(u3_noun);
+    u3_noun u3wee_puck(u3_noun);
+    u3_noun u3wee_sign(u3_noun);
+    u3_noun u3wee_veri(u3_noun);
 
-    u3_noun u3_cwe_bend_fun(u3_noun);
-    u3_noun u3_cwe_cold_fun(u3_noun);
-    u3_noun u3_cwe_cook_fun(u3_noun);
-    u3_noun u3_cwe_comp_fun(u3_noun);
-    u3_noun u3_cwe_easy_fun(u3_noun);
-    u3_noun u3_cwe_glue_fun(u3_noun);
-    u3_noun u3_cwe_here_fun(u3_noun);
-    u3_noun u3_cwe_just_fun(u3_noun);
-    u3_noun u3_cwe_mask_fun(u3_noun);
-    u3_noun u3_cwe_shim_fun(u3_noun);
-    u3_noun u3_cwe_stag_fun(u3_noun);
-    u3_noun u3_cwe_stew_fun(u3_noun);
-    u3_noun u3_cwe_stir_fun(u3_noun);
+    u3_noun u3we_bend_fun(u3_noun);
+    u3_noun u3we_cold_fun(u3_noun);
+    u3_noun u3we_cook_fun(u3_noun);
+    u3_noun u3we_comp_fun(u3_noun);
+    u3_noun u3we_easy_fun(u3_noun);
+    u3_noun u3we_glue_fun(u3_noun);
+    u3_noun u3we_here_fun(u3_noun);
+    u3_noun u3we_just_fun(u3_noun);
+    u3_noun u3we_mask_fun(u3_noun);
+    u3_noun u3we_shim_fun(u3_noun);
+    u3_noun u3we_stag_fun(u3_noun);
+    u3_noun u3we_stew_fun(u3_noun);
+    u3_noun u3we_stir_fun(u3_noun);
 
-    u3_noun u3_cwer_sun(u3_noun);
-    u3_noun u3_cwer_mul(u3_noun);
-    u3_noun u3_cwer_div(u3_noun);
-    u3_noun u3_cwer_add(u3_noun);
-    u3_noun u3_cwer_sub(u3_noun);
-    u3_noun u3_cwer_lte(u3_noun);
-    u3_noun u3_cwer_lth(u3_noun);
-    u3_noun u3_cwer_gte(u3_noun);
-    u3_noun u3_cwer_gth(u3_noun);
+    u3_noun u3wer_sun(u3_noun);
+    u3_noun u3wer_mul(u3_noun);
+    u3_noun u3wer_div(u3_noun);
+    u3_noun u3wer_add(u3_noun);
+    u3_noun u3wer_sub(u3_noun);
+    u3_noun u3wer_lte(u3_noun);
+    u3_noun u3wer_lth(u3_noun);
+    u3_noun u3wer_gte(u3_noun);
+    u3_noun u3wer_gth(u3_noun);
 
 
   /** Tier 6.
   **/
-    u3_noun u3_cwf_bull(u3_noun);
-    u3_noun u3_cwf_cell(u3_noun);
-    u3_noun u3_cwf_comb(u3_noun);
-    u3_noun u3_cwf_cons(u3_noun);
-    u3_noun u3_cwf_core(u3_noun);
-    u3_noun u3_cwf_cube(u3_noun);
-    u3_noun u3_cwf_face(u3_noun);
-    u3_noun u3_cwf_fine(u3_noun);
-    u3_noun u3_cwf_fitz(u3_noun);
-    u3_noun u3_cwf_flan(u3_noun);
-    u3_noun u3_cwf_flay(u3_noun);
-    u3_noun u3_cwf_flip(u3_noun);
-    u3_noun u3_cwf_flor(u3_noun);
-    u3_noun u3_cwf_fork(u3_noun);
-    u3_noun u3_cwf_hike(u3_noun);
-    u3_noun u3_cwf_look(u3_noun);
+    u3_noun u3wf_bull(u3_noun);
+    u3_noun u3wf_cell(u3_noun);
+    u3_noun u3wf_comb(u3_noun);
+    u3_noun u3wf_cons(u3_noun);
+    u3_noun u3wf_core(u3_noun);
+    u3_noun u3wf_cube(u3_noun);
+    u3_noun u3wf_face(u3_noun);
+    u3_noun u3wf_fine(u3_noun);
+    u3_noun u3wf_fitz(u3_noun);
+    u3_noun u3wf_flan(u3_noun);
+    u3_noun u3wf_flay(u3_noun);
+    u3_noun u3wf_flip(u3_noun);
+    u3_noun u3wf_flor(u3_noun);
+    u3_noun u3wf_fork(u3_noun);
+    u3_noun u3wf_hike(u3_noun);
+    u3_noun u3wf_look(u3_noun);
 
-    u3_noun u3_cwfl_bunt(u3_noun);
-    u3_noun u3_cwfl_whip(u3_noun);
+    u3_noun u3wfl_bunt(u3_noun);
+    u3_noun u3wfl_whip(u3_noun);
 
-    u3_noun u3_cwfp_hack(u3_noun);
-    u3_noun u3_cwfp_late(u3_noun);
-    u3_noun u3_cwfp_open(u3_noun);
-    u3_noun u3_cwfp_rake(u3_noun);
+    u3_noun u3wfp_hack(u3_noun);
+    u3_noun u3wfp_late(u3_noun);
+    u3_noun u3wfp_open(u3_noun);
+    u3_noun u3wfp_rake(u3_noun);
 
-    u3_noun u3_cwfu_burn(u3_noun);
-    u3_noun u3_cwfu_busk(u3_noun);
-    u3_noun u3_cwfu_bust(u3_noun);
-    u3_noun u3_cwfu_conk(u3_noun);
-    u3_noun u3_cwfu_crop(u3_noun);
-    u3_noun u3_cwfu_cull(u3_noun);
-    u3_noun u3_cwfu_duck(u3_noun);
-    u3_noun u3_cwfu_find(u3_noun);
-    u3_noun u3_cwfu_fino(u3_noun);
-    u3_noun u3_cwfu_fink(u3_noun);
-    u3_noun u3_cwfu_fire(u3_noun);
-    u3_noun u3_cwfu_firm(u3_noun);
-    u3_noun u3_cwfu_fish(u3_noun);
-    u3_noun u3_cwfu_fuse(u3_noun);
-    u3_noun u3_cwfu_heal(u3_noun);
-    u3_noun u3_cwfu_mint(u3_noun);
-    u3_noun u3_cwfu_mull(u3_noun);
-    u3_noun u3_cwfu_nest(u3_noun);
-    u3_noun u3_cwfu_park(u3_noun);
-    u3_noun u3_cwfu_peek(u3_noun);
-    u3_noun u3_cwfu_play(u3_noun);
-    u3_noun u3_cwfu_repo(u3_noun);
-    u3_noun u3_cwfu_rest(u3_noun);
-    u3_noun u3_cwfu_seek(u3_noun);
-    u3_noun u3_cwfu_seep(u3_noun);
-    u3_noun u3_cwfu_snub(u3_noun);
-    u3_noun u3_cwfu_tock(u3_noun);
-    u3_noun u3_cwfu_wrap(u3_noun);
+    u3_noun u3wfu_burn(u3_noun);
+    u3_noun u3wfu_busk(u3_noun);
+    u3_noun u3wfu_bust(u3_noun);
+    u3_noun u3wfu_conk(u3_noun);
+    u3_noun u3wfu_crop(u3_noun);
+    u3_noun u3wfu_cull(u3_noun);
+    u3_noun u3wfu_duck(u3_noun);
+    u3_noun u3wfu_find(u3_noun);
+    u3_noun u3wfu_fino(u3_noun);
+    u3_noun u3wfu_fink(u3_noun);
+    u3_noun u3wfu_fire(u3_noun);
+    u3_noun u3wfu_firm(u3_noun);
+    u3_noun u3wfu_fish(u3_noun);
+    u3_noun u3wfu_fuse(u3_noun);
+    u3_noun u3wfu_heal(u3_noun);
+    u3_noun u3wfu_mint(u3_noun);
+    u3_noun u3wfu_mull(u3_noun);
+    u3_noun u3wfu_nest(u3_noun);
+    u3_noun u3wfu_park(u3_noun);
+    u3_noun u3wfu_peek(u3_noun);
+    u3_noun u3wfu_play(u3_noun);
+    u3_noun u3wfu_repo(u3_noun);
+    u3_noun u3wfu_rest(u3_noun);
+    u3_noun u3wfu_seek(u3_noun);
+    u3_noun u3wfu_seep(u3_noun);
+    u3_noun u3wfu_snub(u3_noun);
+    u3_noun u3wfu_tock(u3_noun);
+    u3_noun u3wfu_wrap(u3_noun);
diff --git a/j/1/add.c b/j/1/add.c
index 378716e6a5..b4ac434a41 100644
--- a/j/1/add.c
+++ b/j/1/add.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqa_add(u3_atom a,
+  u3qa_add(u3_atom a,
                    u3_atom b)
   {
     if ( _(u3a_is_cat(a)) && _(u3a_is_cat(b)) ) {
@@ -29,7 +29,7 @@
     }
   }
   u3_noun
-  u3_cwa_add(u3_noun cor)
+  u3wa_add(u3_noun cor)
   {
     u3_noun a, b;
 
@@ -39,14 +39,14 @@
     {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqa_add(a, b);
+      return u3qa_add(a, b);
     }
   }
 
   u3_noun
-  u3_cka_add(u3_noun a, u3_noun b)
+  u3ka_add(u3_noun a, u3_noun b)
   {
-    u3_noun c = u3_cqa_add(a, b);
+    u3_noun c = u3qa_add(a, b);
 
     u3z(a); u3z(b);
     return c;
diff --git a/j/1/dec.c b/j/1/dec.c
index 718b92b501..98b0fd2122 100644
--- a/j/1/dec.c
+++ b/j/1/dec.c
@@ -8,13 +8,13 @@
 /* functions
 */
   u3_noun
-  u3_cqa_inc(u3_atom a)
+  u3qa_inc(u3_atom a)
   {
     return u3i_vint(u3k(a));
   }
 
   u3_noun
-  u3_cqa_dec(u3_atom a)
+  u3qa_dec(u3_atom a)
   {
     if ( 0 == a ) {
       return u3m_error("decrement-underflow");
@@ -34,7 +34,7 @@
     }
   }
   u3_noun
-  u3_cwa_dec(u3_noun cor)
+  u3wa_dec(u3_noun cor)
   {
     u3_noun a;
 
@@ -43,6 +43,6 @@
     {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqa_dec(a);
+      return u3qa_dec(a);
     }
   }
diff --git a/j/1/div.c b/j/1/div.c
index 1aede7c179..dab2c6b773 100644
--- a/j/1/div.c
+++ b/j/1/div.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqa_div(u3_atom a,
+  u3qa_div(u3_atom a,
                    u3_atom b)
   {
     if ( 0 == b ) {
@@ -32,7 +32,7 @@
     }
   }
   u3_noun
-  u3_cwa_div(u3_noun cor)
+  u3wa_div(u3_noun cor)
   {
     u3_noun a, b;
 
@@ -42,6 +42,6 @@
     {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqa_div(a, b);
+      return u3qa_div(a, b);
     }
   }
diff --git a/j/1/gte.c b/j/1/gte.c
index 954775e2c1..7a1d73ee97 100644
--- a/j/1/gte.c
+++ b/j/1/gte.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqa_gte(u3_atom a, u3_atom b)
+  u3qa_gte(u3_atom a, u3_atom b)
   {
     if ( _(u3a_is_cat(a)) && _(u3a_is_cat(b)) ) {
       return __(a >= b);
@@ -29,7 +29,7 @@
     }
   }
   u3_noun
-  u3_cwa_gte(
+  u3wa_gte(
                   u3_noun cor)
   {
     u3_noun a, b;
@@ -40,6 +40,6 @@
     {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqa_gte(a, b);
+      return u3qa_gte(a, b);
     }
   }
diff --git a/j/1/gth.c b/j/1/gth.c
index 504501eaa2..b650974728 100644
--- a/j/1/gth.c
+++ b/j/1/gth.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqa_gth(u3_atom a,
+  u3qa_gth(u3_atom a,
                    u3_atom b)
   {
     if ( _(u3a_is_cat(a)) && _(u3a_is_cat(b)) ) {
@@ -30,7 +30,7 @@
     }
   }
   u3_noun
-  u3_cwa_gth(u3_noun cor)
+  u3wa_gth(u3_noun cor)
   {
     u3_noun a, b;
 
@@ -40,14 +40,14 @@
     {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqa_gth(a, b);
+      return u3qa_gth(a, b);
     }
   }
 
   u3_noun
-  u3_cka_gth(u3_noun a, u3_noun b)
+  u3ka_gth(u3_noun a, u3_noun b)
   {
-    u3_noun c = u3_cqa_gth(a, b);
+    u3_noun c = u3qa_gth(a, b);
 
     u3z(a); u3z(b);
     return c;
diff --git a/j/1/lte.c b/j/1/lte.c
index ec94a4ab0f..af98f88da7 100644
--- a/j/1/lte.c
+++ b/j/1/lte.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqa_lte(u3_atom a, u3_atom b)
+  u3qa_lte(u3_atom a, u3_atom b)
   {
     if ( _(u3a_is_cat(a)) && _(u3a_is_cat(b)) ) {
       return __(a <= b);
@@ -29,7 +29,7 @@
     }
   }
   u3_noun
-  u3_cwa_lte(u3_noun cor)
+  u3wa_lte(u3_noun cor)
   {
     u3_noun a, b;
 
@@ -39,13 +39,13 @@
     {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqa_lte(a, b);
+      return u3qa_lte(a, b);
     }
   }
   u3_noun
-  u3_cka_lte(u3_noun a, u3_noun b)
+  u3ka_lte(u3_noun a, u3_noun b)
   {
-    u3_noun c = u3_cqa_lte(a, b);
+    u3_noun c = u3qa_lte(a, b);
 
     u3z(a); u3z(b);
     return c;
diff --git a/j/1/lth.c b/j/1/lth.c
index 0ea8724b53..838965443e 100644
--- a/j/1/lth.c
+++ b/j/1/lth.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqa_lth(u3_atom a,
+  u3qa_lth(u3_atom a,
                    u3_atom b)
   {
     if ( _(u3a_is_cat(a)) && _(u3a_is_cat(b)) ) {
@@ -30,7 +30,7 @@
     }
   }
   u3_noun
-  u3_cwa_lth(u3_noun cor)
+  u3wa_lth(u3_noun cor)
   {
     u3_noun a, b;
 
@@ -40,6 +40,6 @@
     {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqa_lth(a, b);
+      return u3qa_lth(a, b);
     }
   }
diff --git a/j/1/mod.c b/j/1/mod.c
index f1574a48c8..a643a59bae 100644
--- a/j/1/mod.c
+++ b/j/1/mod.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqa_mod(
+  u3qa_mod(
                    u3_atom a,
                    u3_atom b)
   {
@@ -28,7 +28,7 @@
   }
 
   u3_noun
-  u3_cwa_mod(u3_noun cor)
+  u3wa_mod(u3_noun cor)
   {
     u3_noun a, b;
 
@@ -38,6 +38,6 @@
     {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqa_mod(a, b);
+      return u3qa_mod(a, b);
     }
   }
diff --git a/j/1/mul.c b/j/1/mul.c
index a174d722d3..8822d4ab48 100644
--- a/j/1/mul.c
+++ b/j/1/mul.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqa_mul(u3_atom a,
+  u3qa_mul(u3_atom a,
                    u3_atom b)
   {
     if ( _(u3a_is_cat(a)) && _(u3a_is_cat(b)) ) {
@@ -29,7 +29,7 @@
     }
   }
   u3_noun
-  u3_cwa_mul(u3_noun cor)
+  u3wa_mul(u3_noun cor)
   {
     u3_noun a, b;
 
@@ -39,13 +39,13 @@
     {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqa_mul(a, b);
+      return u3qa_mul(a, b);
     }
   }
   u3_noun
-  u3_cka_mul(u3_noun a, u3_noun b)
+  u3ka_mul(u3_noun a, u3_noun b)
   {
-    u3_noun c = u3_cqa_mul(a, b);
+    u3_noun c = u3qa_mul(a, b);
 
     u3z(a); u3z(b);
     return c;
diff --git a/j/1/sub.c b/j/1/sub.c
index 88994bb94f..07e428655a 100644
--- a/j/1/sub.c
+++ b/j/1/sub.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqa_sub(u3_atom a, u3_atom b)
+  u3qa_sub(u3_atom a, u3_atom b)
   {
     if ( _(u3a_is_cat(a)) && _(u3a_is_cat(b)) ) {
       if ( a < b ) {
@@ -36,7 +36,7 @@
   }
 
   u3_noun
-  u3_cwa_sub(u3_noun cor)
+  u3wa_sub(u3_noun cor)
   {
     u3_noun a, b;
 
@@ -46,14 +46,14 @@
     {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqa_sub(a, b);
+      return u3qa_sub(a, b);
     }
   }
 
   u3_noun
-  u3_cka_sub(u3_noun a, u3_noun b)
+  u3ka_sub(u3_noun a, u3_noun b)
   {
-    u3_noun c = u3_cqa_sub(a, b);
+    u3_noun c = u3qa_sub(a, b);
 
     u3z(a); u3z(b);
     return c;
diff --git a/j/2/bind.c b/j/2/bind.c
index c912467e63..add0417c5c 100644
--- a/j/2/bind.c
+++ b/j/2/bind.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqb_bind(
+  u3qb_bind(
                     u3_noun a,
                     u3_noun b)
   {
@@ -19,7 +19,7 @@
     }
   }
   u3_noun
-  u3_cwb_bind(
+  u3wb_bind(
                    u3_noun cor)
   {
     u3_noun a, b;
@@ -27,7 +27,7 @@
     if ( c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0) ) {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqb_bind(a, b);
+      return u3qb_bind(a, b);
     }
   }
 
diff --git a/j/2/clap.c b/j/2/clap.c
index 594fb4747d..742150547b 100644
--- a/j/2/clap.c
+++ b/j/2/clap.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqb_clap(u3_noun a,
+  u3qb_clap(u3_noun a,
                     u3_noun b,
                     u3_noun c)
   {
@@ -23,7 +23,7 @@
     }
   }
   u3_noun
-  u3_cwb_clap(u3_noun cor)
+  u3wb_clap(u3_noun cor)
   {
     u3_noun a, b, c;
 
@@ -32,6 +32,6 @@
                                u3v_sam_7, &c, 0) ) {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqb_clap(a, b, c);
+      return u3qb_clap(a, b, c);
     }
   }
diff --git a/j/2/drop.c b/j/2/drop.c
index 9a1ccc7aa8..2bdaae0bd4 100644
--- a/j/2/drop.c
+++ b/j/2/drop.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqb_drop(u3_noun a)
+  u3qb_drop(u3_noun a)
   {
     if ( 0 == a ) {
       return u3_nul;
@@ -18,14 +18,14 @@
     }
   }
   u3_noun
-  u3_cwb_drop(u3_noun cor)
+  u3wb_drop(u3_noun cor)
   {
     u3_noun a;
 
     if ( u3_none == (a = u3r_at(u3v_sam, cor)) ) {
       return u3_none;
     } else {
-      return u3_cqb_drop(a);
+      return u3qb_drop(a);
     }
   }
 
diff --git a/j/2/flop.c b/j/2/flop.c
index 22e8c808fa..4975141e49 100644
--- a/j/2/flop.c
+++ b/j/2/flop.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqb_flop(u3_noun a)
+  u3qb_flop(u3_noun a)
   {
     u3_noun b = 0;
 
@@ -28,20 +28,20 @@
     }
   }
   u3_noun
-  u3_cwb_flop(u3_noun cor)
+  u3wb_flop(u3_noun cor)
   {
     u3_noun a;
 
     if ( u3_none == (a = u3r_at(u3v_sam, cor)) ) {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqb_flop(a);
+      return u3qb_flop(a);
     }
   }
   u3_noun
-  u3_ckb_flop(u3_noun a)
+  u3kb_flop(u3_noun a)
   {
-    u3_noun b = u3_cqb_flop(a);
+    u3_noun b = u3qb_flop(a);
 
     u3z(a);
     return b;
diff --git a/j/2/lent.c b/j/2/lent.c
index d01dee868a..b84c7d897d 100644
--- a/j/2/lent.c
+++ b/j/2/lent.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqb_lent(u3_noun a)
+  u3qb_lent(u3_noun a)
   {
     u3_noun len = 0;
 
@@ -27,20 +27,20 @@
     }
   }
   u3_noun
-  u3_cwb_lent(u3_noun cor)
+  u3wb_lent(u3_noun cor)
   {
     u3_noun a;
 
     if ( u3_none == (a = u3r_at(u3v_sam, cor)) ) {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqb_lent(a);
+      return u3qb_lent(a);
     }
   }
   u3_noun
-  u3_ckb_lent(u3_noun a)
+  u3kb_lent(u3_noun a)
   {
-    u3_noun b = u3_cqb_lent(a);
+    u3_noun b = u3qb_lent(a);
 
     u3z(a);
     return b;
diff --git a/j/2/levy.c b/j/2/levy.c
index 45ce843e45..2b2978fe73 100644
--- a/j/2/levy.c
+++ b/j/2/levy.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqb_levy(
+  u3qb_levy(
                     u3_noun a,
                     u3_noun b)
   {
@@ -21,7 +21,7 @@
         return u3m_bail(c3__exit);
       }
       else switch ( (loz = u3n_slam_on(u3k(b), u3k(u3h(a)))) ) {
-        case c3y:  return u3_cqb_levy(u3t(a), b);
+        case c3y:  return u3qb_levy(u3t(a), b);
         case c3n:   return c3n;
         default:      u3z(loz);
                       return u3m_bail(c3__exit);
@@ -29,7 +29,7 @@
     }
   }
   u3_noun
-  u3_cwb_levy(
+  u3wb_levy(
                    u3_noun cor)
   {
     u3_noun a, b;
@@ -37,6 +37,6 @@
     if ( c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0) ) {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqb_levy(a, b);
+      return u3qb_levy(a, b);
     }
   }
diff --git a/j/2/lien.c b/j/2/lien.c
index 37b7f6bf3d..3aa4ffca08 100644
--- a/j/2/lien.c
+++ b/j/2/lien.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqb_lien(u3_noun a,
+  u3qb_lien(u3_noun a,
                     u3_noun b)
   {
     if ( 0 == a ) {
@@ -21,20 +21,20 @@
       }
       else switch ( (loz = u3n_slam_on(u3k(b), u3k(u3h(a)))) ) {
         case c3y:  return c3y;
-        case c3n:   return u3_cqb_lien(u3t(a), b);
+        case c3n:   return u3qb_lien(u3t(a), b);
         default:      u3z(loz);
                       return u3m_bail(c3__exit);
       }
     }
   }
   u3_noun
-  u3_cwb_lien(u3_noun cor)
+  u3wb_lien(u3_noun cor)
   {
     u3_noun a, b;
 
     if ( c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0) ) {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqb_lien(a, b);
+      return u3qb_lien(a, b);
     }
   }
diff --git a/j/2/need.c b/j/2/need.c
index 26b9e6e146..7549dcc20c 100644
--- a/j/2/need.c
+++ b/j/2/need.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqb_need(
+  u3qb_need(
                     u3_noun a)
   {
     if ( 0 == a ) {
@@ -19,7 +19,7 @@
     }
   }
   u3_noun
-  u3_cwb_need(
+  u3wb_need(
                    u3_noun cor)
   {
     u3_noun a;
@@ -27,7 +27,7 @@
     if ( u3_none == (a = u3r_at(u3v_sam, cor)) ) {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqb_need(a);
+      return u3qb_need(a);
     }
   }
 
diff --git a/j/2/reel.c b/j/2/reel.c
index 6793d681d7..77d20f25ee 100644
--- a/j/2/reel.c
+++ b/j/2/reel.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqb_reel(
+  u3qb_reel(
                     u3_noun a,
                     u3_noun b)
   {
@@ -20,13 +20,13 @@
     }
     else {
       u3_noun gim = u3k(u3h(a));
-      u3_noun hur = u3_cqb_reel(u3t(a), b);
+      u3_noun hur = u3qb_reel(u3t(a), b);
 
       return u3n_slam_on(u3k(b), u3nc(gim, hur));
     }
   }
   u3_noun
-  u3_cwb_reel(
+  u3wb_reel(
                    u3_noun cor)
   {
     u3_noun a, b;
@@ -34,6 +34,6 @@
     if ( c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0) ) {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqb_reel(a, b);
+      return u3qb_reel(a, b);
     }
   }
diff --git a/j/2/roll.c b/j/2/roll.c
index 6f33d20942..4263fd74c6 100644
--- a/j/2/roll.c
+++ b/j/2/roll.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqb_roll(u3_noun a,
+  u3qb_roll(u3_noun a,
                     u3_noun b)
   {
     if ( 0 == a ) {
@@ -26,7 +26,7 @@
       if ( u3_none == vel ) {
         return u3m_bail(c3__exit);
       } else {
-        u3_noun hox = u3_cqb_roll(u3t(a), vel);
+        u3_noun hox = u3qb_roll(u3t(a), vel);
 
         u3z(vel);
         return hox;
@@ -34,14 +34,14 @@
     }
   }
   u3_noun
-  u3_cwb_roll(u3_noun cor)
+  u3wb_roll(u3_noun cor)
   {
     u3_noun a, b;
 
     if ( c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0) ) {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqb_roll(a, b);
+      return u3qb_roll(a, b);
     }
   }
 
diff --git a/j/2/scag.c b/j/2/scag.c
index 48af81c621..7b41a94d37 100644
--- a/j/2/scag.c
+++ b/j/2/scag.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqb_scag(
+  u3qb_scag(
                     u3_atom a,
                     u3_noun b)
   {
@@ -31,12 +31,12 @@
 	i_w--;
       }
 
-      return u3_ckb_flop(acc);
+      return u3kb_flop(acc);
     }
   }
 
   u3_noun
-  u3_cwb_scag(
+  u3wb_scag(
                    u3_noun cor)
   {
     u3_noun a, b;
@@ -46,7 +46,7 @@
     {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqb_scag(a, b);
+      return u3qb_scag(a, b);
     }
   }
 
diff --git a/j/2/skim.c b/j/2/skim.c
index dcdbf7aaea..f111a21414 100644
--- a/j/2/skim.c
+++ b/j/2/skim.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqb_skim(
+  u3qb_skim(
                     u3_noun a,
                     u3_noun b)
   {
@@ -19,7 +19,7 @@
       return u3m_bail(c3__exit);
     } else {
       u3_noun hoz = u3n_slam_on(u3k(b), u3k(u3h(a)));
-      u3_noun vyr = u3_cqb_skim(u3t(a), b);
+      u3_noun vyr = u3qb_skim(u3t(a), b);
 
       switch ( hoz ) {
         case c3y:  return u3nc(u3k(u3h(a)), vyr);
@@ -31,7 +31,7 @@
     }
   }
   u3_noun
-  u3_cwb_skim(
+  u3wb_skim(
                    u3_noun cor)
   {
     u3_noun a, b;
@@ -39,7 +39,7 @@
     if ( c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0) ) {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqb_skim(a, b);
+      return u3qb_skim(a, b);
     }
   }
 
diff --git a/j/2/skip.c b/j/2/skip.c
index ab31f91ae7..4ff705fa5f 100644
--- a/j/2/skip.c
+++ b/j/2/skip.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqb_skip(
+  u3qb_skip(
                     u3_noun a,
                     u3_noun b)
   {
@@ -19,7 +19,7 @@
       return u3_none;
     } else {
       u3_noun hoz = u3n_slam_on(u3k(b), u3k(u3h(a)));
-      u3_noun vyr = u3_cqb_skip(u3t(a), b);
+      u3_noun vyr = u3qb_skip(u3t(a), b);
 
       switch ( hoz ) {
         case c3y:  return vyr;
@@ -31,7 +31,7 @@
     }
   }
   u3_noun
-  u3_cwb_skip(
+  u3wb_skip(
                    u3_noun cor)
   {
     u3_noun a, b;
@@ -39,7 +39,7 @@
     if ( c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0) ) {
       return u3_none;
     } else {
-      return u3_cqb_skip(a, b);
+      return u3qb_skip(a, b);
     }
   }
 
diff --git a/j/2/slag.c b/j/2/slag.c
index 841e905d43..f8cf92aa80 100644
--- a/j/2/slag.c
+++ b/j/2/slag.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqb_slag(u3_atom a, u3_noun b)
+  u3qb_slag(u3_atom a, u3_noun b)
   {
     if ( !_(u3a_is_cat(a)) ) {
       return u3m_bail(c3__fail);
@@ -27,7 +27,7 @@
     }
   }
   u3_noun
-  u3_cwb_slag(u3_noun cor)
+  u3wb_slag(u3_noun cor)
   {
     u3_noun a, b;
 
@@ -36,6 +36,6 @@
     {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqb_slag(a, b);
+      return u3qb_slag(a, b);
     }
   }
diff --git a/j/2/snag.c b/j/2/snag.c
index 174c904e60..0ae0485506 100644
--- a/j/2/snag.c
+++ b/j/2/snag.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqb_snag(u3_atom a,
+  u3qb_snag(u3_atom a,
                     u3_noun b)
   {
     if ( !_(u3a_is_cat(a)) ) {
@@ -31,7 +31,7 @@
     }
   }
   u3_noun
-  u3_cwb_snag(u3_noun cor)
+  u3wb_snag(u3_noun cor)
   {
     u3_noun a, b;
 
@@ -40,6 +40,6 @@
     {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqb_snag(a, b);
+      return u3qb_snag(a, b);
     }
   }
diff --git a/j/2/sort.c b/j/2/sort.c
index a65d118a0a..cd2a8148c1 100644
--- a/j/2/sort.c
+++ b/j/2/sort.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqb_sort(
+  u3qb_sort(
                     u3_noun a,
                     u3_noun b)
   {
@@ -17,7 +17,7 @@
     return u3m_bail(c3__fail);
   }
   u3_noun
-  u3_cwb_sort(
+  u3wb_sort(
                    u3_noun cor)
   {
     u3_noun a, b;
@@ -25,7 +25,7 @@
     if ( c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0) ) {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqb_sort(a, b);
+      return u3qb_sort(a, b);
     }
   }
 
diff --git a/j/2/turn.c b/j/2/turn.c
index a2693974d2..dfc0638ef2 100644
--- a/j/2/turn.c
+++ b/j/2/turn.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqb_turn(u3_noun a, u3_noun b)
+  u3qb_turn(u3_noun a, u3_noun b)
   {
     if ( 0 == a ) {
       return a;
@@ -18,20 +18,20 @@
     }
     else {
       u3_noun one = u3n_slam_on(u3k(b), u3k(u3h(a)));
-      u3_noun two = u3_cqb_turn(u3t(a), b);
+      u3_noun two = u3qb_turn(u3t(a), b);
 
       return u3nc(one, two);
     }
   }
   u3_noun
-  u3_cwb_turn(u3_noun cor)
+  u3wb_turn(u3_noun cor)
   {
     u3_noun a, b;
 
     if ( c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0) ) {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqb_turn(a, b);
+      return u3qb_turn(a, b);
     }
   }
 
diff --git a/j/2/weld.c b/j/2/weld.c
index d1fba3047a..d414d06c21 100644
--- a/j/2/weld.c
+++ b/j/2/weld.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqb_weld(u3_noun a,
+  u3qb_weld(u3_noun a,
                     u3_noun b)
   {
     if ( 0 == a ) {
@@ -18,24 +18,24 @@
       return u3m_bail(c3__exit);
     }
     else {
-      return u3nc(u3k(u3h(a)), u3_cqb_weld(u3t(a), b));
+      return u3nc(u3k(u3h(a)), u3qb_weld(u3t(a), b));
     }
   }
   u3_noun
-  u3_cwb_weld(u3_noun cor)
+  u3wb_weld(u3_noun cor)
   {
     u3_noun a, b;
 
     if ( c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0) ) {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqb_weld(a, b);
+      return u3qb_weld(a, b);
     }
   }
   u3_noun
-  u3_ckb_weld(u3_noun a, u3_noun b)
+  u3kb_weld(u3_noun a, u3_noun b)
   {
-    u3_noun c = u3_cqb_weld(a, b);
+    u3_noun c = u3qb_weld(a, b);
 
     u3z(a); u3z(b);
     return c;
diff --git a/j/3/bex.c b/j/3/bex.c
index de93a6c3cc..be7c9e7892 100644
--- a/j/3/bex.c
+++ b/j/3/bex.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqc_bex(u3_atom a)
+  u3qc_bex(u3_atom a)
   {
     mpz_t a_mp;
 
@@ -23,7 +23,7 @@
     }
   }
   u3_noun
-  u3_cwc_bex(
+  u3wc_bex(
                   u3_noun cor)
   {
     u3_noun a;
@@ -33,7 +33,7 @@
     {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqc_bex(a);
+      return u3qc_bex(a);
     }
   }
 
diff --git a/j/3/can.c b/j/3/can.c
index 0156770cf6..4047431839 100644
--- a/j/3/can.c
+++ b/j/3/can.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqc_can(u3_atom a,
+  u3qc_can(u3_atom a,
                    u3_noun b)
   {
     if ( !_(u3a_is_cat(a)) || (a >= 32) ) {
@@ -70,7 +70,7 @@
     }
   }
   u3_noun
-  u3_cwc_can(u3_noun cor)
+  u3wc_can(u3_noun cor)
   {
     u3_noun a, b;
 
@@ -79,7 +79,7 @@
     {
       return u3m_bail(c3__fail);
     } else {
-      return u3_cqc_can(a, b);
+      return u3qc_can(a, b);
     }
   }
 
diff --git a/j/3/cap.c b/j/3/cap.c
index 97519667a1..77def90e03 100644
--- a/j/3/cap.c
+++ b/j/3/cap.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqc_cap(
+  u3qc_cap(
                    u3_atom a)
   {
     c3_w met_w = u3r_met(0, a);
@@ -23,7 +23,7 @@
     }
   }
   u3_noun
-  u3_cwc_cap(
+  u3wc_cap(
                   u3_noun cor)
   {
     u3_noun a;
@@ -33,7 +33,7 @@
     {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqc_cap(a);
+      return u3qc_cap(a);
     }
   }
 
diff --git a/j/3/cat.c b/j/3/cat.c
index 9bca4a0ae7..2087d2fd6f 100644
--- a/j/3/cat.c
+++ b/j/3/cat.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqc_cat(u3_atom a,
+  u3qc_cat(u3_atom a,
                    u3_atom b,
                    u3_atom c)
   {
@@ -40,7 +40,7 @@
   }
 
   u3_noun
-  u3_cwc_cat(u3_noun cor)
+  u3wc_cat(u3_noun cor)
   {
     u3_noun a, b, c;
 
@@ -53,7 +53,7 @@
     {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqc_cat(a, b, c);
+      return u3qc_cat(a, b, c);
     }
   }
 
diff --git a/j/3/con.c b/j/3/con.c
index 5fce4da7f6..c533cc0a9d 100644
--- a/j/3/con.c
+++ b/j/3/con.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqc_con(u3_atom a,
+  u3qc_con(u3_atom a,
                    u3_atom b)
   {
     c3_w lna_w = u3r_met(5, a);
@@ -37,7 +37,7 @@
     }
   }
   u3_noun
-  u3_cwc_con(u3_noun cor)
+  u3wc_con(u3_noun cor)
   {
     u3_noun a, b;
 
@@ -47,6 +47,6 @@
     {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqc_con(a, b);
+      return u3qc_con(a, b);
     }
   }
diff --git a/j/3/cut.c b/j/3/cut.c
index 1e61e7ac84..f869704a3f 100644
--- a/j/3/cut.c
+++ b/j/3/cut.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqc_cut(
+  u3qc_cut(
                    u3_atom a,
                    u3_atom b,
                    u3_atom c,
@@ -52,7 +52,7 @@
     }
   }
   u3_noun
-  u3_cwc_cut(
+  u3wc_cut(
                   u3_noun cor)
   {
     u3_noun a, b, c, d;
@@ -68,7 +68,7 @@
     {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqc_cut(a, b, c, d);
+      return u3qc_cut(a, b, c, d);
     }
   }
 
diff --git a/j/3/dis.c b/j/3/dis.c
index 2dcad10618..c58bcbd10f 100644
--- a/j/3/dis.c
+++ b/j/3/dis.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqc_dis(u3_atom a,
+  u3qc_dis(u3_atom a,
                    u3_atom b)
   {
     c3_w lna_w = u3r_met(5, a);
@@ -36,7 +36,7 @@
     }
   }
   u3_noun
-  u3_cwc_dis(u3_noun cor)
+  u3wc_dis(u3_noun cor)
   {
     u3_noun a, b;
 
@@ -46,7 +46,7 @@
     {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqc_dis(a, b);
+      return u3qc_dis(a, b);
     }
   }
 
diff --git a/j/3/dor.c b/j/3/dor.c
index f71083bbf5..0d7b872813 100644
--- a/j/3/dor.c
+++ b/j/3/dor.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqc_dor(
+  u3qc_dor(
                    u3_atom a,
                    u3_atom b)
   {
@@ -18,7 +18,7 @@
     else {
       if ( c3y == u3ud(a) ) {
         if ( c3y == u3ud(b) ) {
-          return u3_cqa_lth(a, b);
+          return u3qa_lth(a, b);
         }
         else {
           return c3y;
@@ -30,15 +30,15 @@
         }
         else {
           if ( c3y == u3r_sing(u3h(a), u3h(b)) ) {
-            return u3_cqc_dor(u3t(a), u3t(b));
+            return u3qc_dor(u3t(a), u3t(b));
           }
-          else return u3_cqc_dor(u3h(a), u3h(b));
+          else return u3qc_dor(u3h(a), u3h(b));
         }
       }
     }
   }
   u3_noun
-  u3_cwc_dor(
+  u3wc_dor(
                   u3_noun cor)
   {
     u3_noun a, b;
@@ -46,7 +46,7 @@
     if ( c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0) ) {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqc_dor(a, b);
+      return u3qc_dor(a, b);
     }
   }
 
diff --git a/j/3/end.c b/j/3/end.c
index a49d2a9ec5..043fe98857 100644
--- a/j/3/end.c
+++ b/j/3/end.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqc_end(
+  u3qc_end(
                    u3_atom a,
                    u3_atom b,
                    u3_atom c)
@@ -43,7 +43,7 @@
     }
   }
   u3_noun
-  u3_cwc_end(
+  u3wc_end(
                   u3_noun cor)
   {
     u3_noun a, b, c;
@@ -57,7 +57,7 @@
     {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqc_end(a, b, c);
+      return u3qc_end(a, b, c);
     }
   }
 
diff --git a/j/3/gor.c b/j/3/gor.c
index 19367da2d0..5a12a75cdc 100644
--- a/j/3/gor.c
+++ b/j/3/gor.c
@@ -8,26 +8,26 @@
 /* functions
 */
   u3_noun
-  u3_cqc_gor(u3_noun a,
+  u3qc_gor(u3_noun a,
                    u3_noun b)
   {
     c3_w c_w = u3r_mug(a);
     c3_w d_w = u3r_mug(b);
 
     if ( c_w == d_w ) {
-      return u3_cqc_dor(a, b);
+      return u3qc_dor(a, b);
     }
     else return (c_w < d_w) ? c3y : c3n;
   }
   u3_noun
-  u3_cwc_gor(u3_noun cor)
+  u3wc_gor(u3_noun cor)
   {
     u3_noun a, b;
 
     if ( (c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0)) ) {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqc_gor(a, b);
+      return u3qc_gor(a, b);
     }
   }
 
diff --git a/j/3/hor.c b/j/3/hor.c
index 19faa48403..6f40b864e5 100644
--- a/j/3/hor.c
+++ b/j/3/hor.c
@@ -8,12 +8,12 @@
 /* functions
 */
   u3_noun
-  u3_cqc_hor(u3_noun a,
+  u3qc_hor(u3_noun a,
                    u3_noun b)
   {
     if ( c3y == u3ud(a) ) {
       if ( c3y == u3ud(b) ) {
-        return u3_cqc_gor(a, b);
+        return u3qc_gor(a, b);
       } else {
         return c3y;
       }
@@ -26,22 +26,22 @@
         u3_noun h_b = u3h(b);
 
         if ( c3y == u3r_sing(h_a, h_b) ) {
-          return u3_cqc_gor(u3t(a), u3t(b));
+          return u3qc_gor(u3t(a), u3t(b));
         } else {
-          return u3_cqc_gor(h_a, h_b);
+          return u3qc_gor(h_a, h_b);
         }
       }
     }
   }
   u3_noun
-  u3_cwc_hor(u3_noun cor)
+  u3wc_hor(u3_noun cor)
   {
     u3_noun a, b;
 
     if ( (c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0)) ) {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqc_hor(a, b);
+      return u3qc_hor(a, b);
     }
   }
 
diff --git a/j/3/lsh.c b/j/3/lsh.c
index 7aa47a8788..cd03306daa 100644
--- a/j/3/lsh.c
+++ b/j/3/lsh.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqc_lsh(u3_atom a, u3_atom b, u3_atom c)
+  u3qc_lsh(u3_atom a, u3_atom b, u3_atom c)
   {
     if ( !_(u3a_is_cat(a)) || (a >= 32) ) {
       return u3m_bail(c3__fail);
@@ -41,7 +41,7 @@
     }
   }
   u3_noun
-  u3_cwc_lsh(u3_noun cor)
+  u3wc_lsh(u3_noun cor)
   {
     u3_noun a, b, c;
 
@@ -54,13 +54,13 @@
     {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqc_lsh(a, b, c);
+      return u3qc_lsh(a, b, c);
     }
   }
   u3_noun
-  u3_ckc_lsh(u3_noun a, u3_noun b, u3_noun c)
+  u3kc_lsh(u3_noun a, u3_noun b, u3_noun c)
   {
-    u3_noun d = u3_cqc_lsh(a, b, c);
+    u3_noun d = u3qc_lsh(a, b, c);
 
     u3z(a); u3z(b); u3z(c);
     return d;
diff --git a/j/3/mas.c b/j/3/mas.c
index bee8483df3..7577c705ff 100644
--- a/j/3/mas.c
+++ b/j/3/mas.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqc_mas(u3_atom a)
+  u3qc_mas(u3_atom a)
   {
     c3_w b_w;
     u3_atom c, d, e, f;
@@ -18,10 +18,10 @@
       return u3m_bail(c3__exit);
     }
     else {
-      c = u3_cqc_bex((b_w - 1));
-      d = u3_cqc_bex((b_w - 2));
-      e = u3_cqa_sub(a, c);
-      f = u3_cqc_con(e, d);
+      c = u3qc_bex((b_w - 1));
+      d = u3qc_bex((b_w - 2));
+      e = u3qa_sub(a, c);
+      f = u3qc_con(e, d);
 
       u3z(c);
       u3z(d);
@@ -31,7 +31,7 @@
     }
   }
   u3_noun
-  u3_cwc_mas(u3_noun cor)
+  u3wc_mas(u3_noun cor)
   {
     u3_noun a;
 
@@ -40,7 +40,7 @@
     {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqc_mas(a);
+      return u3qc_mas(a);
     }
   }
 
diff --git a/j/3/met.c b/j/3/met.c
index 8bc332bf74..da423e4259 100644
--- a/j/3/met.c
+++ b/j/3/met.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqc_met(
+  u3qc_met(
                    u3_atom a,
                    u3_atom b)
   {
@@ -27,7 +27,7 @@
     }
   }
   u3_noun
-  u3_cwc_met(
+  u3wc_met(
                   u3_noun cor)
   {
     u3_noun a, b;
@@ -38,7 +38,7 @@
     {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqc_met(a, b);
+      return u3qc_met(a, b);
     }
   }
 
diff --git a/j/3/mix.c b/j/3/mix.c
index b03f44a2d9..f7dce1984d 100644
--- a/j/3/mix.c
+++ b/j/3/mix.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqc_mix(u3_atom a,
+  u3qc_mix(u3_atom a,
                    u3_atom b)
   {
     c3_w lna_w = u3r_met(5, a);
@@ -36,7 +36,7 @@
     }
   }
   u3_noun
-  u3_cwc_mix(u3_noun cor)
+  u3wc_mix(u3_noun cor)
   {
     u3_noun a, b;
 
@@ -46,7 +46,7 @@
     {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqc_mix(a, b);
+      return u3qc_mix(a, b);
     }
   }
 
diff --git a/j/3/mug.c b/j/3/mug.c
index 2d2b296683..2fa63e8dbf 100644
--- a/j/3/mug.c
+++ b/j/3/mug.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cwc_mug(u3_noun cor)
+  u3wc_mug(u3_noun cor)
   {
     u3_noun sam;
 
diff --git a/j/3/peg.c b/j/3/peg.c
index fe551ba6e9..0117cba6ea 100644
--- a/j/3/peg.c
+++ b/j/3/peg.c
@@ -8,18 +8,18 @@
 /* functions
 */
   u3_noun
-  u3_cqc_peg(
+  u3qc_peg(
                    u3_atom a,
                    u3_atom b)
   {
     u3_atom c, d, e, f, g, h;
 
     c = u3r_met(0, b);
-    d = u3_cqa_dec(c);
-    e = u3_cqc_lsh(0, d, 1);
-    f = u3_cqa_sub(b, e);
-    g = u3_cqc_lsh(0, d, a);
-    h = u3_cqa_add(f, g);
+    d = u3qa_dec(c);
+    e = u3qc_lsh(0, d, 1);
+    f = u3qa_sub(b, e);
+    g = u3qc_lsh(0, d, a);
+    h = u3qa_add(f, g);
 
     u3z(c);
     u3z(d);
@@ -30,7 +30,7 @@
     return h;
   }
   u3_noun
-  u3_cwc_peg(
+  u3wc_peg(
                   u3_noun cor)
   {
     u3_noun a, b;
@@ -43,7 +43,7 @@
     {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqc_peg(a, b);
+      return u3qc_peg(a, b);
     }
   }
 
diff --git a/j/3/po.c b/j/3/po.c
index 97c47db7bc..35a00ebc7a 100644
--- a/j/3/po.c
+++ b/j/3/po.c
@@ -33,7 +33,7 @@
   }
 
   u3_noun
-  u3_cwcp_ins(
+  u3wcp_ins(
                       u3_noun cor)
   {
     u3_noun x, a, buf;
@@ -49,7 +49,7 @@
     }
   }
   u3_noun
-  u3_cwcp_ind(
+  u3wcp_ind(
                       u3_noun cor)
   {
     u3_noun x, a, buf;
@@ -66,7 +66,7 @@
   }
 
   u3_noun
-  u3_cwcp_tos(
+  u3wcp_tos(
                       u3_noun cor)
   {
     u3_noun x, a, buf;
@@ -87,7 +87,7 @@
     }
   }
   u3_noun
-  u3_cwcp_tod(
+  u3wcp_tod(
                       u3_noun cor)
   {
     u3_noun x, a, buf;
diff --git a/j/3/rap.c b/j/3/rap.c
index 4309322e76..b3f9d5ba5a 100644
--- a/j/3/rap.c
+++ b/j/3/rap.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqc_rap(u3_atom a,
+  u3qc_rap(u3_atom a,
                    u3_noun b)
   {
     if ( !_(u3a_is_cat(a)) || (a >= 32) ) {
@@ -71,7 +71,7 @@
     }
   }
   u3_noun
-  u3_cwc_rap(u3_noun cor)
+  u3wc_rap(u3_noun cor)
   {
     u3_noun a, b;
 
@@ -82,7 +82,7 @@
     } else {
       u3_noun pro;
  
-      pro = u3_cqc_rap(a, b);
+      pro = u3qc_rap(a, b);
       return pro;
     }
   }
diff --git a/j/3/rip.c b/j/3/rip.c
index 7a43f5b363..eb24339b8f 100644
--- a/j/3/rip.c
+++ b/j/3/rip.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqc_rip(u3_atom a,
+  u3qc_rip(u3_atom a,
                    u3_atom b)
   {
     if ( !_(u3a_is_cat(a)) || (a >= 32) ) {
@@ -69,7 +69,7 @@
     }
   }
   u3_noun
-  u3_cwc_rip(u3_noun cor)
+  u3wc_rip(u3_noun cor)
   {
     u3_noun a, b;
 
@@ -79,6 +79,6 @@
     {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqc_rip(a, b);
+      return u3qc_rip(a, b);
     }
   }
diff --git a/j/3/rsh.c b/j/3/rsh.c
index c650ddec10..65e60ee0f1 100644
--- a/j/3/rsh.c
+++ b/j/3/rsh.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqc_rsh(
+  u3qc_rsh(
                    u3_atom a,
                    u3_atom b,
                    u3_atom c)
@@ -41,7 +41,7 @@
     }
   }
   u3_noun
-  u3_cwc_rsh(
+  u3wc_rsh(
                   u3_noun cor)
   {
     u3_noun a, b, c;
@@ -55,13 +55,13 @@
     {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqc_rsh(a, b, c);
+      return u3qc_rsh(a, b, c);
     }
   }
   u3_noun
-  u3_ckc_rsh(u3_noun a, u3_noun b, u3_noun c)
+  u3kc_rsh(u3_noun a, u3_noun b, u3_noun c)
   {
-    u3_noun d = u3_cqc_rsh(a, b, c);
+    u3_noun d = u3qc_rsh(a, b, c);
 
     u3z(a); u3z(b); u3z(c);
     return d;
diff --git a/j/3/vor.c b/j/3/vor.c
index 5b4cfdb49e..73a48a7ca7 100644
--- a/j/3/vor.c
+++ b/j/3/vor.c
@@ -8,25 +8,25 @@
 /* functions
 */
   u3_noun
-  u3_cqc_vor(u3_atom a,
+  u3qc_vor(u3_atom a,
                    u3_atom b)
   {
     c3_w c_w = u3r_mug(u3r_mug(a));
     c3_w d_w = u3r_mug(u3r_mug(b));
 
     if ( c_w == d_w ) {
-      return u3_cqc_dor(a, b);
+      return u3qc_dor(a, b);
     }
     else return (c_w < d_w) ? c3y : c3n;
   }
   u3_noun
-  u3_cwc_vor(u3_noun cor)
+  u3wc_vor(u3_noun cor)
   {
     u3_noun a, b;
 
     if ( (c3n == u3r_mean(cor, u3v_sam_2, &a, u3v_sam_3, &b, 0)) ) {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqc_vor(a, b);
+      return u3qc_vor(a, b);
     }
   }
diff --git a/j/4/by_gas.c b/j/4/by_gas.c
index c34a17420f..0b9fb5352e 100644
--- a/j/4/by_gas.c
+++ b/j/4/by_gas.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqdb_gas(
+  u3qdb_gas(
                        u3_noun a,
                        u3_noun b)
   {
@@ -29,10 +29,10 @@
           u3_noun qi_b = u3t(i_b);
           u3_noun c;
 
-          if ( u3_none == (c = u3_cqdb_put(a, pi_b, qi_b)) ) {
+          if ( u3_none == (c = u3qdb_put(a, pi_b, qi_b)) ) {
             return u3m_bail(c3__exit);
           } else {
-            u3_noun d = u3_cqdb_gas(c, t_b);
+            u3_noun d = u3qdb_gas(c, t_b);
 
             u3z(c);
             return d;
@@ -42,7 +42,7 @@
     }
   }
   u3_noun
-  u3_cwdb_gas(
+  u3wdb_gas(
                       u3_noun cor)
   {
     u3_noun a, b;
@@ -50,13 +50,13 @@
     if ( c3n == u3r_mean(cor, u3v_sam, &b, u3v_con_sam, &a, 0) ) {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqdb_gas(a, b);
+      return u3qdb_gas(a, b);
     }
   }
   u3_noun
-  u3_ckdb_gas(u3_noun a, u3_noun b)
+  u3kdb_gas(u3_noun a, u3_noun b)
   {
-    u3_weak c = u3_cqdb_gas(a, b);
+    u3_weak c = u3qdb_gas(a, b);
 
     u3z(a); u3z(b);
     if ( u3_none == c ) {
diff --git a/j/4/by_get.c b/j/4/by_get.c
index 323000e433..cd0adf06dd 100644
--- a/j/4/by_get.c
+++ b/j/4/by_get.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqdb_get(u3_noun a, u3_noun b)
+  u3qdb_get(u3_noun a, u3_noun b)
   {
     if ( u3_nul == a ) {
       return u3_nul;
@@ -27,16 +27,16 @@
           return u3nc(u3_nul, u3k(qn_a));
         }
         else {
-          if ( c3y == u3_cqc_gor(b, pn_a) ) {
-            return u3_cqdb_get(l_a, b);
+          if ( c3y == u3qc_gor(b, pn_a) ) {
+            return u3qdb_get(l_a, b);
           }
-          else return u3_cqdb_get(r_a, b);
+          else return u3qdb_get(r_a, b);
         }
       }
     }
   }
   u3_noun
-  u3_cwdb_get(
+  u3wdb_get(
                       u3_noun cor)
   {
     u3_noun a, b;
@@ -44,13 +44,13 @@
     if ( c3n == u3r_mean(cor, u3v_sam, &b, u3v_con_sam, &a, 0) ) {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqdb_get(a, b);
+      return u3qdb_get(a, b);
     }
   }
   u3_weak
-  u3_ckdb_get(u3_noun a, u3_noun b)
+  u3kdb_get(u3_noun a, u3_noun b)
   {
-    u3_noun c = u3_cqdb_get(a, b);
+    u3_noun c = u3qdb_get(a, b);
 
     u3z(a); u3z(b);
     if ( c3n == u3r_du(c) ) {
@@ -64,9 +64,9 @@
     }
   }
   u3_noun
-  u3_ckdb_got(u3_noun a, u3_noun b)
+  u3kdb_got(u3_noun a, u3_noun b)
   {
-    u3_weak c = u3_ckdb_get(a, b);
+    u3_weak c = u3kdb_get(a, b);
 
     if ( u3_none == c ) {
       return u3m_bail(c3__exit);
diff --git a/j/4/by_has.c b/j/4/by_has.c
index 8de579ee00..0a77456a52 100644
--- a/j/4/by_has.c
+++ b/j/4/by_has.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqdb_has(
+  u3qdb_has(
                        u3_noun a,
                        u3_noun b)
   {
@@ -29,16 +29,16 @@
           return c3y;
         }
         else {
-          if ( c3y == u3_cqc_gor(b, pn_a) ) {
-            return u3_cqdb_has(l_a, b);
+          if ( c3y == u3qc_gor(b, pn_a) ) {
+            return u3qdb_has(l_a, b);
           }
-          else return u3_cqdb_has(r_a, b);
+          else return u3qdb_has(r_a, b);
         }
       }
     }
   }
   u3_noun
-  u3_cwdb_has(
+  u3wdb_has(
                       u3_noun cor)
   {
     u3_noun a, b;
@@ -46,13 +46,13 @@
     if ( c3n == u3r_mean(cor, u3v_sam, &b, u3v_con_sam, &a, 0) ) {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqdb_has(a, b);
+      return u3qdb_has(a, b);
     }
   }
   u3_noun
-  u3_ckdb_has(u3_noun a, u3_noun b)
+  u3kdb_has(u3_noun a, u3_noun b)
   {
-    u3_weak c = u3_cqdb_has(a, b);
+    u3_weak c = u3qdb_has(a, b);
 
     u3z(a); u3z(b);
     if ( u3_none == c ) {
diff --git a/j/4/by_int.c b/j/4/by_int.c
index af0adf8c2c..bc115dfc96 100644
--- a/j/4/by_int.c
+++ b/j/4/by_int.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqdb_int(
+  u3qdb_int(
                        u3_noun a,
                        u3_noun b)
   {
@@ -40,37 +40,37 @@
       else if ( c3n == u3r_cell(n_b, &p_n_b, &q_n_b) ) {
         return u3m_bail(c3__exit);
       }
-      else if ( c3y == u3_cqc_vor(p_n_a, p_n_b) ) {
+      else if ( c3y == u3qc_vor(p_n_a, p_n_b) ) {
         if ( c3y == u3r_sing(p_n_a, p_n_b) ) {
           return u3nt(
 
             u3k(n_b),
-            u3_cqdb_int(u3k(l_a), u3k(l_b)),
-            u3_cqdb_int(u3k(r_a), u3k(r_b)));
+            u3qdb_int(u3k(l_a), u3k(l_b)),
+            u3qdb_int(u3k(r_a), u3k(r_b)));
         }
-        else if ( c3y == u3_cqc_hor(p_n_b, p_n_a) ) {
-          return u3_cqdb_uni(
+        else if ( c3y == u3qc_hor(p_n_b, p_n_a) ) {
+          return u3qdb_uni(
 
-            u3_cqdb_int(
+            u3qdb_int(
                                 u3k(l_a),
                                 u3nt(
                                       u3k(n_b),
                                       u3k(l_b),
                                       u3k(u3_nul))),
-            u3_cqdb_int(
+            u3qdb_int(
                                 u3k(a),
                                 u3k(r_b)));
         }
         else {
-          return u3_cqdb_uni(
+          return u3qdb_uni(
 
-            u3_cqdb_int(
+            u3qdb_int(
                                 u3k(r_a),
                                 u3nt(
                                       u3k(n_b),
                                       u3k(u3_nul),
                                       u3k(r_b))),
-            u3_cqdb_int(
+            u3qdb_int(
                                 u3k(a),
                                 u3k(l_b)));
         }
@@ -79,39 +79,39 @@
         return u3nt(
 
           u3k(n_b),
-          u3_cqdb_int(u3k(l_b), u3k(l_a)),
-          u3_cqdb_int(u3k(r_b), u3k(r_a)));
+          u3qdb_int(u3k(l_b), u3k(l_a)),
+          u3qdb_int(u3k(r_b), u3k(r_a)));
       }
-      else if ( c3y == u3_cqc_hor(p_n_a, p_n_b) ) {
-        return u3_cqdb_uni(
+      else if ( c3y == u3qc_hor(p_n_a, p_n_b) ) {
+        return u3qdb_uni(
 
-          u3_cqdb_int(
+          u3qdb_int(
                               u3k(l_b),
                               u3nt(
                                     u3k(n_a),
                                     u3k(l_a),
                                     u3k(u3_nul))),
-          u3_cqdb_int(
+          u3qdb_int(
                               u3k(a),
                               u3k(r_a)));
       }
       else {
-        return u3_cqdb_uni(
+        return u3qdb_uni(
 
-          u3_cqdb_int(
+          u3qdb_int(
                               u3k(r_b),
                               u3nt(
                                     u3k(n_a),
                                     u3k(u3_nul),
                                     u3k(r_a))),
-          u3_cqdb_int(
+          u3qdb_int(
                               u3k(a),
                               u3k(l_a)));
       }
     }
   }
   u3_noun
-  u3_cwdb_int(
+  u3wdb_int(
                       u3_noun cor)
   {
     u3_noun a, b;
@@ -119,6 +119,6 @@
     if ( c3n == u3r_mean(cor, u3v_sam, &b, u3v_con_sam, &a, 0) ) {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqdb_int(a, b);
+      return u3qdb_int(a, b);
     }
   }
diff --git a/j/4/by_put.c b/j/4/by_put.c
index e1804fa71a..1e918c500f 100644
--- a/j/4/by_put.c
+++ b/j/4/by_put.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqdb_put(
+  u3qdb_put(
                        u3_noun a,
                        u3_noun b,
                        u3_noun c)
@@ -40,10 +40,10 @@
         }
       }
       else {
-        if ( c3y == u3_cqc_gor(b, pn_a) ) {
-          d = u3_cqdb_put(l_a, b, c);
+        if ( c3y == u3qc_gor(b, pn_a) ) {
+          d = u3qdb_put(l_a, b, c);
 
-          if ( c3y == u3_cqc_vor(pn_a, u3h(u3h(d))) ) {
+          if ( c3y == u3qc_vor(pn_a, u3h(u3h(d))) ) {
             return u3nt(u3k(n_a),
                                 d,
                                 u3k(r_a));
@@ -65,9 +65,9 @@
           }
         }
         else {
-          d = u3_cqdb_put(r_a, b, c);
+          d = u3qdb_put(r_a, b, c);
 
-          if ( c3y == u3_cqc_vor(pn_a, u3h(u3h(d))) ) {
+          if ( c3y == u3qc_vor(pn_a, u3h(u3h(d))) ) {
             return u3nt(u3k(n_a),
                                 u3k(l_a),
                                 d);
@@ -92,7 +92,7 @@
     }
   }
   u3_noun
-  u3_cwdb_put(
+  u3wdb_put(
                       u3_noun cor)
   {
     u3_noun a, b, c;
@@ -102,17 +102,17 @@
                                u3v_con_sam, &a, 0) ) {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqdb_put(a, b, c);
+      return u3qdb_put(a, b, c);
     }
   }
   u3_weak
-  u3_ckdb_put(u3_noun a, u3_noun b, u3_noun c)
+  u3kdb_put(u3_noun a, u3_noun b, u3_noun c)
   {
     // Bizarre asymmetry in old jets.
     //
     // (Mysterious comment in old glue code.)
     //
-    u3_noun pro = u3_cqdb_put(a, b, c);
+    u3_noun pro = u3qdb_put(a, b, c);
 
     u3z(a); u3z(b); u3z(c);
     return pro;
diff --git a/j/4/by_uni.c b/j/4/by_uni.c
index c3755c4388..ee26d18c9f 100644
--- a/j/4/by_uni.c
+++ b/j/4/by_uni.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqdb_uni(
+  u3qdb_uni(
                        u3_noun a,
                        u3_noun b)
   {
@@ -40,20 +40,20 @@
       else if ( c3n == u3r_cell(lr_b, &l_b, &r_b) ) {
         return u3m_bail(c3__exit);
       }
-      else if ( c3y == u3_cqc_vor(p_n_a, p_n_b) ) {
+      else if ( c3y == u3qc_vor(p_n_a, p_n_b) ) {
         if ( c3y == u3r_sing(p_n_a, p_n_b) ) {
           return u3nt(u3k(n_b),
-                              u3_cqdb_uni(
+                              u3qdb_uni(
                                 u3k(l_a), u3k(l_b)),
-                              u3_cqdb_uni(
+                              u3qdb_uni(
                                 u3k(r_a), u3k(r_b)));
         }
-        else if ( c3y == u3_cqc_hor(p_n_b, p_n_a) ) {
-          return u3_cqdb_uni(
+        else if ( c3y == u3qc_hor(p_n_b, p_n_a) ) {
+          return u3qdb_uni(
 
             u3nt(
                   u3k(n_a),
-                  u3_cqdb_uni(
+                  u3qdb_uni(
                                       u3k(l_a),
                                       u3nt(
                                             u3k(n_b),
@@ -63,12 +63,12 @@
             u3k(r_b));
         }
         else {
-          return u3_cqdb_uni(
+          return u3qdb_uni(
 
             u3nt(
                   u3k(n_a),
                   u3k(l_a),
-                  u3_cqdb_uni(
+                  u3qdb_uni(
                                       u3k(r_a),
                                       u3nt(
                                             u3k(n_b),
@@ -81,16 +81,16 @@
         return u3nt(
 
           u3k(n_b),
-          u3_cqdb_uni(u3k(r_b), u3k(r_a)),
-          u3_cqdb_uni(u3k(l_b), u3k(l_a)));
+          u3qdb_uni(u3k(r_b), u3k(r_a)),
+          u3qdb_uni(u3k(l_b), u3k(l_a)));
       }
-      else if ( c3y == u3_cqc_hor(p_n_a, p_n_b) ) {
-        return u3_cqdb_uni(
+      else if ( c3y == u3qc_hor(p_n_a, p_n_b) ) {
+        return u3qdb_uni(
 
           u3k(r_a),
           u3nt(
                 u3k(n_b),
-                u3_cqdb_uni(
+                u3qdb_uni(
                                     u3nt(
                                           u3k(n_a),
                                           u3k(l_a),
@@ -99,13 +99,13 @@
                 u3k(r_b)));
       }
       else {
-        return u3_cqdb_uni(
+        return u3qdb_uni(
 
           u3k(l_a),
           u3nt(
                 u3k(n_b),
                 u3k(l_b),
-                u3_cqdb_uni(
+                u3qdb_uni(
                                     u3k(r_b),
                                     u3nt(
                                           u3k(n_a),
@@ -115,7 +115,7 @@
     }
   }
   u3_noun
-  u3_cwdb_uni(
+  u3wdb_uni(
                       u3_noun cor)
   {
     u3_noun a, b;
@@ -123,6 +123,6 @@
     if ( c3n == u3r_mean(cor, u3v_sam, &b, u3v_con_sam, &a, 0) ) {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqdb_uni(a, b);
+      return u3qdb_uni(a, b);
     }
   }
diff --git a/j/4/in_gas.c b/j/4/in_gas.c
index 61a8f42be8..e2f6ace386 100644
--- a/j/4/in_gas.c
+++ b/j/4/in_gas.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqdi_gas(
+  u3qdi_gas(
                        u3_noun a,
                        u3_noun b)
   {
@@ -23,10 +23,10 @@
         u3_noun t_b = u3t(b);
         u3_noun c;
 
-        if ( u3_none == (c = u3_cqdi_put(a, i_b)) ) {
+        if ( u3_none == (c = u3qdi_put(a, i_b)) ) {
           return u3m_bail(c3__exit);
         } else {
-          u3_noun d = u3_cqdi_gas(c, t_b);
+          u3_noun d = u3qdi_gas(c, t_b);
 
           u3z(c);
           return d;
@@ -35,7 +35,7 @@
     }
   }
   u3_noun
-  u3_cwdi_gas(
+  u3wdi_gas(
                       u3_noun cor)
   {
     u3_noun a, b;
@@ -43,13 +43,13 @@
     if ( c3n == u3r_mean(cor, u3v_sam, &b, u3v_con_sam, &a, 0) ) {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqdi_gas(a, b);
+      return u3qdi_gas(a, b);
     }
   }
   u3_noun
-  u3_ckdi_gas(u3_noun a, u3_noun b)
+  u3kdi_gas(u3_noun a, u3_noun b)
   {
-    u3_weak c = u3_cqdi_gas(a, b);
+    u3_weak c = u3qdi_gas(a, b);
 
     u3z(a); u3z(b);
     if ( u3_none == c ) {
diff --git a/j/4/in_has.c b/j/4/in_has.c
index 5e2fcf4735..f060461269 100644
--- a/j/4/in_has.c
+++ b/j/4/in_has.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqdi_has(u3_noun a, u3_noun b)
+  u3qdi_has(u3_noun a, u3_noun b)
   {
     if ( u3_nul == a ) {
       return c3n;
@@ -24,29 +24,29 @@
           return c3y;
         }
         else {
-          if ( c3y == u3_cqc_hor(b, n_a) ) {
-            return u3_cqdi_has(l_a, b);
+          if ( c3y == u3qc_hor(b, n_a) ) {
+            return u3qdi_has(l_a, b);
           }
-          else return u3_cqdi_has(r_a, b);
+          else return u3qdi_has(r_a, b);
         }
       }
     }
   }
   u3_noun
-  u3_cwdi_has(u3_noun cor)
+  u3wdi_has(u3_noun cor)
   {
     u3_noun a, b;
 
     if ( c3n == u3r_mean(cor, u3v_sam, &b, u3v_con_sam, &a, 0) ) {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqdi_has(a, b);
+      return u3qdi_has(a, b);
     }
   }
   u3_noun
-  u3_ckdi_has(u3_noun a, u3_noun b)
+  u3kdi_has(u3_noun a, u3_noun b)
   {
-    u3_weak c = u3_cqdi_has(a, b);
+    u3_weak c = u3qdi_has(a, b);
 
     u3z(a); u3z(b);
     if ( u3_none == c ) {
diff --git a/j/4/in_int.c b/j/4/in_int.c
index 379fdd1e68..ae20a95527 100644
--- a/j/4/in_int.c
+++ b/j/4/in_int.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqdi_int(
+  u3qdi_int(
                        u3_noun a,
                        u3_noun b)
   {
@@ -30,7 +30,7 @@
         return u3m_bail(c3__exit);
       }
       else {
-        if ( c3y == u3_cqc_vor(n_b, n_a) ) {
+        if ( c3y == u3qc_vor(n_b, n_a) ) {
           c = a;    a = b;       b = c;
           c = n_a;  n_a = n_b;   n_b = c;
           c = lr_a; lr_a = lr_b; lr_b = c;
@@ -43,30 +43,30 @@
         }
         else if ( c3y == u3r_sing(n_a, n_b) ) {
           return u3nt(u3k(n_a),
-                              u3_cqdi_int(l_a, l_b),
-                              u3_cqdi_int(r_a, r_b));
+                              u3qdi_int(l_a, l_b),
+                              u3qdi_int(r_a, r_b));
         }
-        else if ( c3y == u3_cqc_hor(n_b, n_a) ) {
-          return u3_cqdi_uni(
-                                      u3_cqdi_int(
+        else if ( c3y == u3qc_hor(n_b, n_a) ) {
+          return u3qdi_uni(
+                                      u3qdi_int(
                                                           l_a,
                                                           u3nt(
                                                                 n_b,
                                                                 l_b,
                                                                 u3_nul)),
-                                      u3_cqdi_int(
+                                      u3qdi_int(
                                                           a,
                                                           r_b));
         }
         else {
-          return u3_cqdi_uni(
-                                      u3_cqdi_int(
+          return u3qdi_uni(
+                                      u3qdi_int(
                                                           r_a,
                                                           u3nt(
                                                                 n_b,
                                                                 u3_nul,
                                                                 r_b)),
-                                      u3_cqdi_int(
+                                      u3qdi_int(
                                                           a,
                                                           l_b));
         }
@@ -74,7 +74,7 @@
     }
   }
   u3_noun
-  u3_cwdi_int(
+  u3wdi_int(
                       u3_noun cor)
   {
     u3_noun a, b;
@@ -82,6 +82,6 @@
     if ( c3n == u3r_mean(cor, u3v_sam, &b, u3v_con_sam, &a, 0) ) {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqdi_int(a, b);
+      return u3qdi_int(a, b);
     }
   }
diff --git a/j/4/in_mer.c b/j/4/in_mer.c
index 0ed32e150a..836d2ece33 100644
--- a/j/4/in_mer.c
+++ b/j/4/in_mer.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqdi_mer(u3_noun a, u3_noun b)
+  u3qdi_mer(u3_noun a, u3_noun b)
   {
     if ( u3_nul == a ) {
       return u3k(b);
@@ -28,7 +28,7 @@
         return u3m_bail(c3__exit);
       }
       else {
-        if ( c3y == u3_cqc_vor(n_b, n_a) ) {
+        if ( c3y == u3qc_vor(n_b, n_a) ) {
           c = a;    a = b;       b = c;
           c = n_a;  n_a = n_b;   n_b = c;
           c = lr_a; lr_a = lr_b; lr_b = c;
@@ -41,14 +41,14 @@
         }
         else if ( c3y == u3r_sing(n_a, n_b) ) {
           return u3nt(u3k(n_a),
-                              u3_cqdi_mer(l_a, l_b),
-                              u3_cqdi_mer(r_a, r_b));
+                              u3qdi_mer(l_a, l_b),
+                              u3qdi_mer(r_a, r_b));
         }
-        else if ( c3y == u3_cqc_hor(n_b, n_a) ) {
-          return u3_cqdi_mer(
+        else if ( c3y == u3qc_hor(n_b, n_a) ) {
+          return u3qdi_mer(
                                       u3nt(
                                             n_a,
-                                            u3_cqdi_mer(
+                                            u3qdi_mer(
                                                                 l_a,
                                                                 u3nt(
                                                                       n_b,
@@ -58,11 +58,11 @@
                                       r_b);
         }
         else {
-          return u3_cqdi_mer(
+          return u3qdi_mer(
                                       u3nt(
                                             n_a,
                                             l_a,
-                                            u3_cqdi_mer(
+                                            u3qdi_mer(
                                                                 r_a,
                                                                 u3nt(
                                                                       n_b,
@@ -75,7 +75,7 @@
   }
 
   u3_noun
-  u3_cwdi_mer(u3_noun cor)
+  u3wdi_mer(u3_noun cor)
   {
     u3_noun a, b;
 
@@ -83,6 +83,6 @@
       return u3m_bail(c3__exit);
     } 
     else {
-      return u3_cqdi_mer(a, b);
+      return u3qdi_mer(a, b);
     }
   }
diff --git a/j/4/in_put.c b/j/4/in_put.c
index 1a3aab2e28..46bd4d04cb 100644
--- a/j/4/in_put.c
+++ b/j/4/in_put.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqdi_put(
+  u3qdi_put(
                        u3_noun a,
                        u3_noun b)
   {
@@ -29,10 +29,10 @@
         return u3m_bail(c3__exit);
       }
       else {
-        if ( c3y == u3_cqc_hor(b, n_a) ) {
-          c = u3_cqdi_put(l_a, b);
+        if ( c3y == u3qc_hor(b, n_a) ) {
+          c = u3qdi_put(l_a, b);
 
-          if ( c3y == u3_cqc_vor(n_a, u3h(c)) ) {
+          if ( c3y == u3qc_vor(n_a, u3h(c)) ) {
             return u3nt(u3k(n_a),
                                 c,
                                 u3k(r_a));
@@ -54,9 +54,9 @@
           }
         }
         else {
-          c = u3_cqdi_put(r_a, b);
+          c = u3qdi_put(r_a, b);
 
-          if ( c3y == u3_cqc_vor(n_a, u3h(c)) ) {
+          if ( c3y == u3qc_vor(n_a, u3h(c)) ) {
             return u3nt(u3k(n_a),
                                 u3k(l_a),
                                 c);
@@ -81,7 +81,7 @@
     }
   }
   u3_noun
-  u3_cwdi_put(
+  u3wdi_put(
                       u3_noun cor)
   {
     u3_noun a, b;
@@ -89,17 +89,17 @@
     if ( c3n == u3r_mean(cor, u3v_sam, &b, u3v_con_sam, &a, 0) ) {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqdi_put(a, b);
+      return u3qdi_put(a, b);
     }
   }
   u3_weak
-  u3_ckdi_put(u3_noun a, u3_noun b)
+  u3kdi_put(u3_noun a, u3_noun b)
   {
     // Bizarre asymmetry in old jets.
     //
     // (Mysterious comment in old glue code.)
     //
-    u3_noun pro = u3_cqdi_put(a, b);
+    u3_noun pro = u3qdi_put(a, b);
 
     u3z(a); u3z(b);
     return pro;
diff --git a/j/4/in_tap.c b/j/4/in_tap.c
index c8fbe55b6b..dedb1f511f 100644
--- a/j/4/in_tap.c
+++ b/j/4/in_tap.c
@@ -30,14 +30,14 @@
   }
 
   u3_noun
-  u3_cqdi_tap(
+  u3qdi_tap(
                        u3_noun a,
                        u3_noun b)
   {
     return _tap_in(a, u3k(b));
   }
   u3_noun
-  u3_cwdi_tap(
+  u3wdi_tap(
                       u3_noun cor)
   {
     u3_noun a, b;
@@ -45,13 +45,13 @@
     if ( c3n == u3r_mean(cor, u3v_sam, &b, u3v_con_sam, &a, 0) ) {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqdi_tap(a, b);
+      return u3qdi_tap(a, b);
     }
   }
   u3_noun
-  u3_ckdi_tap(u3_noun a, u3_noun b)
+  u3kdi_tap(u3_noun a, u3_noun b)
   {
-    u3_weak c = u3_cqdi_tap(a, b);
+    u3_weak c = u3qdi_tap(a, b);
 
     u3z(a); u3z(b);
     if ( u3_none == c ) {
diff --git a/j/4/in_uni.c b/j/4/in_uni.c
index e8cf4ee8cf..1d09228c9d 100644
--- a/j/4/in_uni.c
+++ b/j/4/in_uni.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqdi_uni(
+  u3qdi_uni(
                        u3_noun a,
                        u3_noun b)
   {
@@ -29,7 +29,7 @@
         return u3m_bail(c3__exit);
       }
       else {
-        if ( c3y == u3_cqc_vor(n_a, n_b) ) {
+        if ( c3y == u3qc_vor(n_a, n_b) ) {
           if ( c3n == u3r_cell(lr_a, &l_a, &r_a) ) {
             return u3m_bail(c3__exit);
           }
@@ -40,15 +40,15 @@
             return u3nt(
 
               u3k(n_b),
-              u3_cqdi_uni(u3k(l_a), u3k(l_b)),
-              u3_cqdi_uni(u3k(r_a), u3k(r_b)));
+              u3qdi_uni(u3k(l_a), u3k(l_b)),
+              u3qdi_uni(u3k(r_a), u3k(r_b)));
           }
-          else if ( c3y == u3_cqc_hor(n_b, n_a) ) {
-            return u3_cqdi_uni(
+          else if ( c3y == u3qc_hor(n_b, n_a) ) {
+            return u3qdi_uni(
 
               u3nt(
                     u3k(n_a),
-                    u3_cqdi_uni(
+                    u3qdi_uni(
                                          u3k(l_a),
                                          u3nt(
                                                u3k(n_b),
@@ -58,12 +58,12 @@
               u3k(r_b));
           }
           else {
-            return u3_cqdi_uni(
+            return u3qdi_uni(
 
               u3nt(
                     u3k(n_a),
                     u3k(l_a),
-                    u3_cqdi_uni(
+                    u3qdi_uni(
                                          u3k(r_a),
                                          u3nt(
                                                u3k(n_b),
@@ -82,16 +82,16 @@
           return u3nt(
 
             u3k(n_b),
-            u3_cqdi_uni(u3k(r_b), u3k(r_a)),
-            u3_cqdi_uni(u3k(l_b), u3k(l_a)));
+            u3qdi_uni(u3k(r_b), u3k(r_a)),
+            u3qdi_uni(u3k(l_b), u3k(l_a)));
         }
-        else if ( c3y == u3_cqc_hor(n_a, n_b) ) {
-          return u3_cqdi_uni(
+        else if ( c3y == u3qc_hor(n_a, n_b) ) {
+          return u3qdi_uni(
 
             u3k(r_a),
             u3nt(
                   u3k(n_b),
-                  u3_cqdi_uni(
+                  u3qdi_uni(
                                       u3nt(
                                             u3k(n_a),
                                             u3k(l_a),
@@ -100,13 +100,13 @@
                   u3k(r_b)));
         }
         else {
-          return u3_cqdi_uni(
+          return u3qdi_uni(
 
             u3k(l_a),
             u3nt(
                   u3k(n_b),
                   u3k(l_b),
-                  u3_cqdi_uni(
+                  u3qdi_uni(
                                       u3nt(
                                             u3k(n_a),
                                             u3k(u3_nul),
@@ -117,7 +117,7 @@
     }
   }
   u3_noun
-  u3_cwdi_uni(
+  u3wdi_uni(
                       u3_noun cor)
   {
     u3_noun a, b;
@@ -125,7 +125,7 @@
     if ( c3n == u3r_mean(cor, u3v_sam, &b, u3v_con_sam, &a, 0) ) {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqdi_uni(a, b);
+      return u3qdi_uni(a, b);
     }
   }
 
diff --git a/j/5/aesc.c b/j/5/aesc.c
index 21eab792d5..e1cf819013 100644
--- a/j/5/aesc.c
+++ b/j/5/aesc.c
@@ -14,7 +14,7 @@
 /* functions
 */
   u3_noun
-  u3_cqea_en(u3_atom a, u3_atom b)
+  u3qea_en(u3_atom a, u3_atom b)
   {
     c3_y         a_y[32];
     c3_y         b_y[16];
@@ -51,7 +51,7 @@
   }
 
   u3_noun
-  u3_cwea_en(u3_noun cor)
+  u3wea_en(u3_noun cor)
   {
     u3_noun a, b;
 
@@ -62,12 +62,12 @@
       return u3m_bail(c3__exit);
     }
     else {
-      return u3_cqea_en(a, b);
+      return u3qea_en(a, b);
     }
   }
 
   u3_noun
-  u3_cqea_de(u3_atom a, u3_atom b)
+  u3qea_de(u3_atom a, u3_atom b)
   {
     c3_y    a_y[32];
     c3_y    b_y[16];
@@ -104,7 +104,7 @@
   }
 
   u3_noun
-  u3_cwea_de(u3_noun cor)
+  u3wea_de(u3_noun cor)
   {
     u3_noun a, b;
 
@@ -115,6 +115,6 @@
       return u3m_bail(c3__exit);
     }
     else {
-      return u3_cqea_de(a, b);
+      return u3qea_de(a, b);
     }
   }
diff --git a/j/5/cue.c b/j/5/cue.c
index be3a06f0b3..c4eb809f38 100644
--- a/j/5/cue.c
+++ b/j/5/cue.c
@@ -12,11 +12,11 @@
   {
     u3_noun p, q;
 
-    if ( 0 == u3_cqc_cut(0, b, 1, a) ) {
-      u3_noun x = u3_cqa_inc(b);
-      u3_noun c = u3_cqe_rub(x, a);
+    if ( 0 == u3qc_cut(0, b, 1, a) ) {
+      u3_noun x = u3qa_inc(b);
+      u3_noun c = u3qe_rub(x, a);
 
-      p = u3_cqa_inc(u3k(u3h(c)));
+      p = u3qa_inc(u3k(u3h(c)));
       q = u3k(u3t(c));
 
       u3h_put(har_p, u3k(b), u3k(q));
@@ -25,20 +25,20 @@
       u3z(x);
     }
     else {
-      u3_noun c = u3_cqa_add(2, b);
-      u3_noun l = u3_cqa_inc(b);
+      u3_noun c = u3qa_add(2, b);
+      u3_noun l = u3qa_inc(b);
 
-      if ( 0 == u3_cqc_cut(0, l, 1, a) ) {
+      if ( 0 == u3qc_cut(0, l, 1, a) ) {
         u3_noun u, v, w;
         u3_noun x, y;
 
         u = _cue_in(har_p, a, c);
-        x = u3_cqa_add(u3h(u), c);
+        x = u3qa_add(u3h(u), c);
         v = _cue_in(har_p, a, x);
         w = u3nc(u3k(u3h(u3t(u))), u3k(u3h(u3t(v))));
 
-        y = u3_cqa_add(u3h(u), u3h(v));
-        p = u3_cqa_add(2, y);
+        y = u3qa_add(u3h(u), u3h(v));
+        p = u3qa_add(2, y);
 
         q = w;
         u3h_put(har_p, u3k(b), u3k(q));
@@ -46,10 +46,10 @@
         u3z(u); u3z(v); u3z(x); u3z(y);
       }
       else {
-        u3_noun d = u3_cqe_rub(c, a);
+        u3_noun d = u3qe_rub(c, a);
         u3_noun x = u3h_get(har_p, u3k(u3t(d)));
 
-        p = u3_cqa_add(2, u3h(d));
+        p = u3qa_add(2, u3h(d));
         if ( u3_none == x ) {
           return u3m_bail(c3__exit);
         }
@@ -63,7 +63,7 @@
   }
 
   u3_noun
-  u3_cqe_cue(u3_atom a)
+  u3qe_cue(u3_atom a)
   {
     u3p(u3h_root) har_p = u3h_new();
 
@@ -76,20 +76,20 @@
     return y;
   }
   u3_noun
-  u3_cwe_cue(u3_noun cor)
+  u3we_cue(u3_noun cor)
   {
     u3_noun a;
 
     if ( (u3_none == (a = u3r_at(u3v_sam, cor))) ) {
       return u3m_bail(c3__fail);
     } else {
-      return u3_cqe_cue(a);
+      return u3qe_cue(a);
     }
   }
   u3_noun
-  u3_cke_cue(u3_atom a)
+  u3ke_cue(u3_atom a)
   {
-    u3_noun b = u3_cqe_cue(a);
+    u3_noun b = u3qe_cue(a);
 
     u3z(a);
     return b;
diff --git a/j/5/ed_puck.c b/j/5/ed_puck.c
index ff7d9d1a7e..1b1ea672d4 100644
--- a/j/5/ed_puck.c
+++ b/j/5/ed_puck.c
@@ -10,7 +10,7 @@
 /* functions
 */
   u3_noun
-  u3_cwee_puck(u3_noun cor)
+  u3wee_puck(u3_noun cor)
   {
     c3_y pub_y[32];
     c3_y sec_y[64];
diff --git a/j/5/ed_sign.c b/j/5/ed_sign.c
index dda3159051..65bf104739 100644
--- a/j/5/ed_sign.c
+++ b/j/5/ed_sign.c
@@ -39,7 +39,7 @@
   }
 
   u3_noun
-  u3_cwee_sign(u3_noun cor)
+  u3wee_sign(u3_noun cor)
   {
     u3_noun a, b;
     if ( c3n == u3r_mean(cor,
diff --git a/j/5/ed_veri.c b/j/5/ed_veri.c
index 500dc790f2..ff0aee95bd 100644
--- a/j/5/ed_veri.c
+++ b/j/5/ed_veri.c
@@ -34,7 +34,7 @@
   }
 
   u3_noun
-  u3_cwee_veri(u3_noun cor)
+  u3wee_veri(u3_noun cor)
   {
     u3_noun a, b, c;
     if ( c3n == u3r_mean(cor,
diff --git a/j/5/jam.c b/j/5/jam.c
index 0050d7579c..af2fa0f6d3 100644
--- a/j/5/jam.c
+++ b/j/5/jam.c
@@ -18,22 +18,22 @@
                u3_noun l)
   {
     u3_noun w = u3nc(u3nc(2, 1), u3k(l));
-    u3_noun x = u3_cqa_add(2, b);
+    u3_noun x = u3qa_add(2, b);
     u3_noun d = _jam_in(har_p, h_a, x, w);
     u3_noun p_d, q_d, r_d;
     u3_noun r;
 
     u3r_trel(d, &p_d, &q_d, &r_d);
     {
-      u3_noun y = u3_cqa_add(x, p_d);
+      u3_noun y = u3qa_add(x, p_d);
       u3_noun e = _jam_in(har_p, t_a, y, q_d);
       u3_noun p_e, q_e, r_e;
 
       u3r_trel(e, &p_e, &q_e, &r_e);
       {
-        u3_noun z = u3_cqa_add(p_d, p_e);
+        u3_noun z = u3qa_add(p_d, p_e);
 
-        r = u3nt(u3_cqa_add(2, z), u3k(q_e), 0);
+        r = u3nt(u3qa_add(2, z), u3k(q_e), 0);
 
         u3z(z);
       }
@@ -52,10 +52,10 @@
                u3_atom a,
                u3_noun l)
   {
-    u3_noun d = u3_cqe_mat(a);
-    u3_noun x = u3_cqa_add(1, u3h(d));
+    u3_noun d = u3qe_mat(a);
+    u3_noun x = u3qa_add(1, u3h(d));
     u3_noun y = u3nt
-      (u3k(x), u3nc(u3nc(x, u3_cqc_lsh(0, 1, u3t(d))), u3k(l)), 0);
+      (u3k(x), u3nc(u3nc(x, u3qc_lsh(0, 1, u3t(d))), u3k(l)), 0);
 
     u3z(d);
 
@@ -67,11 +67,11 @@
               u3_atom u_c,
               u3_noun l)
   {
-    u3_noun d = u3_cqe_mat(u_c);
-    u3_atom x = u3_cqc_lsh(0, 2, u3t(d));
-    u3_atom y = u3_cqa_add(2, u3h(d));
+    u3_noun d = u3qe_mat(u_c);
+    u3_atom x = u3qc_lsh(0, 2, u3t(d));
+    u3_atom y = u3qa_add(2, u3h(d));
     u3_noun z = u3nt
-      (u3k(y), u3nc(u3nc(y, u3_cqc_mix(3, x)), u3k(l)), 0);
+      (u3k(y), u3nc(u3nc(y, u3qc_mix(3, x)), u3k(l)), 0);
 
     u3z(d);
     u3z(x);
@@ -109,13 +109,13 @@
   }
 
   u3_noun
-  u3_cqe_jam(u3_atom a)
+  u3qe_jam(u3_atom a)
   {
     u3p(u3h_root) har_p = u3h_new();
 
     u3_noun x = _jam_in(har_p, a, 0, u3_nul);
-    u3_noun q = u3_cqb_flop(u3h(u3t(x)));
-    u3_noun r = u3_cqc_can(0, q);
+    u3_noun q = u3qb_flop(u3h(u3t(x)));
+    u3_noun r = u3qc_can(0, q);
 
     u3z(x);
     u3z(q);
@@ -123,20 +123,20 @@
     return r;
   }
   u3_noun
-  u3_cwe_jam(u3_noun cor)
+  u3we_jam(u3_noun cor)
   {
     u3_noun a;
 
     if ( (u3_none == (a = u3r_at(u3v_sam, cor))) ) {
       return u3m_bail(c3__fail);
     } else {
-      return u3_cqe_jam(a);
+      return u3qe_jam(a);
     }
   }
   u3_atom
-  u3_cke_jam(u3_noun a)
+  u3ke_jam(u3_noun a)
   {
-    u3_atom b = u3_cqe_jam(a);
+    u3_atom b = u3qe_jam(a);
 
     u3z(a);
     return b;
diff --git a/j/5/lore.c b/j/5/lore.c
index fc8b78f6e6..2b421379e0 100644
--- a/j/5/lore.c
+++ b/j/5/lore.c
@@ -6,7 +6,7 @@
 
 
   u3_noun
-  u3_cqe_lore(u3_atom lub)
+  u3qe_lore(u3_atom lub)
   {
     c3_w    len_w = u3r_met(3, lub);
     c3_w    pos_w = 0;
@@ -16,7 +16,7 @@
       c3_w meg_w;
 
       if ( pos_w >= len_w ) {
-        return u3_ckb_flop(tez);
+        return u3kb_flop(tez);
       } else {
         meg_w = 0;
 
@@ -45,7 +45,7 @@
   }
 
   u3_noun
-  u3_cwe_lore(u3_noun cor)
+  u3we_lore(u3_noun cor)
   {
     u3_noun lub;
 
@@ -54,6 +54,6 @@
     {
       return u3m_bail(c3__fail);
     } else {
-      return u3_cqe_lore(lub);
+      return u3qe_lore(lub);
     }
   }
diff --git a/j/5/loss.c b/j/5/loss.c
index e870c3454e..7d18ecdbf5 100644
--- a/j/5/loss.c
+++ b/j/5/loss.c
@@ -54,7 +54,7 @@
   {
     if ( 0 == loc_u->kct_w ) {
       return u3_nul;
-    } else return u3_ckb_flop(_lext(loc_u, loc_u->kad[loc_u->kct_w - 1]));
+    } else return u3kb_flop(_lext(loc_u, loc_u->kad[loc_u->kct_w - 1]));
   }
 
   //  initialize loss object
@@ -65,13 +65,13 @@
         u3_noun  hev)
   {
     loc_u->hel = hel;
-    loc_u->lel_w = u3_ckb_lent(u3k(hel));
+    loc_u->lel_w = u3kb_lent(u3k(hel));
 
     //  Read hev into array.
     {
       c3_w i_w;
 
-      loc_u->hev = c3_malloc(u3_ckb_lent(u3k(hev)) * sizeof(u3_noun));
+      loc_u->hev = c3_malloc(u3kb_lent(u3k(hev)) * sizeof(u3_noun));
 
       for ( i_w = 0; u3_nul != hev; i_w++ ) {
         loc_u->hev[i_w] = u3h(hev);
@@ -95,10 +95,10 @@
         u3_noun hav;
         u3_noun teg;
 
-        hav = u3_ckdb_get(u3k(loc_u->sev), u3k(how));
+        hav = u3kdb_get(u3k(loc_u->sev), u3k(how));
         teg = u3nc(u3i_words(1, &i_w),
                           (hav == u3_none) ? u3_nul : hav);
-        loc_u->sev = u3_ckdb_put(loc_u->sev, u3k(how), teg);
+        loc_u->sev = u3kdb_put(loc_u->sev, u3k(how), teg);
       }
     }
   }
@@ -242,10 +242,10 @@
   {
     while ( u3_nul != loc_u->hel ) {
       u3_noun i_hel = u3h(loc_u->hel);
-      u3_noun guy   = u3_ckdb_get(u3k(loc_u->sev), u3k(i_hel));
+      u3_noun guy   = u3kdb_get(u3k(loc_u->sev), u3k(i_hel));
 
       if ( u3_none != guy ) {
-        u3_noun gay = u3_ckb_flop(guy);
+        u3_noun gay = u3kb_flop(guy);
 
         _merg(loc_u, 0, gay);
         u3z(gay);
@@ -256,7 +256,7 @@
   }
 
   u3_noun
-  u3_cqe_loss(
+  u3qe_loss(
                     u3_noun hel,
                     u3_noun hev)
   {
@@ -282,7 +282,7 @@
   }
 
   u3_noun
-  u3_cwe_loss(u3_noun cor)
+  u3we_loss(u3_noun cor)
   {
     u3_noun hel, hev;
 
@@ -293,6 +293,6 @@
     {
       return u3m_bail(c3__fail);
     } else {
-      return u3_cqe_loss(hel, hev);
+      return u3qe_loss(hel, hev);
     }
   }
diff --git a/j/5/mat.c b/j/5/mat.c
index 68494e03ff..ca2aa4206a 100644
--- a/j/5/mat.c
+++ b/j/5/mat.c
@@ -8,26 +8,26 @@
 /* functions
 */
   u3_noun
-  u3_cqe_mat(
+  u3qe_mat(
                    u3_atom a)
   {
     if ( 0 == a ) {
       return u3nc(1, 1);
     } else {
-      u3_atom b = u3_cqc_met(0, a);
-      u3_atom c = u3_cqc_met(0, b);
+      u3_atom b = u3qc_met(0, a);
+      u3_atom c = u3qc_met(0, b);
       u3_atom u, v, w, x, y, z;
       u3_atom p, q;
 
-      u = u3_cqa_dec(c);
-      v = u3_cqa_add(c, c);
-      w = u3_cqc_bex(c);
-      x = u3_cqc_end(0, u, b);
-      y = u3_cqc_lsh(0, u, a);
-      z = u3_cqc_mix(x, y);
+      u = u3qa_dec(c);
+      v = u3qa_add(c, c);
+      w = u3qc_bex(c);
+      x = u3qc_end(0, u, b);
+      y = u3qc_lsh(0, u, a);
+      z = u3qc_mix(x, y);
 
-      p = u3_cqa_add(v, b);
-      q = u3_cqc_cat(0, w, z);
+      p = u3qa_add(v, b);
+      q = u3qc_cat(0, w, z);
 
       u3z(u);
       u3z(v);
@@ -40,7 +40,7 @@
     }
   }
   u3_noun
-  u3_cwe_mat(
+  u3we_mat(
                   u3_noun cor)
   {
     u3_noun a;
@@ -48,6 +48,6 @@
     if ( (u3_none == (a = u3r_at(u3v_sam, cor))) ) {
       return u3m_bail(c3__fail);
     } else {
-      return u3_cqe_mat(a);
+      return u3qe_mat(a);
     }
   }
diff --git a/j/5/mink.c b/j/5/mink.c
index 2e99af1c8d..478de8f133 100644
--- a/j/5/mink.c
+++ b/j/5/mink.c
@@ -6,7 +6,7 @@
 
 
   u3_noun
-  u3_cwe_mink(u3_noun cor)
+  u3we_mink(u3_noun cor)
   {
     u3_noun bus, fol, fly;
 
diff --git a/j/5/mule.c b/j/5/mule.c
index 2aaecf3801..51e46d93da 100644
--- a/j/5/mule.c
+++ b/j/5/mule.c
@@ -5,7 +5,7 @@
 #include "all.h"
 
   u3_noun
-  u3_cwe_mule(u3_noun cor)
+  u3we_mule(u3_noun cor)
   {
     u3_noun tap;
 
diff --git a/j/5/parse.c b/j/5/parse.c
index 06907814c8..08712c213d 100644
--- a/j/5/parse.c
+++ b/j/5/parse.c
@@ -141,7 +141,7 @@
   }
 
   u3_noun
- u3_cwe_bend_fun(u3_noun cor)
+ u3we_bend_fun(u3_noun cor)
   {
     u3_noun van, raq, vex, sab;
 
@@ -189,7 +189,7 @@
   }
 
   u3_noun
- u3_cwe_cold_fun(
+ u3we_cold_fun(
                         u3_noun cor)
   {
     u3_noun van, cus, sef, tub;
@@ -238,7 +238,7 @@
   }
 
   u3_noun
- u3_cwe_cook_fun(
+ u3we_cook_fun(
                         u3_noun cor)
   {
     u3_noun van, poq, sef, tub;
@@ -302,7 +302,7 @@
   }
 
   u3_noun
- u3_cwe_comp_fun(
+ u3we_comp_fun(
                         u3_noun cor)
   {
     u3_noun van, raq, vex, sab;
@@ -334,7 +334,7 @@
                         u3k(tub));
   }
   u3_noun
- u3_cwe_easy_fun(
+ u3we_easy_fun(
                         u3_noun cor)
   {
     u3_noun van, huf, tub;
@@ -411,7 +411,7 @@
   }
 
   u3_noun
- u3_cwe_glue_fun(
+ u3we_glue_fun(
                         u3_noun cor)
   {
     u3_noun van, bus, vex, sab;
@@ -470,7 +470,7 @@
   }
 
   u3_noun
- u3_cwe_here_fun(
+ u3we_here_fun(
                         u3_noun cor)
   {
     u3_noun van, hez, sef, tub;
@@ -509,7 +509,7 @@
     }
   }
   u3_noun
- u3_cwe_just_fun(
+ u3we_just_fun(
                         u3_noun cor)
   {
     u3_noun van, daf, tub;
@@ -550,7 +550,7 @@
     }
   }
   u3_noun
- u3_cwe_mask_fun(
+ u3we_mask_fun(
                         u3_noun cor)
   {
     u3_noun van, bud, tub;
@@ -596,7 +596,7 @@
     }
   }
   u3_noun
-  u3_cwe_pfix(
+  u3we_pfix(
                    u3_noun cor)
   {
     u3_noun vex, sab;
@@ -653,7 +653,7 @@
     }
   }
   u3_noun
-  u3_cwe_plug(
+  u3we_plug(
                    u3_noun cor)
   {
     u3_noun vex, sab;
@@ -668,7 +668,7 @@
 /* pose
 */
   u3_noun
-  u3_cqe_pose(u3_noun vex,
+  u3qe_pose(u3_noun vex,
                     u3_noun sab)
   {
     u3_noun p_vex, q_vex;
@@ -692,7 +692,7 @@
     }
   }
   u3_noun
-  u3_cwe_pose(
+  u3we_pose(
                    u3_noun cor)
   {
     u3_noun vex, sab;
@@ -700,7 +700,7 @@
     if ( (c3n == u3r_mean(cor, u3v_sam_2, &vex, u3v_sam_3, &sab, 0)) ) {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqe_pose(vex, sab);
+      return u3qe_pose(vex, sab);
     }
   }
 
@@ -746,7 +746,7 @@
     }
   }
   u3_noun
-  u3_cwe_sfix(u3_noun cor)
+  u3we_sfix(u3_noun cor)
   {
     u3_noun vex, sab;
 
@@ -790,7 +790,7 @@
     }
   }
   u3_noun
- u3_cwe_shim_fun(
+ u3we_shim_fun(
                         u3_noun cor)
   {
     u3_noun van, zep, tub;
@@ -839,7 +839,7 @@
   }
 
   u3_noun
- u3_cwe_stag_fun(
+ u3we_stag_fun(
                         u3_noun cor)
   {
     u3_noun van, gob, sef, tub;
@@ -938,7 +938,7 @@
     }
   }
  u3_noun
- u3_cwe_stew_fun(
+ u3we_stew_fun(
                         u3_noun cor)
   {
     u3_noun con, hel, tub;
@@ -1001,7 +1001,7 @@
   }
 
   u3_noun
-  u3_cwe_stir_fun(u3_noun cor)
+  u3we_stir_fun(u3_noun cor)
   {
     u3_noun van, rud, raq, fel, tub;
 
diff --git a/j/5/rd.c b/j/5/rd.c
index c85b9559d4..e4c93a8c29 100644
--- a/j/5/rd.c
+++ b/j/5/rd.c
@@ -16,7 +16,7 @@ union doub {
 /* sun
 */
   u3_noun
-  u3_cqer_sun(u3_atom a)
+  u3qer_sun(u3_atom a)
   {
     union doub b;
     b.d = (double) u3r_chub(0, a);
@@ -25,7 +25,7 @@ union doub {
   }
 
   u3_noun
-  u3_cwer_sun(u3_noun cor)
+  u3wer_sun(u3_noun cor)
   {
     u3_noun a;
 
@@ -34,14 +34,14 @@ union doub {
       return u3m_bail(c3__exit);
     }
     else {
-      return u3_cqer_sun(a);
+      return u3qer_sun(a);
     }
   }
 
 /* mul
 */
   u3_noun
-  u3_cqer_mul(u3_atom a, u3_atom b)
+  u3qer_mul(u3_atom a, u3_atom b)
   {
     union doub c, d, e;
     c.c = u3r_chub(0, a);
@@ -52,7 +52,7 @@ union doub {
   }
 
   u3_noun
-  u3_cwer_mul(u3_noun cor)
+  u3wer_mul(u3_noun cor)
   {
     u3_noun a, b;
 
@@ -63,14 +63,14 @@ union doub {
       return u3m_bail(c3__exit);
     }
     else {
-      return u3_cqer_mul(a, b);
+      return u3qer_mul(a, b);
     }
   }
 
 /* div
 */
   u3_noun
-  u3_cqer_div(u3_atom a, u3_atom b)
+  u3qer_div(u3_atom a, u3_atom b)
   {
     union doub c, d, e;
     c.c = u3r_chub(0, a);
@@ -81,7 +81,7 @@ union doub {
   }
 
   u3_noun
-  u3_cwer_div(u3_noun cor)
+  u3wer_div(u3_noun cor)
   {
     u3_noun a, b;
 
@@ -92,14 +92,14 @@ union doub {
       return u3m_bail(c3__exit);
     }
     else {
-      return u3_cqer_div(a, b);
+      return u3qer_div(a, b);
     }
   }
 
 /* add
 */
   u3_noun
-  u3_cqer_add(u3_atom a, u3_atom b)
+  u3qer_add(u3_atom a, u3_atom b)
   {
     union doub c, d, e;
     c.c = u3r_chub(0, a);
@@ -110,7 +110,7 @@ union doub {
   }
 
   u3_noun
-  u3_cwer_add(u3_noun cor)
+  u3wer_add(u3_noun cor)
   {
     u3_noun a, b;
 
@@ -121,14 +121,14 @@ union doub {
       return u3m_bail(c3__exit);
     }
     else {
-      return u3_cqer_add(a, b);
+      return u3qer_add(a, b);
     }
   }
 
 /* sub
 */
   u3_noun
-  u3_cqer_sub(u3_atom a, u3_atom b)
+  u3qer_sub(u3_atom a, u3_atom b)
   {
     union doub c, d, e;
     c.c = u3r_chub(0, a);
@@ -139,7 +139,7 @@ union doub {
   }
 
   u3_noun
-  u3_cwer_sub(u3_noun cor)
+  u3wer_sub(u3_noun cor)
   {
     u3_noun a, b;
 
@@ -150,14 +150,14 @@ union doub {
       return u3m_bail(c3__exit);
     }
     else {
-      return u3_cqer_sub(a, b);
+      return u3qer_sub(a, b);
     }
   }
 
 /* lte
 */
   u3_noun
-  u3_cqer_lte(u3_atom a, u3_atom b)
+  u3qer_lte(u3_atom a, u3_atom b)
   {
     union doub c, d;
     c.c = u3r_chub(0, a);
@@ -167,7 +167,7 @@ union doub {
   }
 
   u3_noun
-  u3_cwer_lte(u3_noun cor)
+  u3wer_lte(u3_noun cor)
   {
     u3_noun a, b;
 
@@ -178,14 +178,14 @@ union doub {
       return u3m_bail(c3__exit);
     }
     else {
-      return u3_cqer_lte(a, b);
+      return u3qer_lte(a, b);
     }
   }
 
 /* lth
 */
   u3_noun
-  u3_cqer_lth(u3_atom a, u3_atom b)
+  u3qer_lth(u3_atom a, u3_atom b)
   {
     union doub c, d;
     c.c = u3r_chub(0, a);
@@ -195,7 +195,7 @@ union doub {
   }
 
   u3_noun
-  u3_cwer_lth(u3_noun cor)
+  u3wer_lth(u3_noun cor)
   {
     u3_noun a, b;
 
@@ -206,14 +206,14 @@ union doub {
       return u3m_bail(c3__exit);
     }
     else {
-      return u3_cqer_lth(a, b);
+      return u3qer_lth(a, b);
     }
   }
 
 /* gte
 */
   u3_noun
-  u3_cqer_gte(u3_atom a, u3_atom b)
+  u3qer_gte(u3_atom a, u3_atom b)
   {
     union doub c, d;
     c.c = u3r_chub(0, a);
@@ -223,7 +223,7 @@ union doub {
   }
 
   u3_noun
-  u3_cwer_gte(u3_noun cor)
+  u3wer_gte(u3_noun cor)
   {
     u3_noun a, b;
 
@@ -234,14 +234,14 @@ union doub {
       return u3m_bail(c3__exit);
     }
     else {
-      return u3_cqer_gte(a, b);
+      return u3qer_gte(a, b);
     }
   }
 
 /* gth
 */
   u3_noun
-  u3_cqer_gth(u3_atom a, u3_atom b)
+  u3qer_gth(u3_atom a, u3_atom b)
   {
     union doub c, d;
     c.c = u3r_chub(0, a);
@@ -251,7 +251,7 @@ union doub {
   }
 
   u3_noun
-  u3_cwer_gth(u3_noun cor)
+  u3wer_gth(u3_noun cor)
   {
     u3_noun a, b;
 
@@ -262,6 +262,6 @@ union doub {
       return u3m_bail(c3__exit);
     }
     else {
-      return u3_cqer_gth(a, b);
+      return u3qer_gth(a, b);
     }
   }
diff --git a/j/5/repg.c b/j/5/repg.c
index dd500ad7c1..f4443c69c1 100644
--- a/j/5/repg.c
+++ b/j/5/repg.c
@@ -8,7 +8,7 @@
 #include <string.h>
 
   u3_noun
-  u3_cqe_repg(u3_noun lub, u3_noun rad, u3_noun rep)
+  u3qe_repg(u3_noun lub, u3_noun rad, u3_noun rep)
   {
     c3_y* lub_y = u3r_tape(lub);
     c3_y* rad_y = u3r_tape(rad);
@@ -78,11 +78,11 @@
             else {
               int mlen = matches[0].length;
               if (mlen == 0) {
-                ret = u3_ckb_weld(u3_ckb_flop(u3i_tape((char *) rad_y+ic)), u3_ckb_flop(u3i_tape((char *)rep_y)));
+                ret = u3kb_weld(u3kb_flop(u3i_tape((char *) rad_y+ic)), u3kb_flop(u3i_tape((char *)rep_y)));
                 ic = text_len + 1;
               }
               else {
-                ret = u3_ckb_weld(u3_ckb_flop(u3i_tape((char *)rep_y)), ret);
+                ret = u3kb_weld(u3kb_flop(u3i_tape((char *)rep_y)), ret);
                 ic += mlen;
               }
             }
@@ -92,7 +92,7 @@
           free(lub_y);
           free(rad_y);
           free(rep_y);
-          return u3i_cell(u3_nul, u3_ckb_flop(ret));
+          return u3i_cell(u3_nul, u3kb_flop(ret));
         }
         else {
           // Compiling the regular expression failed
@@ -122,7 +122,7 @@
   }
 
   u3_noun
-  u3_cwe_repg(u3_noun cor)
+  u3we_repg(u3_noun cor)
   {
     u3_noun lub;
     u3_noun rad;
@@ -134,6 +134,6 @@
     {
       return u3m_bail(c3__fail);
     } else {
-      return u3_cqe_repg(lub, rad, rep);
+      return u3qe_repg(lub, rad, rep);
     }
   }
diff --git a/j/5/rexp.c b/j/5/rexp.c
index b1e929bd8d..91ef886a8a 100644
--- a/j/5/rexp.c
+++ b/j/5/rexp.c
@@ -8,13 +8,13 @@
 #include <string.h>
 
   u3_noun
-  u3_cqe_rexp(u3_noun lub, u3_noun rad)
+  u3qe_rexp(u3_noun lub, u3_noun rad)
   {
     c3_y* lub_y = u3r_tape(lub);
     c3_y* rad_y = u3r_tape(rad);
 
     u3k(lub);
-    int lub_l = u3_ckb_lent(lub);
+    int lub_l = u3kb_lent(lub);
     if (lub_l != strlen((char *)lub_y)) {
       free(lub_y);
       free(rad_y);
@@ -94,7 +94,7 @@
             char * buf = malloc(matches[i].length + 1);
             memcpy(buf, matches[i].data, matches[i].length);
             buf[matches[i].length] = 0;
-            map = u3_ckdb_put(map, i, u3i_tape(buf));
+            map = u3kdb_put(map, i, u3i_tape(buf));
             free(buf);
           }
 
@@ -124,7 +124,7 @@
   }
 
   u3_noun
-  u3_cwe_rexp(u3_noun cor)
+  u3we_rexp(u3_noun cor)
   {
     u3_noun lub;
     u3_noun rad;
@@ -134,6 +134,6 @@
     {
       return u3m_bail(c3__fail);
     } else {
-      return u3_cqe_rexp(lub, rad);
+      return u3qe_rexp(lub, rad);
     }
   }
diff --git a/j/5/rub.c b/j/5/rub.c
index 3aeebe2a8b..8cd1372d8a 100644
--- a/j/5/rub.c
+++ b/j/5/rub.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqe_rub(
+  u3qe_rub(
                    u3_atom a,
                    u3_atom b)
   {
@@ -16,17 +16,17 @@
     u3_atom w, x, y, z;
     u3_atom p, q;
 
-    u3_atom m = u3_cqa_add(a, u3r_met(0, b));
+    u3_atom m = u3qa_add(a, u3r_met(0, b));
 
     //  Compute c and d.
     {
       x = u3k(a);
 
-      while ( 0 == u3_cqc_cut(0, x, 1, b) ) {
-        u3_atom y = u3_cqa_inc(x);
+      while ( 0 == u3qc_cut(0, x, 1, b) ) {
+        u3_atom y = u3qa_inc(x);
 
         //  Sanity check: crash if decoding more bits than available
-        if ( c3y == u3_cqa_gth(x, m)) {
+        if ( c3y == u3qa_gth(x, m)) {
           //  fprintf(stderr, "[%%rub-hard %d %d %d]\r\n", a, x, m);
           return u3m_bail(c3__exit);
         }
@@ -38,27 +38,27 @@
         u3z(x);
         return u3nc(1, 0);
       }
-      c = u3_cqa_sub(x, a);
-      d = u3_cqa_inc(x);
+      c = u3qa_sub(x, a);
+      d = u3qa_inc(x);
 
       u3z(x);
     }
 
     //  Compute e, p, q.
     {
-      x = u3_cqa_dec(c);
-      y = u3_cqc_bex(x);
-      z = u3_cqc_cut(0, d, x, b);
+      x = u3qa_dec(c);
+      y = u3qc_bex(x);
+      z = u3qc_cut(0, d, x, b);
 
-      e = u3_cqa_add(y, z);
+      e = u3qa_add(y, z);
       u3z(y); u3z(z);
 
-      w = u3_cqa_add(c, c);
-      y = u3_cqa_add(w, e);
-      z = u3_cqa_add(d, x);
+      w = u3qa_add(c, c);
+      y = u3qa_add(w, e);
+      z = u3qa_add(d, x);
 
-      p = u3_cqa_add(w, e);
-      q = u3_cqc_cut(0, z, e, b);
+      p = u3qa_add(w, e);
+      q = u3qc_cut(0, z, e, b);
 
       u3z(w); u3z(x); u3z(y); u3z(z);
 
@@ -66,7 +66,7 @@
     }
   }
   u3_noun
-  u3_cwe_rub(
+  u3we_rub(
                   u3_noun cor)
   {
     u3_noun a, b;
@@ -77,6 +77,6 @@
     {
       return u3m_bail(c3__fail);
     } else {
-      return u3_cqe_rub(a, b);
+      return u3qe_rub(a, b);
     }
   }
diff --git a/j/5/shax.c b/j/5/shax.c
index 13a78e8606..f762956551 100644
--- a/j/5/shax.c
+++ b/j/5/shax.c
@@ -14,7 +14,7 @@
 /* functions
 */
   u3_noun
-  u3_cqe_shax(
+  u3qe_shax(
                     u3_atom a)
   {
     c3_w  met_w = u3r_met(3, a);
@@ -42,7 +42,7 @@
   }
 
   u3_noun
-  u3_cqe_shal(u3_atom a,
+  u3qe_shal(u3_atom a,
                     u3_atom b)
   {
     c3_assert(_(u3a_is_cat(a)));
@@ -70,19 +70,19 @@
   }
 
   u3_noun
-  u3_cqe_shas(
+  u3qe_shas(
                     u3_atom sal,
                     u3_atom ruz)
   {
-    u3_noun one = u3_cqe_shax(ruz);
-    u3_noun two = u3_cqc_mix(sal, one);
-    u3_noun tri = u3_cqe_shax(two);
+    u3_noun one = u3qe_shax(ruz);
+    u3_noun two = u3qc_mix(sal, one);
+    u3_noun tri = u3qe_shax(two);
 
     u3z(one); u3z(two); return tri;
   }
 
   u3_noun
-  u3_cwe_shax(
+  u3we_shax(
                   u3_noun cor)
   {
     u3_noun a;
@@ -92,12 +92,12 @@
     {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqe_shax(a);
+      return u3qe_shax(a);
     }
   }
 
   u3_noun
-  u3_cwe_shal(u3_noun cor)
+  u3we_shal(u3_noun cor)
   {
     u3_noun a, b;
 
@@ -109,12 +109,12 @@
     {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqe_shal(a, b);
+      return u3qe_shal(a, b);
     }
   }
 
   u3_noun
-  u3_cwe_shas(u3_noun cor)
+  u3we_shas(u3_noun cor)
   {
     u3_noun sal, ruz;
 
@@ -125,7 +125,7 @@
     {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqe_shas(sal, ruz);
+      return u3qe_shas(sal, ruz);
     }
   }
 
@@ -141,15 +141,15 @@
       return u3m_bail(c3__fail);
     }
     while ( 0 != b ) {
-      u3_noun x = u3_cqc_mix(a, c);
-      u3_noun y = u3_cqc_mix(b, x);
-      u3_noun d = u3_cqe_shas(c3_s4('o','g','-','b'), y);
+      u3_noun x = u3qc_mix(a, c);
+      u3_noun y = u3qc_mix(b, x);
+      u3_noun d = u3qe_shas(c3_s4('o','g','-','b'), y);
       u3_noun m;
 
       u3z(x); u3z(y);
 
       if ( b < 256 ) {
-        u3_noun e = u3_cqc_end(0, b, d);
+        u3_noun e = u3qc_end(0, b, d);
 
         u3z(d);
         m = u3nc(b, e);
@@ -162,16 +162,16 @@
       }
       l = u3nc(m, l);
     }
-    return u3_ckb_flop(l);
+    return u3kb_flop(l);
   }
 
   u3_noun
-  u3_cqeo_raw(u3_atom a, u3_atom b)
+  u3qeo_raw(u3_atom a, u3_atom b)
   {
-    u3_noun x = u3_cqc_mix(b, a);
-    u3_noun c = u3_cqe_shas(c3_s4('o','g','-','a'), x);
+    u3_noun x = u3qc_mix(b, a);
+    u3_noun c = u3qe_shas(c3_s4('o','g','-','a'), x);
     u3_noun l = _og_list(a, b, c);
-    u3_noun r = u3_cqc_can(0, l);
+    u3_noun r = u3qc_can(0, l);
 
     u3z(l);
     u3z(c);
@@ -181,13 +181,13 @@
   }
 
   u3_noun
-  u3_cweo_raw(u3_noun cor)
+  u3weo_raw(u3_noun cor)
   {
     u3_noun a, b;
 
     if ( c3n == u3r_mean(cor, u3v_sam, &b, u3v_con_sam, &a, 0) ) {
       return u3m_bail(c3__exit);
     } else {
-      return u3_cqeo_raw(a, b);
+      return u3qeo_raw(a, b);
     }
   }
diff --git a/j/5/tape.c b/j/5/tape.c
index 3039b34fa0..59d4bf8c4f 100644
--- a/j/5/tape.c
+++ b/j/5/tape.c
@@ -35,7 +35,7 @@
   }
 
   u3_noun
-  u3_cqe_tape(u3_noun a)
+  u3qe_tape(u3_noun a)
   {
     if ( c3y == _good(a) ) {
       return u3k(a);
@@ -44,13 +44,13 @@
     }
   }
   u3_noun
-  u3_cwe_tape(u3_noun cor)
+  u3we_tape(u3_noun cor)
   {
     u3_noun a;
 
     if ( (u3_none == (a = u3r_at(u3v_sam, cor))) ) {
       return u3m_bail(c3__fail);
     } else {
-      return u3_cqe_tape(a);
+      return u3qe_tape(a);
     }
   }
diff --git a/j/5/trip.c b/j/5/trip.c
index f7ac286844..0ad63b2624 100644
--- a/j/5/trip.c
+++ b/j/5/trip.c
@@ -8,28 +8,28 @@
 /* functions
 */
   u3_noun
-  u3_cqe_trip(u3_atom a)
+  u3qe_trip(u3_atom a)
   {
     if ( c3n == u3ud(a) ) {
       return u3m_bail(c3__exit);
     }
-    return u3_cqc_rip(3, a);
+    return u3qc_rip(3, a);
   }
   u3_noun
-  u3_cwe_trip(u3_noun cor)
+  u3we_trip(u3_noun cor)
   {
     u3_noun a;
 
     if ( (u3_none == (a = u3r_at(u3v_sam, cor))) ) {
       return u3m_bail(c3__fail);
     } else {
-      return u3_cqe_trip(a);
+      return u3qe_trip(a);
     }
   }
   u3_atom
-  u3_cke_trip(u3_noun a)
+  u3ke_trip(u3_noun a)
   {
-    u3_atom b = u3_cqe_trip(a);
+    u3_atom b = u3qe_trip(a);
 
     u3z(a);
     return b;
diff --git a/j/6/al.c b/j/6/al.c
index 153dcafb0a..aff4990ee9 100644
--- a/j/6/al.c
+++ b/j/6/al.c
@@ -20,7 +20,7 @@ _al_core(u3_noun van,
 /* ~(bunt al gen)
 */
 u3_noun
-u3_cqfl_bunt(u3_noun van, u3_noun gen)
+u3qfl_bunt(u3_noun van, u3_noun gen)
 {
   u3_noun cor = _al_core(van, gen);
 
@@ -30,7 +30,7 @@ u3_cqfl_bunt(u3_noun van, u3_noun gen)
 /* ~(whip al gen)
 */
 u3_noun
-u3_cqfl_whip(u3_noun van,
+u3qfl_whip(u3_noun van,
                       u3_noun gen,
                       u3_noun axe)                              //
 {
diff --git a/j/6/ap.c b/j/6/ap.c
index 0da5ff56f5..06ab6ee74d 100644
--- a/j/6/ap.c
+++ b/j/6/ap.c
@@ -7,9 +7,9 @@
 
 /** forward declares
 **/
-    u3_noun u3_cwfp_rake(u3_noun);
-    u3_noun u3_cwfp_open(u3_noun);
-    u3_noun u3_cwfp_hack(u3_noun);
+    u3_noun u3wfp_rake(u3_noun);
+    u3_noun u3wfp_open(u3_noun);
+    u3_noun u3wfp_hack(u3_noun);
 
     static u3_noun
     _ap_open_l(u3_noun, u3_noun);
@@ -38,7 +38,7 @@
     static u3_noun
     _ap_bunt(u3_noun van, u3_noun gen)
     {
-      u3_noun pro = u3_cqfl_bunt(van, gen);
+      u3_noun pro = u3qfl_bunt(van, gen);
 
       u3z(van);
       return pro;
@@ -271,7 +271,7 @@
                         u3nc(u3nc(c3__axil, c3__noun),
                                      u3k(q_gen)),
                         u3_nul);
-    u3_noun zal = u3_cqb_weld(r_gen, tul);
+    u3_noun zal = u3qb_weld(r_gen, tul);
     u3_noun ret = u3nt(c3__wthp, u3k(p_gen), zal);
 
     u3z(tul);
@@ -527,7 +527,7 @@
        c3__tsgr,
        u3nc(
              c3__brcn,
-             u3_cqdb_put(q_gen, u3_blip, diz)),
+             u3qdb_put(q_gen, u3_blip, diz)),
        u3nc(c3__cnzy, u3_blip));
 
     u3z(diz);
@@ -864,7 +864,7 @@
   /** rake
   **/
     u3_noun
-    u3_cqfp_rake(
+    u3qfp_rake(
                           u3_noun gen)
     {
       u3_noun p_gen, q_gen;
@@ -900,12 +900,12 @@
           if ( c3n == u3r_cell(u3t(gen), &p_gen, &q_gen) ) {
             return u3m_bail(c3__fail);
           }
-          else return u3_cqfp_rake(q_gen);
+          else return u3qfp_rake(q_gen);
         }
       }
     }
     u3_noun
-    u3_cwfp_rake(
+    u3wfp_rake(
                          u3_noun cor)
     {
       u3_noun gen;
@@ -913,14 +913,14 @@
       if ( u3_none == (gen = u3r_at(u3v_sam, cor)) ) {
         return u3m_bail(c3__fail);
       } else {
-        return u3_cqfp_rake(gen);
+        return u3qfp_rake(gen);
       }
     }
 
   /** hack
   **/
     u3_noun
-    u3_cqfp_hack(
+    u3qfp_hack(
                           u3_noun ter,
                           u3_noun gen)
     {
@@ -939,7 +939,7 @@
             return u3nc(c3n, u3k(gen));
           }
           else {
-            u3_noun pyr = u3_cqfp_hack(ter, q_gen);
+            u3_noun pyr = u3qfp_hack(ter, q_gen);
 
             if ( c3y == u3h(pyr) ) {
               ret = u3nt
@@ -964,7 +964,7 @@
         }
         case c3__zpcb: u3x_cell(u3t(gen), &p_gen, &q_gen);
         {
-          u3_noun pyr = u3_cqfp_hack(ter, q_gen);
+          u3_noun pyr = u3qfp_hack(ter, q_gen);
 
           if ( c3y == u3h(pyr) ) {
             ret = u3nt
@@ -999,7 +999,7 @@
           return u3nc(c3n, voq);
         }
         else {
-          ret = u3_cqfp_hack(ter, voq);
+          ret = u3qfp_hack(ter, voq);
 
           u3z(voq);
           return ret;
@@ -1008,7 +1008,7 @@
     }
 
     u3_noun
-    u3_cwfp_hack(
+    u3wfp_hack(
                          u3_noun cor)
     {
       u3_noun gen;
@@ -1018,7 +1018,7 @@
       } else {
         u3_noun ter = u3r_at(u3v_con, cor);
 
-        return u3_cqfp_hack(ter, gen);
+        return u3qfp_hack(ter, gen);
       }
     }
 
@@ -1055,13 +1055,13 @@
   }
 
   u3_noun
-  u3_cqfp_open(u3_noun ter, u3_noun gen)
+  u3qfp_open(u3_noun ter, u3_noun gen)
   {
     return _ap_open_l(ter, gen);
   }
 
   u3_noun
-  u3_cwfp_open(u3_noun cor)
+  u3wfp_open(u3_noun cor)
   {
     u3_noun gen;
 
@@ -1070,6 +1070,6 @@
     } else {
       u3_noun ter = u3r_at(u3v_con, cor);
 
-      return u3_cqfp_open(ter, gen);
+      return u3qfp_open(ter, gen);
     }
   }
diff --git a/j/6/bull.c b/j/6/bull.c
index 9307d35cf4..396d187904 100644
--- a/j/6/bull.c
+++ b/j/6/bull.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqf_bull(
+  u3qf_bull(
                     u3_noun bid,
                     u3_noun der)
   {
@@ -21,7 +21,7 @@
       (c3__bull, u3k(bid), u3k(der));
   }
   u3_noun
-  u3_cwf_bull(
+  u3wf_bull(
                    u3_noun cor)
   {
     u3_noun bid, der;
@@ -29,6 +29,6 @@
     if ( c3n == u3r_mean(cor, u3v_sam_2, &bid, u3v_sam_3, &der, 0) ) {
       return u3m_bail(c3__fail);
     } else {
-      return u3_cqf_bull(bid, der);
+      return u3qf_bull(bid, der);
     }
   }
diff --git a/j/6/cell.c b/j/6/cell.c
index 098852be2a..15ac75e8e9 100644
--- a/j/6/cell.c
+++ b/j/6/cell.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqf_cell(u3_noun hed, u3_noun tal)
+  u3qf_cell(u3_noun hed, u3_noun tal)
   {
     if ( (c3__void == hed) || (c3__void == tal) ) {
       return c3__void;
@@ -17,7 +17,7 @@
     }
   }
   u3_noun
-  u3_cwf_cell(
+  u3wf_cell(
                    u3_noun cor)
   {
     u3_noun hed, tal;
@@ -25,6 +25,6 @@
     if ( c3n == u3r_mean(cor, u3v_sam_2, &hed, u3v_sam_3, &tal, 0) ) {
       return u3m_bail(c3__fail);
     } else {
-      return u3_cqf_cell(hed, tal);
+      return u3qf_cell(hed, tal);
     }
   }
diff --git a/j/6/comb.c b/j/6/comb.c
index 81e921b0f9..1e6e77f8a3 100644
--- a/j/6/comb.c
+++ b/j/6/comb.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqf_comb(
+  u3qf_comb(
                     u3_noun mal,
                     u3_noun buz)
   {
@@ -22,7 +22,7 @@
         if ( (c3y == u3r_p(buz, 0, &p_buz)) && (0 != p_buz) ) {
           return u3nc(
                        0,
-                       u3_cqc_peg(p_mal, p_buz));
+                       u3qc_peg(p_mal, p_buz));
         }
         else if ( c3y == u3r_pq(buz, 2, &p_buz, &q_buz) &&
                   c3y == u3r_p(p_buz, 0, &pp_buz) &&
@@ -31,9 +31,9 @@
           return u3nt
             (2,
                    u3nc(0,
-                                u3_cqc_peg(p_mal, pp_buz)),
+                                u3qc_peg(p_mal, pp_buz)),
                    u3nc(0,
-                                u3_cqc_peg(p_mal, pq_buz)));
+                                u3qc_peg(p_mal, pq_buz)));
         }
         else return u3nt(7, u3k(mal),
                                                u3k(buz));
@@ -59,7 +59,7 @@
     }
   }
   u3_noun
-  u3_cwf_comb(
+  u3wf_comb(
                    u3_noun cor)
   {
     u3_noun mal, buz;
@@ -67,6 +67,6 @@
     if ( c3n == u3r_mean(cor, u3v_sam_2, &mal, u3v_sam_3, &buz, 0) ) {
       return u3_none;
     } else {
-      return u3_cqf_comb(mal, buz);
+      return u3qf_comb(mal, buz);
     }
   }
diff --git a/j/6/cons.c b/j/6/cons.c
index a2b77ebcac..2cbdf4f6ef 100644
--- a/j/6/cons.c
+++ b/j/6/cons.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqf_cons(
+  u3qf_cons(
                     u3_noun vur,
                     u3_noun sed)
   {
@@ -26,8 +26,8 @@
               !(c3y == u3r_sing(p_vur, p_sed)) &&
               (0 == u3r_nord(p_vur, p_sed)) )
     {
-      u3_atom fub = u3_cqa_div(p_vur, 2);
-      u3_atom nof = u3_cqa_div(p_sed, 2);
+      u3_atom fub = u3qa_div(p_vur, 2);
+      u3_atom nof = u3qa_div(p_sed, 2);
 
       if ( c3y == u3r_sing(fub, nof) ) {
         u3z(nof);
@@ -42,7 +42,7 @@
     return u3nc(u3k(vur), u3k(sed));
   }
   u3_noun
-  u3_cwf_cons(
+  u3wf_cons(
                    u3_noun cor)
   {
     u3_noun vur, sed;
@@ -50,6 +50,6 @@
     if ( c3n == u3r_mean(cor, u3v_sam_2, &vur, u3v_sam_3, &sed, 0) ) {
       return u3m_bail(c3__fail);
     } else {
-      return u3_cqf_cons(vur, sed);
+      return u3qf_cons(vur, sed);
     }
   }
diff --git a/j/6/core.c b/j/6/core.c
index cb167c9407..d09d30710d 100644
--- a/j/6/core.c
+++ b/j/6/core.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqf_core(
+  u3qf_core(
                     u3_noun pac,
                     u3_noun con)
   {
@@ -19,7 +19,7 @@
     }
   }
   u3_noun
-  u3_cwf_core(
+  u3wf_core(
                    u3_noun cor)
   {
     u3_noun pac, con;
@@ -27,6 +27,6 @@
     if ( c3n == u3r_mean(cor, u3v_sam_2, &pac, u3v_sam_3, &con, 0) ) {
       return u3m_bail(c3__fail);
     } else {
-      return u3_cqf_core(pac, con);
+      return u3qf_core(pac, con);
     }
   }
diff --git a/j/6/cube.c b/j/6/cube.c
index ddd74a2ed6..739147f0b7 100644
--- a/j/6/cube.c
+++ b/j/6/cube.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqf_cube(
+  u3qf_cube(
                     u3_noun dil,
                     u3_noun goq)
   {
@@ -19,7 +19,7 @@
       (c3__cube, u3k(dil), u3k(goq));
   }
   u3_noun
-  u3_cwf_cube(
+  u3wf_cube(
                    u3_noun cor)
   {
     u3_noun dil, goq;
@@ -27,6 +27,6 @@
     if ( c3n == u3r_mean(cor, u3v_sam_2, &dil, u3v_sam_3, &goq, 0) ) {
       return u3m_bail(c3__fail);
     } else {
-      return u3_cqf_cube(dil, goq);
+      return u3qf_cube(dil, goq);
     }
   }
diff --git a/j/6/face.c b/j/6/face.c
index fd3c273b57..b44458f203 100644
--- a/j/6/face.c
+++ b/j/6/face.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqf_face(
+  u3qf_face(
                     u3_noun cog,
                     u3_noun tip)
   {
@@ -19,7 +19,7 @@
       (c3__face, u3k(cog), u3k(tip));
   }
   u3_noun
-  u3_cwf_face(
+  u3wf_face(
                    u3_noun cor)
   {
     u3_noun cog, tip;
@@ -27,6 +27,6 @@
     if ( c3n == u3r_mean(cor, u3v_sam_2, &cog, u3v_sam_3, &tip, 0) ) {
       return u3m_bail(c3__fail);
     } else {
-      return u3_cqf_face(cog, tip);
+      return u3qf_face(cog, tip);
     }
   }
diff --git a/j/6/fine.c b/j/6/fine.c
index b999191b7e..e8f4e16cb0 100644
--- a/j/6/fine.c
+++ b/j/6/fine.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqf_fine(
+  u3qf_fine(
                     u3_noun fuv,
                     u3_noun lup,
                     u3_noun mar)
@@ -22,7 +22,7 @@
     }
   }
   u3_noun
-  u3_cwf_fine(
+  u3wf_fine(
                    u3_noun cor)
   {
     u3_noun fuv, lup, mar;
@@ -32,6 +32,6 @@
                                u3v_sam_7, &mar, 0) ) {
       return u3m_bail(c3__fail);
     } else {
-      return u3_cqf_fine(fuv, lup, mar);
+      return u3qf_fine(fuv, lup, mar);
     }
   }
diff --git a/j/6/fitz.c b/j/6/fitz.c
index 6c7a55de13..9d4711109d 100644
--- a/j/6/fitz.c
+++ b/j/6/fitz.c
@@ -31,7 +31,7 @@
   }
 
   u3_noun
-  u3_cqf_fitz(
+  u3qf_fitz(
                     u3_noun yaz,
                     u3_noun wix)
   {
@@ -55,7 +55,7 @@
   }
 
   u3_noun
-  u3_cwf_fitz(
+  u3wf_fitz(
                    u3_noun cor)
   {
     u3_noun yaz, wix;
@@ -66,6 +66,6 @@
     {
       return u3m_bail(c3__fail);
     } else {
-      return u3_cqf_fitz(yaz, wix);
+      return u3qf_fitz(yaz, wix);
     }
   }
diff --git a/j/6/flan.c b/j/6/flan.c
index 53af2c9702..42608d05ca 100644
--- a/j/6/flan.c
+++ b/j/6/flan.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqf_flan(
+  u3qf_flan(
                     u3_noun bos,
                     u3_noun nif)
   {
@@ -35,7 +35,7 @@
     }
   }
   u3_noun
-  u3_cwf_flan(
+  u3wf_flan(
                    u3_noun cor)
   {
     u3_noun bos, nif;
@@ -43,6 +43,6 @@
     if ( c3n == u3r_mean(cor, u3v_sam_2, &bos, u3v_sam_3, &nif, 0) ) {
       return u3m_bail(c3__fail);
     } else {
-      return u3_cqf_flan(bos, nif);
+      return u3qf_flan(bos, nif);
     }
   }
diff --git a/j/6/flay.c b/j/6/flay.c
index 3be00d3971..7699dc40b0 100644
--- a/j/6/flay.c
+++ b/j/6/flay.c
@@ -15,7 +15,7 @@
       return c3__void;
     } else {
       u3_noun voo = _flay_roll(u3t(quz));
-      u3_noun oon = u3_cqf_fork(u3h(u3h(quz)), voo);
+      u3_noun oon = u3qf_fork(u3h(u3h(quz)), voo);
 
       u3z(voo);
       return oon;
@@ -23,7 +23,7 @@
   }
 
   u3_noun
-  u3_cqf_flay(
+  u3qf_flay(
                     u3_noun pok)
   {
     u3_noun p_pok = u3h(pok);
@@ -42,7 +42,7 @@
   }
 
   u3_noun
-  u3_cwf_flay(
+  u3wf_flay(
                    u3_noun cor)
   {
     u3_noun pok;
@@ -51,6 +51,6 @@
          (c3n == u3du(pok)) ) {
       return u3m_bail(c3__fail);
     } else {
-      return u3_cqf_flay(pok);
+      return u3qf_flay(pok);
     }
   }
diff --git a/j/6/flip.c b/j/6/flip.c
index 822621db65..b322c9e668 100644
--- a/j/6/flip.c
+++ b/j/6/flip.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqf_flip(
+  u3qf_flip(
                     u3_noun hel)
   {
     if ( c3y == u3r_sing(1, u3h(hel)) ) {
@@ -30,7 +30,7 @@
     }
   }
   u3_noun
-  u3_cwf_flip(
+  u3wf_flip(
                    u3_noun cor)
   {
     u3_noun hel;
@@ -38,6 +38,6 @@
     if ( u3_none == (hel = u3r_at(u3v_sam, cor)) ) {
       return u3m_bail(c3__fail);
     } else {
-      return u3_cqf_flip(hel);
+      return u3qf_flip(hel);
     }
   }
diff --git a/j/6/flor.c b/j/6/flor.c
index 351fbd28f7..19b1fce8f8 100644
--- a/j/6/flor.c
+++ b/j/6/flor.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqf_flor(
+  u3qf_flor(
                     u3_noun bos,
                     u3_noun nif)
   {
@@ -35,7 +35,7 @@
     }
   }
   u3_noun
-  u3_cwf_flor(
+  u3wf_flor(
                    u3_noun cor)
   {
     u3_noun bos, nif;
@@ -43,6 +43,6 @@
     if ( c3n == u3r_mean(cor, u3v_sam_2, &bos, u3v_sam_3, &nif, 0) ) {
       return u3m_bail(c3__fail);
     } else {
-      return u3_cqf_flor(bos, nif);
+      return u3qf_flor(bos, nif);
     }
   }
diff --git a/j/6/fork.c b/j/6/fork.c
index e844fbd5bc..8b1a8c901b 100644
--- a/j/6/fork.c
+++ b/j/6/fork.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqf_fork(
+  u3qf_fork(
                     u3_noun hoz,
                     u3_noun bur)
   {
@@ -25,7 +25,7 @@
       (c3__fork, u3k(hoz), u3k(bur));
   }
   u3_noun
-  u3_cwf_fork(
+  u3wf_fork(
                    u3_noun cor)
   {
     u3_noun hoz, bur;
@@ -33,6 +33,6 @@
     if ( c3n == u3r_mean(cor, u3v_sam_2, &hoz, u3v_sam_3, &bur, 0) ) {
       return u3m_bail(c3__fail);
     } else {
-      return u3_cqf_fork(hoz, bur);
+      return u3qf_fork(hoz, bur);
     }
   }
diff --git a/j/6/hike.c b/j/6/hike.c
index b419624f67..40fe7c0eb0 100644
--- a/j/6/hike.c
+++ b/j/6/hike.c
@@ -45,9 +45,9 @@
 
       {
         if ( (1 != axis) &&
-             (c3y == u3r_sing(2, u3_cqc_cap(axis))) )
+             (c3y == u3r_sing(2, u3qc_cap(axis))) )
         {
-          u3_atom axis_tap = u3_cqc_mas(axis);
+          u3_atom axis_tap = u3qc_mas(axis);
 
           return u3nc(
                        u3nc(
@@ -76,9 +76,9 @@
 
       {
         if ( (1 != axis) &&
-             (c3y == u3r_sing(3, u3_cqc_cap(axis))) )
+             (c3y == u3r_sing(3, u3qc_cap(axis))) )
         {
-          u3_atom axis_tap = u3_cqc_mas(axis);
+          u3_atom axis_tap = u3qc_mas(axis);
 
           return u3nc(
                        u3nc(u3k(axis_tap),
@@ -93,7 +93,7 @@
 /* functions
 */
   u3_noun
-  u3_cqf_hike(
+  u3qf_hike(
                     u3_noun axe,
                     u3_noun pac)
   {
@@ -112,11 +112,11 @@
       else {
         u3_noun tum = _lily_hike_belt_l(pac);
         u3_noun gam = _lily_hike_belt_r(pac);
-        u3_noun hax = u3_cqc_peg(axe, 2);
-        u3_noun moz = u3_cqc_peg(axe, 3);
-        u3_noun zip = u3_cqf_hike(hax, tum);
-        u3_noun dof = u3_cqf_hike(moz, gam);
-        u3_noun fol = u3_cqf_cons(zip, dof);
+        u3_noun hax = u3qc_peg(axe, 2);
+        u3_noun moz = u3qc_peg(axe, 3);
+        u3_noun zip = u3qf_hike(hax, tum);
+        u3_noun dof = u3qf_hike(moz, gam);
+        u3_noun fol = u3qf_cons(zip, dof);
 
         u3z(tum);
         u3z(gam);
@@ -130,7 +130,7 @@
     }
   }
   u3_noun
-  u3_cwf_hike(
+  u3wf_hike(
                    u3_noun cor)
   {
     u3_noun axe, pac;
@@ -140,6 +140,6 @@
     {
       return u3m_bail(c3__fail);
     } else {
-      return u3_cqf_hike(axe, pac);
+      return u3qf_hike(axe, pac);
     }
   }
diff --git a/j/6/look.c b/j/6/look.c
index 3c361fadf8..8f5f650a5a 100644
--- a/j/6/look.c
+++ b/j/6/look.c
@@ -42,17 +42,17 @@
           if ( (c3y == u3du(qn_dab)) &&
                (c3y == u3r_sing(cog, pn_dab)) ) {
             return u3nt(u3_nul,
-                                u3_cqc_peg(axe, 2),
+                                u3qc_peg(axe, 2),
                                 u3k(qn_dab));
           }
           else {
-            if ( c3y == u3_cqc_gor(cog, pn_dab) ) {
+            if ( c3y == u3qc_gor(cog, pn_dab) ) {
               return u3_nul;
             }
             else {
               u3_noun pro;
 
-              axe = u3_cqc_peg(axe, 3);
+              axe = u3qc_peg(axe, 3);
               pro = _look_in(cog, r_dab, axe);
               u3z(axe);
               return pro;
@@ -63,14 +63,14 @@
           if ( (c3y == u3du(qn_dab)) &&
                (c3y == u3r_sing(cog, pn_dab)) ) {
             return u3nt(u3_nul,
-                                u3_cqc_peg(axe, 2),
+                                u3qc_peg(axe, 2),
                                 u3k(qn_dab));
           }
           else {
-            if ( c3y == u3_cqc_gor(cog, pn_dab) ) {
+            if ( c3y == u3qc_gor(cog, pn_dab) ) {
               u3_noun pro;
 
-              axe = u3_cqc_peg(axe, 3);
+              axe = u3qc_peg(axe, 3);
               pro = _look_in(cog, l_dab, axe);
               u3z(axe);
               return pro;
@@ -84,14 +84,14 @@
           if ( (c3y == u3du(qn_dab)) &&
                (c3y == u3r_sing(cog, pn_dab)) ) {
             return u3nt(u3_nul,
-                                u3_cqc_peg(axe, 2),
+                                u3qc_peg(axe, 2),
                                 u3k(qn_dab));
           }
           else {
-            if ( c3y == u3_cqc_gor(cog, pn_dab) ) {
+            if ( c3y == u3qc_gor(cog, pn_dab) ) {
               u3_noun pro;
 
-              axe = u3_cqc_peg(axe, 6);
+              axe = u3qc_peg(axe, 6);
               pro = _look_in(cog, l_dab, axe);
               u3z(axe);
               return pro;
@@ -99,7 +99,7 @@
             else {
               u3_noun pro;
 
-              axe = u3_cqc_peg(axe, 7);
+              axe = u3qc_peg(axe, 7);
               pro = _look_in(cog, r_dab, axe);
               u3z(axe);
               return pro;
@@ -114,14 +114,14 @@
 /* functions
 */
   u3_noun
-  u3_cqf_look(
+  u3qf_look(
                     u3_noun cog,
                     u3_noun dab)
   {
     return _look_in(cog, dab, 1);
   }
   u3_noun
-  u3_cwf_look(
+  u3wf_look(
                    u3_noun cor)
   {
     u3_noun cog, dab;
@@ -129,6 +129,6 @@
     if ( c3n == u3r_mean(cor, u3v_sam_2, &cog, u3v_sam_3, &dab, 0) ) {
       return u3m_bail(c3__fail);
     } else {
-      return u3_cqf_look(cog, dab);
+      return u3qf_look(cog, dab);
     }
   }
diff --git a/j/6/slot.c b/j/6/slot.c
index 0ce7911f6a..7df51b67d7 100644
--- a/j/6/slot.c
+++ b/j/6/slot.c
@@ -8,7 +8,7 @@
 /* functions
 */
   u3_noun
-  u3_cqf_slot(u3_atom axe, u3_noun vax)
+  u3qf_slot(u3_atom axe, u3_noun vax)
   {
     u3_noun fag = u3r_at(axe, u3t(vax));
 
@@ -18,7 +18,7 @@
       return u3m_bail(c3__exit);
     }
     else {
-      u3_noun typ = u3_cqfu_peek(
+      u3_noun typ = u3qfu_peek(
     }
     c3_w i_w, met_w = c3_min(u3r_met(3, axe), u3r_met(3, vax));
 
@@ -40,7 +40,7 @@
   }
 
   u3_noun
-  u3_cwe_slot(u3_noun cor)
+  u3we_slot(u3_noun cor)
   {
     u3_noun axe, vax;
 
@@ -50,6 +50,6 @@
     {
       return u3m_bail(c3__fail);
     } else {
-      return u3_cqf_slot(axe, vax);
+      return u3qf_slot(axe, vax);
     }
   }
diff --git a/j/6/ut.c b/j/6/ut.c
index 8a9cd8be07..65c427730f 100644
--- a/j/6/ut.c
+++ b/j/6/ut.c
@@ -8,7 +8,7 @@
   //  duck: create a duck core for mean.
   //
   u3_noun
-  u3_cqfu_duck(
+  u3qfu_duck(
                         u3_noun     van,
                         u3_noun     typ)
   {
@@ -22,7 +22,7 @@
   //  dung: create a dunk core for mean (noun caption)
   //
   u3_noun
-  u3_cqfu_dung(
+  u3qfu_dung(
                         u3_noun     van,
                         u3_noun     paz,
                         u3_noun     typ)
@@ -39,7 +39,7 @@
   //  dunq: create a dunk core for mean
   //
   u3_noun
-  u3_cqfu_dunq(
+  u3qfu_dunq(
                         u3_noun     van,
                         const c3_c* paz_c,
                         u3_noun     typ)
@@ -58,7 +58,7 @@
   //  shew: create a show core for mean
   //
   u3_noun
-  u3_cqfu_shew(u3_noun van, u3_noun mol)
+  u3qfu_shew(u3_noun van, u3_noun mol)
   {
     u3_noun sho = u3j_hook(u3k(van), "show");
     u3_noun ret = u3i_molt(u3k(sho), u3v_sam, u3k(mol), 0);
@@ -71,13 +71,13 @@
   //  shep: show with caption and style
   //
   u3_noun
-  u3_cqfu_shep(
+  u3qfu_shep(
                         u3_noun     van,
                         const c3_c* paz_c,
                         u3_noun     sty,
                         u3_noun     mol)
   {
-    return u3_cqfu_shew
+    return u3qfu_shew
       (van,
               u3nc
                 (u3nc('c', u3i_string(paz_c)),
diff --git a/j/6/ut_burn.c b/j/6/ut_burn.c
index 53c545fca5..166c18dcd9 100644
--- a/j/6/ut_burn.c
+++ b/j/6/ut_burn.c
@@ -59,15 +59,15 @@
       }
       case c3__hold: p_sut = u3t(sut);
       {
-        if ( (c3y == u3_cqdi_has(gil, sut)) ) {
-          u3_noun sux = u3_cqfu_dunq(van, "type", sut);
+        if ( (c3y == u3qdi_has(gil, sut)) ) {
+          u3_noun sux = u3qfu_dunq(van, "type", sut);
 
           u3t_push(u3nc(c3__mean, sux));
           return u3m_error("burn-loop");
         }
         else {
-          u3_noun zoc = u3_cqdi_put(gil, sut);
-          u3_noun fop = u3_cqfu_repo(van, sut);
+          u3_noun zoc = u3qdi_put(gil, sut);
+          u3_noun fop = u3qfu_repo(van, sut);
           u3_noun pro = _burn_in(van, fop, zoc);
 
           u3z(fop);
@@ -88,7 +88,7 @@
   }
 
   u3_noun
-  u3_cqfu_burn(
+  u3qfu_burn(
                         u3_noun van,
                         u3_noun sut)
   {
@@ -106,7 +106,7 @@
   }
 
   u3_noun
-  u3_cwfu_burn(
+  u3wfu_burn(
                        u3_noun cor)
   {
     u3_noun sut;
@@ -114,6 +114,6 @@
     if ( u3_none == (sut = u3r_at(u3v_sam, cor)) ) {
       return u3m_bail(c3__fail);
     } else {
-      return u3_cqfu_burn(cor, sut);
+      return u3qfu_burn(cor, sut);
     }
   }
diff --git a/j/6/ut_busk.c b/j/6/ut_busk.c
index c3b75ed4a1..b06e727cc4 100644
--- a/j/6/ut_busk.c
+++ b/j/6/ut_busk.c
@@ -14,9 +14,9 @@
                         u3_noun cog,
                         u3_noun hyp)
   {
-    u3_noun sep = u3_cqfu_seep(van, sut, c3__both, hyp);
+    u3_noun sep = u3qfu_seep(van, sut, c3__both, hyp);
     u3_noun bid = u3nt(u3k(cog), u3k(hyp), sep);
-    u3_noun ret = u3_cqf_bull(bid, sut);
+    u3_noun ret = u3qf_bull(bid, sut);
 
     u3z(bid);
 
@@ -26,7 +26,7 @@
 /* boilerplate
 */
   u3_noun
-  u3_cwfu_busk(u3_noun cor)
+  u3wfu_busk(u3_noun cor)
   {
     u3_noun sut, cog, hyp, van;
 
@@ -44,7 +44,7 @@
   }
 
   u3_noun
-  u3_cqfu_busk(u3_noun van,
+  u3qfu_busk(u3_noun van,
                         u3_noun sut,
                         u3_noun cog,
                         u3_noun hyp)
diff --git a/j/6/ut_bust.c b/j/6/ut_bust.c
index 4df32d887e..dee9f9a7de 100644
--- a/j/6/ut_bust.c
+++ b/j/6/ut_bust.c
@@ -13,14 +13,14 @@
                         u3_noun sut,
                         u3_noun dib)
   {
-    u3_noun yam = u3_cqfu_burn(van, sut);
+    u3_noun yam = u3qfu_burn(van, sut);
     u3_noun yib = u3nc
       (
        u3nc(u3k(u3h(u3h(yam))),
                     u3k(dib)),
        u3k(u3t(yam)));
     u3_noun woo = u3nc(c3__cnzy, u3_blip);
-    u3_noun wox = u3_cqfu_mint(van, sut, c3__noun, woo);
+    u3_noun wox = u3qfu_mint(van, sut, c3__noun, woo);
     u3_noun ret = u3n_nock_on(yib, u3k(u3t(wox)));
 
     if ( u3_none == ret ) {
@@ -36,7 +36,7 @@
 /* boilerplate
 */
   u3_noun
-  u3_cwfu_bust(u3_noun cor)
+  u3wfu_bust(u3_noun cor)
   {
     u3_noun sut, dib, van;
 
@@ -50,7 +50,7 @@
   }
 
   u3_noun
-  u3_cqfu_bust(u3_noun van,
+  u3qfu_bust(u3_noun van,
                         u3_noun sut,
                         u3_noun dib)
   {
diff --git a/j/6/ut_conk.c b/j/6/ut_conk.c
index c0151eed10..be0fa8db5e 100644
--- a/j/6/ut_conk.c
+++ b/j/6/ut_conk.c
@@ -11,7 +11,7 @@
   _cqfu_conk(u3_noun van, u3_noun sut, u3_noun got)
   {
     if ( c3y == u3ud(got) ) {
-      return u3_cqf_face(got, sut);
+      return u3qf_face(got, sut);
     }
     else switch ( u3h(got) ) {
       default: return u3m_bail(c3__fail);
@@ -21,29 +21,29 @@
       }
       case 1: {
         u3_noun cok = _cqfu_conk(van, sut, u3t(u3t(got)));
-        u3_noun ret = u3_cqf_face(u3h(u3t(got)), cok);
+        u3_noun ret = u3qf_face(u3h(u3t(got)), cok);
 
         u3z(cok);
         return ret;
       }
       case 2: {
-        u3_noun vet = u3r_at(u3_cqfu_van_vet, van);
+        u3_noun vet = u3r_at(u3qfu_van_vet, van);
         u3_noun hed, tal, deh, lat, ret;
 
         if ( c3y == vet ) {
           u3_noun cel = u3nt(c3__cell, c3__noun, c3__noun);
 
-          if ( c3n == u3_cqfu_nest(van, cel, c3y, sut) ) {
+          if ( c3n == u3qfu_nest(van, cel, c3y, sut) ) {
             return u3m_bail(c3__fail);
           }
           u3z(cel);
         }
-        hed = u3_cqfu_peek(van, sut, c3__both, 2);
-        tal = u3_cqfu_peek(van, sut, c3__both, 3);
+        hed = u3qfu_peek(van, sut, c3__both, 2);
+        tal = u3qfu_peek(van, sut, c3__both, 3);
         deh = _cqfu_conk(van, hed, u3h(u3t(got)));
         lat = _cqfu_conk(van, tal, u3t(u3t(got)));
 
-        ret = u3_cqf_cell(deh, lat);
+        ret = u3qf_cell(deh, lat);
 
         u3z(lat);
         u3z(deh);
@@ -58,7 +58,7 @@
 /* boilerplate
 */
   u3_noun
-  u3_cwfu_conk(u3_noun cor)
+  u3wfu_conk(u3_noun cor)
   {
     u3_noun sut, got, van;
 
@@ -74,7 +74,7 @@
   }
 
   u3_noun
-  u3_cqfu_conk(u3_noun van,
+  u3qfu_conk(u3_noun van,
                         u3_noun sut,
                         u3_noun got)
   {
diff --git a/j/6/ut_crop.c b/j/6/ut_crop.c
index 5dc38095dc..8797a9c20f 100644
--- a/j/6/ut_crop.c
+++ b/j/6/ut_crop.c
@@ -19,7 +19,7 @@
              u3_noun ref,
              u3_noun bix)
   {
-    u3_noun rep = u3_cqfu_repo(van, sut);
+    u3_noun rep = u3qfu_repo(van, sut);
     u3_noun ret = _crop_dext(van, rep, ref, bix);
 
     if ( c3y == u3r_sing(ret, rep) ) {
@@ -77,7 +77,7 @@
       case c3__bull: u3x_cell(u3t(sut), &p_sut, &q_sut);
       {
         u3_noun foz = _crop_dext(van, q_sut, ref, bix);
-        u3_noun ret = u3_cqf_bull(p_sut, foz);
+        u3_noun ret = u3qf_bull(p_sut, foz);
 
         u3z(foz);
         return ret;
@@ -90,11 +90,11 @@
         else if ( c3__cell == u3h(ref) ) {
           u3x_cell(u3t(ref), &p_ref, &q_ref);
 
-          if ( c3y == u3_cqfu_nest
+          if ( c3y == u3qfu_nest
                               (van, p_ref, c3n, p_sut) )
           {
             u3_noun foz = _crop_dext(van, q_sut, q_ref, bix);
-            u3_noun ret = u3_cqf_cell(p_sut, foz);
+            u3_noun ret = u3qf_cell(p_sut, foz);
 
             u3z(foz);
             return ret;
@@ -121,8 +121,8 @@
           u3_noun foz = _crop_dext(van, q_sut, ref, bix);
           u3_noun ret;
 
-          if ( c3y == u3_cqfu_firm(van, foz, p_sut) ) {
-            ret = u3_cqf_cube(p_sut, foz);
+          if ( c3y == u3qfu_firm(van, foz, p_sut) ) {
+            ret = u3qf_cube(p_sut, foz);
           }
           else ret = c3__void;
 
@@ -134,7 +134,7 @@
       case c3__face: u3x_cell(u3t(sut), &p_sut, &q_sut);
       {
         u3_noun foz = _crop_dext(van, q_sut, ref, bix);
-        u3_noun ret = u3_cqf_face(p_sut, foz);
+        u3_noun ret = u3qf_face(p_sut, foz);
 
         u3z(foz);
         return ret;
@@ -143,7 +143,7 @@
       {
         u3_noun dis = _crop_dext(van, p_sut, ref, bix);
         u3_noun dat = _crop_dext(van, q_sut, ref, bix);
-        u3_noun ret = u3_cqf_fork(dis, dat);
+        u3_noun ret = u3qf_fork(dis, dat);
 
         u3z(dis);
         u3z(dat);
@@ -153,10 +153,10 @@
       {
         u3_noun hud = u3nc(u3k(sut), u3k(ref));
 
-        if ( c3y == u3_cqdi_has(bix, hud) ) {
+        if ( c3y == u3qdi_has(bix, hud) ) {
 #         if 0
-            u3_noun dun = u3_cqfu_dunq(van, "type", sut);
-            u3_noun niz = u3_cqfu_dunq(van, "over", ref);
+            u3_noun dun = u3qfu_dunq(van, "type", sut);
+            u3_noun niz = u3qfu_dunq(van, "over", ref);
 
             u3t_push(u3nc(c3__mean, dun));
             u3t_push(u3nc(c3__mean, niz));
@@ -164,7 +164,7 @@
 
           return u3m_error("crop-loop");
         } else {
-          u3_noun bux = u3_cqdi_put(bix, hud);
+          u3_noun bux = u3qdi_put(bix, hud);
           u3_noun ret = _crop_repo(van, sut, ref, bux);
 
           u3z(hud);
@@ -209,7 +209,7 @@
       }
       case c3__hold: p_ref = u3t(ref);
       {
-        u3_noun rep = u3_cqfu_repo(van, ref);
+        u3_noun rep = u3qfu_repo(van, ref);
         u3_noun ret = _crop_dext(van, sut, rep, bix);
 
         u3z(rep);
@@ -230,7 +230,7 @@
 /* boilerplate
 */
   u3_noun
-  u3_cwfu_crop(
+  u3wfu_crop(
                        u3_noun cor)
   {
     u3_noun sut, ref, van;
@@ -245,7 +245,7 @@
   }
 
   u3_noun
-  u3_cqfu_crop(u3_noun van,
+  u3qfu_crop(u3_noun van,
                         u3_noun sut,
                         u3_noun ref)
   {
diff --git a/j/6/ut_cull.c b/j/6/ut_cull.c
index 4544757ea8..c99732d636 100644
--- a/j/6/ut_cull.c
+++ b/j/6/ut_cull.c
@@ -27,7 +27,7 @@
       default: return u3m_bail(c3__fail);
 
       case c3__noun: {
-        u3_noun pyr = u3_cqfu_repo(van, sut);
+        u3_noun pyr = u3qfu_repo(van, sut);
         u3_noun yot = _cqfu_cull(van, pyr, pol, axe, ref);
 
         if ( c3y == u3r_sing(pyr, yot) ) {
@@ -58,7 +58,7 @@
         if ( c3y == u3r_sing(hic, q_sut) ) {
           ret = u3k(sut);
         } else {
-          ret = u3_cqf_bull(p_sut, hic);
+          ret = u3qf_bull(p_sut, hic);
         }
         u3z(hic);
 
@@ -70,10 +70,10 @@
 
         if ( 2 == now ) {
           hub = _cqfu_cull(van, p_sut, pol, lat, ref);
-          ret = u3_cqf_cell(hub, q_sut);
+          ret = u3qf_cell(hub, q_sut);
         } else {
           hub = _cqfu_cull(van, q_sut, pol, lat, ref);
-          ret = u3_cqf_cell(p_sut, hub);
+          ret = u3qf_cell(p_sut, hub);
         }
         u3z(hub);
         break;
@@ -86,7 +86,7 @@
           u3_noun hub = _cqfu_cull
                                    (van, p_sut, pol, lat, ref);
 
-          ret = u3_cqf_core(hub, q_sut);
+          ret = u3qf_core(hub, q_sut);
 
           u3z(hub);
         }
@@ -100,7 +100,7 @@
         if ( c3y == u3r_sing(hic, q_sut) ) {
           ret = u3k(sut);
         } else {
-          ret = u3_cqf_face(p_sut, hic);
+          ret = u3qf_face(p_sut, hic);
         }
         u3z(hic);
 
@@ -108,16 +108,16 @@
       }
       case c3__fork: u3x_cell(u3t(sut), &p_sut, &q_sut);
       {
-        if ( c3y == u3_cqdi_has(vil, sut) ) {
+        if ( c3y == u3qdi_has(vil, sut) ) {
           return c3__void;
         } else {
-          u3_noun zoc = u3_cqdi_put(vil, sut);
+          u3_noun zoc = u3qdi_put(vil, sut);
           u3_noun sin = _cull_in
             (van, p_sut, pol, axe, ref, now, lat, zoc);
           u3_noun dex = _cull_in
             (van, q_sut, pol, axe, ref, now, lat, zoc);
 
-          ret = u3_cqf_fork(sin, dex);
+          ret = u3qf_fork(sin, dex);
           u3z(sin);
           u3z(dex);
           u3z(zoc);
@@ -128,7 +128,7 @@
       case c3__cube:
       case c3__hold:
       {
-        u3_noun pyr = u3_cqfu_repo(van, sut);
+        u3_noun pyr = u3qfu_repo(van, sut);
         u3_noun yot = _cull_in(van, pyr, pol, axe, ref, now, lat, vil);
 
         if ( c3y == u3r_sing(pyr, yot) ) {
@@ -158,13 +158,13 @@
   {
     if ( 1 == axe ) {
       if ( c3y == pol ) {
-        return u3_cqfu_fuse(van, sut, ref);
+        return u3qfu_fuse(van, sut, ref);
       } else {
-        return u3_cqfu_crop(van, sut, ref);
+        return u3qfu_crop(van, sut, ref);
       }
     } else {
-      u3_atom now = u3_cqc_cap(axe);
-      u3_atom lat = u3_cqc_mas(axe);
+      u3_atom now = u3qc_cap(axe);
+      u3_atom lat = u3qc_mas(axe);
 
       return _cull_in(van, sut, pol, axe, ref, now, lat, u3_nul);
     }
@@ -173,7 +173,7 @@
 /* boilerplate
 */
   u3_noun
-  u3_cwfu_cull(u3_noun cor)
+  u3wfu_cull(u3_noun cor)
   {
     u3_noun sut, axe, pol, ref, van;
 
@@ -191,7 +191,7 @@
   }
 
   u3_noun
-  u3_cqfu_cull(u3_noun van,
+  u3qfu_cull(u3_noun van,
                         u3_noun sut,
                         u3_noun pol,
                         u3_noun axe,
diff --git a/j/6/ut_find.c b/j/6/ut_find.c
index 1ea55fd018..320bd2eee5 100644
--- a/j/6/ut_find.c
+++ b/j/6/ut_find.c
@@ -45,7 +45,7 @@
             } else {
               return _fino_in
                 (
-                 van, q_sut, u3_cqa_dec(dep), way, cog, gil);
+                 van, q_sut, u3qa_dec(dep), way, cog, gil);
             }
           }
         }
@@ -74,7 +74,7 @@
               ret = u3nq
                 (u3k(p_bov),
                         u3_nul,
-                        u3_cqc_peg(3, puq_bov),
+                        u3qc_peg(3, puq_bov),
                         u3k(quq_bov));
             }
             u3z(bov);
@@ -86,7 +86,7 @@
             ret = u3nq
               (u3k(p_taf),
                       u3_nul,
-                      u3_cqc_peg(2, puq_taf),
+                      u3qc_peg(2, puq_taf),
                       u3k(quq_taf));
           }
           u3z(taf);
@@ -103,12 +103,12 @@
         {
           return u3m_bail(c3__fail);
         } else {
-          u3_noun zem = u3_cqf_look(cog, qrq_sut);
+          u3_noun zem = u3qf_look(cog, qrq_sut);
 
           if ( (u3_nul != zem) && (0 != dep) ) {
             u3_noun ped;
 
-            ped = u3_cqa_dec(dep);
+            ped = u3qa_dec(dep);
             u3z(dep); dep = ped;
 
             u3z(zem);
@@ -130,12 +130,12 @@
 
               u3r_mean(q_taf, 6, &puq_taf, 7, &quq_taf, 0);
 
-              if ( c3n == u3_cqfu_park
+              if ( c3n == u3qfu_park
                     (van, sut, way, puq_taf) )
               {
-                u3_noun weh = u3_cqfu_shep
+                u3_noun weh = u3qfu_shep
                   (van, "way", 'a', u3k(way));
-                u3_noun waz = u3_cqfu_shep
+                u3_noun waz = u3qfu_shep
                   (van, "axis", 'd', u3k(puq_taf));
 
                 u3t_push(u3nc(c3__mean, weh));
@@ -146,7 +146,7 @@
                 pro = u3nq
                   (u3k(p_taf),
                           u3_nul,
-                          u3_cqc_peg(3, puq_taf),
+                          u3qc_peg(3, puq_taf),
                           u3k(quq_taf));
 
                 u3z(taf);
@@ -175,7 +175,7 @@
                      1,
                      1,
                      u3nc
-                       (u3_cqc_peg(2, pu_zem),
+                       (u3qc_peg(2, pu_zem),
                                u3nc(
                                      u3nc(mut, u3k(qu_zem)),
                                      u3_nul))));
@@ -197,13 +197,13 @@
                         u3nq(u3_nul, 1, 0, u3k(q_sut)));
             } else {
               return u3nc
-                (u3_cqa_dec(dep), u3_nul);
+                (u3qa_dec(dep), u3_nul);
             }
           }
         }
       }
       case c3__cube: {
-        u3_noun fop = u3_cqfu_repo(van, sut);
+        u3_noun fop = u3qfu_repo(van, sut);
         u3_noun pro = _fino_in(van, fop, dep, way, cog, gil);
 
         u3z(fop);
@@ -214,10 +214,10 @@
           return u3m_bail(c3__fail);
         }
 
-        if ( (c3y == u3_cqdi_has(gil, q_sut)) ) {
+        if ( (c3y == u3qdi_has(gil, q_sut)) ) {
           return _fino_in(van, p_sut, dep, way, cog, gil);
         }
-        else if ( (c3y == u3_cqdi_has(gil, p_sut)) ) {
+        else if ( (c3y == u3qdi_has(gil, p_sut)) ) {
           return _fino_in(van, q_sut, dep, way, cog, gil);
         }
         else {
@@ -262,7 +262,7 @@
                      u3_nul,
                      u3k(puq_hax),
                      0,
-                     u3_cqf_fork(pquq_hax, pquq_yor)));
+                     u3qf_fork(pquq_hax, pquq_yor)));
                 break;
               }
               case 1: {
@@ -283,7 +283,7 @@
                               1,
                               u3nc
                                 (u3k(pquq_hax),
-                                        u3_cqb_weld
+                                        u3qb_weld
                                           (qquq_hax, qquq_yor))));
                   break;
                 }
@@ -322,10 +322,10 @@
                                    u3k(ppquq_hax),
                                    u3k(qpquq_hax),
                                    u3k(rpquq_hax),
-                                   u3_cqf_fork(
+                                   u3qf_fork(
                                                      spquq_hax,
                                                      spquq_yor)),
-                             u3_cqf_fork(qquq_hax, qquq_yor))));
+                             u3qf_fork(qquq_hax, qquq_yor))));
                   break;
                 }
               }
@@ -339,12 +339,12 @@
       }
       case c3__hold: p_sut = u3t(sut);
       {
-        if ( (c3y == u3_cqdi_has(gil, sut)) ) {
+        if ( (c3y == u3qdi_has(gil, sut)) ) {
           return u3nc(u3k(dep), u3_nul);
         }
         else {
-          u3_noun zoc = u3_cqdi_put(gil, sut);
-          u3_noun fop = u3_cqfu_repo(van, sut);
+          u3_noun zoc = u3qdi_put(gil, sut);
+          u3_noun fop = u3qfu_repo(van, sut);
           u3_noun pro = _fino_in(van, fop, dep, way, cog, zoc);
 
           u3z(fop);
@@ -396,9 +396,9 @@
             } else {
               return _find_in
                 (
-                 van, q_sut, u3_cqa_dec(dep), way, cog, gil);
+                 van, q_sut, u3qa_dec(dep), way, cog, gil);
               return u3nc
-                (u3_cqa_dec(dep), u3_nul);
+                (u3qa_dec(dep), u3_nul);
             }
           }
         }
@@ -427,7 +427,7 @@
               ret = u3nq
                 (u3k(p_bov),
                         u3_nul,
-                        u3_cqc_peg(3, puq_bov),
+                        u3qc_peg(3, puq_bov),
                         u3k(quq_bov));
             }
             u3z(bov);
@@ -439,7 +439,7 @@
             ret = u3nq
               (u3k(p_taf),
                       u3_nul,
-                      u3_cqc_peg(2, puq_taf),
+                      u3qc_peg(2, puq_taf),
                       u3k(quq_taf));
           }
           u3z(taf);
@@ -456,12 +456,12 @@
         {
           return u3m_bail(c3__fail);
         } else {
-          u3_noun zem = u3_cqf_look(cog, qrq_sut);
+          u3_noun zem = u3qf_look(cog, qrq_sut);
 
           if ( (u3_nul != zem) && (0 != dep) ) {
             u3_noun ped;
 
-            ped = u3_cqa_dec(dep);
+            ped = u3qa_dec(dep);
             u3z(dep); dep = ped;
 
             u3z(zem);
@@ -483,12 +483,12 @@
 
               u3r_mean(q_taf, 6, &puq_taf, 7, &quq_taf, 0);
 
-              if ( c3n == u3_cqfu_park
+              if ( c3n == u3qfu_park
                     (van, sut, way, puq_taf) )
               {
-                u3_noun weh = u3_cqfu_shep
+                u3_noun weh = u3qfu_shep
                   (van, "way", 'a', u3k(way));
-                u3_noun waz = u3_cqfu_shep
+                u3_noun waz = u3qfu_shep
                   (van, "axis", 'd', u3k(puq_taf));
 
                 u3t_push(u3nc(c3__mean, weh));
@@ -499,7 +499,7 @@
                 pro = u3nq
                   (u3k(p_taf),
                           u3_nul,
-                          u3_cqc_peg(3, puq_taf),
+                          u3qc_peg(3, puq_taf),
                           u3k(quq_taf));
 
                 u3z(taf);
@@ -528,7 +528,7 @@
                      1,
                      c3n,
                      u3nc
-                       (u3_cqc_peg(2, pu_zem),
+                       (u3qc_peg(2, pu_zem),
                                u3nc(
                                      u3nc(mut, u3k(qu_zem)),
                                      u3_nul))));
@@ -550,13 +550,13 @@
                         u3nq(u3_nul, 1, c3y, u3k(q_sut)));
             } else {
               return u3nc
-                (u3_cqa_dec(dep), u3_nul);
+                (u3qa_dec(dep), u3_nul);
             }
           }
         }
       }
       case c3__cube: {
-        u3_noun fop = u3_cqfu_repo(van, sut);
+        u3_noun fop = u3qfu_repo(van, sut);
         u3_noun pro = _find_in(van, fop, dep, way, cog, gil);
 
         u3z(fop);
@@ -567,10 +567,10 @@
           return u3m_bail(c3__fail);
         }
 
-        if ( (c3y == u3_cqdi_has(gil, q_sut)) ) {
+        if ( (c3y == u3qdi_has(gil, q_sut)) ) {
           return _find_in(van, p_sut, dep, way, cog, gil);
         }
-        else if ( (c3y == u3_cqdi_has(gil, p_sut)) ) {
+        else if ( (c3y == u3qdi_has(gil, p_sut)) ) {
           return _find_in(van, q_sut, dep, way, cog, gil);
         }
         else {
@@ -615,7 +615,7 @@
                      u3_nul,
                      u3k(puq_hax),
                      c3y,
-                     u3_cqf_fork(pquq_hax, pquq_yor)));
+                     u3qf_fork(pquq_hax, pquq_yor)));
                 break;
               }
               case c3n: {
@@ -636,7 +636,7 @@
                               c3n,
                               u3nc
                                 (u3k(pquq_hax),
-                                        u3_cqb_weld
+                                        u3qb_weld
                                           (qquq_hax, qquq_yor))));
                   break;
                 }
@@ -651,12 +651,12 @@
       }
       case c3__hold: p_sut = u3t(sut);
       {
-        if ( (c3y == u3_cqdi_has(gil, sut)) ) {
+        if ( (c3y == u3qdi_has(gil, sut)) ) {
           return u3nc(u3k(dep), u3_nul);
         }
         else {
-          u3_noun zoc = u3_cqdi_put(gil, sut);
-          u3_noun fop = u3_cqfu_repo(van, sut);
+          u3_noun zoc = u3qdi_put(gil, sut);
+          u3_noun fop = u3qfu_repo(van, sut);
           u3_noun pro = _find_in(van, fop, dep, way, cog, zoc);
 
           u3z(fop);
@@ -693,7 +693,7 @@
 /* boilerplate
 */
   u3_noun
-  u3_cwfu_fino(
+  u3wfu_fino(
                        u3_noun cor)
   {
     u3_noun sut, dep, way, cog, van;
@@ -712,7 +712,7 @@
   }
 
   u3_noun
-  u3_cqfu_fino(
+  u3qfu_fino(
                         u3_noun van,
                         u3_noun sut,
                         u3_noun dep,
@@ -736,7 +736,7 @@
 /* boilerplate
 */
   u3_noun
-  u3_cwfu_find(
+  u3wfu_find(
                        u3_noun cor)
   {
     u3_noun sut, dep, way, cog, van;
@@ -755,7 +755,7 @@
   }
 
   u3_noun
-  u3_cqfu_find(
+  u3qfu_find(
                         u3_noun van,
                         u3_noun sut,
                         u3_noun dep,
diff --git a/j/6/ut_fink.c b/j/6/ut_fink.c
index 9194552447..63d69c283e 100644
--- a/j/6/ut_fink.c
+++ b/j/6/ut_fink.c
@@ -15,21 +15,21 @@
                         u3_noun way,
                         u3_noun cog)
   {
-    u3_noun dun = u3_cqfu_dunq(van, "type", sut);
+    u3_noun dun = u3qfu_dunq(van, "type", sut);
     u3_noun nuc = (u3_blip == cog)
-      ? u3_cqfu_shew
+      ? u3qfu_shew
           (van,
                   u3nc
                     (u3nc('c', u3i_string("find-limb")),
                             '$'))
-      :  u3_cqfu_shep
+      :  u3qfu_shep
           (van, "find-limb", 'a', u3k(cog));
     u3_noun pro;
 
     u3t_push(u3nc(c3__mean, dun));
     u3t_push(u3nc(c3__mean, nuc));
     {
-      u3_noun hoq = u3_cqfu_find(van, sut, dep, way, cog);
+      u3_noun hoq = u3qfu_find(van, sut, dep, way, cog);
       u3_noun fin = u3t(hoq);
 
       if ( u3_nul == fin ) {
@@ -50,7 +50,7 @@
 /* boilerplate
 */
   u3_noun
-  u3_cwfu_fink(u3_noun cor)
+  u3wfu_fink(u3_noun cor)
   {
     u3_noun sut, dep, way, cog, van;
 
@@ -68,7 +68,7 @@
   }
 
   u3_noun
-  u3_cqfu_fink(
+  u3qfu_fink(
                         u3_noun van,
                         u3_noun sut,
                         u3_noun dep,
diff --git a/j/6/ut_fire.c b/j/6/ut_fire.c
index d552d715b9..ad7dbdb5ff 100644
--- a/j/6/ut_fire.c
+++ b/j/6/ut_fire.c
@@ -13,21 +13,21 @@
              u3_noun dox,
              u3_noun gen)
   {
-    u3_noun rib = u3r_at(u3_cqfu_van_rib, van);
+    u3_noun rib = u3r_at(u3qfu_van_rib, van);
     u3_noun key = u3nt(u3k(sut),
                                u3k(dox),
                                u3k(gen));
     u3_noun ret;
 
-    if ( c3y == u3_cqdi_has(rib, key) ) {
+    if ( c3y == u3qdi_has(rib, key) ) {
       ret = c3y;
     }
     else {
-      u3_noun rob = u3_cqdi_put(rib, key);
+      u3_noun rob = u3qdi_put(rib, key);
       u3_noun von = u3i_molt(u3k(van),
-                                      u3_cqfu_van_rib, u3k(rob),
+                                      u3qfu_van_rib, u3k(rob),
                                       0);
-      ret = u3_cqfu_mull(von, sut, c3__noun, dox, gen);
+      ret = u3qfu_mull(von, sut, c3__noun, dox, gen);
 
       u3z(von);
       u3z(rob);
@@ -59,12 +59,12 @@
 
       if ( c3__ash == u3h(gat) ) {
         if ( (c3y == vet) &&
-             (c3n == u3_cqfu_nest
+             (c3n == u3qfu_nest
                 (van, qq_typ, c3y, p_typ)) )
         {
 #if 0
-          u3_noun dun = u3_cqfu_dunq(van, "need", qq_typ);
-          u3_noun niz = u3_cqfu_dunq(van, "have", p_typ);
+          u3_noun dun = u3qfu_dunq(van, "need", qq_typ);
+          u3_noun niz = u3qfu_dunq(van, "have", p_typ);
 
           u3t_push(u3nc(c3__mean, niz));
           u3t_push(u3nc(c3__mean, dun));
@@ -83,8 +83,8 @@
              (c3n == _fire_mull(van, typ, dox, t_gat)) )
         {
 #if 0
-          u3_noun dun = u3_cqfu_dunq(van, "wild", typ);
-          u3_noun niz = u3_cqfu_dunq(van, "tame", dox);
+          u3_noun dun = u3qfu_dunq(van, "wild", typ);
+          u3_noun niz = u3qfu_dunq(van, "tame", dox);
 
           u3t_push(u3nc(c3__mean, dun));
           u3t_push(u3nc(c3__mean, niz));
@@ -127,7 +127,7 @@
                         u3_noun sut,
                         u3_noun hag)
   {
-    u3_noun vet = u3r_at(u3_cqfu_van_vet, van);
+    u3_noun vet = u3r_at(u3qfu_van_vet, van);
 
     {
       if ( (c3y == u3du(hag)) && (u3_nul == u3t(hag)) ) {
@@ -153,7 +153,7 @@
 /* boilerplate
 */
   u3_noun
-  u3_cwfu_fire(
+  u3wfu_fire(
                        u3_noun cor)
   {
     u3_noun sut, hag, van;
@@ -168,7 +168,7 @@
   }
 
   u3_noun
-  u3_cqfu_fire(u3_noun van,
+  u3qfu_fire(u3_noun van,
                         u3_noun sut,
                         u3_noun hag)
   {
diff --git a/j/6/ut_firm.c b/j/6/ut_firm.c
index b2f0e204f1..f02bfb8421 100644
--- a/j/6/ut_firm.c
+++ b/j/6/ut_firm.c
@@ -82,7 +82,7 @@
       }
       case c3__hold:
       {
-        u3_noun goy = u3_cqfu_repo(van, sut);
+        u3_noun goy = u3qfu_repo(van, sut);
         u3_noun ret = _cqfu_firm(van, goy, dib);
 
         u3z(goy);
@@ -94,7 +94,7 @@
 /* boilerplate
 */
   u3_noun
-  u3_cwfu_firm(
+  u3wfu_firm(
                        u3_noun cor)
   {
     u3_noun sut, dib, van;
@@ -109,7 +109,7 @@
   }
 
   u3_noun
-  u3_cqfu_firm(u3_noun van,
+  u3qfu_firm(u3_noun van,
                         u3_noun sut,
                         u3_noun dib)
   {
diff --git a/j/6/ut_fish.c b/j/6/ut_fish.c
index 846f436bc5..a3f04dc980 100644
--- a/j/6/ut_fish.c
+++ b/j/6/ut_fish.c
@@ -31,7 +31,7 @@
 
       case c3__atom: {
         u3_noun ton = u3nt(3, 0, u3k(axe));
-        u3_noun pro = u3_cqf_flip(ton);
+        u3_noun pro = u3qf_flip(ton);
 
         u3z(ton);
         return pro;
@@ -44,12 +44,12 @@
           return u3m_bail(c3__fail);
         } else {
           u3_noun hut = u3nt(3, 0, u3k(axe));
-          u3_noun lef = u3_cqc_peg(axe, 2);
-          u3_noun rit = u3_cqc_peg(axe, 3);
+          u3_noun lef = u3qc_peg(axe, 2);
+          u3_noun rit = u3qc_peg(axe, 3);
           u3_noun hed = _fish_in(van, p_sut, lef, vit);
           u3_noun tal = _fish_in(van, q_sut, rit, vit);
-          u3_noun hob = u3_cqf_flan(hed, tal);
-          u3_noun vug = u3_cqf_flan(hut, hob);
+          u3_noun hob = u3qf_flan(hed, tal);
+          u3_noun vug = u3qf_flan(hut, hob);
 
           u3z(hob);
           u3z(tal);
@@ -88,7 +88,7 @@
         else {
           u3_noun hed = _fish_in(van, p_sut, axe, vit);
           u3_noun tal = _fish_in(van, q_sut, axe, vit);
-          u3_noun pro = u3_cqf_flor(hed, tal);
+          u3_noun pro = u3qf_flor(hed, tal);
 
           u3z(hed);
           u3z(tal);
@@ -99,9 +99,9 @@
       case c3__hold: {
         p_sut = u3t(sut);
         {
-          if ( (c3y == u3_cqdi_has(vit, sut)) ) {
-            //  u3_noun dun = u3_cqfu_dunq(van, "type", sut);
-            u3_noun niz = u3_cqfu_shep
+          if ( (c3y == u3qdi_has(vit, sut)) ) {
+            //  u3_noun dun = u3qfu_dunq(van, "type", sut);
+            u3_noun niz = u3qfu_shep
               (van, "axis", 'd', u3k(axe));
 
             //  u3t_push(u3nc(c3__mean, dun));
@@ -109,8 +109,8 @@
 
             return u3m_error("fish-loop");
           } else {
-            u3_noun zoc = u3_cqdi_put(vit, sut);
-            u3_noun fop = u3_cqfu_rest(van, sut, p_sut);
+            u3_noun zoc = u3qdi_put(vit, sut);
+            u3_noun fop = u3qfu_rest(van, sut, p_sut);
             u3_noun pro = _fish_in(van, fop, axe, zoc);
 
             u3z(fop);
@@ -135,7 +135,7 @@
 /* boilerplate
 */
   u3_noun
-  u3_cwfu_fish(
+  u3wfu_fish(
                        u3_noun cor)
   {
     u3_noun sut, axe, van;
@@ -151,7 +151,7 @@
   }
 
   u3_noun
-  u3_cqfu_fish(u3_noun van,
+  u3qfu_fish(u3_noun van,
                         u3_noun sut,
                         u3_noun axe)
   {
diff --git a/j/6/ut_fuse.c b/j/6/ut_fuse.c
index 46c078e608..8621c1bcca 100644
--- a/j/6/ut_fuse.c
+++ b/j/6/ut_fuse.c
@@ -17,7 +17,7 @@
              u3_noun ref,
              u3_noun bix)
   {
-    u3_noun rep = u3_cqfu_repo(van, sut);
+    u3_noun rep = u3qfu_repo(van, sut);
     u3_noun ret = _fuse_in(van, rep, ref, bix);
 
     if ( c3y == u3r_sing(ret, rep) ) {
@@ -65,7 +65,7 @@
       {
         if ( c3y == u3du(ref) ) {
           if ( c3__atom == u3h(ref) ) {
-            if ( c3y == u3_cqf_fitz(u3t(ref), u3t(sut)) ) {
+            if ( c3y == u3qf_fitz(u3t(ref), u3t(sut)) ) {
               return u3k(sut);
             } else return u3k(ref);
           }
@@ -78,7 +78,7 @@
       case c3__bull: u3x_cell(u3t(sut), &p_sut, &q_sut);
       {
         u3_noun vot = _fuse_in(van, q_sut, ref, bix);
-        u3_noun ret = u3_cqf_bull(p_sut, vot);
+        u3_noun ret = u3qf_bull(p_sut, vot);
 
         u3z(vot);
         return ret;
@@ -90,7 +90,7 @@
         if ( c3y == u3r_pq(ref, c3__cell, &p_ref, &q_ref) ) {
           u3_noun hed = _fuse_in(van, p_sut, p_ref, bix);
           u3_noun tal = _fuse_in(van, q_sut, q_ref, bix);
-          u3_noun ret = u3_cqf_cell(hed, tal);
+          u3_noun ret = u3qf_cell(hed, tal);
 
           u3z(hed);
           u3z(tal);
@@ -107,10 +107,10 @@
         u3_noun foz = _fuse_in(van, q_sut, ref, bix);
         u3_noun ret;
 
-        if ( c3n == u3_cqfu_firm(van, foz, p_sut) ) {
+        if ( c3n == u3qfu_firm(van, foz, p_sut) ) {
           ret = c3__void;
         } else {
-          ret = u3_cqf_cube(p_sut, foz);
+          ret = u3qf_cube(p_sut, foz);
         }
         u3z(foz);
         return ret;
@@ -118,7 +118,7 @@
       case c3__face: u3x_cell(u3t(sut), &p_sut, &q_sut);
       {
         u3_noun vot = _fuse_in(van, q_sut, ref, bix);
-        u3_noun ret = u3_cqf_face(p_sut, vot);
+        u3_noun ret = u3qf_face(p_sut, vot);
 
         u3z(vot);
         return ret;
@@ -127,7 +127,7 @@
       {
         u3_noun dis = _fuse_in(van, p_sut, ref, bix);
         u3_noun dat = _fuse_in(van, q_sut, ref, bix);
-        u3_noun ret = u3_cqf_fork(dis, dat);
+        u3_noun ret = u3qf_fork(dis, dat);
 
         u3z(dis);
         u3z(dat);
@@ -137,16 +137,16 @@
       {
         u3_noun hud = u3nc(u3k(sut), u3k(ref));
 
-        if ( c3y == u3_cqdi_has(bix, hud) ) {
-          //  u3_noun dun = u3_cqfu_dunq(van, "type", sut);
-          //  u3_noun niz = u3_cqfu_dunq(van, "over", ref);
+        if ( c3y == u3qdi_has(bix, hud) ) {
+          //  u3_noun dun = u3qfu_dunq(van, "type", sut);
+          //  u3_noun niz = u3qfu_dunq(van, "over", ref);
 
           //  u3t_push(u3nc(c3__mean, dun));
           //  u3t_push(u3nc(c3__mean, niz));
 
           return u3m_error("fuse-loop");
         } else {
-          u3_noun bux = u3_cqdi_put(bix, hud);
+          u3_noun bux = u3qdi_put(bix, hud);
           u3_noun ret = _fuse_repo(van, sut, ref, bux);
 
           u3z(hud);
@@ -169,7 +169,7 @@
 /* boilerplate
 */
   u3_noun
-  u3_cwfu_fuse(
+  u3wfu_fuse(
                        u3_noun cor)
   {
     u3_noun sut, ref, van;
@@ -184,7 +184,7 @@
   }
 
   u3_noun
-  u3_cqfu_fuse(u3_noun van,
+  u3qfu_fuse(u3_noun van,
                         u3_noun sut,
                         u3_noun ref)
   {
diff --git a/j/6/ut_gain.c b/j/6/ut_gain.c
index 3ae2cd4622..8525801069 100644
--- a/j/6/ut_gain.c
+++ b/j/6/ut_gain.c
@@ -6,7 +6,7 @@
 
 
   u3_noun
-  u3_cqfu_gain(u3_noun van, u3_noun sut, u3_noun gen)
+  u3qfu_gain(u3_noun van, u3_noun sut, u3_noun gen)
   {
     u3_noun von = u3i_molt(u3k(van), u3v_sam, u3k(sut), 0);
     u3_noun gat = u3j_hook(von, "gain");
diff --git a/j/6/ut_heal.c b/j/6/ut_heal.c
index 402f73d64b..903b4bb595 100644
--- a/j/6/ut_heal.c
+++ b/j/6/ut_heal.c
@@ -39,7 +39,7 @@
           u3_noun sub = _heal_by(van, q_sut, qog, ref);
           u3_noun ret;
 
-          ret = u3_cqfu_busk
+          ret = u3qfu_busk
             (van, sub, u3h(p_sut), u3h(u3t(p_sut)));
 
           u3z(sub);
@@ -49,12 +49,12 @@
       case c3__face: u3x_cell(u3t(sut), &p_sut, &q_sut);
       {
         if ( c3y == u3r_sing(p_sut, u3t(qog)) ) {
-          return u3_cqf_face(p_sut, ref);
+          return u3qf_face(p_sut, ref);
         }
         else return u3m_error("heal-name");
       }
       case c3__hold: {
-        u3_noun rep = u3_cqfu_repo(van, sut);
+        u3_noun rep = u3qfu_repo(van, sut);
         u3_noun ret = _heal_by(van, rep, qog, ref);
 
         u3z(rep);
@@ -64,7 +64,7 @@
       {
         u3_noun dis = _heal_by(van, p_sut, qog, ref);
         u3_noun dat = _heal_by(van, q_sut, qog, ref);
-        u3_noun ret = u3_cqf_fork(dis, dat);
+        u3_noun ret = u3qf_fork(dis, dat);
 
         u3z(dis);
         u3z(dat);
@@ -98,7 +98,7 @@
         u3_noun sub = _heal_to(van, q_sut, gil, qog, ref, now, lat);
         u3_noun ret;
 
-        ret = u3_cqfu_busk
+        ret = u3qfu_busk
           (van, sub, u3h(p_sut), u3h(u3t(p_sut)));
 
         u3z(sub);
@@ -110,10 +110,10 @@
 
         if ( 2 == now ) {
           ter = _heal_as(van, p_sut, qog, lat, ref);
-          ret = u3_cqf_cell(ter, q_sut);
+          ret = u3qf_cell(ter, q_sut);
         } else {
           ter = _heal_as(van, q_sut, qog, lat, ref);
-          ret = u3_cqf_cell(p_sut, ter);
+          ret = u3qf_cell(p_sut, ter);
         }
         u3z(ter);
         return ret;
@@ -125,7 +125,7 @@
           return u3m_error("heal-core");
         } else {
           u3_noun ter = _heal_as(van, p_sut, qog, lat, ref);
-          u3_noun ret = u3_cqf_core(ter, q_sut);
+          u3_noun ret = u3qf_core(ter, q_sut);
 
           u3z(ter);
           return ret;
@@ -134,7 +134,7 @@
       case c3__face: u3x_cell(u3t(sut), &p_sut, &q_sut);
       {
         u3_noun dun = _heal_to(van, q_sut, gil, qog, ref, now, lat);
-        u3_noun ret = u3_cqf_face(p_sut, dun);
+        u3_noun ret = u3qf_face(p_sut, dun);
 
         u3z(dun);
         return ret;
@@ -143,7 +143,7 @@
       {
         u3_noun dis = _heal_to(van, p_sut, gil, qog, ref, now, lat);
         u3_noun dat = _heal_to(van, q_sut, gil, qog, ref, now, lat);
-        u3_noun ret = u3_cqf_fork(dis, dat);
+        u3_noun ret = u3qf_fork(dis, dat);
 
         u3z(dis);
         u3z(dat);
@@ -151,12 +151,12 @@
       }
 
       case c3__hold: {
-        if ( (c3y == u3_cqdi_has(gil, sut)) ) {
+        if ( (c3y == u3qdi_has(gil, sut)) ) {
           return c3__void;
         }
         else {
-          u3_noun zoc = u3_cqdi_put(gil, sut);
-          u3_noun rep = u3_cqfu_repo(van, sut);
+          u3_noun zoc = u3qdi_put(gil, sut);
+          u3_noun rep = u3qfu_repo(van, sut);
           u3_noun ret = _heal_to(van, rep, zoc, qog, ref, now, lat);
 
           u3z(rep);
@@ -168,7 +168,7 @@
     }
 
     repo: {
-      u3_noun rep = u3_cqfu_repo(van, sut);
+      u3_noun rep = u3qfu_repo(van, sut);
       u3_noun ret = _heal_to(van, rep, gil, qog, ref, now, lat);
 
       u3z(rep);
@@ -190,8 +190,8 @@
       } else return _heal_by(van, sut, qog, ref);
     }
     else {
-      u3_atom now = u3_cqc_cap(axe);
-      u3_atom lat = u3_cqc_mas(axe);
+      u3_atom now = u3qc_cap(axe);
+      u3_atom lat = u3qc_mas(axe);
       u3_noun ret = _heal_to(van, sut, u3_nul, qog, ref, now, lat);
 
       u3z(lat);
@@ -215,7 +215,7 @@
 /* boilerplate
 */
   u3_noun
-  u3_cwfu_heal(
+  u3wfu_heal(
                        u3_noun cor)
   {
     u3_noun van, sut, qog, axe, ref;
@@ -235,7 +235,7 @@
   }
 
   u3_noun
-  u3_cqfu_heal(u3_noun van,
+  u3qfu_heal(u3_noun van,
                         u3_noun sut,
                         u3_noun qog,
                         u3_noun axe,
diff --git a/j/6/ut_lose.c b/j/6/ut_lose.c
index 2e117471cf..8e8ef77951 100644
--- a/j/6/ut_lose.c
+++ b/j/6/ut_lose.c
@@ -6,7 +6,7 @@
 
 
   u3_noun
-  u3_cqfu_lose(u3_noun van,
+  u3qfu_lose(u3_noun van,
                         u3_noun sut,
                         u3_noun gen)
   {
diff --git a/j/6/ut_mint.c b/j/6/ut_mint.c
index 3d46fe80c3..f05aba9e5f 100644
--- a/j/6/ut_mint.c
+++ b/j/6/ut_mint.c
@@ -25,7 +25,7 @@ int FOO;
             u3_noun van)
   {
     // u3_noun vet = u3j_hook(u3k(van), "vet");
-    u3_noun vet = u3r_at(u3_cqfu_van_vet, van);
+    u3_noun vet = u3r_at(u3qfu_van_vet, van);
 
     switch ( vet ) {
       case c3n:
@@ -121,10 +121,10 @@ int FOO;
              u3_noun typ)
   {
     if ( (c3y == _mint_vet(van)) &&
-         (c3n == u3_cqfu_nest(van, gol, c3y, typ)) )
+         (c3n == u3qfu_nest(van, gol, c3y, typ)) )
     {
-      // u3_noun dun = u3_cqfu_dunq(van, "need", gol);
-      // u3_noun niz = u3_cqfu_dunq(van, "have", typ);
+      // u3_noun dun = u3qfu_dunq(van, "need", gol);
+      // u3_noun niz = u3qfu_dunq(van, "have", typ);
 
       // u3t_push(u3nc(c3__mean, dun));
       // u3t_push(u3nc(c3__mean, niz));
@@ -165,8 +165,8 @@ int FOO;
   {
     while ( 1 ) {
       if ( c3n == u3du(mew) ) {
-        u3_noun gim = u3_cqfu_fire(van, sut, rag);
-        u3_noun fol = u3_cqf_hike(p_lar, hej);
+        u3_noun gim = u3qfu_fire(van, sut, rag);
+        u3_noun fol = u3qf_hike(p_lar, hej);
 
         u3z(rag);
         u3z(hej);
@@ -177,10 +177,10 @@ int FOO;
         u3_noun t_mew = u3t(mew);
         u3_noun pi_mew = u3h(i_mew);
         u3_noun qi_mew = u3t(i_mew);
-        u3_noun zil = u3_cqfu_mint(van, sut, c3__noun, qi_mew);
+        u3_noun zil = u3qfu_mint(van, sut, c3__noun, qi_mew);
         u3_noun p_zil = u3h(zil);
         u3_noun q_zil = u3t(zil);
-        u3_noun wip = u3_cqfu_tock
+        u3_noun wip = u3qfu_tock
           (van, sut, pi_mew, p_zil, rag);
 
         u3z(rag);
@@ -212,10 +212,10 @@ int FOO;
       case c3y:
         von = u3k(van); break;
       case c3n:
-        von = u3i_molt(u3k(van), u3_cqfu_van_vet, c3n, 0); break;
+        von = u3i_molt(u3k(van), u3qfu_van_vet, c3n, 0); break;
     }
     {
-      u3_noun mil = u3_cqfu_mint(von, sut, c3__noun, gen);
+      u3_noun mil = u3qfu_mint(von, sut, c3__noun, gen);
       u3_noun fol = u3k(u3t(mil));
 
       u3z(mil);
@@ -305,7 +305,7 @@ int FOO;
     u3_noun ret = u3nc
       (
        _mint_nice(van, gol, cot),
-       u3_cqf_cons(zod, q_dan));
+       u3qf_cons(zod, q_dan));
 
     u3z(zod);
     u3z(toc);
@@ -356,7 +356,7 @@ int FOO;
 
     if ( c3n == u3du(gen) ) {
       u3_noun ter = u3r_at(u3v_con_3, van);
-      u3_noun rex = u3_cqfp_open(ter, gen);
+      u3_noun rex = u3qfp_open(ter, gen);
 
       ret = _mint_in(van, sut, gol, rex);
       u3z(rex);
@@ -368,12 +368,12 @@ int FOO;
       {
         u3_noun hed = _mint_in(van, sut, c3__noun, u3h(gen));
         u3_noun tal = _mint_in(van, sut, c3__noun, u3t(gen));
-        u3_noun typ = u3_cqf_cell(u3h(hed), u3h(tal));
+        u3_noun typ = u3qf_cell(u3h(hed), u3h(tal));
 
         ret = u3nc
           (
            _mint_nice(van, gol, typ),
-           u3_cqf_cons(u3t(hed), u3t(tal)));
+           u3qf_cons(u3t(hed), u3t(tal)));
 
         u3z(hed);
         u3z(tal);
@@ -383,11 +383,11 @@ int FOO;
     } else switch ( u3h(gen) ) {
       default: {
         u3_noun ter = u3r_at(u3v_con_3, van);
-        u3_noun rex = u3_cqfp_open(ter, gen);
+        u3_noun rex = u3qfp_open(ter, gen);
 
         if ( c3y == u3r_sing(rex, gen) ) {
 #if 1
-          u3_noun zix = u3_cqfu_shep(van, "gene", 'q', u3k(gen));
+          u3_noun zix = u3qfu_shep(van, "gene", 'q', u3k(gen));
 
           u3t_push(u3nc(c3__mean, zix));
           return u3m_error("mint-open");
@@ -405,9 +405,9 @@ int FOO;
       case c3__bcpt: u3x_cell(u3t(gen), &p_gen, &q_gen);
       _mint_used();
       {
-        u3_noun sep = u3_cqfu_seep(van, sut, c3__read, p_gen);
+        u3_noun sep = u3qfu_seep(van, sut, c3__read, p_gen);
         u3_noun axe = u3h(sep);
-        u3_noun rex = u3_cqfl_whip(van, q_gen, axe);
+        u3_noun rex = u3qfl_whip(van, q_gen, axe);
         u3_noun ret = _mint_in(van, sut, gol, rex);
 
         u3z(sep);
@@ -419,16 +419,16 @@ int FOO;
       case c3__wtts: u3x_cell(u3t(gen), &p_gen, &q_gen);
       _mint_used();
       {
-        u3_noun nob = u3_cqfl_bunt(van, p_gen);
+        u3_noun nob = u3qfl_bunt(van, p_gen);
         u3_noun dok = u3nc(c3__cnzz, u3k(q_gen));
         u3_noun vol = _mint_corn(van, sut, dok);
         u3_noun axe = _mint_coke(vol);
-        u3_noun wam = u3_cqfu_play(van, sut, nob);
+        u3_noun wam = u3qfu_play(van, sut, nob);
 
         ret = u3nc
           (
            _mint_nice(van, gol, _mint_bean()),
-           u3_cqfu_fish(van, wam, axe));
+           u3qfu_fish(van, wam, axe));
 
         u3z(axe);
         u3z(wam);
@@ -443,8 +443,8 @@ int FOO;
       {
         u3_noun bol = _mint_bean();
         u3_noun nor = _mint_in(van, sut, bol, p_gen);
-        u3_noun fex = u3_cqfu_gain(van, sut, p_gen);
-        u3_noun wux = u3_cqfu_lose(van, sut, p_gen);
+        u3_noun fex = u3qfu_gain(van, sut, p_gen);
+        u3_noun wux = u3qfu_lose(van, sut, p_gen);
         u3_noun duy = (c3__void == fex)
                         ? ( (c3__void == wux)
                              ?  u3nc(0, 0)
@@ -456,7 +456,7 @@ int FOO;
         u3_noun ran = _mint_in(van, wux, gol, r_gen);
 
         ret = u3nc
-          (u3_cqf_fork(u3h(hiq), u3h(ran)),
+          (u3qf_fork(u3h(hiq), u3h(ran)),
                   _mint_cond(duy,
                                     u3k(u3t(hiq)),
                                     u3k(u3t(ran))));
@@ -475,12 +475,12 @@ int FOO;
       {
         u3_noun hed = _mint_in(van, sut, c3__noun, p_gen);
         u3_noun tal = _mint_in(van, sut, c3__noun, q_gen);
-        u3_noun typ = u3_cqf_cell(u3h(hed), u3h(tal));
+        u3_noun typ = u3qf_cell(u3h(hed), u3h(tal));
 
         ret = u3nc
           (
            _mint_nice(van, gol, typ),
-           u3_cqf_cons(u3t(hed), u3t(tal)));
+           u3qf_cons(u3t(hed), u3t(tal)));
 
         u3z(hed);
         u3z(tal);
@@ -540,7 +540,7 @@ int FOO;
         u3_noun boc = (c3n == u3ud(q_gen))
                         ? c3__noun
                         : u3nc(c3__atom, u3k(p_gen));
-        u3_noun typ = u3_cqf_cube(q_gen, boc);
+        u3_noun typ = u3qf_cube(q_gen, boc);
         u3_noun ret =
             u3nc(
                   _mint_nice(van, gol, typ),
@@ -563,7 +563,7 @@ int FOO;
       case c3__dtzy: u3x_cell(u3t(gen), &p_gen, &q_gen);
       _mint_used();
       {
-        u3_noun typ = u3_cqfu_play(van, sut, gen);
+        u3_noun typ = u3qfu_play(van, sut, gen);
         u3_noun ret =
             u3nc(
                   _mint_nice(van, gol, typ),
@@ -575,7 +575,7 @@ int FOO;
       _mint_used();
       {
         u3_noun ryd = _mint_in(van, sut, gol, p_gen);
-        u3_noun tyf = u3_cqfu_wrap(van, u3h(ryd), c3__iron);
+        u3_noun tyf = u3qfu_wrap(van, u3h(ryd), c3__iron);
         u3_noun pro = u3nc(tyf, u3k(u3t(ryd)));
 
         u3z(ryd);
@@ -585,7 +585,7 @@ int FOO;
       _mint_used();
       {
         u3_noun ryd = _mint_in(van, sut, gol, p_gen);
-        u3_noun tyf = u3_cqfu_wrap(van, u3h(ryd), c3__zinc);
+        u3_noun tyf = u3qfu_wrap(van, u3h(ryd), c3__zinc);
         u3_noun pro = u3nc(tyf, u3k(u3t(ryd)));
 
         u3z(ryd);
@@ -595,7 +595,7 @@ int FOO;
       _mint_used();
       {
         u3_noun ryd = _mint_in(van, sut, gol, p_gen);
-        u3_noun tyf = u3_cqfu_wrap(van, u3h(ryd), c3__lead);
+        u3_noun tyf = u3qfu_wrap(van, u3h(ryd), c3__lead);
         u3_noun pro = u3nc(tyf, u3k(u3t(ryd)));
 
         u3z(ryd);
@@ -608,7 +608,7 @@ int FOO;
 
         ret = u3nc
           (
-           u3_cqfu_conk(van, u3h(vat), p_gen),
+           u3qfu_conk(van, u3h(vat), p_gen),
            u3k(u3t(vat)));
 
         u3z(vat);
@@ -621,7 +621,7 @@ int FOO;
 
         ret = u3nc
           (
-           u3_cqfu_conk(van, u3h(vat), p_gen),
+           u3qfu_conk(van, u3h(vat), p_gen),
            u3k(u3t(vat)));
 
         u3z(vat);
@@ -636,7 +636,7 @@ int FOO;
         u3_noun fom;
 
         {
-          u3_noun cag = u3_cqfu_burn(van, sut);
+          u3_noun cag = u3qfu_burn(van, sut);
           u3_noun wim = u3n_nock_an(cag, u3k(q_nef));
 
           if ( 0 == u3h(wim) ) {
@@ -654,7 +654,7 @@ int FOO;
       case c3__ktls: u3x_cell(u3t(gen), &p_gen, &q_gen);
       _mint_used();
       {
-        u3_noun huz = u3_cqfu_play(van, sut, p_gen);
+        u3_noun huz = u3qfu_play(van, sut, p_gen);
         u3_noun hif = _mint_nice(van, gol, huz);
         u3_noun zel = _mint_in(van, sut, hif, q_gen);
         u3_noun ret = u3nc(hif, u3k(u3t(zel)));
@@ -665,19 +665,19 @@ int FOO;
       case c3__kthx: u3x_cell(u3t(gen), &p_gen, &q_gen);
       _mint_used();
       {
-        u3_noun huz = u3_cqfu_play(van, sut, p_gen);
+        u3_noun huz = u3qfu_play(van, sut, p_gen);
         u3_noun hif = _mint_nice(van, gol, huz);
         u3_noun zel = _mint_in(van, sut, hif, q_gen);
         u3_noun ret = u3nc(hif, u3k(u3t(zel)));
 
 #if 0
         {
-          u3_noun goz = u3_cqfu_play(van, sut, q_gen);
+          u3_noun goz = u3qfu_play(van, sut, q_gen);
           u3_noun bar;
 
           FOO = 1;
           fprintf(stderr, "\r\n");
-          bar = u3_cqfu_nest(van, huz, c3n, goz);
+          bar = u3qfu_nest(van, huz, c3n, goz);
           fprintf(stderr, "kthx: bar %d\r\n", bar);
           FOO = 0;
         }
@@ -697,7 +697,7 @@ int FOO;
 
         ret = u3nc
           (u3k(p_dov),
-                  u3_cqf_comb(q_fid, q_dov));
+                  u3qf_comb(q_fid, q_dov));
 
         u3z(fid);
         u3z(dov);
@@ -706,9 +706,9 @@ int FOO;
       case c3__tstr: u3x_trel(u3t(gen), &p_gen, &q_gen, &r_gen);
       _mint_used();
       {
-        u3_noun sep = u3_cqfu_seep(van, sut, c3__both, q_gen);
+        u3_noun sep = u3qfu_seep(van, sut, c3__both, q_gen);
         u3_noun bid = u3nt(u3k(p_gen), u3k(q_gen), sep);
-        u3_noun boc = u3_cqf_bull(bid, sut);
+        u3_noun boc = u3qf_bull(bid, sut);
         u3_noun ret = _mint_in(van, boc, gol, r_gen);
 
         u3z(bid);
@@ -719,13 +719,13 @@ int FOO;
       case c3__cnts: u3x_cell(u3t(gen), &p_gen, &q_gen);
       _mint_used();
       {
-        u3_noun sec = u3_cqfu_seek(van, sut, c3__read, p_gen);
+        u3_noun sec = u3qfu_seek(van, sut, c3__read, p_gen);
         u3_noun lar = _mint_foil(sec);
         u3_noun p_lar = u3h(lar);
         u3_noun q_lar = u3t(lar);
         u3_noun pq_lar = u3h(q_lar);
         u3_noun qq_lar = u3t(q_lar);
-        u3_noun mew = u3_cqfu_snub(van, sut, q_gen);
+        u3_noun mew = u3qfu_snub(van, sut, q_gen);
         u3_noun yom = _mint_edit
           (van, sut, mew, p_lar, u3k(qq_lar), u3_nul);
         u3_noun p_yom = u3h(yom);
@@ -788,8 +788,8 @@ int FOO;
       case c3__sgzp: u3x_cell(u3t(gen), &p_gen, &q_gen);
       _mint_used();
       {
-        u3_noun typ = u3_cqfu_play(van, sut, p_gen);
-        u3_noun dug = u3_cqfu_duck(van, typ);
+        u3_noun typ = u3qfu_play(van, sut, p_gen);
+        u3_noun dug = u3qfu_duck(van, typ);
 
         u3t_push(u3nc(c3__mean, dug));
         {
@@ -822,7 +822,7 @@ int FOO;
       case c3__zpts: p_gen = u3t(gen);
       _mint_used();
       {
-        u3_noun von = u3i_molt(u3k(van), u3_cqfu_van_vet, c3n, 0);
+        u3_noun von = u3i_molt(u3k(van), u3qfu_van_vet, c3n, 0);
         u3_noun sev = _mint_corn(von, sut, p_gen);
 
         u3z(von);
@@ -835,7 +835,7 @@ int FOO;
           (
            _mint_nice(van,
                              gol,
-                             u3_cqfu_play(van, sut, p_gen)),
+                             u3qfu_play(van, sut, p_gen)),
            u3nc(1, u3k(q_gen)));
       }
       case c3__zpcb: u3x_cell(u3t(gen), &p_gen, &q_gen);
@@ -869,17 +869,17 @@ int FOO;
       _mint_used();
       {
         u3_noun vos   = _mint_in(van, sut, c3__noun, q_gen);
-        u3_noun zur   = u3_cqfu_play(van, sut, p_gen);
+        u3_noun zur   = u3qfu_play(van, sut, p_gen);
         u3_noun p_vos = u3h(vos);
         u3_noun q_vos = u3t(vos);
         u3_noun waz   = u3nc(1, u3k(p_vos));
         u3_noun sif   = u3k(zur);
-        u3_noun cig   = u3_cqf_cell(sif, p_vos);
+        u3_noun cig   = u3qf_cell(sif, p_vos);
         u3_noun ret;
 
         ret = u3nc(
                     _mint_nice(van, gol, cig),
-                    u3_cqf_cons(waz, q_vos));
+                    u3qf_cons(waz, q_vos));
 
         u3z(waz);
         u3z(zur);
@@ -892,8 +892,8 @@ int FOO;
       _mint_used();
       {
         if ( c3y == _mint_vet(van) ) {
-          u3_noun zur = u3_cqfu_play(van, sut, p_gen);
-          u3_noun dun = u3_cqfu_dunq(van, "lost", zur);
+          u3_noun zur = u3qfu_play(van, sut, p_gen);
+          u3_noun dun = u3qfu_dunq(van, "lost", zur);
 
           u3t_push(u3nc(c3__mean, dun));
           return u3m_error("mint-lost");
@@ -923,7 +923,7 @@ int FOO;
 /* boilerplate
 */
   u3_noun
-  u3_cwfu_mint(u3_noun cor)
+  u3wfu_mint(u3_noun cor)
   {
     u3_noun sut, gol, gen, van;
 
@@ -940,13 +940,13 @@ int FOO;
   }
 
   u3_noun
-  u3_cqfu_mint(u3_noun van,
+  u3qfu_mint(u3_noun van,
                         u3_noun sut,
                         u3_noun gol,
                         u3_noun gen)
   {
     c3_m    fun_m = c3__mint;
-    u3_noun vrf   = u3r_at(u3_cqfu_van_vrf, van);
+    u3_noun vrf   = u3r_at(u3qfu_van_vrf, van);
     u3_noun pro   = u3z_find_4(fun_m, vrf, sut, gol, gen);
 
     if ( u3_none != pro ) {
diff --git a/j/6/ut_mull.c b/j/6/ut_mull.c
index 5d6a552626..4dc1d5de29 100644
--- a/j/6/ut_mull.c
+++ b/j/6/ut_mull.c
@@ -15,7 +15,7 @@
             u3_noun van)
   {
     // u3_noun vet = u3j_hook(u3k(van), "vet");
-    u3_noun vet = u3r_at(u3_cqfu_van_vet, van);
+    u3_noun vet = u3r_at(u3qfu_van_vet, van);
 
     switch ( vet ) {
       case c3n:
@@ -117,7 +117,7 @@
              u3_noun sut,
              u3_noun gen)
   {
-    u3_noun fug = u3_cqfu_mint(van, sut, c3__noun, gen);
+    u3_noun fug = u3qfu_mint(van, sut, c3__noun, gen);
     u3_noun axe = _mull_coke(u3k(u3t(fug)));
 
     u3z(fug);
@@ -130,9 +130,9 @@
              u3_noun gol,
              u3_noun typ)
   {
-    if ( c3n == u3_cqfu_nest(van, gol, c3y, typ) ) {
-      // u3_noun dun = u3_cqfu_dunq(van, "need", gol);
-      // u3_noun niz = u3_cqfu_dunq(van, "have", typ);
+    if ( c3n == u3qfu_nest(van, gol, c3y, typ) ) {
+      // u3_noun dun = u3qfu_dunq(van, "need", gol);
+      // u3_noun niz = u3qfu_dunq(van, "have", typ);
 
       // u3t_push(u3nc(c3__mean, dun));
       // u3t_push(u3nc(c3__mean, niz));
@@ -266,9 +266,9 @@
         u3_noun zil = _mull_in(van, sut, c3__noun, dox, qi_mew);
         u3_noun p_zil = u3h(zil);
         u3_noun q_zil = u3t(zil);
-        u3_noun cuf = u3_cqfu_tock
+        u3_noun cuf = u3qfu_tock
               (van, sut, pi_mew, p_zil, p_yom);
-        u3_noun dof = u3_cqfu_tock
+        u3_noun dof = u3qfu_tock
               (van, sut, pi_mew, q_zil, q_yom);
 
         if ( u3r_sing(u3h(cuf), u3h(dof)) ) {
@@ -305,7 +305,7 @@
 
     if ( c3n == u3du(gen) ) {
       u3_noun ter = u3r_at(u3v_con_3, van);
-      u3_noun rex = u3_cqfp_open(ter, gen);
+      u3_noun rex = u3qfp_open(ter, gen);
 
       ret = _mull_in(van, sut, gol, dox, rex);
       u3z(rex);
@@ -317,8 +317,8 @@
       {
         u3_noun hed = _mull_in(van, sut, c3__noun, dox, u3h(gen));
         u3_noun tal = _mull_in(van, sut, c3__noun, dox, u3t(gen));
-        u3_noun dis = u3_cqf_cell(u3h(hed), u3h(tal));
-        u3_noun dat = u3_cqf_cell(u3t(hed), u3t(tal));
+        u3_noun dis = u3qf_cell(u3h(hed), u3h(tal));
+        u3_noun dat = u3qf_cell(u3t(hed), u3t(tal));
         u3_noun ret = u3nc(_mull_nice(van, gol, dis), dat);
 
         u3z(tal);
@@ -330,11 +330,11 @@
     else switch ( u3h(gen) ) {
       default: {
         u3_noun ter = u3r_at(u3v_con_3, van);
-        u3_noun rex = u3_cqfp_open(ter, gen);
+        u3_noun rex = u3qfp_open(ter, gen);
 
         if ( c3y == u3r_sing(rex, gen) ) {
 #if 1
-          u3_noun zix = u3_cqfu_shep
+          u3_noun zix = u3qfu_shep
                 (van, "gene", 'q', u3k(gen));
 
           u3t_push(u3nc(c3__mean, zix));
@@ -353,15 +353,15 @@
       case c3__bcpt: u3x_cell(u3t(gen), &p_gen, &q_gen);
       _mull_used();
       {
-        u3_noun sep = u3_cqfu_seep(van, sut, c3__read, p_gen);
-        u3_noun pox = u3_cqfu_seep(van, dox, c3__read, p_gen);
+        u3_noun sep = u3qfu_seep(van, sut, c3__read, p_gen);
+        u3_noun pox = u3qfu_seep(van, dox, c3__read, p_gen);
         u3_noun axe = u3h(sep);
 
         if ( axe != u3h(pox) ) {
           return u3m_error("mull-bonk-wing");
         }
         else {
-          u3_noun rex = u3_cqfl_whip(van, q_gen, axe);
+          u3_noun rex = u3qfl_whip(van, q_gen, axe);
           u3_noun ret = _mull_in(van, sut, gol, dox, rex);
 
           u3z(sep);
@@ -375,14 +375,14 @@
       case c3__wtts: u3x_cell(u3t(gen), &p_gen, &q_gen);
       _mull_used();
       {
-        u3_noun nob = u3_cqfl_bunt(van, p_gen);
-        u3_noun p_waz = u3_cqfu_play(van, sut, nob);
-        u3_noun q_waz = u3_cqfu_play(van, dox, nob);
+        u3_noun nob = u3qfl_bunt(van, p_gen);
+        u3_noun p_waz = u3qfu_play(van, sut, nob);
+        u3_noun q_waz = u3qfu_play(van, dox, nob);
         u3_noun dok   = u3nc(c3__cnzz, u3k(q_gen));
         u3_noun p_syx = _mull_doke(van, sut, dok);
         u3_noun q_syx = _mull_doke(van, dox, dok);
-        u3_noun p_pov = u3_cqfu_fish(van, p_waz, p_syx);
-        u3_noun q_pov = u3_cqfu_fish(van, q_waz, q_syx);
+        u3_noun p_pov = u3qfu_fish(van, p_waz, p_syx);
+        u3_noun q_pov = u3qfu_fish(van, q_waz, q_syx);
 
         if ( (c3n == u3r_sing(p_syx, q_syx)) ||
              (c3n == u3r_sing(p_pov, q_pov)) )
@@ -403,10 +403,10 @@
       {
         u3_noun bol = _mull_bean();
         u3_noun nor = _mull_in(van, sut, bol, dox, p_gen);
-        u3_noun p_fex = u3_cqfu_gain(van, sut, p_gen);
-        u3_noun q_fex = u3_cqfu_gain(van, dox, p_gen);
-        u3_noun p_wux = u3_cqfu_lose(van, sut, p_gen);
-        u3_noun q_wux = u3_cqfu_lose(van, dox, p_gen);
+        u3_noun p_fex = u3qfu_gain(van, sut, p_gen);
+        u3_noun q_fex = u3qfu_gain(van, dox, p_gen);
+        u3_noun p_wux = u3qfu_lose(van, sut, p_gen);
+        u3_noun q_wux = u3qfu_lose(van, dox, p_gen);
         u3_noun hiq, ran;
         u3_noun dis, dat;
         u3_noun ret;
@@ -416,7 +416,7 @@
                       c3__void,
                       (c3__void == q_fex)
                         ? c3__void
-                        : u3_cqfu_play(van, q_fex, q_gen));
+                        : u3qfu_play(van, q_fex, q_gen));
         } else if ( c3__void == q_fex ) {
           hiq = u3m_error("mull-bonk-c");
         }
@@ -427,14 +427,14 @@
                       c3__void,
                       (c3__void == q_wux)
                         ? c3__void
-                        : u3_cqfu_play(van, q_wux, r_gen));
+                        : u3qfu_play(van, q_wux, r_gen));
         } else if ( c3__void == q_wux ) {
           ran = u3m_error("mull-bonk-d");
         }
         else ran = _mull_in(van, p_wux, gol, q_wux, r_gen);
 
-        dis = u3_cqf_fork(u3h(hiq), u3h(ran));
-        dat = u3_cqf_fork(u3t(hiq), u3t(ran));
+        dis = u3qf_fork(u3h(hiq), u3h(ran));
+        dat = u3qf_fork(u3t(hiq), u3t(ran));
 
         ret = u3nc(_mull_nice(van, gol, dis), dat);
 
@@ -454,8 +454,8 @@
       {
         u3_noun hed = _mull_in(van, sut, c3__noun, dox, p_gen);
         u3_noun tal = _mull_in(van, sut, c3__noun, dox, q_gen);
-        u3_noun dis = u3_cqf_cell(u3h(hed), u3h(tal));
-        u3_noun dat = u3_cqf_cell(u3t(hed), u3t(tal));
+        u3_noun dis = u3qf_cell(u3h(hed), u3h(tal));
+        u3_noun dat = u3qf_cell(u3t(hed), u3t(tal));
         u3_noun ret = u3nc(_mull_nice(van, gol, dis), dat);
 
         u3z(tal);
@@ -526,7 +526,7 @@
       case c3__dtzy: u3x_cell(u3t(gen), &p_gen, &q_gen);
       _mull_used();
       {
-        u3_noun typ = u3_cqfu_play(van, sut, gen);
+        u3_noun typ = u3qfu_play(van, sut, gen);
         return _mull_both(van, gol, typ);
       }
       case c3__ktbr: p_gen = u3t(gen);
@@ -534,8 +534,8 @@
       {
         u3_noun vat = _mull_in(van, sut, gol, dox, p_gen);
         u3_noun pro = u3nc
-          (u3_cqfu_wrap(van, u3h(vat), c3__iron),
-                  u3_cqfu_wrap(van, u3t(vat), c3__iron));
+          (u3qfu_wrap(van, u3h(vat), c3__iron),
+                  u3qfu_wrap(van, u3t(vat), c3__iron));
 
         u3z(vat);
         return pro;
@@ -545,8 +545,8 @@
       {
         u3_noun vat = _mull_in(van, sut, gol, dox, p_gen);
         u3_noun pro = u3nc
-          (u3_cqfu_wrap(van, u3h(vat), c3__zinc),
-                  u3_cqfu_wrap(van, u3t(vat), c3__zinc));
+          (u3qfu_wrap(van, u3h(vat), c3__zinc),
+                  u3qfu_wrap(van, u3t(vat), c3__zinc));
 
         u3z(vat);
         return pro;
@@ -556,8 +556,8 @@
       {
         u3_noun vat = _mull_in(van, sut, gol, dox, p_gen);
         u3_noun pro = u3nc
-          (u3_cqfu_wrap(van, u3h(vat), c3__lead),
-                  u3_cqfu_wrap(van, u3t(vat), c3__lead));
+          (u3qfu_wrap(van, u3h(vat), c3__lead),
+                  u3qfu_wrap(van, u3t(vat), c3__lead));
 
         u3z(vat);
         return pro;
@@ -568,8 +568,8 @@
         u3_noun vat = _mull_in(van, sut, gol, dox, q_gen);
         u3_noun ret =
           u3nc(
-                u3_cqfu_conk(van, u3h(vat), p_gen),
-                u3_cqfu_conk(van, u3t(vat), p_gen));
+                u3qfu_conk(van, u3h(vat), p_gen),
+                u3qfu_conk(van, u3t(vat), p_gen));
 
         u3z(vat);
         return ret;
@@ -580,8 +580,8 @@
         u3_noun vat = _mull_in(van, sut, gol, dox, q_gen);
         u3_noun ret =
           u3nc(
-                u3_cqfu_conk(van, u3h(vat), p_gen),
-                u3_cqfu_conk(van, u3t(vat), p_gen));
+                u3qfu_conk(van, u3h(vat), p_gen),
+                u3qfu_conk(van, u3t(vat), p_gen));
 
         u3z(vat);
         return ret;
@@ -595,8 +595,8 @@
       _mull_used();
       {
         u3_noun p_hif = _mull_nice
-          (van, gol, u3_cqfu_play(van, sut, p_gen));
-        u3_noun q_hif = u3_cqfu_play(van, dox, p_gen);
+          (van, gol, u3qfu_play(van, sut, p_gen));
+        u3_noun q_hif = u3qfu_play(van, dox, p_gen);
 
         u3_noun zel = _mull_in(van, sut, p_hif, dox, q_gen);
         u3_noun ret = u3nc(p_hif, q_hif);
@@ -608,8 +608,8 @@
       _mull_used();
       {
         u3_noun p_hif = _mull_nice
-          (van, gol, u3_cqfu_play(van, sut, p_gen));
-        u3_noun q_hif = u3_cqfu_play(van, dox, p_gen);
+          (van, gol, u3qfu_play(van, sut, p_gen));
+        u3_noun q_hif = u3qfu_play(van, dox, p_gen);
 
         u3_noun zel = _mull_in(van, sut, p_hif, dox, q_gen);
         u3_noun ret = u3nc(p_hif, q_hif);
@@ -631,12 +631,12 @@
       case c3__tstr: u3x_trel(u3t(gen), &p_gen, &q_gen, &r_gen);
       _mull_used();
       {
-        u3_noun sep = u3_cqfu_seep(van, sut, c3__both, q_gen);
-        u3_noun pox = u3_cqfu_seep(van, dox, c3__both, q_gen);
+        u3_noun sep = u3qfu_seep(van, sut, c3__both, q_gen);
+        u3_noun pox = u3qfu_seep(van, dox, c3__both, q_gen);
         u3_noun bid = u3nt(u3k(p_gen), u3k(q_gen), sep);
         u3_noun yub = u3nt(u3k(p_gen), u3k(q_gen), pox);
-        u3_noun boc = u3_cqf_bull(bid, sut);
-        u3_noun nuf = u3_cqf_bull(yub, dox);
+        u3_noun boc = u3qf_bull(bid, sut);
+        u3_noun nuf = u3qf_bull(yub, dox);
         u3_noun ret = _mull_in(van, boc, gol, nuf, r_gen);
 
         u3z(bid);
@@ -649,8 +649,8 @@
       case c3__cnts: u3x_cell(u3t(gen), &p_gen, &q_gen);
       _mull_used();
       {
-        u3_noun sec = u3_cqfu_seek(van, sut, c3__read, p_gen);
-        u3_noun suc = u3_cqfu_seek(van, dox, c3__read, p_gen);
+        u3_noun sec = u3qfu_seek(van, sut, c3__read, p_gen);
+        u3_noun suc = u3qfu_seek(van, dox, c3__read, p_gen);
         u3_noun lar = _mull_foil(sec);
         u3_noun p_lar = u3h(lar);
         u3_noun q_lar = u3t(lar);
@@ -666,13 +666,13 @@
           u3m_error("mull-bonk-e");
         }
         {
-          u3_noun mew = u3_cqfu_snub(van, sut, q_gen);
+          u3_noun mew = u3qfu_snub(van, sut, q_gen);
           u3_noun yom = _mull_edit
             (van, sut, dox, mew, u3k(qq_lar),
                                         u3k(qq_vug));
-          u3_noun von = u3i_molt(u3k(van), u3_cqfu_van_vet, c3n, 0);
-          u3_noun p_ret = u3_cqfu_fire(van, sut, u3h(yom));
-          u3_noun q_ret = u3_cqfu_fire(von, sut, u3t(yom));
+          u3_noun von = u3i_molt(u3k(van), u3qfu_van_vet, c3n, 0);
+          u3_noun p_ret = u3qfu_fire(van, sut, u3h(yom));
+          u3_noun q_ret = u3qfu_fire(von, sut, u3t(yom));
 
           u3z(von);
           u3z(yom);
@@ -732,8 +732,8 @@
       case c3__sgzp: u3x_cell(u3t(gen), &p_gen, &q_gen);
       _mull_used();
       {
-        u3_noun typ = u3_cqfu_play(van, sut, p_gen);
-        u3_noun dug = u3_cqfu_duck(van, typ);
+        u3_noun typ = u3qfu_play(van, sut, p_gen);
+        u3_noun dug = u3qfu_duck(van, typ);
         u3_noun ret;
 
         u3t_push(u3nc(c3__mean, dug));
@@ -753,8 +753,8 @@
       case c3__zpcm: u3x_cell(u3t(gen), &p_gen, &q_gen);
       _mull_used();
       {
-        u3_noun p_ret = u3_cqfu_play(van, sut, p_gen);
-        u3_noun q_ret = u3_cqfu_play(van, sut, q_gen);
+        u3_noun p_ret = u3qfu_play(van, sut, p_gen);
+        u3_noun q_ret = u3qfu_play(van, sut, q_gen);
 
         return u3nc
           (_mull_nice(van, gol, p_ret),
@@ -788,11 +788,11 @@
       case c3__zpsm: u3x_cell(u3t(gen), &p_gen, &q_gen);
       _mull_used();
       {
-        u3_noun p_zur = u3_cqfu_play(van, sut, p_gen);
-        u3_noun q_zur = u3_cqfu_play (van, dox, p_gen);
+        u3_noun p_zur = u3qfu_play(van, sut, p_gen);
+        u3_noun q_zur = u3qfu_play (van, dox, p_gen);
         u3_noun vos = _mull_in(van, sut, c3__noun, dox, q_gen);
-        u3_noun p_ret = u3_cqf_cell(p_zur, u3h(vos));
-        u3_noun q_ret = u3_cqf_cell(q_zur, u3t(vos));
+        u3_noun p_ret = u3qf_cell(p_zur, u3h(vos));
+        u3_noun q_ret = u3qf_cell(q_zur, u3t(vos));
 
         u3z(vos);
         u3z(q_zur);
@@ -831,7 +831,7 @@
 /* boilerplate
 */
   u3_noun
-  u3_cwfu_mull(u3_noun cor)
+  u3wfu_mull(u3_noun cor)
   {
     u3_noun sut, gol, dox, gen, van;
 
@@ -849,7 +849,7 @@
   }
 
   u3_noun
-  u3_cqfu_mull(u3_noun van,
+  u3qfu_mull(u3_noun van,
                u3_noun sut,
                u3_noun gol,
                u3_noun dox,
diff --git a/j/6/ut_nest.c b/j/6/ut_nest.c
index 3fbbc1d2f2..74fb1cbe9b 100644
--- a/j/6/ut_nest.c
+++ b/j/6/ut_nest.c
@@ -59,8 +59,8 @@
             } else {
               u3_noun pqn_dab = u3t(qn_dab);
               u3_noun pqn_hem = u3t(qn_hem);
-              u3_noun vis = u3_cqfu_play(van, sut, pqn_dab);
-              u3_noun lon = u3_cqfu_play(van, ref, pqn_hem);
+              u3_noun vis = u3qfu_play(van, sut, pqn_dab);
+              u3_noun lon = u3qfu_play(van, ref, pqn_hem);
               u3_noun ret = _nest_dext(van, vis, tel, lon, gil);
 
               u3z(vis);
@@ -114,13 +114,13 @@
       else {
         u3_noun hud = u3nc(u3k(sut), u3k(ref));
 
-        if ( (c3y == u3_cqdi_has(gil, hud)) ) {
+        if ( (c3y == u3qdi_has(gil, hud)) ) {
           u3z(hud);
 
           return c3y;
         }
         else {
-          u3_noun zoc = u3_cqdi_put(gil, hud);
+          u3_noun zoc = u3qdi_put(gil, hud);
           u3_noun tus = u3nt(c3__core,
                                      u3k(qq_sut),
                                      u3k(q_sut));
@@ -147,9 +147,9 @@
                          _nest_dext(van, qq_ref, tel, qq_sut, gil));
               }
               case c3__iron: {
-                u3_noun s_sam = u3_cqfu_peek
+                u3_noun s_sam = u3qfu_peek
                                         (van, qq_sut, c3__rite, 2);
-                u3_noun r_sam = u3_cqfu_peek
+                u3_noun r_sam = u3qfu_peek
                                         (van, qq_ref, c3__rite, 2);
                 u3_noun ret = _nest_dext(van, r_sam, tel, s_sam, gil);
 
@@ -161,9 +161,9 @@
                 return c3y;
               }
               case c3__zinc: {
-                u3_noun s_pal = u3_cqfu_peek
+                u3_noun s_pal = u3qfu_peek
                                         (van, qq_sut, c3__read, 2);
-                u3_noun r_pal = u3_cqfu_peek
+                u3_noun r_pal = u3qfu_peek
                                         (van, qq_ref, c3__read, 2);
                 u3_noun ret = _nest_dext(van, s_pal, tel, r_pal, gil);
 
@@ -204,7 +204,7 @@
 
       case c3__atom: {
         if ( (c3y == u3du(ref)) && (c3__atom == u3h(ref)) ) {
-          if ( c3n == u3_cqf_fitz(u3t(sut), u3t(ref)) ) {
+          if ( c3n == u3qf_fitz(u3t(sut), u3t(ref)) ) {
             // u3_err("fitz: need", u3t(sut));
             // u3_err("fitz: have", u3t(ref));
             return c3n;
@@ -287,13 +287,13 @@
       {
         u3_noun hud = u3nc(u3k(sut), u3k(ref));
 
-        if ( (c3y == u3_cqdi_has(gil, hud)) ) {
+        if ( (c3y == u3qdi_has(gil, hud)) ) {
           u3z(hud);
 
           return c3y;
         } else {
-          u3_noun zoc = u3_cqdi_put(gil, hud);
-          u3_noun fop = u3_cqfu_rest(van, sut, p_sut);
+          u3_noun zoc = u3qdi_put(gil, hud);
+          u3_noun fop = u3qfu_rest(van, sut, p_sut);
           u3_noun hiv = _nest_dext(van, fop, tel, ref, zoc);
 
           u3z(hud);
@@ -319,8 +319,8 @@
     if ( (c3y == tyn) || (c3n == tel) ) {
       return tyn;
     } else {
-      // u3_noun dun = u3_cqfu_dunq(van, "need", sut);
-      // u3_noun niz = u3_cqfu_dunq(van, "have", ref);
+      // u3_noun dun = u3qfu_dunq(van, "need", sut);
+      // u3_noun niz = u3qfu_dunq(van, "have", ref);
 
       // u3t_push(u3nc(c3__mean, dun));
       // u3t_push(u3nc(c3__mean, niz));
@@ -390,7 +390,7 @@
         }
         case c3__cell: return c3n;
         case c3__core: {
-          u3_noun gam = u3_cqfu_repo(van, ref);
+          u3_noun gam = u3qfu_repo(van, ref);
           u3_noun hiv = _nest_dext(van, sut, tel, gam, gil);
 
           u3z(gam);
@@ -423,13 +423,13 @@
             u3_noun hud = u3nc(u3k(sut),
                                        u3k(ref));
 
-            if ( (c3y == u3_cqdi_has(gil, hud)) ) {
+            if ( (c3y == u3qdi_has(gil, hud)) ) {
               u3z(hud);
 
               return c3y;
             } else {
-              u3_noun zoc = u3_cqdi_put(gil, hud);
-              u3_noun gam = u3_cqfu_repo(van, ref);
+              u3_noun zoc = u3qdi_put(gil, hud);
+              u3_noun gam = u3qfu_repo(van, ref);
 
               {
                 u3_noun hiv = _nest_dext(van, sut, tel, gam, zoc);
@@ -460,7 +460,7 @@
 /* boilerplate
 */
   u3_noun
-  u3_cwfu_nest(u3_noun cor)
+  u3wfu_nest(u3_noun cor)
   {
     u3_noun sut, tel, ref, van;
 
@@ -478,7 +478,7 @@
   }
 
   u3_noun
-  u3_cqfu_nest(u3_noun van,
+  u3qfu_nest(u3_noun van,
                         u3_noun sut,
                         u3_noun tel,
                         u3_noun ref)
diff --git a/j/6/ut_park.c b/j/6/ut_park.c
index 54c49e331f..ae93269959 100644
--- a/j/6/ut_park.c
+++ b/j/6/ut_park.c
@@ -18,7 +18,7 @@
       return u3m_bail(c3__fail);
     }
     // else if ( c3n == u3j_hook(u3k(van), "vet") ) {
-    else if ( c3n == u3r_at(u3_cqfu_van_vet, van) ) {
+    else if ( c3n == u3r_at(u3qfu_van_vet, van) ) {
       return c3y;
     }
     else {
@@ -41,7 +41,7 @@
           case c3__iron: return c3n;
           case c3__zinc: return
                           c3a(!(u3r_sing(1, axe)),
-                                 u3r_sing(2, u3_cqc_cap(axe)));
+                                 u3r_sing(2, u3qc_cap(axe)));
         }
       }
       else if ( c3__rite == way ) {
@@ -52,7 +52,7 @@
           case c3__lead: return c3n;
           case c3__iron: return
                           c3a(!(u3r_sing(1, axe)),
-                                 u3r_sing(2, u3_cqc_cap(axe)));
+                                 u3r_sing(2, u3qc_cap(axe)));
           case c3__zinc: return c3n;
         }
       }
@@ -64,7 +64,7 @@
 /* boilerplate
 */
   u3_noun
-  u3_cwfu_park(
+  u3wfu_park(
                        u3_noun cor)
   {
     u3_noun sut, way, axe, van;
@@ -83,7 +83,7 @@
   }
 
   u3_noun
-  u3_cqfu_park(u3_noun van,
+  u3qfu_park(u3_noun van,
                         u3_noun sut,
                         u3_noun way,
                         u3_noun axe)
diff --git a/j/6/ut_peek.c b/j/6/ut_peek.c
index 39fd4c3c58..a2b1765395 100644
--- a/j/6/ut_peek.c
+++ b/j/6/ut_peek.c
@@ -48,8 +48,8 @@
         if ( (c3n == u3r_trel(sut, 0, &p_sut, &q_sut)) ) {
           return u3m_bail(c3__fail);
         } else {
-          u3_atom tip = u3_cqc_cap(axe);
-          u3_atom tap = u3_cqc_mas(axe);
+          u3_atom tip = u3qc_cap(axe);
+          u3_atom tap = u3qc_mas(axe);
 
           if ( 2 == tip ) {
             pro = _cqfu_peek(van, p_sut, way, tap);
@@ -73,14 +73,14 @@
         {
           return u3m_bail(c3__fail);
         } else {
-          u3_atom tip = u3_cqc_cap(axe);
-          u3_atom tap = u3_cqc_mas(axe);
+          u3_atom tip = u3qc_cap(axe);
+          u3_atom tap = u3qc_mas(axe);
 
           if ( 3 == tip ) {
-            if ( c3n == u3_cqfu_park(van, sut, way, tap) )
+            if ( c3n == u3qfu_park(van, sut, way, tap) )
             {
-              // u3_noun dun = u3_cqfu_dunq(van, "type", sut);
-              u3_noun waz = u3_cqfu_shep
+              // u3_noun dun = u3qfu_dunq(van, "type", sut);
+              u3_noun waz = u3qfu_shep
                 (van, "axis", 'd', u3k(axe));
 
               // u3t_push(u3nc(c3__mean, dun));
@@ -120,7 +120,7 @@
           u3_noun hed = _peek_in(van, p_sut, way, axe, gil);
           u3_noun tal = _peek_in(van, q_sut, way, axe, gil);
 
-          pro = u3_cqf_fork(hed, tal);
+          pro = u3qf_fork(hed, tal);
 
           u3z(hed);
           u3z(tal);
@@ -130,12 +130,12 @@
       }
       case c3__hold: {
         p_sut = u3t(sut);
-        if ( (c3y == u3_cqdi_has(gil, sut)) ) {
+        if ( (c3y == u3qdi_has(gil, sut)) ) {
           return c3__void;
         }
         else {
-          u3_noun zoc = u3_cqdi_put(gil, sut);
-          u3_noun fop = u3_cqfu_repo(van, sut);
+          u3_noun zoc = u3qdi_put(gil, sut);
+          u3_noun fop = u3qfu_repo(van, sut);
           u3_noun pro = _peek_in(van, fop, way, axe, zoc);
 
           u3z(fop);
@@ -163,7 +163,7 @@
 /* boilerplate
 */
   u3_noun
-  u3_cwfu_peek(
+  u3wfu_peek(
                        u3_noun cor)
   {
     u3_noun sut, way, axe, van;
@@ -182,7 +182,7 @@
   }
 
   u3_noun
-  u3_cqfu_peek(u3_noun van,
+  u3qfu_peek(u3_noun van,
                         u3_noun sut,
                         u3_noun way,
                         u3_noun axe)
diff --git a/j/6/ut_play.c b/j/6/ut_play.c
index 0151e95cfe..aa8fe06461 100644
--- a/j/6/ut_play.c
+++ b/j/6/ut_play.c
@@ -97,7 +97,7 @@
         u3_noun pi_mew = u3h(i_mew);
         u3_noun qi_mew = u3t(i_mew);
         u3_noun laf = _play_in(van, sut, qi_mew);
-        u3_noun ruz = u3_cqfu_tock(van, sut, pi_mew, laf, rag);
+        u3_noun ruz = u3qfu_tock(van, sut, pi_mew, laf, rag);
 
         u3z(laf);
         u3z(rag);
@@ -142,7 +142,7 @@
 #if 1
     return _play_in(van, sut, gen);
 #else
-    u3_noun zix = u3_cqfu_shep
+    u3_noun zix = u3qfu_shep
           (van, "gene", 'q', u3k(gen));
     u3_noun ret;
 
@@ -166,11 +166,11 @@
     if ( c3n == u3du(gen) ) {
       open: {
         u3_noun ter = u3r_at(u3v_con_3, van);
-        u3_noun rex = u3_cqfp_open(ter, gen);
+        u3_noun rex = u3qfp_open(ter, gen);
         u3_noun ret;
 
         if ( c3y == u3r_sing(rex, gen) ) {
-          u3_noun zix = u3_cqfu_shep
+          u3_noun zix = u3qfu_shep
                 (van, "gene", 'q', u3k(gen));
 
           u3t_push(u3nc(c3__mean, zix));
@@ -187,7 +187,7 @@
       {
         u3_noun dis = _play_x(van, sut, u3h(gen));
         u3_noun dat = _play_x(van, sut, u3t(gen));
-        u3_noun ret = u3_cqf_cell(dis, dat);
+        u3_noun ret = u3qf_cell(dis, dat);
 
         u3z(dis);
         u3z(dat);
@@ -200,9 +200,9 @@
       case c3__bcpt: u3x_cell(u3t(gen), &p_gen, &q_gen);
       _play_used();
       {
-        u3_noun sep = u3_cqfu_seep(van, sut, c3__read, p_gen);
+        u3_noun sep = u3qfu_seep(van, sut, c3__read, p_gen);
         u3_noun axe = u3h(sep);
-        u3_noun rex = u3_cqfl_whip(van, q_gen, axe);
+        u3_noun rex = u3qfl_whip(van, q_gen, axe);
         u3_noun ret = _play_x(van, sut, rex);
 
         u3z(sep);
@@ -218,13 +218,13 @@
       case c3__wtcl: u3x_trel(u3t(gen), &p_gen, &q_gen, &r_gen);
       _play_used();
       {
-        u3_noun fex = u3_cqfu_gain(van, sut, p_gen);
-        u3_noun wux = u3_cqfu_lose(van, sut, p_gen);
+        u3_noun fex = u3qfu_gain(van, sut, p_gen);
+        u3_noun wux = u3qfu_lose(van, sut, p_gen);
         u3_noun dez = (fex == c3__void) ? c3__void
                                         : _play_x(van, fex, q_gen);
         u3_noun doz = (wux == c3__void) ? c3__void
                                         : _play_x(van, wux, r_gen);
-        u3_noun ret = u3_cqf_fork(dez, doz);
+        u3_noun ret = u3qf_fork(dez, doz);
 
         u3z(dez); u3z(doz);
         u3z(fex); u3z(wux);
@@ -235,7 +235,7 @@
       {
         u3_noun dis = _play_x(van, sut, p_gen);
         u3_noun dat = _play_x(van, sut, q_gen);
-        u3_noun ret = u3_cqf_cell(dis, dat);
+        u3_noun ret = u3qf_cell(dis, dat);
 
         u3z(dis);
         u3z(dat);
@@ -267,7 +267,7 @@
         u3_noun boc = (c3n == u3ud(q_gen))
                         ? c3__noun
                         : u3nc(c3__atom, u3k(p_gen));
-        u3_noun ret = u3_cqf_cube(q_gen, boc);
+        u3_noun ret = u3qf_cube(q_gen, boc);
 
         u3z(boc);
         return ret;
@@ -293,7 +293,7 @@
       _play_used();
       {
         u3_noun boc = _play_x(van, sut, p_gen);
-        u3_noun pro = u3_cqfu_wrap(van, boc, c3__iron);
+        u3_noun pro = u3qfu_wrap(van, boc, c3__iron);
 
         u3z(boc);
         return pro;
@@ -302,7 +302,7 @@
       _play_used();
       {
         u3_noun boc = _play_x(van, sut, p_gen);
-        u3_noun pro = u3_cqfu_wrap(van, boc, c3__zinc);
+        u3_noun pro = u3qfu_wrap(van, boc, c3__zinc);
 
         u3z(boc);
         return pro;
@@ -311,7 +311,7 @@
       _play_used();
       {
         u3_noun boc = _play_x(van, sut, p_gen);
-        u3_noun pro = u3_cqfu_wrap(van, boc, c3__lead);
+        u3_noun pro = u3qfu_wrap(van, boc, c3__lead);
 
         u3z(boc);
         return pro;
@@ -320,7 +320,7 @@
       _play_used();
       {
         u3_noun boc = _play_x(van, sut, q_gen);
-        u3_noun ret = u3_cqfu_conk(van, boc, p_gen);
+        u3_noun ret = u3qfu_conk(van, boc, p_gen);
 
         u3z(boc);
         return ret;
@@ -329,7 +329,7 @@
       _play_used();
       {
         u3_noun boc = _play_x(van, sut, q_gen);
-        u3_noun ret = u3_cqfu_conk(van, boc, p_gen);
+        u3_noun ret = u3qfu_conk(van, boc, p_gen);
 
         u3z(boc);
         return ret;
@@ -361,9 +361,9 @@
       case c3__tstr: u3x_trel(u3t(gen), &p_gen, &q_gen, &r_gen);
       _play_used();
       {
-        u3_noun sep = u3_cqfu_seep(van, sut, c3__both, q_gen);
+        u3_noun sep = u3qfu_seep(van, sut, c3__both, q_gen);
         u3_noun bid = u3nt(u3k(p_gen), u3k(q_gen), sep);
-        u3_noun boc = u3_cqf_bull(bid, sut);
+        u3_noun boc = u3qf_bull(bid, sut);
         u3_noun ret = _play_x(van, boc, r_gen);
 
         u3z(bid);
@@ -374,13 +374,13 @@
       case c3__cnts: u3x_cell(u3t(gen), &p_gen, &q_gen);
       _play_used();
       {
-        u3_noun sec = u3_cqfu_seek(van, sut, c3__read, p_gen);
+        u3_noun sec = u3qfu_seek(van, sut, c3__read, p_gen);
         u3_noun lar = _play_foil(sec);
         u3_noun q_lar = u3t(lar);
         u3_noun qq_lar = u3t(q_lar);
-        u3_noun mew = u3_cqfu_snub(van, sut, q_gen);
+        u3_noun mew = u3qfu_snub(van, sut, q_gen);
         u3_noun rag = _play_edit(van, sut, mew, u3k(qq_lar));
-        u3_noun ret = u3_cqfu_fire(van, sut, rag);
+        u3_noun ret = u3qfu_fire(van, sut, rag);
 
         u3z(rag);
         u3z(mew);
@@ -433,8 +433,8 @@
       case c3__sgzp: u3x_cell(u3t(gen), &p_gen, &q_gen);
       _play_used();
       {
-        u3_noun typ = u3_cqfu_play(van, sut, p_gen);
-        u3_noun dug = u3_cqfu_duck(van, typ);
+        u3_noun typ = u3qfu_play(van, sut, p_gen);
+        u3_noun dug = u3qfu_duck(van, typ);
         u3_noun ret;
 
         u3t_push(u3nc(c3__mean, dug));
@@ -486,7 +486,7 @@
       {
         u3_noun zur = _play_x(van, sut, p_gen);
         u3_noun vos = _play_x(van, sut, q_gen);
-        u3_noun ret = u3_cqf_cell(zur, vos);
+        u3_noun ret = u3qf_cell(zur, vos);
 
         u3z(zur);
         u3z(vos);
@@ -508,7 +508,7 @@
                         u3_noun sut,
                         u3_noun gen)
   {
-    u3_noun von = u3i_molt(u3k(van), u3_cqfu_van_vet, c3n, 0);
+    u3_noun von = u3i_molt(u3k(van), u3qfu_van_vet, c3n, 0);
     u3_noun ret = _play_x(von, sut, gen);
 
     u3z(von);
@@ -518,7 +518,7 @@
 /* boilerplate
 */
   u3_noun
-  u3_cwfu_play(
+  u3wfu_play(
                          u3_noun cor)
   {
     u3_noun sut, gen, van;
@@ -533,7 +533,7 @@
   }
 
   u3_noun
-  u3_cqfu_play(u3_noun van,
+  u3qfu_play(u3_noun van,
                         u3_noun sut,
                         u3_noun gen)
   {
diff --git a/j/6/ut_repo.c b/j/6/ut_repo.c
index c2942be900..ee62da4074 100644
--- a/j/6/ut_repo.c
+++ b/j/6/ut_repo.c
@@ -8,7 +8,7 @@
 /* logic
 */
   u3_noun
-  u3_cqfu_repo(
+  u3qfu_repo(
                         u3_noun van,
                         u3_noun sut)
   {
@@ -57,13 +57,13 @@
       }
       case c3__hold: {
         p_sut = u3t(sut);
-        return u3_cqfu_rest(van, sut, p_sut);
+        return u3qfu_rest(van, sut, p_sut);
       }
     }
   }
 
   u3_noun
-  u3_cwfu_repo(
+  u3wfu_repo(
                        u3_noun cor)
   {
     u3_noun sut;
@@ -71,6 +71,6 @@
     if ( u3_none == (sut = u3r_at(u3v_sam, cor)) ) {
       return u3m_bail(c3__fail);
     } else {
-      return u3_cqfu_repo(cor, sut);
+      return u3qfu_repo(cor, sut);
     }
   }
diff --git a/j/6/ut_rest.c b/j/6/ut_rest.c
index f541787b59..17f758bdae 100644
--- a/j/6/ut_rest.c
+++ b/j/6/ut_rest.c
@@ -19,7 +19,7 @@
       u3_noun t_leg = u3t(leg);
 
       return u3nc
-        (u3_cqfu_play(van, u3h(i_leg), u3t(i_leg)),
+        (u3qfu_play(van, u3h(i_leg), u3t(i_leg)),
                 _rest_in_list(van, t_leg));
     }
   }
@@ -29,8 +29,8 @@
                 u3_noun van,
                 u3_noun gar)
   {
-    u3_noun gun = u3_cqdi_gas(u3_nul, gar);
-    u3_noun nog = u3_cqdi_tap(gun, u3_nul);
+    u3_noun gun = u3qdi_gas(u3_nul, gar);
+    u3_noun nog = u3qdi_tap(gun, u3_nul);
 
     u3z(gun);
     return nog;
@@ -47,7 +47,7 @@
       u3_noun buf = _rest_in_fork
         (
          u3t(nog),
-         u3_cqf_fork(u3h(nog), fub));
+         u3qf_fork(u3h(nog), fub));
 
         u3z(fub);
       return buf;
@@ -76,7 +76,7 @@
     if ( u3_nul == leg ) {
       return c3n;
     } else {
-      return c3o(u3_cqdi_has(fan, u3h(leg)),
+      return c3o(u3qdi_has(fan, u3h(leg)),
                    _rest_hit_fan(fan, u3t(leg)));
     }
   }
@@ -84,14 +84,14 @@
   u3_noun
   _cqfu_rest(u3_noun van, u3_noun sut, u3_noun leg)
   {
-    u3_noun fan = u3r_at(u3_cqfu_van_fan, van);
+    u3_noun fan = u3r_at(u3qfu_van_fan, van);
 
     if ( c3y == _rest_hit_fan(fan, leg) ) {
       return u3m_error("rest-loop");
     }
     else {
-      u3_noun naf = u3_cqdi_gas(fan, leg);
-      u3_noun nav = u3i_molt(u3k(van), u3_cqfu_van_fan, u3k(naf), 0);
+      u3_noun naf = u3qdi_gas(fan, leg);
+      u3_noun nav = u3i_molt(u3k(van), u3qfu_van_fan, u3k(naf), 0);
       u3_noun mez = _rest_in(nav, leg);
 
       u3z(naf);
@@ -103,7 +103,7 @@
 /* boilerplate
 */
   u3_noun
-  u3_cwfu_rest(
+  u3wfu_rest(
                        u3_noun cor)
   {
     u3_noun sut, leg, van;
@@ -118,7 +118,7 @@
   }
 
   u3_noun
-  u3_cqfu_rest(u3_noun van,
+  u3qfu_rest(u3_noun van,
                         u3_noun sut,
                         u3_noun leg)
   {
diff --git a/j/6/ut_seek.c b/j/6/ut_seek.c
index ab98c7c722..ce6e52cb61 100644
--- a/j/6/ut_seek.c
+++ b/j/6/ut_seek.c
@@ -42,7 +42,7 @@
       if ( c3__yew != u3h(qiqq_tor) ) {
         return yon;
       } else {
-        u3_noun nuy = u3_cqf_look(syx, u3t(qiqq_tor));
+        u3_noun nuy = u3qf_look(syx, u3t(qiqq_tor));
 
         if ( u3_nul == nuy ) {
           return u3m_error("silk");
@@ -105,8 +105,8 @@
     if ( u3_nul == hey ) {
       return u3_nul;
     }
-    if ( u3_ckb_lent(u3k(hey)) !=
-         u3_ckb_lent(u3k(qq_tor)) )
+    if ( u3kb_lent(u3k(hey)) !=
+         u3kb_lent(u3k(qq_tor)) )
     {
       return u3m_error("silk");
     }
@@ -114,7 +114,7 @@
     ret = u3nq
       (u3_nul,
               c3n,
-              u3_cqc_peg(pq_tor, _seek_silk_yaw(hey)),
+              u3qc_peg(pq_tor, _seek_silk_yaw(hey)),
               _seek_silk_fum(hey, qq_tor));
 
     u3z(hey);
@@ -175,7 +175,7 @@
 
         u3r_cell(u3t(q_zar), &pq_zar, &qq_zar);
         wip = _seek_flat(qq_zar);
-        syp = u3_cqfu_fire(van, sut, wip);
+        syp = u3qfu_fire(van, sut, wip);
 
         u3z(wip);
       }
@@ -186,13 +186,13 @@
         if ( c3n == u3r_cell(u3t(yip), &p_yip, &q_yip) ) {
           return u3m_bail(c3__fail);
         }
-        hud = u3_cqfu_fink(van, syp, p_yip, way, q_yip);
+        hud = u3qfu_fink(van, syp, p_yip, way, q_yip);
         {
           u3_noun p_hud, q_hud;
 
           u3r_cell(hud, &p_hud, &q_hud);
 
-          ret = u3nc(u3_cqc_peg(p_zar, p_hud),
+          ret = u3nc(u3qc_peg(p_zar, p_hud),
                              u3k(q_hud));
           u3z(hud);
         }
@@ -205,9 +205,9 @@
         }
         else {
           ret = u3nt
-            (u3_cqc_peg(p_zar, p_yip),
+            (u3qc_peg(p_zar, p_yip),
                     c3y,
-                    u3_cqfu_peek(van, syp, way, p_yip));
+                    u3qfu_peek(van, syp, way, p_yip));
         }
       }
       u3z(yip);
@@ -220,7 +220,7 @@
 /* boilerplate
 */
   u3_noun
-  u3_cwfu_seek(u3_noun cor)
+  u3wfu_seek(u3_noun cor)
   {
     u3_noun sut, way, hyp, van;
 
@@ -237,7 +237,7 @@
   }
 
   u3_noun
-  u3_cqfu_seek(u3_noun van,
+  u3qfu_seek(u3_noun van,
                         u3_noun sut,
                         u3_noun way,
                         u3_noun hyp)
@@ -256,12 +256,12 @@
   }
 
   u3_noun
-  u3_cqfu_seep(u3_noun van,
+  u3qfu_seep(u3_noun van,
                         u3_noun sut,
                         u3_noun way,
                         u3_noun hyp)
   {
-    u3_noun zar = u3_cqfu_seek(van, sut, way, hyp);
+    u3_noun zar = u3qfu_seek(van, sut, way, hyp);
     u3_noun p_zar = u3h(zar);
     u3_noun q_zar = u3t(zar);
 
@@ -277,7 +277,7 @@
   }
 
   u3_noun
-  u3_cwfu_seep(u3_noun cor)
+  u3wfu_seep(u3_noun cor)
   {
     u3_noun sut, way, hyp, van;
 
@@ -289,7 +289,7 @@
     {
       return u3m_bail(c3__fail);
     } else {
-      return u3_cqfu_seep(van, sut, way, hyp);
+      return u3qfu_seep(van, sut, way, hyp);
     }
   }
 
diff --git a/j/6/ut_sift.c b/j/6/ut_sift.c
index cb83d12018..9cf7123356 100644
--- a/j/6/ut_sift.c
+++ b/j/6/ut_sift.c
@@ -8,7 +8,7 @@
 /* boilerplate
 */
   u3_noun
-  u3_cwfu_sift(
+  u3wfu_sift(
                        u3_noun cor)
   {
     u3_noun sut, ref, van;
@@ -20,12 +20,12 @@
     {
       return u3m_bail(c3__fail);
     } else {
-      return u3_cqfu_sift(van, sut, ref);
+      return u3qfu_sift(van, sut, ref);
     }
   }
 
   u3_noun
-  u3_cqfu_sift(u3_noun van,
+  u3qfu_sift(u3_noun van,
                         u3_noun sut,
                         u3_noun ref)
   {
diff --git a/j/6/ut_swab.c b/j/6/ut_swab.c
index b44d32d243..a1f5cefef4 100644
--- a/j/6/ut_swab.c
+++ b/j/6/ut_swab.c
@@ -22,7 +22,7 @@
       u3_noun t_har = u3t(har);
       u3_noun pi_har = u3h(i_har);
       u3_noun qi_har = u3t(i_har);
-      u3_noun peh = u3_cqb_flop(pi_har);
+      u3_noun peh = u3qb_flop(pi_har);
       u3_noun ret = u3nc(u3nc(peh, u3k(qi_har)),
                                  _cqfu_snub
                                     (van, sut, t_har));
@@ -34,7 +34,7 @@
 /* boilerplate
 */
   u3_noun
-  u3_cwfu_snub(
+  u3wfu_snub(
                        u3_noun cor)
   {
     u3_noun van, sut, har;
@@ -51,7 +51,7 @@
   }
 
   u3_noun
-  u3_cqfu_snub(u3_noun van,
+  u3qfu_snub(u3_noun van,
                         u3_noun sut,
                         u3_noun har)
   {
diff --git a/j/6/ut_tack.c b/j/6/ut_tack.c
index ca273e1e4a..592013ecc7 100644
--- a/j/6/ut_tack.c
+++ b/j/6/ut_tack.c
@@ -6,7 +6,7 @@
 
 
   u3_noun
-  u3_cqfu_tack(u3_noun van,
+  u3qfu_tack(u3_noun van,
                         u3_noun sut,
                         u3_noun peh,
                         u3_noun mur)
diff --git a/j/6/ut_tock.c b/j/6/ut_tock.c
index 0a30750890..d9444a965e 100644
--- a/j/6/ut_tock.c
+++ b/j/6/ut_tock.c
@@ -23,7 +23,7 @@
       u3_noun pi_men = u3h(i_men);
       u3_noun qi_men = u3t(i_men);
       u3_noun t_men  = u3t(men);
-      u3_noun geq    = u3_cqfu_tack(van, pi_men, peh, mur);
+      u3_noun geq    = u3qfu_tack(van, pi_men, peh, mur);
       u3_noun p_geq  = u3h(geq);
       u3_noun q_geq  = u3t(geq);
       u3_noun mox    = _tock_in(van, sut, peh, mur, t_men);
@@ -71,7 +71,7 @@
 /* boilerplate
 */
   u3_noun
-  u3_cwfu_tock(u3_noun cor)
+  u3wfu_tock(u3_noun cor)
   {
     u3_noun van, sut, peh, mur, men;
 
@@ -89,7 +89,7 @@
   }
 
   u3_noun
-  u3_cqfu_tock(u3_noun van,
+  u3qfu_tock(u3_noun van,
                         u3_noun sut,
                         u3_noun peh,
                         u3_noun mur,
diff --git a/j/6/ut_wrap.c b/j/6/ut_wrap.c
index 7a6a14a636..433d3a1169 100644
--- a/j/6/ut_wrap.c
+++ b/j/6/ut_wrap.c
@@ -39,13 +39,13 @@
       }
       case c3__fork: u3x_cell(u3t(sut), &p_sut, &q_sut);
       {
-        return u3_cqf_fork
+        return u3qf_fork
           (_cqfu_wrap(van, p_sut, yoz),
                   _cqfu_wrap(van, q_sut, yoz));
       }
       case c3__hold:
       {
-        u3_noun fop = u3_cqfu_repo(van, sut);
+        u3_noun fop = u3qfu_repo(van, sut);
         u3_noun pro = _cqfu_wrap(van, fop, yoz);
 
         u3z(fop);
@@ -57,7 +57,7 @@
 /* boilerplate
 */
   u3_noun
-  u3_cwfu_wrap(
+  u3wfu_wrap(
                        u3_noun cor)
   {
     u3_noun sut, yoz, van;
@@ -72,7 +72,7 @@
   }
 
   u3_noun
-  u3_cqfu_wrap(u3_noun van,
+  u3qfu_wrap(u3_noun van,
                         u3_noun sut,
                         u3_noun yoz)
   {
diff --git a/j/dash.c b/j/dash.c
index 22dd856005..9079122a7f 100644
--- a/j/dash.c
+++ b/j/dash.c
@@ -4,62 +4,62 @@
 */
 #include "all.h"
 
-static u3e_harm _mood__hoon_add_a[] = {{".2", u3_cwa_add, c3y}, {}};
-static u3e_harm _mood__hoon_dec_a[] = {{".2", u3_cwa_dec, c3y}, {}};
-static u3e_harm _mood__hoon_div_a[] = {{".2", u3_cwa_div, c3y}, {}};
-static u3e_harm _mood__hoon_gte_a[] = {{".2", u3_cwa_gte, c3y}, {}};
-static u3e_harm _mood__hoon_gth_a[] = {{".2", u3_cwa_gth, c3y}, {}};
-static u3e_harm _mood__hoon_lte_a[] = {{".2", u3_cwa_lte, c3y}, {}};
-static u3e_harm _mood__hoon_lth_a[] = {{".2", u3_cwa_lth, c3y}, {}};
-static u3e_harm _mood__hoon_mod_a[] = {{".2", u3_cwa_mod, c3y}, {}};
-static u3e_harm _mood__hoon_mul_a[] = {{".2", u3_cwa_mul, c3y}, {}};
-static u3e_harm _mood__hoon_sub_a[] = {{".2", u3_cwa_sub, c3y}, {}};
+static u3e_harm _mood__hoon_add_a[] = {{".2", u3wa_add, c3y}, {}};
+static u3e_harm _mood__hoon_dec_a[] = {{".2", u3wa_dec, c3y}, {}};
+static u3e_harm _mood__hoon_div_a[] = {{".2", u3wa_div, c3y}, {}};
+static u3e_harm _mood__hoon_gte_a[] = {{".2", u3wa_gte, c3y}, {}};
+static u3e_harm _mood__hoon_gth_a[] = {{".2", u3wa_gth, c3y}, {}};
+static u3e_harm _mood__hoon_lte_a[] = {{".2", u3wa_lte, c3y}, {}};
+static u3e_harm _mood__hoon_lth_a[] = {{".2", u3wa_lth, c3y}, {}};
+static u3e_harm _mood__hoon_mod_a[] = {{".2", u3wa_mod, c3y}, {}};
+static u3e_harm _mood__hoon_mul_a[] = {{".2", u3wa_mul, c3y}, {}};
+static u3e_harm _mood__hoon_sub_a[] = {{".2", u3wa_sub, c3y}, {}};
 
-static u3e_harm _mood__hoon_bind_a[] = {{".2", u3_cwb_bind, c3y}, {}};
-static u3e_harm _mood__hoon_clap_a[] = {{".2", u3_cwb_clap, c3y}, {}};
-static u3e_harm _mood__hoon_drop_a[] = {{".2", u3_cwb_drop, c3y}, {}};
-static u3e_harm _mood__hoon_flop_a[] = {{".2", u3_cwb_flop, c3y}, {}};
-static u3e_harm _mood__hoon_lent_a[] = {{".2", u3_cwb_lent, c3y}, {}};
-static u3e_harm _mood__hoon_levy_a[] = {{".2", u3_cwb_levy, c3y}, {}};
-static u3e_harm _mood__hoon_lien_a[] = {{".2", u3_cwb_lien, c3y}, {}};
-static u3e_harm _mood__hoon_need_a[] = {{".2", u3_cwb_need, c3y}, {}};
-static u3e_harm _mood__hoon_reel_a[] = {{".2", u3_cwb_reel, c3y}, {}};
-static u3e_harm _mood__hoon_roll_a[] = {{".2", u3_cwb_roll, c3y}, {}};
-static u3e_harm _mood__hoon_skim_a[] = {{".2", u3_cwb_skim, c3y}, {}};
-static u3e_harm _mood__hoon_skip_a[] = {{".2", u3_cwb_skip, c3y}, {}};
-// static u3e_harm _mood__hoon_scag_a[] = {{".2", u3_cwb_scag, c3y}, {}};
-static u3e_harm _mood__hoon_slag_a[] = {{".2", u3_cwb_slag, c3y}, {}};
-static u3e_harm _mood__hoon_snag_a[] = {{".2", u3_cwb_snag, c3y}, {}};
-// static u3e_harm _mood__hoon_sort_a[] = {{".2", u3_cwb_sort, c3y}, {}};
-static u3e_harm _mood__hoon_turn_a[] = {{".2", u3_cwb_turn, c3y}, {}};
-static u3e_harm _mood__hoon_weld_a[] = {{".2", u3_cwb_weld, c3y}, {}};
+static u3e_harm _mood__hoon_bind_a[] = {{".2", u3wb_bind, c3y}, {}};
+static u3e_harm _mood__hoon_clap_a[] = {{".2", u3wb_clap, c3y}, {}};
+static u3e_harm _mood__hoon_drop_a[] = {{".2", u3wb_drop, c3y}, {}};
+static u3e_harm _mood__hoon_flop_a[] = {{".2", u3wb_flop, c3y}, {}};
+static u3e_harm _mood__hoon_lent_a[] = {{".2", u3wb_lent, c3y}, {}};
+static u3e_harm _mood__hoon_levy_a[] = {{".2", u3wb_levy, c3y}, {}};
+static u3e_harm _mood__hoon_lien_a[] = {{".2", u3wb_lien, c3y}, {}};
+static u3e_harm _mood__hoon_need_a[] = {{".2", u3wb_need, c3y}, {}};
+static u3e_harm _mood__hoon_reel_a[] = {{".2", u3wb_reel, c3y}, {}};
+static u3e_harm _mood__hoon_roll_a[] = {{".2", u3wb_roll, c3y}, {}};
+static u3e_harm _mood__hoon_skim_a[] = {{".2", u3wb_skim, c3y}, {}};
+static u3e_harm _mood__hoon_skip_a[] = {{".2", u3wb_skip, c3y}, {}};
+// static u3e_harm _mood__hoon_scag_a[] = {{".2", u3wb_scag, c3y}, {}};
+static u3e_harm _mood__hoon_slag_a[] = {{".2", u3wb_slag, c3y}, {}};
+static u3e_harm _mood__hoon_snag_a[] = {{".2", u3wb_snag, c3y}, {}};
+// static u3e_harm _mood__hoon_sort_a[] = {{".2", u3wb_sort, c3y}, {}};
+static u3e_harm _mood__hoon_turn_a[] = {{".2", u3wb_turn, c3y}, {}};
+static u3e_harm _mood__hoon_weld_a[] = {{".2", u3wb_weld, c3y}, {}};
 
-static u3e_harm _mood__hoon_bex_a[] = {{".2", u3_cwc_bex, c3y}, {}};
-static u3e_harm _mood__hoon_can_a[] = {{".2", u3_cwc_can, c3y}, {}};
-static u3e_harm _mood__hoon_cap_a[] = {{".2", u3_cwc_cap, c3y}, {}};
-static u3e_harm _mood__hoon_cat_a[] = {{".2", u3_cwc_cat, c3y}, {}};
-static u3e_harm _mood__hoon_con_a[] = {{".2", u3_cwc_con, c3y}, {}};
-static u3e_harm _mood__hoon_cut_a[] = {{".2", u3_cwc_cut, c3y}, {}};
-static u3e_harm _mood__hoon_dis_a[] = {{".2", u3_cwc_dis, c3y}, {}};
-static u3e_harm _mood__hoon_dor_a[] = {{".2", u3_cwc_dor, c3y}, {}};
-static u3e_harm _mood__hoon_end_a[] = {{".2", u3_cwc_end, c3y}, {}};
-static u3e_harm _mood__hoon_gor_a[] = {{".2", u3_cwc_gor, c3y}, {}};
-static u3e_harm _mood__hoon_hor_a[] = {{".2", u3_cwc_hor, c3y}, {}};
-static u3e_harm _mood__hoon_lsh_a[] = {{".2", u3_cwc_lsh, c3y}, {}};
-static u3e_harm _mood__hoon_mas_a[] = {{".2", u3_cwc_mas, c3y}, {}};
-static u3e_harm _mood__hoon_met_a[] = {{".2", u3_cwc_met, c3y}, {}};
-static u3e_harm _mood__hoon_mix_a[] = {{".2", u3_cwc_mix, c3y}, {}};
-static u3e_harm _mood__hoon_mug_a[] = {{".2", u3_cwc_mug, c3y}, {}};
-static u3e_harm _mood__hoon_peg_a[] = {{".2", u3_cwc_peg, c3y}, {}};
-static u3e_harm _mood__hoon_rap_a[] = {{".2", u3_cwc_rap, c3y}, {}};
-static u3e_harm _mood__hoon_rip_a[] = {{".2", u3_cwc_rip, c3y}, {}};
-static u3e_harm _mood__hoon_rsh_a[] = {{".2", u3_cwc_rsh, c3y}, {}};
-static u3e_harm _mood__hoon_vor_a[] = {{".2", u3_cwc_vor, c3y}, {}};
+static u3e_harm _mood__hoon_bex_a[] = {{".2", u3wc_bex, c3y}, {}};
+static u3e_harm _mood__hoon_can_a[] = {{".2", u3wc_can, c3y}, {}};
+static u3e_harm _mood__hoon_cap_a[] = {{".2", u3wc_cap, c3y}, {}};
+static u3e_harm _mood__hoon_cat_a[] = {{".2", u3wc_cat, c3y}, {}};
+static u3e_harm _mood__hoon_con_a[] = {{".2", u3wc_con, c3y}, {}};
+static u3e_harm _mood__hoon_cut_a[] = {{".2", u3wc_cut, c3y}, {}};
+static u3e_harm _mood__hoon_dis_a[] = {{".2", u3wc_dis, c3y}, {}};
+static u3e_harm _mood__hoon_dor_a[] = {{".2", u3wc_dor, c3y}, {}};
+static u3e_harm _mood__hoon_end_a[] = {{".2", u3wc_end, c3y}, {}};
+static u3e_harm _mood__hoon_gor_a[] = {{".2", u3wc_gor, c3y}, {}};
+static u3e_harm _mood__hoon_hor_a[] = {{".2", u3wc_hor, c3y}, {}};
+static u3e_harm _mood__hoon_lsh_a[] = {{".2", u3wc_lsh, c3y}, {}};
+static u3e_harm _mood__hoon_mas_a[] = {{".2", u3wc_mas, c3y}, {}};
+static u3e_harm _mood__hoon_met_a[] = {{".2", u3wc_met, c3y}, {}};
+static u3e_harm _mood__hoon_mix_a[] = {{".2", u3wc_mix, c3y}, {}};
+static u3e_harm _mood__hoon_mug_a[] = {{".2", u3wc_mug, c3y}, {}};
+static u3e_harm _mood__hoon_peg_a[] = {{".2", u3wc_peg, c3y}, {}};
+static u3e_harm _mood__hoon_rap_a[] = {{".2", u3wc_rap, c3y}, {}};
+static u3e_harm _mood__hoon_rip_a[] = {{".2", u3wc_rip, c3y}, {}};
+static u3e_harm _mood__hoon_rsh_a[] = {{".2", u3wc_rsh, c3y}, {}};
+static u3e_harm _mood__hoon_vor_a[] = {{".2", u3wc_vor, c3y}, {}};
 
-static u3e_harm _mood__hoon__po_ind_a[] = {{".2", u3_cwcp_ind}, {}};
-static u3e_harm _mood__hoon__po_ins_a[] = {{".2", u3_cwcp_ins}, {}};
-static u3e_harm _mood__hoon__po_tod_a[] = {{".2", u3_cwcp_tod}, {}};
-static u3e_harm _mood__hoon__po_tos_a[] = {{".2", u3_cwcp_tos}, {}};
+static u3e_harm _mood__hoon__po_ind_a[] = {{".2", u3wcp_ind}, {}};
+static u3e_harm _mood__hoon__po_ins_a[] = {{".2", u3wcp_ins}, {}};
+static u3e_harm _mood__hoon__po_tod_a[] = {{".2", u3wcp_tod}, {}};
+static u3e_harm _mood__hoon__po_tos_a[] = {{".2", u3wcp_tos}, {}};
 static u3e_core _mood__hoon__po_d[] =
   { { "ind", _mood__hoon__po_ind_a },
     { "ins", _mood__hoon__po_ins_a },
@@ -68,13 +68,13 @@ static u3e_core _mood__hoon__po_d[] =
     {}
   };
 
-static u3e_harm _mood__hoon__by_gas_a[] = {{".2", u3_cwdb_gas, c3y}, {}};
-static u3e_harm _mood__hoon__by_get_a[] = {{".2", u3_cwdb_get, c3y}, {}};
-static u3e_harm _mood__hoon__by_has_a[] = {{".2", u3_cwdb_has, c3y}, {}};
-static u3e_harm _mood__hoon__by_int_a[] = {{".2", u3_cwdb_int, c3y}, {}};
-static u3e_harm _mood__hoon__by_put_a[] = {{".2", u3_cwdb_put, c3y}, {}};
-static u3e_harm _mood__hoon__by_tap_a[] = {{".2", u3_cwdb_tap, c3y}, {}};
-static u3e_harm _mood__hoon__by_uni_a[] = {{".2", u3_cwdb_uni, c3y}, {}};
+static u3e_harm _mood__hoon__by_gas_a[] = {{".2", u3wdb_gas, c3y}, {}};
+static u3e_harm _mood__hoon__by_get_a[] = {{".2", u3wdb_get, c3y}, {}};
+static u3e_harm _mood__hoon__by_has_a[] = {{".2", u3wdb_has, c3y}, {}};
+static u3e_harm _mood__hoon__by_int_a[] = {{".2", u3wdb_int, c3y}, {}};
+static u3e_harm _mood__hoon__by_put_a[] = {{".2", u3wdb_put, c3y}, {}};
+static u3e_harm _mood__hoon__by_tap_a[] = {{".2", u3wdb_tap, c3y}, {}};
+static u3e_harm _mood__hoon__by_uni_a[] = {{".2", u3wdb_uni, c3y}, {}};
 static u3e_core _mood__hoon__by_d[] =
   { { "gas", _mood__hoon__by_gas_a },
     { "get", _mood__hoon__by_get_a },
@@ -86,13 +86,13 @@ static u3e_core _mood__hoon__by_d[] =
     {}
   };
 
-static u3e_harm _mood__hoon__in_gas_a[] = {{".2", u3_cwdi_gas}, {}};
-static u3e_harm _mood__hoon__in_has_a[] = {{".2", u3_cwdi_has}, {}};
-static u3e_harm _mood__hoon__in_mer_a[] = {{".2", u3_cwdi_mer}, {}};
-static u3e_harm _mood__hoon__in_int_a[] = {{".2", u3_cwdi_int}, {}};
-static u3e_harm _mood__hoon__in_put_a[] = {{".2", u3_cwdi_put}, {}};
-static u3e_harm _mood__hoon__in_tap_a[] = {{".2", u3_cwdi_tap}, {}};
-static u3e_harm _mood__hoon__in_uni_a[] = {{".2", u3_cwdi_uni}, {}};
+static u3e_harm _mood__hoon__in_gas_a[] = {{".2", u3wdi_gas}, {}};
+static u3e_harm _mood__hoon__in_has_a[] = {{".2", u3wdi_has}, {}};
+static u3e_harm _mood__hoon__in_mer_a[] = {{".2", u3wdi_mer}, {}};
+static u3e_harm _mood__hoon__in_int_a[] = {{".2", u3wdi_int}, {}};
+static u3e_harm _mood__hoon__in_put_a[] = {{".2", u3wdi_put}, {}};
+static u3e_harm _mood__hoon__in_tap_a[] = {{".2", u3wdi_tap}, {}};
+static u3e_harm _mood__hoon__in_uni_a[] = {{".2", u3wdi_uni}, {}};
 static u3e_core _mood__hoon__in_d[] =
   { { "gas", _mood__hoon__in_gas_a },
     { "has", _mood__hoon__in_has_a },
@@ -104,107 +104,107 @@ static u3e_core _mood__hoon__in_d[] =
     {}
   };
 
-static u3e_harm _mood__hoon_cue_a[] = {{".2", u3_cwe_cue}, {}};
-static u3e_harm _mood__hoon_jam_a[] = {{".2", u3_cwe_jam}, {}};
-static u3e_harm _mood__hoon_mat_a[] = {{".2", u3_cwe_mat}, {}};
-static u3e_harm _mood__hoon_rub_a[] = {{".2", u3_cwe_rub}, {}};
-static u3e_harm _mood__hoon_lore_a[] = {{".2", u3_cwe_lore}, {}};
-static u3e_harm _mood__hoon_loss_a[] = {{".2", u3_cwe_loss}, {}};
-static u3e_harm _mood__hoon_mink_a[] = {{".2", u3_cwe_mink}, {}};
-static u3e_harm _mood__hoon_mule_a[] = {{".2", u3_cwe_mule}, {}};
-static u3e_harm _mood__hoon_repg_a[] = {{".2", u3_cwe_repg}, {}};
-static u3e_harm _mood__hoon_rexp_a[] = {{".2", u3_cwe_rexp}, {}};
-static u3e_harm _mood__hoon_trip_a[] = {{".2", u3_cwe_trip}, {}};
+static u3e_harm _mood__hoon_cue_a[] = {{".2", u3we_cue}, {}};
+static u3e_harm _mood__hoon_jam_a[] = {{".2", u3we_jam}, {}};
+static u3e_harm _mood__hoon_mat_a[] = {{".2", u3we_mat}, {}};
+static u3e_harm _mood__hoon_rub_a[] = {{".2", u3we_rub}, {}};
+static u3e_harm _mood__hoon_lore_a[] = {{".2", u3we_lore}, {}};
+static u3e_harm _mood__hoon_loss_a[] = {{".2", u3we_loss}, {}};
+static u3e_harm _mood__hoon_mink_a[] = {{".2", u3we_mink}, {}};
+static u3e_harm _mood__hoon_mule_a[] = {{".2", u3we_mule}, {}};
+static u3e_harm _mood__hoon_repg_a[] = {{".2", u3we_repg}, {}};
+static u3e_harm _mood__hoon_rexp_a[] = {{".2", u3we_rexp}, {}};
+static u3e_harm _mood__hoon_trip_a[] = {{".2", u3we_trip}, {}};
 
-static u3e_harm _mood__hoon__aesc_en_a[] = {{".2", u3_cwea_en}, {}};
-static u3e_harm _mood__hoon__aesc_de_a[] = {{".2", u3_cwea_en}, {}};
+static u3e_harm _mood__hoon__aesc_en_a[] = {{".2", u3wea_en}, {}};
+static u3e_harm _mood__hoon__aesc_de_a[] = {{".2", u3wea_en}, {}};
 static u3e_core _mood__hoon__aesc_d[] =
   { { "en", _mood__hoon__aesc_en_a },
     { "de", _mood__hoon__aesc_de_a },
     {}
   };
 
-static u3e_harm _mood__hoon__bend_fun_a[] = {{".2", u3_cwe_bend_fun}, {}};
+static u3e_harm _mood__hoon__bend_fun_a[] = {{".2", u3we_bend_fun}, {}};
 static u3e_core _mood__hoon__bend_d[] =
   { { "fun", _mood__hoon__bend_fun_a },
     {}
   };
-static u3e_harm _mood__hoon__cold_fun_a[] = {{".2", u3_cwe_cold_fun}, {}};
+static u3e_harm _mood__hoon__cold_fun_a[] = {{".2", u3we_cold_fun}, {}};
 static u3e_core _mood__hoon__cold_d[] =
   { { "fun", _mood__hoon__cold_fun_a },
     {}
   };
-static u3e_harm _mood__hoon__cook_fun_a[] = {{".2", u3_cwe_cook_fun}, {}};
+static u3e_harm _mood__hoon__cook_fun_a[] = {{".2", u3we_cook_fun}, {}};
 static u3e_core _mood__hoon__cook_d[] =
   { { "fun", _mood__hoon__cook_fun_a },
     {}
   };
-static u3e_harm _mood__hoon__comp_fun_a[] = {{".2", u3_cwe_comp_fun}, {}};
+static u3e_harm _mood__hoon__comp_fun_a[] = {{".2", u3we_comp_fun}, {}};
 static u3e_core _mood__hoon__comp_d[] =
   { { "fun", _mood__hoon__comp_fun_a },
     {}
   };
-static u3e_harm _mood__hoon__easy_fun_a[] = {{".2", u3_cwe_easy_fun}, {}};
+static u3e_harm _mood__hoon__easy_fun_a[] = {{".2", u3we_easy_fun}, {}};
 static u3e_core _mood__hoon__easy_d[] =
   { { "fun", _mood__hoon__easy_fun_a },
     {}
   };
-static u3e_harm _mood__hoon__glue_fun_a[] = {{".2", u3_cwe_glue_fun}, {}};
+static u3e_harm _mood__hoon__glue_fun_a[] = {{".2", u3we_glue_fun}, {}};
 static u3e_core _mood__hoon__glue_d[] =
   { { "fun", _mood__hoon__glue_fun_a },
     {}
   };
-static u3e_harm _mood__hoon__here_fun_a[] = {{".2", u3_cwe_here_fun}, {}};
+static u3e_harm _mood__hoon__here_fun_a[] = {{".2", u3we_here_fun}, {}};
 static u3e_core _mood__hoon__here_d[] =
   { { "fun", _mood__hoon__here_fun_a },
     {}
   };
-static u3e_harm _mood__hoon__just_fun_a[] = {{".2", u3_cwe_just_fun}, {}};
+static u3e_harm _mood__hoon__just_fun_a[] = {{".2", u3we_just_fun}, {}};
 static u3e_core _mood__hoon__just_d[] =
   { { "fun", _mood__hoon__just_fun_a },
     {}
   };
-static u3e_harm _mood__hoon__mask_fun_a[] = {{".2", u3_cwe_mask_fun}, {}};
+static u3e_harm _mood__hoon__mask_fun_a[] = {{".2", u3we_mask_fun}, {}};
 static u3e_core _mood__hoon__mask_d[] =
   { { "fun", _mood__hoon__mask_fun_a },
     {}
   };
-static u3e_harm _mood__hoon__shim_fun_a[] = {{".2", u3_cwe_shim_fun}, {}};
+static u3e_harm _mood__hoon__shim_fun_a[] = {{".2", u3we_shim_fun}, {}};
 static u3e_core _mood__hoon__shim_d[] =
   { { "fun", _mood__hoon__shim_fun_a },
     {}
   };
-static u3e_harm _mood__hoon__stag_fun_a[] = {{".2", u3_cwe_stag_fun}, {}};
+static u3e_harm _mood__hoon__stag_fun_a[] = {{".2", u3we_stag_fun}, {}};
 static u3e_core _mood__hoon__stag_d[] =
   { { "fun", _mood__hoon__stag_fun_a },
     {}
   };
-static u3e_harm _mood__hoon__stew_fun_a[] = {{".2", u3_cwe_stew_fun}, {}};
+static u3e_harm _mood__hoon__stew_fun_a[] = {{".2", u3we_stew_fun}, {}};
 static u3e_core _mood__hoon__stew_d[] =
   { { "fun", _mood__hoon__stew_fun_a },
     {}
   };
-static u3e_harm _mood__hoon__stir_fun_a[] = {{".2", u3_cwe_stir_fun}, {}};
+static u3e_harm _mood__hoon__stir_fun_a[] = {{".2", u3we_stir_fun}, {}};
 static u3e_core _mood__hoon__stir_d[] =
   { { "fun", _mood__hoon__stir_fun_a },
     {}
   };
 
-static u3e_harm _mood__hoon__og_raw_a[] = {{".2", u3_cweo_raw}, {}};
+static u3e_harm _mood__hoon__og_raw_a[] = {{".2", u3weo_raw}, {}};
 static u3e_core _mood__hoon__og_d[] =
   { { "raw", _mood__hoon__og_raw_a },
     {}
   };
 
-static u3e_harm _mood__hoon__rd_sun_a[] = {{".2", u3_cwer_sun}, {}};
-static u3e_harm _mood__hoon__rd_mul_a[] = {{".2", u3_cwer_mul}, {}};
-static u3e_harm _mood__hoon__rd_div_a[] = {{".2", u3_cwer_div}, {}};
-static u3e_harm _mood__hoon__rd_add_a[] = {{".2", u3_cwer_add}, {}};
-static u3e_harm _mood__hoon__rd_sub_a[] = {{".2", u3_cwer_sub}, {}};
-static u3e_harm _mood__hoon__rd_lte_a[] = {{".2", u3_cwer_lte}, {}};
-static u3e_harm _mood__hoon__rd_lth_a[] = {{".2", u3_cwer_lth}, {}};
-static u3e_harm _mood__hoon__rd_gte_a[] = {{".2", u3_cwer_gte}, {}};
-static u3e_harm _mood__hoon__rd_gth_a[] = {{".2", u3_cwer_gth}, {}};
+static u3e_harm _mood__hoon__rd_sun_a[] = {{".2", u3wer_sun}, {}};
+static u3e_harm _mood__hoon__rd_mul_a[] = {{".2", u3wer_mul}, {}};
+static u3e_harm _mood__hoon__rd_div_a[] = {{".2", u3wer_div}, {}};
+static u3e_harm _mood__hoon__rd_add_a[] = {{".2", u3wer_add}, {}};
+static u3e_harm _mood__hoon__rd_sub_a[] = {{".2", u3wer_sub}, {}};
+static u3e_harm _mood__hoon__rd_lte_a[] = {{".2", u3wer_lte}, {}};
+static u3e_harm _mood__hoon__rd_lth_a[] = {{".2", u3wer_lth}, {}};
+static u3e_harm _mood__hoon__rd_gte_a[] = {{".2", u3wer_gte}, {}};
+static u3e_harm _mood__hoon__rd_gth_a[] = {{".2", u3wer_gth}, {}};
 static u3e_core _mood__hoon__rd_d[] =
   { { "sun", _mood__hoon__rd_sun_a },
     { "mul", _mood__hoon__rd_mul_a },
@@ -218,9 +218,9 @@ static u3e_core _mood__hoon__rd_d[] =
     {}
   };
 
-static u3e_harm _mood__hoon__coed__ed_puck_a[] = {{".2", u3_cwee_puck}, {}};
-static u3e_harm _mood__hoon__coed__ed_sign_a[] = {{".2", u3_cwee_sign}, {}};
-static u3e_harm _mood__hoon__coed__ed_veri_a[] = {{".2", u3_cwee_veri}, {}};
+static u3e_harm _mood__hoon__coed__ed_puck_a[] = {{".2", u3wee_puck}, {}};
+static u3e_harm _mood__hoon__coed__ed_sign_a[] = {{".2", u3wee_sign}, {}};
+static u3e_harm _mood__hoon__coed__ed_veri_a[] = {{".2", u3wee_veri}, {}};
 static u3e_core _mood__hoon__coed__ed_d[] =
   { { "sign", _mood__hoon__coed__ed_sign_a },
     { "puck", _mood__hoon__coed__ed_puck_a },
@@ -232,55 +232,55 @@ static u3e_core _mood__hoon__coed_d[] =
     {}
   };
 
-static u3e_harm _mood__hoon_pfix_a[] = {{".2", u3_cwe_pfix}, {}};
-static u3e_harm _mood__hoon_plug_a[] = {{".2", u3_cwe_plug}, {}};
-static u3e_harm _mood__hoon_pose_a[] = {{".2", u3_cwe_pose}, {}};
-static u3e_harm _mood__hoon_sfix_a[] = {{".2", u3_cwe_sfix}, {}};
-static u3e_harm _mood__hoon_shax_a[] = {{".2", u3_cwe_shax}, {}};
-static u3e_harm _mood__hoon_shas_a[] = {{".2", u3_cwe_shas}, {}};
-static u3e_harm _mood__hoon_shal_a[] = {{".2", u3_cwe_shal}, {}};
+static u3e_harm _mood__hoon_pfix_a[] = {{".2", u3we_pfix}, {}};
+static u3e_harm _mood__hoon_plug_a[] = {{".2", u3we_plug}, {}};
+static u3e_harm _mood__hoon_pose_a[] = {{".2", u3we_pose}, {}};
+static u3e_harm _mood__hoon_sfix_a[] = {{".2", u3we_sfix}, {}};
+static u3e_harm _mood__hoon_shax_a[] = {{".2", u3we_shax}, {}};
+static u3e_harm _mood__hoon_shas_a[] = {{".2", u3we_shas}, {}};
+static u3e_harm _mood__hoon_shal_a[] = {{".2", u3we_shal}, {}};
 
-static u3e_harm _mood__hoon_bull_a[] = {{".2", u3_cwf_bull}, {}};
-static u3e_harm _mood__hoon_cell_a[] = {{".2", u3_cwf_cell}, {}};
-static u3e_harm _mood__hoon_comb_a[] = {{".2", u3_cwf_comb}, {}};
-static u3e_harm _mood__hoon_cons_a[] = {{".2", u3_cwf_cons}, {}};
-static u3e_harm _mood__hoon_core_a[] = {{".2", u3_cwf_core}, {}};
-static u3e_harm _mood__hoon_cube_a[] = {{".2", u3_cwf_cube}, {}};
-static u3e_harm _mood__hoon_face_a[] = {{".2", u3_cwf_face}, {}};
-static u3e_harm _mood__hoon_fitz_a[] = {{".2", u3_cwf_fitz}, {}};
-static u3e_harm _mood__hoon_flan_a[] = {{".2", u3_cwf_flan}, {}};
-static u3e_harm _mood__hoon_flay_a[] = {{".2", u3_cwf_flay}, {}};
-static u3e_harm _mood__hoon_flip_a[] = {{".2", u3_cwf_flip}, {}};
-static u3e_harm _mood__hoon_flor_a[] = {{".2", u3_cwf_flor}, {}};
-static u3e_harm _mood__hoon_fork_a[] = {{".2", u3_cwf_fork}, {}};
-static u3e_harm _mood__hoon_hike_a[] = {{".2", u3_cwf_hike}, {}};
-static u3e_harm _mood__hoon_look_a[] = {{".2", u3_cwf_look}, {}};
+static u3e_harm _mood__hoon_bull_a[] = {{".2", u3wf_bull}, {}};
+static u3e_harm _mood__hoon_cell_a[] = {{".2", u3wf_cell}, {}};
+static u3e_harm _mood__hoon_comb_a[] = {{".2", u3wf_comb}, {}};
+static u3e_harm _mood__hoon_cons_a[] = {{".2", u3wf_cons}, {}};
+static u3e_harm _mood__hoon_core_a[] = {{".2", u3wf_core}, {}};
+static u3e_harm _mood__hoon_cube_a[] = {{".2", u3wf_cube}, {}};
+static u3e_harm _mood__hoon_face_a[] = {{".2", u3wf_face}, {}};
+static u3e_harm _mood__hoon_fitz_a[] = {{".2", u3wf_fitz}, {}};
+static u3e_harm _mood__hoon_flan_a[] = {{".2", u3wf_flan}, {}};
+static u3e_harm _mood__hoon_flay_a[] = {{".2", u3wf_flay}, {}};
+static u3e_harm _mood__hoon_flip_a[] = {{".2", u3wf_flip}, {}};
+static u3e_harm _mood__hoon_flor_a[] = {{".2", u3wf_flor}, {}};
+static u3e_harm _mood__hoon_fork_a[] = {{".2", u3wf_fork}, {}};
+static u3e_harm _mood__hoon_hike_a[] = {{".2", u3wf_hike}, {}};
+static u3e_harm _mood__hoon_look_a[] = {{".2", u3wf_look}, {}};
 
-static u3e_harm _mood__hoon__ut_busk_a[] = {{".2", u3_cwfu_busk}, {}};
-static u3e_harm _mood__hoon__ut_bust_a[] = {{".2", u3_cwfu_bust}, {}};
-static u3e_harm _mood__hoon__ut_conk_a[] = {{".2", u3_cwfu_conk}, {}};
-static u3e_harm _mood__hoon__ut_crop_a[] = {{".2", u3_cwfu_crop}, {}};
-static u3e_harm _mood__hoon__ut_cull_a[] = {{".2", u3_cwfu_cull}, {}};
-static u3e_harm _mood__hoon__ut_find_a[] = {{".2", u3_cwfu_find}, {}};
-static u3e_harm _mood__hoon__ut_fino_a[] = {{".2", u3_cwfu_fino}, {}};
-static u3e_harm _mood__hoon__ut_fink_a[] = {{".2", u3_cwfu_fink}, {}};
-static u3e_harm _mood__hoon__ut_fire_a[] = {{".2", u3_cwfu_fire}, {}};
-static u3e_harm _mood__hoon__ut_firm_a[] = {{".2", u3_cwfu_firm}, {}};
-static u3e_harm _mood__hoon__ut_fish_a[] = {{".2", u3_cwfu_fish}, {}};
-static u3e_harm _mood__hoon__ut_fuse_a[] = {{".2", u3_cwfu_fuse}, {}};
-static u3e_harm _mood__hoon__ut_heal_a[] = {{".2", u3_cwfu_heal}, {}};
-static u3e_harm _mood__hoon__ut_mint_a[] = {{".2", u3_cwfu_mint}, {}};
-static u3e_harm _mood__hoon__ut_mull_a[] = {{".2", u3_cwfu_mull}, {}};
-static u3e_harm _mood__hoon__ut_nest_a[] = {{".2", u3_cwfu_nest}, {}};
-static u3e_harm _mood__hoon__ut_park_a[] = {{".2", u3_cwfu_park}, {}};
-static u3e_harm _mood__hoon__ut_peek_a[] = {{".2", u3_cwfu_peek}, {}};
-static u3e_harm _mood__hoon__ut_play_a[] = {{".2", u3_cwfu_play}, {}};
-static u3e_harm _mood__hoon__ut_rest_a[] = {{".2", u3_cwfu_rest}, {}};
-static u3e_harm _mood__hoon__ut_seek_a[] = {{".2", u3_cwfu_seek}, {}};
-static u3e_harm _mood__hoon__ut_seep_a[] = {{".2", u3_cwfu_seep}, {}};
-static u3e_harm _mood__hoon__ut_snub_a[] = {{".2", u3_cwfu_snub}, {}};
-static u3e_harm _mood__hoon__ut_tock_a[] = {{".2", u3_cwfu_tock}, {}};
-static u3e_harm _mood__hoon__ut_wrap_a[] = {{".2", u3_cwfu_wrap}, {}};
+static u3e_harm _mood__hoon__ut_busk_a[] = {{".2", u3wfu_busk}, {}};
+static u3e_harm _mood__hoon__ut_bust_a[] = {{".2", u3wfu_bust}, {}};
+static u3e_harm _mood__hoon__ut_conk_a[] = {{".2", u3wfu_conk}, {}};
+static u3e_harm _mood__hoon__ut_crop_a[] = {{".2", u3wfu_crop}, {}};
+static u3e_harm _mood__hoon__ut_cull_a[] = {{".2", u3wfu_cull}, {}};
+static u3e_harm _mood__hoon__ut_find_a[] = {{".2", u3wfu_find}, {}};
+static u3e_harm _mood__hoon__ut_fino_a[] = {{".2", u3wfu_fino}, {}};
+static u3e_harm _mood__hoon__ut_fink_a[] = {{".2", u3wfu_fink}, {}};
+static u3e_harm _mood__hoon__ut_fire_a[] = {{".2", u3wfu_fire}, {}};
+static u3e_harm _mood__hoon__ut_firm_a[] = {{".2", u3wfu_firm}, {}};
+static u3e_harm _mood__hoon__ut_fish_a[] = {{".2", u3wfu_fish}, {}};
+static u3e_harm _mood__hoon__ut_fuse_a[] = {{".2", u3wfu_fuse}, {}};
+static u3e_harm _mood__hoon__ut_heal_a[] = {{".2", u3wfu_heal}, {}};
+static u3e_harm _mood__hoon__ut_mint_a[] = {{".2", u3wfu_mint}, {}};
+static u3e_harm _mood__hoon__ut_mull_a[] = {{".2", u3wfu_mull}, {}};
+static u3e_harm _mood__hoon__ut_nest_a[] = {{".2", u3wfu_nest}, {}};
+static u3e_harm _mood__hoon__ut_park_a[] = {{".2", u3wfu_park}, {}};
+static u3e_harm _mood__hoon__ut_peek_a[] = {{".2", u3wfu_peek}, {}};
+static u3e_harm _mood__hoon__ut_play_a[] = {{".2", u3wfu_play}, {}};
+static u3e_harm _mood__hoon__ut_rest_a[] = {{".2", u3wfu_rest}, {}};
+static u3e_harm _mood__hoon__ut_seek_a[] = {{".2", u3wfu_seek}, {}};
+static u3e_harm _mood__hoon__ut_seep_a[] = {{".2", u3wfu_seep}, {}};
+static u3e_harm _mood__hoon__ut_snub_a[] = {{".2", u3wfu_snub}, {}};
+static u3e_harm _mood__hoon__ut_tock_a[] = {{".2", u3wfu_tock}, {}};
+static u3e_harm _mood__hoon__ut_wrap_a[] = {{".2", u3wfu_wrap}, {}};
 
 static u3e_core _mood__hoon__ut_d[] =
   { 
@@ -312,23 +312,23 @@ static u3e_core _mood__hoon__ut_d[] =
     {}
   };
 static u3e_harm _mood__hoon__ut_a[] = 
-  { {"burn", u3_cwfu_burn},
-    {"repo", u3_cwfu_repo},
+  { {"burn", u3wfu_burn},
+    {"repo", u3wfu_repo},
     {}
   };
 
 static u3e_harm _mood__hoon__ap_a[] = 
-  { // {"hack", u3_cwfp_open},
-    // {"late", u3_cwfp_open},
-    {"open", u3_cwfp_open},
-    {"rake", u3_cwfp_rake},
+  { // {"hack", u3wfp_open},
+    // {"late", u3wfp_open},
+    {"open", u3wfp_open},
+    {"rake", u3wfp_rake},
     {}
   };
 
 #if 0
 static u3e_harm _mood__hoon__al_a[] = 
-  { {"bunt", u3_cwfl_bunt},
-    {"whip", u3_cwfl_whip},
+  { {"bunt", u3wfl_bunt},
+    {"whip", u3wfl_whip},
     {}
   };
 #endif
diff --git a/v/cttp.c b/v/cttp.c
index 72df4c4dc7..b121e45b70 100644
--- a/v/cttp.c
+++ b/v/cttp.c
@@ -303,7 +303,7 @@ static c3_w
 _cttp_mcut_host(c3_c* buf_c, c3_w len_w, u3_noun hot)
 {
   if ( c3y == u3h(hot) ) {
-    len_w = _cttp_mcut_path(buf_c, len_w, '.', u3_ckb_flop(u3k(u3t(hot))));
+    len_w = _cttp_mcut_path(buf_c, len_w, '.', u3kb_flop(u3k(u3t(hot))));
   }
   else {
     c3_w ipf_w = u3r_word(0, u3t(hot));
diff --git a/v/raft.c b/v/raft.c
index 7d7ad68e57..36b8c79c58 100644
--- a/v/raft.c
+++ b/v/raft.c
@@ -1495,7 +1495,7 @@ _raft_lame(u3_noun ovo, u3_noun why, u3_noun tan)
   //  with a crypto failure, just drop the packet.
   //
   if ( (c3__exit == why) && (c3__hear == u3h(u3t(ovo))) ) {
-    u3_lo_punt(2, u3_ckb_flop(u3k(tan)));
+    u3_lo_punt(2, u3kb_flop(u3k(tan)));
 
     bov = u3nc(u3k(u3h(ovo)), u3nc(c3__hole, u3k(u3t(u3t(ovo)))));
     u3z(why);
@@ -1530,7 +1530,7 @@ _raft_lame(u3_noun ovo, u3_noun why, u3_noun tan)
         u3z(vab);
 
         uL(fprintf(uH, "crude: all delivery failed!\n"));
-        u3_lo_punt(2, u3_ckb_flop(u3k(tan)));
+        u3_lo_punt(2, u3kb_flop(u3k(tan)));
         c3_assert(!"crud");
       }
     }
@@ -1733,7 +1733,7 @@ u3_raft_work(void)
       if ( 0 == u3Z->lug_u.len_d ) {
         return;
       }
-      ova = u3_ckb_flop(u3A->roe);
+      ova = u3kb_flop(u3A->roe);
       u3A->roe = u3_nul;
 
       while ( u3_nul != ova ) {
@@ -1754,7 +1754,7 @@ u3_raft_work(void)
       u3_noun ron;
       u3_noun ovo;
 
-      ova = u3_ckb_flop(u3A->roe);
+      ova = u3kb_flop(u3A->roe);
       u3A->roe = u3_nul;
 
       while ( u3_nul != ova ) {
@@ -1772,7 +1772,7 @@ u3_raft_work(void)
           egg_u->did = c3n;
           egg_u->vir = vir;
 
-          ron = u3_cke_jam(u3nc(u3k(u3A->now), ovo));
+          ron = u3ke_jam(u3nc(u3k(u3A->now), ovo));
           c3_assert(u3A->key);
           ron = u3dc("en:crua", u3k(u3A->key), ron);
 
diff --git a/v/sist.c b/v/sist.c
index c65aacbc45..f2b95d308b 100644
--- a/v/sist.c
+++ b/v/sist.c
@@ -221,7 +221,7 @@ _sist_suck(u3_noun ovo, u3_noun gon)
     free(hed_c);
   }
 
-  u3_lo_punt(2, u3_ckb_flop(u3k(u3t(gon))));
+  u3_lo_punt(2, u3kb_flop(u3k(u3t(gon))));
   // u3_loom_exit();
   u3_lo_exit();
 
@@ -1041,7 +1041,7 @@ _sist_rest()
           u3z(dep);
         }
       }
-      roe = u3nc(u3_cke_cue(ron), roe);
+      roe = u3nc(u3ke_cue(ron), roe);
     }
     u3A->ent_d = c3_max(las_d + 1ULL, old_d);
   }
diff --git a/v/term.c b/v/term.c
index 55a40fb610..269fe53f1d 100644
--- a/v/term.c
+++ b/v/term.c
@@ -1050,7 +1050,7 @@ _term_ef_blit(u3_utty* uty_u,
 
     case c3__lin: {
       u3_noun lin = u3t(blt);
-      c3_w    len_w = u3_ckb_lent(u3k(lin));
+      c3_w    len_w = u3kb_lent(u3k(lin));
       c3_w*   lin_w = c3_malloc(4 * len_w);
 
       {
@@ -1082,7 +1082,7 @@ _term_ef_blit(u3_utty* uty_u,
       u3_noun jam;
 
       fprintf(stderr, "jamming...\r\n");
-      jam = u3_cke_jam(pib);
+      jam = u3ke_jam(pib);
       fprintf(stderr, "jammed.\r\n");
 
       _term_it_save(u3k(u3h(u3t(blt))), jam);
diff --git a/v/time.c b/v/time.c
index 69d69705ec..15d455b6e8 100644
--- a/v/time.c
+++ b/v/time.c
@@ -147,12 +147,12 @@ u3_time_out_ts(struct timespec* tim_ts, u3_noun now)
 c3_d
 u3_time_gap_ms(u3_noun now, u3_noun wen)
 {
-  if ( c3n == u3_cka_gth(u3k(wen), u3k(now)) ) {
+  if ( c3n == u3ka_gth(u3k(wen), u3k(now)) ) {
     u3z(wen); u3z(now);
     return 0ULL;
   }
   else {
-    u3_noun dif   = u3_cka_sub(wen, now);
+    u3_noun dif   = u3ka_sub(wen, now);
     c3_d    fsc_d = u3r_chub(0, dif);
     c3_d    sec_d = u3r_chub(1, dif);
 
diff --git a/v/unix.c b/v/unix.c
index 21d67fb002..580c08cbdc 100644
--- a/v/unix.c
+++ b/v/unix.c
@@ -673,7 +673,7 @@ _unix_file_load(u3_ufil* fil_u)
   if ( (0 == raw) || ('^' != fil_u->dot_c[1]) ) {
     return raw;
   }
-  else return u3_cke_cue(raw);
+  else return u3ke_cue(raw);
 }
 
 
@@ -737,7 +737,7 @@ _unix_dir_ankh_file(u3_noun pam, u3_noun wib, u3_noun baw, u3_noun woz)
 {
   u3_weak ole;
   if ( c3n == u3du(wib) ) {
-    ole = u3_ckdb_get(u3k(pam), u3k(wib));
+    ole = u3kdb_get(u3k(pam), u3k(wib));
 
     if ( u3_none == ole ) {
       ole = u3do("cosh", u3nt(0, woz, u3_nul));
@@ -749,24 +749,24 @@ _unix_dir_ankh_file(u3_noun pam, u3_noun wib, u3_noun baw, u3_noun woz)
 
       ole = elo;
     }
-    pam = u3_ckdb_put(pam, wib, ole);
+    pam = u3kdb_put(pam, wib, ole);
   }
   else {
     u3_noun fid = u3h(wib);
     u3_noun har = u3t(wib);
 
-    ole = u3_ckdb_get(u3k(pam), u3k(fid));
+    ole = u3kdb_get(u3k(pam), u3k(fid));
 
     if ( u3_none == ole ) {
       ole = u3nt
-        (0, u3_nul, u3_ckdb_put(u3_nul,
+        (0, u3_nul, u3kdb_put(u3_nul,
                                   u3k(har),
                                   u3do("cosh", u3nt(0, woz, u3_nul))));
       ole = u3do("cosh", ole);
     }
     else {
       u3_noun roo = u3t(u3t(ole));
-      u3_weak tup = u3_ckdb_get(u3k(roo), u3k(har));
+      u3_weak tup = u3kdb_get(u3k(roo), u3k(har));
       u3_noun oor, elo;
 
       if ( u3_none == tup ) {
@@ -779,12 +779,12 @@ _unix_dir_ankh_file(u3_noun pam, u3_noun wib, u3_noun baw, u3_noun woz)
 
         tup = upt;
       }
-      oor = u3_ckdb_put(u3k(roo), u3k(har), tup);
+      oor = u3kdb_put(u3k(roo), u3k(har), tup);
       elo = u3do("cosh", u3nt(0, u3k(u3h(u3t(ole))), oor));
 
       u3z(ole); ole = elo;
     }
-    pam = u3_ckdb_put(pam, u3k(fid), ole);
+    pam = u3kdb_put(pam, u3k(fid), ole);
     u3z(wib);
   }
   return pam;
@@ -805,7 +805,7 @@ _unix_dir_ankh(u3_udir* dir_u)
 
     // uL(fprintf(uH, "dir %s\n", u3r_string(pre)));
     if ( 0 != u3h(ank) ) {
-      pam = u3_ckdb_put(pam, pre, ank);
+      pam = u3kdb_put(pam, pre, ank);
     }
   }
 
@@ -1178,7 +1178,7 @@ _unix_desk_sync_tofu(u3_udir* dir_u,
     }
 
     if ( c3y == u3du(god) ) {
-      oat = u3_cke_jam(god);
+      oat = u3ke_jam(god);
       pax_c = pux_c; free(pox_c);
     } else {
       oat = god;
diff --git a/v/walk.c b/v/walk.c
index 5a3413f391..c432fc6c67 100644
--- a/v/walk.c
+++ b/v/walk.c
@@ -199,18 +199,18 @@ _walk_in(const c3_c* dir_c, c3_w len_w)
           {
             u3_noun nam = u3i_string(nam_c);
             u3_noun ext = u3i_string(ext_c);
-            u3_noun get = u3_ckdb_get(u3k(map), u3k(nam));
+            u3_noun get = u3kdb_get(u3k(map), u3k(nam));
             u3_noun dat = u3_walk_load(pat_c);
             u3_noun hax;
 
             if ( !strcmp("noun", ext_c) ) {
-              dat = u3_cke_cue(dat);
+              dat = u3ke_cue(dat);
             }
             hax = u3do("sham", u3k(dat));
             if ( u3_none == get ) { get = u3_nul; }
 
-            get = u3_ckdb_put(get, ext, u3nt(c3y, hax, dat));
-            map = u3_ckdb_put(map, nam, u3nc(c3n, get));
+            get = u3kdb_put(get, ext, u3nt(c3y, hax, dat));
+            map = u3kdb_put(map, nam, u3nc(c3n, get));
           }
           free(nam_c);
           free(ext_c);
@@ -219,7 +219,7 @@ _walk_in(const c3_c* dir_c, c3_w len_w)
           u3_noun dir = _walk_in(pat_c, lef_w);
 
           if ( u3_nul != dir ) {
-            map = u3_ckdb_put
+            map = u3kdb_put
               (map, u3i_string(fil_c), u3nc(c3n, dir));
           }
           else u3z(tim);