5 files changed, 9 insertions, 9 deletions
diff --git a/data/either.scm b/monad/either.scm
index c597a60..c597a60 100644
--- a/data/either.scm
+++ b/monad/either.scm
diff --git a/data/monoid.scm b/monad/monoid.scm
index d33557e..4b10a72 100644
--- a/data/monoid.scm
+++ b/monad/monoid.scm
@@ -1,5 +1,5 @@
 ;;; ???
-(define-module (data monoid)
+(define-module (monad monoid)
   #:use-module (oop goops)
   #:use-module (srfi srfi-1)
   #:export (null mappend <>))
diff --git a/data/optional.scm b/monad/optional.scm
index 61543d2..1aa1e92 100644
--- a/data/optional.scm
+++ b/monad/optional.scm
@@ -1,7 +1,7 @@
-(define-module (data optional)
+(define-module (monad optional)
   #:use-module (oop goops)
   #:use-module (ice-9 match)
-  #:use-module (control monad)
+  #:use-module (monad)
   #:use-module (ice-9 curried-definitions)
   #:export (from-just wrap-maybe
                       nothing just
diff --git a/data/stack.scm b/monad/stack.scm
index d470394..8d25303 100644
--- a/data/stack.scm
+++ b/monad/stack.scm
@@ -1,7 +1,7 @@
-(define-module (data stack)
+(define-module (monad stack)
   #:export (pop peek push)
-  #:use-module (control monad)
-  #:use-module (control monad state))
+  #:use-module (monad)
+  #:use-module (monad state))
 
 ;;; Simple stateful stack module for showing the state monad
 ;;; in action. These functions assume that they are in a
diff --git a/data/writer.scm b/monad/writer.scm
index bf391c2..8be72c2 100644
--- a/data/writer.scm
+++ b/monad/writer.scm
@@ -1,8 +1,8 @@
-(define-module (data writer)
+(define-module (monad writer)
   #:use-module (oop goops)
   #:use-module (ice-9 match)
-  #:use-module (data monoid)
-  #:use-module (control monad)
+  #:use-module (monad monoid) ; ?
+  #:use-module (monad)
   #:export (writer return-writer))
 
 (read-enable 'curly-infix)