diff --git a/libnvme/doc/man/nvme_cmd_get_log_lid.2 b/libnvme/doc/man/nvme_cmd_get_log_lid.2
index 39fd383788..fea09da61e 100644
--- a/libnvme/doc/man/nvme_cmd_get_log_lid.2
+++ b/libnvme/doc/man/nvme_cmd_get_log_lid.2
@@ -136,15 +136,15 @@ enum nvme_cmd_get_log_lid {
 , 
 .br
 .br
-.BI "    NVME_LOG_LID_DISCOVER"
+.BI "    NVME_LOG_LID_DISCOVERY"
 , 
 .br
 .br
-.BI "    NVME_LOG_LID_HOST_DISCOVER"
+.BI "    NVME_LOG_LID_HOST_DISCOVERY"
 , 
 .br
 .br
-.BI "    NVME_LOG_LID_AVE_DISCOVER"
+.BI "    NVME_LOG_LID_AVE_DISCOVERY"
 , 
 .br
 .br
@@ -230,11 +230,11 @@ Reclaim Unit Handle Usage
 FDP Statistics
 .IP "NVME_LOG_LID_FDP_EVENTS" 12
 FDP Events
-.IP "NVME_LOG_LID_DISCOVER" 12
+.IP "NVME_LOG_LID_DISCOVERY" 12
 Discovery
-.IP "NVME_LOG_LID_HOST_DISCOVER" 12
+.IP "NVME_LOG_LID_HOST_DISCOVERY" 12
 Host Discovery
-.IP "NVME_LOG_LID_AVE_DISCOVER" 12
+.IP "NVME_LOG_LID_AVE_DISCOVERY" 12
 AVE Discovery
 .IP "NVME_LOG_LID_PULL_MODEL_DDC_REQ" 12
 Pull Model DDC Request
diff --git a/libnvme/doc/rst/types.rst b/libnvme/doc/rst/types.rst
index 30b223d8d0..bdeacf93f1 100644
--- a/libnvme/doc/rst/types.rst
+++ b/libnvme/doc/rst/types.rst
@@ -14036,13 +14036,13 @@ true if **status** is of the specified type and value
 ``NVME_LOG_LID_FDP_EVENTS``
   FDP Events
 
-``NVME_LOG_LID_DISCOVER``
+``NVME_LOG_LID_DISCOVERY``
   Discovery
 
-``NVME_LOG_LID_HOST_DISCOVER``
+``NVME_LOG_LID_HOST_DISCOVERY``
   Host Discovery
 
-``NVME_LOG_LID_AVE_DISCOVER``
+``NVME_LOG_LID_AVE_DISCOVERY``
   AVE Discovery
 
 ``NVME_LOG_LID_PULL_MODEL_DDC_REQ``
diff --git a/libnvme/examples/discover-loop.py b/libnvme/examples/discover-loop.py
index 741f2dcf8e..0034753232 100644
--- a/libnvme/examples/discover-loop.py
+++ b/libnvme/examples/discover-loop.py
@@ -31,11 +31,11 @@ def discover(host, ctrl, iteration):
 
     slp = ctrl.supported_log_pages()
     try:
-        dlp_supp_opts = slp[nvme.NVME_LOG_LID_DISCOVER] >> 16
+        dlp_supp_opts = slp[nvme.NVME_LOG_LID_DISCOVERY] >> 16
     except (TypeError, IndexError):
         dlp_supp_opts = 0
 
-    print(f"LID {nvme.NVME_LOG_LID_DISCOVER}h (Discovery), supports: {disc_supp_str(dlp_supp_opts)}")
+    print(f"LID {nvme.NVME_LOG_LID_DISCOVERY}h (Discovery), supports: {disc_supp_str(dlp_supp_opts)}")
 
     try:
         lsp = nvme.NVMF_LOG_DISC_LSP_PLEO if dlp_supp_opts & nvme.NVMF_LOG_DISC_LID_PLEOS else 0
diff --git a/libnvme/libnvme/README.md b/libnvme/libnvme/README.md
index d733271a6e..a0142f1ef2 100644
--- a/libnvme/libnvme/README.md
+++ b/libnvme/libnvme/README.md
@@ -42,11 +42,11 @@ except Exception as e:
 supported_log_pages = ctrl.supported_log_pages()
 try:
     # Get the supported options for the Get Discovery Log Page command
-    dlp_supp_opts = supported_log_pages[nvme.NVME_LOG_LID_DISCOVER] >> 16
+    dlp_supp_opts = supported_log_pages[nvme.NVME_LOG_LID_DISCOVERY] >> 16
 except (TypeError, IndexError):
     dlp_supp_opts = 0
 
-print(f"LID {nvme.NVME_LOG_LID_DISCOVER:02x}h (Discovery), supports: {disc_supp_str(dlp_supp_opts)}")
+print(f"LID {nvme.NVME_LOG_LID_DISCOVERY:02x}h (Discovery), supports: {disc_supp_str(dlp_supp_opts)}")
 try:
     lsp = nvme.NVMF_LOG_DISC_LSP_PLEO if dlp_supp_opts & nvme.NVMF_LOG_DISC_LID_PLEOS else 0
     log_pages = ctrl.discover(lsp=lsp)
diff --git a/subprojects/openssl.wrap b/subprojects/openssl.wrap
new file mode 100644
index 0000000000..76688c8efd
--- /dev/null
+++ b/subprojects/openssl.wrap
@@ -0,0 +1,2 @@
+[wrap-redirect]
+filename = libnvme/subprojects/openssl.wrap