diff --git a/src/Makefile b/src/Makefile
index 9bfe11d..8039fa3 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -307,10 +307,10 @@ texts.o: texts.import.scm
 texts.import.scm: $(TEXTS-SOURCES)
 
 TESTS-SOURCES=tests.scm listing.import.scm util-dict-list.import.scm	\
-	month.import.scm period.import.scm util-list.import.scm		\
-	ansi.import.scm command-line.import.scm mbase-dir.import.scm	\
-	primes.import.scm brmember.import.scm table.import.scm		\
-	util-csv.import.scm util-set-list.import.scm			\
+	cal-month.import.scm cal-period.import.scm			\
+	util-list.import.scm ansi.import.scm command-line.import.scm	\
+	mbase-dir.import.scm primes.import.scm brmember.import.scm	\
+	table.import.scm util-csv.import.scm util-set-list.import.scm	\
 	util-parser.import.scm util-string.import.scm
 
 tests.o: tests.import.scm
diff --git a/src/tests.scm b/src/tests.scm
index 508ac49..778c04d 100644
--- a/src/tests.scm
+++ b/src/tests.scm
@@ -34,8 +34,8 @@
  (import scheme
 	 listing
 	 util-dict-list
-	 month
-	 period
+	 cal-month
+	 cal-period
 	 util-list
 	 ansi
 	 command-line
@@ -51,8 +51,8 @@
  (define (run-all-tests!)
    (listing-tests!)
    (ldict-tests!)
-   (month-tests!)
-   (period-tests!)
+   (cal-month-tests!)
+   (cal-period-tests!)
    (util-list-tests!)
    (ansi-tests!)
    (command-line-tests!)