diff --git a/src/mailman.scm b/src/mailman.scm
index 9c5c5cb..342f70f 100644
--- a/src/mailman.scm
+++ b/src/mailman.scm
@@ -27,7 +27,9 @@
 
 (module
  mailman
- ()
+ (
+  find-mailman-list
+  )
 
  (import scheme
 	 (chicken base)
@@ -54,5 +56,11 @@
 
  (define-mailman-proc list-mailman-lists list-mailman2-lists)
  (define-mailman-proc list-mailman-list-members list-mailman2-list-members)
+ (define-mailman-proc load-mailman-list load-mailman2-list)
+ (define-mailman-proc load-mailman-lists load-mailman2-lists)
+
+ ;; List of lists, returns the whole list record (including name)
+ (define (find-mailman-list lsts name)
+   (assoc name lsts))
 
  )
diff --git a/src/mailman2.scm b/src/mailman2.scm
index a184111..c0955df 100644
--- a/src/mailman2.scm
+++ b/src/mailman2.scm
@@ -32,10 +32,8 @@
 
   list-mailman2-lists
   list-mailman2-list-members
-  load-mailman-list
-  load-mailman-lists
-  
-  find-mailman-list
+  load-mailman2-list
+  load-mailman2-lists
   
   mailman-list-name
   mailman-list-members
@@ -108,12 +106,12 @@
  ;; Loads a single mailman list as mailman structure, if
  ;; unsuccessfull, returns only a list with ML name and no member
  ;; emails.
- (define (load-mailman-list name)
+ (define (load-mailman2-list name)
    (make-mailman-list name
 		      (list-mailman2-list-members name)))
 
  ;; Loads all lists and members
- (define (load-mailman-lists)
+ (define (load-mailman2-lists)
    (with-progress%
     #t "Mailman"
     (progress%-advance 0)
@@ -131,13 +129,9 @@
 	    (let ((mln (car lsts)))
 	      (progress%-advance (/ idx total))
 	      (loop (cdr lsts)
-		    (cons (load-mailman-list mln) res)
+		    (cons (load-mailman2-list mln) res)
 		    (add1 idx))))))))
 
- ;; List of lists, returns the whole list record (including name)
- (define (find-mailman-list lsts name)
-   (assoc name lsts))
-
  ;; Returns #t if the email is in given ml
  (define (email-in-mailman-list? ml email)
    (if (lset-member? (list->lset (mailman-list-members ml) string-ci=?)