diff --git a/schema/cryptography-defs.json b/schema/cryptography-defs.json
index b2435f1fc..1a7b774ee 100644
--- a/schema/cryptography-defs.json
+++ b/schema/cryptography-defs.json
@@ -802,15 +802,23 @@
         {
           "name": "RFC8554",
           "url": "https://doi.org/10.17487/RFC8554"
+        },
+        {
+          "name": "RFC9858",
+          "url": "https://doi.org/10.17487/RFC9858"
         }
       ],
       "variant": [
         {
-          "pattern": "LMS[_{hashAlgorithm}][_M{bytesPerNode}][_H{treeHeight}]",
+          "pattern": "LMS[_(SHA256|SHAKE)][_M{bytesPerNode}][_H{treeHeight}]",
+          "primitive": "signature"
+        },
+        {
+          "pattern": "LMOTS[_(SHA256|SHAKE)][_N{hashOutputLength}][_W{winternitzParameter}]",
           "primitive": "signature"
         },
         {
-          "pattern": "LMOTS[_{hashfun}][_N{bytespernode}][_H{treeheight}]",
+          "pattern": "HSS[_L{levels}][(_<LMS>_<LMOTS>)+]",
           "primitive": "signature"
         }
       ]
diff --git a/schema/cryptography-defs.schema.json b/schema/cryptography-defs.schema.json
index e17815057..f14c687c1 100644
--- a/schema/cryptography-defs.schema.json
+++ b/schema/cryptography-defs.schema.json
@@ -71,8 +71,8 @@
               "properties": {
                 "pattern": {
                   "type": "string",
-                  "title": "Standard Name",
-                  "description": "Defines the pattern used to construct the complete algorithm name. Placeholders are defined by {} for algorithm-specific properties."
+                  "title": "Naming Pattern",
+                  "description": "Defines the pattern used to construct the algorithm name. `{name}` is a placeholder for an algorithm-specific value, `[ ]` marks optional content, `|` separates alternatives of which exactly one is used, across the whole pattern or within `( )`, and `( )+` repeats a group one or more times. `<Name>` stands for a name built from the variant pattern whose text before the first notation character is `Name`, for example `<LMS>`. All other characters, such as `-`, `_` and the `+` in `SPAKE2+`, are part of the name. An omitted optional part means the value is unspecified, except for a fixed literal such as `[-PKCS7]` or `[E]`, whose absence selects the variant without it. For `HSS`, the `LMS`/`LMOTS` pairs are listed per level, starting at the root; when both `{levels}` and pairs are given, their numbers shall be equal."
                 },
                 "primitive": {
                   "type": "string",