diff --git a/src/mongocxx/include/mongocxx/v1/range-fwd.hpp b/src/mongocxx/include/mongocxx/v1/auto_encryption_options-fwd.hpp
similarity index 90%
rename from src/mongocxx/include/mongocxx/v1/range-fwd.hpp
rename to src/mongocxx/include/mongocxx/v1/auto_encryption_options-fwd.hpp
index 2d427532cb..94c2bc7d1c 100644
--- a/src/mongocxx/include/mongocxx/v1/range-fwd.hpp
+++ b/src/mongocxx/include/mongocxx/v1/auto_encryption_options-fwd.hpp
@@ -19,7 +19,7 @@
 namespace mongocxx {
 namespace v1 {
 
-class range;
+class auto_encryption_options;
 
 } // namespace v1
 } // namespace mongocxx
@@ -28,5 +28,5 @@ class range;
 
 ///
 /// @file
-/// Declares @ref mongocxx::v1::range.
+/// Declares @ref mongocxx::v1::auto_encryption_options.
 ///
diff --git a/src/mongocxx/include/mongocxx/v1/auto_encryption.hpp b/src/mongocxx/include/mongocxx/v1/auto_encryption_options.hpp
similarity index 88%
rename from src/mongocxx/include/mongocxx/v1/auto_encryption.hpp
rename to src/mongocxx/include/mongocxx/v1/auto_encryption_options.hpp
index a1c41a55b6..2e9d84d536 100644
--- a/src/mongocxx/include/mongocxx/v1/auto_encryption.hpp
+++ b/src/mongocxx/include/mongocxx/v1/auto_encryption_options.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/auto_encryption-fwd.hpp>
+#include <mongocxx/v1/auto_encryption_options-fwd.hpp>
 
 //
 
@@ -30,7 +30,7 @@ namespace v1 {
 /// - [MongoClient Options for Queryable Encryption (MongoDB Manual)](https://www.mongodb.com/docs/manual/core/queryable-encryption/reference/qe-options-clients/)
 /// - [MongoClient Options for CSFLE](https://www.mongodb.com/docs/manual/core/csfle/reference/csfle-options-clients/)
 ///
-class auto_encryption {};
+class auto_encryption_options {};
 
 } // namespace v1
 } // namespace mongocxx
@@ -39,5 +39,5 @@ class auto_encryption {};
 
 ///
 /// @file
-/// Provides @ref mongocxx::v1::auto_encryption.
+/// Provides @ref mongocxx::v1::auto_encryption_options.
 ///
diff --git a/src/mongocxx/include/mongocxx/v1/data_key-fwd.hpp b/src/mongocxx/include/mongocxx/v1/data_key_options-fwd.hpp
similarity index 91%
rename from src/mongocxx/include/mongocxx/v1/data_key-fwd.hpp
rename to src/mongocxx/include/mongocxx/v1/data_key_options-fwd.hpp
index 8a8552a42e..383ed7deda 100644
--- a/src/mongocxx/include/mongocxx/v1/data_key-fwd.hpp
+++ b/src/mongocxx/include/mongocxx/v1/data_key_options-fwd.hpp
@@ -19,7 +19,7 @@
 namespace mongocxx {
 namespace v1 {
 
-class data_key;
+class data_key_options;
 
 } // namespace v1
 } // namespace mongocxx
@@ -28,5 +28,5 @@ class data_key;
 
 ///
 /// @file
-/// Declares @ref mongocxx::v1::data_key.
+/// Declares @ref mongocxx::v1::data_key_options.
 ///
diff --git a/src/mongocxx/include/mongocxx/v1/data_key.hpp b/src/mongocxx/include/mongocxx/v1/data_key_options.hpp
similarity index 89%
rename from src/mongocxx/include/mongocxx/v1/data_key.hpp
rename to src/mongocxx/include/mongocxx/v1/data_key_options.hpp
index 487084b661..2db89d5fb4 100644
--- a/src/mongocxx/include/mongocxx/v1/data_key.hpp
+++ b/src/mongocxx/include/mongocxx/v1/data_key_options.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/data_key-fwd.hpp>
+#include <mongocxx/v1/data_key_options-fwd.hpp>
 
 //
 
@@ -31,7 +31,7 @@ namespace v1 {
 ///
 /// @attention This feature is experimental! It is not ready for use!
 ///
-class data_key {};
+class data_key_options {};
 
 } // namespace v1
 } // namespace mongocxx
@@ -40,5 +40,5 @@ class data_key {};
 
 ///
 /// @file
-/// Provides @ref mongocxx::v1::data_key.
+/// Provides @ref mongocxx::v1::data_key_options.
 ///
diff --git a/src/mongocxx/include/mongocxx/v1/auto_encryption-fwd.hpp b/src/mongocxx/include/mongocxx/v1/encrypt_options-fwd.hpp
similarity index 91%
rename from src/mongocxx/include/mongocxx/v1/auto_encryption-fwd.hpp
rename to src/mongocxx/include/mongocxx/v1/encrypt_options-fwd.hpp
index 6da52d1c07..1b5c04fe5f 100644
--- a/src/mongocxx/include/mongocxx/v1/auto_encryption-fwd.hpp
+++ b/src/mongocxx/include/mongocxx/v1/encrypt_options-fwd.hpp
@@ -19,7 +19,7 @@
 namespace mongocxx {
 namespace v1 {
 
-class auto_encryption;
+class encrypt_options;
 
 } // namespace v1
 } // namespace mongocxx
@@ -28,5 +28,5 @@ class auto_encryption;
 
 ///
 /// @file
-/// Declares @ref mongocxx::v1::auto_encryption.
+/// Declares @ref mongocxx::v1::encrypt_options.
 ///
diff --git a/src/mongocxx/include/mongocxx/v1/encrypt.hpp b/src/mongocxx/include/mongocxx/v1/encrypt_options.hpp
similarity index 92%
rename from src/mongocxx/include/mongocxx/v1/encrypt.hpp
rename to src/mongocxx/include/mongocxx/v1/encrypt_options.hpp
index a956b70774..e61266c133 100644
--- a/src/mongocxx/include/mongocxx/v1/encrypt.hpp
+++ b/src/mongocxx/include/mongocxx/v1/encrypt_options.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/encrypt-fwd.hpp>
+#include <mongocxx/v1/encrypt_options-fwd.hpp>
 
 //
 
@@ -33,7 +33,7 @@ namespace v1 {
 ///
 /// @attention This feature is experimental! It is not ready for use!
 ///
-class encrypt {
+class encrypt_options {
     // This class implements `EncryptOpts`:
     //  - https://specifications.readthedocs.io/en/latest/client-side-encryption/client-side-encryption/
 };
@@ -45,5 +45,5 @@ class encrypt {
 
 ///
 /// @file
-/// Provides @ref mongocxx::v1::encrypt.
+/// Provides @ref mongocxx::v1::encrypt_options.
 ///
diff --git a/src/mongocxx/include/mongocxx/v1/encrypt-fwd.hpp b/src/mongocxx/include/mongocxx/v1/range_options-fwd.hpp
similarity index 92%
rename from src/mongocxx/include/mongocxx/v1/encrypt-fwd.hpp
rename to src/mongocxx/include/mongocxx/v1/range_options-fwd.hpp
index cc166388ca..9481cf5ba8 100644
--- a/src/mongocxx/include/mongocxx/v1/encrypt-fwd.hpp
+++ b/src/mongocxx/include/mongocxx/v1/range_options-fwd.hpp
@@ -19,7 +19,7 @@
 namespace mongocxx {
 namespace v1 {
 
-class encrypt;
+class range_options;
 
 } // namespace v1
 } // namespace mongocxx
@@ -28,5 +28,5 @@ class encrypt;
 
 ///
 /// @file
-/// Declares @ref mongocxx::v1::encrypt.
+/// Declares @ref mongocxx::v1::range_options.
 ///
diff --git a/src/mongocxx/include/mongocxx/v1/range.hpp b/src/mongocxx/include/mongocxx/v1/range_options.hpp
similarity index 90%
rename from src/mongocxx/include/mongocxx/v1/range.hpp
rename to src/mongocxx/include/mongocxx/v1/range_options.hpp
index 58bced2d7c..a3ac2ce760 100644
--- a/src/mongocxx/include/mongocxx/v1/range.hpp
+++ b/src/mongocxx/include/mongocxx/v1/range_options.hpp
@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include <mongocxx/v1/range-fwd.hpp>
+#include <mongocxx/v1/range_options-fwd.hpp>
 
 //
 
@@ -31,7 +31,7 @@ namespace v1 {
 ///
 /// @attention This feature is experimental! It is not ready for use!
 ///
-class range {};
+class range_options {};
 
 } // namespace v1
 } // namespace mongocxx
@@ -40,5 +40,5 @@ class range {};
 
 ///
 /// @file
-/// Provides @ref mongocxx::v1::range.
+/// Provides @ref mongocxx::v1::range_options.
 ///
diff --git a/src/mongocxx/lib/CMakeLists.txt b/src/mongocxx/lib/CMakeLists.txt
index 1ced1a37e9..a7f0293eb0 100644
--- a/src/mongocxx/lib/CMakeLists.txt
+++ b/src/mongocxx/lib/CMakeLists.txt
@@ -123,7 +123,7 @@ set(mongocxx_sources_v_noabi
 set(mongocxx_sources_v1
     mongocxx/v1/aggregate_options.cpp
     mongocxx/v1/apm.cpp
-    mongocxx/v1/auto_encryption.cpp
+    mongocxx/v1/auto_encryption_options.cpp
     mongocxx/v1/bulk_write.cpp
     mongocxx/v1/change_stream.cpp
     mongocxx/v1/client_encryption.cpp
@@ -135,7 +135,7 @@ set(mongocxx_sources_v1
     mongocxx/v1/config/version.cpp
     mongocxx/v1/count_options.cpp
     mongocxx/v1/cursor.cpp
-    mongocxx/v1/data_key.cpp
+    mongocxx/v1/data_key_options.cpp
     mongocxx/v1/database.cpp
     mongocxx/v1/delete_many_options.cpp
     mongocxx/v1/delete_many_result.cpp
@@ -144,7 +144,7 @@ set(mongocxx_sources_v1
     mongocxx/v1/detail/postlude.cpp
     mongocxx/v1/detail/prelude.cpp
     mongocxx/v1/distinct_options.cpp
-    mongocxx/v1/encrypt.cpp
+    mongocxx/v1/encrypt_options.cpp
     mongocxx/v1/estimated_document_count_options.cpp
     mongocxx/v1/events/command_failed.cpp
     mongocxx/v1/events/command_started.cpp
@@ -180,7 +180,7 @@ set(mongocxx_sources_v1
     mongocxx/v1/logger.cpp
     mongocxx/v1/pipeline.cpp
     mongocxx/v1/pool.cpp
-    mongocxx/v1/range.cpp
+    mongocxx/v1/range_options.cpp
     mongocxx/v1/read_concern.cpp
     mongocxx/v1/read_preference.cpp
     mongocxx/v1/replace_one_options.cpp
diff --git a/src/mongocxx/lib/mongocxx/v1/range.cpp b/src/mongocxx/lib/mongocxx/v1/auto_encryption_options.cpp
similarity index 92%
rename from src/mongocxx/lib/mongocxx/v1/range.cpp
rename to src/mongocxx/lib/mongocxx/v1/auto_encryption_options.cpp
index e321481bfa..e8c10aa47f 100644
--- a/src/mongocxx/lib/mongocxx/v1/range.cpp
+++ b/src/mongocxx/lib/mongocxx/v1/auto_encryption_options.cpp
@@ -12,4 +12,4 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <mongocxx/v1/range.hpp>
+#include <mongocxx/v1/auto_encryption_options.hpp>
diff --git a/src/mongocxx/lib/mongocxx/v1/data_key.cpp b/src/mongocxx/lib/mongocxx/v1/data_key_options.cpp
similarity index 93%
rename from src/mongocxx/lib/mongocxx/v1/data_key.cpp
rename to src/mongocxx/lib/mongocxx/v1/data_key_options.cpp
index acabcf1aa9..74a458e8f4 100644
--- a/src/mongocxx/lib/mongocxx/v1/data_key.cpp
+++ b/src/mongocxx/lib/mongocxx/v1/data_key_options.cpp
@@ -12,4 +12,4 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <mongocxx/v1/data_key.hpp>
+#include <mongocxx/v1/data_key_options.hpp>
diff --git a/src/mongocxx/lib/mongocxx/v1/auto_encryption.cpp b/src/mongocxx/lib/mongocxx/v1/encrypt_options.cpp
similarity index 93%
rename from src/mongocxx/lib/mongocxx/v1/auto_encryption.cpp
rename to src/mongocxx/lib/mongocxx/v1/encrypt_options.cpp
index 8ed867b16c..9aebe5df00 100644
--- a/src/mongocxx/lib/mongocxx/v1/auto_encryption.cpp
+++ b/src/mongocxx/lib/mongocxx/v1/encrypt_options.cpp
@@ -12,4 +12,4 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <mongocxx/v1/auto_encryption.hpp>
+#include <mongocxx/v1/encrypt_options.hpp>
diff --git a/src/mongocxx/lib/mongocxx/v1/encrypt.cpp b/src/mongocxx/lib/mongocxx/v1/range_options.cpp
similarity index 93%
rename from src/mongocxx/lib/mongocxx/v1/encrypt.cpp
rename to src/mongocxx/lib/mongocxx/v1/range_options.cpp
index 5acbd1b8b8..820b641f2d 100644
--- a/src/mongocxx/lib/mongocxx/v1/encrypt.cpp
+++ b/src/mongocxx/lib/mongocxx/v1/range_options.cpp
@@ -12,4 +12,4 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <mongocxx/v1/encrypt.hpp>
+#include <mongocxx/v1/range_options.hpp>