diff --git a/.gitignore b/.gitignore
index 207e5bfd..53f239d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,8 @@
 !/modules/pydevices/
 !/modules/palettes/
 !/modules/pdwidgets/
+!/modules/audioinstruments/
+!/modules/audioeffects/
 !/modules/audiocomponents/
 !/modules/micropython-lib/
 !/modules/all/
diff --git a/build_mp.py b/build_mp.py
index ad447dcc..b557e4a7 100755
--- a/build_mp.py
+++ b/build_mp.py
@@ -345,7 +345,7 @@ def sparse(repo, origin, sha, paths):
 # "all"): in the workspace a link to the sibling checkout, which wins like
 # every other module, anywhere else a clone at the pinned commit. The tree is
 # assembled into deps/omnipython-lib on every build that needs it; the outside
-# packages the library pins by tag (pygraphics, audiocomponents' two) are
+# packages the library pins by tag (pygraphics, audioinstruments, audioeffects) are
 # cloned once into deps/omnipython-lib-sources. In the workspace those come
 # from the sibling checkouts instead, the way every module does, so a
 # workspace build freezes the code beside it rather than the pinned tag.
diff --git a/docs/guides/choose-modules.md b/docs/guides/choose-modules.md
index 9cbde3e6..1a22e356 100644
--- a/docs/guides/choose-modules.md
+++ b/docs/guides/choose-modules.md
@@ -18,12 +18,12 @@ A name is one of three things:
   [Use esp-vision's modules](use-esp-vision-modules.md).
 
 A module never brings another, and nothing checks dependencies. If you name
-`audiocomponents`, `tflite` or `vision`, name `ulab` too, or use `all`.
+`audioinstruments`, `audioeffects`, `tflite` or `vision`, name `ulab` too, or use `all`.
 
 ## Python packages from omnipython-lib
 
 Our Python-only packages come from omnipython-lib: `pydevices`, `palettes`,
-`pdwidgets` and `audiocomponents` are modules whose manifest requires them from
+`pdwidgets`, `audioinstruments` and `audioeffects` are modules whose manifest requires them from
 it. Any other package of it, such as `appkit` or a board config, can be named
 too.
 
diff --git a/docs/reference/modules.md b/docs/reference/modules.md
index 2d537ab7..b232a9f8 100644
--- a/docs/reference/modules.md
+++ b/docs/reference/modules.md
@@ -27,7 +27,7 @@ tracked here or linked from a sibling checkout or cloned at the commit in
 |---|---|
 | `audiodsp`, `pygraphics`, `ulab` | Cloned at the commit in `modules.lock` when `modules/<name>` is missing, or linked from a sibling checkout. |
 | `lvgl` | [omnipython-lvgl](https://github.com/PyDevices/omnipython-lvgl), fetched at the commit in `modules.lock` into `modules/.omnipython-lvgl`, or linked from a sibling checkout. A build compiles its `ports/micropython` or `ports/circuitpython`, whichever the interpreter is, and `all` includes it. |
-| `pydevices`, `palettes`, `pdwidgets`, `audiocomponents` | Manifests here that require the Python packages from omnipython-lib. |
+| `pydevices`, `palettes`, `pdwidgets`, `audioinstruments`, `audioeffects` | Manifests here that require the Python packages from omnipython-lib. `audiocomponents` is the old name for the last two together and still builds both. |
 | `micropython-lib` | MicroPython's own upstream packages, frozen from the checkout the MicroPython tree carries. |
 | `tflite`, `vision` | [esp-vision's modules](../guides/use-esp-vision-modules.md), opt-in: `all` leaves them out. |
 
diff --git a/modules.lock b/modules.lock
index d7a46593..4ed79eeb 100644
--- a/modules.lock
+++ b/modules.lock
@@ -23,4 +23,4 @@ audiodsp          https://github.com/PyDevices/audiodsp.git           733b44b63f
 omnipython-lvgl   https://github.com/PyDevices/omnipython-lvgl.git    e6f88b7737e3c5252e92a6e717142875127816ca
 pygraphics        https://github.com/PyDevices/pygraphics.git         ecc4eb2348b3289f4383d51c6f401e922621e724
 ulab              https://github.com/v923z/micropython-ulab.git       1d3ddd8f5228e2c7335dac71f4846e6abb0ec9f9
-omnipython-lib   https://github.com/PyDevices/pydevices.git          e2ab248006980930ce75be621a92c68724b7a263
+omnipython-lib   https://github.com/PyDevices/pydevices.git          89465318281799aeffd5bc3ee40e95a5c1ca8acc
diff --git a/modules/audiocomponents/manifest.py b/modules/audiocomponents/manifest.py
index 8fff72cb..122d0c28 100644
--- a/modules/audiocomponents/manifest.py
+++ b/modules/audiocomponents/manifest.py
@@ -1,7 +1,4 @@
-# audiocomponents' Python, from omnipython-lib: its instruments and its
-# effects, which the library builds from audiocomponents at the tag its
-# lib-lock.json pins. They import ulab and audiodsp, so name those too (or
-# use all). Frozen at opt=3, as before.
-include("../library.py")
-require("audioinstruments", library="omnipython-lib", opt=3)
-require("audioeffects", library="omnipython-lib", opt=3)
+# audiocomponents is the old name for audioinstruments plus audioeffects,
+# kept so `--modules audiocomponents` still builds both.
+include("../audioinstruments")
+include("../audioeffects")
diff --git a/modules/audioeffects/manifest.py b/modules/audioeffects/manifest.py
new file mode 100644
index 00000000..0a6550b9
--- /dev/null
+++ b/modules/audioeffects/manifest.py
@@ -0,0 +1,6 @@
+# audioeffects, from omnipython-lib: the effect classes, which the library
+# builds from the PyDevices/audioeffects repository at the tag its
+# lib-lock.json pins. They import ulab and audiodsp, so name those too (or
+# use all). Frozen at opt=3.
+include("../library.py")
+require("audioeffects", library="omnipython-lib", opt=3)
diff --git a/modules/audioinstruments/manifest.py b/modules/audioinstruments/manifest.py
new file mode 100644
index 00000000..1a13af2c
--- /dev/null
+++ b/modules/audioinstruments/manifest.py
@@ -0,0 +1,6 @@
+# audioinstruments, from omnipython-lib: the rack and its instruments, which
+# the library builds from the PyDevices/audioinstruments repository at the tag
+# its lib-lock.json pins. They import ulab and audiodsp, so name those too (or
+# use all). Frozen at opt=3.
+include("../library.py")
+require("audioinstruments", library="omnipython-lib", opt=3)
diff --git a/scripts/ci_scope.py b/scripts/ci_scope.py
index c5a65dff..cceeab9a 100644
--- a/scripts/ci_scope.py
+++ b/scripts/ci_scope.py
@@ -58,7 +58,7 @@ def matches(path, patterns):
 CP_NOT_BUILT = ("UPSTREAM", "patches/micropython/**", "patches/micropython-lib/**", "patches/tinyusb/**",
                 "patches/apply_patches.py", "modules/*/examples/**", "modules/*/docs/**")
 # The modules the unix-modules job names. The rest (audioif, picotts, tflite,
-# vision, audiocomponents, all) are not in its list.
+# vision, audioinstruments, audioeffects, audiocomponents, all) are not in its list.
 UNIX_MODULES = ("displayif", "pydevices", "pdwidgets", "palettes", "pngio", "tsmux", "ppa", "jpegio", "cameraif",
                 "mdns", "usbhost", "castif", "h264enc")
 CP_JOBS = {