diff --git a/.typos.toml b/.typos.toml
index b8dd5a324465..c03ed6d4a537 100644
--- a/.typos.toml
+++ b/.typos.toml
@@ -16,6 +16,10 @@ ND = "ND"       # np.NDArray
 somes = "somes" # many `Some`
 teh = "teh"     # part of @teh-cmc
 
+# Use the more common spelling
+adaptor = "adapter"
+adaptors = "adapters"
+
 # For consistency we prefer American English:
 aeroplane = "airplane"
 analogue = "analog"
diff --git a/rerun_cpp/src/rerun/component_batch_adapter.hpp b/rerun_cpp/src/rerun/component_batch_adapter.hpp
index 0b205519f3fd..581d10ffc47a 100644
--- a/rerun_cpp/src/rerun/component_batch_adapter.hpp
+++ b/rerun_cpp/src/rerun/component_batch_adapter.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 namespace rerun {
-    /// The ComponentBatchAdaptor trait is responsible for mapping an input argument to a
+    /// The `ComponentBatchAdapter` trait is responsible for mapping an input argument to a
     /// ComponentBatch.
     ///
     /// There are default implementations for standard containers of components, as well as single
diff --git a/rerun_cpp/src/rerun/component_batch_adapter_builtins.hpp b/rerun_cpp/src/rerun/component_batch_adapter_builtins.hpp
index 352bbf6c4163..49e3b59a4896 100644
--- a/rerun_cpp/src/rerun/component_batch_adapter_builtins.hpp
+++ b/rerun_cpp/src/rerun/component_batch_adapter_builtins.hpp
@@ -64,7 +64,7 @@ namespace rerun {
         }
     };
 
-    /// Adaptor from a C-Array reference.
+    /// Adapter from a C-Array reference.
     ///
     /// *Attention*: Does *not* take ownership of the data,
     /// you need to ensure that the data outlives the component batch.
diff --git a/rerun_cpp/tests/component_batch.cpp b/rerun_cpp/tests/component_batch.cpp
index 91ca36c7c596..4c0afdf2bdfc 100644
--- a/rerun_cpp/tests/component_batch.cpp
+++ b/rerun_cpp/tests/component_batch.cpp
@@ -11,7 +11,7 @@
 
 using namespace rerun::components;
 
-SCENARIO("ComponentBatch creation via common adaptors", TEST_TAG) {
+SCENARIO("ComponentBatch creation via common adapters", TEST_TAG) {
     GIVEN("a vector of components") {
         std::vector<Position2D> components = {
             Position2D(0.0f, 1.0f),