diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
index 1f24c69c1f..de5a3c499a 100644
--- a/src/script/interpreter.cpp
+++ b/src/script/interpreter.cpp
@@ -3124,7 +3124,7 @@ bool GenericTransactionSignatureChecker<T>::CheckSimplicity(const valtype& progr
     if (!simplicity_elements_execSimplicity(&error, 0, txdata->m_simplicity_tx_data, nIn, simplicityTapEnv, txdata->m_hash_genesis_block.data(), budget, 0, program.data(), program.size(), witness.data(), witness.size())) {
         assert(!"simplicity_elements_execSimplicity internal error");
     }
-    free(simplicityTapEnv);
+    simplicity_elements_freeTapEnv(simplicityTapEnv);
     switch (error) {
     case SIMPLICITY_NO_ERROR: return set_success(serror);
     case SIMPLICITY_ERR_MALLOC:
@@ -3134,7 +3134,7 @@ bool GenericTransactionSignatureChecker<T>::CheckSimplicity(const valtype& progr
     case SIMPLICITY_ERR_DATA_OUT_OF_RANGE: return set_error(serror, SCRIPT_ERR_SIMPLICITY_DATA_OUT_OF_RANGE);
     case SIMPLICITY_ERR_DATA_OUT_OF_ORDER: return set_error(serror, SCRIPT_ERR_SIMPLICITY_DATA_OUT_OF_ORDER);
     case SIMPLICITY_ERR_FAIL_CODE: return set_error(serror, SCRIPT_ERR_SIMPLICITY_FAIL_CODE);
-    case SIMPLICITY_ERR_STOP_CODE: return set_error(serror, SCRIPT_ERR_SIMPLICITY_STOP_CODE);
+    case SIMPLICITY_ERR_RESERVED_CODE: return set_error(serror, SCRIPT_ERR_SIMPLICITY_RESERVED_CODE);
     case SIMPLICITY_ERR_HIDDEN: return set_error(serror, SCRIPT_ERR_SIMPLICITY_HIDDEN);
     case SIMPLICITY_ERR_BITSTREAM_EOF: return set_error(serror, SCRIPT_ERR_SIMPLICITY_BITSTREAM_EOF);
     case SIMPLICITY_ERR_BITSTREAM_TRAILING_BYTES: return set_error(serror, SCRIPT_ERR_SIMPLICITY_BITSTREAM_TRAILING_BYTES);
diff --git a/src/script/interpreter.h b/src/script/interpreter.h
index 4881b74651..e317a3aad5 100644
--- a/src/script/interpreter.h
+++ b/src/script/interpreter.h
@@ -222,7 +222,7 @@ struct PrecomputedTransactionData
     template <class T>
     explicit PrecomputedTransactionData(const T& tx);
     ~PrecomputedTransactionData() {
-        free(m_simplicity_tx_data);
+        simplicity_elements_freeTransaction(m_simplicity_tx_data);
     }
 };
 
diff --git a/src/script/script_error.cpp b/src/script/script_error.cpp
index b7be7b2139..a50888dd8f 100644
--- a/src/script/script_error.cpp
+++ b/src/script/script_error.cpp
@@ -140,8 +140,8 @@ std::string ScriptErrorString(const ScriptError serror)
             return SIMPLICITY_ERR_MSG(SIMPLICITY_ERR_DATA_OUT_OF_ORDER);
         case SCRIPT_ERR_SIMPLICITY_FAIL_CODE:
             return SIMPLICITY_ERR_MSG(SIMPLICITY_ERR_FAIL_CODE);
-        case SCRIPT_ERR_SIMPLICITY_STOP_CODE:
-            return SIMPLICITY_ERR_MSG(SIMPLICITY_ERR_STOP_CODE);
+        case SCRIPT_ERR_SIMPLICITY_RESERVED_CODE:
+            return SIMPLICITY_ERR_MSG(SIMPLICITY_ERR_RESERVED_CODE);
         case SCRIPT_ERR_SIMPLICITY_HIDDEN:
             return SIMPLICITY_ERR_MSG(SIMPLICITY_ERR_HIDDEN);
         case SCRIPT_ERR_SIMPLICITY_BITSTREAM_EOF:
diff --git a/src/script/script_error.h b/src/script/script_error.h
index db137937f2..8fac6496d0 100644
--- a/src/script/script_error.h
+++ b/src/script/script_error.h
@@ -102,7 +102,7 @@ typedef enum ScriptError_t
     SCRIPT_ERR_SIMPLICITY_DATA_OUT_OF_RANGE,
     SCRIPT_ERR_SIMPLICITY_DATA_OUT_OF_ORDER,
     SCRIPT_ERR_SIMPLICITY_FAIL_CODE,
-    SCRIPT_ERR_SIMPLICITY_STOP_CODE,
+    SCRIPT_ERR_SIMPLICITY_RESERVED_CODE,
     SCRIPT_ERR_SIMPLICITY_HIDDEN,
     SCRIPT_ERR_SIMPLICITY_BITSTREAM_EOF,
     SCRIPT_ERR_SIMPLICITY_BITSTREAM_TRAILING_BYTES,
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index 3ddf915f3a..37e6f77c36 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -121,7 +121,7 @@ static ScriptErrorDesc script_errors[]={
     {SCRIPT_ERR_SIMPLICITY_DATA_OUT_OF_RANGE, "SIMPLICITY_DATA_OUT_OF_RANGE"},
     {SCRIPT_ERR_SIMPLICITY_DATA_OUT_OF_ORDER, "SIMPLICITY_DATA_OUT_OF_ORDER"},
     {SCRIPT_ERR_SIMPLICITY_FAIL_CODE, "SIMPLICITY_FAIL_CODE"},
-    {SCRIPT_ERR_SIMPLICITY_STOP_CODE, "SIMPLICITY_STOP_CODE"},
+    {SCRIPT_ERR_SIMPLICITY_RESERVED_CODE, "SIMPLICITY_RESERVED_CODE"},
     {SCRIPT_ERR_SIMPLICITY_HIDDEN, "SIMPLICITY_HIDDEN"},
     {SCRIPT_ERR_SIMPLICITY_BITSTREAM_EOF, "SIMPLICITY_BITSTREAM_EOF"},
     {SCRIPT_ERR_SIMPLICITY_BITSTREAM_TRAILING_BYTES, "SIMPLICITY_BITSTREAM_TRAILING_BYTES"},