diff --git a/app-arch/xz-utils/xz-utils-4.999.9.recipe b/app-arch/xz_utils/xz-utils-4.999.9.recipe
similarity index 100%
rename from app-arch/xz-utils/xz-utils-4.999.9.recipe
rename to app-arch/xz_utils/xz-utils-4.999.9.recipe
diff --git a/app-arch/xz-utils/xz_utils-5.0.1.recipe b/app-arch/xz_utils/xz_utils-5.0.1.recipe
similarity index 100%
rename from app-arch/xz-utils/xz_utils-5.0.1.recipe
rename to app-arch/xz_utils/xz_utils-5.0.1.recipe
diff --git a/app-arch/xz-utils/xz_utils-5.0.4.recipe b/app-arch/xz_utils/xz_utils-5.0.4.recipe
similarity index 100%
rename from app-arch/xz-utils/xz_utils-5.0.4.recipe
rename to app-arch/xz_utils/xz_utils-5.0.4.recipe
diff --git a/app-text/ebook-tools/ebook-tools-0.2.1.recipe b/app-text/ebook_tools/ebook-tools-0.2.1.recipe
similarity index 100%
rename from app-text/ebook-tools/ebook-tools-0.2.1.recipe
rename to app-text/ebook_tools/ebook-tools-0.2.1.recipe
diff --git a/dev-cpp/mm-common/mm-common-0.9.2.recipe b/dev-cpp/mm_common/mm-common-0.9.2.recipe
similarity index 100%
rename from dev-cpp/mm-common/mm-common-0.9.2.recipe
rename to dev-cpp/mm_common/mm-common-0.9.2.recipe
diff --git a/dev-embedded/u-boot-tools/patches/u-boot-tools-2012.10.patch b/dev-embedded/u_boot_tools/patches/u-boot-tools-2012.10.patch
similarity index 100%
rename from dev-embedded/u-boot-tools/patches/u-boot-tools-2012.10.patch
rename to dev-embedded/u_boot_tools/patches/u-boot-tools-2012.10.patch
diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2012.10.recipe b/dev-embedded/u_boot_tools/u-boot-tools-2012.10.recipe
similarity index 100%
rename from dev-embedded/u-boot-tools/u-boot-tools-2012.10.recipe
rename to dev-embedded/u_boot_tools/u-boot-tools-2012.10.recipe
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.98.recipe b/dev-java/gnu_classpath/gnu-classpath-0.98.recipe
similarity index 100%
rename from dev-java/gnu-classpath/gnu-classpath-0.98.recipe
rename to dev-java/gnu_classpath/gnu-classpath-0.98.recipe
diff --git a/dev-java/gnu-classpath/licenses/GNU GPL v2 with classpath exceptions b/dev-java/gnu_classpath/licenses/GNU GPL v2 with classpath exceptions
similarity index 100%
rename from dev-java/gnu-classpath/licenses/GNU GPL v2 with classpath exceptions
rename to dev-java/gnu_classpath/licenses/GNU GPL v2 with classpath exceptions
diff --git a/dev-java/gnu-classpath/patches/gnu-classpath-0.98.patch b/dev-java/gnu_classpath/patches/gnu-classpath-0.98.patch
similarity index 100%
rename from dev-java/gnu-classpath/patches/gnu-classpath-0.98.patch
rename to dev-java/gnu_classpath/patches/gnu-classpath-0.98.patch
diff --git a/dev-lang/dmd-bin/dmd-bin-1.064.recipe b/dev-lang/dmd_bin/dmd-bin-1.064.recipe
similarity index 100%
rename from dev-lang/dmd-bin/dmd-bin-1.064.recipe
rename to dev-lang/dmd_bin/dmd-bin-1.064.recipe
diff --git a/dev-lang/dmd-bin/licenses/Digital Mars b/dev-lang/dmd_bin/licenses/Digital Mars
similarity index 100%
rename from dev-lang/dmd-bin/licenses/Digital Mars
rename to dev-lang/dmd_bin/licenses/Digital Mars
diff --git a/dev-lang/dmd-bin/patches/dmd-bin-1.064.patch b/dev-lang/dmd_bin/patches/dmd-bin-1.064.patch
similarity index 100%
rename from dev-lang/dmd-bin/patches/dmd-bin-1.064.patch
rename to dev-lang/dmd_bin/patches/dmd-bin-1.064.patch
diff --git a/dev-lang/swi-prolog/licenses/SWI-Prolog b/dev-lang/swi_prolog/licenses/SWI-Prolog
similarity index 100%
rename from dev-lang/swi-prolog/licenses/SWI-Prolog
rename to dev-lang/swi_prolog/licenses/SWI-Prolog
diff --git a/dev-lang/swi-prolog/patches/swi-prolog-6.0.2.patch b/dev-lang/swi_prolog/patches/swi-prolog-6.0.2.patch
similarity index 100%
rename from dev-lang/swi-prolog/patches/swi-prolog-6.0.2.patch
rename to dev-lang/swi_prolog/patches/swi-prolog-6.0.2.patch
diff --git a/dev-lang/swi-prolog/patches/swi-prolog-6.2.0.patch b/dev-lang/swi_prolog/patches/swi-prolog-6.2.0.patch
similarity index 100%
rename from dev-lang/swi-prolog/patches/swi-prolog-6.2.0.patch
rename to dev-lang/swi_prolog/patches/swi-prolog-6.2.0.patch
diff --git a/dev-lang/swi-prolog/swi-prolog-6.0.2.recipe b/dev-lang/swi_prolog/swi-prolog-6.0.2.recipe
similarity index 100%
rename from dev-lang/swi-prolog/swi-prolog-6.0.2.recipe
rename to dev-lang/swi_prolog/swi-prolog-6.0.2.recipe
diff --git a/dev-lang/swi-prolog/swi-prolog-6.2.0.recipe b/dev-lang/swi_prolog/swi-prolog-6.2.0.recipe
similarity index 100%
rename from dev-lang/swi-prolog/swi-prolog-6.2.0.recipe
rename to dev-lang/swi_prolog/swi-prolog-6.2.0.recipe
diff --git a/dev-libs/apr-util/apr-util-1.3.11.recipe b/dev-libs/apr_util/apr-util-1.3.11.recipe
similarity index 100%
rename from dev-libs/apr-util/apr-util-1.3.11.recipe
rename to dev-libs/apr_util/apr-util-1.3.11.recipe
diff --git a/dev-libs/apr-util/apr-util-1.3.12.recipe b/dev-libs/apr_util/apr-util-1.3.12.recipe
similarity index 100%
rename from dev-libs/apr-util/apr-util-1.3.12.recipe
rename to dev-libs/apr_util/apr-util-1.3.12.recipe
diff --git a/dev-libs/apr-util/apr-util-1.3.9.recipe b/dev-libs/apr_util/apr-util-1.3.9.recipe
similarity index 100%
rename from dev-libs/apr-util/apr-util-1.3.9.recipe
rename to dev-libs/apr_util/apr-util-1.3.9.recipe
diff --git a/dev-libs/apr-util/apr-util-1.4.1.recipe b/dev-libs/apr_util/apr-util-1.4.1.recipe
similarity index 100%
rename from dev-libs/apr-util/apr-util-1.4.1.recipe
rename to dev-libs/apr_util/apr-util-1.4.1.recipe
diff --git a/dev-libs/apr-util/apr_util-1.3.10.recipe b/dev-libs/apr_util/apr_util-1.3.10.recipe
similarity index 100%
rename from dev-libs/apr-util/apr_util-1.3.10.recipe
rename to dev-libs/apr_util/apr_util-1.3.10.recipe
diff --git a/dev-libs/apr-util/patches/apr-util-0.9.x-haiku.diff b/dev-libs/apr_util/patches/apr-util-0.9.x-haiku.diff
similarity index 100%
rename from dev-libs/apr-util/patches/apr-util-0.9.x-haiku.diff
rename to dev-libs/apr_util/patches/apr-util-0.9.x-haiku.diff
diff --git a/dev-libs/apr-util/patches/apr-util-0.9.x.diff b/dev-libs/apr_util/patches/apr-util-0.9.x.diff
similarity index 100%
rename from dev-libs/apr-util/patches/apr-util-0.9.x.diff
rename to dev-libs/apr_util/patches/apr-util-0.9.x.diff
diff --git a/dev-libs/apr-util/patches/apr-util-1.3.10.patch b/dev-libs/apr_util/patches/apr-util-1.3.10.patch
similarity index 100%
rename from dev-libs/apr-util/patches/apr-util-1.3.10.patch
rename to dev-libs/apr_util/patches/apr-util-1.3.10.patch
diff --git a/dev-libs/apr-util/patches/apr-util-1.3.11.patch b/dev-libs/apr_util/patches/apr-util-1.3.11.patch
similarity index 100%
rename from dev-libs/apr-util/patches/apr-util-1.3.11.patch
rename to dev-libs/apr_util/patches/apr-util-1.3.11.patch
diff --git a/dev-libs/apr-util/patches/apr-util-1.3.12.patch b/dev-libs/apr_util/patches/apr-util-1.3.12.patch
similarity index 100%
rename from dev-libs/apr-util/patches/apr-util-1.3.12.patch
rename to dev-libs/apr_util/patches/apr-util-1.3.12.patch
diff --git a/dev-libs/apr-util/patches/apr-util-1.4.1.patch b/dev-libs/apr_util/patches/apr-util-1.4.1.patch
similarity index 100%
rename from dev-libs/apr-util/patches/apr-util-1.4.1.patch
rename to dev-libs/apr_util/patches/apr-util-1.4.1.patch
diff --git a/dev-libs/boehm-gc/boehm-gc-7.2_alpha6.recipe b/dev-libs/boehm_gc/boehm-gc-7.2_alpha6.recipe
similarity index 100%
rename from dev-libs/boehm-gc/boehm-gc-7.2_alpha6.recipe
rename to dev-libs/boehm_gc/boehm-gc-7.2_alpha6.recipe
diff --git a/dev-libs/boehm-gc/boehm-gc-7.2d.recipe b/dev-libs/boehm_gc/boehm-gc-7.2d.recipe
similarity index 100%
rename from dev-libs/boehm-gc/boehm-gc-7.2d.recipe
rename to dev-libs/boehm_gc/boehm-gc-7.2d.recipe
diff --git a/dev-libs/boehm-gc/licenses/BOEHM b/dev-libs/boehm_gc/licenses/BOEHM
similarity index 100%
rename from dev-libs/boehm-gc/licenses/BOEHM
rename to dev-libs/boehm_gc/licenses/BOEHM
diff --git a/dev-libs/boehm-gc/patches/boehm-gc-7.2_alpha6.patch b/dev-libs/boehm_gc/patches/boehm-gc-7.2_alpha6.patch
similarity index 100%
rename from dev-libs/boehm-gc/patches/boehm-gc-7.2_alpha6.patch
rename to dev-libs/boehm_gc/patches/boehm-gc-7.2_alpha6.patch
diff --git a/dev-libs/boehm-gc/patches/boehm-gc-7.2d.patch b/dev-libs/boehm_gc/patches/boehm-gc-7.2d.patch
similarity index 100%
rename from dev-libs/boehm-gc/patches/boehm-gc-7.2d.patch
rename to dev-libs/boehm_gc/patches/boehm-gc-7.2d.patch
diff --git a/dev-libs/json-c/json-c-0.9.recipe b/dev-libs/json_c/json-c-0.9.recipe
similarity index 100%
rename from dev-libs/json-c/json-c-0.9.recipe
rename to dev-libs/json_c/json-c-0.9.recipe
diff --git a/dev-libs/json-c/patches/json-c-0.9.patch b/dev-libs/json_c/patches/json-c-0.9.patch
similarity index 100%
rename from dev-libs/json-c/patches/json-c-0.9.patch
rename to dev-libs/json_c/patches/json-c-0.9.patch
diff --git a/dev-libs/libgpg-error/libgpg-error-1.10.recipe b/dev-libs/libgpg_error/libgpg-error-1.10.recipe
similarity index 100%
rename from dev-libs/libgpg-error/libgpg-error-1.10.recipe
rename to dev-libs/libgpg_error/libgpg-error-1.10.recipe
diff --git a/dev-libs/libgpg-error/libgpg-error-1.7.recipe b/dev-libs/libgpg_error/libgpg-error-1.7.recipe
similarity index 100%
rename from dev-libs/libgpg-error/libgpg-error-1.7.recipe
rename to dev-libs/libgpg_error/libgpg-error-1.7.recipe
diff --git a/dev-libs/libgpg-error/patches/libgpg-error-1.10.patch b/dev-libs/libgpg_error/patches/libgpg-error-1.10.patch
similarity index 100%
rename from dev-libs/libgpg-error/patches/libgpg-error-1.10.patch
rename to dev-libs/libgpg_error/patches/libgpg-error-1.10.patch
diff --git a/dev-libs/libgpg-error/patches/libgpg-error-1.7.patch b/dev-libs/libgpg_error/patches/libgpg-error-1.7.patch
similarity index 100%
rename from dev-libs/libgpg-error/patches/libgpg-error-1.7.patch
rename to dev-libs/libgpg_error/patches/libgpg-error-1.7.patch
diff --git a/dev-libs/libpthread-stubs/libpthread-stubs-0.3.2.recipe b/dev-libs/libpthread_stubs/libpthread-stubs-0.3.2.recipe
similarity index 100%
rename from dev-libs/libpthread-stubs/libpthread-stubs-0.3.2.recipe
rename to dev-libs/libpthread_stubs/libpthread-stubs-0.3.2.recipe
diff --git a/dev-libs/libpthread-stubs/libpthread-stubs-0.3.recipe b/dev-libs/libpthread_stubs/libpthread-stubs-0.3.recipe
similarity index 100%
rename from dev-libs/libpthread-stubs/libpthread-stubs-0.3.recipe
rename to dev-libs/libpthread_stubs/libpthread-stubs-0.3.recipe
diff --git a/dev-libs/libxdg-basedir/libxdg-basedir-1.1.1.recipe b/dev-libs/libxdg_basedir/libxdg-basedir-1.1.1.recipe
similarity index 100%
rename from dev-libs/libxdg-basedir/libxdg-basedir-1.1.1.recipe
rename to dev-libs/libxdg_basedir/libxdg-basedir-1.1.1.recipe
diff --git a/dev-libs/libxdg-basedir/patches/libxdg-basedir-1.1.1.patch b/dev-libs/libxdg_basedir/patches/libxdg-basedir-1.1.1.patch
similarity index 100%
rename from dev-libs/libxdg-basedir/patches/libxdg-basedir-1.1.1.patch
rename to dev-libs/libxdg_basedir/patches/libxdg-basedir-1.1.1.patch
diff --git a/dev-libs/xerces-c/xerces-c-3.1.1.recipe b/dev-libs/xerces_c/xerces-c-3.1.1.recipe
similarity index 100%
rename from dev-libs/xerces-c/xerces-c-3.1.1.recipe
rename to dev-libs/xerces_c/xerces-c-3.1.1.recipe
diff --git a/dev-perl/XML-Parser/XML-Parser-2.36.recipe b/dev-perl/XML_Parser/XML-Parser-2.36.recipe
similarity index 100%
rename from dev-perl/XML-Parser/XML-Parser-2.36.recipe
rename to dev-perl/XML_Parser/XML-Parser-2.36.recipe
diff --git a/dev-util/abi-compliance-checker/abi-compliance-checker-1.98.3.recipe b/dev-util/abi_compliance_checker/abi-compliance-checker-1.98.3.recipe
similarity index 100%
rename from dev-util/abi-compliance-checker/abi-compliance-checker-1.98.3.recipe
rename to dev-util/abi_compliance_checker/abi-compliance-checker-1.98.3.recipe
diff --git a/dev-util/abi-compliance-checker/example-descriptors/README b/dev-util/abi_compliance_checker/example-descriptors/README
similarity index 100%
rename from dev-util/abi-compliance-checker/example-descriptors/README
rename to dev-util/abi_compliance_checker/example-descriptors/README
diff --git a/dev-util/abi-compliance-checker/example-descriptors/libjpeg-6.2.desc b/dev-util/abi_compliance_checker/example-descriptors/libjpeg-6.2.desc
similarity index 100%
rename from dev-util/abi-compliance-checker/example-descriptors/libjpeg-6.2.desc
rename to dev-util/abi_compliance_checker/example-descriptors/libjpeg-6.2.desc
diff --git a/dev-util/abi-compliance-checker/example-descriptors/libjpeg-7.desc b/dev-util/abi_compliance_checker/example-descriptors/libjpeg-7.desc
similarity index 100%
rename from dev-util/abi-compliance-checker/example-descriptors/libjpeg-7.desc
rename to dev-util/abi_compliance_checker/example-descriptors/libjpeg-7.desc
diff --git a/dev-util/abi-compliance-checker/example-descriptors/libjpeg-8.desc b/dev-util/abi_compliance_checker/example-descriptors/libjpeg-8.desc
similarity index 100%
rename from dev-util/abi-compliance-checker/example-descriptors/libjpeg-8.desc
rename to dev-util/abi_compliance_checker/example-descriptors/libjpeg-8.desc
diff --git a/dev-util/abi-compliance-checker/example-descriptors/libpng-1.2.42.desc b/dev-util/abi_compliance_checker/example-descriptors/libpng-1.2.42.desc
similarity index 100%
rename from dev-util/abi-compliance-checker/example-descriptors/libpng-1.2.42.desc
rename to dev-util/abi_compliance_checker/example-descriptors/libpng-1.2.42.desc
diff --git a/dev-util/abi-compliance-checker/example-descriptors/libpng-1.4.0.desc b/dev-util/abi_compliance_checker/example-descriptors/libpng-1.4.0.desc
similarity index 100%
rename from dev-util/abi-compliance-checker/example-descriptors/libpng-1.4.0.desc
rename to dev-util/abi_compliance_checker/example-descriptors/libpng-1.4.0.desc
diff --git a/dev-util/abi-compliance-checker/example-descriptors/zlib-1.1.4.desc b/dev-util/abi_compliance_checker/example-descriptors/zlib-1.1.4.desc
similarity index 100%
rename from dev-util/abi-compliance-checker/example-descriptors/zlib-1.1.4.desc
rename to dev-util/abi_compliance_checker/example-descriptors/zlib-1.1.4.desc
diff --git a/dev-util/abi-compliance-checker/example-descriptors/zlib-1.2.2.desc b/dev-util/abi_compliance_checker/example-descriptors/zlib-1.2.2.desc
similarity index 100%
rename from dev-util/abi-compliance-checker/example-descriptors/zlib-1.2.2.desc
rename to dev-util/abi_compliance_checker/example-descriptors/zlib-1.2.2.desc
diff --git a/dev-util/abi-compliance-checker/example-descriptors/zlib-1.2.3.desc b/dev-util/abi_compliance_checker/example-descriptors/zlib-1.2.3.desc
similarity index 100%
rename from dev-util/abi-compliance-checker/example-descriptors/zlib-1.2.3.desc
rename to dev-util/abi_compliance_checker/example-descriptors/zlib-1.2.3.desc
diff --git a/dev-util/gtk-doc/gtk-doc-1.15.recipe b/dev-util/gtk_doc/gtk-doc-1.15.recipe
similarity index 100%
rename from dev-util/gtk-doc/gtk-doc-1.15.recipe
rename to dev-util/gtk_doc/gtk-doc-1.15.recipe
diff --git a/dev-util/gtk-doc/patches/gtk-doc-1.15.patch b/dev-util/gtk_doc/patches/gtk-doc-1.15.patch
similarity index 100%
rename from dev-util/gtk-doc/patches/gtk-doc-1.15.patch
rename to dev-util/gtk_doc/patches/gtk-doc-1.15.patch
diff --git a/gnome-base/gnome-common/gnome-common-2.28.recipe b/gnome-base/gnome_common/gnome-common-2.28.recipe
similarity index 100%
rename from gnome-base/gnome-common/gnome-common-2.28.recipe
rename to gnome-base/gnome_common/gnome-common-2.28.recipe
diff --git a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-0.HEAD.recipe b/haiku-apps/caya_gpl_protocols/caya-gpl-protocols-0.HEAD.recipe
similarity index 100%
rename from haiku-apps/caya-gpl-protocols/caya-gpl-protocols-0.HEAD.recipe
rename to haiku-apps/caya_gpl_protocols/caya-gpl-protocols-0.HEAD.recipe
diff --git a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-19.recipe b/haiku-apps/caya_gpl_protocols/caya-gpl-protocols-19.recipe
similarity index 100%
rename from haiku-apps/caya-gpl-protocols/caya-gpl-protocols-19.recipe
rename to haiku-apps/caya_gpl_protocols/caya-gpl-protocols-19.recipe
diff --git a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-24.recipe b/haiku-apps/caya_gpl_protocols/caya-gpl-protocols-24.recipe
similarity index 100%
rename from haiku-apps/caya-gpl-protocols/caya-gpl-protocols-24.recipe
rename to haiku-apps/caya_gpl_protocols/caya-gpl-protocols-24.recipe
diff --git a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-35.recipe b/haiku-apps/caya_gpl_protocols/caya-gpl-protocols-35.recipe
similarity index 100%
rename from haiku-apps/caya-gpl-protocols/caya-gpl-protocols-35.recipe
rename to haiku-apps/caya_gpl_protocols/caya-gpl-protocols-35.recipe
diff --git a/haiku-apps/caya-gpl-protocols/caya-gpl-protocols-36.recipe b/haiku-apps/caya_gpl_protocols/caya-gpl-protocols-36.recipe
similarity index 100%
rename from haiku-apps/caya-gpl-protocols/caya-gpl-protocols-36.recipe
rename to haiku-apps/caya_gpl_protocols/caya-gpl-protocols-36.recipe
diff --git a/haiku-apps/caya-gpl-protocols/patches/caya-gpl-protocols-0.HEAD.patch b/haiku-apps/caya_gpl_protocols/patches/caya-gpl-protocols-0.HEAD.patch
similarity index 100%
rename from haiku-apps/caya-gpl-protocols/patches/caya-gpl-protocols-0.HEAD.patch
rename to haiku-apps/caya_gpl_protocols/patches/caya-gpl-protocols-0.HEAD.patch
diff --git a/haiku-apps/open-sum-it/open-sum-it-108.recipe b/haiku-apps/open_sum_it/open-sum-it-108.recipe
similarity index 100%
rename from haiku-apps/open-sum-it/open-sum-it-108.recipe
rename to haiku-apps/open_sum_it/open-sum-it-108.recipe
diff --git a/media-fonts/arabeyes-fonts/arabeyes-fonts-1.1.recipe b/media-fonts/arabeyes_fonts/arabeyes-fonts-1.1.recipe
similarity index 100%
rename from media-fonts/arabeyes-fonts/arabeyes-fonts-1.1.recipe
rename to media-fonts/arabeyes_fonts/arabeyes-fonts-1.1.recipe
diff --git a/media-fonts/courier-prime/courier-prime-1.0.recipe b/media-fonts/courier_prime/courier-prime-1.0.recipe
similarity index 100%
rename from media-fonts/courier-prime/courier-prime-1.0.recipe
rename to media-fonts/courier_prime/courier-prime-1.0.recipe
diff --git a/media-fonts/courier-prime/licenses/SIL Open Font License v1.1 b/media-fonts/courier_prime/licenses/SIL Open Font License v1.1
similarity index 100%
rename from media-fonts/courier-prime/licenses/SIL Open Font License v1.1
rename to media-fonts/courier_prime/licenses/SIL Open Font License v1.1
diff --git a/media-fonts/farsi-fonts/farsi-fonts-0.4.recipe b/media-fonts/farsi_fonts/farsi-fonts-0.4.recipe
similarity index 100%
rename from media-fonts/farsi-fonts/farsi-fonts-0.4.recipe
rename to media-fonts/farsi_fonts/farsi-fonts-0.4.recipe
diff --git a/media-fonts/kacst-fonts/kacst-fonts-5.0.recipe b/media-fonts/kacst_fonts/kacst-fonts-5.0.recipe
similarity index 100%
rename from media-fonts/kacst-fonts/kacst-fonts-5.0.recipe
rename to media-fonts/kacst_fonts/kacst-fonts-5.0.recipe
diff --git a/media-fonts/lateef-font/lateef-font-1.001.recipe b/media-fonts/lateef_font/lateef-font-1.001.recipe
similarity index 100%
rename from media-fonts/lateef-font/lateef-font-1.001.recipe
rename to media-fonts/lateef_font/lateef-font-1.001.recipe
diff --git a/media-fonts/lateef-font/licenses/SIL Open Font License v1.1 b/media-fonts/lateef_font/licenses/SIL Open Font License v1.1
similarity index 100%
rename from media-fonts/lateef-font/licenses/SIL Open Font License v1.1
rename to media-fonts/lateef_font/licenses/SIL Open Font License v1.1
diff --git a/media-fonts/liberation-fonts/liberation-fonts-1.06.0.20100721.recipe b/media-fonts/liberation_fonts/liberation-fonts-1.06.0.20100721.recipe
similarity index 100%
rename from media-fonts/liberation-fonts/liberation-fonts-1.06.0.20100721.recipe
rename to media-fonts/liberation_fonts/liberation-fonts-1.06.0.20100721.recipe
diff --git a/media-fonts/liberation-fonts/licenses/Liberation Exceptions b/media-fonts/liberation_fonts/licenses/Liberation Exceptions
similarity index 100%
rename from media-fonts/liberation-fonts/licenses/Liberation Exceptions
rename to media-fonts/liberation_fonts/licenses/Liberation Exceptions
diff --git a/media-fonts/nafees-nastaleeq/licenses/CRULP b/media-fonts/nafees_nastaleeq/licenses/CRULP
similarity index 100%
rename from media-fonts/nafees-nastaleeq/licenses/CRULP
rename to media-fonts/nafees_nastaleeq/licenses/CRULP
diff --git a/media-fonts/nafees-nastaleeq/nafees-nastaleeq-1.02.recipe b/media-fonts/nafees_nastaleeq/nafees-nastaleeq-1.02.recipe
similarity index 100%
rename from media-fonts/nafees-nastaleeq/nafees-nastaleeq-1.02.recipe
rename to media-fonts/nafees_nastaleeq/nafees-nastaleeq-1.02.recipe
diff --git a/media-fonts/nafees-riqa/licenses/CRULP b/media-fonts/nafees_riqa/licenses/CRULP
similarity index 100%
rename from media-fonts/nafees-riqa/licenses/CRULP
rename to media-fonts/nafees_riqa/licenses/CRULP
diff --git a/media-fonts/nafees-riqa/nafees-riqa-1.00.recipe b/media-fonts/nafees_riqa/nafees-riqa-1.00.recipe
similarity index 100%
rename from media-fonts/nafees-riqa/nafees-riqa-1.00.recipe
rename to media-fonts/nafees_riqa/nafees-riqa-1.00.recipe
diff --git a/media-fonts/scheherazade-font/licenses/SIL Open Font License v1.1 b/media-fonts/scheherazade_font/licenses/SIL Open Font License v1.1
similarity index 100%
rename from media-fonts/scheherazade-font/licenses/SIL Open Font License v1.1
rename to media-fonts/scheherazade_font/licenses/SIL Open Font License v1.1
diff --git a/media-fonts/scheherazade-font/scheherazade-font-1.005.recipe b/media-fonts/scheherazade_font/scheherazade-font-1.005.recipe
similarity index 100%
rename from media-fonts/scheherazade-font/scheherazade-font-1.005.recipe
rename to media-fonts/scheherazade_font/scheherazade-font-1.005.recipe
diff --git a/media-fonts/wqy-microhei/wqy-microhei-0.2.0-beta.recipe b/media-fonts/wqy_microhei/wqy-microhei-0.2.0-beta.recipe
similarity index 100%
rename from media-fonts/wqy-microhei/wqy-microhei-0.2.0-beta.recipe
rename to media-fonts/wqy_microhei/wqy-microhei-0.2.0-beta.recipe
diff --git a/media-fonts/wqy-zenhei/licenses/GNU GPL v2 with font embedding exception b/media-fonts/wqy_zenhei/licenses/GNU GPL v2 with font embedding exception
similarity index 100%
rename from media-fonts/wqy-zenhei/licenses/GNU GPL v2 with font embedding exception
rename to media-fonts/wqy_zenhei/licenses/GNU GPL v2 with font embedding exception
diff --git a/media-fonts/wqy-zenhei/wqy-zenhei-0.9.45.recipe b/media-fonts/wqy_zenhei/wqy-zenhei-0.9.45.recipe
similarity index 100%
rename from media-fonts/wqy-zenhei/wqy-zenhei-0.9.45.recipe
rename to media-fonts/wqy_zenhei/wqy-zenhei-0.9.45.recipe
diff --git a/media-fonts/x-series-fonts/x-series-fonts-2.0.recipe b/media-fonts/x_series_fonts/x-series-fonts-2.0.recipe
similarity index 100%
rename from media-fonts/x-series-fonts/x-series-fonts-2.0.recipe
rename to media-fonts/x_series_fonts/x-series-fonts-2.0.recipe
diff --git a/media-gfx/sane-backends/patches/sane-backends-1.0.21.patch b/media-gfx/sane_backends/patches/sane-backends-1.0.21.patch
similarity index 100%
rename from media-gfx/sane-backends/patches/sane-backends-1.0.21.patch
rename to media-gfx/sane_backends/patches/sane-backends-1.0.21.patch
diff --git a/media-libs/ladspa-sdk/ladspa-sdk-1.13.recipe b/media-libs/ladspa_sdk/ladspa-sdk-1.13.recipe
similarity index 100%
rename from media-libs/ladspa-sdk/ladspa-sdk-1.13.recipe
rename to media-libs/ladspa_sdk/ladspa-sdk-1.13.recipe
diff --git a/media-libs/ladspa-sdk/patches/ladspa-sdk-1.13.patch b/media-libs/ladspa_sdk/patches/ladspa-sdk-1.13.patch
similarity index 100%
rename from media-libs/ladspa-sdk/patches/ladspa-sdk-1.13.patch
rename to media-libs/ladspa_sdk/patches/ladspa-sdk-1.13.patch
diff --git a/media-libs/sdl-gfx/patches/sdl-gfx-2.0.20.patch b/media-libs/sdl_gfx/patches/sdl-gfx-2.0.20.patch
similarity index 100%
rename from media-libs/sdl-gfx/patches/sdl-gfx-2.0.20.patch
rename to media-libs/sdl_gfx/patches/sdl-gfx-2.0.20.patch
diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.20.recipe b/media-libs/sdl_gfx/sdl-gfx-2.0.20.recipe
similarity index 100%
rename from media-libs/sdl-gfx/sdl-gfx-2.0.20.recipe
rename to media-libs/sdl_gfx/sdl-gfx-2.0.20.recipe
diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.22.recipe b/media-libs/sdl_gfx/sdl-gfx-2.0.22.recipe
similarity index 100%
rename from media-libs/sdl-gfx/sdl-gfx-2.0.22.recipe
rename to media-libs/sdl_gfx/sdl-gfx-2.0.22.recipe
diff --git a/media-libs/sdl-gfx/sdl-gfx-2.0.23.recipe b/media-libs/sdl_gfx/sdl-gfx-2.0.23.recipe
similarity index 100%
rename from media-libs/sdl-gfx/sdl-gfx-2.0.23.recipe
rename to media-libs/sdl_gfx/sdl-gfx-2.0.23.recipe
diff --git a/media-libs/sdl-image/sdl-image-1.2-hg.recipe b/media-libs/sdl_image/sdl-image-1.2-hg.recipe
similarity index 100%
rename from media-libs/sdl-image/sdl-image-1.2-hg.recipe
rename to media-libs/sdl_image/sdl-image-1.2-hg.recipe
diff --git a/media-libs/sdl-image/sdl-image-1.2.10.recipe b/media-libs/sdl_image/sdl-image-1.2.10.recipe
similarity index 100%
rename from media-libs/sdl-image/sdl-image-1.2.10.recipe
rename to media-libs/sdl_image/sdl-image-1.2.10.recipe
diff --git a/media-libs/sdl-image/sdl-image-1.2.12.recipe b/media-libs/sdl_image/sdl-image-1.2.12.recipe
similarity index 100%
rename from media-libs/sdl-image/sdl-image-1.2.12.recipe
rename to media-libs/sdl_image/sdl-image-1.2.12.recipe
diff --git a/media-libs/sdl-image/sdl-image-1.2.6.recipe b/media-libs/sdl_image/sdl-image-1.2.6.recipe
similarity index 100%
rename from media-libs/sdl-image/sdl-image-1.2.6.recipe
rename to media-libs/sdl_image/sdl-image-1.2.6.recipe
diff --git a/media-libs/sdl-image/sdl-image-1.2.8.recipe b/media-libs/sdl_image/sdl-image-1.2.8.recipe
similarity index 100%
rename from media-libs/sdl-image/sdl-image-1.2.8.recipe
rename to media-libs/sdl_image/sdl-image-1.2.8.recipe
diff --git a/media-libs/sdl-image/sdl-image-1.2.9.recipe b/media-libs/sdl_image/sdl-image-1.2.9.recipe
similarity index 100%
rename from media-libs/sdl-image/sdl-image-1.2.9.recipe
rename to media-libs/sdl_image/sdl-image-1.2.9.recipe
diff --git a/media-libs/sdl-image/sdl-image.OptionalPackageDescription b/media-libs/sdl_image/sdl-image.OptionalPackageDescription
similarity index 100%
rename from media-libs/sdl-image/sdl-image.OptionalPackageDescription
rename to media-libs/sdl_image/sdl-image.OptionalPackageDescription
diff --git a/media-libs/sdl-libpak/sdl-libpak.OptionalPackageDescription b/media-libs/sdl_libpak/sdl-libpak.OptionalPackageDescription
similarity index 100%
rename from media-libs/sdl-libpak/sdl-libpak.OptionalPackageDescription
rename to media-libs/sdl_libpak/sdl-libpak.OptionalPackageDescription
diff --git a/media-libs/sdl-mixer/patches/sdl-mixer-1.2.11.patch b/media-libs/sdl_mixer/patches/sdl-mixer-1.2.11.patch
similarity index 100%
rename from media-libs/sdl-mixer/patches/sdl-mixer-1.2.11.patch
rename to media-libs/sdl_mixer/patches/sdl-mixer-1.2.11.patch
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2-hg.recipe b/media-libs/sdl_mixer/sdl-mixer-1.2-hg.recipe
similarity index 100%
rename from media-libs/sdl-mixer/sdl-mixer-1.2-hg.recipe
rename to media-libs/sdl_mixer/sdl-mixer-1.2-hg.recipe
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.10.recipe b/media-libs/sdl_mixer/sdl-mixer-1.2.10.recipe
similarity index 100%
rename from media-libs/sdl-mixer/sdl-mixer-1.2.10.recipe
rename to media-libs/sdl_mixer/sdl-mixer-1.2.10.recipe
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.11.recipe b/media-libs/sdl_mixer/sdl-mixer-1.2.11.recipe
similarity index 100%
rename from media-libs/sdl-mixer/sdl-mixer-1.2.11.recipe
rename to media-libs/sdl_mixer/sdl-mixer-1.2.11.recipe
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12.recipe b/media-libs/sdl_mixer/sdl-mixer-1.2.12.recipe
similarity index 100%
rename from media-libs/sdl-mixer/sdl-mixer-1.2.12.recipe
rename to media-libs/sdl_mixer/sdl-mixer-1.2.12.recipe
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.9.recipe b/media-libs/sdl_mixer/sdl-mixer-1.2.9.recipe
similarity index 100%
rename from media-libs/sdl-mixer/sdl-mixer-1.2.9.recipe
rename to media-libs/sdl_mixer/sdl-mixer-1.2.9.recipe
diff --git a/media-libs/sdl-net/patches/sdl-net-1.2.7.patch b/media-libs/sdl_net/patches/sdl-net-1.2.7.patch
similarity index 100%
rename from media-libs/sdl-net/patches/sdl-net-1.2.7.patch
rename to media-libs/sdl_net/patches/sdl-net-1.2.7.patch
diff --git a/media-libs/sdl-net/patches/sdl-net-1.2.8.patch b/media-libs/sdl_net/patches/sdl-net-1.2.8.patch
similarity index 100%
rename from media-libs/sdl-net/patches/sdl-net-1.2.8.patch
rename to media-libs/sdl_net/patches/sdl-net-1.2.8.patch
diff --git a/media-libs/sdl-net/sdl-net-1.2-hg.recipe b/media-libs/sdl_net/sdl-net-1.2-hg.recipe
similarity index 100%
rename from media-libs/sdl-net/sdl-net-1.2-hg.recipe
rename to media-libs/sdl_net/sdl-net-1.2-hg.recipe
diff --git a/media-libs/sdl-net/sdl-net-1.2.7.recipe b/media-libs/sdl_net/sdl-net-1.2.7.recipe
similarity index 100%
rename from media-libs/sdl-net/sdl-net-1.2.7.recipe
rename to media-libs/sdl_net/sdl-net-1.2.7.recipe
diff --git a/media-libs/sdl-net/sdl-net-1.2.8.recipe b/media-libs/sdl_net/sdl-net-1.2.8.recipe
similarity index 100%
rename from media-libs/sdl-net/sdl-net-1.2.8.recipe
rename to media-libs/sdl_net/sdl-net-1.2.8.recipe
diff --git a/media-libs/sdl-rtf/sdl-rtf-0.1.0.recipe b/media-libs/sdl_rtf/sdl-rtf-0.1.0.recipe
similarity index 100%
rename from media-libs/sdl-rtf/sdl-rtf-0.1.0.recipe
rename to media-libs/sdl_rtf/sdl-rtf-0.1.0.recipe
diff --git a/media-libs/sdl-sound/sdl-sound-1.0-hg.recipe b/media-libs/sdl_sound/sdl-sound-1.0-hg.recipe
similarity index 100%
rename from media-libs/sdl-sound/sdl-sound-1.0-hg.recipe
rename to media-libs/sdl_sound/sdl-sound-1.0-hg.recipe
diff --git a/media-libs/sdl-sound/sdl-sound-1.0.3.recipe b/media-libs/sdl_sound/sdl-sound-1.0.3.recipe
similarity index 100%
rename from media-libs/sdl-sound/sdl-sound-1.0.3.recipe
rename to media-libs/sdl_sound/sdl-sound-1.0.3.recipe
diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0-hg.recipe b/media-libs/sdl_ttf/sdl-ttf-2.0-hg.recipe
similarity index 100%
rename from media-libs/sdl-ttf/sdl-ttf-2.0-hg.recipe
rename to media-libs/sdl_ttf/sdl-ttf-2.0-hg.recipe
diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.10.recipe b/media-libs/sdl_ttf/sdl-ttf-2.0.10.recipe
similarity index 100%
rename from media-libs/sdl-ttf/sdl-ttf-2.0.10.recipe
rename to media-libs/sdl_ttf/sdl-ttf-2.0.10.recipe
diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.11.recipe b/media-libs/sdl_ttf/sdl-ttf-2.0.11.recipe
similarity index 100%
rename from media-libs/sdl-ttf/sdl-ttf-2.0.11.recipe
rename to media-libs/sdl_ttf/sdl-ttf-2.0.11.recipe
diff --git a/media-libs/sdl-ttf/sdl-ttf-2.0.9.recipe b/media-libs/sdl_ttf/sdl-ttf-2.0.9.recipe
similarity index 100%
rename from media-libs/sdl-ttf/sdl-ttf-2.0.9.recipe
rename to media-libs/sdl_ttf/sdl-ttf-2.0.9.recipe
diff --git a/media-sound/gogo-no-coda/gogo-no-coda-3.13.recipe b/media-sound/gogo_no_coda/gogo-no-coda-3.13.recipe
similarity index 100%
rename from media-sound/gogo-no-coda/gogo-no-coda-3.13.recipe
rename to media-sound/gogo_no_coda/gogo-no-coda-3.13.recipe
diff --git a/media-sound/gogo-no-coda/patches/gogo-no-coda-3.13.patch b/media-sound/gogo_no_coda/patches/gogo-no-coda-3.13.patch
similarity index 100%
rename from media-sound/gogo-no-coda/patches/gogo-no-coda-3.13.patch
rename to media-sound/gogo_no_coda/patches/gogo-no-coda-3.13.patch
diff --git a/media-sound/vorbis-tools/patches/vorbis-tools-1.2.0.patch b/media-sound/vorbis_tools/patches/vorbis-tools-1.2.0.patch
similarity index 100%
rename from media-sound/vorbis-tools/patches/vorbis-tools-1.2.0.patch
rename to media-sound/vorbis_tools/patches/vorbis-tools-1.2.0.patch
diff --git a/media-sound/vorbis-tools/patches/vorbis-tools-1.4.0.patch b/media-sound/vorbis_tools/patches/vorbis-tools-1.4.0.patch
similarity index 100%
rename from media-sound/vorbis-tools/patches/vorbis-tools-1.4.0.patch
rename to media-sound/vorbis_tools/patches/vorbis-tools-1.4.0.patch
diff --git a/media-sound/vorbis-tools/vorbis-tools-1.2.0.recipe b/media-sound/vorbis_tools/vorbis-tools-1.2.0.recipe
similarity index 100%
rename from media-sound/vorbis-tools/vorbis-tools-1.2.0.recipe
rename to media-sound/vorbis_tools/vorbis-tools-1.2.0.recipe
diff --git a/media-sound/vorbis-tools/vorbis-tools-1.4.0.recipe b/media-sound/vorbis_tools/vorbis-tools-1.4.0.recipe
similarity index 100%
rename from media-sound/vorbis-tools/vorbis-tools-1.4.0.recipe
rename to media-sound/vorbis_tools/vorbis-tools-1.4.0.recipe
diff --git a/net-irc/rhapsody-irc/patches/rhapsody-irc-0.28b.patch b/net-irc/rhapsody_irc/patches/rhapsody-irc-0.28b.patch
similarity index 100%
rename from net-irc/rhapsody-irc/patches/rhapsody-irc-0.28b.patch
rename to net-irc/rhapsody_irc/patches/rhapsody-irc-0.28b.patch
diff --git a/net-irc/rhapsody-irc/rhapsody-irc-0.28b.recipe b/net-irc/rhapsody_irc/rhapsody-irc-0.28b.recipe
similarity index 100%
rename from net-irc/rhapsody-irc/rhapsody-irc-0.28b.recipe
rename to net-irc/rhapsody_irc/rhapsody-irc-0.28b.recipe
diff --git a/net-wireless/b43-fwcutter/b43-fwcutter-012.recipe b/net-wireless/b43_fwcutter/b43-fwcutter-012.recipe
similarity index 100%
rename from net-wireless/b43-fwcutter/b43-fwcutter-012.recipe
rename to net-wireless/b43_fwcutter/b43-fwcutter-012.recipe
diff --git a/net-wireless/b43-fwcutter/patches/b43-fwcutter-012.patch b/net-wireless/b43_fwcutter/patches/b43-fwcutter-012.patch
similarity index 100%
rename from net-wireless/b43-fwcutter/patches/b43-fwcutter-012.patch
rename to net-wireless/b43_fwcutter/patches/b43-fwcutter-012.patch
diff --git a/www-client/mozilla-firefox/TinnyTim.sh b/www-client/mozilla_firefox/TinnyTim.sh
similarity index 100%
rename from www-client/mozilla-firefox/TinnyTim.sh
rename to www-client/mozilla_firefox/TinnyTim.sh
diff --git a/www-client/mozilla-firefox/bezilla-patches-2009-07-07.diff b/www-client/mozilla_firefox/bezilla-patches-2009-07-07.diff
similarity index 100%
rename from www-client/mozilla-firefox/bezilla-patches-2009-07-07.diff
rename to www-client/mozilla_firefox/bezilla-patches-2009-07-07.diff
diff --git a/www-client/mozilla-firefox/bookmarks.html b/www-client/mozilla_firefox/bookmarks.html
similarity index 100%
rename from www-client/mozilla-firefox/bookmarks.html
rename to www-client/mozilla_firefox/bookmarks.html
diff --git a/www-client/mozilla-firefox/classic.jar b/www-client/mozilla_firefox/classic.jar
similarity index 100%
rename from www-client/mozilla-firefox/classic.jar
rename to www-client/mozilla_firefox/classic.jar
diff --git a/www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/app/apprunner-beos.rdef b/www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/app/apprunner-beos.rdef
similarity index 100%
rename from www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/app/apprunner-beos.rdef
rename to www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/app/apprunner-beos.rdef
diff --git a/www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-bebook-v1.html b/www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-bebook-v1.html
similarity index 100%
rename from www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-bebook-v1.html
rename to www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-bebook-v1.html
diff --git a/www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-bebook-v2.html b/www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-bebook-v2.html
similarity index 100%
rename from www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-bebook-v2.html
rename to www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-bebook-v2.html
diff --git a/www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-userguide-v1.html b/www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-userguide-v1.html
similarity index 100%
rename from www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-userguide-v1.html
rename to www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-userguide-v1.html
diff --git a/www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-userguide-v2.html b/www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-userguide-v2.html
similarity index 100%
rename from www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-userguide-v2.html
rename to www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-userguide-v2.html
diff --git a/www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-welcome-v1.html b/www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-welcome-v1.html
similarity index 100%
rename from www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-welcome-v1.html
rename to www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-welcome-v1.html
diff --git a/www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-welcome-v2.html b/www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-welcome-v2.html
similarity index 100%
rename from www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-welcome-v2.html
rename to www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/base/content/dynamic-welcome-v2.html
diff --git a/www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/installer/beos/packages-static b/www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/installer/beos/packages-static
similarity index 100%
rename from www-client/mozilla-firefox/copy-to-mozilla-src-dir/browser/installer/beos/packages-static
rename to www-client/mozilla_firefox/copy-to-mozilla-src-dir/browser/installer/beos/packages-static
diff --git a/www-client/mozilla-firefox/copy-to-mozilla-src-dir/calendar/sunbird/app/apprunner-beos.rdef b/www-client/mozilla_firefox/copy-to-mozilla-src-dir/calendar/sunbird/app/apprunner-beos.rdef
similarity index 100%
rename from www-client/mozilla-firefox/copy-to-mozilla-src-dir/calendar/sunbird/app/apprunner-beos.rdef
rename to www-client/mozilla_firefox/copy-to-mozilla-src-dir/calendar/sunbird/app/apprunner-beos.rdef
diff --git a/www-client/mozilla-firefox/copy-to-mozilla-src-dir/calendar/sunbird/app/apprunner-beos.rsrc b/www-client/mozilla_firefox/copy-to-mozilla-src-dir/calendar/sunbird/app/apprunner-beos.rsrc
similarity index 100%
rename from www-client/mozilla-firefox/copy-to-mozilla-src-dir/calendar/sunbird/app/apprunner-beos.rsrc
rename to www-client/mozilla_firefox/copy-to-mozilla-src-dir/calendar/sunbird/app/apprunner-beos.rsrc
diff --git a/www-client/mozilla-firefox/copy-to-mozilla-src-dir/mail/app/apprunner-beos.rdef b/www-client/mozilla_firefox/copy-to-mozilla-src-dir/mail/app/apprunner-beos.rdef
similarity index 100%
rename from www-client/mozilla-firefox/copy-to-mozilla-src-dir/mail/app/apprunner-beos.rdef
rename to www-client/mozilla_firefox/copy-to-mozilla-src-dir/mail/app/apprunner-beos.rdef
diff --git a/www-client/mozilla-firefox/copy-to-mozilla-src-dir/xpfe/bootstrap/apprunner-beos.rdef b/www-client/mozilla_firefox/copy-to-mozilla-src-dir/xpfe/bootstrap/apprunner-beos.rdef
similarity index 100%
rename from www-client/mozilla-firefox/copy-to-mozilla-src-dir/xpfe/bootstrap/apprunner-beos.rdef
rename to www-client/mozilla_firefox/copy-to-mozilla-src-dir/xpfe/bootstrap/apprunner-beos.rdef
diff --git a/www-client/mozilla-firefox/hvif-icons/BeZilla-Browser-l b/www-client/mozilla_firefox/hvif-icons/BeZilla-Browser-l
similarity index 100%
rename from www-client/mozilla-firefox/hvif-icons/BeZilla-Browser-l
rename to www-client/mozilla_firefox/hvif-icons/BeZilla-Browser-l
diff --git a/www-client/mozilla-firefox/hvif-icons/BeZilla-Browser-r b/www-client/mozilla_firefox/hvif-icons/BeZilla-Browser-r
similarity index 100%
rename from www-client/mozilla-firefox/hvif-icons/BeZilla-Browser-r
rename to www-client/mozilla_firefox/hvif-icons/BeZilla-Browser-r
diff --git a/www-client/mozilla-firefox/hvif-icons/BeZilla-MailNews b/www-client/mozilla_firefox/hvif-icons/BeZilla-MailNews
similarity index 100%
rename from www-client/mozilla-firefox/hvif-icons/BeZilla-MailNews
rename to www-client/mozilla_firefox/hvif-icons/BeZilla-MailNews
diff --git a/www-client/mozilla-firefox/hvif-icons/BeZilla-MailNews-r b/www-client/mozilla_firefox/hvif-icons/BeZilla-MailNews-r
similarity index 100%
rename from www-client/mozilla-firefox/hvif-icons/BeZilla-MailNews-r
rename to www-client/mozilla_firefox/hvif-icons/BeZilla-MailNews-r
diff --git a/www-client/mozilla-firefox/hvif-icons/BeZilla-Suite-l b/www-client/mozilla_firefox/hvif-icons/BeZilla-Suite-l
similarity index 100%
rename from www-client/mozilla-firefox/hvif-icons/BeZilla-Suite-l
rename to www-client/mozilla_firefox/hvif-icons/BeZilla-Suite-l
diff --git a/www-client/mozilla-firefox/hvif-icons/BeZilla-Suite-r b/www-client/mozilla_firefox/hvif-icons/BeZilla-Suite-r
similarity index 100%
rename from www-client/mozilla-firefox/hvif-icons/BeZilla-Suite-r
rename to www-client/mozilla_firefox/hvif-icons/BeZilla-Suite-r
diff --git a/www-client/mozilla-firefox/hvif-icons/BeZilla-calendar-l b/www-client/mozilla_firefox/hvif-icons/BeZilla-calendar-l
similarity index 100%
rename from www-client/mozilla-firefox/hvif-icons/BeZilla-calendar-l
rename to www-client/mozilla_firefox/hvif-icons/BeZilla-calendar-l
diff --git a/www-client/mozilla-firefox/hvif-icons/BeZilla-calendar-r b/www-client/mozilla_firefox/hvif-icons/BeZilla-calendar-r
similarity index 100%
rename from www-client/mozilla-firefox/hvif-icons/BeZilla-calendar-r
rename to www-client/mozilla_firefox/hvif-icons/BeZilla-calendar-r
diff --git a/www-client/mozilla-firefox/hvif-icons/bezilla-1 copy b/www-client/mozilla_firefox/hvif-icons/bezilla-1 copy
similarity index 100%
rename from www-client/mozilla-firefox/hvif-icons/bezilla-1 copy
rename to www-client/mozilla_firefox/hvif-icons/bezilla-1 copy
diff --git a/www-client/mozilla-firefox/hvif-icons/icon_copyright/copyleft.txt b/www-client/mozilla_firefox/hvif-icons/icon_copyright/copyleft.txt
similarity index 100%
rename from www-client/mozilla-firefox/hvif-icons/icon_copyright/copyleft.txt
rename to www-client/mozilla_firefox/hvif-icons/icon_copyright/copyleft.txt
diff --git a/www-client/mozilla-firefox/hvif-icons/icon_copyright/copyright_info.txt b/www-client/mozilla_firefox/hvif-icons/icon_copyright/copyright_info.txt
similarity index 100%
rename from www-client/mozilla-firefox/hvif-icons/icon_copyright/copyright_info.txt
rename to www-client/mozilla_firefox/hvif-icons/icon_copyright/copyright_info.txt
diff --git a/www-client/mozilla-firefox/old-patches/allO1.patch b/www-client/mozilla_firefox/old-patches/allO1.patch
similarity index 100%
rename from www-client/mozilla-firefox/old-patches/allO1.patch
rename to www-client/mozilla_firefox/old-patches/allO1.patch
diff --git a/www-client/mozilla-firefox/old-patches/allO3.patch b/www-client/mozilla_firefox/old-patches/allO3.patch
similarity index 100%
rename from www-client/mozilla-firefox/old-patches/allO3.patch
rename to www-client/mozilla_firefox/old-patches/allO3.patch
diff --git a/www-client/mozilla-firefox/old-patches/configure-sunbird-nspr-reorder.diff b/www-client/mozilla_firefox/old-patches/configure-sunbird-nspr-reorder.diff
similarity index 100%
rename from www-client/mozilla-firefox/old-patches/configure-sunbird-nspr-reorder.diff
rename to www-client/mozilla_firefox/old-patches/configure-sunbird-nspr-reorder.diff
diff --git a/www-client/mozilla-firefox/old-patches/firstrun-default-page.diff b/www-client/mozilla_firefox/old-patches/firstrun-default-page.diff
similarity index 100%
rename from www-client/mozilla-firefox/old-patches/firstrun-default-page.diff
rename to www-client/mozilla_firefox/old-patches/firstrun-default-page.diff
diff --git a/www-client/mozilla-firefox/old-patches/forReorderPatches-browser.zip b/www-client/mozilla_firefox/old-patches/forReorderPatches-browser.zip
similarity index 100%
rename from www-client/mozilla-firefox/old-patches/forReorderPatches-browser.zip
rename to www-client/mozilla_firefox/old-patches/forReorderPatches-browser.zip
diff --git a/www-client/mozilla-firefox/old-patches/greyMenuSelection.patch b/www-client/mozilla_firefox/old-patches/greyMenuSelection.patch
similarity index 100%
rename from www-client/mozilla-firefox/old-patches/greyMenuSelection.patch
rename to www-client/mozilla_firefox/old-patches/greyMenuSelection.patch
diff --git a/www-client/mozilla-firefox/old-patches/launch-kill-dowhile.patch b/www-client/mozilla_firefox/old-patches/launch-kill-dowhile.patch
similarity index 100%
rename from www-client/mozilla-firefox/old-patches/launch-kill-dowhile.patch
rename to www-client/mozilla_firefox/old-patches/launch-kill-dowhile.patch
diff --git a/www-client/mozilla-firefox/old-patches/mozilla-rdefs.zip b/www-client/mozilla_firefox/old-patches/mozilla-rdefs.zip
similarity index 100%
rename from www-client/mozilla-firefox/old-patches/mozilla-rdefs.zip
rename to www-client/mozilla_firefox/old-patches/mozilla-rdefs.zip
diff --git a/www-client/mozilla-firefox/old-patches/nsAppRunner.patch b/www-client/mozilla_firefox/old-patches/nsAppRunner.patch
similarity index 100%
rename from www-client/mozilla-firefox/old-patches/nsAppRunner.patch
rename to www-client/mozilla_firefox/old-patches/nsAppRunner.patch
diff --git a/www-client/mozilla-firefox/old-patches/prpolevt-fix.patch b/www-client/mozilla_firefox/old-patches/prpolevt-fix.patch
similarity index 100%
rename from www-client/mozilla-firefox/old-patches/prpolevt-fix.patch
rename to www-client/mozilla_firefox/old-patches/prpolevt-fix.patch
diff --git a/www-client/mozilla-firefox/old-patches/sunbird-makefile-apprunner-rsrc.zip b/www-client/mozilla_firefox/old-patches/sunbird-makefile-apprunner-rsrc.zip
similarity index 100%
rename from www-client/mozilla-firefox/old-patches/sunbird-makefile-apprunner-rsrc.zip
rename to www-client/mozilla_firefox/old-patches/sunbird-makefile-apprunner-rsrc.zip
diff --git a/www-client/mozilla-firefox/patches/2009-09-27/bezilla.step-by-step.txt b/www-client/mozilla_firefox/patches/2009-09-27/bezilla.step-by-step.txt
similarity index 100%
rename from www-client/mozilla-firefox/patches/2009-09-27/bezilla.step-by-step.txt
rename to www-client/mozilla_firefox/patches/2009-09-27/bezilla.step-by-step.txt
diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r01-config-star.patch b/www-client/mozilla_firefox/patches/2009-09-27/r01-config-star.patch
similarity index 100%
rename from www-client/mozilla-firefox/patches/2009-09-27/r01-config-star.patch
rename to www-client/mozilla_firefox/patches/2009-09-27/r01-config-star.patch
diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r02-configure-in-withGCC4andCrossCompile.patch b/www-client/mozilla_firefox/patches/2009-09-27/r02-configure-in-withGCC4andCrossCompile.patch
similarity index 100%
rename from www-client/mozilla-firefox/patches/2009-09-27/r02-configure-in-withGCC4andCrossCompile.patch
rename to www-client/mozilla_firefox/patches/2009-09-27/r02-configure-in-withGCC4andCrossCompile.patch
diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r03a-makefile-in.patch b/www-client/mozilla_firefox/patches/2009-09-27/r03a-makefile-in.patch
similarity index 100%
rename from www-client/mozilla-firefox/patches/2009-09-27/r03a-makefile-in.patch
rename to www-client/mozilla_firefox/patches/2009-09-27/r03a-makefile-in.patch
diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r03b-starmk.patch b/www-client/mozilla_firefox/patches/2009-09-27/r03b-starmk.patch
similarity index 100%
rename from www-client/mozilla-firefox/patches/2009-09-27/r03b-starmk.patch
rename to www-client/mozilla_firefox/patches/2009-09-27/r03b-starmk.patch
diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r04a-rdef-support-in-Makefile.patch b/www-client/mozilla_firefox/patches/2009-09-27/r04a-rdef-support-in-Makefile.patch
similarity index 100%
rename from www-client/mozilla-firefox/patches/2009-09-27/r04a-rdef-support-in-Makefile.patch
rename to www-client/mozilla_firefox/patches/2009-09-27/r04a-rdef-support-in-Makefile.patch
diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r04b-just-rdefs-no-Makefile.patch b/www-client/mozilla_firefox/patches/2009-09-27/r04b-just-rdefs-no-Makefile.patch
similarity index 100%
rename from www-client/mozilla-firefox/patches/2009-09-27/r04b-just-rdefs-no-Makefile.patch
rename to www-client/mozilla_firefox/patches/2009-09-27/r04b-just-rdefs-no-Makefile.patch
diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r05-fix-shlibsign.README b/www-client/mozilla_firefox/patches/2009-09-27/r05-fix-shlibsign.README
similarity index 100%
rename from www-client/mozilla-firefox/patches/2009-09-27/r05-fix-shlibsign.README
rename to www-client/mozilla_firefox/patches/2009-09-27/r05-fix-shlibsign.README
diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r05-fix-shlibsign.patch b/www-client/mozilla_firefox/patches/2009-09-27/r05-fix-shlibsign.patch
similarity index 100%
rename from www-client/mozilla-firefox/patches/2009-09-27/r05-fix-shlibsign.patch
rename to www-client/mozilla_firefox/patches/2009-09-27/r05-fix-shlibsign.patch
diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r06-nss-gcc4.patch b/www-client/mozilla_firefox/patches/2009-09-27/r06-nss-gcc4.patch
similarity index 100%
rename from www-client/mozilla-firefox/patches/2009-09-27/r06-nss-gcc4.patch
rename to www-client/mozilla_firefox/patches/2009-09-27/r06-nss-gcc4.patch
diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r07-working-nspr-from-haikuports.patch b/www-client/mozilla_firefox/patches/2009-09-27/r07-working-nspr-from-haikuports.patch
similarity index 100%
rename from www-client/mozilla-firefox/patches/2009-09-27/r07-working-nspr-from-haikuports.patch
rename to www-client/mozilla_firefox/patches/2009-09-27/r07-working-nspr-from-haikuports.patch
diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r08-misc.patch b/www-client/mozilla_firefox/patches/2009-09-27/r08-misc.patch
similarity index 100%
rename from www-client/mozilla-firefox/patches/2009-09-27/r08-misc.patch
rename to www-client/mozilla_firefox/patches/2009-09-27/r08-misc.patch
diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r09-sunbird-options-fix.patch b/www-client/mozilla_firefox/patches/2009-09-27/r09-sunbird-options-fix.patch
similarity index 100%
rename from www-client/mozilla-firefox/patches/2009-09-27/r09-sunbird-options-fix.patch
rename to www-client/mozilla_firefox/patches/2009-09-27/r09-sunbird-options-fix.patch
diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r10-grey-menu-color.patch b/www-client/mozilla_firefox/patches/2009-09-27/r10-grey-menu-color.patch
similarity index 100%
rename from www-client/mozilla-firefox/patches/2009-09-27/r10-grey-menu-color.patch
rename to www-client/mozilla_firefox/patches/2009-09-27/r10-grey-menu-color.patch
diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r11-bookmarks-v2.patch b/www-client/mozilla_firefox/patches/2009-09-27/r11-bookmarks-v2.patch
similarity index 100%
rename from www-client/mozilla-firefox/patches/2009-09-27/r11-bookmarks-v2.patch
rename to www-client/mozilla_firefox/patches/2009-09-27/r11-bookmarks-v2.patch
diff --git a/www-client/mozilla-firefox/patches/2009-09-27/r12-releasenotes.patch b/www-client/mozilla_firefox/patches/2009-09-27/r12-releasenotes.patch
similarity index 100%
rename from www-client/mozilla-firefox/patches/2009-09-27/r12-releasenotes.patch
rename to www-client/mozilla_firefox/patches/2009-09-27/r12-releasenotes.patch
diff --git a/www-client/mozilla-firefox/persdict.dat b/www-client/mozilla_firefox/persdict.dat
similarity index 100%
rename from www-client/mozilla-firefox/persdict.dat
rename to www-client/mozilla_firefox/persdict.dat
diff --git a/www-client/mozilla-firefox/select-a-mozconfig/browser-debug.mozconfig b/www-client/mozilla_firefox/select-a-mozconfig/browser-debug.mozconfig
similarity index 100%
rename from www-client/mozilla-firefox/select-a-mozconfig/browser-debug.mozconfig
rename to www-client/mozilla_firefox/select-a-mozconfig/browser-debug.mozconfig
diff --git a/www-client/mozilla-firefox/select-a-mozconfig/browser.mozconfig b/www-client/mozilla_firefox/select-a-mozconfig/browser.mozconfig
similarity index 100%
rename from www-client/mozilla-firefox/select-a-mozconfig/browser.mozconfig
rename to www-client/mozilla_firefox/select-a-mozconfig/browser.mozconfig
diff --git a/www-client/mozilla-firefox/select-a-mozconfig/calendar.mozconfig b/www-client/mozilla_firefox/select-a-mozconfig/calendar.mozconfig
similarity index 100%
rename from www-client/mozilla-firefox/select-a-mozconfig/calendar.mozconfig
rename to www-client/mozilla_firefox/select-a-mozconfig/calendar.mozconfig
diff --git a/www-client/mozilla-firefox/select-a-mozconfig/mailnews.mozconfig b/www-client/mozilla_firefox/select-a-mozconfig/mailnews.mozconfig
similarity index 100%
rename from www-client/mozilla-firefox/select-a-mozconfig/mailnews.mozconfig
rename to www-client/mozilla_firefox/select-a-mozconfig/mailnews.mozconfig
diff --git a/www-client/mozilla-firefox/select-a-mozconfig/suite-debug.mozconfig b/www-client/mozilla_firefox/select-a-mozconfig/suite-debug.mozconfig
similarity index 100%
rename from www-client/mozilla-firefox/select-a-mozconfig/suite-debug.mozconfig
rename to www-client/mozilla_firefox/select-a-mozconfig/suite-debug.mozconfig
diff --git a/www-client/mozilla-firefox/select-a-mozconfig/suite-just-browser.mozconfig b/www-client/mozilla_firefox/select-a-mozconfig/suite-just-browser.mozconfig
similarity index 100%
rename from www-client/mozilla-firefox/select-a-mozconfig/suite-just-browser.mozconfig
rename to www-client/mozilla_firefox/select-a-mozconfig/suite-just-browser.mozconfig
diff --git a/www-client/mozilla-firefox/select-a-mozconfig/suite.mozconfig b/www-client/mozilla_firefox/select-a-mozconfig/suite.mozconfig
similarity index 100%
rename from www-client/mozilla-firefox/select-a-mozconfig/suite.mozconfig
rename to www-client/mozilla_firefox/select-a-mozconfig/suite.mozconfig
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.0.recipe b/x11-misc/shared_mime_info/shared-mime-info-1.0.recipe
similarity index 100%
rename from x11-misc/shared-mime-info/shared-mime-info-1.0.recipe
rename to x11-misc/shared_mime_info/shared-mime-info-1.0.recipe
diff --git a/x11-misc/util-macros/util-macros-1.17.0-git.recipe b/x11-misc/util_macros/util-macros-1.17.0-git.recipe
similarity index 100%
rename from x11-misc/util-macros/util-macros-1.17.0-git.recipe
rename to x11-misc/util_macros/util-macros-1.17.0-git.recipe
diff --git a/x11-misc/util-macros/util-macros-1.7.0.recipe b/x11-misc/util_macros/util-macros-1.7.0.recipe
similarity index 100%
rename from x11-misc/util-macros/util-macros-1.7.0.recipe
rename to x11-misc/util_macros/util-macros-1.7.0.recipe
diff --git a/x11-proto/xcb-proto/xcb-proto-1.6.recipe b/x11-proto/xcb_proto/xcb-proto-1.6.recipe
similarity index 100%
rename from x11-proto/xcb-proto/xcb-proto-1.6.recipe
rename to x11-proto/xcb_proto/xcb-proto-1.6.recipe