diff --git a/Makefile b/Makefile
index 7f72712..e738078 100644
--- a/Makefile
+++ b/Makefile
@@ -39,18 +39,16 @@ CSC=csc
 
 BBSTOOL-DEPS=bbstool.scm testing.import.scm listing.import.scm		\
 	dictionary.import.scm month.import.scm period.import.scm	\
-	ansi.import.scm member-file.import.scm				\
-	command-line.import.scm members-base.import.scm			\
-	utils.import.scm primes.import.scm member-record.import.scm	\
-	configuration.import.scm progress.import.scm table.import.scm	\
-	cards.import.scm member2-record.import.scm			\
+	ansi.import.scm command-line.import.scm				\
+	members-base.import.scm utils.import.scm primes.import.scm	\
+	member-record.import.scm configuration.import.scm		\
+	progress.import.scm table.import.scm cards.import.scm		\
 	member-parser.import.scm
 
 BBSTOOL-SOURCES=bbstool.scm testing.scm listing.scm dictionary.scm	\
-	month.scm period.scm ansi.scm member-file.scm			\
-	command-line.scm members-base.scm utils.scm primes.scm		\
-	member-record.scm configuration.scm progress.scm table.scm	\
-	cards.scm
+	month.scm period.scm ansi.scm command-line.scm			\
+	members-base.scm utils.scm primes.scm member-record.scm		\
+	configuration.scm progress.scm table.scm cards.scm
 
 BBSTOOL-OBJS=testing.o listing.o month.o period.o ansi.o	\
 		member-file.o dictionary.o command-line.o	\
@@ -164,10 +162,9 @@ primes.so: primes.o
 primes.o: primes.import.scm
 primes.import.scm: $(PRIMES-SOURCES)
 
-MEMBER-RECORD-SOURCES=member-record.scm dictionary.import.scm		\
-	period.import.scm testing.import.scm month.import.scm		\
-	member-file.import.scm listing.import.scm ansi.import.scm	\
-	configuration.import.scm table.import.scm utils.import.scm
+MEMBER-RECORD-SOURCES=member-record.scm dictionary.import.scm	\
+	period.import.scm testing.import.scm month.import.scm	\
+	configuration.import.scm
 
 member-record.so: member-record.o
 member-record.o: member-record.import.scm
@@ -199,14 +196,9 @@ cards.so: cards.o
 cards.o: cards.import.scm
 cards.import.scm: $(CARDS-SOURCES)
 
-MEMBER2-RECORD-SOURCES=member2-record.scm dictionary.import.scm	\
-	testing.import.scm
-
-member2-record.so: member2-record.o
-member2-record.o: member2-record.import.scm
-member2-record.import.scm: $(MEMBER2-RECORD-SOURCES)
-
-MEMBER-PARSER-SOURCES=member-parser.scm member2-record.import.scm
+MEMBER-PARSER-SOURCES=member-parser.scm member-record.import.scm	\
+	testing.import.scm dictionary.import.scm month.import.scm	\
+	period.import.scm
 
 member-parser.so: member-parser.o
 member-parser.o: member-parser.import.scm
diff --git a/member-file.scm b/member-file-old.scm
similarity index 100%
rename from member-file.scm
rename to member-file-old.scm
diff --git a/member-record.scm b/member-record.scm
index a4d08d1..b7d9503 100644
--- a/member-record.scm
+++ b/member-record.scm
@@ -1,5 +1,5 @@
 ;;
-;; member2-record.scm
+;; member-record.scm
 ;;
 ;; Procedures working with complete member record (as loaded by the
 ;; members-base).
@@ -27,7 +27,7 @@
 (declare (unit member2-record))
 
 (module
- member2-record
+ member-record
  (
   make-member-record
 
@@ -293,7 +293,3 @@
     ))
 
  )
-
-(import member2-record)
-
-(member-record-tests!)