Index: /trunk/source/compiler/ARM/arm-arch.lisp
===================================================================
--- /trunk/source/compiler/ARM/arm-arch.lisp	(revision 15195)
+++ /trunk/source/compiler/ARM/arm-arch.lisp	(revision 15196)
@@ -267,5 +267,5 @@
     ccl::%toplevel-function%
     ccl::%pascal-functions%    
-    ccl::*all-metered-functions*
+    ccl::*heap-init-function*
     ccl::*total-gc-microseconds*
     ccl::%builtin-functions%
@@ -280,5 +280,5 @@
     ccl::%all-packages%
     ccl::*keyword-package* 
-    ccl::%finalization-alist%
+    ccl::%os-init-function%
     ccl::%foreign-thread-control
     ))
Index: /trunk/source/compiler/PPC/ppc-arch.lisp
===================================================================
--- /trunk/source/compiler/PPC/ppc-arch.lisp	(revision 15195)
+++ /trunk/source/compiler/PPC/ppc-arch.lisp	(revision 15196)
@@ -299,5 +299,5 @@
     ccl::%toplevel-function%
     ccl::%pascal-functions%    
-    ccl::*all-metered-functions*
+    ccl::*heap-init-function*
     ccl::*total-gc-microseconds*
     ccl::%builtin-functions%
@@ -312,5 +312,5 @@
     ccl::%all-packages%
     ccl::*keyword-package* 
-    ccl::%finalization-alist%
+    ccl::%os-init-function%
     ccl::%foreign-thread-control
     ))
Index: /trunk/source/compiler/X86/x86-arch.lisp
===================================================================
--- /trunk/source/compiler/X86/x86-arch.lisp	(revision 15195)
+++ /trunk/source/compiler/X86/x86-arch.lisp	(revision 15196)
@@ -101,5 +101,5 @@
     ccl::%toplevel-function%
     ccl::%pascal-functions%    
-    ccl::*all-metered-functions*
+    ccl::*heap-init-function*
     ccl::*total-gc-microseconds*
     ccl::%builtin-functions%
@@ -114,5 +114,5 @@
     ccl::%all-packages%
     ccl::*keyword-package* 
-    ccl::%finalization-alist%
+    ccl::%os-init-function%
     ccl::%foreign-thread-control
     ))
Index: /trunk/source/lisp-kernel/arm-constants.s
===================================================================
--- /trunk/source/lisp-kernel/arm-constants.s	(revision 15195)
+++ /trunk/source/lisp-kernel/arm-constants.s	(revision 15196)
@@ -471,6 +471,6 @@
 
 	 _struct_pad(fulltag_misc)
-	 _struct_label(allmeteredfuns)
-	 _struct_pad(symbol_extra)	/* *all-metered-functions* */
+	 _struct_label(heap_init_function)
+	 _struct_pad(symbol_extra)	/* *heap-init-function* */
 
 	 _struct_pad(fulltag_misc)
@@ -524,6 +524,6 @@
 
 	 _struct_pad(fulltag_misc)
-	 _struct_label(finalization_alist)
-	 _struct_pad(symbol_extra)	/* %finalization-alist% */
+	 _struct_label(os_init_function)
+	 _struct_pad(symbol_extra)	/* %os-init-function% */
 
 	 _struct_pad(fulltag_misc)
Index: /trunk/source/lisp-kernel/lisp_globals.h
===================================================================
--- /trunk/source/lisp-kernel/lisp_globals.h	(revision 15195)
+++ /trunk/source/lisp-kernel/lisp_globals.h	(revision 15196)
@@ -144,5 +144,5 @@
 #define nrs_TOPLFUNC			(nrs_symbol(16))	/* %toplevel-function% */
 #define nrs_CALLBACKS			(nrs_symbol(17))	/* %pascal-functions% */
-#define nrs_ALLMETEREDFUNS		(nrs_symbol(18))	/* *all-metered-functions* */
+#define nrs_HEAP_INIT_FUNCTION		(nrs_symbol(18))	/* *heap-init-function* */
 #define nrs_TOTAL_GC_MICROSECONDS       (nrs_symbol(19))        /* *total-gc-microseconds* */
 #define nrs_BUILTIN_FUNCTIONS           (nrs_symbol(20))        /* %builtin-functions% */
@@ -157,5 +157,5 @@
 #define nrs_ALL_PACKAGES		(nrs_symbol(29))	/* %all-packages% */
 #define nrs_KEYWORD_PACKAGE		(nrs_symbol(30))	/* *keyword-package* */
-#define nrs_FINALIZATION_ALIST		(nrs_symbol(31))	/* %finalization-alist% */
+#define nrs_OS_INIT_FUNCTION		(nrs_symbol(31))	/* %os-init-function% */
 #define nrs_FOREIGN_THREAD_CONTROL      (nrs_symbol(32))        /* %foreign-thread-control */
 #define num_nilreg_symbols 33
Index: /trunk/source/lisp-kernel/ppc-constants32.s
===================================================================
--- /trunk/source/lisp-kernel/ppc-constants32.s	(revision 15195)
+++ /trunk/source/lisp-kernel/ppc-constants32.s	(revision 15196)
@@ -439,6 +439,6 @@
 
 	 _struct_pad(fulltag_misc)
-	 _struct_label(allmeteredfuns)
-	 _struct_pad(symbol_extra)	/* *all-metered-functions* */
+	 _struct_label(heap_init_function)
+	 _struct_pad(symbol_extra)	/* *heap-init-function* */
 
 	 _struct_pad(fulltag_misc)
@@ -492,6 +492,6 @@
 
 	 _struct_pad(fulltag_misc)
-	 _struct_label(finalization_alist)
-	 _struct_pad(symbol_extra)	/* %finalization-alist% */
+	 _struct_label(os_init_function)
+	 _struct_pad(symbol_extra)	/* %os-init-function% */
 
 	 _struct_pad(fulltag_misc)
Index: /trunk/source/lisp-kernel/ppc-constants64.s
===================================================================
--- /trunk/source/lisp-kernel/ppc-constants64.s	(revision 15195)
+++ /trunk/source/lisp-kernel/ppc-constants64.s	(revision 15196)
@@ -408,6 +408,6 @@
 
 	 _struct_pad(fulltag_misc)
-	 _struct_label(allmeteredfuns)
-	 _struct_pad(symbol_extra)	/* *all-metered-functions* */
+	 _struct_label(heap_init_function)
+	 _struct_pad(symbol_extra)	/* *heap-init-function* */
 
 	 _struct_pad(fulltag_misc)
@@ -461,6 +461,6 @@
 
 	 _struct_pad(fulltag_misc)
-	 _struct_label(finalization_alist)
-	 _struct_pad(symbol_extra)	/* %finalization-alist% */
+	 _struct_label(os_init_function)
+	 _struct_pad(symbol_extra)	/* %os-init-function% */
 
 	 _struct_pad(fulltag_misc)
Index: /trunk/source/lisp-kernel/x86-constants32.s
===================================================================
--- /trunk/source/lisp-kernel/x86-constants32.s	(revision 15195)
+++ /trunk/source/lisp-kernel/x86-constants32.s	(revision 15196)
@@ -378,6 +378,6 @@
 
          _struct_pad(fulltag_misc)
-         _struct_label(allmeteredfuns)
-         _struct_pad(symbol_extra)      /* *all-metered-functions* */
+         _struct_label(heap_init_function)
+         _struct_pad(symbol_extra)      /* *heap-init-function* */
 
          _struct_pad(fulltag_misc)
@@ -430,6 +430,6 @@
 
          _struct_pad(fulltag_misc)
-         _struct_label(finalization_alist)
-         _struct_pad(symbol_extra)      /* %finalization-alist% */
+         _struct_label(os_init_function)
+         _struct_pad(symbol_extra)      /* %os-init-function% */
 
          _struct_pad(fulltag_misc)
Index: /trunk/source/lisp-kernel/x86-constants64.s
===================================================================
--- /trunk/source/lisp-kernel/x86-constants64.s	(revision 15195)
+++ /trunk/source/lisp-kernel/x86-constants64.s	(revision 15196)
@@ -794,6 +794,6 @@
 
 	 _struct_pad(fulltag_symbol)
-	 _struct_label(allmeteredfuns)
-	 _struct_pad(symbol_extra)	/* *all-metered-functions*    */
+	 _struct_label(heap_init_function)
+	 _struct_pad(symbol_extra)	/* *heap-init-function*    */
 
 	 _struct_pad(fulltag_symbol)
@@ -847,6 +847,6 @@
 
 	 _struct_pad(fulltag_symbol)
-	 _struct_label(finalization_alist)
-	 _struct_pad(symbol_extra)	/* %finalization-alist%    */
+	 _struct_label(os_init_function)
+	 _struct_pad(symbol_extra)	/* %os-init-function%    */
 
 	 _struct_pad(fulltag_symbol)