diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 2e840361b0..780e5ac44d 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,13 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-04-18 01:50 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * contrib/hbwin/win_prn1.c
+    ! TRUE -> 1 (was HB_TRUE till yesterday)
+
+  * include/harbour.hbx
+    * formatted some remaining names
+
 2012-04-17 16:20 UTC+0300 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt)
   * harbour/src/rtl/hbsocket.c
     ! fixed WSAEFAULT (or sometimes GPF) error by passing correct buffer 
diff --git a/harbour/contrib/hbwin/win_prn1.c b/harbour/contrib/hbwin/win_prn1.c
index ac3248a102..1726e4ce41 100644
--- a/harbour/contrib/hbwin/win_prn1.c
+++ b/harbour/contrib/hbwin/win_prn1.c
@@ -556,7 +556,7 @@ static int CALLBACK FontEnumCallBack( LOGFONT * lplf, TEXTMETRIC * lpntm,
 
    hb_itemRelease( pSubItems );
 
-   return TRUE;
+   return 1;
 }
 
 HB_FUNC( WIN_ENUMFONTS )
diff --git a/harbour/include/harbour.hbx b/harbour/include/harbour.hbx
index 780a7af38f..e4e7ec4f68 100644
--- a/harbour/include/harbour.hbx
+++ b/harbour/include/harbour.hbx
@@ -1214,16 +1214,16 @@ DYNAMIC __AtPrompt
 DYNAMIC __Box
 DYNAMIC __BoxD
 DYNAMIC __BoxS
-DYNAMIC __CAPLENGTH
-DYNAMIC __CAPMETRICS
-DYNAMIC __CAPTION
+DYNAMIC __CapLength
+DYNAMIC __CapMetrics
+DYNAMIC __Caption
 DYNAMIC __classAdd
 DYNAMIC __classH
 DYNAMIC __classInstance
 DYNAMIC __className
 DYNAMIC __classNew
 DYNAMIC __classSel
-DYNAMIC __CLEAR
+DYNAMIC __Clear
 DYNAMIC __clsAddFriend
 DYNAMIC __clsAddMsg
 DYNAMIC __clsAssocType
@@ -1343,24 +1343,24 @@ DYNAMIC __GetListSetActive
 DYNAMIC __GetMessage
 DYNAMIC __GetMsgPrf
 DYNAMIC __GUIColor
-DYNAMIC __HBARRAY
-DYNAMIC __HBBLOCK
-DYNAMIC __HBCHARACTER
-DYNAMIC __HBDATE
+DYNAMIC __HBArray
+DYNAMIC __HBBlock
+DYNAMIC __HBCharacter
+DYNAMIC __HBDate
 DYNAMIC __hbdoc_FilterOut
 DYNAMIC __hbdoc_FromSource
 DYNAMIC __hbdoc_LoadDir
 DYNAMIC __hbdoc_LoadHBD
 DYNAMIC __hbdoc_SaveHBD
 DYNAMIC __hbdoc_ToSource
-DYNAMIC __HBHASH
-DYNAMIC __HBLOGICAL
-DYNAMIC __HBNIL
-DYNAMIC __HBNUMERIC
-DYNAMIC __HBPOINTER
-DYNAMIC __HBSYMBOL
-DYNAMIC __HBTIMESTAMP
-DYNAMIC __HBVMINIT
+DYNAMIC __HBHash
+DYNAMIC __HBLogical
+DYNAMIC __HBNil
+DYNAMIC __HBNumeric
+DYNAMIC __HBPointer
+DYNAMIC __HBSymbol
+DYNAMIC __HBTimestamp
+DYNAMIC __HBVMInit
 DYNAMIC __i18n_hashJoin
 DYNAMIC __i18n_hashTable
 DYNAMIC __i18n_potArrayJoin