diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 15ff4414b4..2dfb2dbe36 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,21 +8,33 @@
    2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-07-03 15:15 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+   - contrib/hbgd/tests/imgs_in/gdlogobig.png
+   - contrib/hbgd/tests/imgs_in/conv_test.jpg
+   - contrib/hbgd/tests/imgs_in/theclipper.gif
+   + contrib/hbgd/tests/imgs_in/harbour.gif
+   + contrib/hbgd/tests/imgs_in/gdlogo.png
+   + contrib/hbgd/tests/imgs_in/conv_tst.jpg
+   * contrib/hbgd/tests/gdtest.prg
+   * contrib/hbgd/tests/tostring.prg
+   * contrib/hbgd/tests/gdtestcl.prg
+     * Removing long filenames in hbgd (part 3/3)
+
 2008-07-03 15:08 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
-   - hbgd/tests/images_in
-   - hbgd/tests/images_out
-   + hbgd/tests/imgs_in
-   + hbgd/tests/imgs_out
-   * hbgd/tests/gdtest.prg
-   * hbgd/tests/bartest.prg
-   * hbgd/tests/barms.prg
-   * hbgd/tests/test_out.prg
-   * hbgd/tests/tostring.prg
-   * hbgd/tests/gdtestcl.prg
-   * hbgd/tests/animgif.prg
-   * hbgd/tests/testdpi.prg
-   * hbgd/tests/counter.prg
-   * hbgd/tests/antialia.prg
+   - contrib/hbgd/tests/images_in
+   - contrib/hbgd/tests/images_out
+   + contrib/hbgd/tests/imgs_in
+   + contrib/hbgd/tests/imgs_out
+   * contrib/hbgd/tests/gdtest.prg
+   * contrib/hbgd/tests/bartest.prg
+   * contrib/hbgd/tests/barms.prg
+   * contrib/hbgd/tests/test_out.prg
+   * contrib/hbgd/tests/tostring.prg
+   * contrib/hbgd/tests/gdtestcl.prg
+   * contrib/hbgd/tests/animgif.prg
+   * contrib/hbgd/tests/testdpi.prg
+   * contrib/hbgd/tests/counter.prg
+   * contrib/hbgd/tests/antialia.prg
      * Removing long filenames in hbgd (part 2/3)
      ! Added SVN headers.
      ! Fixed to not use hbcompat.ch.
diff --git a/harbour/contrib/hbgd/tests/gdtest.prg b/harbour/contrib/hbgd/tests/gdtest.prg
index 9954250244..2d8366f13c 100644
--- a/harbour/contrib/hbgd/tests/gdtest.prg
+++ b/harbour/contrib/hbgd/tests/gdtest.prg
@@ -40,7 +40,7 @@ PROCEDURE Main()
    im := gdImageCreate(200, 200)
 
    /* Load an image in memory from file */
-   im2 := gdImageCreateFromJpeg( IMAGES_IN + "conv_test.jpg")
+   im2 := gdImageCreateFromJpeg( IMAGES_IN + "conv_tst.jpg")
 
    /* Now work on first empty image */
 
@@ -108,8 +108,8 @@ PROCEDURE Main()
    /* Write Images on files */
    gdImagePng(im, IMAGES_OUT + "rect.png")
 
-   gdImagePng(im2, IMAGES_OUT + "conv_test.png")
-   gdImageJpeg(im2, IMAGES_OUT + "conv_test.jpg")
+   gdImagePng(im2, IMAGES_OUT + "conv_tst.png")
+   gdImageJpeg(im2, IMAGES_OUT + "conv_tst.jpg")
 
    /* Destroy images in memory */
    gdImageDestroy(im)
diff --git a/harbour/contrib/hbgd/tests/gdtestcl.prg b/harbour/contrib/hbgd/tests/gdtestcl.prg
index 8e19f08475..db628e73f0 100644
--- a/harbour/contrib/hbgd/tests/gdtestcl.prg
+++ b/harbour/contrib/hbgd/tests/gdtestcl.prg
@@ -45,8 +45,8 @@ PROCEDURE Main()
    oI := GDImage():Create( 200, 200 )
 
    /* Load an image in memory from file */
-   oI2 := GDImage():LoadFromJpeg( IMAGES_IN + "conv_test.jpg" )
-   oI5 := GDImage():LoadFromJpeg( IMAGES_IN + "conv_test.jpg" )
+   oI2 := GDImage():LoadFromJpeg( IMAGES_IN + "conv_tst.jpg" )
+   oI5 := GDImage():LoadFromJpeg( IMAGES_IN + "conv_tst.jpg" )
 
    /* Now work on first empty image */
 
@@ -270,7 +270,7 @@ PROCEDURE Main()
    red   := oI5:SetColor(250, 0, 0)
 
    // Load an image as brush
-   oB := GDImage():LoadFromJpeg( IMAGES_IN + "conv_test.jpg" )
+   oB := GDImage():LoadFromJpeg( IMAGES_IN + "conv_tst.jpg" )
    oB:Zoom(15)
 
 //   oI5:AddDef( "MAXVALUE", 150 )
diff --git a/harbour/contrib/hbgd/tests/imgs_in/conv_test.jpg b/harbour/contrib/hbgd/tests/imgs_in/conv_tst.jpg
similarity index 100%
rename from harbour/contrib/hbgd/tests/imgs_in/conv_test.jpg
rename to harbour/contrib/hbgd/tests/imgs_in/conv_tst.jpg
diff --git a/harbour/contrib/hbgd/tests/imgs_in/gdlogobig.png b/harbour/contrib/hbgd/tests/imgs_in/gdlogo.png
similarity index 100%
rename from harbour/contrib/hbgd/tests/imgs_in/gdlogobig.png
rename to harbour/contrib/hbgd/tests/imgs_in/gdlogo.png
diff --git a/harbour/contrib/hbgd/tests/imgs_in/theclipper.gif b/harbour/contrib/hbgd/tests/imgs_in/harbour.gif
similarity index 100%
rename from harbour/contrib/hbgd/tests/imgs_in/theclipper.gif
rename to harbour/contrib/hbgd/tests/imgs_in/harbour.gif
diff --git a/harbour/contrib/hbgd/tests/tostring.prg b/harbour/contrib/hbgd/tests/tostring.prg
index f18dca899b..2d22d40e67 100644
--- a/harbour/contrib/hbgd/tests/tostring.prg
+++ b/harbour/contrib/hbgd/tests/tostring.prg
@@ -32,7 +32,7 @@ PROCEDURE Main()
    */
 
    /* Load an image from file */
-   oI := GDImage():LoadFromFile( IMAGES_IN + "conv_test.jpg" )
+   oI := GDImage():LoadFromFile( IMAGES_IN + "conv_tst.jpg" )
 
    oI:SaveJpeg( IMAGES_OUT + "testfile.jpg" )