diff --git a/src/brmember-format.scm b/src/brmember-format.scm
index 8eafeca..614622a 100644
--- a/src/brmember-format.scm
+++ b/src/brmember-format.scm
@@ -36,7 +36,7 @@
 	 (chicken string)
 	 (chicken format)
 	 util-dict-list
-	 member-record)
+	 brmember)
 
  ;; Member formatting function for general use.
  (define (brmember-format fmt mr)
diff --git a/src/brmember.scm b/src/brmember.scm
index 9bcdc8b..df73cc1 100644
--- a/src/brmember.scm
+++ b/src/brmember.scm
@@ -1,5 +1,5 @@
 ;;
-;; member-record.scm
+;; brmember.scm
 ;;
 ;; Procedures working with complete member record (as loaded by the
 ;; members-base).
@@ -24,10 +24,10 @@
 ;; CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ;;
 
-(declare (unit member-record))
+(declare (unit brmember))
 
 (module
- member-record
+ brmember
  (
   make-member-record
 
diff --git a/src/cards.scm b/src/cards.scm
index b48f88a..9e99d28 100644
--- a/src/cards.scm
+++ b/src/cards.scm
@@ -38,7 +38,7 @@
 	 (chicken irregex)
 	 util-dict-list
 	 members-base
-	 member-record)
+	 brmember)
 
  ;; Prints single card type records.
  (define (cards-print/type mb type)
diff --git a/src/hackerbase.scm b/src/hackerbase.scm
index 5efbb95..688ff6f 100644
--- a/src/hackerbase.scm
+++ b/src/hackerbase.scm
@@ -27,7 +27,7 @@
 	month
 	command-line
 	members-base
-	member-record
+	brmember
 	configuration
 	cards
 	members-print
diff --git a/src/member-fees.scm b/src/member-fees.scm
index 7024752..9ee07c8 100644
--- a/src/member-fees.scm
+++ b/src/member-fees.scm
@@ -45,7 +45,7 @@
 	 (chicken format)
 	 (chicken sort)
 	 configuration
-	 member-record
+	 brmember
 	 month
 	 ansi
 	 table
diff --git a/src/member-parser.scm b/src/member-parser.scm
index 978b09c..8762a86 100644
--- a/src/member-parser.scm
+++ b/src/member-parser.scm
@@ -35,7 +35,7 @@
 	 (chicken base)
 	 (chicken io)
 	 (chicken irregex)
-	 member-record
+	 brmember
 	 testing
 	 util-dict-list
 	 month
diff --git a/src/members-base.scm b/src/members-base.scm
index 8ae7e9f..c70c07f 100644
--- a/src/members-base.scm
+++ b/src/members-base.scm
@@ -56,7 +56,7 @@
 	 util-list
 	 util-dict-list
 	 primes
-	 member-record
+	 brmember
 	 ansi
 	 period
 	 month
diff --git a/src/members-dir.scm b/src/members-dir.scm
index 8221aa7..a0c6a42 100644
--- a/src/members-dir.scm
+++ b/src/members-dir.scm
@@ -43,7 +43,7 @@
 	 testing
 	 util-dict-list
 	 util-list
-	 member-record
+	 brmember
 	 member-parser)
 
  ;; Gets all files and symbolic links from given directory. The
diff --git a/src/members-payments.scm b/src/members-payments.scm
index f6a8c70..53aaba9 100644
--- a/src/members-payments.scm
+++ b/src/members-payments.scm
@@ -45,7 +45,7 @@
 	 (chicken pathname)
 	 (chicken condition)
 	 bank-account
-	 member-record
+	 brmember
 	 members-base
 	 bank-fio
 	 util-dict-list
diff --git a/src/members-print.scm b/src/members-print.scm
index 7a24d7d..62879e4 100644
--- a/src/members-print.scm
+++ b/src/members-print.scm
@@ -47,7 +47,7 @@
 	 (chicken sort)
 	 (chicken format)
 	 util-dict-list
-	 member-record
+	 brmember
 	 month
 	 util-list
 	 table
diff --git a/src/reminders.scm b/src/reminders.scm
index c28ca27..7d707f6 100644
--- a/src/reminders.scm
+++ b/src/reminders.scm
@@ -35,7 +35,7 @@
  (import scheme
 	 (chicken base)
 	 (chicken format)
-	 member-record
+	 brmember
 	 util-mail
 	 util-dict-list
 	 members-payments
diff --git a/src/tests.scm b/src/tests.scm
index 87593c5..6072f6f 100644
--- a/src/tests.scm
+++ b/src/tests.scm
@@ -41,7 +41,7 @@
 	 command-line
 	 members-dir
 	 primes
-	 member-record
+	 brmember
 	 table
 	 util-csv
 	 util-set-list
diff --git a/src/web-static.scm b/src/web-static.scm
index d180b81..358aa4a 100644
--- a/src/web-static.scm
+++ b/src/web-static.scm
@@ -40,7 +40,7 @@
 	 (chicken pathname)
 	 (chicken file)
 	 (chicken file posix)
-	 member-record
+	 brmember
 	 util-list
 	 configuration
 	 members-payments