diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 753672cebc..6a25e0d38d 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,21 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-01-21 16:31 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  - contrib/hbunix/hbposix.hbp
+  + contrib/hbunix/hbunix.hbp
+  - contrib/hbunix/hbposix.hbc
+  + contrib/hbunix/hbunix.hbc
+  - contrib/hbunix/hbposix.c
+  + contrib/hbunix/posix.c
+  * contrib/hbunix/tests/hbmk.hbm
+    * Renamed hbposix lib to hbunix. Step 2 of 2.
+    ; Please test.
+
+  * contrib/hbunix/daemon.c
+  * contrib/hbunix/tests/testdmn.prg
+    * Renamed HB_POSIX_DAEMON() to UNIX_DAEMON().
+
 2011-01-21 16:26 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   - contrib/hbposix
   + contrib/hbunix
diff --git a/harbour/contrib/hbunix/daemon.c b/harbour/contrib/hbunix/daemon.c
index db1f255342..4643227947 100644
--- a/harbour/contrib/hbunix/daemon.c
+++ b/harbour/contrib/hbunix/daemon.c
@@ -36,9 +36,9 @@
 #include "hbvm.h"
 
 /*
- * hb_posix_daemon( [<lNoChdir>], [<lNoClose>] ) --> <lResult>
+ * unix_daemon( [<lNoChdir>], [<lNoClose>] ) --> <lResult>
  */
-HB_FUNC( HB_POSIX_DAEMON )
+HB_FUNC( UNIX_DAEMON )
 {
    int fd;
 
diff --git a/harbour/contrib/hbunix/hbposix.hbc b/harbour/contrib/hbunix/hbunix.hbc
similarity index 100%
rename from harbour/contrib/hbunix/hbposix.hbc
rename to harbour/contrib/hbunix/hbunix.hbc
diff --git a/harbour/contrib/hbunix/hbposix.hbp b/harbour/contrib/hbunix/hbunix.hbp
similarity index 90%
rename from harbour/contrib/hbunix/hbposix.hbp
rename to harbour/contrib/hbunix/hbunix.hbp
index 5676dd7231..2db6007456 100644
--- a/harbour/contrib/hbunix/hbposix.hbp
+++ b/harbour/contrib/hbunix/hbunix.hbp
@@ -11,7 +11,7 @@
 
 -stop{!unix}
 
-hbposix.c
 daemon.c
 guids.c
+posix.c
 posixerr.c
diff --git a/harbour/contrib/hbunix/hbposix.c b/harbour/contrib/hbunix/posix.c
similarity index 100%
rename from harbour/contrib/hbunix/hbposix.c
rename to harbour/contrib/hbunix/posix.c
diff --git a/harbour/contrib/hbunix/tests/hbmk.hbm b/harbour/contrib/hbunix/tests/hbmk.hbm
index 38269d1763..e90a054dd9 100644
--- a/harbour/contrib/hbunix/tests/hbmk.hbm
+++ b/harbour/contrib/hbunix/tests/hbmk.hbm
@@ -2,6 +2,6 @@
 # $Id$
 #
 
-../hbposix.hbc
+../hbunix.hbc
 
 -w3 -es2
diff --git a/harbour/contrib/hbunix/tests/testdmn.prg b/harbour/contrib/hbunix/tests/testdmn.prg
index 46b8699064..dae0da2913 100644
--- a/harbour/contrib/hbunix/tests/testdmn.prg
+++ b/harbour/contrib/hbunix/tests/testdmn.prg
@@ -20,7 +20,7 @@ PROCEDURE Main()
 
    OutStd( hb_strFormat( "Parent(%d) launching child... ", posix_getpid() ) + hb_eol() )
 
-   IF ! hb_posix_daemon( .F., .F. )
+   IF ! unix_daemon( .F., .F. )
       OutStd( "failed." + hb_eol() )
       ErrorLevel( 1 )
       QUIT