diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f8945c4a4d..fbb121d1a0 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,14 @@
+19991004-16:25 GMT+1 Victor Szel <info@szelvesz.hu>
+  * source/runner/stdalone/runner.c -> hbrun.c
+    source/runner/stdalone/Makefile
+    runner.b32
+    makefile.vc
+    tests/working/hbrun.bat -> hbrunprg.bat
+    tests/working/run_all.bat
+    tests/working/test_all.prg
+    * runner.exe renamed to hbrun.exe to better fit into the final
+      executable naming style (harbour/hbpp/hbrun)
+
 19991004-15:15 GMT+1 Victor Szel <info@szelvesz.hu>
   * source/hbpp -> source/pp
     source/Makefile
diff --git a/harbour/makefile.vc b/harbour/makefile.vc
index 8cecfd9bcc..18b33df3bc 100644
--- a/harbour/makefile.vc
+++ b/harbour/makefile.vc
@@ -53,7 +53,7 @@ DBFNTX_LIB=$(LIB_DIR)\dbfntx.lib
 RUNNER_LIB=$(LIB_DIR)\runner.lib
 HARBOUR_EXE=$(BIN_DIR)\harbour.exe
 PP_EXE=$(BIN_DIR)\hbpp.exe
-RUNNER_EXE=$(BIN_DIR)\runner.exe
+RUNNER_EXE=$(BIN_DIR)\hbrun.exe
 HARBOURFLAGS=-iinclude -n -q
 
 LIBS=$(HARBOUR_LIB) $(TERMINAL_LIB) $(TOOLS_LIB) $(DEBUG_LIB) $(PP_LIB) $(DBFNTX_LIB) $(RUNNER_LIB)
@@ -237,10 +237,10 @@ $(PP_EXE) : \
 
 $(RUNNER_EXE) : \
     $(RUNNER_DIR)\stdalone\external.prg \
-    $(RUNNER_DIR)\stdalone\runner.prg
+    $(RUNNER_DIR)\stdalone\hbrun.prg
     $(HARBOUR_EXE) $(HARBOURFLAGS) -o$(RUNNER_DIR)\stdalone\ $(RUNNER_DIR)\stdalone\external.prg 
-    $(HARBOUR_EXE) $(HARBOURFLAGS) -o$(RUNNER_DIR)\stdalone\ -i$(RUNNER_DIR)\stdalone\ $(RUNNER_DIR)\stdalone\runner.prg 
-    $(CC) -TP $(CFLAGS) $(RUNNER_DIR)\stdalone\runner.c $(RUNNER_DIR)\stdalone\external.c -o $(BIN_DIR)\runner /link  $(LIBS)
+    $(HARBOUR_EXE) $(HARBOURFLAGS) -o$(RUNNER_DIR)\stdalone\ -i$(RUNNER_DIR)\stdalone\ $(RUNNER_DIR)\stdalone\hbrun.prg 
+    $(CC) -TP $(CFLAGS) $(RUNNER_DIR)\stdalone\hbrun.c $(RUNNER_DIR)\stdalone\external.c -o $(BIN_DIR)\runner /link  $(LIBS)
     -del external.obj
     -del runner.obj
 
diff --git a/harbour/runner.b32 b/harbour/runner.b32
index 695d6cfb92..9dc08ba5b7 100644
--- a/harbour/runner.b32
+++ b/harbour/runner.b32
@@ -17,7 +17,7 @@ runner.lib : runlib.obj
 
 runlib.obj   : runlib.c
 
-runner.c     : runner.prg
+hbrun.c      : hbrun.prg
 external.c   : external.prg
 
 .prg.c:
@@ -27,11 +27,11 @@ external.c   : external.prg
   bcc32 -c -O2 -I.\include -v -o$@ -DHARBOUR_USE_WIN_GTAPI $<
   tlib .\lib\b32\runner.lib -+$@,,
 
-runner.exe : runner.c external.c runlib.c
+hbrun.exe : hbrun.c external.c runlib.c
    echo -v -O2 > bld.32
    echo -ebin\runner.exe >> bld.32
    echo -Iinclude >> bld.32
-   echo source\runner\stdalone\runner.c >> bld.32
+   echo source\runner\stdalone\hbrun.c >> bld.32
    echo source\runner\stdalone\external.c >> bld.32
    echo lib\b32\harbour.lib >> bld.32
    echo lib\b32\terminal.lib >> bld.32
diff --git a/harbour/source/runner/stdalone/Makefile b/harbour/source/runner/stdalone/Makefile
index 093ccbc39d..70e054af0f 100644
--- a/harbour/source/runner/stdalone/Makefile
+++ b/harbour/source/runner/stdalone/Makefile
@@ -5,10 +5,10 @@
 ROOT = ../../../
 
 PRG_SOURCES=\
-	runner.prg \
+	hbrun.prg \
         external.prg \
 	
-PRG_MAIN=runner.prg
+PRG_MAIN=hbrun.prg
 
 LIBS=\
         runner \
diff --git a/harbour/tests/working/hbrun.bat b/harbour/tests/working/hbrunprg.bat
similarity index 88%
rename from harbour/tests/working/hbrun.bat
rename to harbour/tests/working/hbrunprg.bat
index dbe82b4e97..45295de1d0 100644
--- a/harbour/tests/working/hbrun.bat
+++ b/harbour/tests/working/hbrunprg.bat
@@ -5,4 +5,4 @@ rem
 
 REM From .PRG to .C = Harbour
 ..\..\bin\harbour %1 /n /gHRB /i..\..\include
-runner %1.hrb
+hbrun %1
diff --git a/harbour/tests/working/run_all.bat b/harbour/tests/working/run_all.bat
index 46fb01aa07..ecf090bd51 100644
--- a/harbour/tests/working/run_all.bat
+++ b/harbour/tests/working/run_all.bat
@@ -4,5 +4,5 @@ rem $Id$
 rem 
 
 ..\..\bin\harbour test_all.prg /n /gHBR /i..\..\include
-runner test_all.hrb hrb
+hbrun test_all
 call testall.bat
diff --git a/harbour/tests/working/test_all.prg b/harbour/tests/working/test_all.prg
index 39c78b8631..a8fa572807 100644
--- a/harbour/tests/working/test_all.prg
+++ b/harbour/tests/working/test_all.prg
@@ -39,7 +39,7 @@ LOCAL aDir,f,n,o,p,cRead
                fWrite(o,;
                   "..\..\bin\harbour "+aDir[f][1]+" /n /gHRB /i..\..\include >> test_all.out"+Chr(13)+Chr(10)+;
                   "if errorlevel 1 goto end"+Chr(13)+Chr(10)+;
-                  "runner "+Left(aDir[f][1],Len(aDir[f][1])-4)+".hrb >> test_all.out"+Chr(13)+Chr(10) )
+                  "hbrun "+Left(aDir[f][1],Len(aDir[f][1])-4)+".hrb >> test_all.out"+Chr(13)+Chr(10) )
             ELSE
                fWrite(o,cCmd + cOption + " " + n + Chr(13) + Chr(10);
                 + "if errorlevel 1 goto end" + Chr(13) + Chr(10) + Chr(13) + Chr(10))