diff --git a/Makefile b/Makefile
index 695ab4b..d1d3089 100644
--- a/Makefile
+++ b/Makefile
@@ -43,25 +43,25 @@ BBSTOOL-DEPS=bbstool.scm testing.import.scm listing.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 member-print.import.scm		\
+	member-parser.import.scm members-print.import.scm		\
 	member-fees.import.scm members-dir.import.scm
 
 BBSTOOL-SOURCES=bbstool.scm testing.scm listing.scm dictionary.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		\
-	member-print.scm member-parser.scm member-fees.scm		\
+	members-print.scm member-parser.scm member-fees.scm		\
 	members-dir.scm
 
 BBSTOOL-OBJS=testing.o listing.o month.o period.o ansi.o dictionary.o	\
 	 command-line.o members-base.o utils.o primes.o			\
 	 member-record.o configuration.o progress.o table.o cards.o	\
-	 member-print.o member-fees.o members-dir.o
+	 members-print.o member-fees.o members-dir.o
 
 BBSTOOL-SHARED=testing.so listing.so month.so period.so ansi.so		\
 	 dictionary.so command-line.so members-base.so utils.so		\
 	 primes.so member-record.so configuration.so progress.so	\
-	 table.so cards.so member-print.so member-fees.so		\
+	 table.so cards.so members-print.so member-fees.so		\
 	 members-dir.so
 
 .PHONY: imports
@@ -200,14 +200,14 @@ member-parser.so: member-parser.o
 member-parser.o: member-parser.import.scm
 member-parser.import.scm: $(MEMBER-PARSER-SOURCES)
 
-MEMBER-PRINT-SOURCES=member-print.scm dictionary.import.scm		\
+MEMBERS-PRINT-SOURCES=members-print.scm dictionary.import.scm		\
 	member-record.import.scm month.import.scm utils.import.scm	\
 	table.import.scm listing.import.scm ansi.import.scm		\
 	period.import.scm primes.import.scm
 
-member-print.so: member-print.o
-member-print.o: member-print.import.scm
-member-print.import.scm: $(MEMBER-PRINT-SOURCES)
+members-print.so: members-print.o
+members-print.o: members-print.import.scm
+members-print.import.scm: $(MEMBERS-PRINT-SOURCES)
 
 MEMBER-FEES-SOURCES=member-fees.scm configuration.import.scm		\
 	member-record.import.scm month.import.scm table.import.scm	\
diff --git a/bbstool.scm b/bbstool.scm
index 8b4f681..5555119 100644
--- a/bbstool.scm
+++ b/bbstool.scm
@@ -39,7 +39,7 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 	configuration
 	table
 	cards
-	member-print
+	members-print
 	member-parser
 	member-fees
 	members-dir)
diff --git a/member-print.scm b/members-print.scm
similarity index 98%
rename from member-print.scm
rename to members-print.scm
index 2fc403c..03f6b51 100644
--- a/member-print.scm
+++ b/members-print.scm
@@ -1,5 +1,5 @@
 ;;
-;; member-print.scm
+;; members-print.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-print))
+(declare (unit members-print))
 
 (module
- member-print
+ members-print
  (
   print-member-info
   print-member-table