diff --git a/builds/target_1024b/plaintext_authentication_1024b.circom b/builds/target_1024b/plaintext_authentication_1024b.circom
index 5b82c7d..89fde4e 100644
--- a/builds/target_1024b/plaintext_authentication_1024b.circom
+++ b/builds/target_1024b/plaintext_authentication_1024b.circom
@@ -1,5 +1,5 @@
 pragma circom 2.1.9;
 
-include "../../circuits/chacha20/nivc/chacha20_nivc.circom";
+include "../../circuits/chacha20/authentication.circom";
 
-component main { public [step_in] } = ChaCha20_NIVC(1024);
\ No newline at end of file
+component main { public [step_in] } = PlaintextAuthentication(1024);
\ No newline at end of file
diff --git a/builds/target_512b/json_extract_value_512b.circom b/builds/target_512b/json_extract_value_512b.circom
deleted file mode 100644
index 600cc0a..0000000
--- a/builds/target_512b/json_extract_value_512b.circom
+++ /dev/null
@@ -1,5 +0,0 @@
-pragma circom 2.1.9;
-
-include "../../circuits/json/nivc/extractor.circom";
-
-component main { public [step_in] } = MaskExtractFinal(512, 50);
\ No newline at end of file
diff --git a/builds/target_512b/json_extraction_512b.circom b/builds/target_512b/json_extraction_512b.circom
new file mode 100644
index 0000000..52b216a
--- /dev/null
+++ b/builds/target_512b/json_extraction_512b.circom
@@ -0,0 +1,5 @@
+pragma circom 2.1.9;
+
+include "../../circuits/json/extraction.circom";
+
+component main { public [step_in] } = JSONExtraction(512, 10);
\ No newline at end of file
diff --git a/builds/target_512b/json_mask_array_index_512b.circom b/builds/target_512b/json_mask_array_index_512b.circom
deleted file mode 100644
index ec72dc7..0000000
--- a/builds/target_512b/json_mask_array_index_512b.circom
+++ /dev/null
@@ -1,5 +0,0 @@
-pragma circom 2.1.9;
-
-include "../../circuits/json/nivc/masker.circom";
-
-component main { public [step_in] } = JsonMaskArrayIndexNIVC(512, 10);
\ No newline at end of file
diff --git a/builds/target_512b/json_mask_object_512b.circom b/builds/target_512b/json_mask_object_512b.circom
deleted file mode 100644
index 3bd0e31..0000000
--- a/builds/target_512b/json_mask_object_512b.circom
+++ /dev/null
@@ -1,5 +0,0 @@
-pragma circom 2.1.9;
-
-include "../../circuits/json/nivc/masker.circom";
-
-component main { public [step_in] } = JsonMaskObjectNIVC(512, 10, 10);
diff --git a/builds/target_512b/plaintext_authentication_512b.circom b/builds/target_512b/plaintext_authentication_512b.circom
index f0c99ff..30388e9 100644
--- a/builds/target_512b/plaintext_authentication_512b.circom
+++ b/builds/target_512b/plaintext_authentication_512b.circom
@@ -1,5 +1,5 @@
 pragma circom 2.1.9;
 
-include "../../circuits/chacha20/nivc/chacha20_nivc.circom";
+include "../../circuits/chacha20/authentication.circom";
 
-component main { public [step_in] } = ChaCha20_NIVC(512);
\ No newline at end of file
+component main { public [step_in] } = PlaintextAuthentication(512);
\ No newline at end of file