diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 26a004660d..894faad9f2 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,12 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-04-19 02:30 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * include/harbour.hbx
+  * contrib/hbnetio/utils/hbnetio/netiosrv.prg
+  * contrib/hbrun/hbrun.prg
+    ! fixes to prev
+
 2012-04-19 02:23 UTC+0200 Viktor Szakats (harbour syenar.net)
   * src/3rd/pcre/Makefile
     + enabled UTF8 support in PCRE (binary size overhead ~150KB)
diff --git a/harbour/contrib/hbnetio/utils/hbnetio/netiosrv.prg b/harbour/contrib/hbnetio/utils/hbnetio/netiosrv.prg
index 2a26fd5cac..0b80bc81c7 100644
--- a/harbour/contrib/hbnetio/utils/hbnetio/netiosrv.prg
+++ b/harbour/contrib/hbnetio/utils/hbnetio/netiosrv.prg
@@ -483,7 +483,7 @@ STATIC PROCEDURE netiosrv_conn_register( netiosrv, pConnectionSocket )
    LOCAL nconn[ _NETIOSRV_CONN_MAX_ ]
 
    nconn[ _NETIOSRV_CONN_pConnection ] := pConnectionSocket
-   nconn[ _NETIOSRV_CONN_nThreadID ]   := hb_threadId()
+   nconn[ _NETIOSRV_CONN_nThreadID ]   := hb_threadID()
    nconn[ _NETIOSRV_CONN_tStart ]      := hb_DateTime()
 
    hb_mutexLock( netiosrv[ _NETIOSRV_mtxConnection ] )
@@ -550,7 +550,7 @@ STATIC FUNCTION netiomgm_rpc_setclientinfo( netiosrv, hInfo )
       hb_mutexLock( netiosrv[ _NETIOSRV_mtxConnection ] )
 
       FOR EACH nconn IN netiosrv[ _NETIOSRV_hConnection ]
-         IF nconn[ _NETIOSRV_CONN_nThreadID ] == hb_threadId()
+         IF nconn[ _NETIOSRV_CONN_nThreadID ] == hb_threadID()
             nconn[ _NETIOSRV_CONN_hInfo ] := hInfo
             EXIT
          ENDIF
diff --git a/harbour/contrib/hbrun/hbrun.prg b/harbour/contrib/hbrun/hbrun.prg
index 090718c1f3..96425ad6b6 100644
--- a/harbour/contrib/hbrun/hbrun.prg
+++ b/harbour/contrib/hbrun/hbrun.prg
@@ -400,7 +400,7 @@ STATIC PROCEDURE hbrun_Prompt( aParams, cCommand )
       bKeyDown := SetKey( K_DOWN, ;
          {|| cLine := iif( nHistIndex < Len( s_aHistory ), ;
              s_aHistory[ ++nHistIndex ], ;
-             ( nHistIndex := Len( s_aHistory ) + 1, Space( HB_LINE_Len ) ) ) } )
+             ( nHistIndex := Len( s_aHistory ) + 1, Space( HB_LINE_LEN ) ) ) } )
       bKeyResize := SetKey( HB_K_RESIZE,;
          {|| lResize := .T., hb_KeyPut( K_ENTER ) } )
 
diff --git a/harbour/include/harbour.hbx b/harbour/include/harbour.hbx
index e4e7ec4f68..1232b98308 100644
--- a/harbour/include/harbour.hbx
+++ b/harbour/include/harbour.hbx
@@ -790,7 +790,7 @@ DYNAMIC hb_StrToTS
 DYNAMIC hb_StrToUTF8
 DYNAMIC hb_StrXor
 DYNAMIC hb_threadDetach
-DYNAMIC hb_threadId
+DYNAMIC hb_threadID
 DYNAMIC hb_threadJoin
 DYNAMIC hb_threadOnce
 DYNAMIC hb_threadOnceInit