Move stuff from calp/util to hnh/util.

This is the first (major) step in splitting the generally useful items
into its own library.

99 files changed, 142 insertions, 142 deletions

diff --git a/calp-gnome.scm b/calp-gnome.scm
index cd10406b..61ef41a4 100644
--- a/calp-gnome.scm
+++ b/calp-gnome.scm
@@ -8,7 +8,7 @@
 (begin
 
  (use-modules
-  (calp util)
+  (hnh util)
   ((srfi srfi-1) :select (partition))
   (srfi srfi-41)
   (vcomponent datetime)
diff --git a/doc/ref/guile/util.texi b/doc/ref/guile/util.texi
index aae4dc6e..4a22b6c5 100644
--- a/doc/ref/guile/util.texi
+++ b/doc/ref/guile/util.texi
@@ -1,5 +1,5 @@
 @node Calp Util
-@section (calp util)
+@section (hnh util)
 
 @defmac define-syntax [stx]
 Extends the default syntax from the default
diff --git a/module/c/cpp.scm b/module/c/cpp.scm
index 070ea4f6..c782e468 100644
--- a/module/c/cpp.scm
+++ b/module/c/cpp.scm
@@ -1,13 +1,13 @@
 (define-module (c cpp)
-  :use-module (calp util)
+  :use-module (hnh util)
   :use-module (srfi srfi-1)
   :use-module (ice-9 popen)
   :use-module (ice-9 match)
   :use-module (ice-9 regex)
   :use-module ((rnrs io ports) :select (call-with-port))
   :use-module (ice-9 pretty-print) ; used by one error handler
-  :use-module ((calp util io) :select (read-lines))
-  :use-module (calp util graph)
+  :use-module ((hnh util io) :select (read-lines))
+  :use-module (hnh util graph)
   :use-module (c lex)
   :use-module (c parse)
   :use-module (c operators)
diff --git a/module/c/parse.scm b/module/c/parse.scm
index bef7e66d..3e3d8024 100644
--- a/module/c/parse.scm
+++ b/module/c/parse.scm
@@ -1,5 +1,5 @@
 (define-module (c parse)
-  :use-module (calp util)
+  :use-module (hnh util)
   :use-module (srfi srfi-1)
   :use-module (ice-9 match)
   :export (parse-lexeme-tree))
diff --git a/module/calp/benchmark/parse.scm b/module/calp/benchmark/parse.scm
index 2d7c7b18..f1ddf17d 100644
--- a/module/calp/benchmark/parse.scm
+++ b/module/calp/benchmark/parse.scm
@@ -1,5 +1,5 @@
 (define-module (calp benchmark parse)
-  :use-module (calp util)
+  :use-module (hnh util)
   :use-module (glob)
   :use-module (statprof)
 
diff --git a/module/calp/entry-points/benchmark.scm b/module/calp/entry-points/benchmark.scm
index 152a398c..5db9b9df 100644
--- a/module/calp/entry-points/benchmark.scm
+++ b/module/calp/entry-points/benchmark.scm
@@ -1,8 +1,8 @@
 (define-module (calp entry-points benchmark)
-  :use-module (calp util)
+  :use-module (hnh util)
 
   :use-module (ice-9 getopt-long)
-  :use-module (calp util options)
+  :use-module (hnh util options)
   :use-module ((srfi srfi-41) :select (stream->list))
 
   :use-module ((vcomponent util instance methods) :select (get-event-set))
diff --git a/module/calp/entry-points/convert.scm b/module/calp/entry-points/convert.scm
index f05b1e7b..3f602b07 100644
--- a/module/calp/entry-points/convert.scm
+++ b/module/calp/entry-points/convert.scm
@@ -1,7 +1,7 @@
 (define-module (calp entry-points convert)
   :export (main)
-  :use-module (calp util)
-  :use-module (calp util options)
+  :use-module (hnh util)
+  :use-module (hnh util options)
   :use-module (ice-9 getopt-long)
   :use-module (sxml simple)
   )
diff --git a/module/calp/entry-points/html.scm b/module/calp/entry-points/html.scm
index 45e71947..adac302f 100644
--- a/module/calp/entry-points/html.scm
+++ b/module/calp/entry-points/html.scm
@@ -1,8 +1,8 @@
 (define-module (calp entry-points html)
   :export (main)
-  :use-module (calp util)
+  :use-module (hnh util)
   :use-module (calp util time)
-  :use-module (calp util options)
+  :use-module (hnh util options)
   :use-module (datetime)
   :use-module (ice-9 getopt-long)
   :use-module ((ice-9 regex) :select (string-match regexp-substitute))
diff --git a/module/calp/entry-points/ical.scm b/module/calp/entry-points/ical.scm
index 0ac01b17..938b0b35 100644
--- a/module/calp/entry-points/ical.scm
+++ b/module/calp/entry-points/ical.scm
@@ -1,7 +1,7 @@
 (define-module (calp entry-points ical)
   :export (main)
-  :use-module (calp util)
-  :use-module (calp util options)
+  :use-module (hnh util)
+  :use-module (hnh util options)
   :use-module (vcomponent formats ical output)
   :use-module (ice-9 getopt-long)
   :use-module (datetime)
diff --git a/module/calp/entry-points/import.scm b/module/calp/entry-points/import.scm
index 69c5b687..441ff527 100644
--- a/module/calp/entry-points/import.scm
+++ b/module/calp/entry-points/import.scm
@@ -1,7 +1,7 @@
 (define-module (calp entry-points import)
   :export (main)
-  :use-module (calp util)
-  :use-module (calp util options)
+  :use-module (hnh util)
+  :use-module (hnh util options)
   :use-module (ice-9 getopt-long)
   :use-module (ice-9 rdelim)
   :use-module (srfi srfi-1)
diff --git a/module/calp/entry-points/server.scm b/module/calp/entry-points/server.scm
index 8885f38d..c9ff339a 100644
--- a/module/calp/entry-points/server.scm
+++ b/module/calp/entry-points/server.scm
@@ -1,6 +1,6 @@
 (define-module (calp entry-points server)
-  :use-module (calp util)
-  :use-module (calp util options)
+  :use-module (hnh util)
+  :use-module (hnh util options)
   :use-module (calp util config)
 
   :use-module (srfi srfi-1)
diff --git a/module/calp/entry-points/terminal.scm b/module/calp/entry-points/terminal.scm
index 5aaa1f2d..b0be318c 100644
--- a/module/calp/entry-points/terminal.scm
+++ b/module/calp/entry-points/terminal.scm
@@ -5,7 +5,7 @@
   :use-module (ice-9 getopt-long)
   :use-module (datetime)
   :use-module (vulgar)
-  :use-module (calp util options)
+  :use-module (hnh util options)
   )
 
 (define options
diff --git a/module/calp/entry-points/text.scm b/module/calp/entry-points/text.scm
index 6da524ae..0a5744b3 100644
--- a/module/calp/entry-points/text.scm
+++ b/module/calp/entry-points/text.scm
@@ -2,8 +2,8 @@
   :export (main)
   :use-module (text flow)
   :use-module (ice-9 getopt-long)
-  :use-module (calp util io)
-  :use-module (calp util options)
+  :use-module (hnh util io)
+  :use-module (hnh util options)
   )
 
 
diff --git a/module/calp/entry-points/tidsrapport.scm b/module/calp/entry-points/tidsrapport.scm
index abdd7aa2..5ff43cf7 100644
--- a/module/calp/entry-points/tidsrapport.scm
+++ b/module/calp/entry-points/tidsrapport.scm
@@ -39,8 +39,8 @@
 
 (define-module (calp entry-points tidsrapport)
   :export (main)
-  :use-module (calp util)
-  :use-module (calp util options)
+  :use-module (hnh util)
+  :use-module (hnh util options)
   :use-module (ice-9 getopt-long)
   :use-module (datetime)
   )
@@ -52,7 +52,7 @@
              (datetime)
              (vcomponent util instance)
              (vcomponent util instance methods)
-             (calp util)
+             (hnh util)
              (ice-9 regex)
              (ice-9 popen)
              )
diff --git a/module/calp/html/caltable.scm b/module/calp/html/caltable.scm
index 2f5a6d31..dd2d4b03 100644
--- a/module/calp/html/caltable.scm
+++ b/module/calp/html/caltable.scm
@@ -1,5 +1,5 @@
 (define-module (calp html caltable)
-  :use-module (calp util)
+  :use-module (hnh util)
   :use-module (calp html util)
   :use-module (datetime)
   :use-module (srfi srfi-41)
diff --git a/module/calp/html/components.scm b/module/calp/html/components.scm
index 36ec5166..2f8c85ec 100644
--- a/module/calp/html/components.scm
+++ b/module/calp/html/components.scm
@@ -1,5 +1,5 @@
 (define-module (calp html components)
-  :use-module (calp util)
+  :use-module (hnh util)
   :use-module (ice-9 curried-definitions)
   :use-module (ice-9 match)
   :export (xhtml-doc)
diff --git a/module/calp/html/config.scm b/module/calp/html/config.scm
index 081777ac..6bd1e0ec 100644
--- a/module/calp/html/config.scm
+++ b/module/calp/html/config.scm
@@ -1,5 +1,5 @@
 (define-module (calp html config)
-  :use-module (calp util)
+  :use-module (hnh util)
   :use-module (calp util config)
   )
 
diff --git a/module/calp/html/util.scm b/module/calp/html/util.scm
index 40852279..ecb54198 100644
--- a/module/calp/html/util.scm
+++ b/module/calp/html/util.scm
@@ -1,5 +1,5 @@
 (define-module (calp html util)
-  :use-module (calp util))
+  :use-module (hnh util))
 
 
 (define-public (date-link date)
diff --git a/module/calp/html/vcomponent.scm b/module/calp/html/vcomponent.scm
index 2abf370d..34aeca66 100644
--- a/module/calp/html/vcomponent.scm
+++ b/module/calp/html/vcomponent.scm
@@ -1,5 +1,5 @@
 (define-module (calp html vcomponent)
-  :use-module (calp util)
+  :use-module (hnh util)
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-41)
   :use-module ((rnrs io ports) :select (put-bytevector))
@@ -10,7 +10,7 @@
   :use-module (calp html util)
   :use-module ((calp html config) :select (edit-mode debug))
   :use-module ((calp html components) :select (btn tabset form with-label))
-  :use-module ((calp util color) :select (calculate-fg-color))
+  :use-module ((hnh util color) :select (calculate-fg-color))
   :use-module ((crypto) :select (sha256 checksum->string))
   :use-module ((xdg basedir) :prefix xdg-)
   :use-module ((vcomponent recurrence) :select (repeating?))
diff --git a/module/calp/html/view/calendar.scm b/module/calp/html/view/calendar.scm
index 64fafb3d..ecdce291 100644
--- a/module/calp/html/view/calendar.scm
+++ b/module/calp/html/view/calendar.scm
@@ -1,5 +1,5 @@
 (define-module (calp html view calendar)
-  :use-module (calp util)
+  :use-module (hnh util)
   :use-module (vcomponent)
   :use-module ((vcomponent datetime)
                :select (events-between))
diff --git a/module/calp/html/view/calendar/month.scm b/module/calp/html/view/calendar/month.scm
index 6506b0ea..2b4c888a 100644
--- a/module/calp/html/view/calendar/month.scm
+++ b/module/calp/html/view/calendar/month.scm
@@ -1,5 +1,5 @@
 (define-module (calp html view calendar month)
-  :use-module (calp util)
+  :use-module (hnh util)
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-41)
   :use-module (srfi srfi-41 util)
diff --git a/module/calp/html/view/calendar/shared.scm b/module/calp/html/view/calendar/shared.scm
index badea7b9..de09e00a 100644
--- a/module/calp/html/view/calendar/shared.scm
+++ b/module/calp/html/view/calendar/shared.scm
@@ -1,6 +1,6 @@
 (define-module (calp html view calendar shared)
-  :use-module (calp util)
-  :use-module ((calp util exceptions) :select (assert))
+  :use-module (hnh util)
+  :use-module ((hnh util exceptions) :select (assert))
   :use-module (srfi srfi-1)
   :use-module (vcomponent)
   :use-module ((vcomponent datetime)
@@ -9,7 +9,7 @@
                         event-length/clamped))
   :use-module ((vcomponent datetime output)
                :select (format-summary))
-  :use-module (calp util tree)
+  :use-module (hnh util tree)
   :use-module (datetime)
   :use-module (calp html config)
   :use-module ((calp html components)
diff --git a/module/calp/html/view/calendar/week.scm b/module/calp/html/view/calendar/week.scm
index 1714c6c4..5b12a351 100644
--- a/module/calp/html/view/calendar/week.scm
+++ b/module/calp/html/view/calendar/week.scm
@@ -1,5 +1,5 @@
 (define-module (calp html view calendar week)
-  :use-module (calp util)
+  :use-module (hnh util)
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-41)
   :use-module (rnrs records syntactic)
diff --git a/module/calp/html/view/search.scm b/module/calp/html/view/search.scm
index b939e7a2..b6f36612 100644
--- a/module/calp/html/view/search.scm
+++ b/module/calp/html/view/search.scm
@@ -1,5 +1,5 @@
 (define-module (calp html view search)
-  :use-module (calp util)
+  :use-module (hnh util)
   :use-module (vcomponent)
   :use-module (vcomponent util search)
   :use-module ((ice-9 pretty-print) :select (pretty-print))
diff --git a/module/calp/main.scm b/module/calp/main.scm
index 770be556..d1e33d55 100644
--- a/module/calp/main.scm
+++ b/module/calp/main.scm
@@ -1,16 +1,16 @@
 ;; -*- geiser-scheme-implementation: guile -*-
 (define-module (calp main)
-  :use-module (calp util)
+  :use-module (hnh util)
 
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-88)             ; keyword syntax
 
   :use-module ((calp util config) :select (set-config! get-config get-configuration-documentation))
-  :use-module (calp util options)
+  :use-module (hnh util options)
   :use-module ((calp util hooks) :select (shutdown-hook))
 
   :use-module ((text markup) :select (sxml->ansi-text))
-  :use-module ((calp util exceptions) :select (filter-stack))
+  :use-module ((hnh util exceptions) :select (filter-stack))
 
   :use-module (ice-9 getopt-long)
   :use-module (ice-9 regex)
@@ -215,7 +215,7 @@
       ;; (define path (read-line pipe))
       (define line ((@ (ice-9 rdelim) read-line) pipe))
       (define names (string-split line #\space))
-      ((@ (calp util io) with-atomic-output-to-file)
+      ((@ (hnh util io) with-atomic-output-to-file)
        (path-append (xdg-data-home) "/calp/zoneinfo.scm")
        (lambda ()
          (write `(set-config! 'tz-list ',names)) (newline)
diff --git a/module/calp/repl.scm b/module/calp/repl.scm
index 0765b65c..e25c2649 100644
--- a/module/calp/repl.scm
+++ b/module/calp/repl.scm
@@ -6,7 +6,7 @@
   :use-module (system repl server)
   :use-module (ice-9 regex)
   :use-module ((calp util hooks) :select (shutdown-hook))
-  :use-module ((calp util exceptions) :select (warning))
+  :use-module ((hnh util exceptions) :select (warning))
   )
 
 (define-public (repl-start address)
diff --git a/module/calp/server/routes.scm b/module/calp/server/routes.scm
index a435bbc0..b53e1cad 100644
--- a/module/calp/server/routes.scm
+++ b/module/calp/server/routes.scm
@@ -1,7 +1,7 @@
 (define-module (calp server routes)
-  :use-module (calp util)
-  :use-module (calp util options)
-  :use-module (calp util exceptions)
+  :use-module (hnh util)
+  :use-module (hnh util options)
+  :use-module (hnh util exceptions)
 
   :use-module (srfi srfi-1)
 
diff --git a/module/calp/server/server.scm b/module/calp/server/server.scm
index ae2117ab..fc185033 100644
--- a/module/calp/server/server.scm
+++ b/module/calp/server/server.scm
@@ -1,5 +1,5 @@
 (define-module (calp server server)
-  :use-module (calp util)
+  :use-module (hnh util)
   :use-module (web server)
   :use-module ((calp server routes) :select (make-make-routes))
   :use-module (ice-9 threads))
diff --git a/module/calp/terminal.scm b/module/calp/terminal.scm
index 1014b94c..cd1d0c9d 100644
--- a/module/calp/terminal.scm
+++ b/module/calp/terminal.scm
@@ -4,7 +4,7 @@
   #:use-module (srfi srfi-17)
   #:use-module (srfi srfi-26)
   #:use-module ((srfi srfi-41) :select (stream-car))
-  #:use-module (calp util)
+  #:use-module (hnh util)
   #:use-module (vulgar)
   #:use-module (vulgar info)
   #:use-module (vulgar color)
diff --git a/module/calp/util/config.scm b/module/calp/util/config.scm
index fbe35d59..2fe2b9b0 100644
--- a/module/calp/util/config.scm
+++ b/module/calp/util/config.scm
@@ -5,7 +5,7 @@
 ;;; Code:
 
 (define-module (calp util config)
-  :use-module (calp util)
+  :use-module (hnh util)
   :use-module (srfi srfi-1)
   :use-module (ice-9 format) ; for format-procedure
   :use-module (ice-9 curried-definitions) ; for ensure
diff --git a/module/datetime.scm b/module/datetime.scm
index e4a17779..0af8ca03 100644
--- a/module/datetime.scm
+++ b/module/datetime.scm
@@ -9,7 +9,7 @@
   :use-module (srfi srfi-9)
   :use-module (srfi srfi-9 gnu)
 
-  :use-module (calp util)
+  :use-module (hnh util)
 
   :use-module (srfi srfi-41)
   :use-module (srfi srfi-41 util)
@@ -694,12 +694,12 @@ Returns -1 on failure"
             [else dt]))
 
     (cond [(null? str)
-           ;; ((@ (calp util exceptions) warning)
+           ;; ((@ (hnh util exceptions) warning)
            ;;  "Premature end of string, still got fmt = ~s"
            ;;  fmt)
            (ampm dt)]
           [(null? fmt)
-           ;; ((@ (calp util exceptions) warning)
+           ;; ((@ (hnh util exceptions) warning)
            ;;  "Unsparsed characters at end of string")
            (ampm dt)]
           [(eq? #\~ (car fmt))
diff --git a/module/datetime/instance.scm b/module/datetime/instance.scm
index a03916d9..294aee27 100644
--- a/module/datetime/instance.scm
+++ b/module/datetime/instance.scm
@@ -1,7 +1,7 @@
 (define-module (datetime instance)
-  :use-module (calp util)
+  :use-module (hnh util)
   :use-module (calp util config)
-  :use-module (calp util exceptions)
+  :use-module (hnh util exceptions)
   :use-module (datetime zic)
   :use-module ((xdg basedir) :prefix xdg-)
   :export (zoneinfo))
diff --git a/module/datetime/timespec.scm b/module/datetime/timespec.scm
index dd75ff7c..9b236e2d 100644
--- a/module/datetime/timespec.scm
+++ b/module/datetime/timespec.scm
@@ -4,8 +4,8 @@
 ;;; Code:
 
 (define-module (datetime timespec)
-  :use-module (calp util)
-  :use-module (calp util exceptions)
+  :use-module (hnh util)
+  :use-module (hnh util exceptions)
   :use-module (datetime)
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-9 gnu)
diff --git a/module/datetime/zic.scm b/module/datetime/zic.scm
index 080a8ad0..6343dce3 100644
--- a/module/datetime/zic.scm
+++ b/module/datetime/zic.scm
@@ -11,8 +11,8 @@
 ;; See zic(8) for data format
 ;;; Code:
 (define-module (datetime zic)
-  :use-module (calp util)
-  :use-module (calp util exceptions)
+  :use-module (hnh util)
+  :use-module (hnh util exceptions)
   :use-module (datetime)
   :use-module (datetime timespec)
   :use-module (ice-9 rdelim)
diff --git a/module/calp/util.scm b/module/hnh/util.scm
index e1e2131a..0b22555b 100644
--- a/module/calp/util.scm
+++ b/module/hnh/util.scm
@@ -1,4 +1,4 @@
-(define-module (calp util)
+(define-module (hnh util)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-88)           ; postfix keywords
   #:use-module ((ice-9 optargs) #:select (define*-public))
diff --git a/module/calp/util/color.scm b/module/hnh/util/color.scm
index 161e6707..b626316d 100644
--- a/module/calp/util/color.scm
+++ b/module/hnh/util/color.scm
@@ -1,4 +1,4 @@
-(define-module (calp util color)
+(define-module (hnh util color)
   )
 
 ;; Returns a color with good contrast to the given background color.
diff --git a/module/calp/util/exceptions.scm b/module/hnh/util/exceptions.scm
index d9df30ed..fef0f1b5 100644
--- a/module/calp/util/exceptions.scm
+++ b/module/hnh/util/exceptions.scm
@@ -1,6 +1,6 @@
-(define-module (calp util exceptions)
+(define-module (hnh util exceptions)
   #:use-module (srfi srfi-1)
-  #:use-module (calp util)
+  #:use-module (hnh util)
   #:use-module (calp util config)
   #:use-module (ice-9 format)
 
diff --git a/module/calp/util/graph.scm b/module/hnh/util/graph.scm
index 6a01a9ee..912f9612 100644
--- a/module/calp/util/graph.scm
+++ b/module/hnh/util/graph.scm
@@ -4,8 +4,8 @@
 ;; order on symbols in scheme.
 ;;; Code:
 
-(define-module (calp util graph)
-  :use-module (calp util)
+(define-module (hnh util graph)
+  :use-module (hnh util)
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-9 gnu))
 
diff --git a/module/calp/util/io.scm b/module/hnh/util/io.scm
index 7db1eee2..04e54a9e 100644
--- a/module/calp/util/io.scm
+++ b/module/hnh/util/io.scm
@@ -1,4 +1,4 @@
-(define-module (calp util io)
+(define-module (hnh util io)
   :use-module ((ice-9 rdelim) :select (read-line)))
 
 (define-public (open-input-port str)
diff --git a/module/calp/util/options.scm b/module/hnh/util/options.scm
index 20263c45..57473816 100644
--- a/module/calp/util/options.scm
+++ b/module/hnh/util/options.scm
@@ -1,5 +1,5 @@
-(define-module (calp util options)
-  :use-module (calp util)
+(define-module (hnh util options)
+  :use-module (hnh util)
   :use-module (ice-9 match)
   :use-module (srfi srfi-1)
   :use-module (text markup)
diff --git a/module/calp/util/tree.scm b/module/hnh/util/tree.scm
index b7856aa9..6c4f765d 100644
--- a/module/calp/util/tree.scm
+++ b/module/hnh/util/tree.scm
@@ -1,6 +1,6 @@
-(define-module (calp util tree)
+(define-module (hnh util tree)
   #:use-module (srfi srfi-1)
-  #:use-module (calp util)
+  #:use-module (hnh util)
   #:export (make-tree left-subtree
                       right-subtree
                       length-of-longst-branch
diff --git a/module/srfi/srfi-41/util.scm b/module/srfi/srfi-41/util.scm
index aa28b852..7c062003 100644
--- a/module/srfi/srfi-41/util.scm
+++ b/module/srfi/srfi-41/util.scm
@@ -2,7 +2,7 @@
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-41)
   #:use-module ((ice-9 sandbox) :select (call-with-time-limit))
-  #:use-module (calp util) ; let*, find-min
+  #:use-module (hnh util) ; let*, find-min
   #:export (stream-car+cdr interleave-streams with-streams
                            stream-timeslice-limit))
 
diff --git a/module/sxml/namespace.scm b/module/sxml/namespace.scm
index 19211227..af770f7a 100644
--- a/module/sxml/namespace.scm
+++ b/module/sxml/namespace.scm
@@ -1,5 +1,5 @@
 (define-module (sxml namespace)
-  :use-module (calp util)
+  :use-module (hnh util)
   :use-module (sxml transform))
 
 (define* (symbol-split symbol key: (sep #\:))
diff --git a/module/sxml/transformations.scm b/module/sxml/transformations.scm
index 5d82ee9c..0978d71c 100644
--- a/module/sxml/transformations.scm
+++ b/module/sxml/transformations.scm
@@ -6,7 +6,7 @@
 ;;; Code:
 
 (define-module (sxml transformations)
-  :use-module (calp util)
+  :use-module (hnh util)
   :use-module ((srfi srfi-1) :select (concatenate))
   :use-module ((sxml transform) :select (pre-post-order))
   )
diff --git a/module/text/flow.scm b/module/text/flow.scm
index 528650a5..f7e08e1b 100644
--- a/module/text/flow.scm
+++ b/module/text/flow.scm
@@ -4,7 +4,7 @@
 ;;; Code:
 
 (define-module (text flow)
-  :use-module (calp util)
+  :use-module (hnh util)
   :use-module (text util)
   :use-module (srfi srfi-1)
   )
diff --git a/module/text/markup.scm b/module/text/markup.scm
index b74fd169..295ca198 100644
--- a/module/text/markup.scm
+++ b/module/text/markup.scm
@@ -1,5 +1,5 @@
 (define-module (text markup)
-  :use-module (calp util)
+  :use-module (hnh util)
   :use-module (srfi srfi-1)
   :use-module (ice-9 match)
   :use-module (ice-9 pretty-print)
diff --git a/module/text/numbers/sv.scm b/module/text/numbers/sv.scm
index ca59254b..2a032525 100644
--- a/module/text/numbers/sv.scm
+++ b/module/text/numbers/sv.scm
@@ -1,5 +1,5 @@
 (define-module (text numbers sv)
-  :use-module (calp util))
+  :use-module (hnh util))
 
 ;; only used in number->string-cardinal
 (define (large-prefix e)
diff --git a/module/text/util.scm b/module/text/util.scm
index ce39ad10..7144b032 100644
--- a/module/text/util.scm
+++ b/module/text/util.scm
@@ -3,7 +3,7 @@
 ;;; Code:
 
 (define-module (text util)
-  :use-module ((calp util) :select (define*-public intersperse) )
+  :use-module ((hnh util) :select (define*-public intersperse) )
   )
 
 (define-public (words str) (string-split str #\space))
diff --git a/module/vcomponent.scm b/module/vcomponent.scm
index c1983977..7618084c 100644
--- a/module/vcomponent.scm
+++ b/module/vcomponent.scm
@@ -1,5 +1,5 @@
 (define-module (vcomponent)
-  :use-module (calp util)
+  :use-module (hnh util)
   :use-module (calp util config)
   :use-module (vcomponent base)
   ;; :use-module ((vcomponent util instance methods)
diff --git a/module/vcomponent/base.scm b/module/vcomponent/base.scm
index 66e6534f..579382ae 100644
--- a/module/vcomponent/base.scm
+++ b/module/vcomponent/base.scm
@@ -1,5 +1,5 @@
 (define-module (vcomponent base)
-  :use-module (calp util)
+  :use-module (hnh util)
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-9)
   :use-module (srfi srfi-9 gnu)
diff --git a/module/vcomponent/control.scm b/module/vcomponent/control.scm
index 4cb6c708..586dd4a3 100644
--- a/module/vcomponent/control.scm
+++ b/module/vcomponent/control.scm
@@ -1,5 +1,5 @@
 (define-module (vcomponent util control)
-  #:use-module (calp util)
+  #:use-module (hnh util)
   #:use-module (vcomponent)
   #:export (with-replaced-properties))
 
diff --git a/module/vcomponent/datetime.scm b/module/vcomponent/datetime.scm
index ca4f90e9..bb4fe50e 100644
--- a/module/vcomponent/datetime.scm
+++ b/module/vcomponent/datetime.scm
@@ -4,7 +4,7 @@
   #:use-module (datetime)
   #:use-module (datetime timespec)
   #:use-module (datetime zic)
-  #:use-module (calp util)
+  #:use-module (hnh util)
 
   :use-module (ice-9 curried-definitions)
 
diff --git a/module/vcomponent/datetime/output.scm b/module/vcomponent/datetime/output.scm
index 1b377a7c..fa662286 100644
--- a/module/vcomponent/datetime/output.scm
+++ b/module/vcomponent/datetime/output.scm
@@ -1,7 +1,7 @@
 (define-module (vcomponent datetime output)
-  :use-module (calp util)
+  :use-module (hnh util)
   :use-module (calp util config)
-  :use-module (calp util exceptions)
+  :use-module (hnh util exceptions)
   :use-module (datetime)
   :use-module (vcomponent base)
   :use-module (text util)
diff --git a/module/vcomponent/duration.scm b/module/vcomponent/duration.scm
index 7591a880..786675b8 100644
--- a/module/vcomponent/duration.scm
+++ b/module/vcomponent/duration.scm
@@ -1,6 +1,6 @@
 (define-module (vcomponent duration)
-  :use-module (calp util)
-  :use-module (calp util exceptions)
+  :use-module (hnh util)
+  :use-module (hnh util exceptions)
   :use-module (datetime)
   :use-module (ice-9 peg)
   :use-module (ice-9 match)
diff --git a/module/vcomponent/formats/common/types.scm b/module/vcomponent/formats/common/types.scm
index 87425c01..efe17f36 100644
--- a/module/vcomponent/formats/common/types.scm
+++ b/module/vcomponent/formats/common/types.scm
@@ -1,6 +1,6 @@
 (define-module (vcomponent formats common types)
-  :use-module (calp util)
-  :use-module (calp util exceptions)
+  :use-module (hnh util)
+  :use-module (hnh util exceptions)
   :use-module (base64)
   :use-module (datetime)
   :use-module (srfi srfi-9 gnu)
diff --git a/module/vcomponent/formats/ical/output.scm b/module/vcomponent/formats/ical/output.scm
index 9efac3c4..fba8bffc 100644
--- a/module/vcomponent/formats/ical/output.scm
+++ b/module/vcomponent/formats/ical/output.scm
@@ -1,6 +1,6 @@
 (define-module (vcomponent formats ical output)
-  :use-module (calp util exceptions)
-  :use-module (calp util)
+  :use-module (hnh util exceptions)
+  :use-module (hnh util)
   :use-module (datetime)
   :use-module (datetime zic)
   :use-module ((datetime instance) :select (zoneinfo))
diff --git a/module/vcomponent/formats/ical/parse.scm b/module/vcomponent/formats/ical/parse.scm
index d76044a3..34812a2c 100644
--- a/module/vcomponent/formats/ical/parse.scm
+++ b/module/vcomponent/formats/ical/parse.scm
@@ -1,7 +1,7 @@
 (define-module (vcomponent formats ical parse)
   :use-module ((ice-9 rdelim) :select (read-line))
-  :use-module (calp util exceptions)
-  :use-module (calp util)
+  :use-module (hnh util exceptions)
+  :use-module (hnh util)
   :use-module (datetime)
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-26)
diff --git a/module/vcomponent/formats/ical/types.scm b/module/vcomponent/formats/ical/types.scm
index d063ca8f..39b3b1e3 100644
--- a/module/vcomponent/formats/ical/types.scm
+++ b/module/vcomponent/formats/ical/types.scm
@@ -1,7 +1,7 @@
 ;; see (vcomponent parse types)
 (define-module (vcomponent formats ical types)
-  :use-module (calp util)
-  :use-module (calp util exceptions)
+  :use-module (hnh util)
+  :use-module (hnh util exceptions)
   :use-module (base64)
   :use-module (datetime)
   :use-module (datetime timespec))
diff --git a/module/vcomponent/formats/vdir/parse.scm b/module/vcomponent/formats/vdir/parse.scm
index f3810887..20b89026 100644
--- a/module/vcomponent/formats/vdir/parse.scm
+++ b/module/vcomponent/formats/vdir/parse.scm
@@ -11,8 +11,8 @@
   :use-module ((ice-9 rdelim) :select (read-line))
   :use-module ((ice-9 ftw) :select (scandir ftw))
 
-  :use-module (calp util)
-  :use-module (calp util exceptions)
+  :use-module (hnh util)
+  :use-module (hnh util exceptions)
   :use-module (vcomponent base)
 
   :use-module (vcomponent formats ical parse)
diff --git a/module/vcomponent/formats/vdir/save-delete.scm b/module/vcomponent/formats/vdir/save-delete.scm
index 1c70dabf..73725b2c 100644
--- a/module/vcomponent/formats/vdir/save-delete.scm
+++ b/module/vcomponent/formats/vdir/save-delete.scm
@@ -10,11 +10,11 @@
 ;;; Code:
 
 (define-module (vcomponent formats vdir save-delete)
-  :use-module (calp util)
-  :use-module ((calp util exceptions) :select (assert))
+  :use-module (hnh util)
+  :use-module ((hnh util exceptions) :select (assert))
   :use-module (vcomponent formats ical output)
   :use-module (vcomponent)
-  :use-module ((calp util io) :select (with-atomic-output-to-file))
+  :use-module ((hnh util io) :select (with-atomic-output-to-file))
   )
 
 
diff --git a/module/vcomponent/formats/xcal/output.scm b/module/vcomponent/formats/xcal/output.scm
index e2cada83..81fab41c 100644
--- a/module/vcomponent/formats/xcal/output.scm
+++ b/module/vcomponent/formats/xcal/output.scm
@@ -1,6 +1,6 @@
 (define-module (vcomponent formats xcal output)
-  :use-module (calp util)
-  :use-module (calp util exceptions)
+  :use-module (hnh util)
+  :use-module (hnh util exceptions)
   :use-module (vcomponent)
   :use-module (vcomponent geo)
   :use-module (vcomponent formats xcal types)
diff --git a/module/vcomponent/formats/xcal/parse.scm b/module/vcomponent/formats/xcal/parse.scm
index e84f380e..7dee8d67 100644
--- a/module/vcomponent/formats/xcal/parse.scm
+++ b/module/vcomponent/formats/xcal/parse.scm
@@ -1,6 +1,6 @@
 (define-module (vcomponent formats xcal parse)
-  :use-module (calp util)
-  :use-module (calp util exceptions)
+  :use-module (hnh util)
+  :use-module (hnh util exceptions)
   :use-module (base64)
   :use-module (ice-9 match)
   :use-module (sxml match)
diff --git a/module/vcomponent/formats/xcal/types.scm b/module/vcomponent/formats/xcal/types.scm
index 34c7c40d..05fbc8c6 100644
--- a/module/vcomponent/formats/xcal/types.scm
+++ b/module/vcomponent/formats/xcal/types.scm
@@ -1,5 +1,5 @@
 (define-module (vcomponent formats xcal types)
-  :use-module (calp util)
+  :use-module (hnh util)
   :use-module (vcomponent formats ical types)
   :use-module (datetime)
   )
diff --git a/module/vcomponent/geo.scm b/module/vcomponent/geo.scm
index ac370a6c..27b2cbae 100644
--- a/module/vcomponent/geo.scm
+++ b/module/vcomponent/geo.scm
@@ -1,5 +1,5 @@
 (define-module (vcomponent geo)
-  :use-module (calp util)
+  :use-module (hnh util)
   :use-module (srfi srfi-9 gnu))
 
 (define-immutable-record-type <geographical-position>
diff --git a/module/vcomponent/recurrence/display.scm b/module/vcomponent/recurrence/display.scm
index b13e955e..f5ce1c57 100644
--- a/module/vcomponent/recurrence/display.scm
+++ b/module/vcomponent/recurrence/display.scm
@@ -6,7 +6,7 @@
 ;;; Code:
 
 (define-module (vcomponent recurrence display)
-  :use-module (calp util)
+  :use-module (hnh util)
   :use-module (vcomponent recurrence internal)
   :use-module (text util)
   :use-module (text numbers sv)
diff --git a/module/vcomponent/recurrence/generate.scm b/module/vcomponent/recurrence/generate.scm
index 1d262202..b498e033 100644
--- a/module/vcomponent/recurrence/generate.scm
+++ b/module/vcomponent/recurrence/generate.scm
@@ -1,6 +1,6 @@
 (define-module (vcomponent recurrence generate)
-  :use-module (calp util)
-  :use-module (calp util exceptions)
+  :use-module (hnh util)
+  :use-module (hnh util exceptions)
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-26)
   :use-module (srfi srfi-41)
diff --git a/module/vcomponent/recurrence/internal.scm b/module/vcomponent/recurrence/internal.scm
index a57dfd65..b4f09d92 100644
--- a/module/vcomponent/recurrence/internal.scm
+++ b/module/vcomponent/recurrence/internal.scm
@@ -5,7 +5,7 @@
   #:use-module ((vcomponent base) :select (prop))
   #:use-module (srfi srfi-9)
   #:use-module (srfi srfi-9 gnu)
-  #:use-module (calp util)
+  #:use-module (hnh util)
   )
 
 ;; EXDATE is also a property linked to recurense rules
diff --git a/module/vcomponent/recurrence/parse.scm b/module/vcomponent/recurrence/parse.scm
index a1bf3eaa..3477f6d4 100644
--- a/module/vcomponent/recurrence/parse.scm
+++ b/module/vcomponent/recurrence/parse.scm
@@ -7,8 +7,8 @@
   #:use-module (datetime)
   #:use-module (srfi srfi-26)
   #:use-module (vcomponent recurrence internal)
-  #:use-module (calp util)
-  #:use-module (calp util exceptions)
+  #:use-module (hnh util)
+  #:use-module (hnh util exceptions)
   #:use-module (ice-9 match))
 
 
diff --git a/module/vcomponent/util/control.scm b/module/vcomponent/util/control.scm
index 4cb6c708..586dd4a3 100644
--- a/module/vcomponent/util/control.scm
+++ b/module/vcomponent/util/control.scm
@@ -1,5 +1,5 @@
 (define-module (vcomponent util control)
-  #:use-module (calp util)
+  #:use-module (hnh util)
   #:use-module (vcomponent)
   #:export (with-replaced-properties))
 
diff --git a/module/vcomponent/util/describe.scm b/module/vcomponent/util/describe.scm
index 5c3afd30..0c3ab27c 100644
--- a/module/vcomponent/util/describe.scm
+++ b/module/vcomponent/util/describe.scm
@@ -1,5 +1,5 @@
 (define-module (vcomponent util describe)
-  :use-module (calp util)
+  :use-module (hnh util)
   :use-module (vcomponent base)
   :use-module (text util))
 
diff --git a/module/vcomponent/util/instance.scm b/module/vcomponent/util/instance.scm
index 15c020b1..6e1e765f 100644
--- a/module/vcomponent/util/instance.scm
+++ b/module/vcomponent/util/instance.scm
@@ -1,5 +1,5 @@
 (define-module (vcomponent util instance)
-  :use-module (calp util)
+  :use-module (hnh util)
   :use-module ((calp util config) :select (get-config))
   :use-module ((oop goops) :select (make))
   :export (global-event-object)
diff --git a/module/vcomponent/util/instance/methods.scm b/module/vcomponent/util/instance/methods.scm
index 37aef3bc..120ab2fe 100644
--- a/module/vcomponent/util/instance/methods.scm
+++ b/module/vcomponent/util/instance/methods.scm
@@ -1,5 +1,5 @@
 (define-module (vcomponent util instance methods)
-  :use-module (calp util)
+  :use-module (hnh util)
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-41)
   :use-module (srfi srfi-41 util)
diff --git a/module/vcomponent/util/parse-cal-path.scm b/module/vcomponent/util/parse-cal-path.scm
index 94c0c6ed..11a32064 100644
--- a/module/vcomponent/util/parse-cal-path.scm
+++ b/module/vcomponent/util/parse-cal-path.scm
@@ -1,5 +1,5 @@
 (define-module (vcomponent util parse-cal-path)
-  :use-module (calp util)
+  :use-module (hnh util)
   :use-module ((calp util time) :select (report-time!))
   :use-module (vcomponent base)
   :use-module ((vcomponent formats ical parse)
diff --git a/module/vcomponent/util/search.scm b/module/vcomponent/util/search.scm
index fb395022..61e81eb5 100644
--- a/module/vcomponent/util/search.scm
+++ b/module/vcomponent/util/search.scm
@@ -25,7 +25,7 @@
 ;;; Code:
 
 (define-module (vcomponent util search)
-  :use-module (calp util)
+  :use-module (hnh util)
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-9)
   :use-module (srfi srfi-41)
diff --git a/module/vulgar.scm b/module/vulgar.scm
index eabd11f8..5ddea738 100644
--- a/module/vulgar.scm
+++ b/module/vulgar.scm
@@ -7,7 +7,7 @@
 (define-module (vulgar)
   #:use-module (srfi srfi-60)
   #:use-module (vulgar termios)
-  #:use-module (calp util)
+  #:use-module (hnh util)
   #:export (with-vulgar))
 
 (define-public (cls)
diff --git a/module/vulgar/components.scm b/module/vulgar/components.scm
index 2b018e4e..882da849 100644
--- a/module/vulgar/components.scm
+++ b/module/vulgar/components.scm
@@ -1,6 +1,6 @@
 (define-module (vulgar components)
   #:use-module (datetime)
-  #:use-module (calp util)
+  #:use-module (hnh util)
   #:export ())
 
 (define-public (display-calendar-header! date)
diff --git a/module/vulgar/info.scm b/module/vulgar/info.scm
index 66901ff8..79e555da 100644
--- a/module/vulgar/info.scm
+++ b/module/vulgar/info.scm
@@ -1,5 +1,5 @@
 (define-module (vulgar info)
-  :use-module (calp util))
+  :use-module (hnh util))
 
 (define-public (get-terminal-size)
  (let* (((rpipe . wpipe) (pipe)))
diff --git a/module/vulgar/termios.scm b/module/vulgar/termios.scm
index f88882c9..532fc07e 100644
--- a/module/vulgar/termios.scm
+++ b/module/vulgar/termios.scm
@@ -7,7 +7,7 @@
   :use-module (ice-9 rdelim)
   :use-module (srfi srfi-9)             ; records
   :use-module (c cpp)
-  :use-module (calp util)
+  :use-module (hnh util)
   :export (make-termios
            copy-termios
            tcsetattr! tcgetattr! cfmakeraw!))
diff --git a/module/web/http/make-routes.scm b/module/web/http/make-routes.scm
index 4fb5397a..7254fcb5 100644
--- a/module/web/http/make-routes.scm
+++ b/module/web/http/make-routes.scm
@@ -1,6 +1,6 @@
 (define-module (web http make-routes)
   :export (make-routes)
-  :use-module (calp util)
+  :use-module (hnh util)
   :use-module (ice-9 regex)
   :use-module (srfi srfi-1)
   :use-module (web response)
diff --git a/module/web/query.scm b/module/web/query.scm
index 55b3f564..e5057a24 100644
--- a/module/web/query.scm
+++ b/module/web/query.scm
@@ -1,5 +1,5 @@
 (define-module (web query)
-  :use-module (calp util)
+  :use-module (hnh util)
   :use-module (srfi srfi-1)
   :use-module (web uri))
 
diff --git a/module/web/uri-query.scm b/module/web/uri-query.scm
index 9eff203f..40d89b11 100644
--- a/module/web/uri-query.scm
+++ b/module/web/uri-query.scm
@@ -1,5 +1,5 @@
 (define-module (web uri-query)
-  :use-module ((calp util) :select (->quoted-string))
+  :use-module ((hnh util) :select (->quoted-string))
   :use-module ((web uri) :select (uri-encode))
   )
 
diff --git a/scripts/all-symbols.scm b/scripts/all-symbols.scm
index a200fb6c..5ac1f215 100755
--- a/scripts/all-symbols.scm
+++ b/scripts/all-symbols.scm
@@ -13,7 +13,7 @@
 
 (add-to-load-path (string-append (dirname (dirname (current-filename))) "/module"))
 
-(use-modules (calp util)
+(use-modules (hnh util)
              (srfi srfi-1))
 
 
diff --git a/scripts/benchmark.scm b/scripts/benchmark.scm
index 362ccccd..462d578c 100644
--- a/scripts/benchmark.scm
+++ b/scripts/benchmark.scm
@@ -1,5 +1,5 @@
 (add-to-load-path "module")
-(use-modules (calp util)
+(use-modules (hnh util)
              (calp util app)
              (calp util config)
              (vcomponent)
diff --git a/scripts/get-config.scm b/scripts/get-config.scm
index 4ab2c2c9..0351b768 100755
--- a/scripts/get-config.scm
+++ b/scripts/get-config.scm
@@ -11,7 +11,7 @@
 (add-to-load-path "module")
 
 (use-modules 
-  (calp util) 
+  (hnh util) 
   (ice-9 ftw) 
   (ice-9 match)
   (srfi srfi-1)
diff --git a/scripts/use2dot/gen-use.scm b/scripts/use2dot/gen-use.scm
index 8475d71e..02785088 100755
--- a/scripts/use2dot/gen-use.scm
+++ b/scripts/use2dot/gen-use.scm
@@ -154,7 +154,7 @@
 
                           (datetime)
                           (vcomponent)
-                          (calp util)
+                          (hnh util)
                           )
                         ((scan files) 'edges)))
 
diff --git a/tests/annoying-events.scm b/tests/annoying-events.scm
index ba93b9c9..90e6a184 100644
--- a/tests/annoying-events.scm
+++ b/tests/annoying-events.scm
@@ -3,7 +3,7 @@
  ((vcomponent base) extract prop make-vcomponent)
  ((vcomponent datetime) event-overlaps?)
  ((datetime) date date+ date<)
- ((calp util) set!))
+ ((hnh util) set!))
 
 (define* (event key: summary dtstart dtend)
   (define ev (make-vcomponent 'VEVENT))
diff --git a/tests/datetime.scm b/tests/datetime.scm
index f9cf94e1..d1ebd238 100644
--- a/tests/datetime.scm
+++ b/tests/datetime.scm
@@ -16,7 +16,7 @@
   string->date string->time string->datetime
   )
  ((ice-9 format) format)
- ((calp util) let*)
+ ((hnh util) let*)
  ((ice-9 i18n) make-locale)
  ((guile) LC_TIME)
  )
diff --git a/tests/let-env.scm b/tests/let-env.scm
index 0fe77539..17cfb817 100644
--- a/tests/let-env.scm
+++ b/tests/let-env.scm
@@ -1,5 +1,5 @@
 (((guile) setenv getenv)
- ((calp util) let-env))
+ ((hnh util) let-env))
 
 (setenv "CALP_TEST_ENV" "1")
 (test-equal "Ensure we have set value beforehand"
diff --git a/tests/let.scm b/tests/let.scm
index 81a34131..3f1b52a7 100644
--- a/tests/let.scm
+++ b/tests/let.scm
@@ -2,7 +2,7 @@
 ;; Tests my custom let*.
 ;;; Code:
 
-(((calp util) let*)
+(((hnh util) let*)
  ((guile) set!))
 
 (test-assert (let* ((a #t)) a))
diff --git a/tests/param.scm b/tests/param.scm
index c5a23cbe..cf8c9458 100644
--- a/tests/param.scm
+++ b/tests/param.scm
@@ -6,7 +6,7 @@
 (((vcomponent base) param prop* parameters prop)
  ((vcomponent formats ical parse) parse-calendar)
  ((vcomponent) make-vcomponent)
- ((calp util) sort* set!))
+ ((hnh util) sort* set!))
 
 (define v (call-with-input-string
               "BEGIN:DUMMY
diff --git a/tests/recurrence-advanced.scm b/tests/recurrence-advanced.scm
index c2242c19..4f26f2c7 100644
--- a/tests/recurrence-advanced.scm
+++ b/tests/recurrence-advanced.scm
@@ -23,7 +23,7 @@
  ((vcomponent base) make-vcomponent prop prop* extract)
  ((datetime) parse-ics-datetime datetime time date
   datetime->string)
- ((calp util) -> set!)
+ ((hnh util) -> set!)
  ((srfi srfi-41) stream->list)
  ((srfi srfi-88) keyword->string))
 
diff --git a/tests/recurrence-simple.scm b/tests/recurrence-simple.scm
index cd170976..d5a35802 100644
--- a/tests/recurrence-simple.scm
+++ b/tests/recurrence-simple.scm
@@ -8,7 +8,7 @@
  ((datetime) day-stream mon)
  ((vcomponent base) extract prop)
 
- ((calp util exceptions) warnings-are-errors warning-handler)
+ ((hnh util exceptions) warnings-are-errors warning-handler)
  ((guile) format @@)
 
  ((vcomponent formats ical parse) parse-calendar)
diff --git a/tests/run-tests.scm b/tests/run-tests.scm
index 6ec8dea7..9271fc55 100755
--- a/tests/run-tests.scm
+++ b/tests/run-tests.scm
@@ -47,7 +47,7 @@
              (srfi srfi-64)             ; test suite
              (srfi srfi-88)             ; suffix keywords
              (system vm coverage)
-             ((calp util) :select (for awhen))
+             ((hnh util) :select (for awhen))
              ;; datetime introduces the reader extensions for datetimes,
              ;; which leaks into the sandboxes below.
              (datetime))
@@ -92,7 +92,7 @@
 (test-begin "tests")
 
 ;; Forces all warnings to be explicitly handled by tests
-((@ (calp util exceptions) warnings-are-errors) #t)
+((@ (hnh util exceptions) warnings-are-errors) #t)
 
 (define (run-with-coverage)
   (with-code-coverage
diff --git a/tests/server.scm b/tests/server.scm
index d21c11da..a2b3ea9d 100644
--- a/tests/server.scm
+++ b/tests/server.scm
@@ -3,7 +3,7 @@
 ;;; Code:
 
 (((web http make-routes) parse-endpoint-string)
- ((calp util) let*))
+ ((hnh util) let*))
 
 (test-assert "Check that parsing doesn't crash"
   (parse-endpoint-string "/static/:dir/:file"))
diff --git a/tests/termios.scm b/tests/termios.scm
index c0cb4323..e54ddc9c 100644
--- a/tests/termios.scm
+++ b/tests/termios.scm
@@ -5,7 +5,7 @@
 ;; It might also leave the terminal in a broken state if exited prematurely.
 ;;; Code:
 
-(((calp util) set!)
+(((hnh util) set!)
  ((vulgar termios)
   make-termios copy-termios
   lflag
diff --git a/tests/tz.scm b/tests/tz.scm
index 147f0807..1cbb1842 100644
--- a/tests/tz.scm
+++ b/tests/tz.scm
@@ -12,7 +12,7 @@
   datetime->unix-time
   unix-time->datetime
   get-datetime)
- ((calp util) let-env))
+ ((hnh util) let-env))
 
 ;; London alternates between +0000 and +0100
 (let-env ((TZ "Europe/London"))
diff --git a/tests/util.scm b/tests/util.scm
index aa47a44f..45e69dd6 100644
--- a/tests/util.scm
+++ b/tests/util.scm
@@ -1,8 +1,8 @@
 ;;; Commentary:
-;; Checks some prodecuders from (calp util)
+;; Checks some prodecuders from (hnh util)
 ;;; Code:
 
-(((calp util) filter-sorted set/r!
+(((hnh util) filter-sorted set/r!
   find-min find-max span-upto
   iterate ->string ->quoted-string path-append
   begin1)
diff --git a/tests/web-server.scm b/tests/web-server.scm
index bce05d0e..73d34317 100644
--- a/tests/web-server.scm
+++ b/tests/web-server.scm
@@ -7,7 +7,7 @@
  ((web server) run-server)
  ((ice-9 threads) call-with-new-thread cancel-thread)
  ((web client) http-get)
- ((calp util) let*)
+ ((hnh util) let*)
  ((web response) response-code response-location)
  ((web uri) build-uri uri-path)
  ((guile) AF_INET))
diff --git a/tests/xcal.scm b/tests/xcal.scm
index df8a5135..6e80405b 100644
--- a/tests/xcal.scm
+++ b/tests/xcal.scm
@@ -6,7 +6,7 @@
 (((vcomponent formats xcal parse) sxcal->vcomponent)
  ((vcomponent formats xcal output) vcomponent->sxcal)
  ((vcomponent formats ical parse) parse-calendar)
- ((calp util) ->)
+ ((hnh util) ->)
  ((vcomponent base)
   parameters prop* children)
  )