diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 7f7b533707..8368343811 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,16 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-06-18 11:18 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/src/vm/hvm.c
+  * harbour/src/vm/harbinit.prg
+    * renamed Harbour VM initialization function
+      from CLIPINIT() to __HBVMINIT()
+      This functions is called when new HVM stack is created at application
+      startup or in MT mode when new HVM thread is registered to initialize
+      basic VM settings like public variable GetList and ErrorBlock() by
+      calling ErrorSys() function.
+
 2010-06-18 10:58 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * include/hbdefs.h
     + HB_SIZE/HB_ISIZ set to 64-bit value on Win64 targets.
diff --git a/harbour/src/vm/harbinit.prg b/harbour/src/vm/harbinit.prg
index bcea9fdc4b..d125ee58a1 100644
--- a/harbour/src/vm/harbinit.prg
+++ b/harbour/src/vm/harbinit.prg
@@ -4,7 +4,7 @@
 
 /*
  * Harbour Project source code:
- * Main Harbour initialization functions CLIPINIT()
+ * Main Harbour VM initialization function __HBVMINIT()
  *
  * Copyright 1999-2001 Viktor Szakats (harbour.01 syenar.hu)
  * www - http://harbour-project.org
@@ -66,13 +66,12 @@ PROCEDURE CLIPPER530()
 
 #endif
 
-/*
- * because on some platform the execution order of init functions
- * is out of Harbour control then this function has to be called
- * explicitly in VM initialization process before hb_vmDoInitFunctions()
- * and not depends on INIT clause.
+/* This functions is called when new HVM stack is created at application
+ * startup or in MT mode when new HVM thread is registered to initialize
+ * basic VM settings like public variable GetList and ErrorBlock() by
+ * calling ErrorSys() function.
  */
-PROCEDURE ClipInit()
+PROCEDURE __HBVMINIT()
 
    MEMVAR GetList
 
@@ -82,6 +81,7 @@ PROCEDURE ClipInit()
 
    RETURN
 
+
 PROCEDURE __SetHelpK()
 
    SET KEY K_F1 TO __XHELP
diff --git a/harbour/src/vm/hvm.c b/harbour/src/vm/hvm.c
index 95feb19948..7a3b06905f 100644
--- a/harbour/src/vm/hvm.c
+++ b/harbour/src/vm/hvm.c
@@ -373,12 +373,12 @@ static void hb_vmDoModuleQuitFunctions( void )
 }
 
 
-/* call CLIPINIT function to initialize GETLIST public variable
- * and set ErrorBlock() by ERRORSYS() function
+/* call __HBVMINIT function to initialize GETLIST public variable
+ * and set ErrorBlock() by ErrorSys() function
  */
-static void hb_vmDoInitClip( void )
+static void hb_vmDoInitHVM( void )
 {
-   PHB_DYNS pDynSym = hb_dynsymFind( "CLIPINIT" );
+   PHB_DYNS pDynSym = hb_dynsymFind( "__HBVMINIT" );
 
    if( pDynSym && pDynSym->pSymbol->value.pFunPtr )
    {
@@ -812,10 +812,10 @@ void hb_vmThreadInit( void * Cargo )
 
       if( s_fHVMActive )
       {
-         /* call CLIPINIT function to initialize GETLIST public variable
-          * and set ErrorBlock() by ERRORSYS() function
+         /* call __HBVMINIT function to initialize GETLIST public variable
+          * and set ErrorBlock() by ErrorSys() function
           */
-         hb_vmDoInitClip();
+         hb_vmDoInitHVM();
       }
 
       if( pState->pMemvars )
@@ -999,14 +999,10 @@ void hb_vmInit( HB_BOOL bStartMainProc )
     */
    hb_vmDoInitStatics();
 
-   /* call CLIPINIT function to initialize GETLIST public variable
-    * and set ErrorBlock() by ERRORSYS() function
-    * Because on some platform the execution order of init functions
-    * is out of Harbour control then this function has to be called
-    * explicitly in VM initialization process before hb_vmDoInitFunctions()
-    * and not depends on INIT clause.
+   /* call __HBVMINIT function to initialize GETLIST public variable
+    * and set ErrorBlock() by ErrorSys() function.
     */
-   hb_vmDoInitClip();
+   hb_vmDoInitHVM();
 
    hb_clsDoInit();                     /* initialize Class(y) .prg functions */