10 files changed, 15 insertions, 15 deletions
diff --git a/module/calp/html/caltable.scm b/module/calp/html/caltable.scm
index 65a70252..2f5a6d31 100644
--- a/module/calp/html/caltable.scm
+++ b/module/calp/html/caltable.scm
@@ -1,5 +1,5 @@
 (define-module (calp html caltable)
-  :use-module (util)
+  :use-module (calp 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 49f00e52..ebc359b8 100644
--- a/module/calp/html/components.scm
+++ b/module/calp/html/components.scm
@@ -1,6 +1,6 @@
 (define-module (calp html components)
-  :use-module (util)
-  :use-module (util exceptions)
+  :use-module (calp util)
+  :use-module (calp util exceptions)
   :export (xhtml-doc)
   )
 
diff --git a/module/calp/html/config.scm b/module/calp/html/config.scm
index 6f156c98..081777ac 100644
--- a/module/calp/html/config.scm
+++ b/module/calp/html/config.scm
@@ -1,6 +1,6 @@
 (define-module (calp html config)
-  :use-module (util)
-  :use-module (util config)
+  :use-module (calp util)
+  :use-module (calp util config)
   )
 
 (define-public debug (make-parameter #f))
diff --git a/module/calp/html/util.scm b/module/calp/html/util.scm
index 8410472c..cd5aaeab 100644
--- a/module/calp/html/util.scm
+++ b/module/calp/html/util.scm
@@ -1,6 +1,6 @@
 (define-module (calp html util)
   :use-module ((base64) :select (base64encode base64decode))
-  :use-module (util))
+  :use-module (calp util))
 
 ;;; @var{html-attr} & @var{html-unattr} used to just strip any
 ;;; attributes not valid in css. That allowed a human reader to
diff --git a/module/calp/html/vcomponent.scm b/module/calp/html/vcomponent.scm
index be6b6166..3a2bd3cc 100644
--- a/module/calp/html/vcomponent.scm
+++ b/module/calp/html/vcomponent.scm
@@ -1,5 +1,5 @@
 (define-module (calp html vcomponent)
-  :use-module (util)
+  :use-module (calp util)
   :use-module (vcomponent)
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-41)
@@ -7,7 +7,7 @@
   :use-module (calp html util)
   :use-module ((calp html config) :select (edit-mode))
   :use-module ((calp html components) :select (btn tabset))
-  :use-module ((util color) :select (calculate-fg-color))
+  :use-module ((calp util color) :select (calculate-fg-color))
   :use-module ((vcomponent datetime output)
                :select (fmt-time-span
                         format-description
diff --git a/module/calp/html/view/calendar.scm b/module/calp/html/view/calendar.scm
index 67a1a7b5..27edfcb4 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 (util)
+  :use-module (calp util)
   :use-module (vcomponent)
   :use-module ((vcomponent datetime)
                :select (events-between))
@@ -18,7 +18,7 @@
   :use-module (calp html util)
   :use-module ((calp html caltable) :select (cal-table))
 
-  :use-module (util config)
+  :use-module (calp util config)
 
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-26)
diff --git a/module/calp/html/view/calendar/month.scm b/module/calp/html/view/calendar/month.scm
index ce8957da..0ac69292 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 (util)
+  :use-module (calp 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 73698060..fb5eace5 100644
--- a/module/calp/html/view/calendar/shared.scm
+++ b/module/calp/html/view/calendar/shared.scm
@@ -1,5 +1,5 @@
 (define-module (calp html view calendar shared)
-  :use-module (util)
+  :use-module (calp util)
   :use-module (srfi srfi-1)
   :use-module (vcomponent)
   :use-module ((vcomponent datetime)
@@ -8,7 +8,7 @@
                         event-length/clamped))
   :use-module ((vcomponent datetime output)
                :select (format-summary))
-  :use-module (util tree)
+  :use-module (calp 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 ca6aa9f8..111c8f21 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 (util)
+  :use-module (calp util)
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-41)
   :use-module (datetime)
diff --git a/module/calp/html/view/search.scm b/module/calp/html/view/search.scm
index faefe6dc..3141fa11 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 (util)
+  :use-module (calp util)
   :use-module (vcomponent)
   :use-module (vcomponent search)
   :use-module ((ice-9 pretty-print) :select (pretty-print))