diff --git a/makefile b/makefile
index e822789e..42a595c9 100644
--- a/makefile
+++ b/makefile
@@ -155,8 +155,8 @@ stage6:
 	$(VOCSTATIC) -sP oocMsg.Mod oocChannel.Mod
 	$(VOCSTATIC) -sP oocStrings2.Mod oocRts.Mod oocFilenames.Mod
 	$(VOCSTATIC) -sP oocTextRider.Mod oocBinaryRider.Mod oocJulianDay.Mod
-	$(VOCSTATIC) -sP oocwrapperlibc.Mod
 	$(VOCSTATIC) -sP oocFilenames.Mod
+	$(VOCSTATIC) -sP oocwrapperlibc.Mod
 
 	#Ulm's Oberon system libs
 	$(VOCSTATIC) -sP ulmSys.Mod
diff --git a/src/lib/ooc/oocFilenames.Mod b/src/lib/ooc/oocFilenames.Mod
index 6d7b1363..c94452d9 100644
--- a/src/lib/ooc/oocFilenames.Mod
+++ b/src/lib/ooc/oocFilenames.Mod
@@ -1,5 +1,5 @@
 (* This module is obsolete.  Don't use it. *)
-MODULE Filenames;
+MODULE oocFilenames;
 (* Note: It is not checked whether the concatenated strings fit into the
    variables given for them or not *)
 
@@ -184,5 +184,5 @@ PROCEDURE ExpandPath*(VAR full: ARRAY OF CHAR; path: ARRAY OF CHAR);
     END
   END ExpandPath;
 
-END Filenames.
+END oocFilenames.