diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/verifyEcdsaSecp256k1Signature-invalid-key/verifyEcdsaSecp256k1Signature-invalid-key.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/invalid-key/invalid-key.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/verifyEcdsaSecp256k1Signature-invalid-key/verifyEcdsaSecp256k1Signature-invalid-key.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/invalid-key/invalid-key.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/verifyEcdsaSecp256k1Signature-invalid-key/verifyEcdsaSecp256k1Signature-invalid-key.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/invalid-key/invalid-key.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/verifyEcdsaSecp256k1Signature-invalid-key/verifyEcdsaSecp256k1Signature-invalid-key.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/invalid-key/invalid-key.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/verifyEcdsaSecp256k1Signature-invalid-key/verifyEcdsaSecp256k1Signature-invalid-key.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/invalid-key/invalid-key.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/verifyEcdsaSecp256k1Signature-invalid-key/verifyEcdsaSecp256k1Signature-invalid-key.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/invalid-key/invalid-key.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/verifyEcdsaSecp256k1Signature-long-key/verifyEcdsaSecp256k1Signature-long-key.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/long-key/long-key.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/verifyEcdsaSecp256k1Signature-long-key/verifyEcdsaSecp256k1Signature-long-key.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/long-key/long-key.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/verifyEcdsaSecp256k1Signature-long-key/verifyEcdsaSecp256k1Signature-long-key.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/long-key/long-key.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/verifyEcdsaSecp256k1Signature-long-key/verifyEcdsaSecp256k1Signature-long-key.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/long-key/long-key.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/verifyEcdsaSecp256k1Signature-long-key/verifyEcdsaSecp256k1Signature-long-key.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/long-key/long-key.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/verifyEcdsaSecp256k1Signature-long-key/verifyEcdsaSecp256k1Signature-long-key.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/long-key/long-key.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/verifyEcdsaSecp256k1Signature-long-msg/verifyEcdsaSecp256k1Signature-long-msg.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/long-msg/long-msg.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/verifyEcdsaSecp256k1Signature-long-msg/verifyEcdsaSecp256k1Signature-long-msg.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/long-msg/long-msg.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/verifyEcdsaSecp256k1Signature-long-msg/verifyEcdsaSecp256k1Signature-long-msg.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/long-msg/long-msg.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/verifyEcdsaSecp256k1Signature-long-msg/verifyEcdsaSecp256k1Signature-long-msg.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/long-msg/long-msg.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/verifyEcdsaSecp256k1Signature-long-msg/verifyEcdsaSecp256k1Signature-long-msg.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/long-msg/long-msg.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/verifyEcdsaSecp256k1Signature-long-msg/verifyEcdsaSecp256k1Signature-long-msg.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/long-msg/long-msg.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/verifyEcdsaSecp256k1Signature-long-sig/verifyEcdsaSecp256k1Signature-long-sig.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/long-sig/long-sig.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/verifyEcdsaSecp256k1Signature-long-sig/verifyEcdsaSecp256k1Signature-long-sig.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/long-sig/long-sig.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/verifyEcdsaSecp256k1Signature-long-sig/verifyEcdsaSecp256k1Signature-long-sig.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/long-sig/long-sig.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/verifyEcdsaSecp256k1Signature-long-sig/verifyEcdsaSecp256k1Signature-long-sig.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/long-sig/long-sig.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/verifyEcdsaSecp256k1Signature-long-sig/verifyEcdsaSecp256k1Signature-long-sig.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/long-sig/long-sig.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/verifyEcdsaSecp256k1Signature-long-sig/verifyEcdsaSecp256k1Signature-long-sig.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/long-sig/long-sig.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/verifyEcdsaSecp256k1Signature-short-key/verifyEcdsaSecp256k1Signature-short-key.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/short-key/short-key.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/verifyEcdsaSecp256k1Signature-short-key/verifyEcdsaSecp256k1Signature-short-key.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/short-key/short-key.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/verifyEcdsaSecp256k1Signature-short-key/verifyEcdsaSecp256k1Signature-short-key.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/short-key/short-key.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/verifyEcdsaSecp256k1Signature-short-key/verifyEcdsaSecp256k1Signature-short-key.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/short-key/short-key.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/verifyEcdsaSecp256k1Signature-short-key/verifyEcdsaSecp256k1Signature-short-key.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/short-key/short-key.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/verifyEcdsaSecp256k1Signature-short-key/verifyEcdsaSecp256k1Signature-short-key.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/short-key/short-key.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/verifyEcdsaSecp256k1Signature-short-msg/verifyEcdsaSecp256k1Signature-short-msg.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/short-msg/short-msg.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/verifyEcdsaSecp256k1Signature-short-msg/verifyEcdsaSecp256k1Signature-short-msg.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/short-msg/short-msg.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/verifyEcdsaSecp256k1Signature-short-msg/verifyEcdsaSecp256k1Signature-short-msg.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/short-msg/short-msg.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/verifyEcdsaSecp256k1Signature-short-msg/verifyEcdsaSecp256k1Signature-short-msg.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/short-msg/short-msg.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/verifyEcdsaSecp256k1Signature-short-msg/verifyEcdsaSecp256k1Signature-short-msg.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/short-msg/short-msg.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/verifyEcdsaSecp256k1Signature-short-msg/verifyEcdsaSecp256k1Signature-short-msg.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/short-msg/short-msg.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/verifyEcdsaSecp256k1Signature-short-sig/verifyEcdsaSecp256k1Signature-short-sig.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/short-sig/short-sig.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/verifyEcdsaSecp256k1Signature-short-sig/verifyEcdsaSecp256k1Signature-short-sig.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/short-sig/short-sig.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/verifyEcdsaSecp256k1Signature-short-sig/verifyEcdsaSecp256k1Signature-short-sig.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/short-sig/short-sig.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/verifyEcdsaSecp256k1Signature-short-sig/verifyEcdsaSecp256k1Signature-short-sig.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/short-sig/short-sig.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/verifyEcdsaSecp256k1Signature-short-sig/verifyEcdsaSecp256k1Signature-short-sig.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/short-sig/short-sig.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/verifyEcdsaSecp256k1Signature-short-sig/verifyEcdsaSecp256k1Signature-short-sig.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEcdsaSecp256k1Signature/short-sig/short-sig.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519SignatureLongKey/verifyEd25519SignatureLongKey.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/long-key/long-key.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519SignatureLongKey/verifyEd25519SignatureLongKey.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/long-key/long-key.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519SignatureLongKey/verifyEd25519SignatureLongKey.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/long-key/long-key.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519SignatureLongKey/verifyEd25519SignatureLongKey.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/long-key/long-key.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519SignatureLongKey/verifyEd25519SignatureLongKey.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/long-key/long-key.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519SignatureLongKey/verifyEd25519SignatureLongKey.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/long-key/long-key.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519SignatureLongSig/verifyEd25519SignatureLongSig.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/long-sig/long-sig.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519SignatureLongSig/verifyEd25519SignatureLongSig.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/long-sig/long-sig.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519SignatureLongSig/verifyEd25519SignatureLongSig.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/long-sig/long-sig.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519SignatureLongSig/verifyEd25519SignatureLongSig.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/long-sig/long-sig.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519SignatureLongSig/verifyEd25519SignatureLongSig.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/long-sig/long-sig.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519SignatureLongSig/verifyEd25519SignatureLongSig.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/long-sig/long-sig.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519SignatureShortKey/verifyEd25519SignatureShortKey.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/short-key/short-key.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519SignatureShortKey/verifyEd25519SignatureShortKey.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/short-key/short-key.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519SignatureShortKey/verifyEd25519SignatureShortKey.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/short-key/short-key.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519SignatureShortKey/verifyEd25519SignatureShortKey.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/short-key/short-key.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519SignatureShortKey/verifyEd25519SignatureShortKey.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/short-key/short-key.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519SignatureShortKey/verifyEd25519SignatureShortKey.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/short-key/short-key.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519SignatureShortSig/verifyEd25519SignatureShortSig.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/short-sig/short-sig.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519SignatureShortSig/verifyEd25519SignatureShortSig.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/short-sig/short-sig.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519SignatureShortSig/verifyEd25519SignatureShortSig.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/short-sig/short-sig.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519SignatureShortSig/verifyEd25519SignatureShortSig.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/short-sig/short-sig.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519SignatureShortSig/verifyEd25519SignatureShortSig.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/short-sig/short-sig.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519SignatureShortSig/verifyEd25519SignatureShortSig.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/short-sig/short-sig.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature1/verifyEd25519Signature1.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test01/test01.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature1/verifyEd25519Signature1.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test01/test01.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature1/verifyEd25519Signature1.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test01/test01.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature1/verifyEd25519Signature1.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test01/test01.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature1/verifyEd25519Signature1.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test01/test01.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature1/verifyEd25519Signature1.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test01/test01.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature2/verifyEd25519Signature2.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test02/test02.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature2/verifyEd25519Signature2.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test02/test02.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature2/verifyEd25519Signature2.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test02/test02.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature2/verifyEd25519Signature2.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test02/test02.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature10/verifyEd25519Signature10.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test02/test02.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature10/verifyEd25519Signature10.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test02/test02.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature3/verifyEd25519Signature3.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test03/test03.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature3/verifyEd25519Signature3.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test03/test03.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature3/verifyEd25519Signature3.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test03/test03.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature3/verifyEd25519Signature3.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test03/test03.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature11/verifyEd25519Signature11.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test03/test03.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature11/verifyEd25519Signature11.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test03/test03.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature4/verifyEd25519Signature4.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test04/test04.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature4/verifyEd25519Signature4.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test04/test04.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature4/verifyEd25519Signature4.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test04/test04.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature4/verifyEd25519Signature4.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test04/test04.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature12/verifyEd25519Signature12.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test04/test04.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature12/verifyEd25519Signature12.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test04/test04.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature5/verifyEd25519Signature5.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test05/test05.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature5/verifyEd25519Signature5.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test05/test05.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature5/verifyEd25519Signature5.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test05/test05.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature5/verifyEd25519Signature5.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test05/test05.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature5/verifyEd25519Signature5.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test05/test05.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature5/verifyEd25519Signature5.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test05/test05.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature6/verifyEd25519Signature6.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test06/test06.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature6/verifyEd25519Signature6.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test06/test06.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature6/verifyEd25519Signature6.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test06/test06.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature6/verifyEd25519Signature6.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test06/test06.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature13/verifyEd25519Signature13.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test06/test06.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature13/verifyEd25519Signature13.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test06/test06.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature7/verifyEd25519Signature7.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test07/test07.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature7/verifyEd25519Signature7.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test07/test07.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature7/verifyEd25519Signature7.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test07/test07.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature7/verifyEd25519Signature7.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test07/test07.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature14/verifyEd25519Signature14.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test07/test07.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature14/verifyEd25519Signature14.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test07/test07.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature8/verifyEd25519Signature8.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test08/test08.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature8/verifyEd25519Signature8.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test08/test08.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature8/verifyEd25519Signature8.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test08/test08.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature8/verifyEd25519Signature8.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test08/test08.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature15/verifyEd25519Signature15.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test08/test08.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature15/verifyEd25519Signature15.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test08/test08.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature9/verifyEd25519Signature9.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test09/test09.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature9/verifyEd25519Signature9.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test09/test09.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature9/verifyEd25519Signature9.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test09/test09.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature9/verifyEd25519Signature9.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test09/test09.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature16/verifyEd25519Signature16.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test09/test09.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature16/verifyEd25519Signature16.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test09/test09.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature10/verifyEd25519Signature10.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test10/test10.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature10/verifyEd25519Signature10.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test10/test10.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature10/verifyEd25519Signature10.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test10/test10.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature10/verifyEd25519Signature10.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test10/test10.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature17/verifyEd25519Signature17.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test10/test10.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature17/verifyEd25519Signature17.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test10/test10.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature11/verifyEd25519Signature11.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test11/test11.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature11/verifyEd25519Signature11.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test11/test11.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature11/verifyEd25519Signature11.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test11/test11.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature11/verifyEd25519Signature11.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test11/test11.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature18/verifyEd25519Signature18.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test11/test11.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature18/verifyEd25519Signature18.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test11/test11.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature12/verifyEd25519Signature12.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test12/test12.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature12/verifyEd25519Signature12.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test12/test12.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature12/verifyEd25519Signature12.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test12/test12.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature12/verifyEd25519Signature12.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test12/test12.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature19/verifyEd25519Signature19.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test12/test12.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature19/verifyEd25519Signature19.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test12/test12.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature13/verifyEd25519Signature13.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test13/test13.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature13/verifyEd25519Signature13.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test13/test13.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature13/verifyEd25519Signature13.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test13/test13.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature13/verifyEd25519Signature13.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test13/test13.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature2/verifyEd25519Signature2.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test13/test13.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature2/verifyEd25519Signature2.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test13/test13.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature14/verifyEd25519Signature14.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test14/test14.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature14/verifyEd25519Signature14.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test14/test14.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature14/verifyEd25519Signature14.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test14/test14.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature14/verifyEd25519Signature14.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test14/test14.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature20/verifyEd25519Signature20.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test14/test14.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature20/verifyEd25519Signature20.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test14/test14.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature15/verifyEd25519Signature15.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test15/test15.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature15/verifyEd25519Signature15.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test15/test15.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature15/verifyEd25519Signature15.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test15/test15.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature15/verifyEd25519Signature15.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test15/test15.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature21/verifyEd25519Signature21.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test15/test15.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature21/verifyEd25519Signature21.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test15/test15.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature16/verifyEd25519Signature16.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test16/test16.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature16/verifyEd25519Signature16.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test16/test16.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature16/verifyEd25519Signature16.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test16/test16.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature16/verifyEd25519Signature16.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test16/test16.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature22/verifyEd25519Signature22.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test16/test16.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature22/verifyEd25519Signature22.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test16/test16.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature17/verifyEd25519Signature17.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test17/test17.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature17/verifyEd25519Signature17.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test17/test17.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature17/verifyEd25519Signature17.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test17/test17.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature17/verifyEd25519Signature17.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test17/test17.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature23/verifyEd25519Signature23.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test17/test17.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature23/verifyEd25519Signature23.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test17/test17.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature18/verifyEd25519Signature18.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test18/test18.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature18/verifyEd25519Signature18.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test18/test18.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature18/verifyEd25519Signature18.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test18/test18.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature18/verifyEd25519Signature18.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test18/test18.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature24/verifyEd25519Signature24.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test18/test18.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature24/verifyEd25519Signature24.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test18/test18.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature19/verifyEd25519Signature19.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test19/test19.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature19/verifyEd25519Signature19.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test19/test19.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature19/verifyEd25519Signature19.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test19/test19.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature19/verifyEd25519Signature19.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test19/test19.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature25/verifyEd25519Signature25.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test19/test19.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature25/verifyEd25519Signature25.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test19/test19.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature20/verifyEd25519Signature20.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test20/test20.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature20/verifyEd25519Signature20.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test20/test20.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature20/verifyEd25519Signature20.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test20/test20.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature20/verifyEd25519Signature20.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test20/test20.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature26/verifyEd25519Signature26.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test20/test20.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature26/verifyEd25519Signature26.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test20/test20.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature21/verifyEd25519Signature21.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test21/test21.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature21/verifyEd25519Signature21.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test21/test21.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature21/verifyEd25519Signature21.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test21/test21.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature21/verifyEd25519Signature21.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test21/test21.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature27/verifyEd25519Signature27.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test21/test21.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature27/verifyEd25519Signature27.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test21/test21.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature22/verifyEd25519Signature22.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test22/test22.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature22/verifyEd25519Signature22.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test22/test22.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature22/verifyEd25519Signature22.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test22/test22.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature22/verifyEd25519Signature22.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test22/test22.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature28/verifyEd25519Signature28.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test22/test22.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature28/verifyEd25519Signature28.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test22/test22.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature23/verifyEd25519Signature23.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test23/test23.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature23/verifyEd25519Signature23.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test23/test23.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature23/verifyEd25519Signature23.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test23/test23.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature23/verifyEd25519Signature23.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test23/test23.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature29/verifyEd25519Signature29.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test23/test23.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature29/verifyEd25519Signature29.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test23/test23.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature24/verifyEd25519Signature24.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test24/test24.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature24/verifyEd25519Signature24.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test24/test24.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature24/verifyEd25519Signature24.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test24/test24.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature24/verifyEd25519Signature24.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test24/test24.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature3/verifyEd25519Signature3.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test24/test24.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature3/verifyEd25519Signature3.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test24/test24.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature25/verifyEd25519Signature25.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test25/test25.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature25/verifyEd25519Signature25.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test25/test25.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature25/verifyEd25519Signature25.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test25/test25.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature25/verifyEd25519Signature25.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test25/test25.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature30/verifyEd25519Signature30.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test25/test25.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature30/verifyEd25519Signature30.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test25/test25.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature26/verifyEd25519Signature26.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test26/test26.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature26/verifyEd25519Signature26.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test26/test26.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature26/verifyEd25519Signature26.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test26/test26.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature26/verifyEd25519Signature26.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test26/test26.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature31/verifyEd25519Signature31.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test26/test26.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature31/verifyEd25519Signature31.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test26/test26.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature27/verifyEd25519Signature27.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test27/test27.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature27/verifyEd25519Signature27.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test27/test27.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature27/verifyEd25519Signature27.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test27/test27.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature27/verifyEd25519Signature27.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test27/test27.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature4/verifyEd25519Signature4.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test27/test27.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature4/verifyEd25519Signature4.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test27/test27.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature28/verifyEd25519Signature28.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test28/test28.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature28/verifyEd25519Signature28.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test28/test28.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature28/verifyEd25519Signature28.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test28/test28.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature28/verifyEd25519Signature28.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test28/test28.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature6/verifyEd25519Signature6.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test28/test28.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature6/verifyEd25519Signature6.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test28/test28.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature29/verifyEd25519Signature29.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test29/test29.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature29/verifyEd25519Signature29.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test29/test29.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature29/verifyEd25519Signature29.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test29/test29.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature29/verifyEd25519Signature29.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test29/test29.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature7/verifyEd25519Signature7.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test29/test29.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature7/verifyEd25519Signature7.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test29/test29.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature30/verifyEd25519Signature30.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test30/test30.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature30/verifyEd25519Signature30.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test30/test30.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature30/verifyEd25519Signature30.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test30/test30.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature30/verifyEd25519Signature30.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test30/test30.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature8/verifyEd25519Signature8.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test30/test30.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature8/verifyEd25519Signature8.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test30/test30.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature31/verifyEd25519Signature31.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test31/test31.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature31/verifyEd25519Signature31.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test31/test31.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature31/verifyEd25519Signature31.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test31/test31.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature31/verifyEd25519Signature31.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test31/test31.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature9/verifyEd25519Signature9.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test31/test31.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/verifyEd25519Signature9/verifyEd25519Signature9.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifyEd25519Signature/test31/test31.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/verifySchnorrSecp256k1Signature-long-key/verifySchnorrSecp256k1Signature-long-key.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/long-key/long-key.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/verifySchnorrSecp256k1Signature-long-key/verifySchnorrSecp256k1Signature-long-key.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/long-key/long-key.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/verifySchnorrSecp256k1Signature-long-key/verifySchnorrSecp256k1Signature-long-key.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/long-key/long-key.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/verifySchnorrSecp256k1Signature-long-key/verifySchnorrSecp256k1Signature-long-key.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/long-key/long-key.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/verifySchnorrSecp256k1Signature-long-key/verifySchnorrSecp256k1Signature-long-key.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/long-key/long-key.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/verifySchnorrSecp256k1Signature-long-key/verifySchnorrSecp256k1Signature-long-key.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/long-key/long-key.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/verifySchnorrSecp256k1Signature-long-sig/verifySchnorrSecp256k1Signature-long-sig.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/long-sig/long-sig.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/verifySchnorrSecp256k1Signature-long-sig/verifySchnorrSecp256k1Signature-long-sig.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/long-sig/long-sig.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/verifySchnorrSecp256k1Signature-long-sig/verifySchnorrSecp256k1Signature-long-sig.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/long-sig/long-sig.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/verifySchnorrSecp256k1Signature-long-sig/verifySchnorrSecp256k1Signature-long-sig.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/long-sig/long-sig.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/verifySchnorrSecp256k1Signature-long-sig/verifySchnorrSecp256k1Signature-long-sig.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/long-sig/long-sig.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/verifySchnorrSecp256k1Signature-long-sig/verifySchnorrSecp256k1Signature-long-sig.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/long-sig/long-sig.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/verifySchnorrSecp256k1Signature-short-key/verifySchnorrSecp256k1Signature-short-key.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/short-key/short-key.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/verifySchnorrSecp256k1Signature-short-key/verifySchnorrSecp256k1Signature-short-key.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/short-key/short-key.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/verifySchnorrSecp256k1Signature-short-key/verifySchnorrSecp256k1Signature-short-key.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/short-key/short-key.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/verifySchnorrSecp256k1Signature-short-key/verifySchnorrSecp256k1Signature-short-key.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/short-key/short-key.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/verifySchnorrSecp256k1Signature-short-key/verifySchnorrSecp256k1Signature-short-key.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/short-key/short-key.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/verifySchnorrSecp256k1Signature-short-key/verifySchnorrSecp256k1Signature-short-key.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/short-key/short-key.uplc.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/verifySchnorrSecp256k1Signature-short-sig/verifySchnorrSecp256k1Signature-short-sig.uplc b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/short-sig/short-sig.uplc similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/verifySchnorrSecp256k1Signature-short-sig/verifySchnorrSecp256k1Signature-short-sig.uplc rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/short-sig/short-sig.uplc diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/verifySchnorrSecp256k1Signature-short-sig/verifySchnorrSecp256k1Signature-short-sig.uplc.budget.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/short-sig/short-sig.uplc.budget.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/verifySchnorrSecp256k1Signature-short-sig/verifySchnorrSecp256k1Signature-short-sig.uplc.budget.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/short-sig/short-sig.uplc.budget.expected diff --git a/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/verifySchnorrSecp256k1Signature-short-sig/verifySchnorrSecp256k1Signature-short-sig.uplc.expected b/plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/short-sig/short-sig.uplc.expected similarity index 100% rename from plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/verifySchnorrSecp256k1Signature-short-sig/verifySchnorrSecp256k1Signature-short-sig.uplc.expected rename to plutus-conformance/test-cases/uplc/evaluation/builtin/semantics/verifySchnorrSecp256k1Signature/short-sig/short-sig.uplc.expected