diff --git a/README.md b/README.md
index e5e8ca1..9fb5d54 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@
 found, it will generate a self-sign a certificate before launching the
 server.  The keys are generated by the `prime256v1` algorithm.  The
 certificate
- - is issued by `C=US, O=Intel BMC, CN=testhost`,
+ - is issued by `C=US, O=OpenBMC, CN=testhost`,
  - is valid for 10 years,
  - has a random serial number, and
  - is signed using the `SHA-256` algorithm.
diff --git a/include/ssl_key_handler.hpp b/include/ssl_key_handler.hpp
index 34a7c04..9a2e877 100644
--- a/include/ssl_key_handler.hpp
+++ b/include/ssl_key_handler.hpp
@@ -145,8 +145,7 @@
                 reinterpret_cast<const unsigned char *>("US"), -1, -1, 0);
             X509_NAME_add_entry_by_txt(
                 name, "O", MBSTRING_ASC,
-                reinterpret_cast<const unsigned char *>("Intel BMC"), -1, -1,
-                0);
+                reinterpret_cast<const unsigned char *>("OpenBMC"), -1, -1, 0);
             X509_NAME_add_entry_by_txt(
                 name, "CN", MBSTRING_ASC,
                 reinterpret_cast<const unsigned char *>("testhost"), -1, -1, 0);
@@ -326,4 +325,4 @@
 }
 } // namespace ensuressl
 
-#endif
\ No newline at end of file
+#endif