diff --git a/src/bsoncxx/lib/bsoncxx/v1/exception.cpp b/src/bsoncxx/lib/bsoncxx/v1/exception.cpp
index ccc25765f7..a2a601d6bc 100644
--- a/src/bsoncxx/lib/bsoncxx/v1/exception.cpp
+++ b/src/bsoncxx/lib/bsoncxx/v1/exception.cpp
@@ -30,10 +30,10 @@ std::error_category const& source_error_category() {
             return "bsoncxx::v1::source_errc";
         }
 
-        std::string message(int e) const noexcept override {
+        std::string message(int v) const noexcept override {
             using code = v1::source_errc;
 
-            switch (static_cast<code>(e)) {
+            switch (static_cast<code>(v)) {
                 case code::zero:
                     return "zero";
                 case code::bsoncxx:
@@ -41,7 +41,7 @@ std::error_category const& source_error_category() {
                 case code::bson:
                     return "bson";
                 default:
-                    return "unknown: " + std::to_string(e);
+                    return std::string(this->name()) + ':' + std::to_string(v);
             }
         }
     };
@@ -57,10 +57,10 @@ std::error_category const& type_error_category() {
             return "bsoncxx::v1::type_errc";
         }
 
-        std::string message(int e) const noexcept override {
+        std::string message(int v) const noexcept override {
             using code = v1::type_errc;
 
-            switch (static_cast<code>(e)) {
+            switch (static_cast<code>(v)) {
                 case code::zero:
                     return "zero";
                 case code::invalid_argument:
@@ -68,7 +68,7 @@ std::error_category const& type_error_category() {
                 case code::runtime_error:
                     return "runtime error";
                 default:
-                    return "unknown: " + std::to_string(e);
+                    return std::string(this->name()) + ':' + std::to_string(v);
             }
         }
     };
diff --git a/src/bsoncxx/test/v1/exception.cpp b/src/bsoncxx/test/v1/exception.cpp
index e3a5edbc5b..3aaa3d50c4 100644
--- a/src/bsoncxx/test/v1/exception.cpp
+++ b/src/bsoncxx/test/v1/exception.cpp
@@ -31,11 +31,11 @@ TEST_CASE("source", "[bsoncxx][v1][error]") {
     }
 
     SECTION("message") {
-        CHECK(c.message(-1) == "unknown: -1");
+        CHECK(c.message(-1) == "bsoncxx::v1::source_errc:-1");
         CHECK(c.message(0) == "zero");
         CHECK(c.message(1) == "bsoncxx");
         CHECK(c.message(2) == "bson");
-        CHECK(c.message(3) == "unknown: 3");
+        CHECK(c.message(3) == "bsoncxx::v1::source_errc:3");
     }
 }
 
@@ -47,11 +47,11 @@ TEST_CASE("type", "[bsoncxx][v1][error]") {
     }
 
     SECTION("message") {
-        CHECK(c.message(-1) == "unknown: -1");
+        CHECK(c.message(-1) == "bsoncxx::v1::type_errc:-1");
         CHECK(c.message(0) == "zero");
         CHECK(c.message(1) == "invalid argument");
         CHECK(c.message(2) == "runtime error");
-        CHECK(c.message(3) == "unknown: 3");
+        CHECK(c.message(3) == "bsoncxx::v1::type_errc:3");
     }
 }