diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 89f1fb8a79..c6658d9a08 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,14 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-02-04 00:49 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * doc/dirstruc.txt
+  - contrib/hbtpathy/tpwin32.c
+  + contrib/hbtpathy/tpwin.c
+  * contrib/hbtpathy/common.mak
+  * contrib/hbtpathy/Makefile
+    * Cleaned some 'win32'/'w32' to 'win'.
+
 2009-02-04 00:29 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   * contrib/hbwin/win_reg.prg
   * contrib/hbwin/win_osc.c
diff --git a/harbour/contrib/hbtpathy/Makefile b/harbour/contrib/hbtpathy/Makefile
index 3e52450dd9..ca75d3721a 100644
--- a/harbour/contrib/hbtpathy/Makefile
+++ b/harbour/contrib/hbtpathy/Makefile
@@ -16,7 +16,7 @@ C_SOURCES=\
 endif
 ifeq ($(HB_ARCHITECTURE),w32)
 C_SOURCES=\
-	tpwin32.c \
+	tpwin.c \
 	tpcommon.c \
 
 endif
diff --git a/harbour/contrib/hbtpathy/common.mak b/harbour/contrib/hbtpathy/common.mak
index 704ab1e06b..937156a057 100644
--- a/harbour/contrib/hbtpathy/common.mak
+++ b/harbour/contrib/hbtpathy/common.mak
@@ -7,7 +7,7 @@ LIBNAME = $(LIBPREF)hbtpathy
 LIB_PATH = $(LIB_DIR)$(LIBNAME)$(LIBEXT)
 
 LIB_OBJS = \
-    $(OBJ_DIR)tpwin32$(OBJEXT) \
+    $(OBJ_DIR)tpwin$(OBJEXT) \
     $(OBJ_DIR)tpcommon$(OBJEXT) \
     \
     $(OBJ_DIR)telepath$(OBJEXT) \
diff --git a/harbour/contrib/hbtpathy/tpwin32.c b/harbour/contrib/hbtpathy/tpwin.c
similarity index 98%
rename from harbour/contrib/hbtpathy/tpwin32.c
rename to harbour/contrib/hbtpathy/tpwin.c
index 64d86caf57..857cd14a3c 100644
--- a/harbour/contrib/hbtpathy/tpwin32.c
+++ b/harbour/contrib/hbtpathy/tpwin.c
@@ -5,7 +5,7 @@
 /*
  * Harbour Project source code:
  * Telepathy emulation library
- * C low level module for Win32 serial communication
+ * C low level module for Windows serial communication
  *
  * Copyright 2004 - Maurilio Longo <maurilio.longo@libero.it>
  * www - http://www.harbour-project.org
diff --git a/harbour/doc/dirstruc.txt b/harbour/doc/dirstruc.txt
index edf3ac9ab2..4fb2c3415f 100644
--- a/harbour/doc/dirstruc.txt
+++ b/harbour/doc/dirstruc.txt
@@ -60,7 +60,7 @@ track of all files (read the FAQ if you don't know what SVN is).
 |   |
 |   |---gtalleg         - GT subsystem based on Allegro with graphic
 |   |                     extensions.
-|   |    
+|   |
 |   +---gtwvg           - GT subsystem for Windows GUI using GDI functions.
 |   |   |
 |   |   +---tests       - Demo program and sample images.
@@ -192,14 +192,14 @@ track of all files (read the FAQ if you don't know what SVN is).
 |   |       |
 |   |       +---files   - Sample files for testing.
 |   |
-|   +---hbw32           - Collection of Windows specific utility functions.
+|   +---hbwin           - Collection of Windows specific utility functions.
 |   |   |
 |   |   +---tests       - Test programs.
 |   |
 |   +---hbwhat          - What is a library for ccessing all of Windows API
 |   |                     from PRG level.
 |   |
-|   +---hbziparc        - Compatibility interface with ZipArchive general 
+|   +---hbziparc        - Compatibility interface with ZipArchive general
 |   |   |                 purpose compression library to work with ZIP files.
 |   |   |
 |   |   +---tests       - Test programs.