diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 9e00d9713e..71bc61a18b 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,15 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-06-05 14:55 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * utils/hbmk2/hbmk2.prg
+  * utils/hbmk2/hbmk2.es_PE.po
+  * utils/hbmk2/hbmk2.hu_HU.po
+  * utils/hbmk2/hbmk2.pt_BR.po
+    + "hbmk2" name avoided inside the source and generated comments
+    + "hbmk2" name converted to variable so it can be easily changed
+    ! fixed few typos in outputs/help
+
 2012-06-05 14:17 UTC+0200 Viktor Szakats (harbour syenar.net)
   * utils/hbmk2/hbmk2.prg
     + added extra protection to not delete the VCS revision
diff --git a/harbour/utils/hbmk2/hbmk2.es_PE.po b/harbour/utils/hbmk2/hbmk2.es_PE.po
index 2c39c3bdea..39ff850220 100644
--- a/harbour/utils/hbmk2/hbmk2.es_PE.po
+++ b/harbour/utils/hbmk2/hbmk2.es_PE.po
@@ -343,8 +343,8 @@ msgstr "enlazar con soporte multi/single-thread Harbour VM"
 
 #: hbmk2.prg:7825 hbmk2.prg:11479
 #, c-format
-msgid "  hbmk2 [options] [<script[s]>] <src[s][.prg|.c|.obj|.o|.rc|.res|.def|.po|.pot|.hbl|@.clp|.d]>"
-msgstr "  hbmk2 [opciones] [<script[s]>] <src[s][.prg|.c|.obj|.o|.rc|.res|.def|.po|.pot|.hbl|@.clp|.d]>"
+msgid "  %1$s [options] [<script[s]>] <src[s][.prg|.c|.obj|.o|.rc|.res|.def|.po|.pot|.hbl|@.clp|.d]>"
+msgstr "  %1$s [opciones] [<script[s]>] <src[s][.prg|.c|.obj|.o|.rc|.res|.def|.po|.pot|.hbl|@.clp|.d]>"
 
 #: hbmk2.prg:7942 hbmk2.prg:11633
 #, c-format
@@ -478,8 +478,8 @@ msgstr "Opciones de .hbc (que debe estar en líneas separadas): libs=[<libname[s
 
 #: hbmk2.prg:7942 hbmk2.prg:11633
 #, c-format
-msgid "stop after creating the object files\\ncreate link/copy hbmk2 to hbcmp/clipper for the same effect"
-msgstr "para después de la creación de los archivos objeto\\ncrear un enlace/copia a hbmk2 para hbcmp/clipper resultará el mismo efecto"
+msgid "stop after creating the object files\\ncreate link/copy %1$s to hbcmp/clipper for the same effect"
+msgstr "para después de la creación de los archivos objeto\\ncrear un enlace/copia a %1$s para hbcmp/clipper resultará el mismo efecto"
 
 #: hbmk2.prg:7960
 #, c-format
@@ -808,13 +808,13 @@ msgstr "Tiempo de ejecución: %1$ss"
 
 #: hbmk2.prg:7942 hbmk2.prg:11633
 #, c-format
-msgid "emulate Clipper compatible linker behavior\\ncreate link/copy hbmk2 to rtlink/blinker/exospace for the same effect"
-msgstr "emula comportamiento de linkeditor compatible con clipper\\ncrear link o copiar hbmk2 para rtlink/blinker/exospace resultará el mismo efecto"
+msgid "emulate Clipper compatible linker behavior\\ncreate link/copy %1$s to rtlink/blinker/exospace for the same effect"
+msgstr "emula comportamiento de linkeditor compatible con clipper\\ncrear link o copiar %1$s para rtlink/blinker/exospace resultará el mismo efecto"
 
 #: hbmk2.prg:7960 hbmk2.prg:11650
 #, c-format
-msgid "%1$s option file in hbmk2 directory is always processed if it exists. On *nix platforms ~/.harbour, /etc/harbour, <base>/etc/harbour, <base>/etc are checked (in that order) before the hbmk2 directory."
-msgstr "archivo de opciones %1$s en directorio de hbmk2 siempre es procesado si existe. En plataformas *nix este archivo es chequeado (en este orden) ~/.harbour, /etc/harbour, <base>/etc/harbour, <base>/etc antes de pasar a directorio de hbmk2.000"
+msgid "%1$s option file in %2$s directory is always processed if it exists. On *nix platforms ~/.harbour, /etc/harbour, <base>/etc/harbour, <base>/etc are checked (in that order) before the %2$s directory."
+msgstr "archivo de opciones %1$s en directorio de %2$s siempre es procesado si existe. En plataformas *nix este archivo es chequeado (en este orden) ~/.harbour, /etc/harbour, <base>/etc/harbour, <base>/etc antes de pasar a directorio de %2$s."
 
 #: hbmk2.prg:7942 hbmk2.prg:11633
 #, c-format
@@ -968,8 +968,8 @@ msgstr "compilación limpia (en modo incremental)"
 
 #: hbmk2.prg:7942 hbmk2.prg:11633
 #, c-format
-msgid "stop after creating the object files and accept raw C flags\\ncreate link/copy hbmk2 to hbcc for the same effect"
-msgstr "para después de creación de archivos objeto y aceptar flags de puro C\\ncrear un link o copiar hbmk2 a hbcc resultará el mismo efecto"
+msgid "stop after creating the object files and accept raw C flags\\ncreate link/copy %1$s to hbcc for the same effect"
+msgstr "para después de creación de archivos objeto y aceptar flags de puro C\\ncrear un link o copiar %1$s a hbcc resultará el mismo efecto"
 
 #: hbmk2.prg:7808 hbmk2.prg:11462
 #, c-format
@@ -1213,7 +1213,7 @@ msgstr ""
 
 #: hbmk2.prg:11633
 #, c-format
-msgid "options/flags reserved for 3rd party tools, always ignored by hbmk2 itself"
+msgid "options/flags reserved for 3rd party tools, always ignored by %1$s itself"
 msgstr ""
 
 #: hbmk2.prg:11633
@@ -1228,7 +1228,7 @@ msgstr ""
 
 #: hbmk2.prg:9418
 #, c-format
-msgid "Warning: Project reference (%1$s) ignored. Project references require hbmk2 to be invoced with a main project."
+msgid "Warning: Project reference (%1$s) ignored. Project references require %2$s to be invoked with a main project."
 msgstr ""
 
 #: hbmk2.prg:6786
@@ -1393,7 +1393,7 @@ msgstr ""
 
 #: hbmk2.prg:11633
 #, c-format
-msgid "<d> is the name of the dependency. <v> is a value that controls how detection is done. Accepted values: no, yes, force, nolocal, local. Default: content of envvar HBMK2_WITH_<d>"
+msgid "<d> is the name of the dependency. <v> is a value that controls how detection is done. Accepted values: no, yes, force, nolocal, local. Default: content of envvar HBMK_WITH_<d>"
 msgstr ""
 
 #: hbmk2.prg:11512
diff --git a/harbour/utils/hbmk2/hbmk2.hu_HU.po b/harbour/utils/hbmk2/hbmk2.hu_HU.po
index 3f0d679beb..f629fc991e 100644
--- a/harbour/utils/hbmk2/hbmk2.hu_HU.po
+++ b/harbour/utils/hbmk2/hbmk2.hu_HU.po
@@ -124,8 +124,8 @@ msgstr "egyszeri sípolás sikeres végrehajtás esetén, dupla sípolás hiba e
 
 #: hbmk2.prg:7941 hbmk2.prg:11633
 #, c-format
-msgid "stop after creating the object files\\ncreate link/copy hbmk2 to hbcmp/clipper for the same effect"
-msgstr "álljon meg az object állományok létrehozása után\\nA hbmk2 program hbcmp/clipper nevekre való másolásával/átnevezésével hasonló hatás érhet el"
+msgid "stop after creating the object files\\ncreate link/copy %1$s to hbcmp/clipper for the same effect"
+msgstr "álljon meg az object állományok létrehozása után\\nA %1$s program hbcmp/clipper nevekre való másolásával/átnevezésével hasonló hatás érhet el"
 
 #: hbmk2.prg:1296 hbmk2.prg:1667
 #, c-format
@@ -349,8 +349,8 @@ msgstr "Automatikusan detektált '%1$s' C fordító figyelmen kívül hagyva, me
 
 #: hbmk2.prg:7824 hbmk2.prg:11479
 #, c-format
-msgid "  hbmk2 [options] [<script[s]>] <src[s][.prg|.c|.obj|.o|.rc|.res|.def|.po|.pot|.hbl|@.clp|.d]>"
-msgstr "  hbmk2 [kapcsolók] [<parancsállomány[s]>] <forrás[.prg|.c|.obj|.o|.rc|.res|.def|.po|.pot|.hbl|@.clp|.d]>"
+msgid "  %1$s [options] [<script[s]>] <src[s][.prg|.c|.obj|.o|.rc|.res|.def|.po|.pot|.hbl|@.clp|.d]>"
+msgstr "  %1$s [kapcsolók] [<parancsállomány[s]>] <forrás[.prg|.c|.obj|.o|.rc|.res|.def|.po|.pot|.hbl|@.clp|.d]>"
 
 #: hbmk2.prg:7941
 #, c-format
@@ -389,8 +389,8 @@ msgstr "szerkessze be a GT<name> GT meghajtót. Több ilyen is megadható, az el
 
 #: hbmk2.prg:7941 hbmk2.prg:11633
 #, c-format
-msgid "stop after creating the object files and accept raw C flags\\ncreate link/copy hbmk2 to hbcc for the same effect"
-msgstr "álljon meg az object állományok létrehozása után és továbbítsa a kapcsolókat a C fordítónak\\nA hbmk2 program hbcc névre való másolásával/átnevezésével hasonló hatás érhet el"
+msgid "stop after creating the object files and accept raw C flags\\ncreate link/copy %1$s to hbcc for the same effect"
+msgstr "álljon meg az object állományok létrehozása után és továbbítsa a kapcsolókat a C fordítónak\\nA %1$s program hbcc névre való másolásával/átnevezésével hasonló hatás érhet el"
 
 #: hbmk2.prg:7941 hbmk2.prg:11633
 #, c-format
@@ -699,8 +699,8 @@ msgstr ""
 
 #: hbmk2.prg:7959 hbmk2.prg:11650
 #, c-format
-msgid "%1$s option file in hbmk2 directory is always processed if it exists. On *nix platforms ~/.harbour, /etc/harbour, <base>/etc/harbour, <base>/etc are checked (in that order) before the hbmk2 directory."
-msgstr "%1$s opció fájl a hbmk2 könyvtárában mindig feldolgozásra kerül amennyiben létezik. *nix platformokon a fájl a ~/.harbour, /etc/harbour, <base>/etc/harbour, <base>/etc könyvtárak (ebben a sorrendben) szintén ellenőrzésre kerülnek."
+msgid "%1$s option file in %2$s directory is always processed if it exists. On *nix platforms ~/.harbour, /etc/harbour, <base>/etc/harbour, <base>/etc are checked (in that order) before the %2$s directory."
+msgstr "%1$s opció fájl a %2$s könyvtárában mindig feldolgozásra kerül amennyiben létezik. *nix platformokon a fájl a ~/.harbour, /etc/harbour, <base>/etc/harbour, <base>/etc könyvtárak (ebben a sorrendben) szintén ellenőrzésre kerülnek."
 
 #: hbmk2.prg:5806 hbmk2.prg:8785
 #, c-format
@@ -809,8 +809,8 @@ msgstr "szerkessze be <libname> függvénykönyvtárat. <libname>-ben nem szerep
 
 #: hbmk2.prg:7941 hbmk2.prg:11633
 #, c-format
-msgid "emulate Clipper compatible linker behavior\\ncreate link/copy hbmk2 to rtlink/blinker/exospace for the same effect"
-msgstr "emuláljon Clipper kompatibilis szerkesztő üzemmódot.\\nA hbmk2 program rtlink/blinker/exospace nevekre való másolásával/átnevezésével hasonló hatás érhet el"
+msgid "emulate Clipper compatible linker behavior\\ncreate link/copy %1$s to rtlink/blinker/exospace for the same effect"
+msgstr "emuláljon Clipper kompatibilis szerkesztő üzemmódot.\\nA %1$s program rtlink/blinker/exospace nevekre való másolásával/átnevezésével hasonló hatás érhet el"
 
 #: hbmk2.prg:7941
 #, c-format
@@ -1209,7 +1209,7 @@ msgstr ""
 
 #: hbmk2.prg:11633
 #, c-format
-msgid "options/flags reserved for 3rd party tools, always ignored by hbmk2 itself"
+msgid "options/flags reserved for 3rd party tools, always ignored by %1$s itself"
 msgstr ""
 
 #: hbmk2.prg:11633
@@ -1224,7 +1224,7 @@ msgstr ""
 
 #: hbmk2.prg:9418
 #, c-format
-msgid "Warning: Project reference (%1$s) ignored. Project references require hbmk2 to be invoced with a main project."
+msgid "Warning: Project reference (%1$s) ignored. Project references require %2$s to be invoked with a main project."
 msgstr ""
 
 #: hbmk2.prg:6786
@@ -1389,7 +1389,7 @@ msgstr ""
 
 #: hbmk2.prg:11633
 #, c-format
-msgid "<d> is the name of the dependency. <v> is a value that controls how detection is done. Accepted values: no, yes, force, nolocal, local. Default: content of envvar HBMK2_WITH_<d>"
+msgid "<d> is the name of the dependency. <v> is a value that controls how detection is done. Accepted values: no, yes, force, nolocal, local. Default: content of envvar HBMK_WITH_<d>"
 msgstr ""
 
 #: hbmk2.prg:11512
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index fe083bd0f5..7ef8ce6b72 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -28,7 +28,7 @@
  *   - This source code must be kept and distributed as part
  *     of the Harbour package and/or the placement of the tool sources
  *     and files must reflect that it is part of Harbour Project.
- *   - hbmk2 copyright information must always be presented by
+ *   - Copyright information must always be presented by
  *     projects including this tool or help text.
  *   - Modified versions of the tool must clearly state this
  *     fact on the copyright screen.
@@ -50,7 +50,7 @@
  *    entry point override method and detection code for gcc.
  *    rtlink/blinker link script parsers.
  *    POTMerge(), LoadPOTFilesAsHash(), GenHBL() and AutoTrans().
- *       (with local modifications by hbmk2 author)
+ *       (with local modifications by main author)
  *    optimized header time scan algorithm
  *
  * See COPYING for licensing terms.
@@ -84,10 +84,9 @@
 #include "hbver.ch"
 
 /* NOTE: Keep this code clean from any kind of contribs and Harbour level
-         3rd party library/tool information. This (the hbmk2) component
-         shall only contain hard-wired knowledge on Harbour _core_
-         (official interfaces preferred), C compilers and OS details on
-         the smallest possible level.
+         3rd party library/tool information. This component shall only
+         contain hard-wired knowledge on Harbour _core_ (official interfaces
+         preferred), C compilers and OS details on the smallest possible level.
          Instead, 3rd party Harbour packages are recommended to maintain
          and provide .hbc files themselves, as part of their standard
          distribution packages. You can find a few such .hbc examples in
@@ -101,7 +100,7 @@
 
 /* TODO: Support debug/release modes. Some default setting can be set
          accordingly, and user can use it to further tweak settings. */
-/* TODO: Further clean hbmk context var usage (hbmk2 scope, project scope,
+/* TODO: Further clean hbmk context var usage (global scope, project scope,
          adding rest of variables). */
 /* TODO: Add a way to fallback to stop if required headers couldn't be found.
          This needs a way to spec what key headers to look for. */
@@ -161,6 +160,8 @@ REQUEST HB_GT_CGI_DEFAULT
 
 REQUEST hbmk_KEYW
 
+#define _SELF_NAME_             "hbmk2"
+
 #define I_( x )                 hb_UTF8ToStr( hb_i18n_gettext( x ) )
 
 #define _TARG_PLAT              1
@@ -567,7 +568,7 @@ PROCEDURE _APPMAIN( ... )
       IF tmp == ".hb" .OR. ;
          tmp == ".hbs" .OR. ;
          tmp == ".hrb"
-         hbmk2_hbrun_minimal( ... )
+         hbmk_hbrun_minimal( ... )
          QUIT
       ENDIF
    ENDIF
@@ -672,7 +673,7 @@ PROCEDURE _APPMAIN( ... )
       ENDIF
 
       /* Build one target */
-      nResult := hbmk2( aArgsTarget, nTargetPos, @lPause, 1 )
+      nResult := hbmk( aArgsTarget, nTargetPos, @lPause, 1 )
 
       /* Exit on first failure */
       IF nResult != 0
@@ -761,7 +762,7 @@ STATIC PROCEDURE hbmk_COMP_Setup( cARCH, cCOMP, cBasePath )
 
    RETURN
 
-FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
+FUNCTION hbmk( aArgs, nArgTarget, /* @ */ lPause, nLevel )
 
    LOCAL hbmk[ _HBMK_MAX_ ]
 
@@ -830,7 +831,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
    LOCAL l_lTargetSelected := .F.
    LOCAL l_cDynLibDir
 
-   /* hbmk2 lib ordering tries to satisfy linkers which require this
+   /* lib ordering tries to satisfy linkers which require this
       (mingw*, linux/gcc, bsd/gcc and dos/djgpp), but this won't solve
       potential problems when users are speccing custom libs themselves
       and expect them to work the same way on all supported platforms/compilers.
@@ -1787,7 +1788,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
    /* Tweaks to compiler/platform environments */
 
    IF hbmk[ _HBMK_cCOMP ] == "bcc"
-      /* NOTE: Hack to tweak bcc setup by hbmk2 to include one additional
+      /* NOTE: Hack to tweak bcc setup to include one additional
                compiler lib dir to lib search path. */
       IF Empty( cPath_CompC )
          cPath_CompC := _BCC_BIN_DETECT()
@@ -3207,7 +3208,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
    IF lHarbourInfo
       IF hbmk[ _HBMK_nHBMODE ] == _HBMODE_NATIVE
          /* Use integrated compiler */
-         hbmk2_hb_compile( hbmk, "harbour", hbmk[ _HBMK_aOPTPRG ] )
+         hbmk_hb_compile( hbmk, "harbour", hbmk[ _HBMK_aOPTPRG ] )
       ELSE
          /* Use external compiler */
          cCommand := FNameEscape( hb_DirSepAdd( PathSepToSelf( l_cHB_INSTALL_BIN ) ) + cBin_CompPRG + cBinExt, hbmk[ _HBMK_nCmd_Esc ] ) +;
@@ -5109,7 +5110,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
       IF ! Empty( l_cVCSHEAD )
          tmp1 := VCSID( hbmk, l_cVCSDIR, l_cVCSHEAD, @tmp2 )
          /* Use the same EOL for all platforms to avoid unnecessary rebuilds. */
-         tmp := "/* Automatically generated by hbmk2. Do not edit. */" + Chr( 10 ) +;
+         tmp := "/* Automatically generated by " + _SELF_NAME_ + ". Do not edit. */" + Chr( 10 ) +;
                 "#define _HBMK_VCS_TYPE_ " + '"' + tmp2 + '"' + Chr( 10 ) +;
                 "#define _HBMK_VCS_ID_   " + '"' + tmp1 + '"' + Chr( 10 )
          /* Update only if something changed to trigger rebuild only if really needed.
@@ -5127,7 +5128,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
       IF ! Empty( l_cTSHEAD )
          /* Use the same EOL for all platforms to avoid unnecessary rebuilds. */
          tmp1 := hb_DateTime()
-         tmp := "/* Automatically generated by hbmk2. Do not edit. */" + Chr( 10 ) +;
+         tmp := "/* Automatically generated by " + _SELF_NAME_ + ". Do not edit. */" + Chr( 10 ) +;
                 "#define _HBMK_BUILD_DATE_      " + '"' +            DToS( tmp1 )         + '"' + Chr( 10 ) +;
                 "#define _HBMK_BUILD_TIME_      " + '"' + SubStr( hb_TToS( tmp1 ), 9, 6 ) + '"' + Chr( 10 ) +;
                 "#define _HBMK_BUILD_TIMESTAMP_ " + '"' +         hb_TToS( tmp1 )         + '"' + Chr( 10 )
@@ -5258,7 +5259,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
       l_aPRG_TO_DO := hbmk[ _HBMK_aPRG ]
    ENDIF
 
-   /* Dump hbmk2 build information */
+   /* Dump build information */
 
    IF lDumpInfo
 
@@ -5353,9 +5354,9 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
 
             IF ! hbmk[ _HBMK_lDONTEXEC ]
                IF hb_mtvm() .AND. Len( aTO_DO:__enumBase() ) > 1
-                  AAdd( aThreads, { hb_threadStart( @hbmk2_hb_compile(), hbmk, "harbour", aCommand ), aCommand } )
+                  AAdd( aThreads, { hb_threadStart( @hbmk_hb_compile(), hbmk, "harbour", aCommand ), aCommand } )
                ELSE
-                  IF ( tmp := hbmk2_hb_compile( hbmk, "harbour", aCommand ) ) != 0
+                  IF ( tmp := hbmk_hb_compile( hbmk, "harbour", aCommand ) ) != 0
                      hbmk_OutErr( hbmk, hb_StrFormat( I_( "Error: Running Harbour compiler (embedded). %1$s" ), hb_ntos( tmp ) ) )
                      IF ! hbmk[ _HBMK_lQuiet ]
                         OutErr( "(" + FNameEscape( hb_DirSepAdd( hb_DirBase() ) + cBin_CompPRG + cBinExt, hbmk[ _HBMK_nCmd_Esc ] ) + ")" +;
@@ -5515,7 +5516,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
 
                /* Build C stub */
                /* Use the same EOL for all platforms to avoid unnecessary rebuilds. */
-               cFile := '/* This temp source file was generated by hbmk2 tool. */'                + Chr( 10 ) +;
+               cFile := '/* This temp source file was generated by ' + _SELF_NAME_ + ' tool. */'  + Chr( 10 ) +;
                         '/* You can safely delete it. */'                                         + Chr( 10 ) +;
                         ''                                                                        + Chr( 10 ) +;
                         '#include "hbapi.h"'                                                      + Chr( 10 ) +;
@@ -5533,7 +5534,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
                               'HB_EXTERN_END'                                                     + Chr( 10 )
                   ENDIF
                   cFile += ''                                                                     + Chr( 10 )
-                  cFile += 'void _hb_lnk_ForceLink_hbmk2( void )'                                 + Chr( 10 )
+                  cFile += 'void _hb_lnk_ForceLink_hbmk( void )'                                  + Chr( 10 )
                   cFile += '{'                                                                    + Chr( 10 )
                   AEval( array, {| tmp | cFile += '   HB_FUNC_EXEC( ' + tmp + ' );'               + Chr( 10 ) } )
                   IF l_cCMAIN != NIL
@@ -5653,14 +5654,14 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
 
                /* Build C++ stub */
                /* Use the same EOL for all platforms to avoid unnecessary rebuilds. */
-               cFile := '/* This temp source file was generated by hbmk2 tool. */'                + Chr( 10 ) +;
+               cFile := '/* This temp source file was generated by ' + _SELF_NAME_ + ' tool. */'  + Chr( 10 ) +;
                         '/* You can safely delete it. */'                                         + Chr( 10 ) +;
                         ''                                                                        + Chr( 10 ) +;
                         '#include "hbapi.h"'                                                      + Chr( 10 ) +;
                         ''                                                                        + Chr( 10 ) +;
                         '#if defined( __cplusplus )'                                              + Chr( 10 ) +;
                         ''                                                                        + Chr( 10 ) +;
-                        'const char * __hbmk2_hbcppmm( void )'                                    + Chr( 10 ) +;
+                        'const char * __hbmk_hbcppmm( void )'                                     + Chr( 10 ) +;
                         '{'                                                                       + Chr( 10 ) +;
                         '   return "HBCPPMM";'                                                    + Chr( 10 ) +;
                         '}'                                                                       + Chr( 10 ) +;
@@ -5922,7 +5923,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
          IF ! hbmk[ _HBMK_lCLEAN ]
             /* Build .rc stub */
             /* Use the same EOL for all platforms to avoid unnecessary rebuilds. */
-            cFile := '/* This temp source file was generated by hbmk2 tool. */'                + Chr( 10 ) +;
+            cFile := '/* This temp source file was generated by ' + _SELF_NAME_ + ' tool. */'  + Chr( 10 ) +;
                      '/* You can safely delete it. */'                                         + Chr( 10 ) +;
                      ''                                                                        + Chr( 10 )
             IF ! Empty( hbmk[ _HBMK_cMANIFEST ] )
@@ -7279,7 +7280,7 @@ STATIC FUNCTION hbmk_MemoRead( cFileName )
 
    RETURN hb_UTF8ToStr( cFile )
 
-STATIC FUNCTION hbmk2_hb_compile( hbmk, ... )
+STATIC FUNCTION hbmk_hb_compile( hbmk, ... )
    LOCAL cSaveCP
    LOCAL xRetVal
 
@@ -7293,7 +7294,7 @@ STATIC FUNCTION hbmk2_hb_compile( hbmk, ... )
 
    RETURN xRetVal
 
-STATIC FUNCTION hbmk2_hb_compileBuf( hbmk, ... )
+STATIC FUNCTION hbmk_hb_compileBuf( hbmk, ... )
    LOCAL cSaveCP
    LOCAL xRetVal
 
@@ -7459,7 +7460,7 @@ STATIC FUNCTION FindNewerHeaders( hbmk, cFileName, tTimeParent, lCMode, cBin_Com
                                 ListToArray( iif( ! Empty( GetEnv( "HB_USER_PRGFLAGS" ) ), " " + GetEnv( "HB_USER_PRGFLAGS" ), "" ) ),;
                                 hbmk[ _HBMK_aOPTPRG ] } )
 
-      IF ! HB_ISSTRING( tmp := hbmk2_hb_compileBuf( hbmk, "harbour", aCommand ) )
+      IF ! HB_ISSTRING( tmp := hbmk_hb_compileBuf( hbmk, "harbour", aCommand ) )
          RETURN .F.
       ENDIF
 
@@ -10039,7 +10040,7 @@ STATIC FUNCTION HBM_Load( hbmk, aParams, cFileName, nNestingLevel, lProcHBP )
                            IF hb_FileExists( cHBP )
                               aArgs := AClone( hbmk[ _HBMK_aArgs ] )
                               aArgs[ hbmk[ _HBMK_nArgTarget ] ] := cHBP
-                              nResult := hbmk2( aArgs, hbmk[ _HBMK_nArgTarget ], @hbmk[ _HBMK_lPause ], hbmk[ _HBMK_nLevel ] + 1 )
+                              nResult := hbmk( aArgs, hbmk[ _HBMK_nArgTarget ], @hbmk[ _HBMK_lPause ], hbmk[ _HBMK_nLevel ] + 1 )
                               IF nResult != 0
                                  RETURN nResult
                               ENDIF
@@ -10047,7 +10048,7 @@ STATIC FUNCTION HBM_Load( hbmk, aParams, cFileName, nNestingLevel, lProcHBP )
                               hbmk_OutErr( hbmk, hb_StrFormat( I_( "Warning: Project reference (%1$s) ignored. File not found." ), cHBP ) )
                            ENDIF
                         ELSE
-                           hbmk_OutErr( hbmk, hb_StrFormat( I_( "Warning: Project reference (%1$s) ignored. Project references require hbmk2 to be invoced with a main project." ), cHBP ) )
+                           hbmk_OutErr( hbmk, hb_StrFormat( I_( "Warning: Project reference (%1$s) ignored. Project references require %2$s to be invoked with a main project." ), cHBP, _SELF_NAME_ ) )
                         ENDIF
                      ELSE
                         hbmk_OutErr( hbmk, hb_StrFormat( I_( "Warning: Project reference (%1$s) ignored in automatic make file: %2$s" ), cHBP, cFileName ) )
@@ -11882,7 +11883,7 @@ STATIC FUNCTION __hb_extern_gen( hbmk, aFuncList, cOutputName )
    cExtern += hb_eol()
    cExtern += cLine
    cExtern += "/* WARNING: Automatically generated code below. DO NOT EDIT!            */" + hb_eol()
-   cExtern += "/*          Regenerate using hbmk2 '-hbx=' option.                      */" + hb_eol()
+   cExtern += "/*          Regenerate using " + _SELF_NAME_ + " '-hbx=' option.        */" + hb_eol()
    cExtern += cLine
    cExtern += hb_eol()
    cExtern += "#ifndef " + "__HBEXTERN_CH__" + StrToDefine( hb_FNameName( cOutputName ) ) + "__" + hb_eol()
@@ -11965,7 +11966,7 @@ STATIC FUNCTION hbmk_CoreHeaderFilesMinimal()
 
 /* Emulate a minimal hbrun */
 
-PROCEDURE hbmk2_hbrun_minimal( cFile, ... )
+STATIC PROCEDURE hbmk_hbrun_minimal( cFile, ... )
 
    IF ! Empty( cFile := FindInPath( cFile ) )
       SWITCH Lower( hb_FNameExt( cFile ) )
@@ -12038,7 +12039,7 @@ STATIC PROCEDURE convert_hbmake_to_hbp( hbmk, cSrcName, cDstName )
       cDstName := hb_FNameExtSet( cSrcName, ".hbp" )
    ENDIF
 
-   AAdd( aDst, "# Automatically converted by hbmk2 from hbmake project:" )
+   AAdd( aDst, "# Automatically converted by " + _SELF_NAME_ + " from hbmake project:" )
    AAdd( aDst, hb_StrFormat( "# %1$s", cSrcName ) )
    AAdd( aDst, "" )
 
@@ -12169,7 +12170,7 @@ STATIC PROCEDURE convert_xbp_to_hbp( hbmk, cSrcName, cDstName )
       cDstName := hb_FNameExtSet( cSrcName, ".hbp" )
    ENDIF
 
-   AAdd( aDst, "# Automatically converted by hbmk2 from xbuild project:" )
+   AAdd( aDst, "# Automatically converted by " + _SELF_NAME_ + " from xbuild project:" )
    AAdd( aDst, hb_StrFormat( "# %1$s", cSrcName ) )
    AAdd( aDst, "" )
    AAdd( aDst, "-inc" )
@@ -12300,7 +12301,7 @@ STATIC PROCEDURE convert_xhp_to_hbp( hbmk, cSrcName, cDstName )
       cDstName := hb_FNameExtSet( cSrcName, ".hbp" )
    ENDIF
 
-   AAdd( aDst, "# Automatically converted by hbmk2 from xMate project:" )
+   AAdd( aDst, "# Automatically converted by " + _SELF_NAME_ + " from xMate project:" )
    AAdd( aDst, hb_StrFormat( "# %1$s", cSrcName ) )
    AAdd( aDst, "" )
    AAdd( aDst, "-inc" )
@@ -12450,7 +12451,7 @@ STATIC PROCEDURE SetUILang( hbmk )
    IF hbmk[ _HBMK_cUILNG ] == "en"
       hb_i18n_Set( NIL )
    ELSE
-      tmp := "${hb_root}hbmk2.${hb_lng}.hbl"
+      tmp := "${hb_root}" + _SELF_NAME_ + ".${hb_lng}.hbl"
       tmp := StrTran( tmp, "${hb_root}", hb_DirSepAdd( hb_DirBase() ) )
       tmp := StrTran( tmp, "${hb_lng}", StrTran( hbmk[ _HBMK_cUILNG ], "-", "_" ) )
       hb_i18n_Set( iif( hb_i18n_Check( tmp := hb_MemoRead( tmp ) ), hb_i18n_RestoreTable( tmp ), NIL ) )
@@ -12866,7 +12867,7 @@ STATIC PROCEDURE ShowHeader( hbmk )
    LOCAL cTrsText
    LOCAL cTrsTextI
 
-   OutStd( "Harbour Make (hbmk2) " + HBRawVersion() + _OUT_EOL +;
+   OutStd( "Harbour Make (" + _SELF_NAME_ + ") " + HBRawVersion() + _OUT_EOL +;
            "Copyright (c) 1999-2012, Viktor Szakats" + _OUT_EOL +;
            "http://harbour-project.org/" + _OUT_EOL )
 
@@ -12892,7 +12893,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong )
    LOCAL aText_Basic := {;
       I_( "Syntax:" ),;
       "",;
-      I_( "  hbmk2 [options] [<script[s]>] <src[s][.prg|.c|.obj|.o|.rc|.res|.def|.po|.pot|.hbl|@.clp|.d]>" ),;
+      hb_StrFormat( I_( "  %1$s [options] [<script[s]>] <src[s][.prg|.c|.obj|.o|.rc|.res|.def|.po|.pot|.hbl|@.clp|.d]>" ), _SELF_NAME_ ),;
       "",;
       I_( "Options:" ) }
 
@@ -12992,8 +12993,8 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong )
       { "-dflag=<f>"         , I_( "pass flag to linker (dynamic library)" ) },;
       { "-iflag=<f>"         , I_( "pass flag to import library creation command" ) },;
       { "-runflag=<f>"       , I_( "pass flag to output executable when -run option is used" ) },;
-      { "-cflag+=<f>"        , I_( "pass flag to C compiler overriding C compiler flags added by hbmk2 itself. Use with caution." ) },;
-      { "-3rd=<f>"           , I_( "options/flags reserved for 3rd party tools, always ignored by hbmk2 itself" ) },;
+      { "-cflag+=<f>"        , hb_StrFormat( I_( "pass flag to C compiler overriding C compiler flags added by %1$s itself. Use with caution." ), _SELF_NAME_ ) },;
+      { "-3rd=<f>"           , hb_StrFormat( I_( "options/flags reserved for 3rd party tools, always ignored by %1$s itself" ), _SELF_NAME_ ) },;
       { "-jobs=<n>"          , I_( "start n compilation threads (multiprocess platforms only)" ) },;
       { "-inc"               , I_( "enable incremental build mode" ) },;
       { "-[no]head[=<m>]"    , I_( "control source header parsing (in incremental build mode)\n<m> can be: native (uses compiler to extract dependencies), full (default, uses simple text parser on the whole file), dep, off" ) },;
@@ -13014,7 +13015,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong )
       { "-deppkgname=<d:n>"       , I_( "<d> is the name of the dependency. <n> name of the package depedency. Can be specified multiple times." ) },;
       { "-depkeyhead=<d:h>"       , I_( "<d> is the name of the dependency. <h> is the key header (.h) of the package dependency. Multiple alternative headers can be specified." ) },;
       { "-depoptional=<d:f>"      , I_( "<d> is the name of the dependency. <f> can be 'yes' or 'no', specifies whether the dependency is optional. Default: no" ) },;
-      { "-depcontrol=<d:v>"       , I_( "<d> is the name of the dependency. <v> is a value that controls how detection is done. Accepted values: no, yes, force, nolocal, local. Default: content of envvar HBMK2_WITH_<d>" ) },;
+      { "-depcontrol=<d:v>"       , I_( "<d> is the name of the dependency. <v> is a value that controls how detection is done. Accepted values: no, yes, force, nolocal, local. Default: content of envvar HBMK_WITH_<d>" ) },;
       { "-depincroot=<d:r>"       , I_( "<d> is the name of the dependency. Set <r> as root directory for paths specified in -depincpath options." ) },;
       { "-depincpath=<d:i>"       , I_( "<d> is the name of the dependency. Add <i> to the header detection path list." ) },;
       { "-depincpathlocal= <d:i>" , I_( "<d> is the name of the dependency. Add <i> to the header detection path list, where <i> is pointing to a directory local to the project and containing an embedded (or locally hosted) dependency." ) },;
@@ -13033,8 +13034,8 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong )
       NIL,;
       { "-hbrun"             , I_( "run target" ) },;
       { "-hbraw"             , I_( "stop after running Harbour compiler" ) },;
-      { "-hbcmp|-clipper"    , I_( "stop after creating the object files\ncreate link/copy hbmk2 to hbcmp/clipper for the same effect" ) },;
-      { "-hbcc"              , I_( "accept raw C flags\ncreate link/copy hbmk2 to hbcc for the same effect" ) },;
+      { "-hbcmp|-clipper"    , hb_StrFormat( I_( "stop after creating the object files\ncreate link/copy %1$s to hbcmp/clipper for the same effect" ), _SELF_NAME_ ) },;
+      { "-hbcc"              , hb_StrFormat( I_( "accept raw C flags\ncreate link/copy %1$s to hbcc for the same effect" ), _SELF_NAME_ ) },;
       { "-hblnk"             , I_( "accept raw linker flags" ) },;
       { "-autohbm[-]"        , hb_StrFormat( I_( "enable (or disable) processing of %1$s in current directory (default: yes)" ), _HBMK_AUTOHBM_NAME ) },;
       { "-hb10"              , I_( "enable Harbour 1.0.x compatibility mode" ) },;
@@ -13043,7 +13044,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong )
       { "-hbc"               , I_( "enable pure C mode" ) },;
       { "-rtlink"            , "" },;
       { "-blinker"           , "" },;
-      { "-exospace"          , I_( "emulate Clipper compatible linker behavior\ncreate link/copy hbmk2 to rtlink/blinker/exospace for the same effect" ) },;
+      { "-exospace"          , hb_StrFormat( I_( "emulate Clipper compatible linker behavior\ncreate link/copy %1$s to rtlink/blinker/exospace for the same effect" ), _SELF_NAME_ ) },;
       NIL,;
       { "-hbmake=<file>"     , I_( "convert hbmake project <file> to .hbp file" ) },;
       { "-xbp=<file>"        , I_( "convert .xbp (xbuild) project <file> to .hbp file" ) },;
@@ -13072,7 +13073,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong )
       I_( "<script> can be:\n  <@script> or <script.hbm>: command line options in file\n  <script.hbp>: command line options in file, it also marks a new target if specified on the command line\n  <script.hbc>: package configuration file" ),;
       I_( "Multiple -l, -L, -i and <script> parameters are accepted." ),;
       I_( "Regular Harbour compiler options are also accepted.\n(see them with -harbourhelp option)" ),;
-      hb_StrFormat( I_( "%1$s option file in hbmk2 directory is always processed if it exists. On *nix platforms ~/.harbour, /etc/harbour, <base>/etc/harbour, <base>/etc are checked (in that order) before the hbmk2 directory." ), _HBMK_AUTOHBC_NAME ),;
+      hb_StrFormat( I_( "%1$s option file in %2$s directory is always processed if it exists. On *nix platforms ~/.harbour, /etc/harbour, <base>/etc/harbour, <base>/etc are checked (in that order) before the %2$s directory." ), _HBMK_AUTOHBC_NAME, _SELF_NAME_ ),;
       hb_StrFormat( I_( "%1$s make script in current directory is always processed if it exists." ), _HBMK_AUTOHBM_NAME ),;
       I_( ".hbc options (they should come in separate lines): libs=[<libname[s]>], hbcs=[<.hbc file[s]>], gt=[gtname], syslibs=[<libname[s]>], frameworks=[<framework[s]>], prgflags=[Harbour flags], cflags=[C compiler flags], resflags=[resource compiler flags], ldflags=[linker flags], pflags=[flags for plugins], libpaths=[paths], sources=[source files], psources=[source files for plugins], incpaths=[paths], requests=[func], instfiles=[files], instpaths=[paths], autohbcs=[<.ch>:<.hbc>], plugins=[plugins], gui|mt|pic|shared|nulrdd|nodefgt|debug|opt|map|strip|hbcppmm|winuni|implib|run|inc=[yes|no], cpp=[yes|no|def], warn=[max|yes|low|no|def], compr=[yes|no|def|min|max], head=[off|full|native|dep], skip=<reason>, stop=<reason>, echo=<text>\nLines starting with '#' char are ignored" ),;
       I_( "Platform filters are accepted in each .hbc line and with several options.\nFilter format: {[!][<plat>|<comp>|<cpu>|<keyword>]}. Filters can be combined using '&', '|' operators and grouped by parantheses. Ex.: {win}, {gcc}, {linux|darwin}, {win&!pocc}, {(win|linux)&!watcom}, {unix&mt&gui}, -cflag={win}-DMYDEF, -stop{dos}, -stop{!allwin}, {allwin|allmsvc|allgcc|allmingw|allicc|allpocc|unix}, {x86|x86_64|ia64|arm|mips|sh}, {debug|nodebug|gui|std|mt|st|shared|static|winuni|winansi|xhb}" ),;
@@ -13149,11 +13150,11 @@ STATIC PROCEDURE hbmk_OutStd( hbmk, cText )
    LOCAL tmp
 
    IF hbmk[ _HBMK_lShowLevel ]
-      nWidth := 10
-      cPrefix := hb_StrFormat( "hbmk2 #%1$s:", hb_ntos( hbmk[ _HBMK_nLevel ] ) )
+      nWidth := Len( _SELF_NAME_ ) + 5
+      cPrefix := hb_StrFormat( _SELF_NAME_ + " #%1$s:", hb_ntos( hbmk[ _HBMK_nLevel ] ) )
    ELSE
-      nWidth := 7
-      cPrefix := "hbmk2:"
+      nWidth := Len( _SELF_NAME_ ) + 2
+      cPrefix := _SELF_NAME_ + ":"
    ENDIF
 
    cText := StrTran( cText, "\n", hb_eol() )
@@ -13174,11 +13175,11 @@ STATIC PROCEDURE hbmk_OutErr( hbmk, cText )
    LOCAL tmp
 
    IF hbmk[ _HBMK_lShowLevel ]
-      nWidth := 10
-      cPrefix := hb_StrFormat( "hbmk2 #%1$s:", hb_ntos( hbmk[ _HBMK_nLevel ] ) )
+      nWidth := Len( _SELF_NAME_ ) + 5
+      cPrefix := hb_StrFormat( _SELF_NAME_ + " #%1$s:", hb_ntos( hbmk[ _HBMK_nLevel ] ) )
    ELSE
-      nWidth := 7
-      cPrefix := "hbmk2:"
+      nWidth := Len( _SELF_NAME_ ) + 2
+      cPrefix := _SELF_NAME_ + ":"
    ENDIF
 
    cText := StrTran( cText, "\n", hb_eol() )
diff --git a/harbour/utils/hbmk2/hbmk2.pt_BR.po b/harbour/utils/hbmk2/hbmk2.pt_BR.po
index 7b248c26c2..5a26dc3916 100644
--- a/harbour/utils/hbmk2/hbmk2.pt_BR.po
+++ b/harbour/utils/hbmk2/hbmk2.pt_BR.po
@@ -343,8 +343,8 @@ msgstr "linkar com suporte multi ou single-thread na HVM"
 
 #: hbmk2.prg:7825 hbmk2.prg:11479
 #, c-format
-msgid "  hbmk2 [options] [<script[s]>] <src[s][.prg|.c|.obj|.o|.rc|.res|.def|.po|.pot|.hbl|@.clp|.d]>"
-msgstr "  hbmk2 [opções] [<script[s]>] <src[s][.prg|.c|.obj|.o|.rc|.res|.def|.po|.pot|.hbl|@.clp|.d]>"
+msgid "  %1$s [options] [<script[s]>] <src[s][.prg|.c|.obj|.o|.rc|.res|.def|.po|.pot|.hbl|@.clp|.d]>"
+msgstr "  %1$s [opções] [<script[s]>] <src[s][.prg|.c|.obj|.o|.rc|.res|.def|.po|.pot|.hbl|@.clp|.d]>"
 
 #: hbmk2.prg:7942 hbmk2.prg:11633
 #, c-format
@@ -478,8 +478,8 @@ msgstr "As opções em um arquivo .hbc devem estar em linhas separadas e são: l
 
 #: hbmk2.prg:7942 hbmk2.prg:11633
 #, c-format
-msgid "stop after creating the object files\\ncreate link/copy hbmk2 to hbcmp/clipper for the same effect"
-msgstr "interromper após criar os arquivos objetos\\ncriar um link ou copiar o hbmk2 para hbcmp/clipper resultará no mesmo efeito"
+msgid "stop after creating the object files\\ncreate link/copy %1$s to hbcmp/clipper for the same effect"
+msgstr "interromper após criar os arquivos objetos\\ncriar um link ou copiar o %1$s para hbcmp/clipper resultará no mesmo efeito"
 
 #: hbmk2.prg:7960
 #, c-format
@@ -808,13 +808,13 @@ msgstr "Tempo de execução: %1$ss"
 
 #: hbmk2.prg:7942 hbmk2.prg:11633
 #, c-format
-msgid "emulate Clipper compatible linker behavior\\ncreate link/copy hbmk2 to rtlink/blinker/exospace for the same effect"
-msgstr "emula o comportamento de um linkeditor compatível com clipper\\ncriar um link ou copiar o hbmk2 para rtlink/blinker/exospace resultará no mesmo efeito"
+msgid "emulate Clipper compatible linker behavior\\ncreate link/copy %1$s to rtlink/blinker/exospace for the same effect"
+msgstr "emula o comportamento de um linkeditor compatível com clipper\\ncriar um link ou copiar o %1$s para rtlink/blinker/exospace resultará no mesmo efeito"
 
 #: hbmk2.prg:7960 hbmk2.prg:11650
 #, c-format
-msgid "%1$s option file in hbmk2 directory is always processed if it exists. On *nix platforms ~/.harbour, /etc/harbour, <base>/etc/harbour, <base>/etc are checked (in that order) before the hbmk2 directory."
-msgstr "O arquivo de configuração %1$s no diretório do hbmk2 sempre ser processado caso exista. Em plataformas *nix este arquivo é sempre procurado nas pastas ~/.harbour, /etc/harbour, <base>/etc/harbour, <base>/etc (exatamente nesta ordem) antes da pasta que contém o hbmk."
+msgid "%1$s option file in %2$s directory is always processed if it exists. On *nix platforms ~/.harbour, /etc/harbour, <base>/etc/harbour, <base>/etc are checked (in that order) before the %2$s directory."
+msgstr "O arquivo de configuração %1$s no diretório do %2$s sempre ser processado caso exista. Em plataformas *nix este arquivo é sempre procurado nas pastas ~/.harbour, /etc/harbour, <base>/etc/harbour, <base>/etc (exatamente nesta ordem) antes da pasta que contém o %2$s."
 
 #: hbmk2.prg:7942 hbmk2.prg:11633
 #, c-format
@@ -968,8 +968,8 @@ msgstr "compilação limpa (em modo de compilação incremental)"
 
 #: hbmk2.prg:7942 hbmk2.prg:11633
 #, c-format
-msgid "stop after creating the object files and accept raw C flags\\ncreate link/copy hbmk2 to hbcc for the same effect"
-msgstr "interromper após criar os arquivos objetos e processa-los com o compilador C\\ncriar um link ou copiar o hbmk2 para hbcc resultará no mesmo efeito"
+msgid "stop after creating the object files and accept raw C flags\\ncreate link/copy %1$s to hbcc for the same effect"
+msgstr "interromper após criar os arquivos objetos e processa-los com o compilador C\\ncriar um link ou copiar o %1$s para hbcc resultará no mesmo efeito"
 
 #: hbmk2.prg:7808 hbmk2.prg:11462
 #, c-format
@@ -1213,7 +1213,7 @@ msgstr ""
 
 #: hbmk2.prg:11633
 #, c-format
-msgid "options/flags reserved for 3rd party tools, always ignored by hbmk2 itself"
+msgid "options/flags reserved for 3rd party tools, always ignored by %1$s itself"
 msgstr ""
 
 #: hbmk2.prg:11633
@@ -1228,7 +1228,7 @@ msgstr ""
 
 #: hbmk2.prg:9418
 #, c-format
-msgid "Warning: Project reference (%1$s) ignored. Project references require hbmk2 to be invoced with a main project."
+msgid "Warning: Project reference (%1$s) ignored. Project references require %2$s to be invoked with a main project."
 msgstr ""
 
 #: hbmk2.prg:6786
@@ -1393,7 +1393,7 @@ msgstr ""
 
 #: hbmk2.prg:11633
 #, c-format
-msgid "<d> is the name of the dependency. <v> is a value that controls how detection is done. Accepted values: no, yes, force, nolocal, local. Default: content of envvar HBMK2_WITH_<d>"
+msgid "<d> is the name of the dependency. <v> is a value that controls how detection is done. Accepted values: no, yes, force, nolocal, local. Default: content of envvar HBMK_WITH_<d>"
 msgstr ""
 
 #: hbmk2.prg:11512