diff --git a/pkgs/development/ocaml-modules/async/default.nix b/pkgs/development/ocaml-modules/async/default.nix
index a813c3f45222..2b84519036c7 100644
--- a/pkgs/development/ocaml-modules/async/default.nix
+++ b/pkgs/development/ocaml-modules/async/default.nix
@@ -1,5 +1,5 @@
-{stdenv, buildOcaml, fetchurl, async-kernel,
- async-unix, async-extra, pa-ounit}:
+{stdenv, buildOcaml, fetchurl, async_kernel,
+ async_unix, async_extra, pa_ounit}:
 
 buildOcaml rec {
   name = "async";
@@ -12,7 +12,7 @@ buildOcaml rec {
     sha256 = "ecc4ca939ab098e689332921b110dbaacd06d9f8d8bf697023dfff3ca37dc1e9";
   };
 
-  propagatedBuildInputs = [ async-kernel async-unix async-extra pa-ounit ];
+  propagatedBuildInputs = [ async_kernel async_unix async_extra pa_ounit ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/janestreet/async;
diff --git a/pkgs/development/ocaml-modules/async-extra/default.nix b/pkgs/development/ocaml-modules/async_extra/default.nix
similarity index 67%
rename from pkgs/development/ocaml-modules/async-extra/default.nix
rename to pkgs/development/ocaml-modules/async_extra/default.nix
index 567562dcf28d..2d1e1dea69cc 100644
--- a/pkgs/development/ocaml-modules/async-extra/default.nix
+++ b/pkgs/development/ocaml-modules/async_extra/default.nix
@@ -1,9 +1,9 @@
-{stdenv, buildOcaml, fetchurl, async-kernel, async-unix,
- bin-prot, core, custom-printf, fieldslib, herelib, pa-ounit,
- pipebang, pa-test, sexplib}:
+{stdenv, buildOcaml, fetchurl, async_kernel, async_unix,
+ bin_prot, core, custom_printf, fieldslib, herelib, pa_ounit,
+ pipebang, pa_test, sexplib}:
 
 buildOcaml rec {
-  name = "async-extra";
+  name = "async_extra";
   version = "112.24.00";
 
   minimumSupportedOcamlVersion = "4.02";
@@ -13,8 +13,8 @@ buildOcaml rec {
     sha256 = "51f6f67a9ad56fe5dcf09faeeca6ec2fea53a7a975a72bc80504b90841212e28";
   };
 
-  buildInputs = [ pa-test pa-ounit ];
-  propagatedBuildInputs = [ async-kernel async-unix core bin-prot custom-printf
+  buildInputs = [ pa_test pa_ounit ];
+  propagatedBuildInputs = [ async_kernel async_unix core bin_prot custom_printf
                             fieldslib herelib pipebang sexplib ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/ocaml-modules/async-find/default.nix b/pkgs/development/ocaml-modules/async_find/default.nix
similarity index 96%
rename from pkgs/development/ocaml-modules/async-find/default.nix
rename to pkgs/development/ocaml-modules/async_find/default.nix
index 4c12c994f8d1..ae10e931ce25 100644
--- a/pkgs/development/ocaml-modules/async-find/default.nix
+++ b/pkgs/development/ocaml-modules/async_find/default.nix
@@ -1,7 +1,7 @@
 {stdenv, buildOcaml, fetchurl, async, core, sexplib}:
 
 buildOcaml rec {
-  name = "async-find";
+  name = "async_find";
   version = "111.28.00";
 
   minimumSupportedOcamlVersion = "4.02";
diff --git a/pkgs/development/ocaml-modules/async-kernel/default.nix b/pkgs/development/ocaml-modules/async_kernel/default.nix
similarity index 72%
rename from pkgs/development/ocaml-modules/async-kernel/default.nix
rename to pkgs/development/ocaml-modules/async_kernel/default.nix
index 7e5db2e2c3e5..8c0d8d7c851e 100644
--- a/pkgs/development/ocaml-modules/async-kernel/default.nix
+++ b/pkgs/development/ocaml-modules/async_kernel/default.nix
@@ -1,9 +1,9 @@
-{stdenv, buildOcaml, fetchurl, core-kernel,
- bin-prot, fieldslib, pa-ounit, pa-test,
+{stdenv, buildOcaml, fetchurl, core_kernel,
+ bin_prot, fieldslib, pa_ounit, pa_test,
  sexplib, herelib}:
 
 buildOcaml rec {
-  name = "async-kernel";
+  name = "async_kernel";
   version = "112.24.00";
 
   minimumSupportedOcamlVersion = "4.02";
@@ -13,8 +13,8 @@ buildOcaml rec {
     sha256 = "95caf4249b55c5a6b38da56e314845e9ea9a0876eedd4cf0ddcb6c8dd660c6a0";
   };
 
-  buildInputs = [ pa-test pa-ounit ];
-  propagatedBuildInputs = [ core-kernel bin-prot fieldslib herelib sexplib ];
+  buildInputs = [ pa_test pa_ounit ];
+  propagatedBuildInputs = [ core_kernel bin_prot fieldslib herelib sexplib ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/janestreet/async_kernel;
diff --git a/pkgs/development/ocaml-modules/async-shell/default.nix b/pkgs/development/ocaml-modules/async_shell/default.nix
similarity index 77%
rename from pkgs/development/ocaml-modules/async-shell/default.nix
rename to pkgs/development/ocaml-modules/async_shell/default.nix
index 6f863382bd2d..75755833a5f5 100644
--- a/pkgs/development/ocaml-modules/async-shell/default.nix
+++ b/pkgs/development/ocaml-modules/async_shell/default.nix
@@ -1,7 +1,7 @@
-{stdenv, buildOcaml, fetchurl, async, core, core-extended}:
+{stdenv, buildOcaml, fetchurl, async, core, core_extended}:
 
 buildOcaml rec {
-  name = "async-shell";
+  name = "async_shell";
   version = "109.28.03";
 
   minimumSupportedOcamlVersion = "4.02";
@@ -11,7 +11,7 @@ buildOcaml rec {
     sha256 = "0b4497bea9124c5a665ee58fb0a73c5cbf2f757479df902e6870627196e6c105";
   };
 
-  propagatedBuildInputs = [ async core core-extended ];
+  propagatedBuildInputs = [ async core core_extended ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/janestreet/async_shell;
diff --git a/pkgs/development/ocaml-modules/async-ssl/default.nix b/pkgs/development/ocaml-modules/async_ssl/default.nix
similarity index 86%
rename from pkgs/development/ocaml-modules/async-ssl/default.nix
rename to pkgs/development/ocaml-modules/async_ssl/default.nix
index 49fd3033320e..527d56ceaa01 100644
--- a/pkgs/development/ocaml-modules/async-ssl/default.nix
+++ b/pkgs/development/ocaml-modules/async_ssl/default.nix
@@ -1,5 +1,5 @@
 {stdenv, buildOcaml, fetchurl, async, comparelib, core, ctypes, openssl,
- fieldslib, herelib, pa-bench, pa-ounit, pipebang, pa-test, sexplib}:
+ fieldslib, herelib, pa_bench, pa_ounit, pipebang, pa_test, sexplib}:
 
 buildOcaml rec {
   name = "async_ssl";
@@ -12,8 +12,8 @@ buildOcaml rec {
     sha256 = "1b0bea92142eef11da6bf649bbe229bd4b8d9cc807303d8142406908c0d28c68";
   };
 
-  buildInputs = [ pa-bench pa-test ];
-  propagatedBuildInputs = [ ctypes async comparelib core fieldslib pa-ounit
+  buildInputs = [ pa_bench pa_test ];
+  propagatedBuildInputs = [ ctypes async comparelib core fieldslib pa_ounit
                             herelib pipebang sexplib openssl ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/ocaml-modules/async-unix/default.nix b/pkgs/development/ocaml-modules/async_unix/default.nix
similarity index 64%
rename from pkgs/development/ocaml-modules/async-unix/default.nix
rename to pkgs/development/ocaml-modules/async_unix/default.nix
index b8fe7bee2551..81fbd6a99182 100644
--- a/pkgs/development/ocaml-modules/async-unix/default.nix
+++ b/pkgs/development/ocaml-modules/async_unix/default.nix
@@ -1,9 +1,9 @@
-{stdenv, buildOcaml, fetchurl, async-kernel,
- bin-prot, comparelib, core, fieldslib, herelib, pa-ounit,
- pipebang, pa-test, sexplib}:
+{stdenv, buildOcaml, fetchurl, async_kernel,
+ bin_prot, comparelib, core, fieldslib, herelib, pa_ounit,
+ pipebang, pa_test, sexplib}:
 
 buildOcaml rec {
-  name = "async-unix";
+  name = "async_unix";
   version = "112.24.00";
 
   minimumSupportedOcamlVersion = "4.02";
@@ -14,9 +14,9 @@ buildOcaml rec {
   };
 
   hasSharedObjects = true;
-  buildInputs = [ pa-ounit ];
-  propagatedBuildInputs = [ async-kernel core bin-prot comparelib
-                            fieldslib herelib pipebang pa-test sexplib ];
+  buildInputs = [ pa_ounit ];
+  propagatedBuildInputs = [ async_kernel core bin_prot comparelib
+                            fieldslib herelib pipebang pa_test sexplib ];
 
    meta = with stdenv.lib; {
     homepage = https://github.com/janestreet/async_unix;
diff --git a/pkgs/development/ocaml-modules/bin-prot/default.nix b/pkgs/development/ocaml-modules/bin_prot/default.nix
similarity index 81%
rename from pkgs/development/ocaml-modules/bin-prot/default.nix
rename to pkgs/development/ocaml-modules/bin_prot/default.nix
index 4f8c3181e238..4a2b9846271b 100644
--- a/pkgs/development/ocaml-modules/bin-prot/default.nix
+++ b/pkgs/development/ocaml-modules/bin_prot/default.nix
@@ -1,7 +1,7 @@
-{stdenv, writeText, buildOcaml, fetchurl, type-conv}:
+{stdenv, writeText, buildOcaml, fetchurl, type_conv}:
 
 buildOcaml rec {
-  name = "bin-prot";
+  name = "bin_prot";
   version = "112.24.00";
 
   minimumSupportedOcamlVersion = "4.00";
@@ -11,7 +11,7 @@ buildOcaml rec {
     sha256 = "dc0c978a825c7c123990af3317637c218f61079e6f35dc878260651084f1adb4";
   };
 
-  propagatedBuildInputs = [ type-conv ];
+  propagatedBuildInputs = [ type_conv ];
 
   hasSharedObjects = true;
 
diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix
index 92690d96ffb6..e219b59de5de 100644
--- a/pkgs/development/ocaml-modules/cohttp/default.nix
+++ b/pkgs/development/ocaml-modules/cohttp/default.nix
@@ -1,6 +1,6 @@
 {stdenv, buildOcaml, fetchurl, cmdliner, re, uri, fieldslib, sexplib, conduit,
  stringext, base64, magic-mime, ounit, alcotest, lwt ? null,
- async ? null, async-ssl ? null}:
+ async ? null, async_ssl ? null}:
 
 buildOcaml rec {
   name = "cohttp";
@@ -16,7 +16,7 @@ buildOcaml rec {
   buildInputs = [ alcotest ];
   propagatedBuildInputs = [ cmdliner re uri fieldslib sexplib sexplib
                             conduit stringext base64 magic-mime ounit async
-                            async-ssl lwt ];
+                            async_ssl lwt ];
 
   buildFlags = "PREFIX=$(out)";
 
diff --git a/pkgs/development/ocaml-modules/comparelib/default.nix b/pkgs/development/ocaml-modules/comparelib/default.nix
index a4e125611945..950012158142 100644
--- a/pkgs/development/ocaml-modules/comparelib/default.nix
+++ b/pkgs/development/ocaml-modules/comparelib/default.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcaml, fetchurl, type-conv}:
+{stdenv, buildOcaml, fetchurl, type_conv}:
 
 buildOcaml rec {
   name = "comparelib";
@@ -11,7 +11,7 @@ buildOcaml rec {
     sha256 = "1075fb05e0d1e290f71ad0f6163f32b2cb4cebdc77568491c7eb38ba91f5db7e";
   };
 
-  propagatedBuildInputs = [ type-conv ];
+  propagatedBuildInputs = [ type_conv ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/janestreet/comparelib;
diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix
index 2ea316462c26..dbb83f4c8cf0 100644
--- a/pkgs/development/ocaml-modules/conduit/default.nix
+++ b/pkgs/development/ocaml-modules/conduit/default.nix
@@ -1,5 +1,5 @@
 {stdenv, buildOcaml, fetchurl, sexplib, stringext, uri, cstruct, ipaddr,
- async ? null, async-ssl ? null, lwt ? null}:
+ async ? null, async_ssl ? null, lwt ? null}:
 
 buildOcaml rec {
   name = "conduit";
@@ -13,7 +13,7 @@ buildOcaml rec {
   propagatedBuildInputs = ([ sexplib stringext uri cstruct ipaddr ]
                             ++ stdenv.lib.optional (lwt != null) lwt
                             ++ stdenv.lib.optional (async != null) async
-                            ++ stdenv.lib.optional (async-ssl != null) async-ssl);
+                            ++ stdenv.lib.optional (async_ssl != null) async_ssl);
 
   meta = with stdenv.lib; {
     homepage = https://github.com/mirage/ocaml-conduit;
diff --git a/pkgs/development/ocaml-modules/core/default.nix b/pkgs/development/ocaml-modules/core/default.nix
index 9cc03883932f..96fd80087d66 100644
--- a/pkgs/development/ocaml-modules/core/default.nix
+++ b/pkgs/development/ocaml-modules/core/default.nix
@@ -1,6 +1,6 @@
-{stdenv, buildOcaml, fetchurl, type-conv,
- core-kernel, bin-prot, comparelib, custom-printf, enumerate,
- fieldslib, herelib, pa-bench, pa-test, pa-ounit,
+{stdenv, buildOcaml, fetchurl, type_conv,
+ core_kernel, bin_prot, comparelib, custom_printf, enumerate,
+ fieldslib, herelib, pa_bench, pa_test, pa_ounit,
  pipebang, sexplib, typerep, variantslib}:
 
 buildOcaml rec {
@@ -16,9 +16,9 @@ buildOcaml rec {
 
   hasSharedObjects = true;
 
-  buildInputs = [ pa-bench pa-test pa-ounit ];
-  propagatedBuildInputs = [ type-conv core-kernel bin-prot comparelib
-                            custom-printf enumerate fieldslib herelib
+  buildInputs = [ pa_bench pa_test pa_ounit ];
+  propagatedBuildInputs = [ type_conv core_kernel bin_prot comparelib
+                            custom_printf enumerate fieldslib herelib
                             pipebang sexplib typerep variantslib ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/ocaml-modules/core-extended/default.nix b/pkgs/development/ocaml-modules/core_extended/default.nix
similarity index 69%
rename from pkgs/development/ocaml-modules/core-extended/default.nix
rename to pkgs/development/ocaml-modules/core_extended/default.nix
index aa6741e6520f..f311aae3d304 100644
--- a/pkgs/development/ocaml-modules/core-extended/default.nix
+++ b/pkgs/development/ocaml-modules/core_extended/default.nix
@@ -1,8 +1,8 @@
-{stdenv, buildOcaml, fetchurl, bin-prot, comparelib, core, custom-printf,
- fieldslib, pa-bench, pa-ounit, pipebang, pa-test, textutils, re2, sexplib}:
+{stdenv, buildOcaml, fetchurl, bin_prot, comparelib, core, custom_printf,
+ fieldslib, pa_bench, pa_ounit, pipebang, pa_test, textutils, re2, sexplib}:
 
 buildOcaml rec {
-  name = "core-extended";
+  name = "core_extended";
   version = "112.24.00";
 
   minimumSupportedOcamlVersion = "4.02";
@@ -13,8 +13,8 @@ buildOcaml rec {
   };
 
   hasSharedObjects = true;
-  buildInputs = [ pa-bench pa-test pa-ounit ];
-  propagatedBuildInputs = [bin-prot comparelib core custom-printf fieldslib
+  buildInputs = [ pa_bench pa_test pa_ounit ];
+  propagatedBuildInputs = [bin_prot comparelib core custom_printf fieldslib
                            pipebang textutils re2 sexplib ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/ocaml-modules/core-kernel/default.nix b/pkgs/development/ocaml-modules/core_kernel/default.nix
similarity index 71%
rename from pkgs/development/ocaml-modules/core-kernel/default.nix
rename to pkgs/development/ocaml-modules/core_kernel/default.nix
index ee1a8b7a5bb6..0fed12b195d6 100644
--- a/pkgs/development/ocaml-modules/core-kernel/default.nix
+++ b/pkgs/development/ocaml-modules/core_kernel/default.nix
@@ -1,10 +1,10 @@
-{stdenv, buildOcaml, fetchurl, type-conv,
- bin-prot, comparelib, custom-printf, enumerate,
- fieldslib, herelib, pa-bench, pa-test, pa-ounit,
+{stdenv, buildOcaml, fetchurl, type_conv,
+ bin_prot, comparelib, custom_printf, enumerate,
+ fieldslib, herelib, pa_bench, pa_test, pa_ounit,
  pipebang, sexplib, typerep, variantslib}:
 
 buildOcaml rec {
-  name = "core-kernel";
+  name = "core_kernel";
   version = "112.24.00";
 
   minimumSupportedOcamlVersion = "4.02";
@@ -16,8 +16,8 @@ buildOcaml rec {
 
   hasSharedObjects = true;
 
-  buildInputs = [ pa-test pa-ounit ];
-  propagatedBuildInputs = [ type-conv pa-bench bin-prot comparelib custom-printf
+  buildInputs = [ pa_test pa_ounit ];
+  propagatedBuildInputs = [ type_conv pa_bench bin_prot comparelib custom_printf
                             enumerate fieldslib herelib pipebang sexplib
                             typerep variantslib ];
 
diff --git a/pkgs/development/ocaml-modules/custom-printf/default.nix b/pkgs/development/ocaml-modules/custom_printf/default.nix
similarity index 75%
rename from pkgs/development/ocaml-modules/custom-printf/default.nix
rename to pkgs/development/ocaml-modules/custom_printf/default.nix
index f435e53314a9..05a8ecfe616b 100644
--- a/pkgs/development/ocaml-modules/custom-printf/default.nix
+++ b/pkgs/development/ocaml-modules/custom_printf/default.nix
@@ -1,7 +1,7 @@
-{stdenv, buildOcaml, fetchurl, type-conv, sexplib, pa-ounit}:
+{stdenv, buildOcaml, fetchurl, type_conv, sexplib, pa_ounit}:
 
 buildOcaml rec {
-  name = "custom-printf";
+  name = "custom_printf";
   version = "112.24.00";
 
   minimumSupportedOcamlVersion = "4.02";
@@ -11,8 +11,8 @@ buildOcaml rec {
     sha256 = "dad3aface92c53e8fbcc12cc9358c4767cb1cb09857d4819a10ed98eccaca8f9";
   };
 
-  buildInputs = [ pa-ounit ];
-  propagatedBuildInputs = [ type-conv sexplib ];
+  buildInputs = [ pa_ounit ];
+  propagatedBuildInputs = [ type_conv sexplib ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/janestreet/custom_printf;
diff --git a/pkgs/development/ocaml-modules/enumerate/default.nix b/pkgs/development/ocaml-modules/enumerate/default.nix
index f0f80eb2ecd4..ce20cdd47bb4 100644
--- a/pkgs/development/ocaml-modules/enumerate/default.nix
+++ b/pkgs/development/ocaml-modules/enumerate/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, type-conv, camlp4 }:
+{ stdenv, fetchurl, ocaml, findlib, type_conv, camlp4 }:
 
 assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00";
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ ocaml findlib ];
-  propagatedBuildInputs = [ type-conv camlp4 ];
+  propagatedBuildInputs = [ type_conv camlp4 ];
 
   createFindlibDestdir = true;
 
diff --git a/pkgs/development/ocaml-modules/erm-xml/default.nix b/pkgs/development/ocaml-modules/erm_xml/default.nix
similarity index 93%
rename from pkgs/development/ocaml-modules/erm-xml/default.nix
rename to pkgs/development/ocaml-modules/erm_xml/default.nix
index c60ef70ef698..0ff2a725ea2b 100644
--- a/pkgs/development/ocaml-modules/erm-xml/default.nix
+++ b/pkgs/development/ocaml-modules/erm_xml/default.nix
@@ -3,7 +3,7 @@
 let version = "0.3"; in
 
 stdenv.mkDerivation {
-  name = "ocaml-erm-xml-${version}";
+  name = "ocaml-erm_xml-${version}";
 
   src = fetchzip {
     url = "https://github.com/ermine/xml/archive/v${version}.tar.gz";
diff --git a/pkgs/development/ocaml-modules/erm-xmpp/default.nix b/pkgs/development/ocaml-modules/erm_xmpp/default.nix
similarity index 84%
rename from pkgs/development/ocaml-modules/erm-xmpp/default.nix
rename to pkgs/development/ocaml-modules/erm_xmpp/default.nix
index 35b090510465..7508a14738dc 100644
--- a/pkgs/development/ocaml-modules/erm-xmpp/default.nix
+++ b/pkgs/development/ocaml-modules/erm_xmpp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchzip, ocaml, findlib, erm-xml, cryptokit, camlp4 }:
+{ stdenv, fetchurl, fetchzip, ocaml, findlib, erm_xml, cryptokit, camlp4 }:
 
 let
   version = "0.2";
@@ -9,7 +9,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "ocaml-erm-xmpp-${version}";
+  name = "ocaml-erm_xmpp-${version}";
 
   src = fetchzip {
     url = "https://github.com/ermine/xmpp/archive/v${version}.tar.gz";
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   patches = [ disable-tests ];
 
   buildInputs = [ ocaml findlib camlp4 ];
-  propagatedBuildInputs = [ erm-xml cryptokit ];
+  propagatedBuildInputs = [ erm_xml cryptokit ];
 
   createFindlibDestdir = true;
 
diff --git a/pkgs/development/ocaml-modules/fieldslib/default.nix b/pkgs/development/ocaml-modules/fieldslib/default.nix
index cb73f56fbd83..385487903290 100644
--- a/pkgs/development/ocaml-modules/fieldslib/default.nix
+++ b/pkgs/development/ocaml-modules/fieldslib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, type-conv, camlp4 }:
+{ stdenv, fetchurl, ocaml, findlib, type_conv, camlp4 }:
 
 assert stdenv.lib.versionOlder "4.00" (stdenv.lib.getVersion ocaml);
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ ocaml findlib ];
-  propagatedBuildInputs = [ type-conv camlp4 ];
+  propagatedBuildInputs = [ type_conv camlp4 ];
 
   createFindlibDestdir = true;
 
diff --git a/pkgs/development/ocaml-modules/odn/default.nix b/pkgs/development/ocaml-modules/odn/default.nix
index c7d4aa52c474..eaeb7e7b22f7 100644
--- a/pkgs/development/ocaml-modules/odn/default.nix
+++ b/pkgs/development/ocaml-modules/odn/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, findlib, type-conv, ounit, camlp4}:
+{stdenv, fetchurl, ocaml, findlib, type_conv, ounit, camlp4}:
 
 stdenv.mkDerivation {
   name = "ocaml-data-notation-0.0.11";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "09a8zdyifpc2nl4hdvg9206142y31cq95ajgij011s1qcg3z93lj";
   };
 
-  buildInputs = [ocaml findlib type-conv ounit camlp4];
+  buildInputs = [ocaml findlib type_conv ounit camlp4];
 
   createFindlibDestdir = true;
 
diff --git a/pkgs/development/ocaml-modules/pa-bench/default.nix b/pkgs/development/ocaml-modules/pa_bench/default.nix
similarity index 77%
rename from pkgs/development/ocaml-modules/pa-bench/default.nix
rename to pkgs/development/ocaml-modules/pa_bench/default.nix
index 926a61fff66f..d8ce0dbc7eac 100644
--- a/pkgs/development/ocaml-modules/pa-bench/default.nix
+++ b/pkgs/development/ocaml-modules/pa_bench/default.nix
@@ -1,7 +1,7 @@
-{stdenv, buildOcaml, fetchurl, type-conv, pa-ounit}:
+{stdenv, buildOcaml, fetchurl, type_conv, pa_ounit}:
 
 buildOcaml rec {
-  name = "pa-bench";
+  name = "pa_bench";
   version = "112.06.00";
 
   minimumSupportedOcamlVersion = "4.00";
@@ -11,8 +11,8 @@ buildOcaml rec {
     sha256 = "e3401e37f1d3d4acb957fd46a192d0ffcefeb0bedee63bbeb26969af1d540870";
   };
 
-  buildInputs = [ pa-ounit ];
-  propagatedBuildInputs = [ type-conv ];
+  buildInputs = [ pa_ounit ];
+  propagatedBuildInputs = [ type_conv ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/janestreet/pa_bench;
diff --git a/pkgs/development/ocaml-modules/pa-ounit/default.nix b/pkgs/development/ocaml-modules/pa_ounit/default.nix
similarity index 96%
rename from pkgs/development/ocaml-modules/pa-ounit/default.nix
rename to pkgs/development/ocaml-modules/pa_ounit/default.nix
index 05a38c814a09..5970aba1e502 100644
--- a/pkgs/development/ocaml-modules/pa-ounit/default.nix
+++ b/pkgs/development/ocaml-modules/pa_ounit/default.nix
@@ -1,7 +1,7 @@
 {stdenv, buildOcaml, fetchurl, ounit}:
 
 buildOcaml rec {
-  name = "pa-ounit";
+  name = "pa_ounit";
   version = "112.24.00";
 
   src = fetchurl {
diff --git a/pkgs/development/ocaml-modules/pa-test/default.nix b/pkgs/development/ocaml-modules/pa_test/default.nix
similarity index 74%
rename from pkgs/development/ocaml-modules/pa-test/default.nix
rename to pkgs/development/ocaml-modules/pa_test/default.nix
index 81b5854348bc..faf17e20dc1e 100644
--- a/pkgs/development/ocaml-modules/pa-test/default.nix
+++ b/pkgs/development/ocaml-modules/pa_test/default.nix
@@ -1,7 +1,7 @@
-{stdenv, buildOcaml, fetchurl, type-conv, pa-ounit, sexplib, herelib}:
+{stdenv, buildOcaml, fetchurl, type_conv, pa_ounit, sexplib, herelib}:
 
 buildOcaml rec {
-  name = "pa-test";
+  name = "pa_test";
   version = "112.24.00";
 
   minimumSupportedOcamlVersion = "4.00";
@@ -11,8 +11,8 @@ buildOcaml rec {
     sha256 = "b03d13c2bc9fa9a4b1c507d7108d965202160f83e9781d430d3b53a1993e30d6";
   };
 
-  buildInputs = [ pa-ounit ];
-  propagatedBuildInputs = [ type-conv sexplib herelib ];
+  buildInputs = [ pa_ounit ];
+  propagatedBuildInputs = [ type_conv sexplib herelib ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/janestreet/pa_test;
diff --git a/pkgs/development/ocaml-modules/re2/default.nix b/pkgs/development/ocaml-modules/re2/default.nix
index 31922d2aab8f..e89e28fe1e55 100644
--- a/pkgs/development/ocaml-modules/re2/default.nix
+++ b/pkgs/development/ocaml-modules/re2/default.nix
@@ -1,5 +1,5 @@
-{stdenv, buildOcaml, fetchurl, ocaml, core, pa-ounit, pa-test,
- bin-prot, comparelib, sexplib, rsync}:
+{stdenv, buildOcaml, fetchurl, ocaml, core, pa_ounit, pa_test,
+ bin_prot, comparelib, sexplib, rsync}:
 
 buildOcaml rec {
   name = "re2";
@@ -15,8 +15,8 @@ buildOcaml rec {
             then [./Makefile.patch ./myocamlbuild.patch]
             else null;
 
-  buildInputs = [ pa-ounit pa-test rsync ];
-  propagatedBuildInputs = [ core bin-prot comparelib sexplib ];
+  buildInputs = [ pa_ounit pa_test rsync ];
+  propagatedBuildInputs = [ core bin_prot comparelib sexplib ];
 
   hasSharedObjects = true;
 
diff --git a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix
index 0067d68e1294..dd9e89bcef70 100644
--- a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix
+++ b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, findlib, type-conv, camlp4}:
+{stdenv, fetchurl, ocaml, findlib, type_conv, camlp4}:
 
 let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ocaml findlib];
-  propagatedBuildInputs = [type-conv camlp4];
+  propagatedBuildInputs = [type_conv camlp4];
 
   createFindlibDestdir = true;
 
diff --git a/pkgs/development/ocaml-modules/sexplib/111.25.00.nix b/pkgs/development/ocaml-modules/sexplib/111.25.00.nix
index 0a817728393a..61d46e205fa6 100644
--- a/pkgs/development/ocaml-modules/sexplib/111.25.00.nix
+++ b/pkgs/development/ocaml-modules/sexplib/111.25.00.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, findlib, type-conv, camlp4}:
+{stdenv, fetchurl, ocaml, findlib, type_conv, camlp4}:
 
 let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ocaml findlib];
-  propagatedBuildInputs = [type-conv camlp4];
+  propagatedBuildInputs = [type_conv camlp4];
 
   createFindlibDestdir = true;
 
diff --git a/pkgs/development/ocaml-modules/sexplib/112.24.01.nix b/pkgs/development/ocaml-modules/sexplib/112.24.01.nix
index 31ef738b3a20..b63b5af05e82 100644
--- a/pkgs/development/ocaml-modules/sexplib/112.24.01.nix
+++ b/pkgs/development/ocaml-modules/sexplib/112.24.01.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcaml, fetchurl, type-conv, camlp4}:
+{stdenv, buildOcaml, fetchurl, type_conv, camlp4}:
 
 buildOcaml rec {
   minimumSupportedOcamlVersion = "4.02";
@@ -10,7 +10,7 @@ buildOcaml rec {
     sha256 = "5f776aee295cc51c952aecd4b74b52dd2b850c665cc25b3d69bc42014d3ba073";
   };
 
-  propagatedBuildInputs = [ type-conv camlp4 ];
+  propagatedBuildInputs = [ type_conv camlp4 ];
 
   meta = with stdenv.lib; {
     homepage = https://ocaml.janestreet.com/;
diff --git a/pkgs/development/ocaml-modules/textutils/default.nix b/pkgs/development/ocaml-modules/textutils/default.nix
index 07a79519745a..377b94eff8b8 100644
--- a/pkgs/development/ocaml-modules/textutils/default.nix
+++ b/pkgs/development/ocaml-modules/textutils/default.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcaml, fetchurl, core, pa-ounit, pa-test, sexplib}:
+{stdenv, buildOcaml, fetchurl, core, pa_ounit, pa_test, sexplib}:
 
 buildOcaml rec {
   name = "textutils";
@@ -11,8 +11,8 @@ buildOcaml rec {
     sha256 = "605d9fde66dc2d777721c936aa521e17169c143efaf9ff29619a7f273a7d0052";
   };
 
-  buildInputs = [ pa-test ];
-  propagatedBuildInputs = [ core pa-ounit sexplib ];
+  buildInputs = [ pa_test ];
+  propagatedBuildInputs = [ core pa_ounit sexplib ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/janestreet/textutils;
diff --git a/pkgs/development/ocaml-modules/type-conv/108.08.00.nix b/pkgs/development/ocaml-modules/type_conv/108.08.00.nix
similarity index 95%
rename from pkgs/development/ocaml-modules/type-conv/108.08.00.nix
rename to pkgs/development/ocaml-modules/type_conv/108.08.00.nix
index 281ef90d42db..d3e32105f7df 100644
--- a/pkgs/development/ocaml-modules/type-conv/108.08.00.nix
+++ b/pkgs/development/ocaml-modules/type_conv/108.08.00.nix
@@ -7,7 +7,7 @@ in
 assert stdenv.lib.versionOlder "3.12" ocaml_version;
 
 stdenv.mkDerivation {
-  name = "ocaml-type-conv-108.08.00";
+  name = "ocaml-type_conv-108.08.00";
 
   src = fetchurl {
     url = https://ocaml.janestreet.com/ocaml-core/108.08.00/individual/type_conv-108.08.00.tar.gz;
diff --git a/pkgs/development/ocaml-modules/type-conv/109.60.01.nix b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix
similarity index 95%
rename from pkgs/development/ocaml-modules/type-conv/109.60.01.nix
rename to pkgs/development/ocaml-modules/type_conv/109.60.01.nix
index 91f6b32cb0a1..fe42dd5ddcbd 100644
--- a/pkgs/development/ocaml-modules/type-conv/109.60.01.nix
+++ b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix
@@ -7,7 +7,7 @@ in
 assert stdenv.lib.versionOlder "4.00" ocaml_version;
 
 stdenv.mkDerivation {
-  name = "ocaml-type-conv-109.60.01";
+  name = "ocaml-type_conv-109.60.01";
 
   src = fetchurl {
     url = https://github.com/janestreet/type_conv/archive/109.60.01.tar.gz;
diff --git a/pkgs/development/ocaml-modules/type-conv/112.01.01.nix b/pkgs/development/ocaml-modules/type_conv/112.01.01.nix
similarity index 96%
rename from pkgs/development/ocaml-modules/type-conv/112.01.01.nix
rename to pkgs/development/ocaml-modules/type_conv/112.01.01.nix
index d6e0cea6eaa5..e65306d15018 100644
--- a/pkgs/development/ocaml-modules/type-conv/112.01.01.nix
+++ b/pkgs/development/ocaml-modules/type_conv/112.01.01.nix
@@ -3,7 +3,7 @@
 buildOcaml rec {
   minimumSupportedOcamlVersion = "4.02";
 
-  name = "type-conv";
+  name = "type_conv";
   version = "112.01.01";
 
   src = fetchurl {
diff --git a/pkgs/development/ocaml-modules/typerep/default.nix b/pkgs/development/ocaml-modules/typerep/default.nix
index 168b61085edb..9500579e2458 100644
--- a/pkgs/development/ocaml-modules/typerep/default.nix
+++ b/pkgs/development/ocaml-modules/typerep/default.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcaml, fetchurl, type-conv}:
+{stdenv, buildOcaml, fetchurl, type_conv}:
 
 buildOcaml rec {
   name = "typerep";
@@ -11,7 +11,7 @@ buildOcaml rec {
     sha256 = "4f1ab611a00aaf774e9774b26b687233e0c70d91f684415a876f094a9969eada";
   };
 
-  propagatedBuildInputs = [ type-conv ];
+  propagatedBuildInputs = [ type_conv ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/janestreet/typerep;
diff --git a/pkgs/development/ocaml-modules/variantslib/default.nix b/pkgs/development/ocaml-modules/variantslib/default.nix
index f8e60205e4f1..cb25b844606d 100644
--- a/pkgs/development/ocaml-modules/variantslib/default.nix
+++ b/pkgs/development/ocaml-modules/variantslib/default.nix
@@ -1,4 +1,4 @@
-{stdenv, buildOcaml, fetchurl, type-conv}:
+{stdenv, buildOcaml, fetchurl, type_conv}:
 
 buildOcaml rec {
   name = "variantslib";
@@ -11,7 +11,7 @@ buildOcaml rec {
     sha256 = "a948dcdd4ca54786fe0646386b6e37a9db03bf276c6557ea374d82740bf18055";
   };
 
-  propagatedBuildInputs = [ type-conv ];
+  propagatedBuildInputs = [ type_conv ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/janestreet/variantslib;
diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix
index da94fed0831e..e823466f4174 100644
--- a/pkgs/development/tools/ocaml/oasis/default.nix
+++ b/pkgs/development/tools/ocaml/oasis/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ocaml, findlib, ocaml-data-notation, type-conv, camlp4,
+{stdenv, fetchurl, ocaml, findlib, ocaml_data_notation, type_conv, camlp4,
  ocamlmod, ocamlify, ounit, expect}:
 
 stdenv.mkDerivation {
@@ -13,10 +13,10 @@ stdenv.mkDerivation {
 
   buildInputs =
     [
-      ocaml findlib type-conv ocamlmod ocamlify ounit camlp4
+      ocaml findlib type_conv ocamlmod ocamlify ounit camlp4
     ];
 
-  propagatedBuildInputs = [ ocaml-data-notation ];
+  propagatedBuildInputs = [ ocaml_data_notation ];
 
   configurePhase = "ocaml setup.ml -configure --prefix $out";
   buildPhase     = "ocaml setup.ml -build";
diff --git a/pkgs/tools/typesetting/patoline/default.nix b/pkgs/tools/typesetting/patoline/default.nix
index 9da588b934dc..a39105c83145 100644
--- a/pkgs/tools/typesetting/patoline/default.nix
+++ b/pkgs/tools/typesetting/patoline/default.nix
@@ -2,7 +2,7 @@
 { stdenv, fetchurl, ncurses, mesa, freeglut, libzip, 
    ocaml, findlib, camomile, 
    dypgen, ocaml_sqlite3, camlzip, 
-   lablgtk, camlimages, ocaml-cairo,
+   lablgtk, camlimages, ocaml_cairo,
    lablgl, ocamlnet, cryptokit,
    ocaml_pcre }:
 
@@ -21,13 +21,13 @@ stdenv.mkDerivation {
   createFindlibDestdir = true;
    
    buildInputs = [ ocaml findlib dypgen camomile ocaml_sqlite3 camlzip 
-   lablgtk camlimages ocaml-cairo
+   lablgtk camlimages ocaml_cairo
    lablgl ocamlnet cryptokit
    ocaml_pcre ncurses mesa freeglut libzip ];
 
   propagatedbuildInputs = [ camomile 
    dypgen ocaml_sqlite3 camlzip 
-   lablgtk camlimages ocaml-cairo
+   lablgtk camlimages ocaml_cairo
    lablgl ocamlnet cryptokit
    ocaml_pcre ncurses mesa freeglut libzip ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 20d63aa02569..5ae5d62ef972 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4312,17 +4312,17 @@ let
 
     asn1-combinators = callPackage ../development/ocaml-modules/asn1-combinators { };
 
-    async-extra = callPackage ../development/ocaml-modules/async-extra { };
+    async_extra = callPackage ../development/ocaml-modules/async_extra { };
 
-    async-find = callPackage ../development/ocaml-modules/async-find { };
+    async_find = callPackage ../development/ocaml-modules/async_find { };
 
-    async-kernel = callPackage ../development/ocaml-modules/async-kernel { };
+    async_kernel = callPackage ../development/ocaml-modules/async_kernel { };
 
-    async-shell = callPackage ../development/ocaml-modules/async-shell { };
+    async_shell = callPackage ../development/ocaml-modules/async_shell { };
 
-    async-ssl = callPackage ../development/ocaml-modules/async-ssl { };
+    async_ssl = callPackage ../development/ocaml-modules/async_ssl { };
 
-    async-unix = callPackage ../development/ocaml-modules/async-unix { };
+    async_unix = callPackage ../development/ocaml-modules/async_unix { };
 
     async =
       if lib.versionOlder "4.02" ocaml_version
@@ -4398,11 +4398,11 @@ let
 
     biniou = callPackage ../development/ocaml-modules/biniou { };
 
-    bin-prot = callPackage ../development/ocaml-modules/bin-prot { };
+    bin_prot = callPackage ../development/ocaml-modules/bin_prot { };
 
-    ocaml-cairo = callPackage ../development/ocaml-modules/ocaml-cairo { };
+    ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { };
 
-    ocaml-cairo2 = callPackage ../development/ocaml-modules/ocaml-cairo2 { };
+    ocaml_cairo2 = callPackage ../development/ocaml-modules/ocaml-cairo2 { };
 
     cil = callPackage ../development/ocaml-modules/cil { };
 
@@ -4426,7 +4426,7 @@ let
 
     csv = callPackage ../development/ocaml-modules/csv { };
 
-    custom-printf = callPackage ../development/ocaml-modules/custom-printf { };
+    custom_printf = callPackage ../development/ocaml-modules/custom_printf { };
 
     ctypes = callPackage ../development/ocaml-modules/ctypes { };
 
@@ -4442,9 +4442,9 @@ let
 
     enumerate = callPackage ../development/ocaml-modules/enumerate { };
 
-    erm-xml = callPackage ../development/ocaml-modules/erm-xml { };
+    erm_xml = callPackage ../development/ocaml-modules/erm_xml { };
 
-    erm-xmpp = callPackage ../development/ocaml-modules/erm-xmpp { };
+    erm_xmpp = callPackage ../development/ocaml-modules/erm_xmpp { };
 
     ezjsonm = callPackage ../development/ocaml-modules/ezjsonm {
       lwt = ocaml_lwt;
@@ -4537,15 +4537,15 @@ let
 
     comparelib = callPackage ../development/ocaml-modules/comparelib { };
 
-    core-extended = callPackage ../development/ocaml-modules/core-extended { };
+    core_extended = callPackage ../development/ocaml-modules/core_extended { };
 
-    core-kernel = callPackage ../development/ocaml-modules/core-kernel { };
+    core_kernel = callPackage ../development/ocaml-modules/core_kernel { };
 
     core = callPackage ../development/ocaml-modules/core { };
 
-    ocaml-cryptgps = callPackage ../development/ocaml-modules/cryptgps { };
+    ocaml_cryptgps = callPackage ../development/ocaml-modules/cryptgps { };
 
-    ocaml-data-notation = callPackage ../development/ocaml-modules/odn { };
+    ocaml_data_notation = callPackage ../development/ocaml-modules/odn { };
 
     ocaml_expat = callPackage ../development/ocaml-modules/expat { };
 
@@ -4619,16 +4619,16 @@ let
 
     textutils = callPackage ../development/ocaml-modules/textutils { };
 
-    type-conv-108_08_00 = callPackage ../development/ocaml-modules/type-conv/108.08.00.nix { };
-    type-conv-109_60_01 = callPackage ../development/ocaml-modules/type-conv/109.60.01.nix { };
-    type-conv-112_01_01 = callPackage ../development/ocaml-modules/type-conv/112.01.01.nix { };
-    type-conv =
+    type_conv_108_08_00 = callPackage ../development/ocaml-modules/type_conv/108.08.00.nix { };
+    type_conv_109_60_01 = callPackage ../development/ocaml-modules/type_conv/109.60.01.nix { };
+    type_conv_112_01_01 = callPackage ../development/ocaml-modules/type_conv/112.01.01.nix { };
+    type_conv =
       if lib.versionOlder "4.02" ocaml_version
-      then type-conv-112_01_01
+      then type_conv_112_01_01
       else if lib.versionOlder "4.00" ocaml_version
-      then type-conv-109_60_01
+      then type_conv_109_60_01
       else if lib.versionOlder "3.12" ocaml_version
-      then type-conv-108_08_00
+      then type_conv_108_08_00
       else null;
 
     sexplib_108_08_00 = callPackage ../development/ocaml-modules/sexplib/108.08.00.nix { };
@@ -4651,11 +4651,11 @@ let
 
     ocurl = callPackage ../development/ocaml-modules/ocurl { };
 
-    pa-ounit = callPackage ../development/ocaml-modules/pa-ounit { };
+    pa_ounit = callPackage ../development/ocaml-modules/pa_ounit { };
 
-    pa-bench = callPackage ../development/ocaml-modules/pa-bench { };
+    pa_bench = callPackage ../development/ocaml-modules/pa_bench { };
 
-    pa-test = callPackage ../development/ocaml-modules/pa-test { };
+    pa_test = callPackage ../development/ocaml-modules/pa_test { };
 
     pipebang = callPackage ../development/ocaml-modules/pipebang { };
 
@@ -4716,32 +4716,6 @@ let
       oasis = ocaml_oasis;
     };
 
-
-    # Attributes for backward compatibility.
-    async_extra = async-extra; # added 2015-07-21
-    async_find = async-find; # added 2015-07-21
-    async_kernel = async-kernel; # added 2015-07-21
-    async_shell = async-shell; # added 2015-07-21
-    async_ssl = async-ssl; # added 2015-07-21
-    async_unix = async-unix; # added 2015-07-21
-    bin_prot = bin-prot; # added 2015-07-21
-    core_extended = core-extended; # added 2015-07-21
-    core_kernel = core-kernel; # added 2015-07-21
-    custom_printf = custom-printf; # added 2015-07-21
-    erm_xml = erm-xml; # added 2015-07-21
-    erm_xmpp = erm-xmpp; # added 2015-07-21
-    ocaml_cairo = ocaml-cairo; # added 2015-07-21
-    ocaml_cairo2 = ocaml-cairo2; # added 2015-07-21
-    ocaml_cryptgps = ocaml-cryptgps; # added 2015-07-21
-    ocaml_data_notation = ocaml-data-notation; # added 2015-07-21
-    pa_bench = pa-bench; # added 2015-07-21
-    pa_ounit = pa-ounit; # added 2015-07-21
-    pa_test = pa-test; # added 2015-07-21
-    type_conv_108_08_00 = type-conv-108_08_00; # added 2015-07-21
-    type_conv_109_60_01 = type-conv-109_60_01; # added 2015-07-21
-    type_conv_112_01_01 = type-conv-112_01_01; # added 2015-07-21
-    type_conv = type-conv; # added 2015-07-21
-
   };
 
   ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0;
@@ -15269,7 +15243,7 @@ let
       buildInputs = [ stdenv ncurses mesa freeglut libzip gcc
                                    pack.ocaml pack.findlib pack.camomile
                                    pack.dypgen pack.ocaml_sqlite3 pack.camlzip
-                                   pack.lablgtk pack.camlimages pack.ocaml-cairo
+                                   pack.lablgtk pack.camlimages pack.ocaml_cairo
                                    pack.lablgl pack.ocamlnet pack.cryptokit
                                    pack.ocaml_pcre pack.patoline
                                    ];