diff --git a/src/Makefile b/src/Makefile
index 828b700..375a8a7 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -39,7 +39,7 @@ BBSTOOL-DEPS=bbstool.scm testing.import.scm listing.import.scm		\
 	progress.import.scm table.import.scm cards.import.scm		\
 	member-parser.import.scm members-print.import.scm		\
 	member-fees.import.scm members-dir.import.scm			\
-	csv-simple.import.scm bank-account.import.scm			\
+	util-csv.import.scm bank-account.import.scm			\
 	bank-fio.import.scm members-payments.import.scm			\
 	web-static.import.scm environment.import.scm			\
 	mailman.import.scm util-set-list.import.scm			\
@@ -48,7 +48,7 @@ BBSTOOL-DEPS=bbstool.scm testing.import.scm listing.import.scm		\
 BBSTOOL-OBJS=bbstool.o 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	\
-	 members-print.o member-fees.o members-dir.o csv-simple.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 util-set-list.o		\
 	 util-time.o util-tag.o util-io.o
@@ -198,11 +198,11 @@ MEMBERS-DIR-SOURCES=members-dir.scm testing.import.scm		\
 members-dir.o: members-dir.import.scm
 members-dir.import.scm: $(MEMBERS-DIR-SOURCES)
 
-CSV-SIMPLE-SOURCES=csv-simple.scm testing.import.scm	\
+UTIL-CSV-SOURCES=util-csv.scm testing.import.scm	\
 	progress.import.scm util-io.import.scm
 
-csv-simple.o: csv-simple.import.scm
-csv-simple.import.scm: $(CSV-SIMPLE-SOURCES)
+util-csv.o: util-csv.import.scm
+util-csv.import.scm: $(UTIL-CSV-SOURCES)
 
 BANK-ACCOUNT-SOURCES=bank-account.scm
 
@@ -210,7 +210,7 @@ bank-account.o: bank-account.import.scm
 bank-account.import.scm: $(BANK-ACCOUNT-SOURCES)
 
 BANK-FIO-SOURCES=bank-fio.scm bank-account.import.scm	\
-	csv-simple.import.scm progress.import.scm
+	util-csv.import.scm progress.import.scm
 
 bank-fio.o: bank-fio.import.scm
 bank-fio.import.scm: $(BANK-FIO-SOURCES)
diff --git a/src/csv-simple.scm b/src/util-csv.scm
similarity index 98%
rename from src/csv-simple.scm
rename to src/util-csv.scm
index 7a20b4b..211b102 100644
--- a/src/csv-simple.scm
+++ b/src/util-csv.scm
@@ -1,5 +1,5 @@
 ;;
-;; csv-simple.scm
+;; util-csv.scm
 ;;
 ;; Simple, incomplete and incorrect but fast CSV loader.
 ;;
@@ -23,7 +23,7 @@
 ;; CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ;;
 
-(declare (unit csv-simple))
+(declare (unit util-csv))
 
 (module
  csv-simple