diff --git a/driver-scala/src/integration/scala/org/mongodb/scala/syncadapter/SyncMongoCluster.scala b/driver-scala/src/integration/scala/org/mongodb/scala/syncadapter/SyncMongoCluster.scala
index 189ca52c0f1..972831f197f 100644
--- a/driver-scala/src/integration/scala/org/mongodb/scala/syncadapter/SyncMongoCluster.scala
+++ b/driver-scala/src/integration/scala/org/mongodb/scala/syncadapter/SyncMongoCluster.scala
@@ -130,24 +130,24 @@ class SyncMongoCluster(wrapped: MongoCluster) extends JMongoCluster {
   override def bulkWrite(
       models: util.List[_ <: ClientNamespacedWriteModel]
   ): ClientBulkWriteResult = {
-    org.junit.Assume.assumeTrue("BULK-TODO implement", java.lang.Boolean.parseBoolean(toString))
-    throw Assertions.fail("BULK-TODO implement")
+    org.junit.Assume.assumeTrue("TODO-JAVA-5531 implement", java.lang.Boolean.parseBoolean(toString))
+    throw Assertions.fail("TODO-JAVA-5531 implement")
   }
 
   override def bulkWrite(
       models: util.List[_ <: ClientNamespacedWriteModel],
       options: ClientBulkWriteOptions
   ): ClientBulkWriteResult = {
-    org.junit.Assume.assumeTrue("BULK-TODO implement", java.lang.Boolean.parseBoolean(toString))
-    throw Assertions.fail("BULK-TODO implement")
+    org.junit.Assume.assumeTrue("TODO-JAVA-5531 implement", java.lang.Boolean.parseBoolean(toString))
+    throw Assertions.fail("TODO-JAVA-5531 implement")
   }
 
   override def bulkWrite(
       clientSession: ClientSession,
       models: util.List[_ <: ClientNamespacedWriteModel]
   ): ClientBulkWriteResult = {
-    org.junit.Assume.assumeTrue("BULK-TODO implement", java.lang.Boolean.parseBoolean(toString))
-    throw Assertions.fail("BULK-TODO implement")
+    org.junit.Assume.assumeTrue("TODO-JAVA-5531 implement", java.lang.Boolean.parseBoolean(toString))
+    throw Assertions.fail("TODO-JAVA-5531 implement")
   }
 
   override def bulkWrite(
@@ -155,7 +155,7 @@ class SyncMongoCluster(wrapped: MongoCluster) extends JMongoCluster {
       models: util.List[_ <: ClientNamespacedWriteModel],
       options: ClientBulkWriteOptions
   ): ClientBulkWriteResult = {
-    org.junit.Assume.assumeTrue("BULK-TODO implement", java.lang.Boolean.parseBoolean(toString))
-    throw Assertions.fail("BULK-TODO implement")
+    org.junit.Assume.assumeTrue("TODO-JAVA-5531 implement", java.lang.Boolean.parseBoolean(toString))
+    throw Assertions.fail("TODO-JAVA-5531 implement")
   }
 }
diff --git a/driver-scala/src/test/scala/org/mongodb/scala/ApiAliasAndCompanionSpec.scala b/driver-scala/src/test/scala/org/mongodb/scala/ApiAliasAndCompanionSpec.scala
index b6d86bf8118..5b8e46c598d 100644
--- a/driver-scala/src/test/scala/org/mongodb/scala/ApiAliasAndCompanionSpec.scala
+++ b/driver-scala/src/test/scala/org/mongodb/scala/ApiAliasAndCompanionSpec.scala
@@ -154,7 +154,7 @@ class ApiAliasAndCompanionSpec extends BaseSpec {
       .map(_.getSimpleName)
       .toSet +
       "MongoException" - "MongoGridFSException" - "MongoConfigurationException" - "MongoWriteConcernWithResponseException" -
-      // BULK-TODO remove this exclusion
+      // TODO-JAVA-5531 remove the `"ClientBulkWriteException"` exclusion
       "ClientBulkWriteException"
 
     val objects = new Reflections(
diff --git a/driver-scala/src/test/scala/org/mongodb/scala/MongoClientSpec.scala b/driver-scala/src/test/scala/org/mongodb/scala/MongoClientSpec.scala
index d5516b984ae..4e0189bfd5e 100644
--- a/driver-scala/src/test/scala/org/mongodb/scala/MongoClientSpec.scala
+++ b/driver-scala/src/test/scala/org/mongodb/scala/MongoClientSpec.scala
@@ -36,11 +36,11 @@ class MongoClientSpec extends BaseSpec with MockitoSugar {
     wrapped.foreach((name: String) => {
       val cleanedName = name.stripPrefix("get")
 
-      // TODO("BULK-TODO remove this if when bulkWrite is implemented and uncomment line 43")
       if (!cleanedName.contains("bulkWrite")) {
+        // TODO-JAVA-5531 remove this whole `if` block
         assert(local.contains(name) | local.contains(cleanedName.head.toLower + cleanedName.tail), s"Missing: $name")
       }
-      // assert(local.contains(name) | local.contains(cleanedName.head.toLower + cleanedName.tail), s"Missing: $name")
+      // TODO-JAVA-5531 uncomment: assert(local.contains(name) | local.contains(cleanedName.head.toLower + cleanedName.tail), s"Missing: $name")
     })
   }