diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 248f9b0ef4..f8945c4a4d 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,4 +1,16 @@
-19991004-12:52 GMT+1 Victor Szel <info@szelvesz.hu>
+19991004-15:15 GMT+1 Victor Szel <info@szelvesz.hu>
+  * source/hbpp -> source/pp
+    source/Makefile
+    source/pp/Makefile
+    source/pp/stdalone/Makefile
+    source/compiler/Makefile
+    source/runner/stdalone/Makefile
+    tests/working/Makefile
+    makefile.*
+    *.b??
+    * source/hbpp changed to source/pp.
+
+19991004-14:48 GMT+1 Victor Szel <info@szelvesz.hu>
   * tests/working/*.bat
     *.b??
     makefile.vc
diff --git a/harbour/hbpp.b16 b/harbour/hbpp.b16
index 28db86e996..5f3ea0bdb9 100644
--- a/harbour/hbpp.b16
+++ b/harbour/hbpp.b16
@@ -6,6 +6,6 @@
 
 PROJECT: hbpp.exe
 
-hbpp.exe : source\hbpp\stdalone\hbpp.c
-   bcc -ml -Iinclude source\hbpp\stdalone\hbpp.c source\hbpp\hbpp.lib lib\b16\hbpp.lib
-   del source\hbpp\stdalone\hbpp.obj
+hbpp.exe : source\pp\stdalone\hbpp.c
+   bcc -ml -Iinclude source\pp\stdalone\hbpp.c source\pp\hbpp.lib lib\b16\hbpp.lib
+   del source\pp\stdalone\hbpp.obj
diff --git a/harbour/hbpp.b32 b/harbour/hbpp.b32
index bda0a80668..4c135458ca 100644
--- a/harbour/hbpp.b32
+++ b/harbour/hbpp.b32
@@ -6,6 +6,6 @@
 
 PROJECT: hbpp.exe
 
-hbpp.exe : source\hbpp\stdalone\hbpp.c
-   bcc32  -O2 -ebin\hbpp.exe -Iinclude source\hbpp\stdalone\hbpp.c lib\b32\hbpp.lib
-   del source\hbpp\stdalone\hbpp.obj
+hbpp.exe : source\pp\stdalone\hbpp.c
+   bcc32  -O2 -ebin\hbpp.exe -Iinclude source\pp\stdalone\hbpp.c lib\b32\hbpp.lib
+   del source\pp\stdalone\hbpp.obj
diff --git a/harbour/hbpplib.b32 b/harbour/hbpplib.b32
index 183e0b9b0d..1cd63f428f 100644
--- a/harbour/hbpplib.b32
+++ b/harbour/hbpplib.b32
@@ -5,7 +5,7 @@
 # makefile for Borland C/C++ 32 bits
 # Preprocessor Library makefile
 
-.path.c   = source\hbpp
+.path.c   = source\pp
 .path.h   = include
 .path.lib = lib\b32
 .path.obj = obj
@@ -18,5 +18,5 @@ table.obj   : table.c
 hbpplib.obj : hbpplib.c
 
 .c.obj :
-  bcc32 -c -O2 -I.\include;.\source\hbpp -o$@ $<
+  bcc32 -c -O2 -I.\include;.\source\pp -o$@ $<
   tlib .\lib\b32\hbpp.lib -+$@,,
diff --git a/harbour/makefile.b32 b/harbour/makefile.b32
index 9726c0b130..d6a672a897 100644
--- a/harbour/makefile.b32
+++ b/harbour/makefile.b32
@@ -5,7 +5,7 @@
 # makefile for Borland C/C++ 32 bits
 
 .path.asm = source\compiler
-.path.c   = source\compiler;source\vm;source\rtl;source\tools;source\rtl\gt;source\rtl\natmsg;source\hbpp;source\rdd
+.path.c   = source\compiler;source\vm;source\rtl;source\tools;source\rtl\gt;source\rtl\natmsg;source\pp;source\rdd
 .path.h   = include
 .path.l   = source\compiler
 .path.y   = source\compiler
@@ -126,7 +126,7 @@ memvarbl.c   : memvarbl.prg  harbour.exe
 harbour.exe : harboury.c harbourl.c genc.obj genhrb.obj genjava.obj genrc.obj genpas.obj genobj32.obj harbour.obj compiler.h hbppint.c hbpp.c table.c
    echo -O2 > bld.32
    echo -ebin\harbour.exe >> bld.32
-   echo -Iinclude;source\compiler;source\hbpp >> bld.32
+   echo -Iinclude >> bld.32
    echo source\compiler\harboury.c >> bld.32
    echo source\compiler\harbourl.c >> bld.32
    echo source\compiler\genobj32.obj >> bld.32
@@ -136,9 +136,9 @@ harbour.exe : harboury.c harbourl.c genc.obj genhrb.obj genjava.obj genrc.obj ge
    echo source\compiler\genrc.obj >> bld.32
    echo source\compiler\genpas.obj >> bld.32
    echo source\compiler\harbour.obj >> bld.32
-   echo source\hbpp\hbppint.c >> bld.32
-   echo source\hbpp\hbpp.c >> bld.32
-   echo source\hbpp\table.c >> bld.32
+   echo source\pp\hbppint.c >> bld.32
+   echo source\pp\hbpp.c >> bld.32
+   echo source\pp\table.c >> bld.32
    bcc32 @bld.32
    del bld.32
 
diff --git a/harbour/makefile.b40 b/harbour/makefile.b40
index d7b9e50a20..b0c92aa423 100644
--- a/harbour/makefile.b40
+++ b/harbour/makefile.b40
@@ -5,7 +5,7 @@
 # makefile for Borland C/C++ 32 bits
 
 .path.asm = source\compiler
-.path.c   = source\compiler;source\vm;source\rtl;source\tools;source\rtl\gt;source\rtl\natmsg;source\hbpp;source\rdd
+.path.c   = source\compiler;source\vm;source\rtl;source\tools;source\rtl\gt;source\rtl\natmsg;source\pp;source\rdd
 .path.h   = include
 .path.l   = source\compiler
 .path.y   = source\compiler
@@ -95,7 +95,7 @@ alert.c      : alert.prg     harbour.exe
 
 harbour.exe : harboury.c harbourl.c genc.obj genhrb.obj genjava.obj genrc.obj genpas.obj genobj32.obj harbour.obj compiler.h hbppint.c hbpp.c table.c
    echo -ebin\harbour.exe >> bld.32
-   echo -Iinclude;source\compiler;source\hbpp >> bld.32
+   echo -Iinclude >> bld.32
    echo source\compiler\harboury.c >> bld.32
    echo source\compiler\harbourl.c >> bld.32
    echo source\compiler\genobj32.obj >> bld.32
@@ -105,9 +105,9 @@ harbour.exe : harboury.c harbourl.c genc.obj genhrb.obj genjava.obj genrc.obj ge
    echo source\compiler\genrc.obj >> bld.32
    echo source\compiler\genpas.obj >> bld.32
    echo source\compiler\harbour.obj >> bld.32
-   echo source\hbpp\hbppint.c >> bld.32
-   echo source\hbpp\hbpp.c >> bld.32
-   echo source\hbpp\table.c >> bld.32
+   echo source\pp\hbppint.c >> bld.32
+   echo source\pp\hbpp.c >> bld.32
+   echo source\pp\table.c >> bld.32
    bcc32 @bld.32
    del bld.32
    del harboury.obj
diff --git a/harbour/makefile.vc b/harbour/makefile.vc
index 10f2234aaa..8cecfd9bcc 100644
--- a/harbour/makefile.vc
+++ b/harbour/makefile.vc
@@ -20,7 +20,7 @@
 COMPILER_DIR=source\compiler
 RTL_DIR=source\rtl
 RDD_DIR=source\rdd
-HBPP_DIR=source\hbpp
+PP_DIR=source\pp
 TOOLS_DIR=source\tools
 DEBUG_DIR=source\debug
 VM_DIR=source\vm
@@ -47,16 +47,16 @@ CLIBFLAGSDEBUG=$(CFLAGS) -c -Zi /TP
 HARBOUR_LIB=$(LIB_DIR)\harbour.lib
 TERMINAL_LIB=$(LIB_DIR)\terminal.lib
 TOOLS_LIB=$(LIB_DIR)\hbtools.lib
-HBPP_LIB=$(LIB_DIR)\hbpp.lib
+PP_LIB=$(LIB_DIR)\hbpp.lib
 DEBUG_LIB=$(LIB_DIR)\debug.lib
 DBFNTX_LIB=$(LIB_DIR)\dbfntx.lib
 RUNNER_LIB=$(LIB_DIR)\runner.lib
 HARBOUR_EXE=$(BIN_DIR)\harbour.exe
-HBPP_EXE=$(BIN_DIR)\hbpp.exe
+PP_EXE=$(BIN_DIR)\hbpp.exe
 RUNNER_EXE=$(BIN_DIR)\runner.exe
 HARBOURFLAGS=-iinclude -n -q
 
-LIBS=$(HARBOUR_LIB) $(TERMINAL_LIB) $(TOOLS_LIB) $(DEBUG_LIB) $(HBPP_LIB) $(DBFNTX_LIB) $(RUNNER_LIB)
+LIBS=$(HARBOUR_LIB) $(TERMINAL_LIB) $(TOOLS_LIB) $(DEBUG_LIB) $(PP_LIB) $(DBFNTX_LIB) $(RUNNER_LIB)
 
 #
 # OBJ list for harbour.lib. Add new ones as needed
@@ -196,7 +196,7 @@ RUNNER_LIB_OBJS = \
 # OBJ list for hbpp.lib. Add new ones as needed
 #
 
-HBPP_LIB_OBJS = \
+PP_LIB_OBJS = \
     $(OBJ_DIR)\hbppint.obj \
     $(OBJ_DIR)\hbpp.obj \
     $(OBJ_DIR)\table.obj \
@@ -219,20 +219,20 @@ all: $(OBJ_DIR)\symbols.obj \
      $(HARBOUR_LIB) \
      $(TOOLS_LIB) \
      $(TERMINAL_LIB) \
-     $(HBPP_LIB) \
+     $(PP_LIB) \
      $(DEBUG_LIB) \
      $(DBFNTX_LIB) \
-     $(HBPP_EXE) \
+     $(PP_EXE) \
      $(RUNNER_LIB) \
      $(RUNNER_EXE)
 
 $(OBJ_DIR)\symbols.obj : $(VM_DIR)\symbols.asm
     masm $** $@ obj\symbols.lst obj\symbols.crf
 
-$(HBPP_EXE) : \
-    $(HBPP_DIR)\stdalone\hbpp.c
+$(PP_EXE) : \
+    $(PP_DIR)\stdalone\hbpp.c
     @if exist obj\hbpp.obj del obj\hbpp.obj
-    $(CC) -TP $(CFLAGS) $(HBPP_DIR)\stdalone\hbpp.c -o $(BIN_DIR)\hbpp /link $(HBPP_LIB) 
+    $(CC) -TP $(CFLAGS) $(PP_DIR)\stdalone\hbpp.c -o $(BIN_DIR)\hbpp /link $(PP_LIB) 
     -del hbpp.obj
 
 $(RUNNER_EXE) : \
@@ -254,10 +254,10 @@ $(HARBOUR_EXE) : \
     $(COMPILER_DIR)\genjava.c \
     $(COMPILER_DIR)\genpas.c \
     $(COMPILER_DIR)\harbour.c \
-    $(HBPP_DIR)\hbpp.c \
-    $(HBPP_DIR)\hbppint.c \
-    $(HBPP_DIR)\table.c
-    $(CC) $(CFLAGS) $(COMPILER_DIR)\harboury.c $(COMPILER_DIR)\harbourl.c $(COMPILER_DIR)\harbour.c $(COMPILER_DIR)\genobj32.c $(COMPILER_DIR)\genc.c $(COMPILER_DIR)\genhrb.c $(COMPILER_DIR)\genrc.c $(COMPILER_DIR)\genjava.c $(COMPILER_DIR)\genpas.c $(HBPP_DIR)\hbppint.c $(HBPP_DIR)\hbpp.c $(HBPP_DIR)\table.c -o $(BIN_DIR)\harbour
+    $(PP_DIR)\hbpp.c \
+    $(PP_DIR)\hbppint.c \
+    $(PP_DIR)\table.c
+    $(CC) $(CFLAGS) $(COMPILER_DIR)\harboury.c $(COMPILER_DIR)\harbourl.c $(COMPILER_DIR)\harbour.c $(COMPILER_DIR)\genobj32.c $(COMPILER_DIR)\genc.c $(COMPILER_DIR)\genhrb.c $(COMPILER_DIR)\genrc.c $(COMPILER_DIR)\genjava.c $(COMPILER_DIR)\genpas.c $(PP_DIR)\hbppint.c $(PP_DIR)\hbpp.c $(PP_DIR)\table.c -o $(BIN_DIR)\harbour
     @Echo :	Ignore Lnk4033 warning
     -del harboury.obj
     -del harbourl.obj
@@ -282,8 +282,8 @@ $(HARBOUR_LIB) : $(HARBOUR_LIB_OBJS)
 $(TOOLS_LIB) : $(TOOLS_LIB_OBJS)
     lib /OUT:$(TOOLS_LIB) $(TOOLS_LIB_OBJS)
 
-$(HBPP_LIB) : $(HBPP_LIB_OBJS)
-    lib /OUT:$(HBPP_LIB) $(HBPP_LIB_OBJS)
+$(PP_LIB) : $(PP_LIB_OBJS)
+    lib /OUT:$(PP_LIB) $(PP_LIB_OBJS)
 
 $(DEBUG_LIB) : $(DEBUG_LIB_OBJS)
     lib /OUT:$(DEBUG_LIB) $(DEBUG_LIB_OBJS)
@@ -330,16 +330,16 @@ $(COMPILER_DIR)\harbourl.c : $(COMPILER_DIR)\harbour.l
 # HBPP source dependencies below. Add as needed
 #
 
-$(OBJ_DIR)\hbpplib.obj : $(HBPP_DIR)\hbpplib.c
+$(OBJ_DIR)\hbpplib.obj : $(PP_DIR)\hbpplib.c
     $(CC) $(CLIBFLAGS) -Fo$@ $**
 
-$(OBJ_DIR)\hbpp.obj : $(HBPP_DIR)\hbpp.c
+$(OBJ_DIR)\hbpp.obj : $(PP_DIR)\hbpp.c
     $(CC) $(CLIBFLAGS) -Fo$@ $**
 
-$(OBJ_DIR)\hbppint.obj : $(HBPP_DIR)\hbppint.c
+$(OBJ_DIR)\hbppint.obj : $(PP_DIR)\hbppint.c
     $(CC) $(CLIBFLAGS) -Fo$@ $**
 
-$(OBJ_DIR)\table.obj : $(HBPP_DIR)\table.c
+$(OBJ_DIR)\table.obj : $(PP_DIR)\table.c
     $(CC) $(CLIBFLAGS) -Fo$@ $**
 
 
diff --git a/harbour/rdd.b32 b/harbour/rdd.b32
index e7b9e46229..5de86baa54 100644
--- a/harbour/rdd.b32
+++ b/harbour/rdd.b32
@@ -32,7 +32,7 @@ delim0.obj  : delim0.c
 delim1.obj  : delim1.c
 
 .c.obj :
-  bcc32 -c -O2 -I.\include;.\source\hbpp -o$@ -v $<
+  bcc32 -c -O2 -I.\include -o$@ -v $<
   tlib .\lib\b32\rdd.lib -+$@,,
 
 .prg.c:
diff --git a/harbour/source/Makefile b/harbour/source/Makefile
index 001f81af5f..0a293cb931 100644
--- a/harbour/source/Makefile
+++ b/harbour/source/Makefile
@@ -5,7 +5,7 @@
 ROOT = ../
 
 DIRS=\
-	hbpp \
+	pp \
 	compiler \
 	rtl \
 	vm \
diff --git a/harbour/source/compiler/Makefile b/harbour/source/compiler/Makefile
index 7da80aa53f..4f28e0757d 100644
--- a/harbour/source/compiler/Makefile
+++ b/harbour/source/compiler/Makefile
@@ -32,6 +32,6 @@ C_SOURCES=\
 C_MAIN=harbour.c
 
 LIBS=\
-	hbpp \
+	pp \
 
 include $(TOP)$(ROOT)config/bin.cf
diff --git a/harbour/source/hbpp/Makefile b/harbour/source/pp/Makefile
similarity index 95%
rename from harbour/source/hbpp/Makefile
rename to harbour/source/pp/Makefile
index 4859003601..b6aef3767c 100644
--- a/harbour/source/hbpp/Makefile
+++ b/harbour/source/pp/Makefile
@@ -10,7 +10,7 @@ C_SOURCES=\
         hbpplib.c \
         table.c \
 
-LIB=hbpp
+LIB=pp
 
 DIRS=\
 	stdalone \
diff --git a/harbour/source/hbpp/hbpp.c b/harbour/source/pp/hbpp.c
similarity index 100%
rename from harbour/source/hbpp/hbpp.c
rename to harbour/source/pp/hbpp.c
diff --git a/harbour/source/hbpp/hbppint.c b/harbour/source/pp/hbppint.c
similarity index 100%
rename from harbour/source/hbpp/hbppint.c
rename to harbour/source/pp/hbppint.c
diff --git a/harbour/source/hbpp/hbpplib.c b/harbour/source/pp/hbpplib.c
similarity index 100%
rename from harbour/source/hbpp/hbpplib.c
rename to harbour/source/pp/hbpplib.c
diff --git a/harbour/source/hbpp/stdalone/Makefile b/harbour/source/pp/stdalone/Makefile
similarity index 92%
rename from harbour/source/hbpp/stdalone/Makefile
rename to harbour/source/pp/stdalone/Makefile
index 8afb073f8d..57c23a585d 100644
--- a/harbour/source/hbpp/stdalone/Makefile
+++ b/harbour/source/pp/stdalone/Makefile
@@ -9,6 +9,6 @@ C_SOURCES=\
 C_MAIN=hbpp.c
 
 LIBS=\
-	hbpp \
+	pp \
 
 include $(TOP)$(ROOT)config/bin.cf
diff --git a/harbour/source/hbpp/stdalone/hbpp.c b/harbour/source/pp/stdalone/hbpp.c
similarity index 100%
rename from harbour/source/hbpp/stdalone/hbpp.c
rename to harbour/source/pp/stdalone/hbpp.c
diff --git a/harbour/source/hbpp/table.c b/harbour/source/pp/table.c
similarity index 100%
rename from harbour/source/hbpp/table.c
rename to harbour/source/pp/table.c
diff --git a/harbour/source/runner/stdalone/Makefile b/harbour/source/runner/stdalone/Makefile
index 735935d782..093ccbc39d 100644
--- a/harbour/source/runner/stdalone/Makefile
+++ b/harbour/source/runner/stdalone/Makefile
@@ -18,6 +18,6 @@ LIBS=\
 	vm \
 	rdd \
 	rtl \
-	hbpp \
+	pp \
 
 include $(TOP)$(ROOT)config/bin.cf
diff --git a/harbour/tests/working/Makefile b/harbour/tests/working/Makefile
index 4b5c68e009..cc77405f1a 100644
--- a/harbour/tests/working/Makefile
+++ b/harbour/tests/working/Makefile
@@ -12,7 +12,7 @@ LIBS=\
         vm \
         rdd \
         rtl \
-        hbpp \
+        pp \
         runner \
 
 ifeq ($(PM),)