diff --git a/src/core/config/Categories.json b/src/core/config/Categories.json
index 98a88240..bc7c079d 100644
--- a/src/core/config/Categories.json
+++ b/src/core/config/Categories.json
@@ -160,6 +160,7 @@
             "Citrix CTX1 Decode",
             "AES Key Wrap",
             "AES Key Unwrap",
+            "Derive ECDH Key Material",
             "Pseudo-Random Number Generator",
             "Enigma",
             "Bombe",
@@ -611,13 +612,14 @@
             "Generate VISA PVV",
             "Verify VISA PVV",
             "Derive DUKPT Key",
-            "Derive ECDH Key Material",
+            "Derive DUKPT AES Key",
+            "Generate Key",
             "Calculate Payment KCV",
             "Generate AS2805 KEK Validation",
-            "Parse Thales payShield command",
-            "Parse Futurex Excrypt command",
-            "Parse TR-31 key block",
-            "Parse TR-34 B9 envelope",
+            "Parse Thales payShield Command",
+            "Parse Futurex Excrypt Command",
+            "Parse TR-31 Key Block",
+            "Parse TR-34 Key Transport",
             "HMAC",
             "CMAC",
             "AES Encrypt",