Added ! to all updaters

13 files changed, 260 insertions, 260 deletions

diff --git a/srfi-225-test.scm b/srfi-225-test.scm
index 4967f94..f7654b7 100644
--- a/srfi-225-test.scm
+++ b/srfi-225-test.scm
@@ -52,7 +52,7 @@
 ;; which counts how often each dto's method was called
 ;; verify that all functions were tested
 (define (wrap-dto dto)
-  (define proc-count (+ 1 dict-adjoin-accumulator-id))
+  (define proc-count (+ 1 dict-adjoin!-accumulator-id))
   (define counter (make-vector proc-count 0))
   (define wrapper-dto-args
     (let loop ((indexes (iota proc-count))
@@ -141,9 +141,9 @@
   (when mutable?
     (test-skip 1))
   (test-group
-   "dict-set"
+   "dict-set!"
    (define dict-original (alist->dict '((a . b))))
-   (define d (dict-set dto dict-original 'a 'c 'a2 'b2))
+   (define d (dict-set! dto dict-original 'a 'c 'a2 'b2))
    (test-equal 'c (dict-ref dto d 'a ))
    (test-equal 'b2 (dict-ref dto d 'a2))
    (test-equal 'b (dict-ref dto dict-original' a))
@@ -152,18 +152,18 @@
   (unless mutable?
     (test-skip 1))
   (test-group
-   "dict-set"
+   "dict-set!"
    (define d (alist->dict '((a . b))))
-   (dict-set dto d 'a 'c 'a2 'b2)
+   (dict-set! dto d 'a 'c 'a2 'b2)
    (test-equal 'c (dict-ref dto d 'a ))
    (test-equal 'b2 (dict-ref dto d 'a2)))
 
   (when mutable?
     (test-skip 1))
   (test-group
-   "dict-adjoin"
+   "dict-adjoin!"
    (define dict-original (alist->dict '((a . b))))
-   (define d (dict-adjoin dto dict-original 'a 'c 'a2 'b2))
+   (define d (dict-adjoin! dto dict-original 'a 'c 'a2 'b2))
    (test-equal 'b (dict-ref dto d 'a))
    (test-equal 'b2 (dict-ref dto d 'a2))
    (test-equal #f (dict-ref/default dto dict-original 'a2 #f)))
@@ -171,52 +171,52 @@
   (unless mutable?
     (test-skip 1))
   (test-group
-   "dict-adjoin"
+   "dict-adjoin!"
    (define d (alist->dict '((a . b))))
-   (dict-adjoin dto d 'a 'c 'a2 'b2)
+   (dict-adjoin! dto d 'a 'c 'a2 'b2)
    (test-equal 'b (dict-ref dto d 'a))
    (test-equal 'b2 (dict-ref dto d 'a2)))
 
   (when mutable?
     (test-skip 1))
   (test-group
-   "dict-delete"
+   "dict-delete!"
    (define dict-original (alist->dict '((a . b) (c . d))))
-   (define d (dict-delete dto dict-original 'a 'b))
+   (define d (dict-delete! dto dict-original 'a 'b))
    (test-equal (dict->alist dto d) '((c . d)))
    (test-equal 'b (dict-ref dto dict-original 'a)))
 
   (unless mutable?
     (test-skip 1))
   (test-group
-   "dict-delete"
+   "dict-delete!"
    (define d (alist->dict '((a . b) (c . d))))
-   (dict-delete dto d 'a 'b)
+   (dict-delete! dto d 'a 'b)
    (test-equal (dict->alist dto d) '((c . d))))
 
   (when mutable?
     (test-skip 1))
   (test-group
-   "dict-delete-all"
+   "dict-delete!-all!"
    (define dict-original (alist->dict '((a . b) (c . d))))
-   (define d (dict-delete-all dto dict-original '(a b)))
+   (define d (dict-delete!-all! dto dict-original '(a b)))
    (test-equal (dict->alist dto d) '((c . d)))
    (test-equal 'b (dict-ref dto dict-original 'a)))
 
   (unless mutable?
     (test-skip 1))
   (test-group
-   "dict-delete-all"
+   "dict-delete!-all!"
    (define d (alist->dict '((a . b) (c . d))))
-   (dict-delete-all dto d '(a b))
+   (dict-delete!-all! dto d '(a b))
    (test-equal (dict->alist dto d) '((c . d))))
 
   (when mutable?
     (test-skip 1))
   (test-group
-   "dict-replace"
+   "dict-replace!"
    (define dict-original (alist->dict '((a . b) (c . d))))
-   (define d (dict-replace dto dict-original 'a 'b2))
+   (define d (dict-replace! dto dict-original 'a 'b2))
    (test-equal 'b2 (dict-ref dto d 'a))
    (test-equal 'd (dict-ref dto d 'c))
    (test-equal 'b (dict-ref dto dict-original 'a)))
@@ -224,21 +224,21 @@
   (unless mutable?
     (test-skip 1))
   (test-group
-   "dict-replace"
+   "dict-replace!"
    (define d (alist->dict '((a . b) (c . d))))
-   (dict-replace dto d 'a 'b2)
+   (dict-replace! dto d 'a 'b2)
    (test-equal 'b2 (dict-ref dto d 'a))
    (test-equal 'd (dict-ref dto d 'c)))
 
   (when mutable?
     (test-skip 1))
   (test-group
-   "dict-intern"
+   "dict-intern!"
    ;; intern existing
    (let ()
      (define-values
          (d value)
-       (dict-intern dto (alist->dict '((a . b))) 'a (lambda () 'd)))
+       (dict-intern! dto (alist->dict '((a . b))) 'a (lambda () 'd)))
      (test-equal 'b (dict-ref dto d 'a))
      (test-equal 'b value))
    ;; intern missing
@@ -246,7 +246,7 @@
      (define dict-original (alist->dict '((a . b))))
      (define-values
          (d value)
-       (dict-intern dto dict-original 'c (lambda () 'd)))
+       (dict-intern! dto dict-original 'c (lambda () 'd)))
      (test-equal 'b (dict-ref dto d 'a))
      (test-equal 'd (dict-ref dto d 'c))
      (test-equal 'd value)
@@ -255,17 +255,17 @@
   (unless mutable?
     (test-skip 1))
   (test-group
-   "dict-intern"
+   "dict-intern!"
    ;; intern existing
    (let ()
     (define d (alist->dict '((a . b))))
-    (define-values (new-dict value) (dict-intern dto d 'a (lambda () 'd)))
+    (define-values (new-dict value) (dict-intern! dto d 'a (lambda () 'd)))
     (test-equal 'b (dict-ref dto d 'a))
     (test-equal 'b value))
    ;; intern missing
    (let ()
     (define d (alist->dict '((a . b))))
-    (define-values (new-dict value) (dict-intern dto d 'c (lambda () 'd)))
+    (define-values (new-dict value) (dict-intern! dto d 'c (lambda () 'd)))
     (test-equal 'b (dict-ref dto d 'a))
     (test-equal 'd (dict-ref dto d 'c))
     (test-equal 'd value)))
@@ -273,11 +273,11 @@
   (when mutable?
     (test-skip 1))
   (test-group
-   "dict-update"
+   "dict-update!"
    ;; update existing
    (define dict-original (alist->dict '((a . "b"))))
    (let ()
-     (define d (dict-update dto dict-original 'a
+     (define d (dict-update! dto dict-original 'a
                             (lambda (value)
                               (string-append value "2"))
                             error
@@ -286,7 +286,7 @@
      (test-equal "b" (dict-ref dto dict-original 'a)))
    ;; update missing
    (let ()
-     (define d (dict-update dto dict-original 'c
+     (define d (dict-update! dto dict-original 'c
                             (lambda (value)
                               (string-append value "2"))
                             (lambda () "d1")
@@ -297,11 +297,11 @@
   (unless mutable?
     (test-skip 1))
   (test-group
-   "dict-update"
+   "dict-update!"
    ;; update existing
    (let ()
     (define d (alist->dict '((a . "b"))))
-    (dict-update dto d 'a
+    (dict-update! dto d 'a
                   (lambda (value)
                     (string-append value "2"))
                   error
@@ -310,7 +310,7 @@
    ;; update missing
    (let ()
     (define d (alist->dict '((a . "b"))))
-    (dict-update dto d 'c
+    (dict-update! dto d 'c
                   (lambda (value)
                     (string-append value "2"))
                   (lambda () "d1")
@@ -320,11 +320,11 @@
   (when mutable?
     (test-skip 1))
   (test-group
-   "dict-update/default"
+   "dict-update!/default!"
    ;; update existing
    (define dict-original (alist->dict '((a . "b"))))
    (let ()
-     (define d (dict-update/default dto dict-original 'a
+     (define d (dict-update!/default! dto dict-original 'a
                                     (lambda (value)
                                       (string-append value "2"))
                                     "d1"))
@@ -333,7 +333,7 @@
 
    ;; update missing
    (let ()
-     (define d (dict-update/default dto dict-original 'c
+     (define d (dict-update!/default! dto dict-original 'c
                                     (lambda (value)
                                       (string-append value "2"))
                                     "d1"))
@@ -343,11 +343,11 @@
   (unless mutable?
     (test-skip 1))
   (test-group
-   "dict-update/default"
+   "dict-update!/default!"
    ;; update existing
    (let ()
     (define d (alist->dict '((a . "b"))))
-    (dict-update/default dto d 'a
+    (dict-update!/default! dto d 'a
                           (lambda (value)
                             (string-append value "2"))
                           "d1")
@@ -356,7 +356,7 @@
    ;; update missing
    (let ()
     (define d (alist->dict '((a . "b"))))
-    (dict-update/default dto d 'c
+    (dict-update!/default! dto d 'c
                           (lambda (value)
                             (string-append value "2"))
                           "d1")
@@ -365,11 +365,11 @@
   (when mutable?
     (test-skip 1))
   (test-group
-   "dict-pop"
+   "dict-pop!"
    (define dict-original (alist->dict '((a . b) (c . d))))
    (define-values
        (new-dict key value)
-     (dict-pop dto dict-original))
+     (dict-pop! dto dict-original))
    (test-assert
        (or
         (and (equal? (dict->alist dto new-dict) '((c . d)))
@@ -385,11 +385,11 @@
   (unless mutable?
     (test-skip 1))
   (test-group
-   "dict-pop"
+   "dict-pop!"
    (define d (alist->dict '((a . b) (c . d))))
    (define-values
        (new-dict key value)
-     (dict-pop dto d))
+     (dict-pop! dto d))
    (test-assert (eq? new-dict d))
    (test-assert
        (or
@@ -477,10 +477,10 @@
   (when mutable?
     (test-skip 1))
   (test-group
-   "dict-find-update"
+   "dict-find-update!"
    ;; ignore
    (let ()
-     (define dict (dict-find-update dto (alist->dict '((a . b))) 'c
+     (define dict (dict-find-update! dto (alist->dict '((a . b))) 'c
                               (lambda (insert ignore)
                                 (ignore))
                               (lambda args
@@ -490,7 +490,7 @@
    ;; insert
    (let ()
      (define dict-original (alist->dict '((a . b))))
-     (define dict (dict-find-update dto dict-original 'c
+     (define dict (dict-find-update! dto dict-original 'c
                     (lambda (insert ignore)
                       (insert 'd))
                     (lambda args
@@ -502,7 +502,7 @@
    ;; update
    (let ()
      (define dict-original (alist->dict '((a . b))))
-     (define dict (dict-find-update dto dict-original 'a
+     (define dict (dict-find-update! dto dict-original 'a
                               (lambda args
                                 (error "shouldn't happen"))
                               (lambda (key value update delete)
@@ -514,7 +514,7 @@
    ;; delete
    (let ()
      (define dict-original (alist->dict '((a . b) (c . d))))
-     (define dict (dict-find-update dto dict-original 'a
+     (define dict (dict-find-update! dto dict-original 'a
                               (lambda args
                                 (error "shouldn't happen"))
                               (lambda (key value update delete)
@@ -525,11 +525,11 @@
   (unless mutable?
     (test-skip 1))
   (test-group
-   "dict-find-update"
+   "dict-find-update!"
    ;; ignore
    (let ()
     (define dict (alist->dict '((a . b))))
-    (dict-find-update dto dict 'c
+    (dict-find-update! dto dict 'c
                               (lambda (insert ignore)
                                 (ignore))
                               (lambda args
@@ -539,7 +539,7 @@
    ;; insert
    (let ()
     (define dict (alist->dict '((a . b))))
-    (dict-find-update dto dict 'c
+    (dict-find-update! dto dict 'c
                        (lambda (insert ignore)
                          (insert 'd))
                        (lambda args
@@ -550,7 +550,7 @@
    ;; update
    (let ()
     (define dict (alist->dict '((a . b))))
-    (dict-find-update dto dict 'a
+    (dict-find-update! dto dict 'a
                        (lambda args
                          (error "shouldn't happen"))
                        (lambda (key value update delete)
@@ -560,7 +560,7 @@
    ;; delete
    (let ()
     (define dict (alist->dict '((a . b) (c . d))))
-    (dict-find-update dto dict 'a
+    (dict-find-update! dto dict 'a
                        (lambda args
                          (error "shouldn't happen"))
                        (lambda (key value update delete)
@@ -809,8 +809,8 @@
   (when mutable?
     (test-skip 1))
   (test-group
-    "dict-set-accumulator"
-    (define acc (dict-set-accumulator dto (alist->dict '())))
+    "dict-set!-accumulator"
+    (define acc (dict-set!-accumulator dto (alist->dict '())))
     (acc (cons 1 'a))
     (acc (cons 2 'b))
     (acc (cons 2 'c))
@@ -819,8 +819,8 @@
   (unless mutable?
     (test-skip 1))
   (test-group
-    "dict-set-accumulator"
-    (define acc (dict-set-accumulator dto (alist->dict '())))
+    "dict-set!-accumulator"
+    (define acc (dict-set!-accumulator dto (alist->dict '())))
     (acc (cons 1 'a))
     (acc (cons 2 'b))
     (acc (cons 2 'c))
@@ -829,8 +829,8 @@
   (when mutable?
     (test-skip 1))
   (test-group
-    "dict-adjoin-accumulator"
-    (define acc (dict-adjoin-accumulator dto (alist->dict '())))
+    "dict-adjoin!-accumulator"
+    (define acc (dict-adjoin!-accumulator dto (alist->dict '())))
     (acc (cons 1 'a))
     (acc (cons 2 'b))
     (acc (cons 2 'c))
@@ -839,8 +839,8 @@
   (unless mutable?
     (test-skip 1))
   (test-group
-    "dict-adjoin-accumulator"
-    (define acc (dict-adjoin-accumulator dto (alist->dict '())))
+    "dict-adjoin!-accumulator"
+    (define acc (dict-adjoin!-accumulator dto (alist->dict '())))
     (acc (cons 1 'a))
     (acc (cons 2 'b))
     (acc (cons 2 'c))
@@ -864,7 +864,7 @@
     dictionary?-id (dto-ref equal-alist-dto dictionary?-id)
     dict-pure?-id (dto-ref equal-alist-dto dict-pure?-id)
     dict-size-id (dto-ref equal-alist-dto dict-size-id)
-    dict-find-update-id (dto-ref equal-alist-dto dict-find-update-id)
+    dict-find-update!-id (dto-ref equal-alist-dto dict-find-update!-id)
     dict-map-id (dto-ref equal-alist-dto dict-map-id)
     dict-comparator-id (dto-ref equal-alist-dto dict-comparator-id)))
  (do-test
diff --git a/srfi-225.html b/srfi-225.html
index 5ca87dc..af07db4 100644
--- a/srfi-225.html
+++ b/srfi-225.html
@@ -152,84 +152,84 @@ returns <code>#f</code>.</p>
 dictionaries (see <a href="#dict-purep"><code>dict-pure?</code></a>): the <code>!</code>
 convention is not used in this SRFI.</p>
 <p>Updates are not permitted while any generic procedure is running that takes a procedure argument.</p>
-<p><code>(dict-set</code>&nbsp;<em>dto dict obj</em> …<code>)</code><br>
+<p><code>(dict-set!</code>&nbsp;<em>dto dict obj</em> …<code>)</code><br>
 <p>Returns a dictionary that contains all the associations of <em>dict</em>
   plus those specified by <em>objs</em>, which alternate between keys and values.
   If a key to be added already exists in <em>dict</em>, the new value prevails.</p>
-<blockquote><pre> (dict-set dto dict 7 8) =&gt;
+<blockquote><pre> (dict-set! dto dict 7 8) =&gt;
    ((1 . 2) (3 . 4) (5 . 6) (7 . 8)))
-(dict-set dto dict 3 5) =&gt;
+(dict-set! dto dict 3 5) =&gt;
    ((3 . 5) (1 . 2) (5 . 6)))</pre></blockquote>
-<p><code>(dict-adjoin</code>&nbsp;<em>dto dict obj</em> ...<code>)</code><br>
+<p><code>(dict-adjoin!</code>&nbsp;<em>dto dict obj</em> ...<code>)</code><br>
 <p>Returns a dictionary that contains all the associations of <em>dict</em>
   plus those specified by <em>objs</em>, which alternate between keys and values.
   If a key to be added already exists in <em>dict</em>, the old value prevails.</p>
-<blockquote><pre> (dict-adjoin dto dict 7 8) =&gt;
+<blockquote><pre> (dict-adjoin! dto dict 7 8) =&gt;
   ((7 . 8) (1 . 2) (3 . 4) (5 . 6))
-(dict-adjoin dto dict 3 5) =&gt;
+(dict-adjoin! dto dict 3 5) =&gt;
   ((1 . 2) (3 . 4) (5 . 6))</pre></blockquote>
-<p><code>(dict-delete</code>&nbsp;<em>dto dict key</em> …<code>)</code></p>
+<p><code>(dict-delete!</code>&nbsp;<em>dto dict key</em> …<code>)</code></p>
 <p>Returns a dictionary that contains all the associations of <em>dict</em>
   except those whose keys are the same as one of the <em>keys</em>.
-<blockquote><pre>(dict-delete dto dict 1 3) =&gt;
+<blockquote><pre>(dict-delete! dto dict 1 3) =&gt;
   ((5 . 6))
-(dict-delete dto dict 5) =&gt;
+(dict-delete! dto dict 5) =&gt;
   ((1 . 2) (3 . 4))</pre></blockquote>
-<p><code>(dict-delete-all</code>&nbsp;<em>dto dict keylist</em><code>)</code></p>
-<p>The same as <code>dict-delete</code>, except that the keys to be deleted are in the list <em>keylist</em>.</p>
-<blockquote><pre>(dict-delete-all dto dict '(1 3)) =&gt; ((5 . 6))</pre></blockquote>
-<p><code>(dict-replace</code>&nbsp;<em>dto dict key value</em><code>)</code></p>
+<p><code>(dict-delete!-all!</code>&nbsp;<em>dto dict keylist</em><code>)</code></p>
+<p>The same as <code>dict-delete!</code>, except that the keys to be deleted are in the list <em>keylist</em>.</p>
+<blockquote><pre>(dict-delete!-all! dto dict '(1 3)) =&gt; ((5 . 6))</pre></blockquote>
+<p><code>(dict-replace!</code>&nbsp;<em>dto dict key value</em><code>)</code></p>
 <p>Returns a dictionary that contains all the associations of <em>dict</em> except as follows:
 If <em>key</em> is the same as a key of <em>dict</em>,
   then the association for that key is omitted and replaced by the association
   defined by the pair <em>key</em> and <em>value</em>.
 If there is no such key in <em>dict</em>, then dictionary is returned unchanged.</p>
-<blockquote><pre>(dict-replace dto dict 1 3) =&gt;
+<blockquote><pre>(dict-replace! dto dict 1 3) =&gt;
   ((1 . 3) (3 . 4) (5 . 6))) </pre></blockquote>
-<p><code>(dict-intern</code>&nbsp;<em>dto dict key failure</em>)</p>
+<p><code>(dict-intern!</code>&nbsp;<em>dto dict key failure</em>)</p>
 <p>If there is a key in <em>dict</em> that is the same as <em>key</em>, returns two values,
   <em>dict</em> and the value associated with <em>key</em>.
 Otherwise, returns two values, a dictionary that contains
   all the associations of <em>dict</em> and in addition a new association that maps <em>key</em>
   to the result of invoking <em>failure</em>, and the result of invoking <em>failure</em>.<br>
-<blockquote><pre>(dict-intern dto dict 1 (lambda () #f)) =&gt; ; 2 values
+<blockquote><pre>(dict-intern! dto dict 1 (lambda () #f)) =&gt; ; 2 values
   ((1 . 2) (3 . 4) (5 . 6))
   2
-(dict-intern dto dict 2 (lambda () 0)) =&gt; ; 2 values
+(dict-intern! dto dict 2 (lambda () 0)) =&gt; ; 2 values
   ((1 . 2) (2 . 0) (3 . 4) (5 . 6))
   0</pre></blockquote>
-<p><code>(dict-update</code>&nbsp;<em>dto dict key updater</em> [<em>failure</em> [<em>success</em>] ]<code>)</code></p>
-<p>Retrieves the value of <em>key</em> as if by <code>dict-ref</code>, invokes <em>updater</em> on it, and sets the value of <em>key</em> to be the result of calling <em>updater</em> as if by <code>dict-set</code>, but may do so more efficiently. Returns the updated dictionary. The default value of <em>failure</em> signals an error; the default value of <em>success</em> is the identity procedure.</p>
+<p><code>(dict-update!</code>&nbsp;<em>dto dict key updater</em> [<em>failure</em> [<em>success</em>] ]<code>)</code></p>
+<p>Retrieves the value of <em>key</em> as if by <code>dict-ref</code>, invokes <em>updater</em> on it, and sets the value of <em>key</em> to be the result of calling <em>updater</em> as if by <code>dict-set!</code>, but may do so more efficiently. Returns the updated dictionary. The default value of <em>failure</em> signals an error; the default value of <em>success</em> is the identity procedure.</p>
 <blockquote><pre>
-(dict-update dto dict 1 (lambda (x) (+ 1 x))) =&gt;
+(dict-update! dto dict 1 (lambda (x) (+ 1 x))) =&gt;
   ((1 . 3) (3 . 4) (5 . 6))
-(dict-update dto dict 2 (lambda (x) (+ 1 x))) =&gt;
+(dict-update! dto dict 2 (lambda (x) (+ 1 x))) =&gt;
   <em>error</em>
 </pre></blockquote>
-<p><code>(dict-update/default</code>&nbsp;<em>dto dict key updater default</em><code>)</code></p>
+<p><code>(dict-update!/default!</code>&nbsp;<em>dto dict key updater default</em><code>)</code></p>
 <p>Retrieves the value of <em>key</em> as if by <code>dict-ref/default</code>, invokes <em>updater</em> on it,
-  and sets the value of <em>key</em> to be the result of calling <em>updater</em> as if by <code>dict-set</code>,
+  and sets the value of <em>key</em> to be the result of calling <em>updater</em> as if by <code>dict-set!</code>,
   but may do so more efficiently. Returns the updated dictionary.</p>
 <blockquote><pre>
-(dict-update/default dto dict 1
+(dict-update!/default! dto dict 1
   (lambda (x) (+ 1 x)) 0) =&gt;
   ((1 . 3) (3 . 4) (5 . 6))
-(dict-update/default dto dict 2
+(dict-update!/default! dto dict 2
   (lambda (x) (+ 1 x)) 0) =&gt;
   ((2 . 1) (3 . 4) (5 . 6))
 </pre></blockquote>
-<p><code>(dict-pop</code>&nbsp;<em>dto dict</em><code>)</code></p>
+<p><code>(dict-pop!</code>&nbsp;<em>dto dict</em><code>)</code></p>
 <p>Chooses an association from <em>dict</em> and returns three values:
   a dictionary that contains all associations of <em>dict</em> except the chosen one,
   the key, and the value of the association chosen.
   If the dictionary is inherently ordered, the first association is chosen;
   otherwise, the chosen association is arbitrary.</p>
 <p>If <em>dict</em> contains no associations, it is an error.</p>
-<blockquote><pre>(dict-pop dto dict) =&gt; ; 3 values
+<blockquote><pre>(dict-pop! dto dict) =&gt; ; 3 values
   ((3 . 4) (5 . 6))
   1
   2</pre></blockquote>
-<p><code>(dict-find-update</code>&nbsp;<em>dto dict key failure success</em><code>)</code></p>
+<p><code>(dict-find-update!</code>&nbsp;<em>dto dict key failure success</em><code>)</code></p>
 <p>This procedure is a workhorse for dictionary lookup, insert, and delete.
   The dictionary <em>dict</em> is searched for an association whose key is the same as <em>key</em>.
   If one is not found, then the <em>failure</em> procedure is tail-called with two procedure arguments,
@@ -354,12 +354,12 @@ key <em>key</em>.
   if the dictionary is ordered.</p>
   <p>It is an error to mutate <em>dict</em> until after the generator is exhausted.
   When all the associations have been processed, returns an end-of-file object.</p>
-  <p><code>(dict-set-accumulator</code>&nbsp;<em>dto dict</em><code>)</code></p>
+  <p><code>(dict-set!-accumulator</code>&nbsp;<em>dto dict</em><code>)</code></p>
 <p>Returns a SRFI 158 accumulator procedure that, when invoked on a pair, adds the <code>car</code> and <code>cdr</code> of the pair
-  as a key and value of <em>dict</em> as if by <code>dict-set</code>, eventually returning the new value of <em>dict</em>.
+  as a key and value of <em>dict</em> as if by <code>dict-set!</code>, eventually returning the new value of <em>dict</em>.
   If invoked on an end-of-file object, no action is taken and <em>dict</em> is returned.</p>
-<p><code>(dict-adjoin-accumulator</code>&nbsp;<em>dto dict</em><code>)</code></p>
-<p>The same as <code>dict-set-accumulator</code>, except using <code>dict-adjoin</code>. </p>
+<p><code>(dict-adjoin!-accumulator</code>&nbsp;<em>dto dict</em><code>)</code></p>
+<p>The same as <code>dict-set!-accumulator</code>, except using <code>dict-adjoin!</code>. </p>
 <h3 id="dictionary-type-object-procedures">Dictionary type object procedures (non-generic)</h3>
 <p><code>(dto?</code>&nbsp;<em>obj</em><code>)</code></p>
 <p>Returns <code>#t</code> if <em>obj</em> is a DTO, and <code>#f</code> otherwise.</p>
@@ -374,7 +374,7 @@ The following proc-id variables and associated procedures need to be provided
   in order for the DTO to support the full set of dictionary procedures:</p>
 <ul>
 <li><code>dictionary?-id</code></li>
-<li><code>dict-find-update-id</code></li>
+<li><code>dict-find-update!-id</code></li>
 <li><code>dict-comparator-id</code></li>
 <li><code>dict-map-id</code></li>
 <li><code>dict-pure?-id</code></li>
@@ -387,38 +387,38 @@ The following proc-id variables and associated procedures need to be provided
 <p>There are additional proc-id variables that may be provided with corresponding procedures
   in order to increase efficiency.
   For example, it is not necessary to provide a <code>dict-ref</code> procedure,
-  because the default version is built on top of <code>dict-find-update</code>.
+  because the default version is built on top of <code>dict-find-update!</code>.
   But if the underlying dictionary provides its own <code>-ref</code> procedure,
   it may be more efficient to specify it to <code>make-dto</code> using <code>dict-ref-id</code>.
   Here is the list of additional proc-id variables:</p>
 <ul>
 <li><code>dict-&gt;alist-id</code></li>
-<li><code>dict-adjoin-accumulator-id</code></li>
-<li><code>dict-adjoin-id</code></li>
+<li><code>dict-adjoin!-accumulator-id</code></li>
+<li><code>dict-adjoin!-id</code></li>
 <li><code>dict-any-id</code></li>
 <li><code>dict-contains?-id</code></li>
 <li><code>dict-count-id</code></li>
-<li><code>dict-delete-all-id</code></li>
-<li><code>dict-delete-id</code></li>
+<li><code>dict-delete!-all!-id</code></li>
+<li><code>dict-delete!-id</code></li>
 <li><code>dict-empty?-id</code></li>
 <li><code>dict-entries-id</code></li>
 <li><code>dict-every-id</code></li>
 <li><code>dict-filter-id</code></li>
 <li><code>dict-fold-id</code></li>
 <li><code>dict-for-each-id</code></li>
-<li><code>dict-intern-id</code></li>
+<li><code>dict-intern!-id</code></li>
 <li><code>dict-keys-id</code></li>
 <li><code>dict-map-&gt;list-id</code></li>
 <li><code>dict-map-id</code></li>
-<li><code>dict-pop-id</code></li>
+<li><code>dict-pop!-id</code></li>
 <li><code>dict-ref-id</code></li>
 <li><code>dict-ref/default-id</code></li>
 <li><code>dict-remove-id</code></li>
-<li><code>dict-replace-id</code></li>
-<li><code>dict-set-accumulator-id</code></li>
-<li><code>dict-set-id</code></li>
-<li><code>dict-update-id</code></li>
-<li><code>dict-update/default-id</code></li>
+<li><code>dict-replace!-id</code></li>
+<li><code>dict-set!-accumulator-id</code></li>
+<li><code>dict-set!-id</code></li>
+<li><code>dict-update!-id</code></li>
+<li><code>dict-update!/default!-id</code></li>
 <li><code>dict-values-id</code></li>
 <li><code>dict=?-id</code></li>
 <li><code>dict-&gt;generator-id</code></li>
@@ -469,44 +469,44 @@ new dictionary types that may not have complete dictionary APIs:</p>
 
     <dt>dict-ref</dt>
     <dd>dict-pure?</dd>
-    <dd>dict-find-update</dd>
+    <dd>dict-find-update!</dd>
 
     <dt>dict-ref/default</dt>
     <dd>dict-ref</dd>
 
-    <dt>dict-set</dt>
-    <dd>dict-find-update</dd>
+    <dt>dict-set!</dt>
+    <dd>dict-find-update!</dd>
 
-    <dt>dict-adjoin</dt>
-    <dd>dict-find-update</dd>
+    <dt>dict-adjoin!</dt>
+    <dd>dict-find-update!</dd>
 
-    <dt>dict-delete</dt>
-    <dd>dict-delete-all</dd>
+    <dt>dict-delete!</dt>
+    <dd>dict-delete!-all!</dd>
 
-    <dt>dict-delete-all</dt>
-    <dd>dict-find-update</dd>
+    <dt>dict-delete!-all!</dt>
+    <dd>dict-find-update!</dd>
 
-    <dt>dict-replace</dt>
-    <dd>dict-find-update</dd>
+    <dt>dict-replace!</dt>
+    <dd>dict-find-update!</dd>
 
-    <dt>dict-intern</dt>
-    <dd>dict-find-update</dd>
+    <dt>dict-intern!</dt>
+    <dd>dict-find-update!</dd>
 
-    <dt>dict-update</dt>
-    <dd>dict-find-update</dd>
+    <dt>dict-update!</dt>
+    <dd>dict-find-update!</dd>
 
-    <dt>dict-update/default</dt>
-    <dd>dict-update</dd>
+    <dt>dict-update!/default!</dt>
+    <dd>dict-update!</dd>
 
-    <dt>dict-pop</dt>
+    <dt>dict-pop!</dt>
     <dd>dict-for-each</dd>
-    <dd>dict-delete-all</dd>
+    <dd>dict-delete!-all!</dd>
     <dd>dict-empty?</dd>
 
     <dt>dict-filter</dt>
     <dd>dict-keys</dd>
     <dd>dict-ref</dd>
-    <dd>dict-delete-all</dd>
+    <dd>dict-delete!-all!</dd>
 
     <dt>dict-remove</dt>
     <dd>dict-filter</dd>
@@ -541,11 +541,11 @@ new dictionary types that may not have complete dictionary APIs:</p>
     <dt>dict-&gt;generator</dt>
     <dd>dict-for-each</dd>
 
-    <dt>dict-set-accumulator</dt>
-    <dd>dict-set</dd>
+    <dt>dict-set!-accumulator</dt>
+    <dd>dict-set!</dd>
 
-    <dt>dict-adjoin-accumulator</dt>
-    <dd>dict-set</dd>
+    <dt>dict-adjoin!-accumulator</dt>
+    <dd>dict-set!</dd>
 </dl>
 </code>
 
diff --git a/srfi/225/alist-impl.sld b/srfi/225/alist-impl.sld
index 01df92a..bbb0f45 100644
--- a/srfi/225/alist-impl.sld
+++ b/srfi/225/alist-impl.sld
@@ -91,7 +91,7 @@
         dict-pure?-id alist-pure?
         dict-map-id alist-map
         dict-filter-id alist-filter
-        dict-find-update-id (make-alist-find-update key=)
+        dict-find-update!-id (make-alist-find-update key=)
         dict-size-id alist-size
         dict->alist-id alist->alist
         dict-comparator-id alist-comparator))
diff --git a/srfi/225/core-exports.scm b/srfi/225/core-exports.scm
index 90e2992..a3dab1d 100644
--- a/srfi/225/core-exports.scm
+++ b/srfi/225/core-exports.scm
@@ -12,19 +12,19 @@
     dict-comparator
 
     ;; mutation
-    dict-set
-    dict-adjoin
-    dict-delete
-    dict-delete-all
-    dict-replace
-    dict-intern
-    dict-update
-    dict-update/default
-    dict-pop
+    dict-set!
+    dict-adjoin!
+    dict-delete!
+    dict-delete!-all!
+    dict-replace!
+    dict-intern!
+    dict-update!
+    dict-update!/default!
+    dict-pop!
     dict-map
     dict-filter
     dict-remove
-    dict-find-update
+    dict-find-update!
 
     ;; whole dictionary
     dict-size
@@ -41,8 +41,8 @@
     ;; iteration
     dict-for-each
     dict->generator
-    dict-set-accumulator
-    dict-adjoin-accumulator
+    dict-set!-accumulator
+    dict-adjoin!-accumulator
 
     ;; dictionary type descriptors
     dto?
diff --git a/srfi/225/core-impl.scm b/srfi/225/core-impl.scm
index 2e38432..f65cd9e 100644
--- a/srfi/225/core-impl.scm
+++ b/srfi/225/core-impl.scm
@@ -47,33 +47,33 @@
      ((dto-ref-stx dto dict-ref-id) dto dict key failure success))))
 
 (define/dict-proc dict-ref/default dict-ref/default-id)
-(define/dict-proc dict-set dict-set-id)
-(define/dict-proc dict-adjoin dict-adjoin-id)
-(define/dict-proc dict-delete dict-delete-id)
-(define/dict-proc dict-delete-all dict-delete-all-id)
-(define/dict-proc dict-replace dict-replace-id)
-(define/dict-proc dict-intern dict-intern-id)
-
-(define dict-update
+(define/dict-proc dict-set! dict-set!-id)
+(define/dict-proc dict-adjoin! dict-adjoin!-id)
+(define/dict-proc dict-delete! dict-delete!-id)
+(define/dict-proc dict-delete!-all! dict-delete!-all!-id)
+(define/dict-proc dict-replace! dict-replace!-id)
+(define/dict-proc dict-intern! dict-intern!-id)
+
+(define dict-update!
   (case-lambda
     ((dto dict key updater)
-     (dict-update dto dict key updater
+     (dict-update! dto dict key updater
                   (lambda () (error "Key not found in dictionary" dict key))
                   values))
 
     ((dto dict key updater failure)
-     (dict-update dto dict key  updater failure values))
+     (dict-update! dto dict key  updater failure values))
 
     ((dto dict key updater failure success)
      (assume (dto? dto))
-     ((dto-ref-stx dto dict-update-id) dto dict key updater failure success))))
+     ((dto-ref-stx dto dict-update!-id) dto dict key updater failure success))))
 
-(define/dict-proc dict-update/default dict-update/default-id)
-(define/dict-proc dict-pop dict-pop-id)
+(define/dict-proc dict-update!/default! dict-update!/default!-id)
+(define/dict-proc dict-pop! dict-pop!-id)
 (define/dict-proc dict-map dict-map-id)
 (define/dict-proc dict-filter dict-filter-id)
 (define/dict-proc dict-remove dict-remove-id)
-(define/dict-proc dict-find-update dict-find-update-id)
+(define/dict-proc dict-find-update! dict-find-update!-id)
 (define/dict-proc dict-size dict-size-id)
 (define/dict-proc dict-count dict-count-id)
 (define/dict-proc dict-any dict-any-id)
@@ -98,8 +98,8 @@
     ((dto dict start) (dict->generator dto dict start #f))
     ((dto dict start end) ((dto-ref-stx dto dict->generator-id) dto dict start end))))
 
-(define/dict-proc dict-set-accumulator dict-set-accumulator-id)
-(define/dict-proc dict-adjoin-accumulator dict-adjoin-accumulator-id)
+(define/dict-proc dict-set!-accumulator dict-set!-accumulator-id)
+(define/dict-proc dict-adjoin!-accumulator dict-adjoin!-accumulator-id)
 
 (define (dto-ref dto procindex)
   (dto-ref-stx dto procindex))
diff --git a/srfi/225/default-impl.sld b/srfi/225/default-impl.sld
index 0c7d75c..4d815f9 100644
--- a/srfi/225/default-impl.sld
+++ b/srfi/225/default-impl.sld
@@ -18,7 +18,7 @@
     (define default-dictionary? (not-implemented "dictionary?"))
     (define default-dict-pure? (not-implemented "dict-pure?"))
     (define default-dict-size (not-implemented "dict-size"))
-    (define default-dict-find-update (not-implemented "dict-find-update"))
+    (define default-dict-find-update! (not-implemented "dict-find-update!"))
 
     (define (default-dict-empty? dto dictionary)
       (= 0 (dict-size dto dictionary)))
@@ -45,7 +45,7 @@
                 (lambda (x) #t)))
 
     (define (default-dict-ref dto dictionary key failure success)
-      (dict-find-update dto dictionary key
+      (dict-find-update! dto dictionary key
                         (lambda (insert ignore)
                           (failure))
                         (lambda (key value update remove)
@@ -57,7 +57,7 @@
                 (lambda (x) x)))
 
     ;; private
-    (define (default-dict-set* dto dictionary use-old? objs)
+    (define (default-dict-set!* dto dictionary use-old? objs)
       (let loop ((objs objs)
                  (dictionary dictionary))
         (cond
@@ -67,7 +67,7 @@
            (error "mismatch of key / values argument list" objs))
           (else (let* ((key (car objs))
                        (value (cadr objs))
-                       (new-d (dict-find-update dto dictionary key
+                       (new-d (dict-find-update! dto dictionary key
                                                 (lambda (insert ignore)
                                                   (insert value))
                                                 (lambda (key old-value update delete)
@@ -75,22 +75,22 @@
                   (loop (cddr objs)
                         new-d))))))
 
-    (define (default-dict-set dto dictionary . objs)
-      (default-dict-set* dto dictionary #f objs))
+    (define (default-dict-set! dto dictionary . objs)
+      (default-dict-set!* dto dictionary #f objs))
 
-    (define (default-dict-adjoin dto dictionary . objs)
-      (default-dict-set* dto dictionary #t objs))
+    (define (default-dict-adjoin! dto dictionary . objs)
+      (default-dict-set!* dto dictionary #t objs))
 
-    (define (default-dict-delete dto dictionary . keys)
-      (dict-delete-all dto dictionary keys))
+    (define (default-dict-delete! dto dictionary . keys)
+      (dict-delete!-all! dto dictionary keys))
 
-    (define (default-dict-delete-all dto dictionary keylist)
+    (define (default-dict-delete!-all! dto dictionary keylist)
       (let loop ((keylist keylist)
                  (d dictionary))
         (cond
           ((null? keylist) d)
           (else (let* ((key (car keylist))
-                       (new-d (dict-find-update dto d key
+                       (new-d (dict-find-update! dto d key
                                                 (lambda (_ ignore)
                                                   (ignore))
                                                 (lambda (key old-value _ delete)
@@ -98,41 +98,41 @@
                   (loop (cdr keylist)
                         new-d))))))
 
-    (define (default-dict-replace dto dictionary key value)
-      (dict-find-update dto dictionary key
+    (define (default-dict-replace! dto dictionary key value)
+      (dict-find-update! dto dictionary key
                         (lambda (_ ignore)
                           (ignore))
                         (lambda (key old-value update _)
                           (update key value))))
 
-    (define (default-dict-intern dto dictionary key failure)
-      (dict-find-update dto dictionary key
+    (define (default-dict-intern! dto dictionary key failure)
+      (dict-find-update! dto dictionary key
                         (lambda (insert _)
                           (let ((value (failure)))
                             (values (insert value) value)))
                         (lambda (key value update _)
                           (values dictionary value))))
 
-    (define (default-dict-update dto dictionary key updater failure success)
-      (dict-find-update dto dictionary key
+    (define (default-dict-update! dto dictionary key updater failure success)
+      (dict-find-update! dto dictionary key
                         (lambda (insert ignore)
                           (insert (updater (failure))))
                         (lambda (key value update _)
                           (update key (updater (success value))))))
 
-    (define (default-dict-update/default dto dictionary key updater default)
-      (dict-update dto dictionary key updater
+    (define (default-dict-update!/default! dto dictionary key updater default)
+      (dict-update! dto dictionary key updater
                    (lambda () default)
                    (lambda (x) x)))
 
-    (define (default-dict-pop dto dictionary)
+    (define (default-dict-pop! dto dictionary)
       (define (do-pop)
         (call/cc
           (lambda (cont)
             (dict-for-each dto
                            (lambda (key value)
                              (define new-dict
-                               (dict-delete-all dto dictionary (list key)))
+                               (dict-delete!-all! dto dictionary (list key)))
                              (cont new-dict key value))
                            dictionary))))
       (define empty? (dict-empty? dto dictionary))
@@ -149,7 +149,7 @@
           (lambda (key)
             (not (pred key (dict-ref dto dictionary key))))
           keys))
-      (dict-delete-all dto dictionary keys-to-delete))
+      (dict-delete!-all! dto dictionary keys-to-delete))
 
     (define (default-dict-remove dto pred dictionary)
       (dict-filter dto (lambda (key value)
@@ -329,11 +329,11 @@
           dict
           (set! dict (acc-proc dto dict (car arg) (cdr arg))))))
 
-    (define (default-dict-set-accumulator dto dict)
-      (default-dict-accumulator dto dict dict-set))
+    (define (default-dict-set!-accumulator dto dict)
+      (default-dict-accumulator dto dict dict-set!))
 
-    (define (default-dict-adjoin-accumulator dto dict)
-      (default-dict-accumulator dto dict dict-adjoin))
+    (define (default-dict-adjoin!-accumulator dto dict)
+      (default-dict-accumulator dto dict dict-adjoin!))
 
     (define null-dto (make-dto-private (make-vector dict-procedures-count #f)))
 
@@ -348,19 +348,19 @@
             dict-pure?-id default-dict-pure?
             dict-ref-id default-dict-ref
             dict-ref/default-id default-dict-ref/default
-            dict-set-id default-dict-set
-            dict-adjoin-id default-dict-adjoin
-            dict-delete-id default-dict-delete
-            dict-delete-all-id default-dict-delete-all
-            dict-replace-id default-dict-replace
-            dict-intern-id default-dict-intern
-            dict-update-id default-dict-update
-            dict-update/default-id default-dict-update/default
-            dict-pop-id default-dict-pop
+            dict-set!-id default-dict-set!
+            dict-adjoin!-id default-dict-adjoin!
+            dict-delete!-id default-dict-delete!
+            dict-delete!-all!-id default-dict-delete!-all!
+            dict-replace!-id default-dict-replace!
+            dict-intern!-id default-dict-intern!
+            dict-update!-id default-dict-update!
+            dict-update!/default!-id default-dict-update!/default!
+            dict-pop!-id default-dict-pop!
             dict-map-id default-dict-map
             dict-filter-id default-dict-filter
             dict-remove-id default-dict-remove
-            dict-find-update-id default-dict-find-update
+            dict-find-update!-id default-dict-find-update!
             dict-size-id default-dict-size
             dict-count-id default-dict-count
             dict-any-id default-dict-any
@@ -377,8 +377,8 @@
 
             ;; generator procedures
             dict->generator-id default-dict->generator
-            dict-set-accumulator-id default-dict-set-accumulator
-            dict-adjoin-accumulator-id default-dict-adjoin-accumulator)))
+            dict-set!-accumulator-id default-dict-set!-accumulator
+            dict-adjoin!-accumulator-id default-dict-adjoin!-accumulator)))
 
     (define (make-dto . lst)
       (make-modified-dto default-dto lst))
diff --git a/srfi/225/indexes-exports.scm b/srfi/225/indexes-exports.scm
index fcb49ae..ff81ff3 100644
--- a/srfi/225/indexes-exports.scm
+++ b/srfi/225/indexes-exports.scm
@@ -1,7 +1,7 @@
 (export
     ;; required
     dictionary?-id
-    dict-find-update-id
+    dict-find-update!-id
     dict-comparator-id
     dict-map-id
     dict-pure?-id
@@ -10,32 +10,32 @@
 
     ;; extra
     dict->alist-id
-    dict-adjoin-accumulator-id
-    dict-adjoin-id
+    dict-adjoin!-accumulator-id
+    dict-adjoin!-id
     dict-any-id
     dict-contains?-id
     dict-count-id
-    dict-delete-all-id
-    dict-delete-id
+    dict-delete!-all!-id
+    dict-delete!-id
     dict-empty?-id
     dict-entries-id
     dict-every-id
     dict-filter-id
     dict-fold-id
     dict-for-each-id
-    dict-intern-id
+    dict-intern!-id
     dict-keys-id
     dict-map->list-id
     dict-map-id
-    dict-pop-id
+    dict-pop!-id
     dict-ref-id
     dict-ref/default-id
     dict-remove-id
-    dict-replace-id
-    dict-set-accumulator-id
-    dict-set-id
-    dict-update-id
-    dict-update/default-id
+    dict-replace!-id
+    dict-set!-accumulator-id
+    dict-set!-id
+    dict-update!-id
+    dict-update!/default!-id
     dict-values-id
     dict=?-id
     dict->generator-id)
diff --git a/srfi/225/indexes.sld b/srfi/225/indexes.sld
index b746c39..c1e1763 100644
--- a/srfi/225/indexes.sld
+++ b/srfi/225/indexes.sld
@@ -16,19 +16,19 @@
     (define dict-pure?-id (proc-id-inc))
     (define dict-ref-id (proc-id-inc))
     (define dict-ref/default-id (proc-id-inc))
-    (define dict-set-id (proc-id-inc))
-    (define dict-adjoin-id (proc-id-inc))
-    (define dict-delete-id (proc-id-inc))
-    (define dict-delete-all-id (proc-id-inc))
-    (define dict-replace-id (proc-id-inc))
-    (define dict-intern-id (proc-id-inc))
-    (define dict-update-id (proc-id-inc))
-    (define dict-update/default-id (proc-id-inc))
-    (define dict-pop-id (proc-id-inc))
+    (define dict-set!-id (proc-id-inc))
+    (define dict-adjoin!-id (proc-id-inc))
+    (define dict-delete!-id (proc-id-inc))
+    (define dict-delete!-all!-id (proc-id-inc))
+    (define dict-replace!-id (proc-id-inc))
+    (define dict-intern!-id (proc-id-inc))
+    (define dict-update!-id (proc-id-inc))
+    (define dict-update!/default!-id (proc-id-inc))
+    (define dict-pop!-id (proc-id-inc))
     (define dict-map-id (proc-id-inc))
     (define dict-filter-id (proc-id-inc))
     (define dict-remove-id (proc-id-inc))
-    (define dict-find-update-id (proc-id-inc))
+    (define dict-find-update!-id (proc-id-inc))
     (define dict-size-id (proc-id-inc))
     (define dict-count-id (proc-id-inc))
     (define dict-any-id (proc-id-inc))
@@ -42,7 +42,7 @@
     (define dict-comparator-id (proc-id-inc))
     (define dict-for-each-id (proc-id-inc))
     (define dict->generator-id (proc-id-inc))
-    (define dict-set-accumulator-id (proc-id-inc))
-    (define dict-adjoin-accumulator-id (proc-id-inc))
+    (define dict-set!-accumulator-id (proc-id-inc))
+    (define dict-adjoin!-accumulator-id (proc-id-inc))
     (define dict-procedures-count (proc-id-inc)) ;; only used for tracking backing vector size
     ))
diff --git a/srfi/225/srfi-125-impl.sld b/srfi/225/srfi-125-impl.sld
index a987787..a406fe0 100644
--- a/srfi/225/srfi-125-impl.sld
+++ b/srfi/225/srfi-125-impl.sld
@@ -129,16 +129,16 @@
         dict-contains?-id t125-hash-table-contains?*
         dict-ref-id t125-hash-table-ref*
         dict-ref/default-id t125-hash-table-ref/default*
-        dict-set-id t125-hash-table-set*
-        dict-delete-all-id t125-hash-table-delete-all*
-        dict-intern-id t125-hash-table-intern*
-        dict-update-id t125-hash-table-update*
-        dict-update/default-id t125-hash-table-update/default*
-        dict-pop-id t125-hash-table-pop*
+        dict-set!-id t125-hash-table-set*
+        dict-delete!-all!-id t125-hash-table-delete-all*
+        dict-intern!-id t125-hash-table-intern*
+        dict-update!-id t125-hash-table-update*
+        dict-update!/default!-id t125-hash-table-update/default*
+        dict-pop!-id t125-hash-table-pop*
         dict-map-id t125-hash-table-map*
         dict-filter-id t125-hash-table-filter*
         dict-remove-id t125-hash-table-remove*
-        dict-find-update-id t125-hash-table-find-update*
+        dict-find-update!-id t125-hash-table-find-update*
         dict-size-id t125-hash-table-size*
         dict-keys-id t125-hash-table-keys*
         dict-values-id t125-hash-table-values*
diff --git a/srfi/225/srfi-126-impl.sld b/srfi/225/srfi-126-impl.sld
index 5acc2cc..9b9fd74 100644
--- a/srfi/225/srfi-126-impl.sld
+++ b/srfi/225/srfi-126-impl.sld
@@ -118,15 +118,15 @@
         dict-contains?-id (prep-dto-arg t126-hashtable-contains?)
         dict-ref-id t126-hashtable-ref*
         dict-ref/default-id t126-hashtable-ref/default*
-        dict-set-id t126-hashtable-set*
-        dict-delete-all-id t126-hashtable-delete-all*
-        dict-intern-id t126-hashtable-intern*
-        dict-update/default-id t126-hashtable-update/default*
-        dict-pop-id t126-hashtable-pop*
+        dict-set!-id t126-hashtable-set*
+        dict-delete!-all!-id t126-hashtable-delete-all*
+        dict-intern!-id t126-hashtable-intern*
+        dict-update!/default!-id t126-hashtable-update/default*
+        dict-pop!-id t126-hashtable-pop*
         dict-map-id t126-hashtable-update-all*
         dict-filter-id t126-hashtable-filter*
         dict-remove-id t126-hashtable-remove*
-        dict-find-update-id t126-hashtable-find-update*
+        dict-find-update!-id t126-hashtable-find-update*
         dict-size-id (prep-dto-arg t126-hashtable-size)
         dict-keys-id t126-hashtable-keys*
         dict-values-id t126-hashtable-values*
diff --git a/srfi/225/srfi-146-hash-impl.sld b/srfi/225/srfi-146-hash-impl.sld
index 82dc769..d29bffc 100644
--- a/srfi/225/srfi-146-hash-impl.sld
+++ b/srfi/225/srfi-146-hash-impl.sld
@@ -56,18 +56,18 @@
         dict-contains?-id (prep-dto-arg hashmap-contains?)
         dict-ref-id (prep-dto-arg hashmap-ref)
         dict-ref/default-id (prep-dto-arg hashmap-ref/default)
-        dict-set-id (prep-dto-arg hashmap-set)
-        dict-adjoin-id (prep-dto-arg hashmap-adjoin)
-        dict-delete-id (prep-dto-arg hashmap-delete)
-        dict-delete-all-id (prep-dto-arg hashmap-delete-all)
-        dict-replace-id (prep-dto-arg hashmap-replace)
-        dict-intern-id (prep-dto-arg hashmap-intern)
-        dict-update-id (prep-dto-arg hashmap-update)
-        dict-update/default-id (prep-dto-arg hashmap-update/default)
-        dict-pop-id (prep-dto-arg hashmap-pop)
+        dict-set!-id (prep-dto-arg hashmap-set)
+        dict-adjoin!-id (prep-dto-arg hashmap-adjoin)
+        dict-delete!-id (prep-dto-arg hashmap-delete)
+        dict-delete!-all!-id (prep-dto-arg hashmap-delete-all)
+        dict-replace!-id (prep-dto-arg hashmap-replace)
+        dict-intern!-id (prep-dto-arg hashmap-intern)
+        dict-update!-id (prep-dto-arg hashmap-update)
+        dict-update!/default!-id (prep-dto-arg hashmap-update/default)
+        dict-pop!-id (prep-dto-arg hashmap-pop)
         dict-filter-id (prep-dto-arg hashmap-filter)
         dict-remove-id (prep-dto-arg hashmap-remove)
-        dict-find-update-id hashmap-find-update*
+        dict-find-update!-id hashmap-find-update*
         dict-size-id (prep-dto-arg hashmap-size)
         dict-count-id (prep-dto-arg hashmap-count)
         dict-keys-id (prep-dto-arg hashmap-keys)
diff --git a/srfi/225/srfi-146-impl.sld b/srfi/225/srfi-146-impl.sld
index d9577b4..3acb4b9 100644
--- a/srfi/225/srfi-146-impl.sld
+++ b/srfi/225/srfi-146-impl.sld
@@ -57,18 +57,18 @@
         dict-contains?-id (prep-dto-arg mapping-contains?)
         dict-ref-id (prep-dto-arg mapping-ref)
         dict-ref/default-id (prep-dto-arg mapping-ref/default)
-        dict-set-id (prep-dto-arg mapping-set)
-        dict-adjoin-id (prep-dto-arg mapping-adjoin)
-        dict-delete-id (prep-dto-arg mapping-delete)
-        dict-delete-all-id (prep-dto-arg mapping-delete-all)
-        dict-replace-id (prep-dto-arg mapping-replace)
-        dict-intern-id (prep-dto-arg mapping-intern)
-        dict-update-id (prep-dto-arg mapping-update)
-        dict-update/default-id (prep-dto-arg mapping-update/default)
-        dict-pop-id (prep-dto-arg mapping-pop)
+        dict-set!-id (prep-dto-arg mapping-set)
+        dict-adjoin!-id (prep-dto-arg mapping-adjoin)
+        dict-delete!-id (prep-dto-arg mapping-delete)
+        dict-delete!-all!-id (prep-dto-arg mapping-delete-all)
+        dict-replace!-id (prep-dto-arg mapping-replace)
+        dict-intern!-id (prep-dto-arg mapping-intern)
+        dict-update!-id (prep-dto-arg mapping-update)
+        dict-update!/default!-id (prep-dto-arg mapping-update/default)
+        dict-pop!-id (prep-dto-arg mapping-pop)
         dict-filter-id (prep-dto-arg mapping-filter)
         dict-remove-id (prep-dto-arg mapping-remove)
-        dict-find-update-id mapping-find-update*
+        dict-find-update!-id mapping-find-update*
         dict-size-id (prep-dto-arg mapping-size)
         dict-count-id (prep-dto-arg mapping-count)
         dict-keys-id (prep-dto-arg mapping-keys)
diff --git a/srfi/225/srfi-69-impl.sld b/srfi/225/srfi-69-impl.sld
index 6d04e4e..be4c6db 100644
--- a/srfi/225/srfi-69-impl.sld
+++ b/srfi/225/srfi-69-impl.sld
@@ -94,10 +94,10 @@
         dict-pure?-id t69-hash-table-pure?*
         dict-ref-id t69-hash-table-ref*
         dict-ref/default-id (prep-dto-arg t69-hash-table-ref/default)
-        dict-set-id t69-hash-table-set!*
-        dict-delete-all-id t69-hash-table-delete-all!*
+        dict-set!-id t69-hash-table-set!*
+        dict-delete!-all!-id t69-hash-table-delete-all!*
         dict-contains?-id (prep-dto-arg t69-hash-table-exists?)
-        dict-update/default-id t69-hash-table-update!/default*
+        dict-update!/default!-id t69-hash-table-update!/default*
         dict-size-id (prep-dto-arg t69-hash-table-size)
         dict-keys-id (prep-dto-arg t69-hash-table-keys)
         dict-values-id (prep-dto-arg t69-hash-table-values)
@@ -105,5 +105,5 @@
         dict-filter-id t69-hash-table-filter!*
         dict-fold-id t69-hash-table-fold*
         dict->alist-id (prep-dto-arg t69-hash-table->alist)
-        dict-find-update-id t69-hash-table-find-update!*
+        dict-find-update!-id t69-hash-table-find-update!*
         dict-comparator-id t69-hash-table-comparator*))))