diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 32e8f663cb..93b58d5757 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,12 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-12-10 20:18 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hblzf/tests/test.prg
+  * contrib/hblzf/hblzf.c
+    ! Turns out none of the LZF_[DE]COMPRESS() functions are
+      pure wrappers. Readded HB_ prefix to both.
+
 2010-12-10 15:14 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hblzf/tests/test.prg
   * contrib/hblzf/hblzf.c
diff --git a/harbour/contrib/hblzf/hblzf.c b/harbour/contrib/hblzf/hblzf.c
index c3bbb2e6f8..4408a7be6f 100644
--- a/harbour/contrib/hblzf/hblzf.c
+++ b/harbour/contrib/hblzf/hblzf.c
@@ -99,7 +99,7 @@ HB_FUNC( HB_LZF_COMPRESSBOUND )
    Return a string compressed with LZF
 */
 
-HB_FUNC( LZF_COMPRESS )
+HB_FUNC( HB_LZF_COMPRESS )
 {
    PHB_ITEM pArg = hb_param( 1, HB_IT_STRING );
 
@@ -134,10 +134,10 @@ HB_FUNC( LZF_COMPRESS )
 
             if( uiResult != 0 )
             {
-               if( !pBuffer )
-                  hb_retclen_buffer( out_data, uiResult );
-               else
+               if( pBuffer )
                   hb_retclen( out_data, uiResult );
+               else
+                  hb_retclen_buffer( out_data, uiResult );
 
                hb_storni( HB_LZF_OK, 3 );
             }
@@ -166,7 +166,7 @@ HB_FUNC( LZF_COMPRESS )
    Return a string decompressed with LZF
 */
 
-HB_FUNC( LZF_DECOMPRESS )
+HB_FUNC( HB_LZF_DECOMPRESS )
 {
    PHB_ITEM pArg = hb_param( 1, HB_IT_STRING );
 
diff --git a/harbour/contrib/hblzf/tests/test.prg b/harbour/contrib/hblzf/tests/test.prg
index 78095904ce..57d558a580 100644
--- a/harbour/contrib/hblzf/tests/test.prg
+++ b/harbour/contrib/hblzf/tests/test.prg
@@ -21,35 +21,35 @@ PROCEDURE Main()
    ? "--- test 1 ---"
    /*
       If the output buffer is not large enough or any error occurs
-      lzf_compress return NIL
+      hb_lzf_compress return NIL
    */
    cStr := TEST_STRING
-   str_compressed := lzf_compress( cStr, 15, @nResult )
+   str_compressed := hb_lzf_compress( cStr, 15, @nResult )
 
    IF nResult == HB_LZF_OK
       ? "Lenght of a string is", hb_ntos( Len( cStr ) )
       ? "Lenght of a compressed string is", hb_ntos( Len( str_compressed ) )
    ELSE
-      ? "lzf_compress() return ", iif( nResult == HB_LZF_BUF_ERROR, "LZF_BUF_ERROR", "LZF_MEM_ERROR" )
+      ? "hb_lzf_compress() return ", iif( nResult == HB_LZF_BUF_ERROR, "LZF_BUF_ERROR", "LZF_MEM_ERROR" )
    ENDIF
 
    ? "--- test 2 ---"
    cStr := TEST_STRING
    str_compressed := Space( 15 )
-   str_compressed := lzf_compress( cStr, @str_compressed, @nResult )
+   str_compressed := hb_lzf_compress( cStr, @str_compressed, @nResult )
 
    IF nResult == HB_LZF_OK
       ? "Lenght of a string is", hb_ntos( Len( cStr ) )
       ? "Lenght of a compressed string is", hb_ntos( Len( str_compressed ) )
    ELSE
-      ? "lzf_compress() return ", iif( nResult == HB_LZF_BUF_ERROR, "LZF_BUF_ERROR", "LZF_MEM_ERROR" )
+      ? "hb_lzf_compress() return ", iif( nResult == HB_LZF_BUF_ERROR, "LZF_BUF_ERROR", "LZF_MEM_ERROR" )
    ENDIF
 
    ? "--- test 3 ---"
    nLen := hb_lzf_compressBound( cStr )
 
    cStr := TEST_STRING
-   str_compressed := lzf_compress( cStr, nLen, @nResult )
+   str_compressed := hb_lzf_compress( cStr, nLen, @nResult )
 
    IF nResult == HB_LZF_OK
       ? "Lenght of a string is", hb_ntos( Len( cStr ) )
@@ -57,7 +57,7 @@ PROCEDURE Main()
 
       ? hb_base64encode( str_compressed ) == b64_expected_result
    ELSE
-      ? "lzf_compress() return ", iif( nResult == HB_LZF_BUF_ERROR, "LZF_BUF_ERROR", "LZF_MEM_ERROR" )
+      ? "hb_lzf_compress() return ", iif( nResult == HB_LZF_BUF_ERROR, "LZF_BUF_ERROR", "LZF_MEM_ERROR" )
    ENDIF
 
    ? "--- test 4 ---"
@@ -65,7 +65,7 @@ PROCEDURE Main()
    str_compressed := Space( nLen )
 
    cStr := TEST_STRING
-   str_compressed := lzf_compress( cStr, @str_compressed, @nResult )
+   str_compressed := hb_lzf_compress( cStr, @str_compressed, @nResult )
 
    IF nResult == HB_LZF_OK
       ? "Lenght of a string is", hb_ntos( Len( cStr ) )
@@ -73,22 +73,22 @@ PROCEDURE Main()
 
       ? hb_base64encode( str_compressed ) == b64_expected_result
    ELSE
-      ? "lzf_compress() return ", iif( nResult == HB_LZF_BUF_ERROR, "LZF_BUF_ERROR", "LZF_MEM_ERROR" )
+      ? "hb_lzf_compress() return ", iif( nResult == HB_LZF_BUF_ERROR, "LZF_BUF_ERROR", "LZF_MEM_ERROR" )
    ENDIF
 
    ? "--- test 5 ---"
    cStr := Replicate( TEST_STRING, _NREPL_ )
-   str_compressed := lzf_compress( cStr, NIL, @nResult )
+   str_compressed := hb_lzf_compress( cStr, NIL, @nResult )
 
    IF nResult == HB_LZF_OK
       ? "Lenght of a string is", hb_ntos( Len( cStr ) )
       ? "Lenght of a compressed string is", hb_ntos( Len( str_compressed ) )
    ELSE
-      ? "lzf_compress() return ", iif( nResult == HB_LZF_BUF_ERROR, "LZF_BUF_ERROR", "LZF_MEM_ERROR" )
+      ? "hb_lzf_compress() return ", iif( nResult == HB_LZF_BUF_ERROR, "LZF_BUF_ERROR", "LZF_MEM_ERROR" )
    ENDIF
 
    ? "--- test 6 ---"
-   str_decompressed := lzf_decompress( str_compressed, @errno, NIL )
+   str_decompressed := hb_lzf_decompress( str_compressed, @errno, NIL )
 
    IF errno == HB_LZF_DATA_CORRUPTED
       ? "LZF decompression failed, compressed data corrupted"
@@ -100,7 +100,7 @@ PROCEDURE Main()
    cStr := Replicate( TEST_STRING, _NREPL_ )
    str_compressed := hb_zcompress( cStr, NIL, @nResult )
 
-   str_decompressed := lzf_decompress( str_compressed, @errno, NIL )
+   str_decompressed := hb_lzf_decompress( str_compressed, @errno, NIL )
 
    IF errno == HB_LZF_DATA_CORRUPTED
       ? "LZF decompression failed, compressed data corrupted !"
@@ -108,4 +108,4 @@ PROCEDURE Main()
       ? cStr == str_decompressed
    ENDIF
 
-   RETURN
\ No newline at end of file
+   RETURN