diff --git a/src/mbase-dir.scm b/src/mbase-dir.scm
index aca6f87..0bdb460 100644
--- a/src/mbase-dir.scm
+++ b/src/mbase-dir.scm
@@ -28,9 +28,9 @@
 (module
  mbase-dir
  (
-  load-members-dir
-  members-dir-load-member
-  members-dir-tests!
+  load-mbase-dir
+  mbase-dir-load-member
+  mbase-dir-tests!
   )
 
  (import scheme
@@ -139,7 +139,7 @@
 
  ;; Loads the members directory as dictionary of files to symlinks
  ;; mapping.
- (define (load-members-dir dn)
+ (define (load-mbase-dir dn)
    (files-dictionary-filter-4digit-symbols
     (files+symlinks->files-dictionary
      (get-files+symlinks dn))))
@@ -148,14 +148,14 @@
  ;; keys. The info key contains whatever load-member-file from the
  ;; member-file module returns. The id key contains whatever is the
  ;; first 4-digit symbol in (cons fname aliases) list.
- (define (members-dir-load-member mdir fname symlinks)
+ (define (mbase-dir-load-member mdir fname symlinks)
    (let* ((mr0 (make-brmember fname
 			      (make-pathname mdir (symbol->string fname))
 			      symlinks)))
      (load-brmember-file mr0)))
 
  ;; Performs self-tests of this module.
- (define (members-dir-tests!)
+ (define (mbase-dir-tests!)
    (run-tests
     members-base
     (test-equal? files+symlinks->files-dictionary
diff --git a/src/mbase.scm b/src/mbase.scm
index 625631c..0fda26b 100644
--- a/src/mbase.scm
+++ b/src/mbase.scm
@@ -95,14 +95,14 @@
 	 .
 	 ,(with-progress%
 	   progress? "members"
-	   (let* ((fss (load-members-dir dn))
+	   (let* ((fss (load-mbase-dir dn))
 		  (tot (sub1 (length (ldict-keys fss))))
 		  (mb0 (ldict-map
 			(lambda (symfn symlinks prg)
 			  (progress%-advance (/ prg tot))
-			  (members-dir-load-member dn
-						   symfn
-						   symlinks))
+			  (mbase-dir-load-member dn
+						 symfn
+						 symlinks))
 			fss))
 		  (mb1 (ldict-reduce (make-ldict)
 				     (lambda (acc symfn mr)
diff --git a/src/tests.scm b/src/tests.scm
index ce631fe..508ac49 100644
--- a/src/tests.scm
+++ b/src/tests.scm
@@ -56,7 +56,7 @@
    (util-list-tests!)
    (ansi-tests!)
    (command-line-tests!)
-   (members-dir-tests!)
+   (mbase-dir-tests!)
    (primes-tests!)
    (brmember-tests!)
    (table-tests!)