diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 1bcd5488b1..9eea15f31d 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,22 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-01-27 13:49 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbplist
+  - contrib/hbnetio/utils/netiosrv/netiosrv.hbp
+  + contrib/hbnetio/utils/netiosrv/hbnetio.hbp
+  - contrib/hbnetio/utils/netiosrv/netiocui.hbp
+  + contrib/hbnetio/utils/netiosrv/hbnetioc.hbp
+  - contrib/hbnetio/utils/netiosrq/netiosrq.hbp
+  + contrib/hbnetio/utils/netiosrq/hbnetioq.hbp
+    ! Renamed back to get in sync with installer.
+    ; TOFIX: Change hbnetioq to a pure management client without
+             embedded server daemon code. Pritpal, can you do it?
+    ; TODO: Change hbnetio to be pure server daemon and add separate
+            management console tool. Or, it's possible to put the
+            console UI in a lib and keeping it included in daemon
+            for convenience.
+
 2011-01-27 12:26 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * ChangeLog
     * Marked TODOs/TOFIXes DONE.
diff --git a/harbour/contrib/hbnetio/utils/netiosrq/netiosrq.hbp b/harbour/contrib/hbnetio/utils/netiosrq/hbnetioq.hbp
similarity index 100%
rename from harbour/contrib/hbnetio/utils/netiosrq/netiosrq.hbp
rename to harbour/contrib/hbnetio/utils/netiosrq/hbnetioq.hbp
diff --git a/harbour/contrib/hbnetio/utils/netiosrv/netiosrv.hbp b/harbour/contrib/hbnetio/utils/netiosrv/hbnetio.hbp
similarity index 100%
rename from harbour/contrib/hbnetio/utils/netiosrv/netiosrv.hbp
rename to harbour/contrib/hbnetio/utils/netiosrv/hbnetio.hbp
diff --git a/harbour/contrib/hbnetio/utils/netiosrv/netiocui.hbp b/harbour/contrib/hbnetio/utils/netiosrv/hbnetioc.hbp
similarity index 100%
rename from harbour/contrib/hbnetio/utils/netiosrv/netiocui.hbp
rename to harbour/contrib/hbnetio/utils/netiosrv/hbnetioc.hbp
diff --git a/harbour/contrib/hbplist b/harbour/contrib/hbplist
index d4d446750e..fa4f8deb76 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/netiosrv.hbp
+hbnetio/utils/netiosrv/hbnetio.hbp
 hbnf/hbnf.hbp
 hbodbc/hbodbc.hbp
 hbpgsql/hbpgsql.hbp