7 files changed, 18 insertions, 18 deletions
diff --git a/module/calp/entry-points/benchmark.scm b/module/calp/entry-points/benchmark.scm
index 7706f6f0..851edc59 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 (util)
+  :use-module (calp util)
 
   :use-module (ice-9 getopt-long)
-  :use-module (util options)
+  :use-module (calp util options)
   :use-module ((srfi srfi-41) :select (stream->list))
 
   :use-module ((vcomponent instance methods) :select (get-event-set))
diff --git a/module/calp/entry-points/html.scm b/module/calp/entry-points/html.scm
index 8c400e1d..39f00979 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 (util)
-  :use-module (util time)
-  :use-module (util options)
+  :use-module (calp util)
+  :use-module (calp util time)
+  :use-module (calp util options)
   :use-module (datetime)
   :use-module (ice-9 getopt-long)
   :use-module ((ice-9 regex) :select (string-match regexp-substitute))
@@ -91,7 +91,7 @@
   (define calendars (get-calendars global-event-object))
   (define events (get-event-set global-event-object))
 
-  ((@ (util time) report-time!) "html start")
+  ((@ (calp util time) report-time!) "html start")
 
   (create-files target-directory)
 
@@ -168,5 +168,5 @@
     [else
      (error "Unknown html style: ~a" style)])
 
-  ((@ (util time) report-time!) "all done")
+  ((@ (calp util time) report-time!) "all done")
   )
diff --git a/module/calp/entry-points/ical.scm b/module/calp/entry-points/ical.scm
index 0b6a0535..15e677b5 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 (util)
-  :use-module (util options)
+  :use-module (calp util)
+  :use-module (calp util options)
   :use-module (vcomponent 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 e8c46ea8..f25e642f 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 (util)
-  :use-module (util options)
+  :use-module (calp util)
+  :use-module (calp 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 87eaba1e..55f84c1a 100644
--- a/module/calp/entry-points/server.scm
+++ b/module/calp/entry-points/server.scm
@@ -1,8 +1,8 @@
 (define-module (calp entry-points server)
-  :use-module (util)
-  :use-module (util options)
-  :use-module (util exceptions)
-  :use-module (util config)
+  :use-module (calp util)
+  :use-module (calp util options)
+  :use-module (calp util exceptions)
+  :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 fa035e7a..5aaa1f2d 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 (util options)
+  :use-module (calp util options)
   )
 
 (define options
diff --git a/module/calp/entry-points/text.scm b/module/calp/entry-points/text.scm
index 04f57a31..6da524ae 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 (util io)
-  :use-module (util options)
+  :use-module (calp util io)
+  :use-module (calp util options)
   )