diff --git a/packages/solaris/CSW/boinc_client/Makefile.am b/packages/solaris/CSW/boincclient/Makefile.am
similarity index 100%
rename from packages/solaris/CSW/boinc_client/Makefile.am
rename to packages/solaris/CSW/boincclient/Makefile.am
diff --git a/packages/solaris/CSW/boinc_client/boinc-client.conf b/packages/solaris/CSW/boincclient/boinc-client.conf
similarity index 100%
rename from packages/solaris/CSW/boinc_client/boinc-client.conf
rename to packages/solaris/CSW/boincclient/boinc-client.conf
diff --git a/packages/solaris/CSW/boinc_client/boinc.1 b/packages/solaris/CSW/boincclient/boinc.1
similarity index 100%
rename from packages/solaris/CSW/boinc_client/boinc.1
rename to packages/solaris/CSW/boincclient/boinc.1
diff --git a/packages/solaris/CSW/boinc_client/boinc_client.1 b/packages/solaris/CSW/boincclient/boinc_client.1
similarity index 100%
rename from packages/solaris/CSW/boinc_client/boinc_client.1
rename to packages/solaris/CSW/boincclient/boinc_client.1
diff --git a/packages/solaris/CSW/boinc_client/boinc_cmd.1 b/packages/solaris/CSW/boincclient/boinc_cmd.1
similarity index 100%
rename from packages/solaris/CSW/boinc_client/boinc_cmd.1
rename to packages/solaris/CSW/boincclient/boinc_cmd.1
diff --git a/packages/solaris/CSW/boinc_client/boinccmd.1 b/packages/solaris/CSW/boincclient/boinccmd.1
similarity index 100%
rename from packages/solaris/CSW/boinc_client/boinccmd.1
rename to packages/solaris/CSW/boincclient/boinccmd.1
diff --git a/packages/solaris/CSW/boinc_client/depend b/packages/solaris/CSW/boincclient/depend
similarity index 100%
rename from packages/solaris/CSW/boinc_client/depend
rename to packages/solaris/CSW/boincclient/depend
diff --git a/packages/solaris/CSW/boinc_client/pkginfo.in b/packages/solaris/CSW/boincclient/pkginfo.in
similarity index 100%
rename from packages/solaris/CSW/boinc_client/pkginfo.in
rename to packages/solaris/CSW/boincclient/pkginfo.in
diff --git a/packages/solaris/CSW/boinc_client/postinstall b/packages/solaris/CSW/boincclient/postinstall
similarity index 100%
rename from packages/solaris/CSW/boinc_client/postinstall
rename to packages/solaris/CSW/boincclient/postinstall
diff --git a/packages/solaris/CSW/boinc_client/preinstall b/packages/solaris/CSW/boincclient/preinstall
similarity index 100%
rename from packages/solaris/CSW/boinc_client/preinstall
rename to packages/solaris/CSW/boincclient/preinstall
diff --git a/packages/solaris/CSW/boinc_client/prototype.in b/packages/solaris/CSW/boincclient/prototype.in
similarity index 100%
rename from packages/solaris/CSW/boinc_client/prototype.in
rename to packages/solaris/CSW/boincclient/prototype.in
diff --git a/packages/solaris/CSW/boinc_devel/Makefile.am b/packages/solaris/CSW/boincdevel/Makefile.am
similarity index 100%
rename from packages/solaris/CSW/boinc_devel/Makefile.am
rename to packages/solaris/CSW/boincdevel/Makefile.am
diff --git a/packages/solaris/CSW/boinc_devel/depend b/packages/solaris/CSW/boincdevel/depend
similarity index 100%
rename from packages/solaris/CSW/boinc_devel/depend
rename to packages/solaris/CSW/boincdevel/depend
diff --git a/packages/solaris/CSW/boinc_devel/pkginfo.in b/packages/solaris/CSW/boincdevel/pkginfo.in
similarity index 100%
rename from packages/solaris/CSW/boinc_devel/pkginfo.in
rename to packages/solaris/CSW/boincdevel/pkginfo.in
diff --git a/packages/solaris/CSW/boinc_devel/prototype.in b/packages/solaris/CSW/boincdevel/prototype.in
similarity index 100%
rename from packages/solaris/CSW/boinc_devel/prototype.in
rename to packages/solaris/CSW/boincdevel/prototype.in
diff --git a/packages/solaris/CSW/boinc_libs/Makefile.am b/packages/solaris/CSW/boinclibs/Makefile.am
similarity index 100%
rename from packages/solaris/CSW/boinc_libs/Makefile.am
rename to packages/solaris/CSW/boinclibs/Makefile.am
diff --git a/packages/solaris/CSW/boinc_libs/depend b/packages/solaris/CSW/boinclibs/depend
similarity index 100%
rename from packages/solaris/CSW/boinc_libs/depend
rename to packages/solaris/CSW/boinclibs/depend
diff --git a/packages/solaris/CSW/boinc_libs/pkginfo.in b/packages/solaris/CSW/boinclibs/pkginfo.in
similarity index 100%
rename from packages/solaris/CSW/boinc_libs/pkginfo.in
rename to packages/solaris/CSW/boinclibs/pkginfo.in
diff --git a/packages/solaris/CSW/boinc_libs/prototype.in b/packages/solaris/CSW/boinclibs/prototype.in
similarity index 100%
rename from packages/solaris/CSW/boinc_libs/prototype.in
rename to packages/solaris/CSW/boinclibs/prototype.in
diff --git a/packages/solaris/CSW/boinc_manager/Makefile.am b/packages/solaris/CSW/boincmanager/Makefile.am
similarity index 100%
rename from packages/solaris/CSW/boinc_manager/Makefile.am
rename to packages/solaris/CSW/boincmanager/Makefile.am
diff --git a/packages/solaris/CSW/boinc_manager/boinc_manager.1 b/packages/solaris/CSW/boincmanager/boinc_manager.1
similarity index 100%
rename from packages/solaris/CSW/boinc_manager/boinc_manager.1
rename to packages/solaris/CSW/boincmanager/boinc_manager.1
diff --git a/packages/solaris/CSW/boinc_manager/boincmgr.1 b/packages/solaris/CSW/boincmanager/boincmgr.1
similarity index 100%
rename from packages/solaris/CSW/boinc_manager/boincmgr.1
rename to packages/solaris/CSW/boincmanager/boincmgr.1
diff --git a/packages/solaris/CSW/boinc_manager/depend b/packages/solaris/CSW/boincmanager/depend
similarity index 100%
rename from packages/solaris/CSW/boinc_manager/depend
rename to packages/solaris/CSW/boincmanager/depend
diff --git a/packages/solaris/CSW/boinc_manager/pkginfo.in b/packages/solaris/CSW/boincmanager/pkginfo.in
similarity index 100%
rename from packages/solaris/CSW/boinc_manager/pkginfo.in
rename to packages/solaris/CSW/boincmanager/pkginfo.in
diff --git a/packages/solaris/CSW/boinc_manager/prototype.in b/packages/solaris/CSW/boincmanager/prototype.in
similarity index 100%
rename from packages/solaris/CSW/boinc_manager/prototype.in
rename to packages/solaris/CSW/boincmanager/prototype.in
diff --git a/packages/solaris/CSW/boinc_server/Makefile.am b/packages/solaris/CSW/boincserver/Makefile.am
similarity index 100%
rename from packages/solaris/CSW/boinc_server/Makefile.am
rename to packages/solaris/CSW/boincserver/Makefile.am