diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 2894a18154..2a1b36a613 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,12 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-08-02 14:37 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbqt/utils/qscintilla.qtp
+  - contrib/hbqt/hbqscintilla
+  + contrib/hbqt/qscintilla
+    * Dir renamed.
+
 2010-08-02 14:29 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbqt/qtcore/hbqtcore.hbc
   - contrib/hbqt/hbqt.h
diff --git a/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qsciabstractapis.txt b/harbour/contrib/hbqt/qscintilla/doc/en/class_qsciabstractapis.txt
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/doc/en/class_qsciabstractapis.txt
rename to harbour/contrib/hbqt/qscintilla/doc/en/class_qsciabstractapis.txt
diff --git a/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qsciapis.txt b/harbour/contrib/hbqt/qscintilla/doc/en/class_qsciapis.txt
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/doc/en/class_qsciapis.txt
rename to harbour/contrib/hbqt/qscintilla/doc/en/class_qsciapis.txt
diff --git a/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qscicommand.txt b/harbour/contrib/hbqt/qscintilla/doc/en/class_qscicommand.txt
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/doc/en/class_qscicommand.txt
rename to harbour/contrib/hbqt/qscintilla/doc/en/class_qscicommand.txt
diff --git a/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qscicommandset.txt b/harbour/contrib/hbqt/qscintilla/doc/en/class_qscicommandset.txt
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/doc/en/class_qscicommandset.txt
rename to harbour/contrib/hbqt/qscintilla/doc/en/class_qscicommandset.txt
diff --git a/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qscilexer.txt b/harbour/contrib/hbqt/qscintilla/doc/en/class_qscilexer.txt
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/doc/en/class_qscilexer.txt
rename to harbour/contrib/hbqt/qscintilla/doc/en/class_qscilexer.txt
diff --git a/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qscilexercpp.txt b/harbour/contrib/hbqt/qscintilla/doc/en/class_qscilexercpp.txt
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/doc/en/class_qscilexercpp.txt
rename to harbour/contrib/hbqt/qscintilla/doc/en/class_qscilexercpp.txt
diff --git a/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qscilexerflagship.txt b/harbour/contrib/hbqt/qscintilla/doc/en/class_qscilexerflagship.txt
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/doc/en/class_qscilexerflagship.txt
rename to harbour/contrib/hbqt/qscintilla/doc/en/class_qscilexerflagship.txt
diff --git a/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qsciscintilla.txt b/harbour/contrib/hbqt/qscintilla/doc/en/class_qsciscintilla.txt
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/doc/en/class_qsciscintilla.txt
rename to harbour/contrib/hbqt/qscintilla/doc/en/class_qsciscintilla.txt
diff --git a/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qscistyle.txt b/harbour/contrib/hbqt/qscintilla/doc/en/class_qscistyle.txt
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/doc/en/class_qscistyle.txt
rename to harbour/contrib/hbqt/qscintilla/doc/en/class_qscistyle.txt
diff --git a/harbour/contrib/hbqt/hbqscintilla/doc/en/class_qscistyledtext.txt b/harbour/contrib/hbqt/qscintilla/doc/en/class_qscistyledtext.txt
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/doc/en/class_qscistyledtext.txt
rename to harbour/contrib/hbqt/qscintilla/doc/en/class_qscistyledtext.txt
diff --git a/harbour/contrib/hbqt/hbqscintilla/g/HBQsciScintilla.cpp b/harbour/contrib/hbqt/qscintilla/g/HBQsciScintilla.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/g/HBQsciScintilla.cpp
rename to harbour/contrib/hbqt/qscintilla/g/HBQsciScintilla.cpp
diff --git a/harbour/contrib/hbqt/hbqscintilla/g/QsciAPIs.cpp b/harbour/contrib/hbqt/qscintilla/g/QsciAPIs.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/g/QsciAPIs.cpp
rename to harbour/contrib/hbqt/qscintilla/g/QsciAPIs.cpp
diff --git a/harbour/contrib/hbqt/hbqscintilla/g/QsciAbstractAPIs.cpp b/harbour/contrib/hbqt/qscintilla/g/QsciAbstractAPIs.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/g/QsciAbstractAPIs.cpp
rename to harbour/contrib/hbqt/qscintilla/g/QsciAbstractAPIs.cpp
diff --git a/harbour/contrib/hbqt/hbqscintilla/g/QsciCommand.cpp b/harbour/contrib/hbqt/qscintilla/g/QsciCommand.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/g/QsciCommand.cpp
rename to harbour/contrib/hbqt/qscintilla/g/QsciCommand.cpp
diff --git a/harbour/contrib/hbqt/hbqscintilla/g/QsciCommandSet.cpp b/harbour/contrib/hbqt/qscintilla/g/QsciCommandSet.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/g/QsciCommandSet.cpp
rename to harbour/contrib/hbqt/qscintilla/g/QsciCommandSet.cpp
diff --git a/harbour/contrib/hbqt/hbqscintilla/g/QsciDocument.cpp b/harbour/contrib/hbqt/qscintilla/g/QsciDocument.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/g/QsciDocument.cpp
rename to harbour/contrib/hbqt/qscintilla/g/QsciDocument.cpp
diff --git a/harbour/contrib/hbqt/hbqscintilla/g/QsciLexer.cpp b/harbour/contrib/hbqt/qscintilla/g/QsciLexer.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/g/QsciLexer.cpp
rename to harbour/contrib/hbqt/qscintilla/g/QsciLexer.cpp
diff --git a/harbour/contrib/hbqt/hbqscintilla/g/QsciLexerCPP.cpp b/harbour/contrib/hbqt/qscintilla/g/QsciLexerCPP.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/g/QsciLexerCPP.cpp
rename to harbour/contrib/hbqt/qscintilla/g/QsciLexerCPP.cpp
diff --git a/harbour/contrib/hbqt/hbqscintilla/g/QsciLexerFlagship.cpp b/harbour/contrib/hbqt/qscintilla/g/QsciLexerFlagship.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/g/QsciLexerFlagship.cpp
rename to harbour/contrib/hbqt/qscintilla/g/QsciLexerFlagship.cpp
diff --git a/harbour/contrib/hbqt/hbqscintilla/g/QsciScintilla.cpp b/harbour/contrib/hbqt/qscintilla/g/QsciScintilla.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/g/QsciScintilla.cpp
rename to harbour/contrib/hbqt/qscintilla/g/QsciScintilla.cpp
diff --git a/harbour/contrib/hbqt/hbqscintilla/g/QsciStyle.cpp b/harbour/contrib/hbqt/qscintilla/g/QsciStyle.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/g/QsciStyle.cpp
rename to harbour/contrib/hbqt/qscintilla/g/QsciStyle.cpp
diff --git a/harbour/contrib/hbqt/hbqscintilla/g/QsciStyledText.cpp b/harbour/contrib/hbqt/qscintilla/g/QsciStyledText.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/g/QsciStyledText.cpp
rename to harbour/contrib/hbqt/qscintilla/g/QsciStyledText.cpp
diff --git a/harbour/contrib/hbqt/hbqscintilla/g/THBQsciScintilla.prg b/harbour/contrib/hbqt/qscintilla/g/THBQsciScintilla.prg
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/g/THBQsciScintilla.prg
rename to harbour/contrib/hbqt/qscintilla/g/THBQsciScintilla.prg
diff --git a/harbour/contrib/hbqt/hbqscintilla/g/TQsciAPIs.prg b/harbour/contrib/hbqt/qscintilla/g/TQsciAPIs.prg
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/g/TQsciAPIs.prg
rename to harbour/contrib/hbqt/qscintilla/g/TQsciAPIs.prg
diff --git a/harbour/contrib/hbqt/hbqscintilla/g/TQsciAbstractAPIs.prg b/harbour/contrib/hbqt/qscintilla/g/TQsciAbstractAPIs.prg
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/g/TQsciAbstractAPIs.prg
rename to harbour/contrib/hbqt/qscintilla/g/TQsciAbstractAPIs.prg
diff --git a/harbour/contrib/hbqt/hbqscintilla/g/TQsciCommand.prg b/harbour/contrib/hbqt/qscintilla/g/TQsciCommand.prg
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/g/TQsciCommand.prg
rename to harbour/contrib/hbqt/qscintilla/g/TQsciCommand.prg
diff --git a/harbour/contrib/hbqt/hbqscintilla/g/TQsciCommandSet.prg b/harbour/contrib/hbqt/qscintilla/g/TQsciCommandSet.prg
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/g/TQsciCommandSet.prg
rename to harbour/contrib/hbqt/qscintilla/g/TQsciCommandSet.prg
diff --git a/harbour/contrib/hbqt/hbqscintilla/g/TQsciDocument.prg b/harbour/contrib/hbqt/qscintilla/g/TQsciDocument.prg
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/g/TQsciDocument.prg
rename to harbour/contrib/hbqt/qscintilla/g/TQsciDocument.prg
diff --git a/harbour/contrib/hbqt/hbqscintilla/g/TQsciLexer.prg b/harbour/contrib/hbqt/qscintilla/g/TQsciLexer.prg
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/g/TQsciLexer.prg
rename to harbour/contrib/hbqt/qscintilla/g/TQsciLexer.prg
diff --git a/harbour/contrib/hbqt/hbqscintilla/g/TQsciLexerCPP.prg b/harbour/contrib/hbqt/qscintilla/g/TQsciLexerCPP.prg
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/g/TQsciLexerCPP.prg
rename to harbour/contrib/hbqt/qscintilla/g/TQsciLexerCPP.prg
diff --git a/harbour/contrib/hbqt/hbqscintilla/g/TQsciLexerFlagship.prg b/harbour/contrib/hbqt/qscintilla/g/TQsciLexerFlagship.prg
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/g/TQsciLexerFlagship.prg
rename to harbour/contrib/hbqt/qscintilla/g/TQsciLexerFlagship.prg
diff --git a/harbour/contrib/hbqt/hbqscintilla/g/TQsciScintilla.prg b/harbour/contrib/hbqt/qscintilla/g/TQsciScintilla.prg
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/g/TQsciScintilla.prg
rename to harbour/contrib/hbqt/qscintilla/g/TQsciScintilla.prg
diff --git a/harbour/contrib/hbqt/hbqscintilla/g/TQsciStyle.prg b/harbour/contrib/hbqt/qscintilla/g/TQsciStyle.prg
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/g/TQsciStyle.prg
rename to harbour/contrib/hbqt/qscintilla/g/TQsciStyle.prg
diff --git a/harbour/contrib/hbqt/hbqscintilla/g/TQsciStyledText.prg b/harbour/contrib/hbqt/qscintilla/g/TQsciStyledText.prg
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/g/TQsciStyledText.prg
rename to harbour/contrib/hbqt/qscintilla/g/TQsciStyledText.prg
diff --git a/harbour/contrib/hbqt/hbqscintilla/g/filelist.hbm b/harbour/contrib/hbqt/qscintilla/g/filelist.hbm
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/g/filelist.hbm
rename to harbour/contrib/hbqt/qscintilla/g/filelist.hbm
diff --git a/harbour/contrib/hbqt/hbqscintilla/g/hbqscintilla.h b/harbour/contrib/hbqt/qscintilla/g/hbqscintilla.h
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/g/hbqscintilla.h
rename to harbour/contrib/hbqt/qscintilla/g/hbqscintilla.h
diff --git a/harbour/contrib/hbqt/hbqscintilla/hbqscintilla.ch b/harbour/contrib/hbqt/qscintilla/hbqscintilla.ch
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/hbqscintilla.ch
rename to harbour/contrib/hbqt/qscintilla/hbqscintilla.ch
diff --git a/harbour/contrib/hbqt/hbqscintilla/hbqscintilla.hbc b/harbour/contrib/hbqt/qscintilla/hbqscintilla.hbc
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/hbqscintilla.hbc
rename to harbour/contrib/hbqt/qscintilla/hbqscintilla.hbc
diff --git a/harbour/contrib/hbqt/hbqscintilla/hbqscintilla.hbm b/harbour/contrib/hbqt/qscintilla/hbqscintilla.hbm
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/hbqscintilla.hbm
rename to harbour/contrib/hbqt/qscintilla/hbqscintilla.hbm
diff --git a/harbour/contrib/hbqt/hbqscintilla/hbqscintilla.hbp b/harbour/contrib/hbqt/qscintilla/hbqscintilla.hbp
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/hbqscintilla.hbp
rename to harbour/contrib/hbqt/qscintilla/hbqscintilla.hbp
diff --git a/harbour/contrib/hbqt/hbqscintilla/hbqscintillas.hbp b/harbour/contrib/hbqt/qscintilla/hbqscintillas.hbp
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/hbqscintillas.hbp
rename to harbour/contrib/hbqt/qscintilla/hbqscintillas.hbp
diff --git a/harbour/contrib/hbqt/hbqscintilla/hbqt_hbqsciscintilla.cpp b/harbour/contrib/hbqt/qscintilla/hbqt_hbqsciscintilla.cpp
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/hbqt_hbqsciscintilla.cpp
rename to harbour/contrib/hbqt/qscintilla/hbqt_hbqsciscintilla.cpp
diff --git a/harbour/contrib/hbqt/hbqscintilla/hbqt_hbqsciscintilla.h b/harbour/contrib/hbqt/qscintilla/hbqt_hbqsciscintilla.h
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/hbqt_hbqsciscintilla.h
rename to harbour/contrib/hbqt/qscintilla/hbqt_hbqsciscintilla.h
diff --git a/harbour/contrib/hbqt/hbqscintilla/qth/HBQsciScintilla.qth b/harbour/contrib/hbqt/qscintilla/qth/HBQsciScintilla.qth
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/qth/HBQsciScintilla.qth
rename to harbour/contrib/hbqt/qscintilla/qth/HBQsciScintilla.qth
diff --git a/harbour/contrib/hbqt/hbqscintilla/qth/QsciAPIs.qth b/harbour/contrib/hbqt/qscintilla/qth/QsciAPIs.qth
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/qth/QsciAPIs.qth
rename to harbour/contrib/hbqt/qscintilla/qth/QsciAPIs.qth
diff --git a/harbour/contrib/hbqt/hbqscintilla/qth/QsciAbstractAPIs.qth b/harbour/contrib/hbqt/qscintilla/qth/QsciAbstractAPIs.qth
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/qth/QsciAbstractAPIs.qth
rename to harbour/contrib/hbqt/qscintilla/qth/QsciAbstractAPIs.qth
diff --git a/harbour/contrib/hbqt/hbqscintilla/qth/QsciCommand.qth b/harbour/contrib/hbqt/qscintilla/qth/QsciCommand.qth
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/qth/QsciCommand.qth
rename to harbour/contrib/hbqt/qscintilla/qth/QsciCommand.qth
diff --git a/harbour/contrib/hbqt/hbqscintilla/qth/QsciCommandSet.qth b/harbour/contrib/hbqt/qscintilla/qth/QsciCommandSet.qth
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/qth/QsciCommandSet.qth
rename to harbour/contrib/hbqt/qscintilla/qth/QsciCommandSet.qth
diff --git a/harbour/contrib/hbqt/hbqscintilla/qth/QsciDocument.qth b/harbour/contrib/hbqt/qscintilla/qth/QsciDocument.qth
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/qth/QsciDocument.qth
rename to harbour/contrib/hbqt/qscintilla/qth/QsciDocument.qth
diff --git a/harbour/contrib/hbqt/hbqscintilla/qth/QsciLexer.qth b/harbour/contrib/hbqt/qscintilla/qth/QsciLexer.qth
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/qth/QsciLexer.qth
rename to harbour/contrib/hbqt/qscintilla/qth/QsciLexer.qth
diff --git a/harbour/contrib/hbqt/hbqscintilla/qth/QsciLexerCPP.qth b/harbour/contrib/hbqt/qscintilla/qth/QsciLexerCPP.qth
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/qth/QsciLexerCPP.qth
rename to harbour/contrib/hbqt/qscintilla/qth/QsciLexerCPP.qth
diff --git a/harbour/contrib/hbqt/hbqscintilla/qth/QsciLexerFlagship.qth b/harbour/contrib/hbqt/qscintilla/qth/QsciLexerFlagship.qth
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/qth/QsciLexerFlagship.qth
rename to harbour/contrib/hbqt/qscintilla/qth/QsciLexerFlagship.qth
diff --git a/harbour/contrib/hbqt/hbqscintilla/qth/QsciScintilla.qth b/harbour/contrib/hbqt/qscintilla/qth/QsciScintilla.qth
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/qth/QsciScintilla.qth
rename to harbour/contrib/hbqt/qscintilla/qth/QsciScintilla.qth
diff --git a/harbour/contrib/hbqt/hbqscintilla/qth/QsciStyle.qth b/harbour/contrib/hbqt/qscintilla/qth/QsciStyle.qth
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/qth/QsciStyle.qth
rename to harbour/contrib/hbqt/qscintilla/qth/QsciStyle.qth
diff --git a/harbour/contrib/hbqt/hbqscintilla/qth/QsciStyledText.qth b/harbour/contrib/hbqt/qscintilla/qth/QsciStyledText.qth
similarity index 100%
rename from harbour/contrib/hbqt/hbqscintilla/qth/QsciStyledText.qth
rename to harbour/contrib/hbqt/qscintilla/qth/QsciStyledText.qth
diff --git a/harbour/contrib/hbqt/utils/qscintilla.qtp b/harbour/contrib/hbqt/utils/qscintilla.qtp
index 56656ca9dd..907ccb1ed5 100644
--- a/harbour/contrib/hbqt/utils/qscintilla.qtp
+++ b/harbour/contrib/hbqt/utils/qscintilla.qtp
@@ -2,9 +2,9 @@
 ; $Id$
 ;
 
--I=../hbqscintilla/qth
--O=../hbqscintilla/g
--D=../hbqscintilla/doc
+-I=../qscintilla/qth
+-O=../qscintilla/g
+-D=../qscintilla/doc
 
 HBQsciScintilla.qth