diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index ae09281f0b..32910be6c8 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,20 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-12-01 00:54 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+   - contrib/apollo
+   + contrib/hbapollo
+   * contrib/hbapollo/common.mak
+   * contrib/hbapollo/Makefile
+   * harbour/contrib/make_b32_all.bat
+   * harbour/contrib/make_vc_all.bat
+     * First contrib lib rename (live rehearsal).
+       (goals: hb prefix, dirname = libname, 8 chars limit)
+
+   * harbour/contrib/make_b32_all.bat
+   * harbour/contrib/make_vc_all.bat
+     * DIRS internal envvar renamed to _HB_DIRS.
+
 2007-11-30 20:30 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl)
   * harbour/include/hbstack.h
     ! Added HB_EXPORT to hb_stackPop(). Required
diff --git a/harbour/contrib/apollo/Makefile b/harbour/contrib/hbapollo/Makefile
similarity index 87%
rename from harbour/contrib/apollo/Makefile
rename to harbour/contrib/hbapollo/Makefile
index 98233ef3be..1e27fb6569 100644
--- a/harbour/contrib/apollo/Makefile
+++ b/harbour/contrib/hbapollo/Makefile
@@ -10,6 +10,6 @@ C_SOURCES=\
 PRG_SOURCES=\
 	apollo1.prg \
 
-LIBNAME=apollo
+LIBNAME=hbapollo
 
 include $(TOP)$(ROOT)config/lib.cf
diff --git a/harbour/contrib/apollo/apollo.c b/harbour/contrib/hbapollo/apollo.c
similarity index 100%
rename from harbour/contrib/apollo/apollo.c
rename to harbour/contrib/hbapollo/apollo.c
diff --git a/harbour/contrib/apollo/apollo1.prg b/harbour/contrib/hbapollo/apollo1.prg
similarity index 100%
rename from harbour/contrib/apollo/apollo1.prg
rename to harbour/contrib/hbapollo/apollo1.prg
diff --git a/harbour/contrib/apollo/changelog b/harbour/contrib/hbapollo/changelog
similarity index 100%
rename from harbour/contrib/apollo/changelog
rename to harbour/contrib/hbapollo/changelog
diff --git a/harbour/contrib/apollo/common.mak b/harbour/contrib/hbapollo/common.mak
similarity index 89%
rename from harbour/contrib/apollo/common.mak
rename to harbour/contrib/hbapollo/common.mak
index 542d008094..0a9835845c 100644
--- a/harbour/contrib/apollo/common.mak
+++ b/harbour/contrib/hbapollo/common.mak
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-LIBNAME = apollo
+LIBNAME = hbapollo
 
 LIB_PATH = $(LIB_DIR)\$(LIBNAME)$(LIBEXT)
 
diff --git a/harbour/contrib/apollo/make_b32.bat b/harbour/contrib/hbapollo/make_b32.bat
similarity index 100%
rename from harbour/contrib/apollo/make_b32.bat
rename to harbour/contrib/hbapollo/make_b32.bat
diff --git a/harbour/contrib/apollo/make_vc.bat b/harbour/contrib/hbapollo/make_vc.bat
similarity index 100%
rename from harbour/contrib/apollo/make_vc.bat
rename to harbour/contrib/hbapollo/make_vc.bat
diff --git a/harbour/contrib/apollo/readme.txt b/harbour/contrib/hbapollo/readme.txt
similarity index 100%
rename from harbour/contrib/apollo/readme.txt
rename to harbour/contrib/hbapollo/readme.txt
diff --git a/harbour/contrib/apollo/test/apollo.ch b/harbour/contrib/hbapollo/test/apollo.ch
similarity index 100%
rename from harbour/contrib/apollo/test/apollo.ch
rename to harbour/contrib/hbapollo/test/apollo.ch
diff --git a/harbour/contrib/apollo/test/apollo.prg b/harbour/contrib/hbapollo/test/apollo.prg
similarity index 100%
rename from harbour/contrib/apollo/test/apollo.prg
rename to harbour/contrib/hbapollo/test/apollo.prg
diff --git a/harbour/contrib/apollo/test/bld.bat b/harbour/contrib/hbapollo/test/bld.bat
similarity index 100%
rename from harbour/contrib/apollo/test/bld.bat
rename to harbour/contrib/hbapollo/test/bld.bat
diff --git a/harbour/contrib/apollo/test/bld_b32.bat b/harbour/contrib/hbapollo/test/bld_b32.bat
similarity index 100%
rename from harbour/contrib/apollo/test/bld_b32.bat
rename to harbour/contrib/hbapollo/test/bld_b32.bat
diff --git a/harbour/contrib/make_b32_all.bat b/harbour/contrib/make_b32_all.bat
index d529665eb8..4f01bcd58f 100644
--- a/harbour/contrib/make_b32_all.bat
+++ b/harbour/contrib/make_b32_all.bat
@@ -10,22 +10,22 @@ set HB_SHOW_ERRORS=no
 
 rem set DO_NOT_COMPILE=examples hbclip hgf what32
 
-set DIRS=adordd bmdbfcdx btree gtwvg libct libgt libmisc libnf msql
-for %%n in ( %DIRS% ) do %COMSPEC% /c make_b32.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9
+set _HB_DIRS=adordd bmdbfcdx btree gtwvg libct libgt libmisc libnf msql
+for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c make_b32.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9
 
-set DIRS=ole hbzlib htmllib odbc telepath tip win32 xhb
-for %%n in ( %DIRS% ) do %COMSPEC% /c make_b32.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9
+set _HB_DIRS=ole hbzlib htmllib odbc telepath tip win32 xhb
+for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c make_b32.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9
 
-set DIRS=samples directx
-if not "%APOLLO_DIR%"    == "" set DIRS=%DIRS% apollo
-if not "%FIREBIRD_DIR%"  == "" set DIRS=%DIRS% firebird
-if not "%FREEIMAGE_DIR%" == "" set DIRS=%DIRS% freeimage
-if not "%GD_DIR%"        == "" set DIRS=%DIRS% gd
-if not "%MYSQL_DIR%"     == "" set DIRS=%DIRS% mysql
-if not "%PDFLIB_DIR%"    == "" set DIRS=%DIRS% pdflib
-if not "%PGSQL_DIR%"     == "" set DIRS=%DIRS% pgsql
-if not "%ADS_DIR%"       == "" set DIRS=%DIRS% rdd_ads
-for %%n in ( %DIRS% ) do %COMSPEC% /c make_b32.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9
+set _HB_DIRS=samples directx
+if not "%APOLLO_DIR%"    == "" set _HB_DIRS=%_HB_DIRS% hbapollo
+if not "%FIREBIRD_DIR%"  == "" set _HB_DIRS=%_HB_DIRS% firebird
+if not "%FREEIMAGE_DIR%" == "" set _HB_DIRS=%_HB_DIRS% freeimage
+if not "%GD_DIR%"        == "" set _HB_DIRS=%_HB_DIRS% gd
+if not "%MYSQL_DIR%"     == "" set _HB_DIRS=%_HB_DIRS% mysql
+if not "%PDFLIB_DIR%"    == "" set _HB_DIRS=%_HB_DIRS% pdflib
+if not "%PGSQL_DIR%"     == "" set _HB_DIRS=%_HB_DIRS% pgsql
+if not "%ADS_DIR%"       == "" set _HB_DIRS=%_HB_DIRS% rdd_ads
+for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c make_b32.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9
 
 set HB_SHOW_ERRORS=
-set DIRS=
+set _HB_DIRS=
diff --git a/harbour/contrib/make_vc_all.bat b/harbour/contrib/make_vc_all.bat
index a0173e5e3d..cceff050b6 100644
--- a/harbour/contrib/make_vc_all.bat
+++ b/harbour/contrib/make_vc_all.bat
@@ -10,22 +10,22 @@ set HB_SHOW_ERRORS=no
 
 rem set DO_NOT_COMPILE=examples hbclip hgf
 
-set DIRS=adordd bmdbfcdx btree gtwvg libct libgt libmisc libnf msql
-for %%n in ( %DIRS% ) do %COMSPEC% /c make_vc.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9
+set _HB_DIRS=adordd bmdbfcdx btree gtwvg libct libgt libmisc libnf msql
+for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c make_vc.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9
 
-set DIRS=ole hbzlib htmllib odbc telepath tip what32 win32 xhb
-for %%n in ( %DIRS% ) do %COMSPEC% /c make_vc.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9
+set _HB_DIRS=ole hbzlib htmllib odbc telepath tip what32 win32 xhb
+for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c make_vc.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9
 
-set DIRS=samples directx
-if not "%APOLLO_DIR%"    == "" set DIRS=%DIRS% apollo
-if not "%FIREBIRD_DIR%"  == "" set DIRS=%DIRS% firebird
-if not "%FREEIMAGE_DIR%" == "" set DIRS=%DIRS% freeimage
-if not "%GD_DIR%"        == "" set DIRS=%DIRS% gd
-if not "%MYSQL_DIR%"     == "" set DIRS=%DIRS% mysql
-if not "%PDFLIB_DIR%"    == "" set DIRS=%DIRS% pdflib
-if not "%PGSQL_DIR%"     == "" set DIRS=%DIRS% pgsql
-if not "%ADS_DIR%"       == "" set DIRS=%DIRS% rdd_ads
-for %%n in ( %DIRS% ) do %COMSPEC% /c make_vc.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9
+set _HB_DIRS=samples directx
+if not "%APOLLO_DIR%"    == "" set _HB_DIRS=%_HB_DIRS% hbapollo
+if not "%FIREBIRD_DIR%"  == "" set _HB_DIRS=%_HB_DIRS% firebird
+if not "%FREEIMAGE_DIR%" == "" set _HB_DIRS=%_HB_DIRS% freeimage
+if not "%GD_DIR%"        == "" set _HB_DIRS=%_HB_DIRS% gd
+if not "%MYSQL_DIR%"     == "" set _HB_DIRS=%_HB_DIRS% mysql
+if not "%PDFLIB_DIR%"    == "" set _HB_DIRS=%_HB_DIRS% pdflib
+if not "%PGSQL_DIR%"     == "" set _HB_DIRS=%_HB_DIRS% pgsql
+if not "%ADS_DIR%"       == "" set _HB_DIRS=%_HB_DIRS% rdd_ads
+for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c make_vc.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9
 
 set HB_SHOW_ERRORS=
-set DIRS=
+set _HB_DIRS=