diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index af9e1d957b..2ea7a3a1c5 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,17 @@
    2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-07-03 18:35 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+   * contrib/hbbmcdx/bmdbfcdx.c
+   * contrib/hbbtree/hb_btree.c
+   * contrib/hbgd/gdwrp.c
+   * contrib/hbsqlit3/hbsqlit3.c
+   * contrib/hbtip/encmthd.c
+   * contrib/hbtip/utils.c
+   * contrib/xhb/cstructc.c
+   * contrib/xhb/xhbwith.c
+     % Using HB_ERR_FUNCNAME
+
 2008-07-03 18:00 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
    * contrib/hbmzip/hbmzip.c
      ! Fixed previous TOFIX for DOS.
diff --git a/harbour/contrib/hbbmcdx/bmdbfcdx.c b/harbour/contrib/hbbmcdx/bmdbfcdx.c
index 4187d0a150..376d57b6b9 100644
--- a/harbour/contrib/hbbmcdx/bmdbfcdx.c
+++ b/harbour/contrib/hbbmcdx/bmdbfcdx.c
@@ -6822,10 +6822,10 @@ HB_FUNC( BM_DBSETFILTERARRAY )
                 CURKEY_SETLOGCNT( pTag, (hb_arrayLen( pArray )) )
        }
        else
-          hb_errRT_DBCMD( EG_ARG, EDBCMD_BADPARAMETER, NULL, "BM_DBSETFILTERARRAY" );
+          hb_errRT_DBCMD( EG_ARG, EDBCMD_BADPARAMETER, NULL, HB_ERR_FUNCNAME );
     }
     else
-       hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "BM_DBSETFILTERARRAY" );
+       hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME );
 }
 
 HB_FUNC( BM_DBSETFILTERARRAYADD )
@@ -6851,10 +6851,10 @@ HB_FUNC( BM_DBSETFILTERARRAYADD )
                  CURKEY_SETLOGCNT( pTag, (pTag->logKeyCount + ulAdd) )
         }
         else
-           hb_errRT_DBCMD( EG_ARG, EDBCMD_BADPARAMETER, NULL, "BM_DBSETFILTERARRAYADD" );
+           hb_errRT_DBCMD( EG_ARG, EDBCMD_BADPARAMETER, NULL, HB_ERR_FUNCNAME );
     }
     else
-       hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "BM_DBSETFILTERARRAYADD" );
+       hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME );
 }
 
 HB_FUNC( BM_DBSETFILTERARRAYDEL )
@@ -6880,10 +6880,10 @@ HB_FUNC( BM_DBSETFILTERARRAYDEL )
                 CURKEY_SETLOGCNT( pTag, pTag->logKeyCount - ulDel )
        }
        else
-          hb_errRT_DBCMD( EG_ARG, EDBCMD_BADPARAMETER, NULL, "BM_DBSETFILTERARRAYDEL" );
+          hb_errRT_DBCMD( EG_ARG, EDBCMD_BADPARAMETER, NULL, HB_ERR_FUNCNAME );
     }
     else
-       hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "BM_DBSETFILTERARRAYDEL" );
+       hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME );
 }
 
 
@@ -6935,13 +6935,12 @@ HB_FUNC( BM_DBSEEKWILD )
              }
        }
        else
-          hb_errRT_DBCMD( EG_ARG, EDBCMD_SEEK_BADPARAMETER, NULL, "BM_DBSEEKWILD" );
+          hb_errRT_DBCMD( EG_ARG, EDBCMD_SEEK_BADPARAMETER, NULL, HB_ERR_FUNCNAME );
     }
     else
-       hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, "BM_DBSEEKWILD" );
+       hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME );
 
     hb_retl( FALSE );
-
 }
 
 #endif
diff --git a/harbour/contrib/hbbtree/hb_btree.c b/harbour/contrib/hbbtree/hb_btree.c
index a4a8afa049..a82b349a7f 100644
--- a/harbour/contrib/hbbtree/hb_btree.c
+++ b/harbour/contrib/hbbtree/hb_btree.c
@@ -1810,7 +1810,7 @@ HB_FUNC( HB_BTREEOPEN  )  /* hb_BTreeOpen( CHAR cFileName, ULONG ulFlags [ , int
     hb_retni( BTree_SetTreeIndex( hb_BTreeOpen( ( BYTE * ) hb_parc( 1 ), hb_parnl( 2 ), hb_parni( 3 ) ) ) );
   else
   {
-    hb_RaiseError( HB_BTreeArgError_EC, "Bad argument(s)", "hb_btreeopen", hb_pcount() );
+    hb_RaiseError( HB_BTreeArgError_EC, "Bad argument(s)", HB_ERR_FUNCNAME, hb_pcount() );
     hb_retni( 0 );
   }
 }
@@ -1825,7 +1825,7 @@ HB_FUNC( HB_BTREENEW )  /* hb_BTreeNew( CHAR cFileName, int nPageSize, int nKeyS
   }
   else
   {
-    hb_RaiseError( HB_BTreeArgError_EC, "Bad argument(s)", "hb_btreenew", hb_pcount() );
+    hb_RaiseError( HB_BTreeArgError_EC, "Bad argument(s)", HB_ERR_FUNCNAME, hb_pcount() );
     hb_retni( 0 );
   }
 }
@@ -1847,7 +1847,7 @@ HB_FUNC( HB_BTREEINSERT )  /* hb_BTreeInsert( hb_BTree_Handle, CHAR cKey, LONG l
     hb_retl( hb_BTreeInsert( BTree_GetTreeIndex( "hb_btreeinsert" ), ( BYTE * ) hb_parc( 2 ), hb_paramError( 3 ) ) );
   else
   {
-    hb_RaiseError( HB_BTreeArgError_EC, "Bad argument(s)", "hb_btreeinsert", hb_pcount() );
+    hb_RaiseError( HB_BTreeArgError_EC, "Bad argument(s)", HB_ERR_FUNCNAME, hb_pcount() );
     hb_retl( 0 );
   }
 }
@@ -1859,7 +1859,7 @@ HB_FUNC( HB_BTREEDELETE )  /* hb_BTreeDelete( hb_BTree_Handle, CHAR cKey, LONG l
     hb_retl( hb_BTreeDelete( BTree_GetTreeIndex( "hb_btreedelete" ), ( BYTE * ) hb_parc( 2 ), hb_parnl( 3 ) ) );
   else
   {
-    hb_RaiseError( HB_BTreeArgError_EC, "Bad argument(s)", "hb_btreedelete", hb_pcount() );
+    hb_RaiseError( HB_BTreeArgError_EC, "Bad argument(s)", HB_ERR_FUNCNAME, hb_pcount() );
     hb_retl( 0 );
   }
 }
@@ -1907,7 +1907,7 @@ HB_FUNC( HB_BTREESKIP )  /* hb_BTreeSkip( hb_BTree_Handle, LONG nRecords ) -> LO
     hb_retnl( hb_BTreeSkip( BTree_GetTreeIndex( "hb_btreeskip" ), hb_parnl( 2 ) ) );
   else
   {
-    hb_RaiseError( HB_BTreeArgError_EC, "Bad argument(s)", "hb_btreeskip", hb_pcount() );
+    hb_RaiseError( HB_BTreeArgError_EC, "Bad argument(s)", HB_ERR_FUNCNAME, hb_pcount() );
     hb_retnl( 0 );
   }
 }
@@ -1919,7 +1919,7 @@ HB_FUNC( HB_BTREESEEK )  /* hb_BTreeSeek( hb_BTree_Handle, CHAR cKey, LONG lData
     hb_retl( hb_BTreeSeek( BTree_GetTreeIndex( "hb_btreeseek" ), ( BYTE * ) hb_parc( 2 ), hb_parnl( 3 ), hb_parl( 4 ) ) );
   else
   {
-    hb_RaiseError( HB_BTreeArgError_EC, "Bad argument(s)", "hb_btreeseek", hb_pcount() );
+    hb_RaiseError( HB_BTreeArgError_EC, "Bad argument(s)", HB_ERR_FUNCNAME, hb_pcount() );
     hb_retl( 0 );
   }
 }
@@ -1983,7 +1983,7 @@ HB_FUNB( HB_BTREEEVAL )  /* hb_BTreeEval( hb_BTree_Handle, bBlock, [bForConditio
   if ( ISNUM( 1 ) && ISBLOCK( 2 ) )
     hb_BTreeEval( BTree_GetTreeIndex( "hb_btreeeval" ), 0 );
   else
-    hb_RaiseError( HB_BTreeArgError_EC, "Bad argument(s)", "hb_btreeeval", hb_pcount() );
+    hb_RaiseError( HB_BTreeArgError_EC, "Bad argument(s)", HB_ERR_FUNCNAME, hb_pcount() );
 }
 #endif
 
diff --git a/harbour/contrib/hbgd/gdwrp.c b/harbour/contrib/hbgd/gdwrp.c
index 781334d2f1..55822fdac0 100644
--- a/harbour/contrib/hbgd/gdwrp.c
+++ b/harbour/contrib/hbgd/gdwrp.c
@@ -610,7 +610,7 @@ HB_FUNC( GDIMAGECREATE ) /* gdImagePtr gdImageCreate(sx, sy) */
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGECREATE", 2,
+            HB_ERR_FUNCNAME, 2,
             hb_paramError( 1 ), hb_paramError( 2 ) );
          return;
       }
@@ -652,7 +652,7 @@ HB_FUNC( GDIMAGECREATETRUECOLOR ) /* gdImageCreateTrueColor(sx, sy) */
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGECREATETRUECOLOR", 2,
+            HB_ERR_FUNCNAME, 2,
             hb_paramError( 1 ), hb_paramError( 2 ) );
          return;
       }
@@ -779,7 +779,7 @@ HB_FUNC( GDIMAGEDESTROY ) /* gdImageDestroy(gdImagePtr im) */
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGEDESTROY", 1,
+            HB_ERR_FUNCNAME, 1,
             hb_paramError( 1 ) );
          return;
       }
@@ -825,7 +825,7 @@ HB_FUNC( GDIMAGESETPIXEL ) /* void gdImageSetPixel(gdImagePtr im, int x, int y,
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGESETPIXEL", 4,
+            HB_ERR_FUNCNAME, 4,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ) );
          return;
       }
@@ -870,7 +870,7 @@ HB_FUNC( GDIMAGELINE ) /* void gdImageLine(gdImagePtr im, int x1, int y1, int x2
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGELINE", 6,
+            HB_ERR_FUNCNAME, 6,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ),
             hb_paramError( 5 ), hb_paramError( 6 ) );
          return;
@@ -916,7 +916,7 @@ HB_FUNC( GDIMAGEDASHEDLINE ) /* void gdImageDashedLine(gdImagePtr im, int x1, in
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGEDASHEDLINE", 6,
+            HB_ERR_FUNCNAME, 6,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ),
             hb_paramError( 5 ), hb_paramError( 6 ) );
          return;
@@ -974,7 +974,7 @@ HB_FUNC( GDIMAGEPOLYGON ) /* original: void gdImagePolygon(gdImagePtr im, gdPoin
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGEPOLYGON", 3,
+            HB_ERR_FUNCNAME, 3,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ) );
          return;
       }
@@ -1031,7 +1031,7 @@ HB_FUNC( GDIMAGEOPENPOLYGON ) /* original: void gdImageOpenPolygon(gdImagePtr im
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGEOPENPOLYGON", 3,
+            HB_ERR_FUNCNAME, 3,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ) );
          return;
       }
@@ -1077,7 +1077,7 @@ HB_FUNC( GDIMAGERECTANGLE ) /* void gdImageRectangle(gdImagePtr im, int x1, int
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGERECTANGLE", 6,
+            HB_ERR_FUNCNAME, 6,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ),
             hb_paramError( 5 ), hb_paramError( 6 ) );
          return;
@@ -1123,7 +1123,7 @@ HB_FUNC( GDIMAGEELLIPSE ) /* void gdImageEllipse(gdImagePtr im, int cx, int cy,
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGEELLIPSE", 2,
+            HB_ERR_FUNCNAME, 2,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ),
             hb_paramError( 5 ), hb_paramError( 6 ) );
          return;
@@ -1182,7 +1182,7 @@ HB_FUNC( GDIMAGEFILLEDPOLYGON ) /* original: void gdImageFilledPolygon(gdImagePt
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGEFILLEDPOLYGON", 3,
+            HB_ERR_FUNCNAME, 3,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ) );
          return;
       }
@@ -1227,7 +1227,7 @@ HB_FUNC( GDIMAGEFILLEDRECTANGLE ) /* void gdImageFilledRectangle(gdImagePtr im,
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGEFILLEDRECTANGLE", 6,
+            HB_ERR_FUNCNAME, 6,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ),
             hb_paramError( 5 ), hb_paramError( 6 ) );
          return;
@@ -1277,7 +1277,7 @@ HB_FUNC( GDIMAGEARC ) /* void gdImageArc(gdImagePtr im, int cx, int cy, int w, i
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGEARC", 8,
+            HB_ERR_FUNCNAME, 8,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ),
             hb_paramError( 5 ), hb_paramError( 6 ), hb_paramError( 7 ), hb_paramError( 8 ) );
          return;
@@ -1330,7 +1330,7 @@ HB_FUNC( GDIMAGEFILLEDARC ) /* void gdImageFilledArc(gdImagePtr im, int cx, int
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGEFILLEDARC", 9,
+            HB_ERR_FUNCNAME, 9,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ),
             hb_paramError( 5 ), hb_paramError( 6 ), hb_paramError( 7 ), hb_paramError( 8 ),
             hb_paramError( 9 ) );
@@ -1376,7 +1376,7 @@ HB_FUNC( GDIMAGEFILLEDELLIPSE ) /* void gdImageFilledEllipse(gdImagePtr im, int
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGEFILLEDELLIPSE", 6,
+            HB_ERR_FUNCNAME, 6,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ),
             hb_paramError( 5 ), hb_paramError( 6 ) );
          return;
@@ -1419,7 +1419,7 @@ HB_FUNC( GDIMAGEFILLTOBORDER ) /* void gdImageFillToBorder(gdImagePtr im, int x,
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGEFILLTOBORDER", 5,
+            HB_ERR_FUNCNAME, 5,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ),
             hb_paramError( 5 ) );
          return;
@@ -1464,7 +1464,7 @@ HB_FUNC( GDIMAGEELLIPSE ) /* void gdImageEllipse(gdImagePtr im, int cx, int cy,
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGEELLIPSE", 6,
+            HB_ERR_FUNCNAME, 6,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ),
             hb_paramError( 5 ), hb_paramError( 6 ) );
          return;
@@ -1505,7 +1505,7 @@ HB_FUNC( GDIMAGEFILL ) /* void gdImageFill(gdImagePtr im, int x, int y, int colo
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGEFILL", 4,
+            HB_ERR_FUNCNAME, 4,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ) );
          return;
       }
@@ -1539,7 +1539,7 @@ HB_FUNC( GDIMAGESETANTIALIASED ) /* void gdImageSetAntiAliased(gdImagePtr im, in
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGESETANTIALIASED", 2,
+            HB_ERR_FUNCNAME, 2,
             hb_paramError( 1 ), hb_paramError( 2 ) );
          return;
       }
@@ -1578,7 +1578,7 @@ HB_FUNC( GDIMAGESETANTIALIASEDDONTBLEND ) /* void gdImageSetAntiAliasedDontBlend
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGESETANTIALIASEDDONTBLEND", 3,
+            HB_ERR_FUNCNAME, 3,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ) );
          return;
       }
@@ -1612,7 +1612,7 @@ HB_FUNC( GDIMAGESETBRUSH ) /* void gdImageSetBrush(gdImagePtr im, gdImagePtr bru
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGESETBRUSH", 2,
+            HB_ERR_FUNCNAME, 2,
             hb_paramError( 1 ), hb_paramError( 2 ) );
          return;
       }
@@ -1646,7 +1646,7 @@ HB_FUNC( GDIMAGESETTILE ) /* void gdImageSetTile(gdImagePtr im, gdImagePtr tile)
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGESETTILE", 2,
+            HB_ERR_FUNCNAME, 2,
             hb_paramError( 1 ), hb_paramError( 2 ) );
          return;
       }
@@ -1691,7 +1691,7 @@ HB_FUNC( GDIMAGESETSTYLE ) /* original: void gdImageSetStyle(gdImagePtr im, int
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGESETSTYLE", 2,
+            HB_ERR_FUNCNAME, 2,
             hb_paramError( 1 ), hb_paramError( 2 ) );
          return;
       }
@@ -1732,7 +1732,7 @@ HB_FUNC( GDIMAGESETTHICKNESS ) /* void gdImageSetThickness(gdImagePtr im, int th
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGESETTHICKNESS", 2,
+            HB_ERR_FUNCNAME, 2,
             hb_paramError( 1 ), hb_paramError( 2 ) );
          return;
       }
@@ -1766,7 +1766,7 @@ HB_FUNC( GDIMAGEALPHABLENDING ) /* void gdImageAlphaBlending(gdImagePtr im, int
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGEALPHABLENDING", 2,
+            HB_ERR_FUNCNAME, 2,
             hb_paramError( 1 ), hb_paramError( 2 ) );
          return;
       }
@@ -1800,7 +1800,7 @@ HB_FUNC( GDIMAGESAVEALPHA ) /* void gdImageSaveAlpha(gdImagePtr im, int saveFlag
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGESAVEALPHA", 2,
+            HB_ERR_FUNCNAME, 2,
             hb_paramError( 1 ), hb_paramError( 2 ) );
          return;
       }
@@ -1840,7 +1840,7 @@ HB_FUNC( GDIMAGESETCLIP ) /* void gdImageSetClip(gdImagePtr im, int x1, int y1,
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGESETCLIP", 5,
+            HB_ERR_FUNCNAME, 5,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ),
             hb_paramError( 5 ) );
          return;
@@ -1883,7 +1883,7 @@ HB_FUNC( GDIMAGEGETCLIP ) /* original: void gdImageGetClip(gdImagePtr im, int *x
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGEGETCLIP", 1,
+            HB_ERR_FUNCNAME, 1,
             hb_paramError( 1 ) );
          return;
       }
@@ -1917,7 +1917,7 @@ HB_FUNC( GDIMAGECOLORSTOTAL ) /* int gdImageColorsTotal(gdImagePtr im) */
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGECOLORSTOTAL", 1,
+            HB_ERR_FUNCNAME, 1,
             hb_paramError( 1 ) );
          return;
       }
@@ -1951,7 +1951,7 @@ HB_FUNC( GDIMAGEALPHA ) /* int gdImageAlpha(gdImagePtr im, int color) */
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGEALPHA", 2,
+            HB_ERR_FUNCNAME, 2,
             hb_paramError( 1 ), hb_paramError( 2 ) );
          return;
       }
@@ -1985,7 +1985,7 @@ HB_FUNC( GDIMAGERED ) /* int gdImageRed(gdImagePtr im, int color) */
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGERED", 2,
+            HB_ERR_FUNCNAME, 2,
             hb_paramError( 1 ), hb_paramError( 2 ) );
          return;
       }
@@ -2019,7 +2019,7 @@ HB_FUNC( GDIMAGEGREEN ) /* int gdImageGreen(gdImagePtr im, int color) */
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGEGREEN", 2,
+            HB_ERR_FUNCNAME, 2,
             hb_paramError( 1 ), hb_paramError( 2 ) );
          return;
       }
@@ -2053,7 +2053,7 @@ HB_FUNC( GDIMAGEBLUE ) /* int gdImageBlue(gdImagePtr im, int color) */
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGEBLUE", 2,
+            HB_ERR_FUNCNAME, 2,
             hb_paramError( 1 ), hb_paramError( 2 ) );
          return;
       }
@@ -2082,7 +2082,7 @@ HB_FUNC( GDIMAGESX ) /* int gdImageSX(gdImagePtr im) */
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGESX", 1,
+            HB_ERR_FUNCNAME, 1,
             hb_paramError( 1 ) );
          return;
       }
@@ -2111,7 +2111,7 @@ HB_FUNC( GDIMAGESY ) /* int gdImageSX(gdImagePtr im) */
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGESY", 1,
+            HB_ERR_FUNCNAME, 1,
             hb_paramError( 1 ) );
          return;
       }
@@ -2147,7 +2147,7 @@ HB_FUNC( GDIMAGEGETPIXEL ) /* int gdImageGetPixel(gdImagePtr im, int x, int y) *
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGEGETPIXEL", 3,
+            HB_ERR_FUNCNAME, 3,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ) );
          return;
       }
@@ -2183,7 +2183,7 @@ HB_FUNC( GDIMAGEBOUNDSSAFE ) /* int gdImageBoundsSafe(gdImagePtr im, int x, int
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGEBOUNDSSAFE", 3,
+            HB_ERR_FUNCNAME, 3,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ) );
          return;
       }
@@ -2212,7 +2212,7 @@ HB_FUNC( GDIMAGEGETINTERLACED ) /* int gdImageGetInterlaced(gdImagePtr im) */
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGEGETINTERLACED", 3,
+            HB_ERR_FUNCNAME, 3,
             hb_paramError( 1 ) );
          return;
       }
@@ -2241,7 +2241,7 @@ HB_FUNC( GDIMAGEGETTRANSPARENT ) /* int gdImageGetTransparent(gdImagePtr im) */
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGEGETTRANSPARENT", 1,
+            HB_ERR_FUNCNAME, 1,
             hb_paramError( 1 ) );
          return;
       }
@@ -2270,7 +2270,7 @@ HB_FUNC( GDIMAGETRUECOLOR ) /* int gdImageTrueColor(gdImagePtr im) */
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGETRUECOLOR", 1,
+            HB_ERR_FUNCNAME, 1,
             hb_paramError( 1 ) );
          return;
       }
@@ -2308,7 +2308,7 @@ HB_FUNC( GDIMAGETRUECOLORTOPALETTE ) /* void gdImageTrueColorToPalette (gdImageP
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGETRUECOLORTOPALETTE", 3,
+            HB_ERR_FUNCNAME, 3,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ) );
          return;
       }
@@ -2350,7 +2350,7 @@ HB_FUNC( GDIMAGECREATEPALETTEFROMTRUECOLOR ) /* gdImagePtr gdImageCreatePaletteF
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGECREATEPALETTEFROMTRUECOLOR", 3,
+            HB_ERR_FUNCNAME, 3,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ) );
          return;
       }
@@ -2386,7 +2386,7 @@ HB_FUNC( GDIMAGEPALETTEPIXEL ) /* int gdImagePalettePixel(gdImagePtr im, int x,
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGEPALETTEPIXEL", 3,
+            HB_ERR_FUNCNAME, 3,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ) );
          return;
       }
@@ -2422,7 +2422,7 @@ HB_FUNC( GDIMAGETRUECOLORPIXEL ) /* int gdImageTrueColorPixel(gdImagePtr im, int
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGETRUECOLORPIXEL", 3,
+            HB_ERR_FUNCNAME, 3,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ) );
          return;
       }
@@ -2451,7 +2451,7 @@ HB_FUNC( GDIMAGEGETTHICKNESS ) /* void gdImageGetThickness(gdImagePtr im) */
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGEGETTHICKNESS", 1,
+            HB_ERR_FUNCNAME, 1,
             hb_paramError( 1 ) );
          return;
       }
@@ -2584,7 +2584,7 @@ HB_FUNC( GDIMAGESTRING ) /* void gdImageChar(gdImagePtr im, gdFontPtr font, int
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGESTRING", 6,
+            HB_ERR_FUNCNAME, 6,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ),
             hb_paramError( 5 ), hb_paramError( 6 ) );
          return;
@@ -2644,7 +2644,7 @@ HB_FUNC( GDIMAGESTRINGUP ) /* void gdImageCharUp(gdImagePtr im, gdFontPtr font,
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGESTRINGUP", 6,
+            HB_ERR_FUNCNAME, 6,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ),
             hb_paramError( 5 ), hb_paramError( 6 ) );
          return;
@@ -2782,7 +2782,7 @@ HB_FUNC( GDIMAGESTRINGFTEX )
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGESTRINGFTEX", 12,
+            HB_ERR_FUNCNAME, 12,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ),
             hb_paramError( 5 ), hb_paramError( 6 ), hb_paramError( 7 ), hb_paramError( 8 ),
             hb_paramError( 9 ), hb_paramError( 10 ), hb_paramError( 11 ), hb_paramError( 12 ) );
@@ -2861,7 +2861,7 @@ HB_FUNC( GDIMAGESTRINGFTCIRCLE ) /* char *gdImageStringFTCircle(gdImagePtr im, i
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGESTRINGFTCIRCLE", 11,
+            HB_ERR_FUNCNAME, 11,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ),
             hb_paramError( 5 ), hb_paramError( 6 ), hb_paramError( 7 ), hb_paramError( 8 ),
             hb_paramError( 9 ), hb_paramError( 10 ), hb_paramError( 11 ) );
@@ -2908,7 +2908,7 @@ HB_FUNC( GDFONTGETWIDTH )
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDFONTGETWIDTH", 1,
+            HB_ERR_FUNCNAME, 1,
             hb_paramError( 1 ) );
          return;
       }
@@ -2937,7 +2937,7 @@ HB_FUNC( GDFONTGETHEIGHT )
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDFONTGETHEIGHT", 1,
+            HB_ERR_FUNCNAME, 1,
             hb_paramError( 1 ) );
          return;
       }
@@ -2983,7 +2983,7 @@ HB_FUNC( GDIMAGECOLORALLOCATE ) /* int gdImageColorAllocate(gdImagePtr im, int r
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGECOLORALLOCATE", 4,
+            HB_ERR_FUNCNAME, 4,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ) );
          return;
       }
@@ -3017,7 +3017,7 @@ HB_FUNC( GDIMAGECOLORDEALLOCATE ) /* void gdImageColorDeallocate(gdImagePtr im,
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGECOLORDEALLOCATE", 2,
+            HB_ERR_FUNCNAME, 2,
             hb_paramError( 1 ), hb_paramError( 2 ) );
          return;
       }
@@ -3064,7 +3064,7 @@ HB_FUNC( GDIMAGECOLORALLOCATEALPHA ) /* int gdImageColorAllocateAlpha(gdImagePtr
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGECOLORALLOCATEALPHA", 5,
+            HB_ERR_FUNCNAME, 5,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ),
             hb_paramError( 5 ) );
          return;
@@ -3107,7 +3107,7 @@ HB_FUNC( GDIMAGECOLORCLOSEST ) /* int gdImageColorClosest(gdImagePtr im, int r,
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGECOLORCLOSEST", 4,
+            HB_ERR_FUNCNAME, 4,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ) );
          return;
       }
@@ -3154,7 +3154,7 @@ HB_FUNC( GDIMAGECOLORCLOSESTALPHA ) /* int gdImageColorClosestAlpha(gdImagePtr i
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGECOLORCLOSESTALPHA", 5,
+            HB_ERR_FUNCNAME, 5,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ),
             hb_paramError( 5 ) );
          return;
@@ -3197,7 +3197,7 @@ HB_FUNC( GDIMAGECOLORCLOSESTHWB ) /*  gdImageColorClosestHWB(gdImagePtr im, int
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGECOLORCLOSESTHWB", 4,
+            HB_ERR_FUNCNAME, 4,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ) );
          return;
       }
@@ -3239,7 +3239,7 @@ HB_FUNC( GDIMAGECOLOREXACT ) /* int gdImageColorExact(gdImagePtr im, int r, int
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGECOLOREXACT", 4,
+            HB_ERR_FUNCNAME, 4,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ) );
          return;
       }
@@ -3281,7 +3281,7 @@ HB_FUNC( GDIMAGECOLORRESOLVE ) /* int gdImageColorResolve(gdImagePtr im, int r,
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGECOLORRESOLVE", 4,
+            HB_ERR_FUNCNAME, 4,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ) );
          return;
       }
@@ -3328,7 +3328,7 @@ HB_FUNC( GDIMAGECOLORRESOLVEALPHA ) /* int gdImageColorResolveAlpha(gdImagePtr i
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGECOLORRESOLVEALPHA", 5,
+            HB_ERR_FUNCNAME, 5,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ),
             hb_paramError( 5 ) );
          return;
@@ -3363,7 +3363,7 @@ HB_FUNC( GDIMAGECOLORTRANSPARENT ) /* void gdImageColorTransparent(gdImagePtr im
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGECOLORTRANSPARENT", 2,
+            HB_ERR_FUNCNAME, 2,
             hb_paramError( 1 ), hb_paramError( 2 ) );
          return;
       }
@@ -3400,7 +3400,7 @@ HB_FUNC( GDTRUECOLOR ) /* int gdTrueColor(int red, int green, int blue) */
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDTRUECOLOR", 3,
+            HB_ERR_FUNCNAME, 3,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ) );
          return;
       }
@@ -3439,7 +3439,7 @@ HB_FUNC( GDTRUECOLORALPHA ) /* int gdTrueColorAlpha(int red, int green, int blue
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDTRUECOLORALPHA", 4,
+            HB_ERR_FUNCNAME, 4,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ) );
          return;
       }
@@ -3496,7 +3496,7 @@ HB_FUNC( GDIMAGECOPY ) /* void gdImageCopy(gdImagePtr dst, gdImagePtr src, int d
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGECOPY", 8,
+            HB_ERR_FUNCNAME, 8,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ),
             hb_paramError( 5 ), hb_paramError( 6 ), hb_paramError( 7 ), hb_paramError( 8 ) );
          return;
@@ -3559,7 +3559,7 @@ HB_FUNC( GDIMAGECOPYRESIZED ) /* void gdImageCopyResized(gdImagePtr dst, gdImage
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGECOPYRESIZED", 10,
+            HB_ERR_FUNCNAME, 10,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ),
             hb_paramError( 5 ), hb_paramError( 6 ), hb_paramError( 7 ), hb_paramError( 8 ),
             hb_paramError( 9 ), hb_paramError( 10 ) );
@@ -3623,7 +3623,7 @@ HB_FUNC( GDIMAGECOPYRESAMPLED ) /* void gdImageCopyResampled(gdImagePtr dst, gdI
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGECOPYRESAMPLED", 10,
+            HB_ERR_FUNCNAME, 10,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ),
             hb_paramError( 5 ), hb_paramError( 6 ), hb_paramError( 7 ), hb_paramError( 8 ),
             hb_paramError( 9 ), hb_paramError( 10 ) );
@@ -3683,7 +3683,7 @@ HB_FUNC( GDIMAGECOPYROTATED ) /* void gdImageCopyRotated(gdImagePtr dst, gdImage
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGECOPYROTATED", 9,
+            HB_ERR_FUNCNAME, 9,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ),
             hb_paramError( 5 ), hb_paramError( 6 ), hb_paramError( 7 ), hb_paramError( 8 ),
             hb_paramError( 9 ) );
@@ -3742,7 +3742,7 @@ HB_FUNC( GDIMAGECOPYMERGE ) /* void gdImageCopyMerge(gdImagePtr dst, gdImagePtr
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGECOPYMERGE", 9,
+            HB_ERR_FUNCNAME, 9,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ),
             hb_paramError( 5 ), hb_paramError( 6 ), hb_paramError( 7 ), hb_paramError( 8 ),
             hb_paramError( 9 ) );
@@ -3801,7 +3801,7 @@ HB_FUNC( GDIMAGECOPYMERGEGRAY ) /* void gdImageCopyMergeGray(gdImagePtr dst, gdI
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGECOPYMERGEGRAY", 9,
+            HB_ERR_FUNCNAME, 9,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ),
             hb_paramError( 5 ), hb_paramError( 6 ), hb_paramError( 7 ), hb_paramError( 8 ),
             hb_paramError( 9 ) );
@@ -3835,7 +3835,7 @@ HB_FUNC( GDIMAGEPALETTECOPY ) /* void gdImagePaletteCopy(gdImagePtr dst, gdImage
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGECOPYMERGEGRAY", 2,
+            HB_ERR_FUNCNAME, 2,
             hb_paramError( 1 ), hb_paramError( 2 ) );
          return;
       }
@@ -3869,7 +3869,7 @@ HB_FUNC( GDIMAGESQUARETOCIRCLE ) /* void gdImageSquareToCircle(gdImagePtr im, in
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGESQUARETOCIRCLE", 2,
+            HB_ERR_FUNCNAME, 2,
             hb_paramError( 1 ), hb_paramError( 2 ) );
          return;
       }
@@ -3903,7 +3903,7 @@ HB_FUNC( GDIMAGESHARPEN ) /* void gdImageSharpen(gdImagePtr im, int pct) */
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGESHARPEN", 2,
+            HB_ERR_FUNCNAME, 2,
             hb_paramError( 1 ), hb_paramError( 2 ) );
          return;
       }
@@ -3939,7 +3939,7 @@ HB_FUNC( GDIMAGECOMPARE ) /* int gdImageCompare(gdImagePtr im1, gdImagePtr im2)
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGECOMPARE", 2,
+            HB_ERR_FUNCNAME, 2,
             hb_paramError( 1 ), hb_paramError( 2 ) );
          return;
       }
@@ -3973,7 +3973,7 @@ HB_FUNC( GDIMAGEINTERLACE ) /* void gdImageInterlace(gdImagePtr im, int interlac
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGEINTERLACE", 2,
+            HB_ERR_FUNCNAME, 2,
             hb_paramError( 1 ), hb_paramError( 2 ) );
          return;
       }
@@ -4054,7 +4054,7 @@ HB_FUNC( GDIMAGEGIFANIMBEGIN )
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGEGIFANIMBEGIN", 3,
+            HB_ERR_FUNCNAME, 3,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ) );
          return;
       }
@@ -4121,7 +4121,7 @@ HB_FUNC( GDIMAGEGIFANIMADD )
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGEGIFANIMADD", 8,
+            HB_ERR_FUNCNAME, 8,
             hb_paramError( 1 ), hb_paramError( 2 ), hb_paramError( 3 ), hb_paramError( 4 ),
             hb_paramError( 5 ), hb_paramError( 6 ), hb_paramError( 7 ), hb_paramError( 8 )
          );
@@ -4171,7 +4171,7 @@ HB_FUNC( GDIMAGEGIFANIMEND )
       /* Parameter error */
       {
          hb_errRT_BASE_SubstR( EG_ARG, 0, NULL,
-            "GDIMAGEGIFANIMEND", 1,
+            HB_ERR_FUNCNAME, 1,
             hb_paramError( 1 )
          );
          return;
diff --git a/harbour/contrib/hbsqlit3/hbsqlit3.c b/harbour/contrib/hbsqlit3/hbsqlit3.c
index 3af57895bb..ec637cac7e 100644
--- a/harbour/contrib/hbsqlit3/hbsqlit3.c
+++ b/harbour/contrib/hbsqlit3/hbsqlit3.c
@@ -139,7 +139,7 @@ HB_FUNC( SQLITE3_EXTENDED_RESULT_CODES )
    if( db )
       hb_retni( sqlite3_extended_result_codes( db, hb_parl( 2 ) ) );
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_EXTENDED_RESULT_CODES", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 /*
@@ -158,7 +158,7 @@ HB_FUNC( SQLITE3_ERRCODE )
    if( db )
       hb_retni( sqlite3_errcode( db ) );
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_ERRCODE", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 HB_FUNC( SQLITE3_ERRMSG )
@@ -168,7 +168,7 @@ HB_FUNC( SQLITE3_ERRMSG )
    if( db )
       hb_retc( sqlite3_errmsg( db ) );
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_ERRMSG", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 /*
@@ -195,7 +195,7 @@ HB_FUNC( SQLITE3_LAST_INSERT_ROWID )
    if( db )
       hb_retnint( sqlite3_last_insert_rowid( db ) );
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_LAST_INSERT_ROWID", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 /*
@@ -322,7 +322,7 @@ HB_FUNC( SQLITE3_EXEC )
       hb_retni( rc );
    }
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_EXEC", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 /*
@@ -359,10 +359,10 @@ HB_FUNC( SQLITE3_PREPARE )
          }
       }
       else
-         hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_PREPARE", 1, hb_paramError( 2 ) );
+         hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 2 ) );
    }
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_PREPARE", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 /*
@@ -378,7 +378,7 @@ HB_FUNC( SQLITE3_DB_HANDLE )
    if( pStmt )
       hb_retsqlite3( sqlite3_db_handle( pStmt ) );
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_DB_HANDLE", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 /*
@@ -394,7 +394,7 @@ HB_FUNC( SQLITE3_STEP )
    if( pStmt )
       hb_retni( sqlite3_step( pStmt ) );
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_STEP", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 /*
@@ -414,7 +414,7 @@ HB_FUNC( SQLITE3_CLEAR_BINDINGS )
    if( pStmt )
       hb_retni( sqlite3_clear_bindings( pStmt ) );
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_CLEAR_BINDINGS", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 /*
@@ -430,7 +430,7 @@ HB_FUNC( SQLITE3_RESET )
    if( pStmt )
       hb_retni( sqlite3_reset( pStmt ) );
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_RESET", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 /*
@@ -446,7 +446,7 @@ HB_FUNC( SQLITE3_FINALIZE )
    if( pStmt )
       hb_retni( sqlite3_finalize( pStmt ) );
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_FINALIZE", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 /*
@@ -478,7 +478,7 @@ HB_FUNC( SQLITE3_BIND_BLOB )
    if( pStmt )
       hb_retni( sqlite3_bind_blob( pStmt, hb_parni( 2 ), ( const char * ) hb_parcx( 3 ), hb_parcsiz( 3 ) - 1, SQLITE_TRANSIENT ) );
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_BIND_BLOB", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 HB_FUNC( SQLITE3_BIND_DOUBLE )
@@ -488,7 +488,7 @@ HB_FUNC( SQLITE3_BIND_DOUBLE )
    if( pStmt )
       hb_retni( sqlite3_bind_double( pStmt, hb_parni( 2 ), hb_parnd( 3 ) ) );
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_BIND_DOUBLE", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 HB_FUNC( SQLITE3_BIND_INT )
@@ -498,7 +498,7 @@ HB_FUNC( SQLITE3_BIND_INT )
    if( pStmt )
       hb_retni( sqlite3_bind_int( pStmt, hb_parni( 2 ), hb_parni( 3 ) ) );
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_BIND_INT", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 HB_FUNC( SQLITE3_BIND_INT64 )
@@ -509,7 +509,7 @@ HB_FUNC( SQLITE3_BIND_INT64 )
    if( pStmt )
       hb_retni( sqlite3_bind_int64( pStmt, hb_parni( 2 ), int64 ) );
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_BIND_INT64", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 HB_FUNC( SQLITE3_BIND_NULL )
@@ -519,7 +519,7 @@ HB_FUNC( SQLITE3_BIND_NULL )
    if( pStmt )
       hb_retni( sqlite3_bind_null( pStmt, hb_parni( 2 ) ) );
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_BIND_NULL", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 HB_FUNC( SQLITE3_BIND_TEXT )
@@ -529,7 +529,7 @@ HB_FUNC( SQLITE3_BIND_TEXT )
    if( pStmt )
       hb_retni( sqlite3_bind_text( pStmt, hb_parni( 2 ), ( const char * ) hb_parc( 3 ), hb_parclen( 3 ), SQLITE_TRANSIENT ) );
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_BIND_TEXT", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 HB_FUNC( SQLITE3_BIND_ZEROBLOB )
@@ -539,7 +539,7 @@ HB_FUNC( SQLITE3_BIND_ZEROBLOB )
    if( pStmt )
       hb_retni( sqlite3_bind_zeroblob( pStmt, hb_parni( 2 ), hb_parni( 3 ) ) );
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_BIND_ZEROBLOB", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 /*
@@ -555,7 +555,7 @@ HB_FUNC( SQLITE3_BIND_PARAMETER_COUNT )
    if( pStmt )
       hb_retni( sqlite3_bind_parameter_count( pStmt ) );
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_BIND_PARAMETER_COUNT", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 /*
@@ -571,7 +571,7 @@ HB_FUNC( SQLITE3_BIND_PARAMETER_INDEX )
    if( pStmt )
       hb_retni( sqlite3_bind_parameter_index( pStmt, hb_parc( 2 ) ) );
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_BIND_PARAMETER_INDEX", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 /*
@@ -587,7 +587,7 @@ HB_FUNC( SQLITE3_BIND_PARAMETER_NAME )
    if( pStmt )
       hb_retc( sqlite3_bind_parameter_name( pStmt, hb_parni( 2 ) ) );
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_BIND_PARAMETER_NAME", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 /*
@@ -603,7 +603,7 @@ HB_FUNC( SQLITE3_CHANGES )
    if( db )
       hb_retni( sqlite3_changes(db) );
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_CHANGES", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 /*
@@ -619,7 +619,7 @@ HB_FUNC( SQLITE3_TOTAL_CHANGES )
    if( db )
       hb_retni( sqlite3_total_changes(db) );
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_TOTAL_CHANGES", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 /*
@@ -635,7 +635,7 @@ HB_FUNC( SQLITE3_COLUMN_COUNT )
    if( pStmt )
       hb_retni( sqlite3_column_count( pStmt ) );
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_COLUMN_COUNT", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 /*
@@ -661,7 +661,7 @@ HB_FUNC( SQLITE3_COLUMN_TYPE )
    if( pStmt )
       hb_retni( sqlite3_column_type( pStmt, hb_parni( 2 ) - 1 ) );
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_COLUMN_TYPE", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 HB_FUNC( SQLITE3_COLUMN_DECLTYPE )
@@ -671,7 +671,7 @@ HB_FUNC( SQLITE3_COLUMN_DECLTYPE )
    if( pStmt )
       hb_retc( sqlite3_column_decltype( pStmt, hb_parni( 2 ) - 1 ) );
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_COLUMN_DECLTYPE", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 /*
@@ -687,7 +687,7 @@ HB_FUNC( SQLITE3_COLUMN_NAME )
    if( pStmt )
       hb_retc( sqlite3_column_name( pStmt, hb_parni( 2 ) - 1 ) );
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_COLUMN_NAME", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 /*
@@ -710,7 +710,7 @@ HB_FUNC( SQLITE3_COLUMN_BYTES )
    if( pStmt )
       hb_retni( sqlite3_column_bytes( pStmt, hb_parni( 2 ) - 1 ) );
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_COLUMN_BYTES", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 HB_FUNC( SQLITE3_COLUMN_BLOB )
@@ -725,7 +725,7 @@ HB_FUNC( SQLITE3_COLUMN_BLOB )
                   sqlite3_column_bytes( pStmt, index ) );
    }
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_COLUMN_BLOB", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 HB_FUNC( SQLITE3_COLUMN_DOUBLE )
@@ -735,7 +735,7 @@ HB_FUNC( SQLITE3_COLUMN_DOUBLE )
    if( pStmt )
       hb_retnd( sqlite3_column_double( pStmt, hb_parni( 2 ) - 1 ) );
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_COLUMN_DOUBLE", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 HB_FUNC( SQLITE3_COLUMN_INT )
@@ -745,7 +745,7 @@ HB_FUNC( SQLITE3_COLUMN_INT )
    if( pStmt )
       hb_retni( sqlite3_column_int( pStmt, hb_parni( 2 ) - 1 ) );
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_COLUMN_INT", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 HB_FUNC( SQLITE3_COLUMN_INT64 )
@@ -755,7 +755,7 @@ HB_FUNC( SQLITE3_COLUMN_INT64 )
    if( pStmt )
       hb_retnint( sqlite3_column_int64( pStmt, hb_parni( 2 ) - 1 ) );
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_COLUMN_INT64", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 HB_FUNC( SQLITE3_COLUMN_TEXT )
@@ -769,7 +769,7 @@ HB_FUNC( SQLITE3_COLUMN_TEXT )
                   sqlite3_column_bytes( pStmt, index ) );
    }
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_COLUMN_TEXT", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 /*
@@ -785,7 +785,7 @@ HB_FUNC( SQLITE3_ENABLE_LOAD_EXTENSION )
    if( db )
       hb_retni( sqlite3_enable_load_extension( db, hb_parl( 2 ) ) );
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_ENABLE_LOAD_EXTENSION", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 /*
@@ -812,7 +812,7 @@ HB_FUNC( SQLITE3_BUSY_TIMEOUT )
    if( db )
       hb_retni( sqlite3_busy_timeout( db, hb_parni( 2 ) ) );
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_ENABLE_LOAD_EXTENSION", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 /*
@@ -869,7 +869,7 @@ HB_FUNC( SQLITE3_GET_TABLE )
       hb_itemReturnRelease( pResultList );
    }
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_GET_TABLE", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 #ifdef SQLITE_ENABLE_COLUMN_METADATA
@@ -924,7 +924,7 @@ HB_FUNC( SQLITE3_TABLE_COLUMN_METADATA )
       }
    }
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_TABLE_COLUMN_METADATA", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 /*
@@ -942,7 +942,7 @@ HB_FUNC( SQLITE3_COLUMN_DATABASE_NAME )
    if( pStmt )
       hb_retc( sqlite3_column_database_name( pStmt, hb_parni( 2 ) - 1 ) );
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_COLUMN_DATABASE_NAME", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 HB_FUNC( SQLITE3_COLUMN_TABLE_NAME )
@@ -952,7 +952,7 @@ HB_FUNC( SQLITE3_COLUMN_TABLE_NAME )
    if( pStmt )
       hb_retc( sqlite3_column_table_name( pStmt, hb_parni( 2 ) - 1 ) );
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_COLUMN_TABLE_NAME", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 HB_FUNC( SQLITE3_COLUMN_ORIGIN_NAME )
@@ -962,7 +962,7 @@ HB_FUNC( SQLITE3_COLUMN_ORIGIN_NAME )
    if( pStmt )
       hb_retc( sqlite3_column_origin_name( pStmt, hb_parni( 2 ) - 1 ) );
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_COLUMN_ORIGIN_NAME", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 #endif
@@ -1014,7 +1014,7 @@ HB_FUNC( SQLITE3_BLOB_CLOSE )
    if( pBlob )
       hb_retni( sqlite3_blob_close( pBlob ) );
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_BLOB_CLOSE", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 /*
@@ -1028,7 +1028,7 @@ HB_FUNC( SQLITE3_BLOB_BYTES )
    if( pBlob )
       hb_retni( sqlite3_blob_bytes( pBlob ) );
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_BLOB_BYTES", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 /*
@@ -1059,7 +1059,7 @@ HB_FUNC( SQLITE3_BLOB_READ )
          hb_xfree( buffer );
    }
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_BLOB_READ", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 /*
@@ -1080,7 +1080,7 @@ HB_FUNC( SQLITE3_BLOB_WRITE )
       hb_retni( sqlite3_blob_write( pBlob, hb_parcx( 2 ), iLen, hb_parni( 4 ) ) );
    }
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_BLOB_WRITE", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 /*
@@ -1096,7 +1096,7 @@ HB_FUNC( SQLITE3_GET_AUTOCOMMIT )
    if( db )
       hb_retl( sqlite3_get_autocommit( db ) );
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_GET_AUTOCOMMIT", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 /*
@@ -1152,7 +1152,7 @@ HB_FUNC( SQLITE3_PROFILE )
    if( db )
       sqlite3_profile( db, hb_parl( 2 ) ? SQL3ProfileLog : NULL, NULL );
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_PROFILE", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 HB_FUNC( SQLITE3_TRACE )
@@ -1162,7 +1162,7 @@ HB_FUNC( SQLITE3_TRACE )
    if( db )
       sqlite3_trace( db, hb_parl( 2 ) ? SQL3TraceLog : NULL, NULL );
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "SQLITE3_TRACE", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 /*
diff --git a/harbour/contrib/hbtip/encmthd.c b/harbour/contrib/hbtip/encmthd.c
index 6fd1af0088..b8d9821237 100644
--- a/harbour/contrib/hbtip/encmthd.c
+++ b/harbour/contrib/hbtip/encmthd.c
@@ -71,7 +71,7 @@ HB_FUNC( TIPENCODERBASE64_ENCODE )
    if ( ! cData )
    {
       hb_errRT_BASE( EG_ARG, 3012, NULL,
-         "TIPENCODERBASE64_ENCODE", 1, hb_paramError(1) );
+         HB_ERR_FUNCNAME, 1, hb_paramError(1) );
       return;
    }
 
@@ -197,7 +197,7 @@ HB_FUNC( TIPENCODERBASE64_DECODE )
    if ( ! cData )
    {
       hb_errRT_BASE( EG_ARG, 3012, NULL,
-         "TIPENCODERBASE64_DECODE", 1, hb_paramError(1) );
+         HB_ERR_FUNCNAME, 1, hb_paramError(1) );
       return;
    }
 
@@ -295,7 +295,7 @@ HB_FUNC( TIPENCODERQP_ENCODE )
    if ( ! cData )
    {
       hb_errRT_BASE( EG_ARG, 3012, NULL,
-         "TIPENCODEQP_ENCODE", 1, hb_paramError(1) );
+         HB_ERR_FUNCNAME, 1, hb_paramError(1) );
       return;
    }
 
@@ -368,7 +368,7 @@ HB_FUNC( TIPENCODERQP_DECODE )
    if ( ! cData )
    {
       hb_errRT_BASE( EG_ARG, 3012, NULL,
-         "TIPENCODERQP_DECODE", 1, hb_paramError(1) );
+         HB_ERR_FUNCNAME, 1, hb_paramError(1) );
       return;
    }
 
@@ -450,7 +450,7 @@ HB_FUNC( TIPENCODERURL_ENCODE )
    if ( ! cData )
    {
       hb_errRT_BASE( EG_ARG, 3012, NULL,
-         "TIPENCODERBASE64_ENCODE", 1, hb_paramError(1) );
+         HB_ERR_FUNCNAME, 1, hb_paramError(1) );
       return;
    }
 
@@ -511,7 +511,7 @@ HB_FUNC( TIPENCODERURL_DECODE )
    if ( ! cData )
    {
       hb_errRT_BASE( EG_ARG, 3012, NULL,
-         "TIPENCODERBASE64_DECODE", 1, hb_paramError(1) );
+         HB_ERR_FUNCNAME, 1, hb_paramError(1) );
       return;
    }
 
diff --git a/harbour/contrib/hbtip/utils.c b/harbour/contrib/hbtip/utils.c
index 6b2e78e83a..d8bc2bc5c9 100644
--- a/harbour/contrib/hbtip/utils.c
+++ b/harbour/contrib/hbtip/utils.c
@@ -624,8 +624,7 @@ HB_FUNC( TIP_FILEMIMETYPE )
 
    if ( pFile == NULL )
    {
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "TIP_FILEMIMETYPE",
-         1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
       return;
    }
 
@@ -685,8 +684,7 @@ HB_FUNC( TIP_MIMETYPE )
 
    if ( pData == NULL )
    {
-      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, "TIP_MIMETYPE",
-         1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 0, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
       return;
    }
 
@@ -843,8 +841,7 @@ HB_FUNC( TIP_HTMLSPECIALCHARS )
    
    if ( ! cData )
    {
-      hb_errRT_BASE( EG_ARG, 3012, NULL,
-         "TIP_HTMLSPECIALCHARS", 1, hb_paramError(1) );
+      hb_errRT_BASE( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, 1, hb_paramError(1) );
       return;
    }
 
diff --git a/harbour/contrib/xhb/cstructc.c b/harbour/contrib/xhb/cstructc.c
index 54362b968b..682f5d7883 100644
--- a/harbour/contrib/xhb/cstructc.c
+++ b/harbour/contrib/xhb/cstructc.c
@@ -1422,7 +1422,7 @@ HB_FUNC( HB_POINTER2STRING )
       hb_retclen( (char *) (HB_PTRDIFF) hb_itemGetNL( pPointer ), (ULONG) hb_itemGetNL( pLen ) );
    }
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 1099, NULL, "HB_Pointer2String", 2, hb_paramError( 1 ), hb_paramError( 2 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 1099, NULL, HB_ERR_FUNCNAME, 2, hb_paramError( 1 ), hb_paramError( 2 ) );
 }
 
 HB_FUNC( HB_STRING2POINTER )
@@ -1432,7 +1432,7 @@ HB_FUNC( HB_STRING2POINTER )
    if( pszString )
       hb_retptr( ( void * ) pszString );
    else
-      hb_errRT_BASE_SubstR( EG_ARG, 1099, NULL, "HB_String2Pointer", 1, hb_paramError( 1 ) );
+      hb_errRT_BASE_SubstR( EG_ARG, 1099, NULL, HB_ERR_FUNCNAME, 1, hb_paramError( 1 ) );
 }
 
 
diff --git a/harbour/contrib/xhb/xhbwith.c b/harbour/contrib/xhb/xhbwith.c
index 8e36a1c8f8..9ed8d75807 100644
--- a/harbour/contrib/xhb/xhbwith.c
+++ b/harbour/contrib/xhb/xhbwith.c
@@ -107,5 +107,5 @@ HB_FUNC( HB_RESETWITH )
    if( hb_pcount() >= 1 && pItem )
       hb_itemMove( pItem, hb_stackItemFromBase( 1 ) );
    else
-      hb_errRT_BASE( EG_ARG, 1607, NULL, "HB_RESETWITH", 0, NULL );
+      hb_errRT_BASE( EG_ARG, 1607, NULL, HB_ERR_FUNCNAME, 0, NULL );
 }