diff --git a/quad/qtest/markdown.rkt b/quad/qtest/markdown.rkt
index 52a78418..618d275f 100644
--- a/quad/qtest/markdown.rkt
+++ b/quad/qtest/markdown.rkt
@@ -94,9 +94,9 @@
 
 (define (line-wrap xs size)
   (break xs size
-         #:hard-break-proc (λ (q) (equal? "¶" (car (quad-elems q))))
-         #:soft-break-proc soft-break-for-line?
-         #:finish-wrap-proc (λ (pcs q idx)
+         #:hard-break (λ (q) (equal? "¶" (car (quad-elems q))))
+         #:soft-break soft-break-for-line?
+         #:finish-wrap (λ (pcs q idx)
                               (append
                                (if (= idx 1) (list q:line-spacer) null)
                                (list (struct-copy quad q:line
@@ -111,8 +111,8 @@
 
 (define (page-wrap xs vertical-height)
   (break xs vertical-height
-         #:soft-break-proc line-spacer?
-         #:finish-wrap-proc (λ (pcs q idx) (list (struct-copy quad q:page [elems pcs])))))
+         #:soft-break line-spacer?
+         #:finish-wrap (λ (pcs q idx) (list (struct-copy quad q:page [elems pcs])))))
 
 (define (run xs path)
   (define pdf (time-name make-pdf (make-pdf #:compress #t
diff --git a/quad/qtest/typewriter.rkt b/quad/qtest/typewriter.rkt
index 77375454..a1c5fcff 100644
--- a/quad/qtest/typewriter.rkt
+++ b/quad/qtest/typewriter.rkt
@@ -104,8 +104,8 @@
 (define consolidate-into-runs? #t)
 (define (line-wrap xs size [debug #f])
   (break xs size debug
-         #:soft-break-proc soft-break?
-         #:finish-wrap-proc (λ (pcs q idx) (list (struct-copy quad $line
+         #:soft-break soft-break?
+         #:finish-wrap (λ (pcs q idx) (list (struct-copy quad $line
                                                   [elems
                                                    ;; consolidate chars into a single run (naively)
                                                    ;; by taking attributes from first (including origin)
@@ -117,7 +117,7 @@
 
 (define (page-wrap xs size [debug #f])
   (break xs size debug
-         #:finish-wrap-proc (λ (pcs q idx) (list (struct-copy quad $page
+         #:finish-wrap (λ (pcs q idx) (list (struct-copy quad $page
                                                   [elems pcs])))))
 
 (define (typeset pdf qarg)
diff --git a/quad/quad/break.rkt b/quad/quad/break.rkt
index 2a263999..035053af 100644
--- a/quad/quad/break.rkt
+++ b/quad/quad/break.rkt
@@ -11,15 +11,15 @@
 (define (break xs
                [target-size (current-wrap-distance)]
                [debug #f]
-               #:hard-break-proc [hard-break? (λ (x) #f)]
-               #:soft-break-proc [soft-break? (λ (x) #f)]
-               #:finish-wrap-proc [finish-wrap-proc (λ (xs q idx) (list xs))])
+               #:hard-break [hard-break? (λ (x) #f)]
+               #:soft-break [soft-break? (λ (x) #f)]
+               #:finish-wrap [finish-wrap-proc (λ (xs q idx) (list xs))])
   #;((listof quad?)
      (real?
       any/c
-      #:hard-break-proc (quad? . -> . any/c)
-      #:soft-break-proc (quad? . -> . any/c)
-      #:finish-wrap-proc ((listof any/c) quad? natural? . -> . (listof any/c))) . ->* . (listof any/c))
+      #:hard-break (quad? . -> . any/c)
+      #:soft-break (quad? . -> . any/c)
+      #:finish-wrap ((listof any/c) quad? natural? . -> . (listof any/c))) . ->* . (listof any/c))
   (break-hards xs target-size debug hard-break? soft-break? finish-wrap-proc))
 
 ;; the hard breaks are used to divide the wrap territory into smaller chunks
@@ -58,7 +58,7 @@
     ;; but we capture it separately because it's likely to get trimmed away by `nonprinting-at-end?`
     (finish-wrap-proc (reverse (dropf qs nonprinting-at-end?)) wrap-triggering-q wrap-idx))
   (let loop ([wraps null] ; list of (list of quads)
-             [wrap-idx 1] ; wrap count
+             [wrap-idx 1] ; wrap count (could be (length wraps) but we'd rather avoid `length`)
              [next-wrap-head null] ; list of quads ending in previous `soft-break?`
              [next-wrap-tail null] ; list of unbreakable quads
              [current-dist #false] ; #false (to indicate start) or integer
@@ -179,9 +179,9 @@
 
 (define (linewrap xs size [debug #f])
   (add-between (break xs size debug
-                      #:finish-wrap-proc (λ (xs . _) (list xs))
-                      #:hard-break-proc (λ (q) (char=? (car (quad-elems q)) #\newline))
-                      #:soft-break-proc soft-break?) lbr))
+                      #:finish-wrap (λ (xs . _) (list xs))
+                      #:hard-break (λ (q) (char=? (car (quad-elems q)) #\newline))
+                      #:soft-break soft-break?) lbr))
 
 (module+ test
   (require rackunit))
@@ -316,8 +316,8 @@
 (define (pagewrap xs size [debug #f])
   (add-between
    (break (flatten xs) size debug
-          #:hard-break-proc (λ (x) (and (quad? x) (memv (car (quad-elems x)) '(#\page))))
-          #:soft-break-proc (λ (x) (and (quad? x) (eq? x lbr)))) pbr))
+          #:hard-break (λ (x) (and (quad? x) (memv (car (quad-elems x)) '(#\page))))
+          #:soft-break (λ (x) (and (quad? x) (eq? x lbr)))) pbr))
 (define pbr (q #:size #false #:elems '(#\page)))
 
 (module+ test
@@ -354,9 +354,9 @@
 (define (linewrap2 xs size [debug #f])
   (add-between
    (break xs size debug
-          #:hard-break-proc (λ (q) (memv (car (quad-elems q)) '(#\newline)))
-          #:soft-break-proc soft-break?
-          #:finish-wrap-proc (λ (pcs . _) (list (apply q pcs))))
+          #:hard-break (λ (q) (memv (car (quad-elems q)) '(#\newline)))
+          #:soft-break soft-break?
+          #:finish-wrap (λ (pcs . _) (list (apply q pcs))))
    lbr))
 
 (module+ test