diff --git a/src/Makefile b/src/Makefile
index b06d23b..54390e0 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -42,7 +42,7 @@ HACKERBASE-DEPS=hackerbase.scm cal-month.import.scm			\
 	dokuwiki.import.scm
 
 HACKERBASE-OBJS=hackerbase.o testing.o listing.o cal-month.o		\
-	 cal-period.o ansi.o util-dict-list.o command-line.o mbase.o	\
+	 cal-period.o ansi.o util-bst-ldict.o command-line.o mbase.o	\
 	 primes.o brmember.o configuration.o progress.o			\
 	 export-cards.o members-print.o members-fees.o mbase-dir.o	\
 	 util-csv.o bank-account.o bank-fio.o members-payments.o	\
@@ -70,7 +70,7 @@ GENDOC-SOURCES=gendoc.scm duck-extract.import.scm			\
 GENDOC-OBJS=gendoc.o duck-extract.o util-time.o util-csv.o util-io.o	\
 	progress.o testing.o util-proc.o util-git.o util-io.o		\
 	util-stdout.o util-parser.o util-list.o util-proc.o		\
-	util-format.o racket-kwargs.o util-dict-list.o util-tag.o	\
+	util-format.o racket-kwargs.o util-bst-ldict.o util-tag.o	\
 	util-set-list.o duck.o util-string.o util-bst.o			\
 	util-bst-bdict.o util-bst-ldict.o
 
@@ -136,13 +136,6 @@ LISTING-SOURCES=listing.scm testing.import.scm ansi.import.scm	\
 listing.o: listing.import.scm
 listing.import.scm: $(LISTING-SOURCES)
 
-UTIL-DICT-LIST-SOURCES=util-dict-list.scm testing.import.scm	\
-	util-tag.import.scm util-proc.import.scm		\
-	util-set-list.import.scm duck.import.scm
-
-util-dict-list.o: util-dict-list.import.scm
-util-dict-list.import.scm: $(UTIL-DICT-LIST-SOURCES)
-
 ANSI-SOURCES=ansi.scm testing.import.scm util-list.import.scm
 
 ansi.o: ansi.import.scm
@@ -154,7 +147,7 @@ COMMAND-LINE-SOURCES=command-line.scm testing.import.scm	\
 command-line.o: command-line.import.scm
 command-line.import.scm: $(COMMAND-LINE-SOURCES)
 
-MBASE-SOURCES=mbase.scm testing.import.scm util-dict-list.import.scm	\
+MBASE-SOURCES=mbase.scm testing.import.scm util-bst-ldict.import.scm	\
 	 primes.import.scm brmember.import.scm ansi.import.scm		\
 	 cal-period.import.scm cal-month.import.scm			\
 	 configuration.import.scm progress.import.scm			\
@@ -170,7 +163,7 @@ PRIMES-SOURCES=primes.scm testing.import.scm util-list.import.scm
 primes.o: primes.import.scm
 primes.import.scm: $(PRIMES-SOURCES)
 
-BRMEMBER-SOURCES=brmember.scm util-dict-list.import.scm			\
+BRMEMBER-SOURCES=brmember.scm util-bst-ldict.import.scm			\
 	cal-period.import.scm testing.import.scm cal-month.import.scm	\
 	configuration.import.scm primes.import.scm			\
 	bank-account.import.scm util-tag.import.scm			\
@@ -189,14 +182,14 @@ PROGRESS-SOURCES=progress.scm util-time.import.scm
 progress.o: progress.import.scm
 progress.import.scm: $(PROGRESS-SOURCES)
 
-EXPORT-CARDS-SOURCES=export-cards.scm util-dict-list.import.scm	\
+EXPORT-CARDS-SOURCES=export-cards.scm util-bst-ldict.import.scm	\
 	mbase.import.scm brmember.import.scm
 
 export-cards.o: export-cards.import.scm
 export-cards.import.scm: $(EXPORT-CARDS-SOURCES)
 
 BRMEMBER-PARSER-SOURCES=brmember-parser.scm brmember.import.scm	\
-	testing.import.scm util-dict-list.import.scm		\
+	testing.import.scm util-bst-ldict.import.scm		\
 	cal-month.import.scm cal-period.import.scm		\
 	configuration.import.scm util-string.import.scm		\
 	util-parser.import.scm cal-day.import.scm		\
@@ -205,7 +198,7 @@ BRMEMBER-PARSER-SOURCES=brmember-parser.scm brmember.import.scm	\
 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	\
+MEMBERS-PRINT-SOURCES=members-print.scm util-bst-ldict.import.scm	\
 	brmember.import.scm cal-month.import.scm table.import.scm	\
 	listing.import.scm ansi.import.scm cal-period.import.scm	\
 	primes.import.scm mbase.import.scm configuration.import.scm	\
@@ -227,7 +220,7 @@ members-fees.o: members-fees.import.scm
 members-fees.import.scm: $(MEMBERS-FEES-SOURCES)
 
 MBASE-DIR-SOURCES=mbase-dir.scm testing.import.scm	\
-	util-dict-list.import.scm brmember.import.scm	\
+	util-bst-ldict.import.scm brmember.import.scm	\
 	brmember-parser.import.scm util-list.import.scm
 
 mbase-dir.o: mbase-dir.import.scm
@@ -251,7 +244,7 @@ bank-fio.o: bank-fio.import.scm
 bank-fio.import.scm: $(BANK-FIO-SOURCES)
 
 MEMBERS-PAYMENTS-SOURCES=members-payments.scm bank-account.import.scm	\
-	util-dict-list.import.scm members-fees.import.scm		\
+	util-bst-ldict.import.scm members-fees.import.scm		\
 	cal-period.import.scm configuration.import.scm			\
 	progress.import.scm bank-fio.import.scm				\
 	specification.import.scm util-list.import.scm
@@ -314,7 +307,7 @@ TEXTS-SOURCES=texts.scm
 texts.o: texts.import.scm
 texts.import.scm: $(TEXTS-SOURCES)
 
-TESTS-SOURCES=tests.scm listing.import.scm util-dict-list.import.scm	\
+TESTS-SOURCES=tests.scm listing.import.scm util-bst-ldict.import.scm	\
 	cal-month.import.scm cal-period.import.scm ansi.import.scm	\
 	command-line.import.scm mbase-dir.import.scm			\
 	primes.import.scm brmember.import.scm util-csv.import.scm	\
@@ -341,7 +334,7 @@ util-mail.o: util-mail.import.scm
 util-mail.import.scm: $(UTIL-MAIL-SOURCES)
 
 NOTIFICATIONS-SOURCES=notifications.scm brmember.import.scm		\
-	util-mail.import.scm util-dict-list.import.scm			\
+	util-mail.import.scm util-bst-ldict.import.scm			\
 	members-payments.import.scm util-format.import.scm		\
 	brmember-format.import.scm configuration.import.scm		\
 	util-time.import.scm members-fees.import.scm mbase.import.scm	\
@@ -356,7 +349,7 @@ UTIL-FORMAT-SOURCES=util-format.scm duck.import.scm
 util-format.o: util-format.import.scm
 util-format.import.scm: $(UTIL-FORMAT-SOURCES)
 
-BRMEMBER-FORMAT-SOURCES=brmember-format.scm util-dict-list.import.scm	\
+BRMEMBER-FORMAT-SOURCES=brmember-format.scm util-bst-ldict.import.scm	\
 	brmember.import.scm bank-account.import.scm			\
 	members-fees.import.scm members-payments.import.scm
 
@@ -374,7 +367,7 @@ specification.o: specification.import.scm
 specification.import.scm: $(SPECIFICATION-SOURCES)
 
 UTIL-GIT-SOURCES=util-git.scm util-io.import.scm			\
-	util-dict-list.import.scm util-parser.import.scm		\
+	util-bst-ldict.import.scm util-parser.import.scm		\
 	util-time.import.scm duck.import.scm racket-kwargs.import.scm
 
 util-git.o: util-git.import.scm
diff --git a/src/brmember-format.scm b/src/brmember-format.scm
index f0ce763..c8895af 100644
--- a/src/brmember-format.scm
+++ b/src/brmember-format.scm
@@ -35,7 +35,7 @@
  (import scheme
 	 (chicken string)
 	 (chicken format)
-	 util-dict-list
+	 util-bst-ldict
 	 brmember
 	 bank-account
 	 members-fees
diff --git a/src/brmember-parser.scm b/src/brmember-parser.scm
index ba35553..bcfb988 100644
--- a/src/brmember-parser.scm
+++ b/src/brmember-parser.scm
@@ -39,7 +39,7 @@
 	 util-list
 	 brmember
 	 testing
-	 util-dict-list
+	 util-bst-ldict
 	 cal-month
 	 cal-period
 	 configuration
diff --git a/src/brmember.scm b/src/brmember.scm
index 095cbe3..97651cd 100644
--- a/src/brmember.scm
+++ b/src/brmember.scm
@@ -95,7 +95,7 @@
 	 (chicken string)
 	 (chicken format)
 	 util-list
-	 util-dict-list
+	 util-bst-ldict
 	 testing
 	 cal-month
 	 cal-period
diff --git a/src/export-cards.scm b/src/export-cards.scm
index cab6166..41d7721 100644
--- a/src/export-cards.scm
+++ b/src/export-cards.scm
@@ -36,7 +36,7 @@
 	 (chicken sort)
 	 (chicken format)
 	 (chicken irregex)
-	 util-dict-list
+	 util-bst-ldict
 	 mbase
 	 brmember)
 
diff --git a/src/hackerbase.scm b/src/hackerbase.scm
index 32fc972..4ce6e34 100644
--- a/src/hackerbase.scm
+++ b/src/hackerbase.scm
@@ -43,7 +43,7 @@
 	cal-month
 	cal-day
 	util-git
-	util-dict-list
+	util-bst-ldict
 	util-stdout
 	table
 	export-web-static
diff --git a/src/listing.scm b/src/listing.scm
index 6e8a9df..e796669 100644
--- a/src/listing.scm
+++ b/src/listing.scm
@@ -40,7 +40,7 @@
 	 testing
 	 ansi
 	 racket-kwargs
-	 util-dict-list
+	 util-bst-ldict
 	 table)
 
  ;; Returns the number of digits required to represent a given number
diff --git a/src/mbase-dir.scm b/src/mbase-dir.scm
index 07ab84f..78643ea 100644
--- a/src/mbase-dir.scm
+++ b/src/mbase-dir.scm
@@ -42,7 +42,7 @@
 	 (chicken irregex)
 	 util-list
 	 testing
-	 util-dict-list
+	 util-bst-ldict
 	 brmember
 	 brmember-parser)
 
diff --git a/src/mbase.scm b/src/mbase.scm
index b34751c..112dcb0 100644
--- a/src/mbase.scm
+++ b/src/mbase.scm
@@ -71,7 +71,7 @@
 	 (chicken sort)
 	 util-list
 	 testing
-	 util-dict-list
+	 util-bst-ldict
 	 primes
 	 brmember
 	 ansi
diff --git a/src/members-payments.scm b/src/members-payments.scm
index 96729f8..a87d770 100644
--- a/src/members-payments.scm
+++ b/src/members-payments.scm
@@ -53,7 +53,7 @@
 	 brmember
 	 mbase
 	 bank-fio
-	 util-dict-list
+	 util-bst-ldict
 	 members-fees
 	 cal-period
 	 configuration
diff --git a/src/members-print.scm b/src/members-print.scm
index 4111bf6..4dc2690 100644
--- a/src/members-print.scm
+++ b/src/members-print.scm
@@ -49,7 +49,7 @@
 	 (chicken sort)
 	 (chicken format)
 	 util-list
-	 util-dict-list
+	 util-bst-ldict
 	 brmember
 	 cal-month
 	 table
diff --git a/src/notifications.scm b/src/notifications.scm
index f2ca996..1105869 100644
--- a/src/notifications.scm
+++ b/src/notifications.scm
@@ -42,7 +42,7 @@
 	 (chicken sort)
 	 brmember
 	 util-mail
-	 util-dict-list
+	 util-bst-ldict
 	 members-payments
 	 util-format
 	 brmember-format
diff --git a/src/tests.scm b/src/tests.scm
index 18970dd..f60f0d8 100644
--- a/src/tests.scm
+++ b/src/tests.scm
@@ -33,7 +33,6 @@
 
  (import scheme
 	 listing
-	 util-dict-list
 	 cal-month
 	 cal-period
 	 cal-day
@@ -58,7 +57,6 @@
  (define (run-all-tests!)
    (listing-tests!)
    (lset-tests!)
-   (ldict-tests!)
    (util-bst-tests!)
    (cal-month-tests!)
    (cal-period-tests!)
diff --git a/src/util-git.scm b/src/util-git.scm
index 2c885a3..b8fbea1 100644
--- a/src/util-git.scm
+++ b/src/util-git.scm
@@ -40,7 +40,7 @@
 	 (chicken base)
 	 (chicken string)
 	 util-io
-	 util-dict-list
+	 util-bst-ldict
 	 util-parser
 	 util-time
 	 racket-kwargs)