diff --git a/ALGORITHMS.md b/ALGORITHMS.md
index fff31036..f010b26f 100644
--- a/ALGORITHMS.md
+++ b/ALGORITHMS.md
@@ -75,23 +75,23 @@ As standardization for these algorithms within TLS is not done, all TLS code poi
 | mldsa44 | 0xfed0 |Yes| OQS_CODEPOINT_MLDSA44
 | p256_mldsa44 | 0xfed3 |Yes| OQS_CODEPOINT_P256_MLDSA44
 | rsa3072_mldsa44 | 0xfed4 |Yes| OQS_CODEPOINT_RSA3072_MLDSA44
-| mldsa44_pss2048 | 0xfee1 |Yes| OQS_OID_MLDSA44_pss2048
-| mldsa44_rsa2048 | 0xfee2 |Yes| OQS_OID_MLDSA44_rsa2048
-| mldsa44_ed25519 | 0xfee3 |Yes| OQS_OID_MLDSA44_ed25519
-| mldsa44_p256 | 0xfee4 |Yes| OQS_OID_MLDSA44_p256
-| mldsa44_bp256 | 0xfee5 |Yes| OQS_OID_MLDSA44_bp256
+| mldsa44_pss2048 | 0xfee1 |Yes| OQS_CODEPOINT_MLDSA44_pss2048
+| mldsa44_rsa2048 | 0xfee2 |Yes| OQS_CODEPOINT_MLDSA44_rsa2048
+| mldsa44_ed25519 | 0xfee3 |Yes| OQS_CODEPOINT_MLDSA44_ed25519
+| mldsa44_p256 | 0xfee4 |Yes| OQS_CODEPOINT_MLDSA44_p256
+| mldsa44_bp256 | 0xfee5 |Yes| OQS_CODEPOINT_MLDSA44_bp256
 | mldsa65 | 0xfed1 |Yes| OQS_CODEPOINT_MLDSA65
 | p384_mldsa65 | 0xfed5 |Yes| OQS_CODEPOINT_P384_MLDSA65
-| mldsa65_pss3072 | 0xfee6 |Yes| OQS_OID_MLDSA65_pss3072
-| mldsa65_rsa3072 | 0xfee7 |Yes| OQS_OID_MLDSA65_rsa3072
-| mldsa65_p256 | 0xfee8 |Yes| OQS_OID_MLDSA65_p256
-| mldsa65_bp256 | 0xfee9 |Yes| OQS_OID_MLDSA65_bp256
-| mldsa65_ed25519 | 0xfeea |Yes| OQS_OID_MLDSA65_ed25519
+| mldsa65_pss3072 | 0xfee6 |Yes| OQS_CODEPOINT_MLDSA65_pss3072
+| mldsa65_rsa3072 | 0xfee7 |Yes| OQS_CODEPOINT_MLDSA65_rsa3072
+| mldsa65_p256 | 0xfee8 |Yes| OQS_CODEPOINT_MLDSA65_p256
+| mldsa65_bp256 | 0xfee9 |Yes| OQS_CODEPOINT_MLDSA65_bp256
+| mldsa65_ed25519 | 0xfeea |Yes| OQS_CODEPOINT_MLDSA65_ed25519
 | mldsa87 | 0xfed2 |Yes| OQS_CODEPOINT_MLDSA87
 | p521_mldsa87 | 0xfed6 |Yes| OQS_CODEPOINT_P521_MLDSA87
-| mldsa87_p384 | 0xfeeb |Yes| OQS_OID_MLDSA87_p384
-| mldsa87_bp384 | 0xfeec |Yes| OQS_OID_MLDSA87_bp384
-| mldsa87_ed448 | 0xfeed |Yes| OQS_OID_MLDSA87_ed448
+| mldsa87_p384 | 0xfeeb |Yes| OQS_CODEPOINT_MLDSA87_p384
+| mldsa87_bp384 | 0xfeec |Yes| OQS_CODEPOINT_MLDSA87_bp384
+| mldsa87_ed448 | 0xfeed |Yes| OQS_CODEPOINT_MLDSA87_ed448
 | falcon512 | 0xfed7 |Yes| OQS_CODEPOINT_FALCON512
 | p256_falcon512 | 0xfed8 |Yes| OQS_CODEPOINT_P256_FALCON512
 | rsa3072_falcon512 | 0xfed9 |Yes| OQS_CODEPOINT_RSA3072_FALCON512
diff --git a/oqs-template/ALGORITHMS.md/ids.fragment b/oqs-template/ALGORITHMS.md/ids.fragment
index 37c431b8..cfac058a 100644
--- a/oqs-template/ALGORITHMS.md/ids.fragment
+++ b/oqs-template/ALGORITHMS.md/ids.fragment
@@ -14,7 +14,7 @@
 | {{ classical_alg['name'] }}_{{variant['name']}} | {{ classical_alg['code_point'] }} | {%- if variant['enable'] -%} Yes {%- else -%} No {%- endif -%} | OQS_CODEPOINT_{{ classical_alg['name']|upper }}_{{ variant['name']|upper }}
       {%- endfor %}
       {%- for composite_alg in variant['composite'] %}
-| {{variant['name']}}_{{ composite_alg['name'] }} | {{ composite_alg['code_point'] }} | {%- if variant['enable'] -%} Yes {%- else -%} No {%- endif -%} | OQS_OID_{{ variant['name']|upper }}_{{ composite_alg['name'] }}
+| {{variant['name']}}_{{ composite_alg['name'] }} | {{ composite_alg['code_point'] }} | {%- if variant['enable'] -%} Yes {%- else -%} No {%- endif -%} | OQS_CODEPOINT_{{ variant['name']|upper }}_{{ composite_alg['name'] }}
       {%- endfor %}
    {%- endfor %}
 {%- endfor %}
diff --git a/oqs-template/test/oqs_test_evp_pkey_params.c/composite_sig_algs.fragment b/oqs-template/test/oqs_test_evp_pkey_params.c/composite_sig_algs.fragment
new file mode 100644
index 00000000..b22a559c
--- /dev/null
+++ b/oqs-template/test/oqs_test_evp_pkey_params.c/composite_sig_algs.fragment
@@ -0,0 +1,14 @@
+
+
+/** \brief List of composite signature algorithms. */
+const char *kCompositeSignatureAlgorithms[] = {
+{% for sig in config['sigs'] %}
+   {%- for variant in sig['variants'] %}
+     {%- for composite_alg in variant['composite'] -%}
+     "{{variant['name']}}_{{ composite_alg['name'] }}",
+     {%- endfor -%}
+   {%- endfor %}
+{%- endfor %}
+NULL,
+};
+
diff --git a/test/oqs_test_evp_pkey_params.c b/test/oqs_test_evp_pkey_params.c
index 18ac883a..bcdabdf4 100644
--- a/test/oqs_test_evp_pkey_params.c
+++ b/test/oqs_test_evp_pkey_params.c
@@ -46,6 +46,20 @@ const char *kHybridSignatureAlgorithms[] = {
 };
 ///// OQS_TEMPLATE_FRAGMENT_HYBRID_SIG_ALGS_END
 
+///// OQS_TEMPLATE_FRAGMENT_COMPOSITE_SIG_ALGS_START
+
+/** \brief List of composite signature algorithms. */
+const char *kCompositeSignatureAlgorithms[] = {
+    "mldsa44_pss2048", "mldsa44_rsa2048",
+    "mldsa44_ed25519", "mldsa44_p256",
+    "mldsa44_bp256",   "mldsa65_pss3072",
+    "mldsa65_rsa3072", "mldsa65_p256",
+    "mldsa65_bp256",   "mldsa65_ed25519",
+    "mldsa87_p384",    "mldsa87_bp384",
+    "mldsa87_ed448",   NULL,
+};
+///// OQS_TEMPLATE_FRAGMENT_COMPOSITE_SIG_ALGS_END
+
 ///// OQS_TEMPLATE_FRAGMENT_HYBRID_KEM_ALGS_START
 
 /** \brief List of hybrid KEMs. */