diff --git a/src/Makefile b/src/Makefile
index 5321b44..ec3d837 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -45,7 +45,7 @@ HACKERBASE-OBJS=hackerbase.o testing.o listing.o month.o period.o	\
 	 primes.o brmember.o configuration.o progress.o table.o	\
 	 cards.o members-print.o member-fees.o members-dir.o		\
 	 util-csv.o bank-account.o bank-fio.o members-payments.o	\
-	 member-parser.o web-static.o environment.o mailman.o		\
+	 brmember-parser.o web-static.o environment.o mailman.o		\
 	 util-set-list.o util-time.o util-tag.o util-io.o		\
 	 util-string.o util-io.o util-list.o util-parser.o texts.o	\
 	 tests.o util-proc.o util-mail.o reminders.o util-format.o	\
@@ -174,14 +174,14 @@ CARDS-SOURCES=cards.scm util-dict-list.import.scm members-base.import.scm	\
 cards.o: cards.import.scm
 cards.import.scm: $(CARDS-SOURCES)
 
-MEMBER-PARSER-SOURCES=member-parser.scm brmember.import.scm	\
+BRMEMBER-PARSER-SOURCES=brmember-parser.scm brmember.import.scm	\
 	testing.import.scm util-dict-list.import.scm month.import.scm	\
 	period.import.scm configuration.import.scm			\
 	util-string.import.scm util-list.import.scm			\
 	util-parser.import.scm
 
-member-parser.o: member-parser.import.scm
-member-parser.import.scm: $(MEMBER-PARSER-SOURCES)
+brmember-parser.o: brmember-parser.import.scm
+brmember-parser.import.scm: $(BRMEMBER-PARSER-SOURCES)
 
 MEMBERS-PRINT-SOURCES=members-print.scm util-dict-list.import.scm		\
 	brmember.import.scm month.import.scm table.import.scm	\
@@ -203,7 +203,7 @@ member-fees.import.scm: $(MEMBER-FEES-SOURCES)
 
 MEMBERS-DIR-SOURCES=members-dir.scm testing.import.scm	\
 	util-dict-list.import.scm brmember.import.scm	\
-	member-parser.import.scm util-list.import.scm
+	brmember-parser.import.scm util-list.import.scm
 
 members-dir.o: members-dir.import.scm
 members-dir.import.scm: $(MEMBERS-DIR-SOURCES)
diff --git a/src/member-parser.scm b/src/brmember-parser.scm
similarity index 98%
rename from src/member-parser.scm
rename to src/brmember-parser.scm
index 1cf301d..54da4bf 100644
--- a/src/member-parser.scm
+++ b/src/brmember-parser.scm
@@ -1,5 +1,5 @@
 ;;
-;; member-parser.scm
+;; brmember-parser.scm
 ;;
 ;; Member file parsing.
 ;;
@@ -23,12 +23,12 @@
 ;; CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ;;
 
-(declare (unit member-parser))
+(declare (unit brmember-parser))
 
 (module
- member-parser
+ brmember-parser
  (
-  load-member-file
+  load-brmember-file
   )
 
  (import scheme
@@ -221,7 +221,7 @@
 		   (interpreter-pass mr pass-name (ldict-ref mr prev-name) pass-proc)))))))
 
  ;; Loads member file source. Performs passes 0, 1 and 2.
- (define (load-member-file mr)
+ (define (load-brmember-file mr)
    (let* ((mrif (brmember-input-file mr))
 	  (source (read-lines mrif))
 	  (mrp (parse-member-lines mr source)))
diff --git a/src/members-dir.scm b/src/members-dir.scm
index bdaf4ca..9cca1d6 100644
--- a/src/members-dir.scm
+++ b/src/members-dir.scm
@@ -152,7 +152,7 @@
    (let* ((mr0 (make-brmember fname
 			      (make-pathname mdir (symbol->string fname))
 			      symlinks)))
-     (load-member-file mr0)))
+     (load-brmember-file mr0)))
 
  ;; Performs self-tests of this module.
  (define (members-dir-tests!)