1 files changed, 8 insertions, 8 deletions

diff --git a/auto_tests/encryptsave_test.c b/auto_tests/encryptsave_test.c
index bf7988e2..906bf3f8 100644
--- a/auto_tests/encryptsave_test.c
+++ b/auto_tests/encryptsave_test.c
@@ -70,7 +70,7 @@ static void test_save_friend(void)
     tox_get_savedata(tox1, data);
     size_t size2 = size + TOX_PASS_ENCRYPTION_EXTRA_LENGTH;
     VLA(uint8_t, enc_data, size2);
-    TOX_ERR_ENCRYPTION error1;
+    Tox_Err_Encryption error1;
     bool ret = tox_pass_encrypt(data, size, (const uint8_t *)"correcthorsebatterystaple", 25, enc_data, &error1);
     ck_assert_msg(ret, "failed to encrypted save: %d", error1);
     ck_assert_msg(tox_is_data_encrypted(enc_data), "magic number missing");
@@ -79,13 +79,13 @@ static void test_save_friend(void)
     tox_options_set_savedata_type(options, TOX_SAVEDATA_TYPE_TOX_SAVE);
     tox_options_set_savedata_data(options, enc_data, size2);
 
-    TOX_ERR_NEW err2;
+    Tox_Err_New err2;
     Tox *tox3 = tox_new_log(options, &err2, nullptr);
     ck_assert_msg(err2 == TOX_ERR_NEW_LOAD_ENCRYPTED, "wrong error! %d. should fail with %d", err2,
                   TOX_ERR_NEW_LOAD_ENCRYPTED);
     ck_assert_msg(tox3 == nullptr, "tox_new with error should return NULL");
     VLA(uint8_t, dec_data, size);
-    TOX_ERR_DECRYPTION err3;
+    Tox_Err_Decryption err3;
     ret = tox_pass_decrypt(enc_data, size2, (const uint8_t *)"correcthorsebatterystaple", 25, dec_data, &err3);
     ck_assert_msg(ret, "failed to decrypt save: %d", err3);
     tox_options_set_savedata_data(options, dec_data, size);
@@ -99,7 +99,7 @@ static void test_save_friend(void)
     size = tox_get_savedata_size(tox3);
     VLA(uint8_t, data2, size);
     tox_get_savedata(tox3, data2);
-    TOX_ERR_KEY_DERIVATION keyerr;
+    Tox_Err_Key_Derivation keyerr;
     Tox_Pass_Key *key = tox_pass_key_derive((const uint8_t *)"123qweasdzxc", 12, &keyerr);
     ck_assert_msg(key != nullptr, "pass key allocation failure");
     memcpy((uint8_t *)key, test_salt, TOX_PASS_SALT_LENGTH);
@@ -139,9 +139,9 @@ static void test_save_friend(void)
 
 static void test_keys(void)
 {
-    TOX_ERR_ENCRYPTION encerr;
-    TOX_ERR_DECRYPTION decerr;
-    TOX_ERR_KEY_DERIVATION keyerr;
+    Tox_Err_Encryption encerr;
+    Tox_Err_Decryption decerr;
+    Tox_Err_Key_Derivation keyerr;
     Tox_Pass_Key *key = tox_pass_key_derive((const uint8_t *)"123qweasdzxc", 12, &keyerr);
     ck_assert_msg(key != nullptr, "generic failure 1: %d", keyerr);
     const uint8_t *string = (const uint8_t *)"No Patrick, mayonnaise is not an instrument."; // 44
@@ -177,7 +177,7 @@ static void test_keys(void)
     ck_assert_msg(memcmp(out1, string, 44) == 0, "decryption 3 failed");
 
     uint8_t salt[TOX_PASS_SALT_LENGTH];
-    TOX_ERR_GET_SALT salt_err;
+    Tox_Err_Get_Salt salt_err;
     ck_assert_msg(tox_get_salt(encrypted, salt, &salt_err), "couldn't get salt");
     ck_assert_msg(salt_err == TOX_ERR_GET_SALT_OK, "get_salt returned an error");
     Tox_Pass_Key *key2 = tox_pass_key_derive_with_salt((const uint8_t *)"123qweasdzxc", 12, salt, &keyerr);