diff --git a/src/Client.php b/src/Client.php
index ae0433f62..32d064f64 100644
--- a/src/Client.php
+++ b/src/Client.php
@@ -92,7 +92,7 @@ class Client
      *
      * Supported driver-specific options:
      *
-     *  * builderEncoder (MongoDB\Builder\Encoder): Encoder for query and
+     *  * builderEncoder (MongoDB\Codec\Encoder): Encoder for query and
      *    aggregation builders. If not given, the default encoder will be used.
      *
      *  * typeMap (array): Default type map for cursors and BSON documents.
diff --git a/src/Collection.php b/src/Collection.php
index a4ff6326f..f65aa07c0 100644
--- a/src/Collection.php
+++ b/src/Collection.php
@@ -114,7 +114,7 @@ class Collection
      *
      * Supported options:
      *
-     *  * builderEncoder (MongoDB\Builder\Encoder): Encoder for query and
+     *  * builderEncoder (MongoDB\Codec\Encoder): Encoder for query and
      *    aggregation builders. If not given, the default encoder will be used.
      *
      *  * codec (MongoDB\Codec\DocumentCodec): Codec used to decode documents
diff --git a/src/Database.php b/src/Database.php
index 36154cfa5..0652a896e 100644
--- a/src/Database.php
+++ b/src/Database.php
@@ -90,7 +90,7 @@ class Database
      *
      * Supported options:
      *
-     *  * builderEncoder (MongoDB\Builder\Encoder): Encoder for query and
+     *  * builderEncoder (MongoDB\Codec\Encoder): Encoder for query and
      *    aggregation builders. If not given, the default encoder will be used.
      *
      *  * readConcern (MongoDB\Driver\ReadConcern): The default read concern to
diff --git a/src/Operation/BulkWrite.php b/src/Operation/BulkWrite.php
index a5367bf2c..5c0b67ea5 100644
--- a/src/Operation/BulkWrite.php
+++ b/src/Operation/BulkWrite.php
@@ -98,7 +98,7 @@ class BulkWrite implements Executable
      *
      * Supported options for the bulk write operation:
      *
-     *  * builderEncoder (MongoDB\Builder\Encoder): Encoder for query and
+     *  * builderEncoder (MongoDB\Codec\Encoder): Encoder for query and
      *    aggregation builders. If not given, the default encoder will be used.
      *
      *  * bypassDocumentValidation (boolean): If true, allows the write to