diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 9eea15f31d..274f4ed4cc 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,14 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-01-27 13:55 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbplist
+  - contrib/hbnetio/utils/netiosrq
+  + contrib/hbnetio/utils/hbnetio
+  - contrib/hbnetio/utils/netiosrv
+  + contrib/hbnetio/utils/hbnetioq
+    * Renaming second pass.
+
 2011-01-27 13:49 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbplist
   - contrib/hbnetio/utils/netiosrv/netiosrv.hbp
diff --git a/harbour/contrib/hbnetio/utils/netiosrv/hbnetio.hbp b/harbour/contrib/hbnetio/utils/hbnetio/hbnetio.hbp
similarity index 100%
rename from harbour/contrib/hbnetio/utils/netiosrv/hbnetio.hbp
rename to harbour/contrib/hbnetio/utils/hbnetio/hbnetio.hbp
diff --git a/harbour/contrib/hbnetio/utils/netiosrv/hbnetioc.hbp b/harbour/contrib/hbnetio/utils/hbnetio/hbnetioc.hbp
similarity index 100%
rename from harbour/contrib/hbnetio/utils/netiosrv/hbnetioc.hbp
rename to harbour/contrib/hbnetio/utils/hbnetio/hbnetioc.hbp
diff --git a/harbour/contrib/hbnetio/utils/netiosrv/modules.hbp b/harbour/contrib/hbnetio/utils/hbnetio/modules.hbp
similarity index 100%
rename from harbour/contrib/hbnetio/utils/netiosrv/modules.hbp
rename to harbour/contrib/hbnetio/utils/hbnetio/modules.hbp
diff --git a/harbour/contrib/hbnetio/utils/netiosrv/netiocui.prg b/harbour/contrib/hbnetio/utils/hbnetio/netiocui.prg
similarity index 100%
rename from harbour/contrib/hbnetio/utils/netiosrv/netiocui.prg
rename to harbour/contrib/hbnetio/utils/hbnetio/netiocui.prg
diff --git a/harbour/contrib/hbnetio/utils/netiosrv/netiosrv.prg b/harbour/contrib/hbnetio/utils/hbnetio/netiosrv.prg
similarity index 100%
rename from harbour/contrib/hbnetio/utils/netiosrv/netiosrv.prg
rename to harbour/contrib/hbnetio/utils/hbnetio/netiosrv.prg
diff --git a/harbour/contrib/hbnetio/utils/netiosrv/rpcdemo.hbs b/harbour/contrib/hbnetio/utils/hbnetio/rpcdemo.hbs
similarity index 100%
rename from harbour/contrib/hbnetio/utils/netiosrv/rpcdemo.hbs
rename to harbour/contrib/hbnetio/utils/hbnetio/rpcdemo.hbs
diff --git a/harbour/contrib/hbnetio/utils/netiosrq/about.png b/harbour/contrib/hbnetio/utils/hbnetioq/about.png
similarity index 100%
rename from harbour/contrib/hbnetio/utils/netiosrq/about.png
rename to harbour/contrib/hbnetio/utils/hbnetioq/about.png
diff --git a/harbour/contrib/hbnetio/utils/netiosrq/exit.png b/harbour/contrib/hbnetio/utils/hbnetioq/exit.png
similarity index 100%
rename from harbour/contrib/hbnetio/utils/netiosrq/exit.png
rename to harbour/contrib/hbnetio/utils/hbnetioq/exit.png
diff --git a/harbour/contrib/hbnetio/utils/netiosrq/fullscreen.png b/harbour/contrib/hbnetio/utils/hbnetioq/fullscreen.png
similarity index 100%
rename from harbour/contrib/hbnetio/utils/netiosrq/fullscreen.png
rename to harbour/contrib/hbnetio/utils/hbnetioq/fullscreen.png
diff --git a/harbour/contrib/hbnetio/utils/netiosrq/harbour.png b/harbour/contrib/hbnetio/utils/hbnetioq/harbour.png
similarity index 100%
rename from harbour/contrib/hbnetio/utils/netiosrq/harbour.png
rename to harbour/contrib/hbnetio/utils/hbnetioq/harbour.png
diff --git a/harbour/contrib/hbnetio/utils/netiosrq/hbnetioq.hbp b/harbour/contrib/hbnetio/utils/hbnetioq/hbnetioq.hbp
similarity index 100%
rename from harbour/contrib/hbnetio/utils/netiosrq/hbnetioq.hbp
rename to harbour/contrib/hbnetio/utils/hbnetioq/hbnetioq.hbp
diff --git a/harbour/contrib/hbnetio/utils/netiosrq/help.png b/harbour/contrib/hbnetio/utils/hbnetioq/help.png
similarity index 100%
rename from harbour/contrib/hbnetio/utils/netiosrq/help.png
rename to harbour/contrib/hbnetio/utils/hbnetioq/help.png
diff --git a/harbour/contrib/hbnetio/utils/netiosrq/netiosrq.prg b/harbour/contrib/hbnetio/utils/hbnetioq/netiosrq.prg
similarity index 100%
rename from harbour/contrib/hbnetio/utils/netiosrq/netiosrq.prg
rename to harbour/contrib/hbnetio/utils/hbnetioq/netiosrq.prg
diff --git a/harbour/contrib/hbnetio/utils/netiosrq/netiosrq.qrc b/harbour/contrib/hbnetio/utils/hbnetioq/netiosrq.qrc
similarity index 100%
rename from harbour/contrib/hbnetio/utils/netiosrq/netiosrq.qrc
rename to harbour/contrib/hbnetio/utils/hbnetioq/netiosrq.qrc
diff --git a/harbour/contrib/hbnetio/utils/netiosrq/terminate.png b/harbour/contrib/hbnetio/utils/hbnetioq/terminate.png
similarity index 100%
rename from harbour/contrib/hbnetio/utils/netiosrq/terminate.png
rename to harbour/contrib/hbnetio/utils/hbnetioq/terminate.png
diff --git a/harbour/contrib/hbplist b/harbour/contrib/hbplist
index fa4f8deb76..4389230f37 100644
--- a/harbour/contrib/hbplist
+++ b/harbour/contrib/hbplist
@@ -33,7 +33,7 @@ hbmxml/hbmxml.hbp                # uses: minixml (locally hosted)
 hbmysql/hbmysql.hbp
 hbmzip/hbmzip.hbp                # uses: minizip (locally hosted)
 hbnetio/hbnetio.hbp
-hbnetio/utils/netiosrv/hbnetio.hbp
+hbnetio/utils/hbnetio/hbnetio.hbp
 hbnf/hbnf.hbp
 hbodbc/hbodbc.hbp
 hbpgsql/hbpgsql.hbp