diff --git a/source/gridfs/gridfs-spec.md b/source/gridfs/gridfs-spec.md
index e272563225..4052b94973 100644
--- a/source/gridfs/gridfs-spec.md
+++ b/source/gridfs/gridfs-spec.md
@@ -670,8 +670,8 @@ This method is an optimisation over deleting each revision of a stored file indi
 **Implementation details:**
 
 Drivers MUST first find the `_id` field of all files collection documents with the given filename. Drivers MUST then
-delete all chunks with `files_id` in the found ids that was just deleted. Drivers MUST then delete all files collection
-documents with the found ids.
+delete all files collection documents with the found ids. Drivers MUST then delete all chunks with `files_id` in the
+found ids that was just deleted.
 
 If there are no files collection documents with the given filename, drivers MUST raise an error.
 
diff --git a/source/gridfs/tests/deleteByName.json b/source/gridfs/tests/deleteByName.json
index 0590ee11ce..884d0300ce 100644
--- a/source/gridfs/tests/deleteByName.json
+++ b/source/gridfs/tests/deleteByName.json
@@ -221,7 +221,7 @@
             "filename": "missing-file"
           },
           "expectError": {
-            "isError": true
+            "isClientError": true
           }
         }
       ]
diff --git a/source/gridfs/tests/deleteByName.yml b/source/gridfs/tests/deleteByName.yml
index b33e740058..b63b15633a 100644
--- a/source/gridfs/tests/deleteByName.yml
+++ b/source/gridfs/tests/deleteByName.yml
@@ -99,4 +99,4 @@ tests:
         object: *bucket0
         arguments:
           filename: missing-file
-        expectError: { isError: true } # FileNotFound
+        expectError: { isClientError: true } # FileNotFound
diff --git a/source/gridfs/tests/renameByName.json b/source/gridfs/tests/renameByName.json
index 81d36b4ee8..26f04fb9e0 100644
--- a/source/gridfs/tests/renameByName.json
+++ b/source/gridfs/tests/renameByName.json
@@ -304,7 +304,7 @@
             "newFilename": "newfilename"
           },
           "expectError": {
-            "isError": true
+            "isClientError": true
           }
         }
       ]
diff --git a/source/gridfs/tests/renameByName.yml b/source/gridfs/tests/renameByName.yml
index 2904b78f0f..f628ca9c5f 100644
--- a/source/gridfs/tests/renameByName.yml
+++ b/source/gridfs/tests/renameByName.yml
@@ -110,4 +110,4 @@ tests:
         arguments:
           filename: missing-file
           newFilename: newfilename
-        expectError: { isError: true } # FileNotFound
+        expectError: { isClientError: true } # FileNotFound