Rename (shorten name of) finalized_mlc.c to fnlz_mlc.c file

* finalized_mlc.c: Rename to fnlz_mlc.c file.
* BCC_MAKEFILE (XXXOBJS): Rename "finalized_mlc" to "fnlz_mlc".
* EMX_MAKEFILE (OBJS): Likewise.
* Makefile.am (libgc_la_SOURCES): Likewise.
* Makefile.direct (OBJS, CSRCS): Likewise.
* Makefile.dj (OBJS, CSRCS): Likewise.
* NT_MAKEFILE (OBJS): Likewise.
* NT_STATIC_THREADS_MAKEFILE (OBJS): Likewise.
* NT_X64_STATIC_THREADS_MAKEFILE (OBJS): Likewise.
* NT_X64_THREADS_MAKEFILE (OBJS): Likewise.
* OS2_MAKEFILE (OBJS): Likewise.
* PCR-Makefile (COBJ, CSRC): Likewise.
* SMakefile.amiga (OBJS, finalized_mlc.o): Likewise.
* WCC_MAKEFILE (OBJS): Likewise.
* digimars.mak (OBJS, finalized_mlc.o): Likewise.
* extra/gc.c: Likewise.
* gc.mak: Likewise.
* thread_local_alloc.c: Likewise.
* windows-untested/vc60/gc.dsp (SOURCE): Likewise.
* windows-untested/vc60/libgc.dsp (SOURCE): Likewise.
* windows-untested/vc70/gc.vcproj: Likewise.
* windows-untested/vc70/libgc.vcproj: Likewise.
* windows-untested/vc70/libgcmt.vcproj: Likewise.
* windows-untested/vc71/gc.vcproj: Likewise.
* windows-untested/vc71/libgc.vcproj: Likewise.
* windows-untested/vc71/libgcmt.vcproj: Likewise.

27 files changed, 45 insertions, 47 deletions

diff --git a/BCC_MAKEFILE b/BCC_MAKEFILE
index a134e430..2f67e085 100644
--- a/BCC_MAKEFILE
+++ b/BCC_MAKEFILE
@@ -35,7 +35,7 @@ XXXOBJS= XXXalloc.obj XXXreclaim.obj XXXallchblk.obj XXXmisc.obj \
     XXXobj_map.obj XXXblacklst.obj XXXfinalize.obj XXXnew_hblk.obj \

     XXXdbg_mlc.obj XXXmalloc.obj XXXstubborn.obj XXXdyn_load.obj \

     XXXtypd_mlc.obj XXXptr_chck.obj XXXgc_cpp.obj XXXmallocx.obj \

-    XXXfinalized_mlc.obj

+    XXXfnlz_mlc.obj

 

 OBJS= $(XXXOBJS:XXX=)

 

diff --git a/EMX_MAKEFILE b/EMX_MAKEFILE
index 00f70e14..ccb5f321 100644
--- a/EMX_MAKEFILE
+++ b/EMX_MAKEFILE
@@ -48,7 +48,7 @@ RANLIB= ar s
 srcdir = .
 VPATH = $(srcdir)
 
-OBJS= alloc.o reclaim.o allchblk.o misc.o mach_dep.o os_dep.o mark_rts.o headers.o mark.o obj_map.o blacklst.o finalize.o new_hblk.o dyn_load.o dbg_mlc.o finalized_mlc.o malloc.o stubborn.o checksums.o typd_mlc.o ptr_chck.o mallocx.o
+OBJS= alloc.o reclaim.o allchblk.o misc.o mach_dep.o os_dep.o mark_rts.o headers.o mark.o obj_map.o blacklst.o finalize.o new_hblk.o dyn_load.o dbg_mlc.o fnlz_mlc.o malloc.o stubborn.o checksums.o typd_mlc.o ptr_chck.o mallocx.o
 
 CORD_OBJS=  cord/cordbscs.o cord/cordxtra.o cord/cordprnt.o
 
diff --git a/Makefile.am b/Makefile.am
index 31f097f3..21a2056f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -73,7 +73,7 @@ libgc_la_SOURCES += win32_threads.c
 endif
 
 if ENABLE_DISCLAIM
-libgc_la_SOURCES += finalized_mlc.c
+libgc_la_SOURCES += fnlz_mlc.c
 endif
 
 if USE_INTERNAL_LIBATOMIC_OPS
diff --git a/Makefile.direct b/Makefile.direct
index c8371584..e524f1de 100644
--- a/Makefile.direct
+++ b/Makefile.direct
@@ -74,16 +74,15 @@ OBJS= alloc.o reclaim.o allchblk.o misc.o mach_dep.o os_dep.o mark_rts.o \
   headers.o mark.o obj_map.o blacklst.o finalize.o new_hblk.o dbg_mlc.o  \
   malloc.o stubborn.o checksums.o pthread_support.o pthread_stop_world.o \
   darwin_stop_world.o typd_mlc.o ptr_chck.o mallocx.o gcj_mlc.o specific.o \
-  gc_dlopen.o backgraph.o win32_threads.o pthread_start.o thread_local_alloc.o \
-  finalized_mlc.o
+  gc_dlopen.o backgraph.o win32_threads.o pthread_start.o \
+  thread_local_alloc.o fnlz_mlc.o
 
 CSRCS= reclaim.c allchblk.c misc.c alloc.c mach_dep.c os_dep.c mark_rts.c \
   headers.c mark.c obj_map.c pcr_interface.c blacklst.c finalize.c \
   new_hblk.c real_malloc.c dyn_load.c dbg_mlc.c malloc.c stubborn.c \
   checksums.c pthread_support.c pthread_stop_world.c darwin_stop_world.c \
   typd_mlc.c ptr_chck.c mallocx.c gcj_mlc.c specific.c gc_dlopen.c \
-  backgraph.c win32_threads.c pthread_start.c thread_local_alloc.c \
-  finalized_mlc.c
+  backgraph.c win32_threads.c pthread_start.c thread_local_alloc.c fnlz_mlc.c
 
 CORD_SRCS= cord/cordbscs.c cord/cordxtra.c cord/cordprnt.c cord/tests/de.c \
   cord/tests/cordtest.c include/cord.h include/ec.h \
diff --git a/Makefile.dj b/Makefile.dj
index 754b6444..55230d19 100644
--- a/Makefile.dj
+++ b/Makefile.dj
@@ -37,9 +37,9 @@ AR= ar
 RANLIB= ranlib
 
 
-OBJS= alloc.o reclaim.o allchblk.o misc.o mach_dep.o os_dep.o mark_rts.o headers.o mark.o obj_map.o blacklst.o finalize.o new_hblk.o dbg_mlc.o malloc.o stubborn.o checksums.o solaris_threads.o typd_mlc.o ptr_chck.o mallocx.o solaris_pthreads.o gcj_mlc.o specific.o finalized_mlc.o
+OBJS= alloc.o reclaim.o allchblk.o misc.o mach_dep.o os_dep.o mark_rts.o headers.o mark.o obj_map.o blacklst.o finalize.o new_hblk.o dbg_mlc.o malloc.o stubborn.o checksums.o solaris_threads.o typd_mlc.o ptr_chck.o mallocx.o solaris_pthreads.o gcj_mlc.o specific.o fnlz_mlc.o
 
-CSRCS= reclaim.c allchblk.c misc.c alloc.c mach_dep.c os_dep.c mark_rts.c headers.c mark.c obj_map.c pcr_interface.c blacklst.c finalize.c new_hblk.c real_malloc.c dyn_load.c dbg_mlc.c malloc.c stubborn.c checksums.c solaris_threads.c typd_mlc.c ptr_chck.c mallocx.c solaris_pthreads.c gcj_mlc.c specific.c finalized_mlc.c
+CSRCS= reclaim.c allchblk.c misc.c alloc.c mach_dep.c os_dep.c mark_rts.c headers.c mark.c obj_map.c pcr_interface.c blacklst.c finalize.c new_hblk.c real_malloc.c dyn_load.c dbg_mlc.c malloc.c stubborn.c checksums.c solaris_threads.c typd_mlc.c ptr_chck.c mallocx.c solaris_pthreads.c gcj_mlc.c specific.c fnlz_mlc.c
 
 CORD_SRCS= cord/cordbscs.c cord/cordxtra.c cord/cordprnt.c cord/tests/de.c \
     cord/tests/cordtest.c include/cord.h include/ec.h \
diff --git a/NT_MAKEFILE b/NT_MAKEFILE
index fc190a24..340766d3 100644
--- a/NT_MAKEFILE
+++ b/NT_MAKEFILE
@@ -10,7 +10,7 @@ CPU=$(MY_CPU)
 .SUFFIXES:
 .SUFFIXES: .obj .cpp .c
 
-OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj obj_map.obj blacklst.obj finalize.obj new_hblk.obj dbg_mlc.obj finalized_mlc.obj malloc.obj stubborn.obj dyn_load.obj typd_mlc.obj ptr_chck.obj gc_cpp.obj mallocx.obj extra\msvc_dbg.obj
+OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj obj_map.obj blacklst.obj finalize.obj new_hblk.obj dbg_mlc.obj fnlz_mlc.obj malloc.obj stubborn.obj dyn_load.obj typd_mlc.obj ptr_chck.obj gc_cpp.obj mallocx.obj extra\msvc_dbg.obj
 
 all: gctest.exe cord\de.exe test_cpp.exe
 
diff --git a/NT_STATIC_THREADS_MAKEFILE b/NT_STATIC_THREADS_MAKEFILE
index 3d75f58c..8bb375b2 100644
--- a/NT_STATIC_THREADS_MAKEFILE
+++ b/NT_STATIC_THREADS_MAKEFILE
@@ -17,7 +17,7 @@ CPU=$(MY_CPU)
 AO_SRC_DIR=libatomic_ops/src
 AO_INCLUDE_DIR=$(AO_SRC_DIR)
 
-OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj obj_map.obj blacklst.obj finalize.obj new_hblk.obj dbg_mlc.obj finalized_mlc.obj malloc.obj stubborn.obj dyn_load.obj typd_mlc.obj ptr_chck.obj gc_cpp.obj mallocx.obj win32_threads.obj extra\msvc_dbg.obj thread_local_alloc.obj
+OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj obj_map.obj blacklst.obj finalize.obj new_hblk.obj dbg_mlc.obj fnlz_mlc.obj malloc.obj stubborn.obj dyn_load.obj typd_mlc.obj ptr_chck.obj gc_cpp.obj mallocx.obj win32_threads.obj extra\msvc_dbg.obj thread_local_alloc.obj
 
 all: gctest.exe cord\de.exe test_cpp.exe
 
diff --git a/NT_X64_STATIC_THREADS_MAKEFILE b/NT_X64_STATIC_THREADS_MAKEFILE
index 38c37009..2574a621 100644
--- a/NT_X64_STATIC_THREADS_MAKEFILE
+++ b/NT_X64_STATIC_THREADS_MAKEFILE
@@ -17,7 +17,7 @@ CPU=$(MY_CPU)
 AO_SRC_DIR=libatomic_ops/src
 AO_INCLUDE_DIR=$(AO_SRC_DIR)
 
-OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj obj_map.obj blacklst.obj finalize.obj new_hblk.obj dbg_mlc.obj finalized_mlc.obj malloc.obj stubborn.obj dyn_load.obj typd_mlc.obj ptr_chck.obj gc_cpp.obj mallocx.obj win32_threads.obj extra\msvc_dbg.obj thread_local_alloc.obj
+OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj obj_map.obj blacklst.obj finalize.obj new_hblk.obj dbg_mlc.obj fnlz_mlc.obj malloc.obj stubborn.obj dyn_load.obj typd_mlc.obj ptr_chck.obj gc_cpp.obj mallocx.obj win32_threads.obj extra\msvc_dbg.obj thread_local_alloc.obj
 
 all: gctest.exe cord\de.exe test_cpp.exe
 
diff --git a/NT_X64_THREADS_MAKEFILE b/NT_X64_THREADS_MAKEFILE
index 3df5cc46..45c27d59 100644
--- a/NT_X64_THREADS_MAKEFILE
+++ b/NT_X64_THREADS_MAKEFILE
@@ -25,7 +25,7 @@ CPU=$(MY_CPU)
 AO_SRC_DIR=libatomic_ops/src
 AO_INCLUDE_DIR=$(AO_SRC_DIR)
 
-OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj obj_map.obj blacklst.obj finalize.obj new_hblk.obj dbg_mlc.obj finalized_mlc.obj malloc.obj stubborn.obj dyn_load.obj typd_mlc.obj ptr_chck.obj gc_cpp.obj mallocx.obj win32_threads.obj extra\msvc_dbg.obj thread_local_alloc.obj
+OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj obj_map.obj blacklst.obj finalize.obj new_hblk.obj dbg_mlc.obj fnlz_mlc.obj malloc.obj stubborn.obj dyn_load.obj typd_mlc.obj ptr_chck.obj gc_cpp.obj mallocx.obj win32_threads.obj extra\msvc_dbg.obj thread_local_alloc.obj
 
 all: gc64.dll gctest.exe cord\de.exe test_cpp.exe
 
diff --git a/OS2_MAKEFILE b/OS2_MAKEFILE
index 59c6c686..d4cdd54d 100644
--- a/OS2_MAKEFILE
+++ b/OS2_MAKEFILE
@@ -5,7 +5,7 @@
 
 # Significantly revised for GC version 4.4 by Mark Boulter (Jan 1994).
 
-OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj obj_map.obj blacklst.obj finalize.obj new_hblk.obj dbg_mlc.obj finalized_mlc.obj malloc.obj stubborn.obj typd_mlc.obj ptr_chck.obj mallocx.obj
+OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj obj_map.obj blacklst.obj finalize.obj new_hblk.obj dbg_mlc.obj fnlz_mlc.obj malloc.obj stubborn.obj typd_mlc.obj ptr_chck.obj mallocx.obj
 
 CORDOBJS= cord\cordbscs.obj cord\cordxtra.obj cord\cordprnt.obj
 
diff --git a/PCR-Makefile b/PCR-Makefile
index 457a47ce..ff057808 100644
--- a/PCR-Makefile
+++ b/PCR-Makefile
@@ -32,9 +32,9 @@ LDFLAGS = $(CONFIG_LDFLAGS)
 # Fix to point to local pcr installation directory.
 PCRDIR= ..
 
-COBJ= alloc.o reclaim.o allchblk.o misc.o os_dep.o mark_rts.o headers.o mark.o obj_map.o pcr_interface.o blacklst.o finalize.o new_hblk.o real_malloc.o dyn_load.o dbg_mlc.o finalized_mlc.o malloc.o stubborn.o checksums.o solaris_threads.o typd_mlc.o ptr_chck.o mallocx.o
+COBJ= alloc.o reclaim.o allchblk.o misc.o os_dep.o mark_rts.o headers.o mark.o obj_map.o pcr_interface.o blacklst.o finalize.o new_hblk.o real_malloc.o dyn_load.o dbg_mlc.o fnlz_mlc.o malloc.o stubborn.o checksums.o solaris_threads.o typd_mlc.o ptr_chck.o mallocx.o
 
-CSRC= reclaim.c allchblk.c misc.c alloc.c mach_dep.c os_dep.c mark_rts.c headers.c mark.c obj_map.c pcr_interface.c blacklst.c finalize.c new_hblk.c real_malloc.c dyn_load.c dbg_mlc.c finalized_mlc.c malloc.c stubborn.c checksums.c solaris_threads.c typd_mlc.c ptr_chck.c mallocx.c
+CSRC= reclaim.c allchblk.c misc.c alloc.c mach_dep.c os_dep.c mark_rts.c headers.c mark.c obj_map.c pcr_interface.c blacklst.c finalize.c new_hblk.c real_malloc.c dyn_load.c dbg_mlc.c fnlz_mlc.c malloc.c stubborn.c checksums.c solaris_threads.c typd_mlc.c ptr_chck.c mallocx.c
 
 SHELL= /bin/sh
 
diff --git a/SMakefile.amiga b/SMakefile.amiga
index c31fd1ec..ebc8eae3 100644
--- a/SMakefile.amiga
+++ b/SMakefile.amiga
@@ -72,7 +72,7 @@ cord/cordtest: cord/cordtest.o cord/cord$(CPU).lib gc$(CPU).lib
 
 #------------------LIBBING----------------------------
 
-OBJS= alloc.o reclaim.o allchblk.o misc.o mach_dep.o os_dep.o mark_rts.o headers.o mark.o obj_map.o blacklst.o finalize.o new_hblk.o real_malloc.o dyn_load.o dbg_mlc.o malloc.o stubborn.o checksums.o typd_mlc.o ptr_chck.o mallocx.o finalized_mlc.o
+OBJS= alloc.o reclaim.o allchblk.o misc.o mach_dep.o os_dep.o mark_rts.o headers.o mark.o obj_map.o blacklst.o finalize.o new_hblk.o real_malloc.o dyn_load.o dbg_mlc.o malloc.o stubborn.o checksums.o typd_mlc.o ptr_chck.o mallocx.o fnlz_mlc.o
 
 gc$(CPU).lib: $(OBJS)
    $(LIBER) gc$(CPU).lib r $(OBJS)
@@ -132,8 +132,8 @@ dyn_load.o : dyn_load.c $(INC)
 dbg_mlc.o : dbg_mlc.c $(INC)
 	$(CC) dbg_mlc.c $(SCOPT)
 
-finalized_mlc.o : finalized_mlc.c $(INC)
-	$(CC) finalized_mlc.c $(SCOPT)
+fnlz_mlc.o : fnlz_mlc.c $(INC)
+	$(CC) fnlz_mlc.c $(SCOPT)
 
 malloc.o : malloc.c $(INC)
 	$(CC) malloc.c $(SCOPT)
diff --git a/WCC_MAKEFILE b/WCC_MAKEFILE
index 3741f774..d1cca27a 100644
--- a/WCC_MAKEFILE
+++ b/WCC_MAKEFILE
@@ -76,8 +76,7 @@ OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj &
       mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj &
       obj_map.obj blacklst.obj finalize.obj new_hblk.obj &
       dbg_mlc.obj malloc.obj stubborn.obj dyn_load.obj &
-      typd_mlc.obj ptr_chck.obj mallocx.obj &
-      finalized_mlc.obj
+      typd_mlc.obj ptr_chck.obj mallocx.obj fnlz_mlc.obj
 
 all: gc.lib gctest.exe test_cpp.exe
 
diff --git a/digimars.mak b/digimars.mak
index 9a5c3d77..bb9fe8c0 100644
--- a/digimars.mak
+++ b/digimars.mak
@@ -20,7 +20,7 @@ OBJS=	\
 	blacklst.obj\

 	checksums.obj\

 	dbg_mlc.obj\

-	finalized_mlc.obj\

+	fnlz_mlc.obj\

 	dyn_load.obj\

 	finalize.obj\

 	gc_cpp.obj\

@@ -73,7 +73,7 @@ checksums.obj: checksums.c
 dbg_mlc.obj: dbg_mlc.c

 dyn_load.obj: dyn_load.c

 finalize.obj: finalize.c

-finalized_mlc.obj: finalized_mlc.c

+fnlz_mlc.obj: fnlz_mlc.c

 gc_cpp.obj: gc_cpp.cpp

 headers.obj: headers.c

 mach_dep.obj: mach_dep.c

diff --git a/extra/gc.c b/extra/gc.c
index 9fbfb2bb..f48f989a 100644
--- a/extra/gc.c
+++ b/extra/gc.c
@@ -50,7 +50,7 @@
 #include "../alloc.c"
 #include "../dbg_mlc.c"
 #include "../finalize.c"
-#include "../finalized_mlc.c"
+#include "../fnlz_mlc.c"
 #include "../mallocx.c"
 #include "../mark.c"
 #include "../mark_rts.c"
diff --git a/finalized_mlc.c b/fnlz_mlc.c
index 6aea12d5..6aea12d5 100644
--- a/finalized_mlc.c
+++ b/fnlz_mlc.c
diff --git a/gc.mak b/gc.mak
index 34641371..50fe9037 100644
--- a/gc.mak
+++ b/gc.mak
@@ -72,8 +72,8 @@ CLEAN :
 	-@erase ".\Release\dyn_load.sbr"
 	-@erase ".\Release\finalize.obj"
 	-@erase ".\Release\finalize.sbr"
-	-@erase ".\Release\finalized_mlc.obj"
-	-@erase ".\Release\finalized_mlc.sbr"
+	-@erase ".\Release\fnlz_mlc.obj"
+	-@erase ".\Release\fnlz_mlc.sbr"
 	-@erase ".\Release\gc.bsc"
 	-@erase ".\Release\gc_cpp.obj"
 	-@erase ".\Release\gc_cpp.sbr"
@@ -163,7 +163,7 @@ BSC32_SBRS= \
 	".\Release\dbg_mlc.sbr" \
 	".\Release\dyn_load.sbr" \
 	".\Release\finalize.sbr" \
-	".\Release\finalized_mlc.sbr" \
+	".\Release\fnlz_mlc.sbr" \
 	".\Release\gc_cpp.sbr" \
 	".\Release\headers.sbr" \
 	".\Release\mach_dep.sbr" \
@@ -203,7 +203,7 @@ LINK32_OBJS= \
 	".\Release\dbg_mlc.obj" \
 	".\Release\dyn_load.obj" \
 	".\Release\finalize.obj" \
-	".\Release\finalized_mlc.obj" \
+	".\Release\fnlz_mlc.obj" \
 	".\Release\gc_cpp.obj" \
 	".\Release\headers.obj" \
 	".\Release\mach_dep.obj" \
@@ -259,8 +259,8 @@ CLEAN :
 	-@erase ".\Debug\dyn_load.sbr"
 	-@erase ".\Debug\finalize.obj"
 	-@erase ".\Debug\finalize.sbr"
-	-@erase ".\Debug\finalized_mlc.obj"
-	-@erase ".\Debug\finalized_mlc.sbr"
+	-@erase ".\Debug\fnlz_mlc.obj"
+	-@erase ".\Debug\fnlz_mlc.sbr"
 	-@erase ".\Debug\gc_cpp.obj"
 	-@erase ".\Debug\gc_cpp.sbr"
 	-@erase ".\Debug\gc.bsc"
@@ -353,9 +353,9 @@ BSC32_SBRS= \
 	".\Debug\blacklst.sbr" \
 	".\Debug\checksums.sbr" \
 	".\Debug\dbg_mlc.sbr" \
-	".\Debug\finalized_mlc.sbr" \
 	".\Debug\dyn_load.sbr" \
 	".\Debug\finalize.sbr" \
+	".\Debug\fnlz_mlc.sbr" \
 	".\Debug\gc_cpp.sbr" \
 	".\Debug\headers.sbr" \
 	".\Debug\mach_dep.sbr" \
@@ -393,9 +393,9 @@ LINK32_OBJS= \
 	".\Debug\blacklst.obj" \
 	".\Debug\checksums.obj" \
 	".\Debug\dbg_mlc.obj" \
-	".\Debug\finalized_mlc.obj" \
 	".\Debug\dyn_load.obj" \
 	".\Debug\finalize.obj" \
+	".\Debug\fnlz_mlc.obj" \
 	".\Debug\gc_cpp.obj" \
 	".\Debug\headers.obj" \
 	".\Debug\mach_dep.obj" \
@@ -1635,7 +1635,7 @@ NODEP_CPP_DBG_M=\
 ################################################################################
 # Begin Source File
 
-SOURCE=.\finalized_mlc.c
+SOURCE=.\fnlz_mlc.c
 
 !IF  "$(CFG)" == "gc - Win32 Release"
 
@@ -1652,9 +1652,9 @@ NODEP_CPP_DBG_M=\
 	".\th\PCR_ThCtl.h"\
 
 
-".\Release\finalized_mlc.obj" : $(SOURCE) $(DEP_CPP_DBG_M) "$(INTDIR)"
+".\Release\fnlz_mlc.obj" : $(SOURCE) $(DEP_CPP_DBG_M) "$(INTDIR)"
 
-".\Release\finalized_mlc.sbr" : $(SOURCE) $(DEP_CPP_DBG_M) "$(INTDIR)"
+".\Release\fnlz_mlc.sbr" : $(SOURCE) $(DEP_CPP_DBG_M) "$(INTDIR)"
 
 
 !ELSEIF  "$(CFG)" == "gc - Win32 Debug"
@@ -1672,9 +1672,9 @@ NODEP_CPP_DBG_M=\
 	".\th\PCR_ThCtl.h"\
 
 
-".\Debug\finalized_mlc.obj" : $(SOURCE) $(DEP_CPP_DBG_M) "$(INTDIR)"
+".\Debug\fnlz_mlc.obj" : $(SOURCE) $(DEP_CPP_DBG_M) "$(INTDIR)"
 
-".\Debug\finalized_mlc.sbr" : $(SOURCE) $(DEP_CPP_DBG_M) "$(INTDIR)"
+".\Debug\fnlz_mlc.sbr" : $(SOURCE) $(DEP_CPP_DBG_M) "$(INTDIR)"
 
 
 !ENDIF
diff --git a/thread_local_alloc.c b/thread_local_alloc.c
index 2c76ad7e..37b5579e 100644
--- a/thread_local_alloc.c
+++ b/thread_local_alloc.c
@@ -35,7 +35,7 @@ static GC_bool keys_initialized;
 #ifdef ENABLE_DISCLAIM
   GC_INNER ptr_t * GC_finalized_objfreelist = NULL;
         /* This variable is declared here to prevent linking of         */
-        /* finalized_mlc module unless the client uses the latter one.  */
+        /* fnlz_mlc module unless the client uses the latter one.       */
 #endif
 
 /* Return a single nonempty freelist fl to the global one pointed to    */
diff --git a/windows-untested/vc60/gc.dsp b/windows-untested/vc60/gc.dsp
index 8b0cb20b..b3169eb7 100644
--- a/windows-untested/vc60/gc.dsp
+++ b/windows-untested/vc60/gc.dsp
@@ -132,7 +132,7 @@ SOURCE=..\..\gcj_mlc.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\finalized_mlc.c
+SOURCE=..\..\fnlz_mlc.c
 # End Source File
 # Begin Source File
 
diff --git a/windows-untested/vc60/libgc.dsp b/windows-untested/vc60/libgc.dsp
index da67fd0f..40cb4d65 100644
--- a/windows-untested/vc60/libgc.dsp
+++ b/windows-untested/vc60/libgc.dsp
@@ -125,7 +125,7 @@ SOURCE=..\..\gcj_mlc.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\finalized_mlc.c
+SOURCE=..\..\fnlz_mlc.c
 # End Source File
 # Begin Source File
 
diff --git a/windows-untested/vc60/libgcmt.dsp b/windows-untested/vc60/libgcmt.dsp
index 4bc9927d..14b6fbe2 100644
--- a/windows-untested/vc60/libgcmt.dsp
+++ b/windows-untested/vc60/libgcmt.dsp
@@ -125,7 +125,7 @@ SOURCE=..\..\gcj_mlc.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\finalized_mlc.c
+SOURCE=..\..\fnlz_mlc.c
 # End Source File
 # Begin Source File
 
diff --git a/windows-untested/vc70/gc.vcproj b/windows-untested/vc70/gc.vcproj
index c7283071..c143e76b 100644
--- a/windows-untested/vc70/gc.vcproj
+++ b/windows-untested/vc70/gc.vcproj
@@ -168,7 +168,7 @@
                 RelativePath="..\..\gcj_mlc.c">
             </File>
             <File
-                RelativePath="..\..\finalized_mlc.c">
+                RelativePath="..\..\fnlz_mlc.c">
             </File>
             <File
                 RelativePath="..\..\dyn_load.c">
diff --git a/windows-untested/vc70/libgc.vcproj b/windows-untested/vc70/libgc.vcproj
index a41cdb8c..10deed7c 100644
--- a/windows-untested/vc70/libgc.vcproj
+++ b/windows-untested/vc70/libgc.vcproj
@@ -134,7 +134,7 @@
                 RelativePath="..\..\gcj_mlc.c">
             </File>
             <File
-                RelativePath="..\..\finalized_mlc.c">
+                RelativePath="..\..\fnlz_mlc.c">
             </File>
             <File
                 RelativePath="..\..\dyn_load.c">
diff --git a/windows-untested/vc70/libgcmt.vcproj b/windows-untested/vc70/libgcmt.vcproj
index 2f9cd9bd..446180de 100644
--- a/windows-untested/vc70/libgcmt.vcproj
+++ b/windows-untested/vc70/libgcmt.vcproj
@@ -134,7 +134,7 @@
                 RelativePath="..\..\gcj_mlc.c">
             </File>
             <File
-                RelativePath="..\..\finalized_mlc.c">
+                RelativePath="..\..\fnlz_mlc.c">
             </File>
             <File
                 RelativePath="..\..\dyn_load.c">
diff --git a/windows-untested/vc71/gc.vcproj b/windows-untested/vc71/gc.vcproj
index ed556df9..d33e9a3a 100644
--- a/windows-untested/vc71/gc.vcproj
+++ b/windows-untested/vc71/gc.vcproj
@@ -318,7 +318,7 @@
                 </FileConfiguration>
             </File>
             <File
-                RelativePath="..\..\finalized_mlc.c">
+                RelativePath="..\..\fnlz_mlc.c">
                 <FileConfiguration
                     Name="Release|Win32">
                     <Tool
diff --git a/windows-untested/vc71/libgc.vcproj b/windows-untested/vc71/libgc.vcproj
index 8b199a60..6c5bfdce 100644
--- a/windows-untested/vc71/libgc.vcproj
+++ b/windows-untested/vc71/libgc.vcproj
@@ -282,7 +282,7 @@
                 </FileConfiguration>
             </File>
             <File
-                RelativePath="..\..\finalized_mlc.c">
+                RelativePath="..\..\fnlz_mlc.c">
                 <FileConfiguration
                     Name="Release|Win32">
                     <Tool
diff --git a/windows-untested/vc71/libgcmt.vcproj b/windows-untested/vc71/libgcmt.vcproj
index 4eb243a8..96c526be 100644
--- a/windows-untested/vc71/libgcmt.vcproj
+++ b/windows-untested/vc71/libgcmt.vcproj
@@ -282,7 +282,7 @@
                 </FileConfiguration>
             </File>
             <File
-                RelativePath="..\..\finalized_mlc.c">
+                RelativePath="..\..\fnlz_mlc.c">
                 <FileConfiguration
                     Name="Debug|Win32">
                     <Tool