diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 00cfb9a732..540838100f 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,10 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-11-11 11:18 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
+  * contrib/*/doc/en/*.txt
+    ! Changed: $FUNCNAME$ => $NAME$.
+
 2012-11-11 19:47 UTC+0100 Viktor Szakats (harbour syenar.net)
   * extras/gfspell/gfspell.hbx
   * extras/gfspell/spell.prg
diff --git a/harbour/contrib/hbct/doc/en/addascii.txt b/harbour/contrib/hbct/doc/en/addascii.txt
index d6e40878b9..7fd091991e 100644
--- a/harbour/contrib/hbct/doc/en/addascii.txt
+++ b/harbour/contrib/hbct/doc/en/addascii.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ADDASCII()
    $CATEGORY$
       CT3 string functions
diff --git a/harbour/contrib/hbct/doc/en/asciisum.txt b/harbour/contrib/hbct/doc/en/asciisum.txt
index 400a8a4223..cfd16afb4b 100644
--- a/harbour/contrib/hbct/doc/en/asciisum.txt
+++ b/harbour/contrib/hbct/doc/en/asciisum.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ASCIISUM()
    $CATEGORY$
       CT3 string functions
diff --git a/harbour/contrib/hbct/doc/en/ascpos.txt b/harbour/contrib/hbct/doc/en/ascpos.txt
index 3b0db2e7ef..752d185f38 100644
--- a/harbour/contrib/hbct/doc/en/ascpos.txt
+++ b/harbour/contrib/hbct/doc/en/ascpos.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ASCPOS()
    $CATEGORY$
       CT3 string functions
@@ -43,7 +43,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       VALPOS()
    $CATEGORY$
       CT3 string functions
diff --git a/harbour/contrib/hbct/doc/en/atadjust.txt b/harbour/contrib/hbct/doc/en/atadjust.txt
index 78b71abf7f..71a13ecd12 100644
--- a/harbour/contrib/hbct/doc/en/atadjust.txt
+++ b/harbour/contrib/hbct/doc/en/atadjust.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ATADJUST()
    $CATEGORY$
       CT3 string functions
diff --git a/harbour/contrib/hbct/doc/en/atnum.txt b/harbour/contrib/hbct/doc/en/atnum.txt
index 92ff758765..bce36b60f5 100644
--- a/harbour/contrib/hbct/doc/en/atnum.txt
+++ b/harbour/contrib/hbct/doc/en/atnum.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       AFTERATNUM()
    $CATEGORY$
       CT3 string functions
@@ -59,7 +59,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       BEFORATNUM()
    $CATEGORY$
       CT3 string functions
@@ -115,7 +115,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ATNUM()
    $CATEGORY$
       CT3 string functions
diff --git a/harbour/contrib/hbct/doc/en/atrepl.txt b/harbour/contrib/hbct/doc/en/atrepl.txt
index 18e91e45e7..dbc143deff 100644
--- a/harbour/contrib/hbct/doc/en/atrepl.txt
+++ b/harbour/contrib/hbct/doc/en/atrepl.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ATREPL()
    $CATEGORY$
       CT3 string functions
diff --git a/harbour/contrib/hbct/doc/en/charevod.txt b/harbour/contrib/hbct/doc/en/charevod.txt
index 1e6758d179..953592161d 100644
--- a/harbour/contrib/hbct/doc/en/charevod.txt
+++ b/harbour/contrib/hbct/doc/en/charevod.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       CHAREVEN()
    $CATEGORY$
       CT3 string functions
@@ -39,7 +39,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       CHARODD()
    $CATEGORY$
       CT3 string functions
diff --git a/harbour/contrib/hbct/doc/en/charlihb.txt b/harbour/contrib/hbct/doc/en/charlihb.txt
index 723d9fe7af..d5722cbc11 100644
--- a/harbour/contrib/hbct/doc/en/charlihb.txt
+++ b/harbour/contrib/hbct/doc/en/charlihb.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       CHARSLIST()
    $CATEGORY$
       CT3 string functions
@@ -42,7 +42,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       CHARHIST()
    $CATEGORY$
       CT3 string functions
diff --git a/harbour/contrib/hbct/doc/en/charlist.txt b/harbour/contrib/hbct/doc/en/charlist.txt
index def4f29f55..2fcd132c29 100644
--- a/harbour/contrib/hbct/doc/en/charlist.txt
+++ b/harbour/contrib/hbct/doc/en/charlist.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       CHARLIST()
    $CATEGORY$
       CT3 string functions
@@ -41,7 +41,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       CHARNOLIST()
    $CATEGORY$
       CT3 string functions
diff --git a/harbour/contrib/hbct/doc/en/charmirr.txt b/harbour/contrib/hbct/doc/en/charmirr.txt
index fc0f622ba4..8d9ee8b0fd 100644
--- a/harbour/contrib/hbct/doc/en/charmirr.txt
+++ b/harbour/contrib/hbct/doc/en/charmirr.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       CHARMIRR()
    $CATEGORY$
       CT3 string functions
diff --git a/harbour/contrib/hbct/doc/en/charmix.txt b/harbour/contrib/hbct/doc/en/charmix.txt
index 7358401a51..8ea29a930a 100644
--- a/harbour/contrib/hbct/doc/en/charmix.txt
+++ b/harbour/contrib/hbct/doc/en/charmix.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       CHARMIX()
    $CATEGORY$
       CT3 string functions
diff --git a/harbour/contrib/hbct/doc/en/charone.txt b/harbour/contrib/hbct/doc/en/charone.txt
index 9946eab89c..8760f95c39 100644
--- a/harbour/contrib/hbct/doc/en/charone.txt
+++ b/harbour/contrib/hbct/doc/en/charone.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       CHARONE()
    $CATEGORY$
       CT3 string functions
@@ -47,7 +47,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       WORDONE()
    $CATEGORY$
       CT3 string functions
diff --git a/harbour/contrib/hbct/doc/en/charonly.txt b/harbour/contrib/hbct/doc/en/charonly.txt
index cecfb318da..8a749973e5 100644
--- a/harbour/contrib/hbct/doc/en/charonly.txt
+++ b/harbour/contrib/hbct/doc/en/charonly.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       CHARONLY()
    $CATEGORY$
       CT3 string functions
@@ -42,7 +42,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       WORDONLY()
    $CATEGORY$
       CT3 string functions
@@ -81,7 +81,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       CHARREM()
    $CATEGORY$
       CT3 string functions
@@ -119,7 +119,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       WORDREM()
    $CATEGORY$
       CT3 string functions
diff --git a/harbour/contrib/hbct/doc/en/charop.txt b/harbour/contrib/hbct/doc/en/charop.txt
index e88ff6be6b..6b642b882f 100644
--- a/harbour/contrib/hbct/doc/en/charop.txt
+++ b/harbour/contrib/hbct/doc/en/charop.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       CHARADD()
    $CATEGORY$
       CT3 string functions
@@ -53,7 +53,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       CHARAND()
    $CATEGORY$
       CT3 string functions
@@ -102,7 +102,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       CHARNOT()
    $CATEGORY$
       CT3 string functions
@@ -147,7 +147,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       CHAROR()
    $CATEGORY$
       CT3 string functions
@@ -196,7 +196,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       CHARXOR()
    $CATEGORY$
       CT3 string functions
diff --git a/harbour/contrib/hbct/doc/en/charophb.txt b/harbour/contrib/hbct/doc/en/charophb.txt
index ab52c84837..856e246ce7 100644
--- a/harbour/contrib/hbct/doc/en/charophb.txt
+++ b/harbour/contrib/hbct/doc/en/charophb.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       CHARSUB()
    $CATEGORY$
       CT3 string functions
@@ -53,7 +53,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       CHARSHL()
    $CATEGORY$
       CT3 string functions
@@ -101,7 +101,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       CHARSHR()
    $CATEGORY$
       CT3 string functions
@@ -147,7 +147,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       CHARRLL()
    $CATEGORY$
       CT3 string functions
@@ -193,7 +193,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       CHARRLR()
    $CATEGORY$
       CT3 string functions
diff --git a/harbour/contrib/hbct/doc/en/charrepl.txt b/harbour/contrib/hbct/doc/en/charrepl.txt
index 58e8cf7d36..2c09e6d8a1 100644
--- a/harbour/contrib/hbct/doc/en/charrepl.txt
+++ b/harbour/contrib/hbct/doc/en/charrepl.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       CHARREPL()
    $CATEGORY$
       CT3 string functions
diff --git a/harbour/contrib/hbct/doc/en/charsort.txt b/harbour/contrib/hbct/doc/en/charsort.txt
index 032eda29f2..90cd6aad36 100644
--- a/harbour/contrib/hbct/doc/en/charsort.txt
+++ b/harbour/contrib/hbct/doc/en/charsort.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       CHARSORT()
    $CATEGORY$
       CT3 string functions
diff --git a/harbour/contrib/hbct/doc/en/charswap.txt b/harbour/contrib/hbct/doc/en/charswap.txt
index 2381238b71..9f45bdaad0 100644
--- a/harbour/contrib/hbct/doc/en/charswap.txt
+++ b/harbour/contrib/hbct/doc/en/charswap.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       CHARSWAP()
    $CATEGORY$
       CT3 string functions
@@ -41,7 +41,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       WORDSWAP()
    $CATEGORY$
       CT3 string functions
diff --git a/harbour/contrib/hbct/doc/en/color.txt b/harbour/contrib/hbct/doc/en/color.txt
index a3d6946acc..eea2c1b5ac 100644
--- a/harbour/contrib/hbct/doc/en/color.txt
+++ b/harbour/contrib/hbct/doc/en/color.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       INVERTATTR()
    $CATEGORY$
       CT3 video functions
@@ -35,7 +35,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       COLORTON()
    $CATEGORY$
       CT3 video functions
@@ -78,7 +78,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       NTOCOLOR()
    $CATEGORY$
       HBCT video functions
@@ -123,7 +123,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ENHANCED()
    $CATEGORY$
       CT3 video functions
@@ -155,7 +155,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       STANDARD()
    $CATEGORY$
       CT3 video functions
@@ -187,7 +187,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       UNSELECTED()
    $CATEGORY$
       CT3 video functions
diff --git a/harbour/contrib/hbct/doc/en/count.txt b/harbour/contrib/hbct/doc/en/count.txt
index 4a94ec9c26..421c41ceef 100644
--- a/harbour/contrib/hbct/doc/en/count.txt
+++ b/harbour/contrib/hbct/doc/en/count.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       COUNTLEFT()
    $CATEGORY$
       CT3 string functions
@@ -35,7 +35,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       COUNTRIGHT()
    $CATEGORY$
       CT3 string functions
diff --git a/harbour/contrib/hbct/doc/en/ct.txt b/harbour/contrib/hbct/doc/en/ct.txt
index b4a3650ba7..2317e912e7 100644
--- a/harbour/contrib/hbct/doc/en/ct.txt
+++ b/harbour/contrib/hbct/doc/en/ct.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       CTINIT()
    $CATEGORY$
       CT3 general functions
@@ -39,7 +39,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       CTEXIT()
    $CATEGORY$
       CT3 general functions
diff --git a/harbour/contrib/hbct/doc/en/ctc.txt b/harbour/contrib/hbct/doc/en/ctc.txt
index afd8f77646..2a709195ca 100644
--- a/harbour/contrib/hbct/doc/en/ctc.txt
+++ b/harbour/contrib/hbct/doc/en/ctc.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       CSETARGERR()
    $CATEGORY$
       CT3 general functions
@@ -46,7 +46,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       CTCINIT()
    $CATEGORY$
       CT3 general functions
@@ -79,7 +79,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       CTCEXIT()
    $CATEGORY$
       CT3 general functions
diff --git a/harbour/contrib/hbct/doc/en/ctmath.txt b/harbour/contrib/hbct/doc/en/ctmath.txt
index 59a20de65b..89e811d0fe 100644
--- a/harbour/contrib/hbct/doc/en/ctmath.txt
+++ b/harbour/contrib/hbct/doc/en/ctmath.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       SETPREC()
    $CATEGORY$
       CT3 math functions
@@ -36,7 +36,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       GETPREC()
    $CATEGORY$
       CT3 math functions
diff --git a/harbour/contrib/hbct/doc/en/ctmath2.txt b/harbour/contrib/hbct/doc/en/ctmath2.txt
index c5ad937102..ac4d2f4726 100644
--- a/harbour/contrib/hbct/doc/en/ctmath2.txt
+++ b/harbour/contrib/hbct/doc/en/ctmath2.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FLOOR()
    $CATEGORY$
       CT3 math functions
@@ -38,7 +38,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       CEILING()
    $CATEGORY$
       CT3 math functions
@@ -73,7 +73,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       SIGN()
    $CATEGORY$
       CT3 math functions
@@ -112,7 +112,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       LOG10()
    $CATEGORY$
       CT3 math functions
@@ -147,7 +147,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FACT()
    $CATEGORY$
       CT3 math functions
diff --git a/harbour/contrib/hbct/doc/en/ctpad.txt b/harbour/contrib/hbct/doc/en/ctpad.txt
index ee30c9bfc3..41b5ab37e1 100644
--- a/harbour/contrib/hbct/doc/en/ctpad.txt
+++ b/harbour/contrib/hbct/doc/en/ctpad.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       PADLEFT()
    $CATEGORY$
       CT3 string functions
@@ -35,7 +35,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       PADRIGHT()
    $CATEGORY$
       CT3 string functions
diff --git a/harbour/contrib/hbct/doc/en/ctstr.txt b/harbour/contrib/hbct/doc/en/ctstr.txt
index ca6fe43a4c..629f6d47a0 100644
--- a/harbour/contrib/hbct/doc/en/ctstr.txt
+++ b/harbour/contrib/hbct/doc/en/ctstr.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       CSETREF()
    $CATEGORY$
       CT3 string functions
@@ -65,7 +65,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       CSETATMUPA()
    $CATEGORY$
       CT3 string functions
@@ -109,7 +109,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       SETATLIKE()
    $CATEGORY$
       CT3 string functions
diff --git a/harbour/contrib/hbct/doc/en/datetime.txt b/harbour/contrib/hbct/doc/en/datetime.txt
index 575cc00677..1b6f78eb7b 100644
--- a/harbour/contrib/hbct/doc/en/datetime.txt
+++ b/harbour/contrib/hbct/doc/en/datetime.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       BOM()
    $CATEGORY$
       CT3 date and time functions
@@ -35,7 +35,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       EOM()
    $CATEGORY$
       CT3 date and time functions
@@ -67,7 +67,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       BOQ()
    $CATEGORY$
       CT3 date and time functions
@@ -99,7 +99,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       EOQ()
    $CATEGORY$
       CT3 date and time functions
@@ -131,7 +131,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       BOY()
    $CATEGORY$
       CT3 date and time functions
@@ -163,7 +163,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       EOY()
    $CATEGORY$
       CT3 date and time functions
diff --git a/harbour/contrib/hbct/doc/en/dattime2.txt b/harbour/contrib/hbct/doc/en/dattime2.txt
index ff538ed3a6..b4dbb2fe28 100644
--- a/harbour/contrib/hbct/doc/en/dattime2.txt
+++ b/harbour/contrib/hbct/doc/en/dattime2.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       CTODOW()
    $CATEGORY$
       CT3 date and time functions
@@ -35,7 +35,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       CTOMONTH()
    $CATEGORY$
       CT3 date and time functions
@@ -67,7 +67,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       DMY()
    $CATEGORY$
       CT3 date and time functions
@@ -101,7 +101,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       MDY()
    $CATEGORY$
       CT3 date and time functions
@@ -135,7 +135,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ADDMONTH()
    $CATEGORY$
       CT3 date and time functions
@@ -167,7 +167,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       DOY()
    $CATEGORY$
       CT3 date and time functions
@@ -201,7 +201,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ISLEAP()
    $CATEGORY$
       CT3 date and time functions
@@ -233,7 +233,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       DAYSTOMONTH()
    $CATEGORY$
       CT3 date and time functions
@@ -267,7 +267,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       DAYSINMONTH()
    $CATEGORY$
       CT3 date and time functions
@@ -299,7 +299,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       QUARTER()
    $CATEGORY$
       CT3 date and time functions
@@ -333,7 +333,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       LASTDAYOM()
    $CATEGORY$
       CT3 date and time functions
@@ -368,7 +368,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       NTOCDOW()
    $CATEGORY$
       CT3 date and time functions
@@ -400,7 +400,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       NTOCMONTH()
    $CATEGORY$
       CT3 date and time functions
@@ -432,7 +432,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       WEEK()
    $CATEGORY$
       CT3 date and time functions
diff --git a/harbour/contrib/hbct/doc/en/dattime3.txt b/harbour/contrib/hbct/doc/en/dattime3.txt
index f853d8a433..36a376f2ca 100644
--- a/harbour/contrib/hbct/doc/en/dattime3.txt
+++ b/harbour/contrib/hbct/doc/en/dattime3.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       WAITPERIOD()
    $CATEGORY$
       HBCT date and time functions
@@ -55,7 +55,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       TIMEVALID()
    $CATEGORY$
       HBCT Date and Time Functions
@@ -117,7 +117,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       SETTIME()
    $CATEGORY$
       HBCT Date and Time Functions
@@ -169,7 +169,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       SETDATE()
    $CATEGORY$
       HBCT Date and Time Functions
diff --git a/harbour/contrib/hbct/doc/en/exponent.txt b/harbour/contrib/hbct/doc/en/exponent.txt
index b157d97aa0..26cf5dbd1f 100644
--- a/harbour/contrib/hbct/doc/en/exponent.txt
+++ b/harbour/contrib/hbct/doc/en/exponent.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       MANTISSA()
    $CATEGORY$
       CT3 number and bit manipulation functions
@@ -45,7 +45,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       EXPONENT()
    $CATEGORY$
       CT3 number and bit manipulation functions
diff --git a/harbour/contrib/hbct/doc/en/finan.txt b/harbour/contrib/hbct/doc/en/finan.txt
index f303a6e38a..ae67e70585 100644
--- a/harbour/contrib/hbct/doc/en/finan.txt
+++ b/harbour/contrib/hbct/doc/en/finan.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FV()
    $CATEGORY$
       CT3 math functions
@@ -55,7 +55,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       PV()
    $CATEGORY$
       CT3 math functions
@@ -106,7 +106,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       PAYMENT()
    $CATEGORY$
       CT3 math functions
@@ -155,7 +155,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       PERIODS()
    $CATEGORY$
       CT3 math functions
@@ -209,7 +209,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       RATE()
    $CATEGORY$
       CT3 math functions
diff --git a/harbour/contrib/hbct/doc/en/ftoc.txt b/harbour/contrib/hbct/doc/en/ftoc.txt
index 470ec85c31..2db2835b19 100644
--- a/harbour/contrib/hbct/doc/en/ftoc.txt
+++ b/harbour/contrib/hbct/doc/en/ftoc.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FTOC()
    $CATEGORY$
       CT3 number and bit manipulation functions
@@ -44,7 +44,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       CTOF()
    $CATEGORY$
       CT3 number and bit manipulation functions
diff --git a/harbour/contrib/hbct/doc/en/justify.txt b/harbour/contrib/hbct/doc/en/justify.txt
index f51c0b1756..9e468614d5 100644
--- a/harbour/contrib/hbct/doc/en/justify.txt
+++ b/harbour/contrib/hbct/doc/en/justify.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       JUSTLEFT()
    $CATEGORY$
       CT3 string functions
@@ -35,7 +35,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       JUSTRIGHT()
    $CATEGORY$
       Harbour Tools string functions
diff --git a/harbour/contrib/hbct/doc/en/keyset.txt b/harbour/contrib/hbct/doc/en/keyset.txt
index c59d67ed94..47d6008a1e 100644
--- a/harbour/contrib/hbct/doc/en/keyset.txt
+++ b/harbour/contrib/hbct/doc/en/keyset.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       KSETINS()
    $CATEGORY$
       CT3 switch and state functions
@@ -35,7 +35,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       KSETCAPS()
    $CATEGORY$
       CT3 switch and state functions
@@ -67,7 +67,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       KSETNUM()
    $CATEGORY$
       CT3 switch and state functions
@@ -99,7 +99,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       KSETSCROLL()
    $CATEGORY$
       CT3 switch and state functions
diff --git a/harbour/contrib/hbct/doc/en/misc1.txt b/harbour/contrib/hbct/doc/en/misc1.txt
index 6807f7ec43..af333c9493 100644
--- a/harbour/contrib/hbct/doc/en/misc1.txt
+++ b/harbour/contrib/hbct/doc/en/misc1.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       XTOC()
    $CATEGORY$
       CT3 miscellaneous functions
diff --git a/harbour/contrib/hbct/doc/en/num1.txt b/harbour/contrib/hbct/doc/en/num1.txt
index 8b39b06f39..8df63e6a42 100644
--- a/harbour/contrib/hbct/doc/en/num1.txt
+++ b/harbour/contrib/hbct/doc/en/num1.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       CELSIUS()
    $CATEGORY$
       CT3 numeric functions
@@ -40,7 +40,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FAHRENHEIT()
    $CATEGORY$
       CT3 numeric functions
@@ -77,7 +77,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       INFINITY()
    $CATEGORY$
       CT3 numeric functions
diff --git a/harbour/contrib/hbct/doc/en/numat.txt b/harbour/contrib/hbct/doc/en/numat.txt
index 4f8c758a9a..757f064a08 100644
--- a/harbour/contrib/hbct/doc/en/numat.txt
+++ b/harbour/contrib/hbct/doc/en/numat.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       NUMAT()
    $CATEGORY$
       CT3 string functions
diff --git a/harbour/contrib/hbct/doc/en/numconv.txt b/harbour/contrib/hbct/doc/en/numconv.txt
index e257fcf14e..139ba972db 100644
--- a/harbour/contrib/hbct/doc/en/numconv.txt
+++ b/harbour/contrib/hbct/doc/en/numconv.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       NTOC()
    $CATEGORY$
       CT3 number and bit manipulation functions
@@ -35,7 +35,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       CTON()
    $CATEGORY$
       CT3 number and bit manipulation functions
@@ -67,7 +67,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       BITTOC()
    $CATEGORY$
       CT3 number and bit manipulation functions
@@ -99,7 +99,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       CTOBIT()
    $CATEGORY$
       CT3 number and bit manipulation functions
diff --git a/harbour/contrib/hbct/doc/en/pos1.txt b/harbour/contrib/hbct/doc/en/pos1.txt
index 18775821d5..99b27a2186 100644
--- a/harbour/contrib/hbct/doc/en/pos1.txt
+++ b/harbour/contrib/hbct/doc/en/pos1.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       POSALPHA()
    $CATEGORY$
       CT3 string functions
@@ -35,7 +35,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       POSLOWER()
    $CATEGORY$
       CT3 string functions
@@ -67,7 +67,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       POSRANGE()
    $CATEGORY$
       CT3 string functions
@@ -100,7 +100,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       POSUPPER()
    $CATEGORY$
       CT3 string functions
diff --git a/harbour/contrib/hbct/doc/en/pos2.txt b/harbour/contrib/hbct/doc/en/pos2.txt
index f23a5e8b15..3c1fda00e6 100644
--- a/harbour/contrib/hbct/doc/en/pos2.txt
+++ b/harbour/contrib/hbct/doc/en/pos2.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       POSCHAR()
    $CATEGORY$
       CT3 string functions
@@ -35,7 +35,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       POSDEL()
    $CATEGORY$
       CT3 string functions
@@ -67,7 +67,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       POSINS()
    $CATEGORY$
       CT3 string functions
@@ -99,7 +99,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       POSREPL()
    $CATEGORY$
       CT3 string functions
diff --git a/harbour/contrib/hbct/doc/en/posdiff.txt b/harbour/contrib/hbct/doc/en/posdiff.txt
index 4c2a4bed09..2c584e0e7d 100644
--- a/harbour/contrib/hbct/doc/en/posdiff.txt
+++ b/harbour/contrib/hbct/doc/en/posdiff.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       POSDIFF()
    $CATEGORY$
       CT3 string functions
@@ -35,7 +35,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       POSEQUAL()
    $CATEGORY$
       CT3 string functions
diff --git a/harbour/contrib/hbct/doc/en/print.txt b/harbour/contrib/hbct/doc/en/print.txt
index c5795b8692..7e17ce62fb 100644
--- a/harbour/contrib/hbct/doc/en/print.txt
+++ b/harbour/contrib/hbct/doc/en/print.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       PRINTSTAT()
    $CATEGORY$
       CT3 printer functions
@@ -35,7 +35,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       PRINTREADY()
    $CATEGORY$
       CT3 printer functions
diff --git a/harbour/contrib/hbct/doc/en/range.txt b/harbour/contrib/hbct/doc/en/range.txt
index 7b24558169..04523d2d8d 100644
--- a/harbour/contrib/hbct/doc/en/range.txt
+++ b/harbour/contrib/hbct/doc/en/range.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       RANGEREM()
    $CATEGORY$
       CT3 string functions
@@ -40,7 +40,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       RANGEREPL
    $CATEGORY$
       CT3 string functions
diff --git a/harbour/contrib/hbct/doc/en/relation.txt b/harbour/contrib/hbct/doc/en/relation.txt
index d7d2afed11..7d85b46977 100644
--- a/harbour/contrib/hbct/doc/en/relation.txt
+++ b/harbour/contrib/hbct/doc/en/relation.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       CHARRELA()
    $CATEGORY$
       CT3 string functions
@@ -36,7 +36,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       CHARRELREP()
    $CATEGORY$
       CT3 string functions
diff --git a/harbour/contrib/hbct/doc/en/remove.txt b/harbour/contrib/hbct/doc/en/remove.txt
index 6e6faaae7c..a3bdd2164d 100644
--- a/harbour/contrib/hbct/doc/en/remove.txt
+++ b/harbour/contrib/hbct/doc/en/remove.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       REMALL()
    $CATEGORY$
       CT3 string functions
@@ -35,7 +35,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       REMLEFT()
    $CATEGORY$
       CT3 string functions
@@ -67,7 +67,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       REMRIGHT()
    $CATEGORY$
       CT3 string functions
diff --git a/harbour/contrib/hbct/doc/en/replace.txt b/harbour/contrib/hbct/doc/en/replace.txt
index 14e89508d2..a53221313a 100644
--- a/harbour/contrib/hbct/doc/en/replace.txt
+++ b/harbour/contrib/hbct/doc/en/replace.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       REPLALL()
    $CATEGORY$
       CT3 string functions
@@ -35,7 +35,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       REPLLEFT()
    $CATEGORY$
       CT3 string functions
@@ -67,7 +67,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       REPLRIGHT()
    $CATEGORY$
       CT3 string functions
diff --git a/harbour/contrib/hbct/doc/en/screen1.txt b/harbour/contrib/hbct/doc/en/screen1.txt
index 856f12a0ba..f16d98e702 100644
--- a/harbour/contrib/hbct/doc/en/screen1.txt
+++ b/harbour/contrib/hbct/doc/en/screen1.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       SCREENATTR()
    $CATEGORY$
       CT3 video functions
@@ -45,7 +45,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       SCREENMIX()
    $CATEGORY$
       CT3 video functions
@@ -77,7 +77,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       SAYSCREEN()
    $CATEGORY$
       CT3 video functions
@@ -112,7 +112,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       INVERTWIN()
    $CATEGORY$
       CT3 video functions
@@ -144,7 +144,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       UNTEXTWIN()
    $CATEGORY$
       CT3 video functions
@@ -197,7 +197,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       CHARWIN()
    $CATEGORY$
       CT3 video functions
@@ -240,7 +240,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       COLORWIN()
    $CATEGORY$
       CT3 video functions
@@ -285,7 +285,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       SCREENTEXT()
    $CATEGORY$
       CT video functions (Harbour extension)
@@ -321,7 +321,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       COLORREPL()
    $CATEGORY$
       CT3 video functions
diff --git a/harbour/contrib/hbct/doc/en/strdiff.txt b/harbour/contrib/hbct/doc/en/strdiff.txt
index 45a8230066..066793c41a 100644
--- a/harbour/contrib/hbct/doc/en/strdiff.txt
+++ b/harbour/contrib/hbct/doc/en/strdiff.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       STRDIFF()
    $CATEGORY$
       CT3 string functions
diff --git a/harbour/contrib/hbct/doc/en/strswap.txt b/harbour/contrib/hbct/doc/en/strswap.txt
index 7b1c4fc05b..e57204cf28 100644
--- a/harbour/contrib/hbct/doc/en/strswap.txt
+++ b/harbour/contrib/hbct/doc/en/strswap.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       STRSWAP()
    $CATEGORY$
       CT3 string functions
diff --git a/harbour/contrib/hbct/doc/en/tab.txt b/harbour/contrib/hbct/doc/en/tab.txt
index 4e095d2acc..9b5bbb35d5 100644
--- a/harbour/contrib/hbct/doc/en/tab.txt
+++ b/harbour/contrib/hbct/doc/en/tab.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       TABEXPAND()
    $CATEGORY$
       CT3 string functions
@@ -55,7 +55,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       TABPACK()
    $CATEGORY$
       CT3 string functions
diff --git a/harbour/contrib/hbct/doc/en/token1.txt b/harbour/contrib/hbct/doc/en/token1.txt
index fbc61592af..f89b62159a 100644
--- a/harbour/contrib/hbct/doc/en/token1.txt
+++ b/harbour/contrib/hbct/doc/en/token1.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ATTOKEN()
    $CATEGORY$
       CT3 string functions
@@ -65,7 +65,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       TOKEN()
    $CATEGORY$
       CT3 string functions
@@ -134,7 +134,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       NUMTOKEN()
    $CATEGORY$
       CT3 string functions
@@ -168,7 +168,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       TOKENLOWER()
    $CATEGORY$
       CT3 string functions
@@ -230,7 +230,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       TOKENUPPER()
    $CATEGORY$
       CT3 string functions
@@ -292,7 +292,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       TOKENSEP()
    $CATEGORY$
       CT3 string functions
diff --git a/harbour/contrib/hbct/doc/en/token2.txt b/harbour/contrib/hbct/doc/en/token2.txt
index 7595c4fa92..2274af7fe0 100644
--- a/harbour/contrib/hbct/doc/en/token2.txt
+++ b/harbour/contrib/hbct/doc/en/token2.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       TOKENINIT()
    $CATEGORY$
       CT3 string functions
@@ -87,7 +87,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       TOKENNEXT()
    $CATEGORY$
       CT3 string functions
@@ -146,7 +146,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       TOKENNUM()
    $CATEGORY$
       CT3 string functions
@@ -183,7 +183,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       TOKENEND()
    $CATEGORY$
       CT3 string functions
@@ -227,7 +227,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       TOKENEXIT()
    $CATEGORY$
       CT3 string functions
@@ -267,7 +267,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       TOKENAT()
    $CATEGORY$
       CT3 string functions
@@ -324,7 +324,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       SAVETOKEN()
    $CATEGORY$
       CT3 string functions
@@ -359,7 +359,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       RESTTOKEN()
    $CATEGORY$
       CT3 string functions
diff --git a/harbour/contrib/hbct/doc/en/trig.txt b/harbour/contrib/hbct/doc/en/trig.txt
index f60c44391c..09be4b3337 100644
--- a/harbour/contrib/hbct/doc/en/trig.txt
+++ b/harbour/contrib/hbct/doc/en/trig.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       PI()
    $CATEGORY$
       CT3 math functions
@@ -40,7 +40,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       SIN()
    $CATEGORY$
       CT3 math functions
@@ -80,7 +80,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       COS()
    $CATEGORY$
       CT3 math functions
@@ -120,7 +120,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       TAN()
    $CATEGORY$
       CT3 math functions
@@ -160,7 +160,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       COT()
    $CATEGORY$
       CT3 math functions
@@ -198,7 +198,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ASIN()
    $CATEGORY$
       CT3 math functions
@@ -239,7 +239,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ACOS()
    $CATEGORY$
       CT3 math functions
@@ -281,7 +281,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ATAN()
    $CATEGORY$
       CT3 math functions
@@ -319,7 +319,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ATN2()
    $CATEGORY$
       CT3 math functions
@@ -364,7 +364,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       SINH()
    $CATEGORY$
       CT3 math functions
@@ -403,7 +403,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       COSH()
    $CATEGORY$
       CT3 math functions
@@ -442,7 +442,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       TANH()
    $CATEGORY$
       CT3 math functions
@@ -477,7 +477,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       RTOD()
    $CATEGORY$
       CT3 math functions
@@ -513,7 +513,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       DTOR()
    $CATEGORY$
       CT3 math functions
diff --git a/harbour/contrib/hbct/doc/en/video.txt b/harbour/contrib/hbct/doc/en/video.txt
index 2246a721dd..eb17587897 100644
--- a/harbour/contrib/hbct/doc/en/video.txt
+++ b/harbour/contrib/hbct/doc/en/video.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       CHARPIX()
    $CATEGORY$
       HBCT video functions
@@ -35,7 +35,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       VGAPALETTE()
    $CATEGORY$
       HBCT video functions
@@ -75,7 +75,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       VIDEOTYPE()
    $CATEGORY$
       HBCT video functions
@@ -107,7 +107,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       SETFONT()
    $CATEGORY$
       HBCT video functions
diff --git a/harbour/contrib/hbct/doc/en/wordrepl.txt b/harbour/contrib/hbct/doc/en/wordrepl.txt
index 0ebcff2cb8..ac57586a9e 100644
--- a/harbour/contrib/hbct/doc/en/wordrepl.txt
+++ b/harbour/contrib/hbct/doc/en/wordrepl.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       WORDREPL()
    $CATEGORY$
       CT3 string functions
diff --git a/harbour/contrib/hbct/doc/en/wordtoch.txt b/harbour/contrib/hbct/doc/en/wordtoch.txt
index 7171720799..a27d9127ca 100644
--- a/harbour/contrib/hbct/doc/en/wordtoch.txt
+++ b/harbour/contrib/hbct/doc/en/wordtoch.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       WORDTOCHAR()
    $CATEGORY$
       CT3 string functions
diff --git a/harbour/contrib/hbgd/doc/en/hbgd.txt b/harbour/contrib/hbgd/doc/en/hbgd.txt
index 4569f6baed..4b04b9ae9a 100644
--- a/harbour/contrib/hbgd/doc/en/hbgd.txt
+++ b/harbour/contrib/hbgd/doc/en/hbgd.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       The GD Library
    $CATEGORY$
       Document
@@ -48,7 +48,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       gdImageCreate()
    $CATEGORY$
       HBGD
@@ -86,7 +86,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       gdImageCreateTrueColor()
    $CATEGORY$
       HBGD
@@ -124,7 +124,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       gdImageFromJpeg()
    $CATEGORY$
       HBGD
@@ -178,7 +178,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       gdImageFromGif()
    $CATEGORY$
       HBGD
@@ -232,7 +232,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       gdImageFromPng()
    $CATEGORY$
       HBGD
@@ -286,7 +286,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       gdImageFromGD()
    $CATEGORY$
       HBGD
@@ -340,7 +340,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       gdImageFromWBmp()
    $CATEGORY$
       HBGD
@@ -394,7 +394,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       gdImageJpeg()
    $CATEGORY$
       HBGD
@@ -441,7 +441,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       gdImageGif()
    $CATEGORY$
       HBGD
@@ -486,7 +486,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       gdImagePng()
    $CATEGORY$
       HBGD
@@ -533,7 +533,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       gdImageGD()
    $CATEGORY$
       HBGD
@@ -578,7 +578,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       gdImageWBmp()
    $CATEGORY$
       HBGD
@@ -637,7 +637,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       gdImageSetPixel()
    $CATEGORY$
       HBGD
@@ -687,7 +687,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       gdImageLine()
    $CATEGORY$
       HBGD
@@ -740,7 +740,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       gdImageDashedLine()
    $CATEGORY$
       HBGD
@@ -793,7 +793,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       gdImagePolygon()
    $CATEGORY$
       HBGD
@@ -849,7 +849,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       gdImageOpenPolygon()
    $CATEGORY$
       HBGD
@@ -906,7 +906,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       gdImageRectangle()
    $CATEGORY$
       HBGD
@@ -959,7 +959,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       gdImageFilledPolygon()
    $CATEGORY$
       HBGD
@@ -1015,7 +1015,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       gdImageFilledRectangle()
    $CATEGORY$
       HBGD
@@ -1068,7 +1068,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       gdImageArc()
    $CATEGORY$
       HBGD
@@ -1127,7 +1127,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       gdImageFilledArc()
    $CATEGORY$
       HBGD
@@ -1206,7 +1206,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       gdImageFilledEllipse()
    $CATEGORY$
       HBGD
@@ -1259,7 +1259,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       gdImageFillToBorder()
    $CATEGORY$
       HBGD
@@ -1316,7 +1316,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       gdImageFill()
    $CATEGORY$
       HBGD
@@ -1377,7 +1377,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       gdImageSetAntiAliased()
    $CATEGORY$
       HBGD
@@ -1448,7 +1448,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       gdSetAntiAliasedDontBlend()
    $CATEGORY$
       HBGD
@@ -1510,7 +1510,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       gdImageSetBrush()
    $CATEGORY$
       HBGD
@@ -1582,7 +1582,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       gdImageSetTile()
    $CATEGORY$
       HBGD
@@ -1654,7 +1654,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       gdImageSetStyle()
    $CATEGORY$
       HBGD
@@ -1742,7 +1742,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       gdImageSetThickness()
    $CATEGORY$
       HBGD
diff --git a/harbour/contrib/hbgt/doc/en/hbgt.txt b/harbour/contrib/hbgt/doc/en/hbgt.txt
index 1e794ca752..9a73b5e30d 100644
--- a/harbour/contrib/hbgt/doc/en/hbgt.txt
+++ b/harbour/contrib/hbgt/doc/en/hbgt.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       GT_ASCPOS()
    $CATEGORY$
       String Tools
@@ -44,7 +44,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       GT_ASCIISUM()
    $CATEGORY$
       String Tools
@@ -75,7 +75,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       GT_ATDIFF()
    $CATEGORY$
       String Tools
@@ -113,7 +113,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       GT_CHAREVEN()
    $CATEGORY$
       String Tools
@@ -147,7 +147,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       GT_CHARMIX()
    $CATEGORY$
       String Tools
@@ -185,7 +185,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       GT_CHARODD()
    $CATEGORY$
       String Tools
@@ -219,7 +219,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       GT_CHRCOUNT()
    $CATEGORY$
       String Tools
@@ -254,7 +254,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       GT_CHRFIRST()
    $CATEGORY$
       String Tools
@@ -288,7 +288,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       GT_CHRTOTAL()
    $CATEGORY$
       String Tools
@@ -328,7 +328,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       GT_STRCOUNT()
    $CATEGORY$
       String Tools
@@ -367,7 +367,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       GT_STRCSPN()
    $CATEGORY$
       String Tools
@@ -400,7 +400,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       GT_STRDIFF()
    $CATEGORY$
       String Tools
@@ -439,7 +439,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       GT_STREXPAND()
    $CATEGORY$
       String Tools
@@ -477,7 +477,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       GT_STRLEFT()
    $CATEGORY$
       String Tools
@@ -515,7 +515,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       GT_STRPBRK()
    $CATEGORY$
       String Tools
@@ -549,7 +549,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       GT_STRRIGHT()
    $CATEGORY$
       String Tools
@@ -587,7 +587,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       GT_NEWFLAG()
    $CATEGORY$
       General
@@ -616,7 +616,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       GT_SETFLAG()
    $CATEGORY$
       General
@@ -657,7 +657,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       GT_CLRFLAG()
    $CATEGORY$
       General
@@ -702,7 +702,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       GT_ISFLAG()
    $CATEGORY$
       General
diff --git a/harbour/contrib/hbmisc/doc/en/dates2.txt b/harbour/contrib/hbmisc/doc/en/dates2.txt
index 867aa718dd..24b4bff270 100644
--- a/harbour/contrib/hbmisc/doc/en/dates2.txt
+++ b/harbour/contrib/hbmisc/doc/en/dates2.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       AMONTHS()
    $CATEGORY$
       Date
@@ -36,7 +36,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ADAYS()
    $CATEGORY$
       Date
@@ -69,7 +69,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ISLEAPYEAR()
    $CATEGORY$
       Date
@@ -101,7 +101,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       DAYSINMONTH()
    $CATEGORY$
       Date
@@ -132,7 +132,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       EOM()
    $CATEGORY$
       Date
@@ -164,7 +164,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       BOM()
    $CATEGORY$
       Date
@@ -196,7 +196,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       DOY()
    $CATEGORY$
       Date
@@ -227,7 +227,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       WOY()
    $CATEGORY$
       Date
@@ -261,7 +261,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       EOY()
    $CATEGORY$
       Date
@@ -293,7 +293,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       BOY()
    $CATEGORY$
       Date
diff --git a/harbour/contrib/hbmisc/doc/en/ht_class.txt b/harbour/contrib/hbmisc/doc/en/ht_class.txt
index c36c354a0b..39e64bcd01 100644
--- a/harbour/contrib/hbmisc/doc/en/ht_class.txt
+++ b/harbour/contrib/hbmisc/doc/en/ht_class.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       TFileRead()
    $CATEGORY$
       Harbour Tools
diff --git a/harbour/contrib/hbmisc/doc/en/ht_conv.txt b/harbour/contrib/hbmisc/doc/en/ht_conv.txt
index baf1daf5e6..ff320b565a 100644
--- a/harbour/contrib/hbmisc/doc/en/ht_conv.txt
+++ b/harbour/contrib/hbmisc/doc/en/ht_conv.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ISBIN()
    $CATEGORY$
       Conversion Tools
@@ -25,7 +25,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ISOCTAL()
    $CATEGORY$
       Conversion Tools
@@ -47,7 +47,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ISDEC()
    $CATEGORY$
       Conversion Tools
@@ -69,7 +69,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ISHEXA()
    $CATEGORY$
       Conversion Tools
@@ -91,7 +91,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       DECTOBIN()
    $CATEGORY$
       Conversion Tools
@@ -114,7 +114,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       DECTOOCTAL()
    $CATEGORY$
       Conversion Tools
@@ -137,7 +137,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       DECTOHEXA()
    $CATEGORY$
       Conversion Tools
@@ -160,7 +160,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       BINTODEC()
    $CATEGORY$
       Conversion Tools
@@ -183,7 +183,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       OCTALTODEC()
    $CATEGORY$
       Conversion Tools
@@ -206,7 +206,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       HEXATODEC()
    $CATEGORY$
       Conversion Tools
diff --git a/harbour/contrib/hbmisc/doc/en/ht_dbf.txt b/harbour/contrib/hbmisc/doc/en/ht_dbf.txt
index ceb2ec1296..726c12c03f 100644
--- a/harbour/contrib/hbmisc/doc/en/ht_dbf.txt
+++ b/harbour/contrib/hbmisc/doc/en/ht_dbf.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FIELDTYPE()
    $CATEGORY$
       Database Tools
@@ -47,7 +47,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FIELDSIZE()
    $CATEGORY$
       Database tools
@@ -83,7 +83,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FIELDDECI()
    $CATEGORY$
       Database tools
diff --git a/harbour/contrib/hbmisc/doc/en/ht_doc.txt b/harbour/contrib/hbmisc/doc/en/ht_doc.txt
index 00a1ea678c..31a9daa9c5 100644
--- a/harbour/contrib/hbmisc/doc/en/ht_doc.txt
+++ b/harbour/contrib/hbmisc/doc/en/ht_doc.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       THtml()
    $CATEGORY$
       Harbour Tools
@@ -52,7 +52,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       TOs2()
    $CATEGORY$
       Harbour Tools
@@ -102,7 +102,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       TNortonGuide()
    $CATEGORY$
       Harbour Tools
@@ -150,7 +150,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       TRtf()
    $CATEGORY$
       Harbour Tools
@@ -201,7 +201,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       TTroff()
    $CATEGORY$
       Harbour Tools
diff --git a/harbour/contrib/hbmisc/doc/en/ht_file.txt b/harbour/contrib/hbmisc/doc/en/ht_file.txt
index c4cf74a112..a2e4177d13 100644
--- a/harbour/contrib/hbmisc/doc/en/ht_file.txt
+++ b/harbour/contrib/hbmisc/doc/en/ht_file.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       CD()
    $CATEGORY$
       Dos Tools
@@ -31,7 +31,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       MD()
    $CATEGORY$
       Dos Tools
@@ -59,7 +59,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       RD()
    $CATEGORY$
       Dos Tools
diff --git a/harbour/contrib/hbmisc/doc/en/ht_str.txt b/harbour/contrib/hbmisc/doc/en/ht_str.txt
index 8cd4998e2d..de49581e02 100644
--- a/harbour/contrib/hbmisc/doc/en/ht_str.txt
+++ b/harbour/contrib/hbmisc/doc/en/ht_str.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       StrFormat()
    $CATEGORY$
       String Tools
diff --git a/harbour/contrib/hbnf/doc/en/aading.txt b/harbour/contrib/hbnf/doc/en/aading.txt
index ec71819c09..d4064e77f6 100644
--- a/harbour/contrib/hbnf/doc/en/aading.txt
+++ b/harbour/contrib/hbnf/doc/en/aading.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_AADDITION()
    $CATEGORY$
       Array
diff --git a/harbour/contrib/hbnf/doc/en/aavg.txt b/harbour/contrib/hbnf/doc/en/aavg.txt
index 6ba4eed7a6..c64a111baa 100644
--- a/harbour/contrib/hbnf/doc/en/aavg.txt
+++ b/harbour/contrib/hbnf/doc/en/aavg.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_AAVG()
    $CATEGORY$
       Array
diff --git a/harbour/contrib/hbnf/doc/en/acctadj.txt b/harbour/contrib/hbnf/doc/en/acctadj.txt
index f5c81e9ea8..92d396f98f 100644
--- a/harbour/contrib/hbnf/doc/en/acctadj.txt
+++ b/harbour/contrib/hbnf/doc/en/acctadj.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_ACCTADJ()
    $CATEGORY$
       Date/Time
diff --git a/harbour/contrib/hbnf/doc/en/acctmnth.txt b/harbour/contrib/hbnf/doc/en/acctmnth.txt
index 77529f34d9..514211a318 100644
--- a/harbour/contrib/hbnf/doc/en/acctmnth.txt
+++ b/harbour/contrib/hbnf/doc/en/acctmnth.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_ACCTMONTH()
    $CATEGORY$
       Date/Time
diff --git a/harbour/contrib/hbnf/doc/en/acctqtr.txt b/harbour/contrib/hbnf/doc/en/acctqtr.txt
index 89c0337880..12f3f7fdd1 100644
--- a/harbour/contrib/hbnf/doc/en/acctqtr.txt
+++ b/harbour/contrib/hbnf/doc/en/acctqtr.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_ACCTQTR()
    $CATEGORY$
       Date/Time
diff --git a/harbour/contrib/hbnf/doc/en/acctweek.txt b/harbour/contrib/hbnf/doc/en/acctweek.txt
index ae3577b506..fbfe1c495c 100644
--- a/harbour/contrib/hbnf/doc/en/acctweek.txt
+++ b/harbour/contrib/hbnf/doc/en/acctweek.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_ACCTWEEK()
    $CATEGORY$
       Date/Time
diff --git a/harbour/contrib/hbnf/doc/en/acctyear.txt b/harbour/contrib/hbnf/doc/en/acctyear.txt
index d4c3cda07d..6889ed899d 100644
--- a/harbour/contrib/hbnf/doc/en/acctyear.txt
+++ b/harbour/contrib/hbnf/doc/en/acctyear.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_ACCTYEAR()
    $CATEGORY$
       Date/Time
diff --git a/harbour/contrib/hbnf/doc/en/adapter.txt b/harbour/contrib/hbnf/doc/en/adapter.txt
index 208701fd85..47094b4bbd 100644
--- a/harbour/contrib/hbnf/doc/en/adapter.txt
+++ b/harbour/contrib/hbnf/doc/en/adapter.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_ADAPTER()
    $CATEGORY$
       Video
diff --git a/harbour/contrib/hbnf/doc/en/adessort.txt b/harbour/contrib/hbnf/doc/en/adessort.txt
index 3daf1eacdf..046cbd274a 100644
--- a/harbour/contrib/hbnf/doc/en/adessort.txt
+++ b/harbour/contrib/hbnf/doc/en/adessort.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_ADESSORT()
    $CATEGORY$
       Array
diff --git a/harbour/contrib/hbnf/doc/en/aemaxlen.txt b/harbour/contrib/hbnf/doc/en/aemaxlen.txt
index 7645712755..8317e10613 100644
--- a/harbour/contrib/hbnf/doc/en/aemaxlen.txt
+++ b/harbour/contrib/hbnf/doc/en/aemaxlen.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_AEMAXLEN()
    $CATEGORY$
       Array
diff --git a/harbour/contrib/hbnf/doc/en/aeminlen.txt b/harbour/contrib/hbnf/doc/en/aeminlen.txt
index b311e61319..2e12759fdb 100644
--- a/harbour/contrib/hbnf/doc/en/aeminlen.txt
+++ b/harbour/contrib/hbnf/doc/en/aeminlen.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_AEMINLEN()
    $CATEGORY$
       Array
diff --git a/harbour/contrib/hbnf/doc/en/alt.txt b/harbour/contrib/hbnf/doc/en/alt.txt
index 20c3b38f2b..83ba36e64e 100644
--- a/harbour/contrib/hbnf/doc/en/alt.txt
+++ b/harbour/contrib/hbnf/doc/en/alt.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_ALT()
    $CATEGORY$
       Keyboard/Mouse
diff --git a/harbour/contrib/hbnf/doc/en/amedian.txt b/harbour/contrib/hbnf/doc/en/amedian.txt
index 794966e970..3a84fcc8f0 100644
--- a/harbour/contrib/hbnf/doc/en/amedian.txt
+++ b/harbour/contrib/hbnf/doc/en/amedian.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_AMEDIAN()
    $CATEGORY$
       Array
diff --git a/harbour/contrib/hbnf/doc/en/anomatch.txt b/harbour/contrib/hbnf/doc/en/anomatch.txt
index 2b90f28697..9671ed4bfe 100644
--- a/harbour/contrib/hbnf/doc/en/anomatch.txt
+++ b/harbour/contrib/hbnf/doc/en/anomatch.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_ANOMATCHES()
    $CATEGORY$
       Array
diff --git a/harbour/contrib/hbnf/doc/en/any2any.txt b/harbour/contrib/hbnf/doc/en/any2any.txt
index c64fe7766b..3729daf181 100644
--- a/harbour/contrib/hbnf/doc/en/any2any.txt
+++ b/harbour/contrib/hbnf/doc/en/any2any.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_XTOY()
    $CATEGORY$
       Conversion
diff --git a/harbour/contrib/hbnf/doc/en/aredit.txt b/harbour/contrib/hbnf/doc/en/aredit.txt
index 12642bc738..499ca7a6ba 100644
--- a/harbour/contrib/hbnf/doc/en/aredit.txt
+++ b/harbour/contrib/hbnf/doc/en/aredit.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_AREDIT()
    $CATEGORY$
       Array
diff --git a/harbour/contrib/hbnf/doc/en/asum.txt b/harbour/contrib/hbnf/doc/en/asum.txt
index ce1d34aa77..155c779098 100644
--- a/harbour/contrib/hbnf/doc/en/asum.txt
+++ b/harbour/contrib/hbnf/doc/en/asum.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_ASUM()
    $CATEGORY$
       Array
diff --git a/harbour/contrib/hbnf/doc/en/at2.txt b/harbour/contrib/hbnf/doc/en/at2.txt
index bae94d5f4a..048ffb7e98 100644
--- a/harbour/contrib/hbnf/doc/en/at2.txt
+++ b/harbour/contrib/hbnf/doc/en/at2.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_AT2()
    $CATEGORY$
       String
@@ -42,7 +42,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_RAT2()
    $CATEGORY$
       String
diff --git a/harbour/contrib/hbnf/doc/en/bitclr.txt b/harbour/contrib/hbnf/doc/en/bitclr.txt
index ab2b8f9b8c..e04fe8c649 100644
--- a/harbour/contrib/hbnf/doc/en/bitclr.txt
+++ b/harbour/contrib/hbnf/doc/en/bitclr.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_BITCLR()
    $CATEGORY$
       String
diff --git a/harbour/contrib/hbnf/doc/en/bitset.txt b/harbour/contrib/hbnf/doc/en/bitset.txt
index 13df95f79b..8efd9daaa2 100644
--- a/harbour/contrib/hbnf/doc/en/bitset.txt
+++ b/harbour/contrib/hbnf/doc/en/bitset.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_BITSET()
    $CATEGORY$
       String
diff --git a/harbour/contrib/hbnf/doc/en/blink.txt b/harbour/contrib/hbnf/doc/en/blink.txt
index dfac55809f..1b00955d69 100644
--- a/harbour/contrib/hbnf/doc/en/blink.txt
+++ b/harbour/contrib/hbnf/doc/en/blink.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_BLINK()
    $CATEGORY$
       Menus/Prompts
diff --git a/harbour/contrib/hbnf/doc/en/byt2bit.txt b/harbour/contrib/hbnf/doc/en/byt2bit.txt
index 1005ac1bf0..6eb133bd14 100644
--- a/harbour/contrib/hbnf/doc/en/byt2bit.txt
+++ b/harbour/contrib/hbnf/doc/en/byt2bit.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_BYT2BIT()
    $CATEGORY$
       Conversion
diff --git a/harbour/contrib/hbnf/doc/en/byt2hex.txt b/harbour/contrib/hbnf/doc/en/byt2hex.txt
index b4ebaebcfd..1698af67b0 100644
--- a/harbour/contrib/hbnf/doc/en/byt2hex.txt
+++ b/harbour/contrib/hbnf/doc/en/byt2hex.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_BYT2HEX()
    $CATEGORY$
       Conversion
diff --git a/harbour/contrib/hbnf/doc/en/byteand.txt b/harbour/contrib/hbnf/doc/en/byteand.txt
index 312bb56a8b..7df22b1e36 100644
--- a/harbour/contrib/hbnf/doc/en/byteand.txt
+++ b/harbour/contrib/hbnf/doc/en/byteand.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_BYTEAND()
    $CATEGORY$
       String
diff --git a/harbour/contrib/hbnf/doc/en/byteneg.txt b/harbour/contrib/hbnf/doc/en/byteneg.txt
index a1ee411469..84de2556c8 100644
--- a/harbour/contrib/hbnf/doc/en/byteneg.txt
+++ b/harbour/contrib/hbnf/doc/en/byteneg.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_BYTENEG()
    $CATEGORY$
       String
diff --git a/harbour/contrib/hbnf/doc/en/bytenot.txt b/harbour/contrib/hbnf/doc/en/bytenot.txt
index 908c9f0ebb..b747996f2e 100644
--- a/harbour/contrib/hbnf/doc/en/bytenot.txt
+++ b/harbour/contrib/hbnf/doc/en/bytenot.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_BYTENOT()
    $CATEGORY$
       String
diff --git a/harbour/contrib/hbnf/doc/en/byteor.txt b/harbour/contrib/hbnf/doc/en/byteor.txt
index befd35a7f2..88d6df85a7 100644
--- a/harbour/contrib/hbnf/doc/en/byteor.txt
+++ b/harbour/contrib/hbnf/doc/en/byteor.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_BYTEOR()
    $CATEGORY$
       String
diff --git a/harbour/contrib/hbnf/doc/en/bytexor.txt b/harbour/contrib/hbnf/doc/en/bytexor.txt
index e91a3edba0..2fb3bd43ff 100644
--- a/harbour/contrib/hbnf/doc/en/bytexor.txt
+++ b/harbour/contrib/hbnf/doc/en/bytexor.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_BYTEXOR()
    $CATEGORY$
       String
diff --git a/harbour/contrib/hbnf/doc/en/calendar.txt b/harbour/contrib/hbnf/doc/en/calendar.txt
index fa43556a19..1e5cadedef 100644
--- a/harbour/contrib/hbnf/doc/en/calendar.txt
+++ b/harbour/contrib/hbnf/doc/en/calendar.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_CALENDAR()
    $CATEGORY$
       Date/Time
diff --git a/harbour/contrib/hbnf/doc/en/caplock.txt b/harbour/contrib/hbnf/doc/en/caplock.txt
index 5936dd5d7f..ca3ffc711b 100644
--- a/harbour/contrib/hbnf/doc/en/caplock.txt
+++ b/harbour/contrib/hbnf/doc/en/caplock.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_CAPLOCK()
    $CATEGORY$
       Keyboard/Mouse
diff --git a/harbour/contrib/hbnf/doc/en/chdir.txt b/harbour/contrib/hbnf/doc/en/chdir.txt
index eff2e228cf..8047489422 100644
--- a/harbour/contrib/hbnf/doc/en/chdir.txt
+++ b/harbour/contrib/hbnf/doc/en/chdir.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_CHDIR()
    $CATEGORY$
       DOS/BIOS
diff --git a/harbour/contrib/hbnf/doc/en/cint86.txt b/harbour/contrib/hbnf/doc/en/cint86.txt
index 814b3a0521..9b9c0a9659 100644
--- a/harbour/contrib/hbnf/doc/en/cint86.txt
+++ b/harbour/contrib/hbnf/doc/en/cint86.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_INT86()
    $CATEGORY$
       DOS/BIOS
diff --git a/harbour/contrib/hbnf/doc/en/clrsel.txt b/harbour/contrib/hbnf/doc/en/clrsel.txt
index 186988a047..78458ad4e5 100644
--- a/harbour/contrib/hbnf/doc/en/clrsel.txt
+++ b/harbour/contrib/hbnf/doc/en/clrsel.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_ClrSel()
    $CATEGORY$
       Menus/Prompts
diff --git a/harbour/contrib/hbnf/doc/en/cntryset.txt b/harbour/contrib/hbnf/doc/en/cntryset.txt
index ef21d01d85..7459df1e62 100644
--- a/harbour/contrib/hbnf/doc/en/cntryset.txt
+++ b/harbour/contrib/hbnf/doc/en/cntryset.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_SETCENTURY()
    $CATEGORY$
       Environment
diff --git a/harbour/contrib/hbnf/doc/en/color2n.txt b/harbour/contrib/hbnf/doc/en/color2n.txt
index b987246437..86f619a673 100644
--- a/harbour/contrib/hbnf/doc/en/color2n.txt
+++ b/harbour/contrib/hbnf/doc/en/color2n.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_COLOR2N()
    $CATEGORY$
       String
diff --git a/harbour/contrib/hbnf/doc/en/ctrl.txt b/harbour/contrib/hbnf/doc/en/ctrl.txt
index 85a9562323..d416aae97c 100644
--- a/harbour/contrib/hbnf/doc/en/ctrl.txt
+++ b/harbour/contrib/hbnf/doc/en/ctrl.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_CTRL()
    $CATEGORY$
       Keyboard/Mouse
diff --git a/harbour/contrib/hbnf/doc/en/d2e.txt b/harbour/contrib/hbnf/doc/en/d2e.txt
index 524b92314a..e321676518 100644
--- a/harbour/contrib/hbnf/doc/en/d2e.txt
+++ b/harbour/contrib/hbnf/doc/en/d2e.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_D2E()
    $CATEGORY$
       Conversion
diff --git a/harbour/contrib/hbnf/doc/en/datecnfg.txt b/harbour/contrib/hbnf/doc/en/datecnfg.txt
index 7885909281..881f901b07 100644
--- a/harbour/contrib/hbnf/doc/en/datecnfg.txt
+++ b/harbour/contrib/hbnf/doc/en/datecnfg.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_DATECNFG()
    $CATEGORY$
       Date/Time
diff --git a/harbour/contrib/hbnf/doc/en/dayofyr.txt b/harbour/contrib/hbnf/doc/en/dayofyr.txt
index aaa41dca53..9b9a4a912b 100644
--- a/harbour/contrib/hbnf/doc/en/dayofyr.txt
+++ b/harbour/contrib/hbnf/doc/en/dayofyr.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_DAYOFYR()
    $CATEGORY$
       Date/Time
diff --git a/harbour/contrib/hbnf/doc/en/daytobow.txt b/harbour/contrib/hbnf/doc/en/daytobow.txt
index 394b61f497..a0e1a44e0b 100644
--- a/harbour/contrib/hbnf/doc/en/daytobow.txt
+++ b/harbour/contrib/hbnf/doc/en/daytobow.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_DAYTOBOW()
    $CATEGORY$
       Date/Time
diff --git a/harbour/contrib/hbnf/doc/en/dectobin.txt b/harbour/contrib/hbnf/doc/en/dectobin.txt
index 1cd97cfec7..9986d0c26a 100644
--- a/harbour/contrib/hbnf/doc/en/dectobin.txt
+++ b/harbour/contrib/hbnf/doc/en/dectobin.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_DEC2BIN()
    $CATEGORY$
       Conversion
diff --git a/harbour/contrib/hbnf/doc/en/default.txt b/harbour/contrib/hbnf/doc/en/default.txt
index daf30b3d37..a416f5e71e 100644
--- a/harbour/contrib/hbnf/doc/en/default.txt
+++ b/harbour/contrib/hbnf/doc/en/default.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_DEFAULT()
    $CATEGORY$
       DOS/BIOS
diff --git a/harbour/contrib/hbnf/doc/en/descendn.txt b/harbour/contrib/hbnf/doc/en/descendn.txt
index 46ef9a1cb2..f736ca29e3 100644
--- a/harbour/contrib/hbnf/doc/en/descendn.txt
+++ b/harbour/contrib/hbnf/doc/en/descendn.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_Descend()
    $CATEGORY$
       Conversion
diff --git a/harbour/contrib/hbnf/doc/en/dfile.txt b/harbour/contrib/hbnf/doc/en/dfile.txt
index cb149ce700..43db212ea7 100644
--- a/harbour/contrib/hbnf/doc/en/dfile.txt
+++ b/harbour/contrib/hbnf/doc/en/dfile.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_DFSETUP()
    $CATEGORY$
       File I/O
@@ -56,7 +56,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_DFCLOSE()
    $CATEGORY$
       File I/O
diff --git a/harbour/contrib/hbnf/doc/en/diskfunc.txt b/harbour/contrib/hbnf/doc/en/diskfunc.txt
index 9a6b030f91..546fb126d8 100644
--- a/harbour/contrib/hbnf/doc/en/diskfunc.txt
+++ b/harbour/contrib/hbnf/doc/en/diskfunc.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_DSKSIZE()
    $CATEGORY$
       DOS/BIOS
@@ -27,7 +27,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_DSKFREE()
    $CATEGORY$
       DOS/BIOS
diff --git a/harbour/contrib/hbnf/doc/en/dispc.txt b/harbour/contrib/hbnf/doc/en/dispc.txt
index 17028b6435..82654f6ca8 100644
--- a/harbour/contrib/hbnf/doc/en/dispc.txt
+++ b/harbour/contrib/hbnf/doc/en/dispc.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_DISPFILE()
    $CATEGORY$
       File I/O
diff --git a/harbour/contrib/hbnf/doc/en/dispmsg.txt b/harbour/contrib/hbnf/doc/en/dispmsg.txt
index cdf42ed2f6..52fb4a23cb 100644
--- a/harbour/contrib/hbnf/doc/en/dispmsg.txt
+++ b/harbour/contrib/hbnf/doc/en/dispmsg.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_DISPMSG()
    $CATEGORY$
       Menus/Prompts
diff --git a/harbour/contrib/hbnf/doc/en/dosver.txt b/harbour/contrib/hbnf/doc/en/dosver.txt
index 69dc066a99..a23deb777c 100644
--- a/harbour/contrib/hbnf/doc/en/dosver.txt
+++ b/harbour/contrib/hbnf/doc/en/dosver.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_DOSVER
    $CATEGORY$
       DOS/BIOS
diff --git a/harbour/contrib/hbnf/doc/en/e2d.txt b/harbour/contrib/hbnf/doc/en/e2d.txt
index b74ff286c3..2bc96be0d5 100644
--- a/harbour/contrib/hbnf/doc/en/e2d.txt
+++ b/harbour/contrib/hbnf/doc/en/e2d.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_E2D()
    $CATEGORY$
       Conversion
diff --git a/harbour/contrib/hbnf/doc/en/easter.txt b/harbour/contrib/hbnf/doc/en/easter.txt
index 7d4b4fea7e..5be2a5fda3 100644
--- a/harbour/contrib/hbnf/doc/en/easter.txt
+++ b/harbour/contrib/hbnf/doc/en/easter.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_EASTER()
    $CATEGORY$
       Date/Time
diff --git a/harbour/contrib/hbnf/doc/en/elapmil.txt b/harbour/contrib/hbnf/doc/en/elapmil.txt
index d1b71082e7..eda09a27eb 100644
--- a/harbour/contrib/hbnf/doc/en/elapmil.txt
+++ b/harbour/contrib/hbnf/doc/en/elapmil.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_ELAPMIN()
    $CATEGORY$
       Date/Time
diff --git a/harbour/contrib/hbnf/doc/en/elapsed.txt b/harbour/contrib/hbnf/doc/en/elapsed.txt
index dd205c04df..1e18b2a81e 100644
--- a/harbour/contrib/hbnf/doc/en/elapsed.txt
+++ b/harbour/contrib/hbnf/doc/en/elapsed.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_ELAPSED()
    $CATEGORY$
       Date/Time
diff --git a/harbour/contrib/hbnf/doc/en/eltime.txt b/harbour/contrib/hbnf/doc/en/eltime.txt
index 83f27e54b1..19a9fcb7b4 100644
--- a/harbour/contrib/hbnf/doc/en/eltime.txt
+++ b/harbour/contrib/hbnf/doc/en/eltime.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_ELTIME()
    $CATEGORY$
       Date/Time
diff --git a/harbour/contrib/hbnf/doc/en/findith.txt b/harbour/contrib/hbnf/doc/en/findith.txt
index 2457a32119..1a3ec01ee5 100644
--- a/harbour/contrib/hbnf/doc/en/findith.txt
+++ b/harbour/contrib/hbnf/doc/en/findith.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_FINDITH()
    $CATEGORY$
       String
diff --git a/harbour/contrib/hbnf/doc/en/firstday.txt b/harbour/contrib/hbnf/doc/en/firstday.txt
index 2b15262f26..6d1a508446 100644
--- a/harbour/contrib/hbnf/doc/en/firstday.txt
+++ b/harbour/contrib/hbnf/doc/en/firstday.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_FDAY()
    $CATEGORY$
       Date/Time
diff --git a/harbour/contrib/hbnf/doc/en/floptst.txt b/harbour/contrib/hbnf/doc/en/floptst.txt
index 07713caddb..41f6d73555 100644
--- a/harbour/contrib/hbnf/doc/en/floptst.txt
+++ b/harbour/contrib/hbnf/doc/en/floptst.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_FLOPTST()
    $CATEGORY$
       DOS/BIOS
diff --git a/harbour/contrib/hbnf/doc/en/ftattr.txt b/harbour/contrib/hbnf/doc/en/ftattr.txt
index 787a0cadbf..af8a28a84c 100644
--- a/harbour/contrib/hbnf/doc/en/ftattr.txt
+++ b/harbour/contrib/hbnf/doc/en/ftattr.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_SAVEATT()
    $CATEGORY$
       Video
@@ -39,7 +39,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_RESTATT()
    $CATEGORY$
       Video
diff --git a/harbour/contrib/hbnf/doc/en/fttext.txt b/harbour/contrib/hbnf/doc/en/fttext.txt
index 19bc5110d1..ceccfd2dbf 100644
--- a/harbour/contrib/hbnf/doc/en/fttext.txt
+++ b/harbour/contrib/hbnf/doc/en/fttext.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_FUSE()
    $CATEGORY$
       File I/O
@@ -61,7 +61,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_FSELECT()
    $CATEGORY$
       File I/O
@@ -114,7 +114,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_FGOTOP()
    $CATEGORY$
       File I/O
@@ -155,7 +155,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_FERROR()
    $CATEGORY$
       File I/O
@@ -190,7 +190,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_FRECNO()
    $CATEGORY$
       File I/O
@@ -231,7 +231,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_FGOBOT()
    $CATEGORY$
       File I/O
@@ -267,7 +267,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_FSKIP()
    $CATEGORY$
       File I/O
@@ -315,7 +315,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_FREADLN()
    $CATEGORY$
       File I/O
@@ -363,7 +363,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_FDELETE()
    $CATEGORY$
       File I/O
@@ -400,7 +400,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_FINSERT()
    $CATEGORY$
       File I/O
@@ -442,7 +442,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_FAPPEND()
    $CATEGORY$
       File I/O
@@ -494,7 +494,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_FWRITELN()
    $CATEGORY$
       File I/O
@@ -550,7 +550,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_FLASTRE()
    $CATEGORY$
       File I/O
@@ -582,7 +582,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_FEOF()
    $CATEGORY$
       File I/O
@@ -617,7 +617,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_FBOF()
    $CATEGORY$
       File I/O
@@ -654,7 +654,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_FGOTO()
    $CATEGORY$
       File I/O
diff --git a/harbour/contrib/hbnf/doc/en/gcd.txt b/harbour/contrib/hbnf/doc/en/gcd.txt
index 24beb8465d..7c26e18412 100644
--- a/harbour/contrib/hbnf/doc/en/gcd.txt
+++ b/harbour/contrib/hbnf/doc/en/gcd.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_GCD()
    $CATEGORY$
       Math
diff --git a/harbour/contrib/hbnf/doc/en/getenvrn.txt b/harbour/contrib/hbnf/doc/en/getenvrn.txt
index a309adc49d..3e0f1aa9c2 100644
--- a/harbour/contrib/hbnf/doc/en/getenvrn.txt
+++ b/harbour/contrib/hbnf/doc/en/getenvrn.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_GETE()
    $CATEGORY$
       Environment
diff --git a/harbour/contrib/hbnf/doc/en/hex2dec.txt b/harbour/contrib/hbnf/doc/en/hex2dec.txt
index 4c6cbd895c..5c3e03cd28 100644
--- a/harbour/contrib/hbnf/doc/en/hex2dec.txt
+++ b/harbour/contrib/hbnf/doc/en/hex2dec.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_HEX2DEC()
    $CATEGORY$
       Conversion
diff --git a/harbour/contrib/hbnf/doc/en/iamidle.txt b/harbour/contrib/hbnf/doc/en/iamidle.txt
index a3b4f0f0ea..d5328c3681 100644
--- a/harbour/contrib/hbnf/doc/en/iamidle.txt
+++ b/harbour/contrib/hbnf/doc/en/iamidle.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_IAmIdle()
    $CATEGORY$
       DOS/BIOS
diff --git a/harbour/contrib/hbnf/doc/en/idle.txt b/harbour/contrib/hbnf/doc/en/idle.txt
index 470777b079..ef2dd00507 100644
--- a/harbour/contrib/hbnf/doc/en/idle.txt
+++ b/harbour/contrib/hbnf/doc/en/idle.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_Idle()
    $CATEGORY$
       Event
diff --git a/harbour/contrib/hbnf/doc/en/inp.txt b/harbour/contrib/hbnf/doc/en/inp.txt
index 92cc3355f9..1bd81d66e3 100644
--- a/harbour/contrib/hbnf/doc/en/inp.txt
+++ b/harbour/contrib/hbnf/doc/en/inp.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_INP()
    $CATEGORY$
       DOS/BIOS
diff --git a/harbour/contrib/hbnf/doc/en/invclr.txt b/harbour/contrib/hbnf/doc/en/invclr.txt
index fb287389a8..338d583da3 100644
--- a/harbour/contrib/hbnf/doc/en/invclr.txt
+++ b/harbour/contrib/hbnf/doc/en/invclr.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_INVCLR()
    $CATEGORY$
       Conversion
diff --git a/harbour/contrib/hbnf/doc/en/isbit.txt b/harbour/contrib/hbnf/doc/en/isbit.txt
index bad59c4ec4..6968b86748 100644
--- a/harbour/contrib/hbnf/doc/en/isbit.txt
+++ b/harbour/contrib/hbnf/doc/en/isbit.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_ISBIT()
    $CATEGORY$
       String
diff --git a/harbour/contrib/hbnf/doc/en/isbiton.txt b/harbour/contrib/hbnf/doc/en/isbiton.txt
index 428958e317..9aa7b8d74f 100644
--- a/harbour/contrib/hbnf/doc/en/isbiton.txt
+++ b/harbour/contrib/hbnf/doc/en/isbiton.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_ISBITON()
    $CATEGORY$
       String
diff --git a/harbour/contrib/hbnf/doc/en/isprint.txt b/harbour/contrib/hbnf/doc/en/isprint.txt
index efa7d7b2e7..56114e7a5d 100644
--- a/harbour/contrib/hbnf/doc/en/isprint.txt
+++ b/harbour/contrib/hbnf/doc/en/isprint.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_ISPRINT()
    $CATEGORY$
       DOS/BIOS
diff --git a/harbour/contrib/hbnf/doc/en/isshare.txt b/harbour/contrib/hbnf/doc/en/isshare.txt
index d7c013599a..9b7286cf73 100644
--- a/harbour/contrib/hbnf/doc/en/isshare.txt
+++ b/harbour/contrib/hbnf/doc/en/isshare.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_ISSHARE()
    $CATEGORY$
       DOS/BIOS
diff --git a/harbour/contrib/hbnf/doc/en/kspeed.txt b/harbour/contrib/hbnf/doc/en/kspeed.txt
index 2496076fb6..23c7559234 100644
--- a/harbour/contrib/hbnf/doc/en/kspeed.txt
+++ b/harbour/contrib/hbnf/doc/en/kspeed.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_SETRATE()
    $CATEGORY$
       Keyboard/Mouse
diff --git a/harbour/contrib/hbnf/doc/en/lastday.txt b/harbour/contrib/hbnf/doc/en/lastday.txt
index caa6b83123..993a1e7e61 100644
--- a/harbour/contrib/hbnf/doc/en/lastday.txt
+++ b/harbour/contrib/hbnf/doc/en/lastday.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_LDAY()
    $CATEGORY$
       Date/Time
diff --git a/harbour/contrib/hbnf/doc/en/linked.txt b/harbour/contrib/hbnf/doc/en/linked.txt
index 9127b92396..707018af99 100644
--- a/harbour/contrib/hbnf/doc/en/linked.txt
+++ b/harbour/contrib/hbnf/doc/en/linked.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_LINKED()
    $CATEGORY$
       Environment
diff --git a/harbour/contrib/hbnf/doc/en/madd.txt b/harbour/contrib/hbnf/doc/en/madd.txt
index 6f8cf52383..f24ac67f92 100644
--- a/harbour/contrib/hbnf/doc/en/madd.txt
+++ b/harbour/contrib/hbnf/doc/en/madd.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_MADD()
    $CATEGORY$
       Date/Time
diff --git a/harbour/contrib/hbnf/doc/en/menu1.txt b/harbour/contrib/hbnf/doc/en/menu1.txt
index 4998b9020b..e95bf54764 100644
--- a/harbour/contrib/hbnf/doc/en/menu1.txt
+++ b/harbour/contrib/hbnf/doc/en/menu1.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_MENU1()
    $CATEGORY$
       Menus/Prompts
@@ -116,7 +116,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_FILL()
    $CATEGORY$
       Menus/Prompts
diff --git a/harbour/contrib/hbnf/doc/en/menutonf.txt b/harbour/contrib/hbnf/doc/en/menutonf.txt
index 2ed0d00e16..e0c4cdeda3 100644
--- a/harbour/contrib/hbnf/doc/en/menutonf.txt
+++ b/harbour/contrib/hbnf/doc/en/menutonf.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_Prompt()
    $CATEGORY$
       Menus/Prompts
@@ -151,7 +151,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_MenuTo()
    $CATEGORY$
       Menus/Prompts
diff --git a/harbour/contrib/hbnf/doc/en/metaph.txt b/harbour/contrib/hbnf/doc/en/metaph.txt
index 60686beec0..002137a1b9 100644
--- a/harbour/contrib/hbnf/doc/en/metaph.txt
+++ b/harbour/contrib/hbnf/doc/en/metaph.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_METAPH()
    $CATEGORY$
       String
diff --git a/harbour/contrib/hbnf/doc/en/miltime.txt b/harbour/contrib/hbnf/doc/en/miltime.txt
index a91ee39e9d..777270372c 100644
--- a/harbour/contrib/hbnf/doc/en/miltime.txt
+++ b/harbour/contrib/hbnf/doc/en/miltime.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_MIL2MIN()
    $CATEGORY$
       Date/Time
@@ -25,7 +25,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_MIN2MIL()
    $CATEGORY$
       Date/Time
@@ -47,7 +47,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_MIL2CIV()
    $CATEGORY$
       Date/Time
@@ -80,7 +80,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_CIV2MIL()
    $CATEGORY$
       Date/Time
@@ -112,7 +112,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_SYS2MIL()
    $CATEGORY$
       Date/Time
diff --git a/harbour/contrib/hbnf/doc/en/min2dhm.txt b/harbour/contrib/hbnf/doc/en/min2dhm.txt
index 1ef921d53c..d37e611359 100644
--- a/harbour/contrib/hbnf/doc/en/min2dhm.txt
+++ b/harbour/contrib/hbnf/doc/en/min2dhm.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_MIN2DHM()
    $CATEGORY$
       Date/Time
diff --git a/harbour/contrib/hbnf/doc/en/mkdir.txt b/harbour/contrib/hbnf/doc/en/mkdir.txt
index ea22b571ec..d780e6e901 100644
--- a/harbour/contrib/hbnf/doc/en/mkdir.txt
+++ b/harbour/contrib/hbnf/doc/en/mkdir.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_MKDIR()
    $CATEGORY$
       DOS/BIOS
diff --git a/harbour/contrib/hbnf/doc/en/month.txt b/harbour/contrib/hbnf/doc/en/month.txt
index 2eb64a4849..df3bba9bd3 100644
--- a/harbour/contrib/hbnf/doc/en/month.txt
+++ b/harbour/contrib/hbnf/doc/en/month.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_MONTH()
    $CATEGORY$
       Date/Time
diff --git a/harbour/contrib/hbnf/doc/en/mouse1.txt b/harbour/contrib/hbnf/doc/en/mouse1.txt
index 765a3f0551..a1d3d7e626 100644
--- a/harbour/contrib/hbnf/doc/en/mouse1.txt
+++ b/harbour/contrib/hbnf/doc/en/mouse1.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_MINIT()
    $CATEGORY$
       Keyboard/Mouse
@@ -31,7 +31,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_MMICKEYS()
    $CATEGORY$
       Keyboard/Mouse
@@ -56,7 +56,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_MDBLCLK()
    $CATEGORY$
       Keyboard/Mouse
@@ -115,7 +115,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_MCONOFF()
    $CATEGORY$
       Keyboard/Mouse
@@ -143,7 +143,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_MINREGION()
    $CATEGORY$
       Keyboard/Mouse
@@ -168,7 +168,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_MSETSENS()
    $CATEGORY$
       Keyboard/Mouse
@@ -230,7 +230,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_MGETSENS()
    $CATEGORY$
       Keyboard/Mouse
@@ -261,7 +261,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_MVERSION()
    $CATEGORY$
       Keyboard/Mouse
@@ -304,7 +304,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_MSETPAGE()
    $CATEGORY$
       Keyboard/Mouse
@@ -328,7 +328,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_MGETPAGE()
    $CATEGORY$
       Keyboard/Mouse
@@ -353,7 +353,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_MRESET()
    $CATEGORY$
       Keyboard/Mouse
@@ -385,7 +385,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_MCURSOR()
    $CATEGORY$
       Keyboard/Mouse
@@ -411,7 +411,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_MSHOWCRS()
    $CATEGORY$
       Keyboard/Mouse
@@ -445,7 +445,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_MHIDECRS()
    $CATEGORY$
       Keyboard/Mouse
@@ -479,7 +479,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_MGETPOS()
    $CATEGORY$
       Keyboard/Mouse
@@ -523,7 +523,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_MGETX()
    $CATEGORY$
       Keyboard/Mouse
@@ -548,7 +548,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_MGETY()
    $CATEGORY$
       Keyboard/Mouse
@@ -572,7 +572,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_MSETPOS()
    $CATEGORY$
       Keyboard/Mouse
@@ -599,7 +599,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_MSETCOORD()
    $CATEGORY$
       Keyboard/Mouse
@@ -625,7 +625,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_MXLIMIT()
    $CATEGORY$
       Keyboard/Mouse
@@ -649,7 +649,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_MYLIMIT()
    $CATEGORY$
       Keyboard/Mouse
@@ -673,7 +673,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_MBUTPRS()
    $CATEGORY$
       Keyboard/Mouse
@@ -719,7 +719,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_MBUTREL()
    $CATEGORY$
       Keyboard/Mouse
@@ -760,7 +760,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_MDEFCRS()
    $CATEGORY$
       Keyboard/Mouse
@@ -818,7 +818,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_MGETCOORD()
    $CATEGORY$
       Keyboard/Mouse
diff --git a/harbour/contrib/hbnf/doc/en/n2color.txt b/harbour/contrib/hbnf/doc/en/n2color.txt
index fb9c103126..b2562e351a 100644
--- a/harbour/contrib/hbnf/doc/en/n2color.txt
+++ b/harbour/contrib/hbnf/doc/en/n2color.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_N2COLOR()
    $CATEGORY$
       String
diff --git a/harbour/contrib/hbnf/doc/en/netpv.txt b/harbour/contrib/hbnf/doc/en/netpv.txt
index a24786785d..2730e8d3e2 100644
--- a/harbour/contrib/hbnf/doc/en/netpv.txt
+++ b/harbour/contrib/hbnf/doc/en/netpv.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_NETPV()
    $CATEGORY$
       Math
diff --git a/harbour/contrib/hbnf/doc/en/nooccur.txt b/harbour/contrib/hbnf/doc/en/nooccur.txt
index a97527fa4c..94f1562b5b 100644
--- a/harbour/contrib/hbnf/doc/en/nooccur.txt
+++ b/harbour/contrib/hbnf/doc/en/nooccur.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_NOOCCUR()
    $CATEGORY$
       String
diff --git a/harbour/contrib/hbnf/doc/en/ntow.txt b/harbour/contrib/hbnf/doc/en/ntow.txt
index 705e8bb31b..077ad76fb8 100644
--- a/harbour/contrib/hbnf/doc/en/ntow.txt
+++ b/harbour/contrib/hbnf/doc/en/ntow.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_NTOW()
    $CATEGORY$
       Conversion
diff --git a/harbour/contrib/hbnf/doc/en/numlock.txt b/harbour/contrib/hbnf/doc/en/numlock.txt
index 59a5df1b2b..972c3c639f 100644
--- a/harbour/contrib/hbnf/doc/en/numlock.txt
+++ b/harbour/contrib/hbnf/doc/en/numlock.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_NUMLOCK()
    $CATEGORY$
       Keyboard/Mouse
diff --git a/harbour/contrib/hbnf/doc/en/nwlstat.txt b/harbour/contrib/hbnf/doc/en/nwlstat.txt
index efbd06b731..37968012c1 100644
--- a/harbour/contrib/hbnf/doc/en/nwlstat.txt
+++ b/harbour/contrib/hbnf/doc/en/nwlstat.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_NWLSTAT()
    $CATEGORY$
       NetWare
diff --git a/harbour/contrib/hbnf/doc/en/nwsem.txt b/harbour/contrib/hbnf/doc/en/nwsem.txt
index d2e9ab7278..bd29824db7 100644
--- a/harbour/contrib/hbnf/doc/en/nwsem.txt
+++ b/harbour/contrib/hbnf/doc/en/nwsem.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_NWSEMOPEN()
    $CATEGORY$
       NetWare
@@ -95,7 +95,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_NWSEMEX()
    $CATEGORY$
       NetWare
@@ -148,7 +148,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_NWSEMWAIT()
    $CATEGORY$
       NetWare
@@ -186,7 +186,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_NWSEMSIG()
    $CATEGORY$
       NetWare
@@ -217,7 +217,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_NWSEMCLOSE()
    $CATEGORY$
       NetWare
@@ -245,7 +245,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_NWSEMLOCK()
    $CATEGORY$
       NetWare
@@ -308,7 +308,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_NWSEMUNLOCK()
    $CATEGORY$
       NetWare
diff --git a/harbour/contrib/hbnf/doc/en/nwuid.txt b/harbour/contrib/hbnf/doc/en/nwuid.txt
index 09f36a8d9f..e752c09cb1 100644
--- a/harbour/contrib/hbnf/doc/en/nwuid.txt
+++ b/harbour/contrib/hbnf/doc/en/nwuid.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_NWUID()
    $CATEGORY$
       NetWare
diff --git a/harbour/contrib/hbnf/doc/en/ontick.txt b/harbour/contrib/hbnf/doc/en/ontick.txt
index 652e62d7cd..d7bd2097de 100644
--- a/harbour/contrib/hbnf/doc/en/ontick.txt
+++ b/harbour/contrib/hbnf/doc/en/ontick.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_OnTick()
    $CATEGORY$
       Event
diff --git a/harbour/contrib/hbnf/doc/en/origin.txt b/harbour/contrib/hbnf/doc/en/origin.txt
index ecb5661649..d88962b69b 100644
--- a/harbour/contrib/hbnf/doc/en/origin.txt
+++ b/harbour/contrib/hbnf/doc/en/origin.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_ORIGIN()
    $CATEGORY$
       Environment
diff --git a/harbour/contrib/hbnf/doc/en/outp.txt b/harbour/contrib/hbnf/doc/en/outp.txt
index a740348be5..68f325b181 100644
--- a/harbour/contrib/hbnf/doc/en/outp.txt
+++ b/harbour/contrib/hbnf/doc/en/outp.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_OUTP()
    $CATEGORY$
       DOS/BIOS
diff --git a/harbour/contrib/hbnf/doc/en/page.txt b/harbour/contrib/hbnf/doc/en/page.txt
index 781cfc8f28..e5f1f02a29 100644
--- a/harbour/contrib/hbnf/doc/en/page.txt
+++ b/harbour/contrib/hbnf/doc/en/page.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_SETVPG()
    $CATEGORY$
       Video
@@ -31,7 +31,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_GETVPG()
    $CATEGORY$
       Video
diff --git a/harbour/contrib/hbnf/doc/en/pchr.txt b/harbour/contrib/hbnf/doc/en/pchr.txt
index 5388e468c0..b5a0260598 100644
--- a/harbour/contrib/hbnf/doc/en/pchr.txt
+++ b/harbour/contrib/hbnf/doc/en/pchr.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_PChr()
    $CATEGORY$
       String
diff --git a/harbour/contrib/hbnf/doc/en/peek.txt b/harbour/contrib/hbnf/doc/en/peek.txt
index b5244d86e5..1c660edcdc 100644
--- a/harbour/contrib/hbnf/doc/en/peek.txt
+++ b/harbour/contrib/hbnf/doc/en/peek.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_PEEK()
    $CATEGORY$
       DOS/BIOS
diff --git a/harbour/contrib/hbnf/doc/en/pegs.txt b/harbour/contrib/hbnf/doc/en/pegs.txt
index 6682753c79..f5d6e9b74a 100644
--- a/harbour/contrib/hbnf/doc/en/pegs.txt
+++ b/harbour/contrib/hbnf/doc/en/pegs.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_PEGS()
    $CATEGORY$
       Game
diff --git a/harbour/contrib/hbnf/doc/en/pending.txt b/harbour/contrib/hbnf/doc/en/pending.txt
index 7d04d1e0bf..2c9cd52b8d 100644
--- a/harbour/contrib/hbnf/doc/en/pending.txt
+++ b/harbour/contrib/hbnf/doc/en/pending.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_PENDING()
    $CATEGORY$
       Menus/Prompts
diff --git a/harbour/contrib/hbnf/doc/en/pickday.txt b/harbour/contrib/hbnf/doc/en/pickday.txt
index 9543ff66f0..d8302804d4 100644
--- a/harbour/contrib/hbnf/doc/en/pickday.txt
+++ b/harbour/contrib/hbnf/doc/en/pickday.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_PICKDAY()
    $CATEGORY$
       Menus/Prompts
diff --git a/harbour/contrib/hbnf/doc/en/poke.txt b/harbour/contrib/hbnf/doc/en/poke.txt
index cfb3d642d9..ef730093bd 100644
--- a/harbour/contrib/hbnf/doc/en/poke.txt
+++ b/harbour/contrib/hbnf/doc/en/poke.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_POKE()
    $CATEGORY$
       DOS/BIOS
diff --git a/harbour/contrib/hbnf/doc/en/popadder.txt b/harbour/contrib/hbnf/doc/en/popadder.txt
index 8e0f138bc1..03f980dda1 100644
--- a/harbour/contrib/hbnf/doc/en/popadder.txt
+++ b/harbour/contrib/hbnf/doc/en/popadder.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_Adder()
    $CATEGORY$
       Menus/Prompts
diff --git a/harbour/contrib/hbnf/doc/en/proper.txt b/harbour/contrib/hbnf/doc/en/proper.txt
index 855d87e7e1..fa5eff37ed 100644
--- a/harbour/contrib/hbnf/doc/en/proper.txt
+++ b/harbour/contrib/hbnf/doc/en/proper.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_PROPER()
    $CATEGORY$
       String
diff --git a/harbour/contrib/hbnf/doc/en/prtesc.txt b/harbour/contrib/hbnf/doc/en/prtesc.txt
index 9ff7ece168..ed353266f3 100644
--- a/harbour/contrib/hbnf/doc/en/prtesc.txt
+++ b/harbour/contrib/hbnf/doc/en/prtesc.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_ESCCODE()
    $CATEGORY$
       Conversion
diff --git a/harbour/contrib/hbnf/doc/en/prtscr.txt b/harbour/contrib/hbnf/doc/en/prtscr.txt
index 3a70af64e5..27ff8688c4 100644
--- a/harbour/contrib/hbnf/doc/en/prtscr.txt
+++ b/harbour/contrib/hbnf/doc/en/prtscr.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_PRTSCR()
    $CATEGORY$
       Keyboard/Mouse
diff --git a/harbour/contrib/hbnf/doc/en/putkey.txt b/harbour/contrib/hbnf/doc/en/putkey.txt
index 9a3efb44ca..80eefb0d14 100644
--- a/harbour/contrib/hbnf/doc/en/putkey.txt
+++ b/harbour/contrib/hbnf/doc/en/putkey.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_PUTKEY()
    $CATEGORY$
       Keyboard/Mouse
diff --git a/harbour/contrib/hbnf/doc/en/pvid.txt b/harbour/contrib/hbnf/doc/en/pvid.txt
index 4144e026d2..1937d4c749 100644
--- a/harbour/contrib/hbnf/doc/en/pvid.txt
+++ b/harbour/contrib/hbnf/doc/en/pvid.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_PUSHVID()
    $CATEGORY$
       Video
@@ -33,7 +33,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_POPVID()
    $CATEGORY$
       Video
diff --git a/harbour/contrib/hbnf/doc/en/qtr.txt b/harbour/contrib/hbnf/doc/en/qtr.txt
index 006aeacc52..4ec37c9755 100644
--- a/harbour/contrib/hbnf/doc/en/qtr.txt
+++ b/harbour/contrib/hbnf/doc/en/qtr.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_QTR()
    $CATEGORY$
       Date/Time
diff --git a/harbour/contrib/hbnf/doc/en/rand1.txt b/harbour/contrib/hbnf/doc/en/rand1.txt
index 9395020655..24a8d0ffe2 100644
--- a/harbour/contrib/hbnf/doc/en/rand1.txt
+++ b/harbour/contrib/hbnf/doc/en/rand1.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_RAND1()
    $CATEGORY$
       Math
diff --git a/harbour/contrib/hbnf/doc/en/reboot.txt b/harbour/contrib/hbnf/doc/en/reboot.txt
index 333ffac12d..7f9f3cf0af 100644
--- a/harbour/contrib/hbnf/doc/en/reboot.txt
+++ b/harbour/contrib/hbnf/doc/en/reboot.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_REBOOT()
    $CATEGORY$
       DOS/BIOS
diff --git a/harbour/contrib/hbnf/doc/en/restsets.txt b/harbour/contrib/hbnf/doc/en/restsets.txt
index b7624a0572..910ddde62d 100644
--- a/harbour/contrib/hbnf/doc/en/restsets.txt
+++ b/harbour/contrib/hbnf/doc/en/restsets.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_RESTSETS()
    $CATEGORY$
       Environment
diff --git a/harbour/contrib/hbnf/doc/en/rmdir.txt b/harbour/contrib/hbnf/doc/en/rmdir.txt
index 71b8114a8f..8dd8bcfec6 100644
--- a/harbour/contrib/hbnf/doc/en/rmdir.txt
+++ b/harbour/contrib/hbnf/doc/en/rmdir.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_RMDIR()
    $CATEGORY$
       DOS/BIOS
diff --git a/harbour/contrib/hbnf/doc/en/round.txt b/harbour/contrib/hbnf/doc/en/round.txt
index 99b005375c..20793ce3bf 100644
--- a/harbour/contrib/hbnf/doc/en/round.txt
+++ b/harbour/contrib/hbnf/doc/en/round.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_ROUND()
    $CATEGORY$
       Math
diff --git a/harbour/contrib/hbnf/doc/en/savearr.txt b/harbour/contrib/hbnf/doc/en/savearr.txt
index c8816ad879..eaac53d613 100644
--- a/harbour/contrib/hbnf/doc/en/savearr.txt
+++ b/harbour/contrib/hbnf/doc/en/savearr.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_SAVEARR()
    $CATEGORY$
       Array
@@ -58,7 +58,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_RESTARR()
    $CATEGORY$
       Array
diff --git a/harbour/contrib/hbnf/doc/en/savesets.txt b/harbour/contrib/hbnf/doc/en/savesets.txt
index 034606dc5b..3ddbdda09f 100644
--- a/harbour/contrib/hbnf/doc/en/savesets.txt
+++ b/harbour/contrib/hbnf/doc/en/savesets.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_SAVESETS()
    $CATEGORY$
       Environment
diff --git a/harbour/contrib/hbnf/doc/en/scancode.txt b/harbour/contrib/hbnf/doc/en/scancode.txt
index a85caf0c05..d84d249a9e 100644
--- a/harbour/contrib/hbnf/doc/en/scancode.txt
+++ b/harbour/contrib/hbnf/doc/en/scancode.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_SCANCODE()
    $CATEGORY$
       Keyboard/Mouse
diff --git a/harbour/contrib/hbnf/doc/en/scregion.txt b/harbour/contrib/hbnf/doc/en/scregion.txt
index 0e76d91b5b..0bffbf28fe 100644
--- a/harbour/contrib/hbnf/doc/en/scregion.txt
+++ b/harbour/contrib/hbnf/doc/en/scregion.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_SAVRGN()
    $CATEGORY$
       Video
@@ -42,7 +42,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_RSTRGN()
    $CATEGORY$
       Video
@@ -88,7 +88,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_RGNSTACK()
    $CATEGORY$
       Video
diff --git a/harbour/contrib/hbnf/doc/en/setdate.txt b/harbour/contrib/hbnf/doc/en/setdate.txt
index aea5608cbd..98790d9872 100644
--- a/harbour/contrib/hbnf/doc/en/setdate.txt
+++ b/harbour/contrib/hbnf/doc/en/setdate.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_SETDATE()
    $CATEGORY$
       DOS/BIOS
diff --git a/harbour/contrib/hbnf/doc/en/setkeys.txt b/harbour/contrib/hbnf/doc/en/setkeys.txt
index 4a631c68e1..35d093159d 100644
--- a/harbour/contrib/hbnf/doc/en/setkeys.txt
+++ b/harbour/contrib/hbnf/doc/en/setkeys.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_LASTKEY()
    $CATEGORY$
       Keyboard/Mouse
diff --git a/harbour/contrib/hbnf/doc/en/setlastk.txt b/harbour/contrib/hbnf/doc/en/setlastk.txt
index 4a631c68e1..35d093159d 100644
--- a/harbour/contrib/hbnf/doc/en/setlastk.txt
+++ b/harbour/contrib/hbnf/doc/en/setlastk.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_LASTKEY()
    $CATEGORY$
       Keyboard/Mouse
diff --git a/harbour/contrib/hbnf/doc/en/settime.txt b/harbour/contrib/hbnf/doc/en/settime.txt
index 2df5d74271..c0fe1c6c0e 100644
--- a/harbour/contrib/hbnf/doc/en/settime.txt
+++ b/harbour/contrib/hbnf/doc/en/settime.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_SETTIME()
    $CATEGORY$
       DOS/BIOS
diff --git a/harbour/contrib/hbnf/doc/en/shadow.txt b/harbour/contrib/hbnf/doc/en/shadow.txt
index 6acb5baa53..786801b14e 100644
--- a/harbour/contrib/hbnf/doc/en/shadow.txt
+++ b/harbour/contrib/hbnf/doc/en/shadow.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_SHADOW()
    $CATEGORY$
       Video
diff --git a/harbour/contrib/hbnf/doc/en/shift.txt b/harbour/contrib/hbnf/doc/en/shift.txt
index 16be9f2bac..b03591f2ef 100644
--- a/harbour/contrib/hbnf/doc/en/shift.txt
+++ b/harbour/contrib/hbnf/doc/en/shift.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_SHIFT()
    $CATEGORY$
       Keyboard/Mouse
diff --git a/harbour/contrib/hbnf/doc/en/sinkey.txt b/harbour/contrib/hbnf/doc/en/sinkey.txt
index d265991910..f3a73462bf 100644
--- a/harbour/contrib/hbnf/doc/en/sinkey.txt
+++ b/harbour/contrib/hbnf/doc/en/sinkey.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_SINKEY()
    $CATEGORY$
       Keyboard/Mouse
diff --git a/harbour/contrib/hbnf/doc/en/sleep.txt b/harbour/contrib/hbnf/doc/en/sleep.txt
index 3f1138a51d..73e88c5e1d 100644
--- a/harbour/contrib/hbnf/doc/en/sleep.txt
+++ b/harbour/contrib/hbnf/doc/en/sleep.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_SLEEP
    $CATEGORY$
       Menus/Prompts
diff --git a/harbour/contrib/hbnf/doc/en/sqzn.txt b/harbour/contrib/hbnf/doc/en/sqzn.txt
index 2fcb0c1702..b8aca8623e 100644
--- a/harbour/contrib/hbnf/doc/en/sqzn.txt
+++ b/harbour/contrib/hbnf/doc/en/sqzn.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_SQZN()
    $CATEGORY$
       Conversion
@@ -35,7 +35,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_UNSQZN()
    $CATEGORY$
       Conversion
diff --git a/harbour/contrib/hbnf/doc/en/stod.txt b/harbour/contrib/hbnf/doc/en/stod.txt
index d421ba2653..1c068f7d1d 100644
--- a/harbour/contrib/hbnf/doc/en/stod.txt
+++ b/harbour/contrib/hbnf/doc/en/stod.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_SToD()
    $CATEGORY$
       Conversion
diff --git a/harbour/contrib/hbnf/doc/en/sysmem.txt b/harbour/contrib/hbnf/doc/en/sysmem.txt
index 851f51e48d..200856823a 100644
--- a/harbour/contrib/hbnf/doc/en/sysmem.txt
+++ b/harbour/contrib/hbnf/doc/en/sysmem.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_SYSMEM()
    $CATEGORY$
       DOS/BIOS
diff --git a/harbour/contrib/hbnf/doc/en/tbwhile.txt b/harbour/contrib/hbnf/doc/en/tbwhile.txt
index 13a44d2065..62f9ab216a 100644
--- a/harbour/contrib/hbnf/doc/en/tbwhile.txt
+++ b/harbour/contrib/hbnf/doc/en/tbwhile.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_BRWSWHL()
    $CATEGORY$
       Menus/Prompts
diff --git a/harbour/contrib/hbnf/doc/en/tempfile.txt b/harbour/contrib/hbnf/doc/en/tempfile.txt
index 7d332cfae9..34f8cf8e66 100644
--- a/harbour/contrib/hbnf/doc/en/tempfile.txt
+++ b/harbour/contrib/hbnf/doc/en/tempfile.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_TEMPFIL()
    $CATEGORY$
       DOS/BIOS
diff --git a/harbour/contrib/hbnf/doc/en/vertmenu.txt b/harbour/contrib/hbnf/doc/en/vertmenu.txt
index 864505a5de..336ae822c6 100644
--- a/harbour/contrib/hbnf/doc/en/vertmenu.txt
+++ b/harbour/contrib/hbnf/doc/en/vertmenu.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_MENU2()
    $CATEGORY$
       Menus/Prompts
diff --git a/harbour/contrib/hbnf/doc/en/vidcur.txt b/harbour/contrib/hbnf/doc/en/vidcur.txt
index 26fe391b2c..8dff42a87f 100644
--- a/harbour/contrib/hbnf/doc/en/vidcur.txt
+++ b/harbour/contrib/hbnf/doc/en/vidcur.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_SETVCUR()
    $CATEGORY$
       Video
@@ -36,7 +36,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_GETVCUR()
    $CATEGORY$
       Video
diff --git a/harbour/contrib/hbnf/doc/en/video1.txt b/harbour/contrib/hbnf/doc/en/video1.txt
index 64eed7bc37..33506c408d 100644
--- a/harbour/contrib/hbnf/doc/en/video1.txt
+++ b/harbour/contrib/hbnf/doc/en/video1.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_VIDSTR()
    $CATEGORY$
       Video
@@ -39,7 +39,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_WRTChr()
    $CATEGORY$
       Video
@@ -78,7 +78,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_CLS()
    $CATEGORY$
       Video
@@ -112,7 +112,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_SETATTR()
    $CATEGORY$
       Video
@@ -143,7 +143,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_REVATTR()
    $CATEGORY$
       Video
@@ -170,7 +170,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_REVCHR()
    $CATEGORY$
       Video
diff --git a/harbour/contrib/hbnf/doc/en/vidmode.txt b/harbour/contrib/hbnf/doc/en/vidmode.txt
index cf0db19eeb..4b887bbcec 100644
--- a/harbour/contrib/hbnf/doc/en/vidmode.txt
+++ b/harbour/contrib/hbnf/doc/en/vidmode.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_SETMODE()
    $CATEGORY$
       Video
@@ -32,7 +32,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_GETMODE()
    $CATEGORY$
       Video
diff --git a/harbour/contrib/hbnf/doc/en/wda.txt b/harbour/contrib/hbnf/doc/en/wda.txt
index d0f9aaeb20..8f75d3ba7b 100644
--- a/harbour/contrib/hbnf/doc/en/wda.txt
+++ b/harbour/contrib/hbnf/doc/en/wda.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_ADDWKDY()
    $CATEGORY$
       Date/Time
diff --git a/harbour/contrib/hbnf/doc/en/week.txt b/harbour/contrib/hbnf/doc/en/week.txt
index be4316a861..c45228a4b5 100644
--- a/harbour/contrib/hbnf/doc/en/week.txt
+++ b/harbour/contrib/hbnf/doc/en/week.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_WEEK()
    $CATEGORY$
       Date/Time
diff --git a/harbour/contrib/hbnf/doc/en/workdays.txt b/harbour/contrib/hbnf/doc/en/workdays.txt
index 1744f929e9..adf210524c 100644
--- a/harbour/contrib/hbnf/doc/en/workdays.txt
+++ b/harbour/contrib/hbnf/doc/en/workdays.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_WORKDAYS()
    $CATEGORY$
       Date/Time
diff --git a/harbour/contrib/hbnf/doc/en/woy.txt b/harbour/contrib/hbnf/doc/en/woy.txt
index 4db7a8d2de..13a6e80f67 100644
--- a/harbour/contrib/hbnf/doc/en/woy.txt
+++ b/harbour/contrib/hbnf/doc/en/woy.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_WOY()
    $CATEGORY$
       Date/Time
@@ -45,7 +45,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_DOY()
    $CATEGORY$
       Date/Time
diff --git a/harbour/contrib/hbnf/doc/en/xbox.txt b/harbour/contrib/hbnf/doc/en/xbox.txt
index a3f2636bd2..089eeb06b7 100644
--- a/harbour/contrib/hbnf/doc/en/xbox.txt
+++ b/harbour/contrib/hbnf/doc/en/xbox.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_XBOX()
    $CATEGORY$
       Menus/Prompts
diff --git a/harbour/contrib/hbnf/doc/en/year.txt b/harbour/contrib/hbnf/doc/en/year.txt
index a376109ae8..2aa74d3875 100644
--- a/harbour/contrib/hbnf/doc/en/year.txt
+++ b/harbour/contrib/hbnf/doc/en/year.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       FT_YEAR()
    $CATEGORY$
       Date/Time
diff --git a/harbour/contrib/hbziparc/doc/en/hbziparc.txt b/harbour/contrib/hbziparc/doc/en/hbziparc.txt
index 36dc1b1408..b856f14ac4 100644
--- a/harbour/contrib/hbziparc/doc/en/hbziparc.txt
+++ b/harbour/contrib/hbziparc/doc/en/hbziparc.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       hb_SetZipComment()
    $CATEGORY$
       Zip Functions
@@ -33,7 +33,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       hb_GetZipComment()
    $CATEGORY$
       Zip Functions
@@ -62,7 +62,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       hb_ZipTestPK()
    $CATEGORY$
       Zip Functions
@@ -104,7 +104,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       hb_SetDiskZip()
    $CATEGORY$
       Zip Functions
@@ -136,7 +136,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       hb_SetBuffer()
    $CATEGORY$
       Zip Functions
@@ -176,7 +176,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       hb_ZipFileByTDSpan()
    $CATEGORY$
       Zip Functions
@@ -271,7 +271,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       hb_ZipFileByPKSpan()
    $CATEGORY$
       Zip Functions
@@ -373,7 +373,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       hb_ZipFile()
    $CATEGORY$
       Zip Functions
@@ -470,7 +470,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       hb_UnzipFile()
    $CATEGORY$
       Zip Functions
@@ -538,7 +538,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       hb_ZipDeleteFiles()
    $CATEGORY$
       Zip Functions
diff --git a/harbour/contrib/rddads/doc/en/adsfuncs.txt b/harbour/contrib/rddads/doc/en/adsfuncs.txt
index 271b43adcf..89f4a734e9 100644
--- a/harbour/contrib/rddads/doc/en/adsfuncs.txt
+++ b/harbour/contrib/rddads/doc/en/adsfuncs.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ADSBlob2File()
    $CATEGORY$
       Advantage Database RDD
@@ -41,7 +41,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ADSFile2Blob()
    $CATEGORY$
       Advantage Database RDD
@@ -83,7 +83,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ADSClearAOF()
    $CATEGORY$
       Advantage Database RDD
@@ -116,7 +116,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ADSCustomizeAOF()
    $CATEGORY$
       Advantage Database RDD
@@ -187,7 +187,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ADSEvalAOF()
    $CATEGORY$
       Advantage Database RDD
@@ -224,7 +224,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ADSGetAOFoptLevel()
    $CATEGORY$
       Advantage Database RDD
@@ -259,7 +259,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ADSGetAOF()
    $CATEGORY$
       Advantage Database RDD
@@ -292,7 +292,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ADSGetAOFnoOpt()
    $CATEGORY$
       Advantage Database RDD
@@ -326,7 +326,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ADSRefreshAOF()
    $CATEGORY$
       Advantage Database RDD
@@ -362,7 +362,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ADSSetAOF()
    $CATEGORY$
       Advantage Database RDD
@@ -400,7 +400,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ADSIsRecordInAOF()
    $CATEGORY$
       Advantage Database RDD
@@ -433,7 +433,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ADSGetRelKeyPos()
    $CATEGORY$
       Advantage Database RDD
@@ -474,7 +474,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ADSSetRelKeyPos()
    $CATEGORY$
       Advantage Database RDD
@@ -514,7 +514,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ADSKeyCount()
    $CATEGORY$
       Advantage Database RDD
@@ -565,7 +565,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ADSKeyNo()
    $CATEGORY$
       Advantage Database RDD
@@ -615,7 +615,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ADSLocking()
    $CATEGORY$
       Advantage Database RDD
@@ -661,7 +661,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ADSRightsCheck()
    $CATEGORY$
       Advantage Database RDD
@@ -706,7 +706,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       AdsRegCallBack()
    $CATEGORY$
       Advantage Database RDD
@@ -760,7 +760,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       AdsClrCallBack()
    $CATEGORY$
       Advantage Database RDD
@@ -793,7 +793,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ADSSetDefault() *
    $CATEGORY$
       Advantage Database RDD
@@ -831,7 +831,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ADSSetDeleted() *
    $CATEGORY$
       Advantage Database RDD
@@ -872,7 +872,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       AdsSetSearchPath() *
    $CATEGORY$
       Advantage Database RDD
@@ -910,7 +910,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       AdsSetExact() *
    $CATEGORY$
       Advantage Database RDD
@@ -948,7 +948,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ADSSetCharType()
    $CATEGORY$
       Advantage Database RDD
@@ -992,7 +992,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       AdsIsIndexed()
    $CATEGORY$
       Advantage Database RDD
@@ -1024,7 +1024,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       AdsTestRecLocks()
    $CATEGORY$
       Advantage Database RDD
@@ -1076,7 +1076,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       AdsGetLastError()
    $CATEGORY$
       Advantage Database RDD
@@ -1109,7 +1109,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       AdsIsExprValid()
    $CATEGORY$
       Advantage Database RDD
@@ -1158,7 +1158,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       AdsGetConnectionType()
    $CATEGORY$
       Advantage Database RDD
@@ -1202,7 +1202,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       AdsGetTableConType()
    $CATEGORY$
       Advantage Database RDD
@@ -1241,7 +1241,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ADSDDADDTABLE()
    $CATEGORY$
       Advantage Database RDD
@@ -1282,7 +1282,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ADSUSEDICTIONARY()*
    $CATEGORY$
       Advantage Database RDD
@@ -1312,7 +1312,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ADSCONNECT60()
    $CATEGORY$
       Advantage Database RDD
@@ -1352,7 +1352,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ADSCACHEOPENTABLES()
    $CATEGORY$
       Advantage Database RDD
@@ -1390,7 +1390,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ADSCACHEOPENCURSORS()
    $CATEGORY$
       Advantage Database RDD
@@ -1429,7 +1429,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ADSCLOSECACHEDTABLES()
    $CATEGORY$
       Advantage Database RDD
@@ -1466,7 +1466,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       xxx()
    $CATEGORY$
       Advantage Database RDD
diff --git a/harbour/contrib/rddads/doc/en/readme.txt b/harbour/contrib/rddads/doc/en/readme.txt
index 7d980bfd67..fb43a3698b 100644
--- a/harbour/contrib/rddads/doc/en/readme.txt
+++ b/harbour/contrib/rddads/doc/en/readme.txt
@@ -3,7 +3,7 @@
  */
 
 /* $DOC$
-   $FUNCNAME$
+   $NAME$
       ADS Overview
    $CATEGORY$
       Document