diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 6842d2a817..92ffdbcb8b 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,29 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-10-19 00:55 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * contrib/hbct/ctwfunc.c
+  * contrib/hbct/files.c
+  * contrib/hbfship/dbsetloc.c
+  * contrib/hbgd/gdwrp.c
+  * contrib/hbnf/fttext.c
+  * contrib/xhb/xhbgt.c
+  * contrib/xhb/xhbtrim.c
+  * src/rdd/dbcmd.c
+  * src/rdd/dbfcdx/dbfcdx1.c
+  * src/rdd/dbffpt/dbffpt1.c
+  * src/rdd/dbfnsx/dbfnsx1.c
+  * src/rdd/dbfntx/dbfntx1.c
+  * src/rtl/cdpapihb.c
+  * src/rtl/dirdrive.c
+  * src/rtl/gete.c
+  * src/rtl/hbi18n1.c
+  * src/rtl/trim.c
+  * src/vm/classes.c
+    * use HB_FUNC_TRANSLATE() where the target function was
+      present in the same physical source file (plus some
+      RDD ones missed in prev)
+
 2012-10-18 23:52 UTC+0200 Viktor Szakats (harbour syenar.net)
   * contrib/gtwvg/wvgutils.c
   * contrib/hbct/dbftools.c
@@ -67,7 +90,7 @@
   * src/rtl/shadowu.c
   * src/vm/memvclip.c
     * use HB_FUNC_TRANSLATE() when creating pure forwarder stubs
-      (I might rename this to HB_FUNC_FORWARD())
+      (I might rename this to HB_FUNC_FORWARD() or HB_FUNC_ALIAS())
 
 2012-10-18 20:59 UTC+0200 Viktor Szakats (harbour syenar.net)
   * contrib/hbmisc/hb_f.c
diff --git a/harbour/contrib/hbct/ctwfunc.c b/harbour/contrib/hbct/ctwfunc.c
index 334eb0d453..4c96b6054b 100644
--- a/harbour/contrib/hbct/ctwfunc.c
+++ b/harbour/contrib/hbct/ctwfunc.c
@@ -445,10 +445,7 @@ HB_FUNC( WLIST )
    }
 }
 
-HB_FUNC( _WSTACK )
-{
-   HB_FUNC_EXEC( WLIST );
-}
+HB_FUNC_TRANSLATE( _WSTACK, WLIST )
 
 /* Temporary Harbour extensions to test some extended CTW functionality
  */
diff --git a/harbour/contrib/hbct/files.c b/harbour/contrib/hbct/files.c
index 77835e88e4..31dc82a59d 100644
--- a/harbour/contrib/hbct/files.c
+++ b/harbour/contrib/hbct/files.c
@@ -282,10 +282,7 @@ HB_FUNC( FILEMOVE )
                             hb_parcx( 2 ) ) ? 0 : - ( HB_MAXINT ) hb_fsOsError() );
 }
 
-HB_FUNC( RENAMEFILE )
-{
-   HB_FUNC_EXEC( FILEMOVE );
-}
+HB_FUNC_TRANSLATE( RENAMEFILE, FILEMOVE )
 
 HB_FUNC( DELETEFILE )
 {
diff --git a/harbour/contrib/hbfship/dbsetloc.c b/harbour/contrib/hbfship/dbsetloc.c
index 3344496bdb..60f47b5d67 100644
--- a/harbour/contrib/hbfship/dbsetloc.c
+++ b/harbour/contrib/hbfship/dbsetloc.c
@@ -74,7 +74,4 @@ HB_FUNC( DBSETLOCATE )
    hb_retl( fSet );
 }
 
-HB_FUNC( DBSETLOCATEBLOCK )
-{
-   HB_FUNC_EXEC( DBSETLOCATE )
-}
+HB_FUNC_TRANSLATE( DBSETLOCATEBLOCK, DBSETLOCATE )
diff --git a/harbour/contrib/hbgd/gdwrp.c b/harbour/contrib/hbgd/gdwrp.c
index d0685392ca..e164fc4cde 100644
--- a/harbour/contrib/hbgd/gdwrp.c
+++ b/harbour/contrib/hbgd/gdwrp.c
@@ -610,12 +610,8 @@ HB_FUNC( GDIMAGECREATE ) /* gdImagePtr gdImageCreate(sx, sy) */
 
 /* - */
 
-HB_FUNC( GDIMAGECREATEPALETTE ) /* gdImagePtr gdImageCreatePalette(sx, sy) */
-{
-   /* Alias of GDCreate() */
-   HB_FUNC_EXEC( GDIMAGECREATE );
-}
-
+/* Alias of GDCreate() */
+HB_FUNC_TRANSLATE( GDIMAGECREATEPALETTE, GDIMAGECREATE ) /* gdImagePtr gdImageCreatePalette(sx, sy) */
 
 /* - */
 
diff --git a/harbour/contrib/hbnf/fttext.c b/harbour/contrib/hbnf/fttext.c
index a67e81a9e0..ef9ef6a4d7 100644
--- a/harbour/contrib/hbnf/fttext.c
+++ b/harbour/contrib/hbnf/fttext.c
@@ -767,10 +767,7 @@ HB_FUNC( FT_FWRITELN )
    hb_retl( err );
 }
 
-HB_FUNC( FT_FWRITEL )
-{
-   HB_FUNC_EXEC( FT_FWRITELN );
-}
+HB_FUNC_TRANSLATE( FT_FWRITEL, FT_FWRITELN )
 
 HB_FUNC( FT_FLASTRE )
 {
diff --git a/harbour/contrib/xhb/xhbgt.c b/harbour/contrib/xhb/xhbgt.c
index 8a5b69c406..3fbb8f4db6 100644
--- a/harbour/contrib/xhb/xhbgt.c
+++ b/harbour/contrib/xhb/xhbgt.c
@@ -52,8 +52,8 @@
 
 #include "hbapi.h"
 
-HB_FUNC_TRANSLATE( GTPROCESSMESSAGES , NEXTKEY               )
-HB_FUNC_TRANSLATE( GFXPRIMITIVE      , HB_GFXPRIMITIVE       )
-HB_FUNC_TRANSLATE( GFXTEXT           , HB_GFXTEXT            )
-HB_FUNC_TRANSLATE( HBCONSOLELOCK     , HB_GTLOCK             )
-HB_FUNC_TRANSLATE( HBCONSOLEUNLOCK   , HB_GTUNLOCK           )
+HB_FUNC_TRANSLATE( GTPROCESSMESSAGES , NEXTKEY         )
+HB_FUNC_TRANSLATE( GFXPRIMITIVE      , HB_GFXPRIMITIVE )
+HB_FUNC_TRANSLATE( GFXTEXT           , HB_GFXTEXT      )
+HB_FUNC_TRANSLATE( HBCONSOLELOCK     , HB_GTLOCK       )
+HB_FUNC_TRANSLATE( HBCONSOLEUNLOCK   , HB_GTUNLOCK     )
diff --git a/harbour/contrib/xhb/xhbtrim.c b/harbour/contrib/xhb/xhbtrim.c
index 1b226e1e4c..8eaaae34fc 100644
--- a/harbour/contrib/xhb/xhbtrim.c
+++ b/harbour/contrib/xhb/xhbtrim.c
@@ -81,10 +81,7 @@ HB_FUNC( XHB_RTRIM )
 }
 
 /* synonymn for XHB_RTRIM */
-HB_FUNC( XHB_TRIM )
-{
-   HB_FUNC_EXEC( XHB_RTRIM );
-}
+HB_FUNC_TRANSLATE( XHB_TRIM, XHB_RTRIM )
 
 /* trims leading and trailing spaces from a string */
 
diff --git a/harbour/src/rdd/dbcmd.c b/harbour/src/rdd/dbcmd.c
index 0e432166f5..e56f3543a0 100644
--- a/harbour/src/rdd/dbcmd.c
+++ b/harbour/src/rdd/dbcmd.c
@@ -342,7 +342,7 @@ HB_FUNC( DBCREATE )
 
    /*
     * NOTE: 4-th, 5-th and 6-th parameters are undocumented Clipper ones
-    * 4-th is boolean flag indicating if file should stay open (any boolean 
+    * 4-th is boolean flag indicating if file should stay open (any boolean
     *      value will enable this behavior)
     * 5-th is alias - if not given then WA is open without alias
     * 6-th is optional DELIMITED value used by some RDDs like DELIM
@@ -1585,10 +1585,7 @@ HB_FUNC( RDDREGISTER )
 }
 
 /* Same as LASTREC() */
-HB_FUNC( RECCOUNT )
-{
-   HB_FUNC_EXEC( LASTREC );
-}
+HB_FUNC_TRANSLATE( RECCOUNT, LASTREC )
 
 HB_FUNC( RECNO )
 {
diff --git a/harbour/src/rdd/dbfcdx/dbfcdx1.c b/harbour/src/rdd/dbfcdx/dbfcdx1.c
index 09c9773fe7..bd501ea6ce 100644
--- a/harbour/src/rdd/dbfcdx/dbfcdx1.c
+++ b/harbour/src/rdd/dbfcdx/dbfcdx1.c
@@ -9933,7 +9933,8 @@ static void hb_cdxRddInit( void * cargo )
 
 #if defined( HB_SIXCDX )
 
-HB_FUNC_EXTERN( _DBF ); HB_FUNC( SIXCDX ) { HB_FUNC_EXEC( _DBF ); }
+HB_FUNC_TRANSLATE( SIXCDX, _DBF )
+
 HB_INIT_SYMBOLS_BEGIN( _hb_sixcdx1_InitSymbols_ )
 { "SIXCDX",              {HB_FS_PUBLIC|HB_FS_LOCAL}, {HB_FUNCNAME( SIXCDX )}, NULL },
 { "SIXCDX_GETFUNCTABLE", {HB_FS_PUBLIC|HB_FS_LOCAL}, {HB_FUNCNAME( _GETFUNCTABLE )}, NULL }
@@ -9954,7 +9955,8 @@ HB_CALL_ON_STARTUP_END( _hb_sixcdx_rdd_init_ )
 
 #else
 
-HB_FUNC_EXTERN( _DBF ); HB_FUNC( DBFCDX ) { HB_FUNC_EXEC( _DBF ); }
+HB_FUNC_TRANSLATE( DBFCDX, _DBF )
+
 HB_INIT_SYMBOLS_BEGIN( _hb_dbfcdx1_InitSymbols_ )
 { "DBFCDX",              {HB_FS_PUBLIC|HB_FS_LOCAL}, {HB_FUNCNAME( DBFCDX )}, NULL },
 { "DBFCDX_GETFUNCTABLE", {HB_FS_PUBLIC|HB_FS_LOCAL}, {HB_FUNCNAME( _GETFUNCTABLE )}, NULL }
diff --git a/harbour/src/rdd/dbffpt/dbffpt1.c b/harbour/src/rdd/dbffpt/dbffpt1.c
index 586d79cb83..79a475f117 100644
--- a/harbour/src/rdd/dbffpt/dbffpt1.c
+++ b/harbour/src/rdd/dbffpt/dbffpt1.c
@@ -5452,9 +5452,7 @@ static const RDDFUNCS fptTable =
    ( DBENTRYP_SVP )   NULL    /* hb_fptWhoCares */
 };
 
-HB_FUNC_EXTERN( _DBF );
-
-HB_FUNC( DBFFPT ) { HB_FUNC_EXEC( _DBF ); }
+HB_FUNC_TRANSLATE( DBFFPT, _DBF )
 HB_FUNC( DBFDBT ) {;}
 HB_FUNC( DBFSMT ) {;}
 HB_FUNC( DBFBLOB ) {;}
diff --git a/harbour/src/rdd/dbfnsx/dbfnsx1.c b/harbour/src/rdd/dbfnsx/dbfnsx1.c
index b61b22a00f..c640fe2a76 100644
--- a/harbour/src/rdd/dbfnsx/dbfnsx1.c
+++ b/harbour/src/rdd/dbfnsx/dbfnsx1.c
@@ -8170,7 +8170,7 @@ static const RDDFUNCS nsxTable = {
                              NULL
                            };
 
-HB_FUNC_EXTERN( _DBF ); HB_FUNC( DBFNSX ) { HB_FUNC_EXEC( _DBF ); }
+HB_FUNC_TRANSLATE( DBFNSX, _DBF )
 
 HB_FUNC_STATIC( DBFNSX_GETFUNCTABLE )
 {
diff --git a/harbour/src/rdd/dbfntx/dbfntx1.c b/harbour/src/rdd/dbfntx/dbfntx1.c
index 6ee3a69979..6d5f58507b 100644
--- a/harbour/src/rdd/dbfntx/dbfntx1.c
+++ b/harbour/src/rdd/dbfntx/dbfntx1.c
@@ -7850,7 +7850,7 @@ static const RDDFUNCS ntxTable = {
                              hb_ntxWhoCares
                            };
 
-HB_FUNC_EXTERN( _DBF ); HB_FUNC( DBFNTX ) { HB_FUNC_EXEC( _DBF ); }
+HB_FUNC_TRANSLATE( DBFNTX, _DBF )
 
 HB_FUNC_STATIC( DBFNTX_GETFUNCTABLE )
 {
diff --git a/harbour/src/rtl/cdpapihb.c b/harbour/src/rtl/cdpapihb.c
index 3ab52b2f76..aaa4395fe1 100644
--- a/harbour/src/rtl/cdpapihb.c
+++ b/harbour/src/rtl/cdpapihb.c
@@ -137,13 +137,9 @@ HB_FUNC( HB_CDPLIST )
    hb_xfree( ( void * ) list );
 }
 
-HB_FUNC( __NATSORTVER )
-{
-   /* NOTE: CA-Cl*pper 5.2e Intl. will return: "NATSORT v1.2i x14 19/Mar/93" */
-   /* NOTE: CA-Cl*pper 5.3  Intl. will return: "NATSORT v1.3i x19 06/Mar/95" */
-
-   HB_FUNC_EXEC( HB_CDPINFO );
-}
+/* NOTE: CA-Cl*pper 5.2e Intl. will return: "NATSORT v1.2i x14 19/Mar/93" */
+/* NOTE: CA-Cl*pper 5.3  Intl. will return: "NATSORT v1.3i x19 06/Mar/95" */
+HB_FUNC_TRANSLATE( __NATSORTVER, HB_CDPINFO )
 
 /*
  * extended CP PRG functions
diff --git a/harbour/src/rtl/dirdrive.c b/harbour/src/rtl/dirdrive.c
index f9ef309f2f..6f7448efe1 100644
--- a/harbour/src/rtl/dirdrive.c
+++ b/harbour/src/rtl/dirdrive.c
@@ -84,15 +84,8 @@ HB_FUNC( DIRCHANGE )
 /* NOTE: Clipper 5.3 NG incorrectly states that the name of this function is
          DIRMAKE(), in reality it's not. */
 
-HB_FUNC( MAKEDIR )
-{
-   HB_FUNC_EXEC( HB_DIRCREATE );
-}
-
-HB_FUNC( DIRREMOVE )
-{
-   HB_FUNC_EXEC( HB_DIRDELETE );
-}
+HB_FUNC_TRANSLATE( MAKEDIR, HB_DIRCREATE )
+HB_FUNC_TRANSLATE( DIRREMOVE, HB_DIRDELETE )
 
 /* NOTE: Clipper 5.3 undocumented */
 
diff --git a/harbour/src/rtl/gete.c b/harbour/src/rtl/gete.c
index 379515e96e..b1332c1d36 100644
--- a/harbour/src/rtl/gete.c
+++ b/harbour/src/rtl/gete.c
@@ -102,11 +102,7 @@ HB_FUNC( GETENV )
 }
 
 /* NOTE: Undocumented Clipper function. [vszakats] */
-
-HB_FUNC( GETE )
-{
-   HB_FUNC_EXEC( GETENV );
-}
+HB_FUNC_TRANSLATE( GETE, GETENV )
 
 /* NOTE: Harbour extended version of GETENV(). The 2nd parameter
          can be used to specify a default value, returned if the
diff --git a/harbour/src/rtl/hbi18n1.c b/harbour/src/rtl/hbi18n1.c
index 2a94d3cf3f..36a2920c64 100644
--- a/harbour/src/rtl/hbi18n1.c
+++ b/harbour/src/rtl/hbi18n1.c
@@ -957,16 +957,8 @@ HB_FUNC( HB_I18N_NGETTEXT )
       hb_errRT_BASE_SubstR( EG_ARG, 3012, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
 }
 
-HB_FUNC( HB_I18N_GETTEXT_STRICT )
-{
-   HB_FUNC_EXEC( HB_I18N_GETTEXT );
-}
-
-HB_FUNC( HB_I18N_NGETTEXT_STRICT )
-{
-   HB_FUNC_EXEC( HB_I18N_NGETTEXT );
-}
-
+HB_FUNC_TRANSLATE( HB_I18N_GETTEXT_STRICT, HB_I18N_GETTEXT )
+HB_FUNC_TRANSLATE( HB_I18N_NGETTEXT_STRICT, HB_I18N_NGETTEXT )
 
 /*
  * extended .prg i18n functions to create and manage translation tables
diff --git a/harbour/src/rtl/trim.c b/harbour/src/rtl/trim.c
index e50d6b4602..7a1abaeab2 100644
--- a/harbour/src/rtl/trim.c
+++ b/harbour/src/rtl/trim.c
@@ -138,10 +138,7 @@ HB_FUNC( RTRIM )
 }
 
 /* synonymn for RTRIM */
-HB_FUNC( TRIM )
-{
-   HB_FUNC_EXEC( RTRIM );
-}
+HB_FUNC_TRANSLATE( TRIM, RTRIM )
 
 /* trims leading and trailing spaces from a string */
 
diff --git a/harbour/src/vm/classes.c b/harbour/src/vm/classes.c
index 5dff8cfe53..4f107c1a1d 100644
--- a/harbour/src/vm/classes.c
+++ b/harbour/src/vm/classes.c
@@ -4096,29 +4096,17 @@ HB_FUNC( __CLS_INCDATA )
 }
 
 /* NOTE: Undocumented Clipper function */
-
 /* see for parameter compatibility with Clipper. */
-HB_FUNC( __CLASSNEW )
-{
-   HB_FUNC_EXEC( __CLSNEW );
-}
 
+HB_FUNC_TRANSLATE( __CLASSNEW, __CLSNEW )
 
 /* NOTE: Undocumented Clipper function */
 
-HB_FUNC( __CLASSINSTANCE )
-{
-   HB_FUNC_EXEC( __CLSINST );
-}
-
+HB_FUNC_TRANSLATE( __CLASSINSTANCE, __CLSINST )
 
 /* NOTE: Undocumented Clipper function */
 
-HB_FUNC( __CLASSADD )
-{
-   HB_FUNC_EXEC( __CLSADDMSG );
-}
-
+HB_FUNC_TRANSLATE( __CLASSADD, __CLSADDMSG )
 
 /* NOTE: Undocumented Clipper function */