diff --git a/tests/README.md b/tests/README.md
index 5322d0f795..96ce6ddd62 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -19,7 +19,7 @@ namespace: Parse
 expectation: Pass
 */
 
-circuit X {
+struct X {
     x: u32,
     y: u32,
 }
diff --git a/tests/compiler/additional_benches/big_circuit.leo b/tests/compiler/additional_benches/big_circuit.leo
index 4328ed06c0..75f9bc256f 100644
--- a/tests/compiler/additional_benches/big_circuit.leo
+++ b/tests/compiler/additional_benches/big_circuit.leo
@@ -10,7 +10,7 @@ function main() {
     return foo.x0 + bar.x255;
 }
 
-circuit Foo {
+struct Foo {
     x0: u8;
     x1: u8;
     x2: u8;
diff --git a/tests/compiler/additional_benches/large_1.leo b/tests/compiler/additional_benches/large_1.leo
index 2d6209bb17..9bcd316e0c 100644
--- a/tests/compiler/additional_benches/large_1.leo
+++ b/tests/compiler/additional_benches/large_1.leo
@@ -10,7 +10,7 @@ type V8fkp = u128;
 const vxlan = 13658i16;
 
 
-circuit sylcl {
+struct sylcl {
     bTxd7: bool,
     tfTQr: bool,
     l_Dfk: u32,
@@ -100,7 +100,7 @@ function xGEs (
     return eLHo5;
 }
 
-circuit L9Snz {
+struct L9Snz {
 
     function PC0R (
         const jevo: address,
@@ -234,7 +234,7 @@ function BHZjx (
     return WUY_d.0.2.2;
 }
 
-circuit GzzO {
+struct GzzO {
     RAyvy: char,
     SGgTI: i16,
     AWm8P: char,
diff --git a/tests/compiler/additional_benches/large_2.leo b/tests/compiler/additional_benches/large_2.leo
index ef42a96146..56e29528de 100644
--- a/tests/compiler/additional_benches/large_2.leo
+++ b/tests/compiler/additional_benches/large_2.leo
@@ -63,7 +63,7 @@ function Tw0p (jCQc: char) -> (
     return (6810u16, 122075245384760587708883454153053778463i128, 11162326899970246285u64, (15111u16, t5RQ {}));
 }
 
-circuit t5RQ {
+struct t5RQ {
 }
 
 
@@ -80,7 +80,7 @@ function fGeK (const YKvX: i8) -> u8 {
     return 199u8;
 }
 
-circuit q2USj {
+struct q2USj {
     GoGV: bool,
     aLCN: i32,
     E_t6: bool,
@@ -182,7 +182,7 @@ function mH2Y9 (iEfoy: u8) -> (
     return (11817726415298897201781763882612161235674380541753244883813987091658618975514747358698825992261995321821959028187112813486614880508876689770337142994146408field, '\u{105181}', 212u8);
 }
 
-circuit VdqTF {
+struct VdqTF {
     vNAMH: bool,
     JkBcA: address,
     qQtCF: i16,
diff --git a/tests/compiler/additional_benches/large_3.leo b/tests/compiler/additional_benches/large_3.leo
index 765b39e23d..28648b94f1 100644
--- a/tests/compiler/additional_benches/large_3.leo
+++ b/tests/compiler/additional_benches/large_3.leo
@@ -65,7 +65,7 @@ function FCIe (
         } 
 }
 
-circuit x4x07 {
+struct x4x07 {
     Gg_UX: u16,
     CFmyP: bool,
     QdLo: u64,
@@ -231,7 +231,7 @@ function uocd () -> (
     return (679694547190221403116537244681951121754919771791350316747287453042032902862057226918548953516602842317380963297974405319599274158746187816329125707432325field, 83083990534768452705048990419652926759, 21119u16);
 }
 
-circuit c0q0D {
+struct c0q0D {
     K4OKX: u64,
     sWaX: address,
     BEMu: char,
@@ -293,7 +293,7 @@ circuit c0q0D {
 }
 
 
-circuit yoi2 {
+struct yoi2 {
     Q9XX: address,
     PeYO: char,
 
diff --git a/tests/compiler/additional_benches/large_4.leo b/tests/compiler/additional_benches/large_4.leo
index 7f04fc9fb8..0e1e0b4153 100644
--- a/tests/compiler/additional_benches/large_4.leo
+++ b/tests/compiler/additional_benches/large_4.leo
@@ -13,7 +13,7 @@ type zyIj = [gwqG; 3];
 
 type nyaT0 = KMjk;
 
-circuit ud9u {
+struct ud9u {
 
     function OA2a (self, const PQSm: i64) -> (
         [[u8; 1]; 2],
@@ -50,7 +50,7 @@ circuit ud9u {
 }
 
 
-circuit QIdG {
+struct QIdG {
     mOJx: u128,
     ats6: i32,
     QJg2: u32,
@@ -96,7 +96,7 @@ function main (elXa: i128) -> (
     return (aleo1fl2jl3jyphgprzcmj78j88s93fu3clx47uskj0508y5r7z6fncyq8706c6, (183u8 ** 0u8 + (true? 67 : 65u8) * 0u8 + 195u8 / 203u8) * 60u8 ** 1u8 - 0u8 * 0u8 ** (61u8 - 32u8 - 13u8 - 23u8 / 65u8 / 84u8));
 }
 
-circuit gwqG {
+struct gwqG {
     KWE2: (i64, i128, [i32; 2], (([address; 1], i64, address, i128), TESjC)),
     PtPCd: u64,
     P4SG: (i32, [(u32, bool, TESjC); 2], i32, i16),
diff --git a/tests/compiler/additional_benches/large_5.leo b/tests/compiler/additional_benches/large_5.leo
index 872b25ca31..3231558067 100644
--- a/tests/compiler/additional_benches/large_5.leo
+++ b/tests/compiler/additional_benches/large_5.leo
@@ -39,7 +39,7 @@ function main () -> (
     return ('\x6a', -32246, '\x0f', (false, -78, 134482078048524008i64, 54), woTZ.0);
 }
 
-circuit XzVq {
+struct XzVq {
     amVgA: [i64; 2],
 
     function m0NjV (self) {
@@ -67,7 +67,7 @@ function yJ9T (
     //RETURN
 }
 
-circuit M6Cza {
+struct M6Cza {
 
     function JYvIz (
         self,
@@ -311,5 +311,5 @@ function nKDZF (
         } 
 }
 
-circuit FjCxy {
+struct FjCxy {
 }
diff --git a/tests/compiler/additional_benches/massive.leo b/tests/compiler/additional_benches/massive.leo
index 0961ea0aa4..8b24d889bd 100644
--- a/tests/compiler/additional_benches/massive.leo
+++ b/tests/compiler/additional_benches/massive.leo
@@ -790,7 +790,7 @@ function Y8vwD () -> (
     return ('\x49', 0618428222752580929025744011017473243663188325800434593874052200field);
 }
 
-circuit ch4X {
+struct ch4X {
     u4M_f: u8,
 
     function zxMYt (
@@ -1135,7 +1135,7 @@ function kUOeO (
     } 
 }
 
-circuit K9Bs {
+struct K9Bs {
     loESr: ((i128, address, i128), bool),
 
     function LjoKc () {
@@ -1574,7 +1574,7 @@ function XKP9 (
     LdsOq[..2u32][1] = LdsOq[0u32..][KCR4 * KCR4 ** 0 - 3187832772u32];
 }
 
-circuit bmU5 {
+struct bmU5 {
     Ym93w: RKDY,
     QtiNX: [i16; 3],
     bPmuq: RKDY,
diff --git a/tests/compiler/additional_benches/medium_2.leo b/tests/compiler/additional_benches/medium_2.leo
index 593a435423..b6299e7754 100644
--- a/tests/compiler/additional_benches/medium_2.leo
+++ b/tests/compiler/additional_benches/medium_2.leo
@@ -20,7 +20,7 @@ const AWye: xs1w = 115i8;
 const NyOSS: i64 = -9112024196555249712i64;
 
 
-circuit UaAlp {
+struct UaAlp {
     Lq72: xs1w,
 }
 
@@ -90,7 +90,7 @@ function gLeR (const ltYE: (char, char)) -> (
     return (74, 3906516312311027547u64);
 }
 
-circuit KAjg {
+struct KAjg {
 }
 
 
diff --git a/tests/compiler/additional_benches/medium_3.leo b/tests/compiler/additional_benches/medium_3.leo
index 37de0f0d66..235ceb5011 100644
--- a/tests/compiler/additional_benches/medium_3.leo
+++ b/tests/compiler/additional_benches/medium_3.leo
@@ -59,7 +59,7 @@ function main (
     //RETURN
 }
 
-circuit HeJTD {
+struct HeJTD {
 
     function sxOgu (self, const kksQi: i128) -> (
         u8,
@@ -95,7 +95,7 @@ circuit HeJTD {
 }
 
 
-circuit gtQV {
+struct gtQV {
     L6gU: i16,
     hC3az: u128,
     j7uL: i64,
diff --git a/tests/compiler/additional_benches/medium_5.leo b/tests/compiler/additional_benches/medium_5.leo
index a21f62fdcd..11e43cd335 100644
--- a/tests/compiler/additional_benches/medium_5.leo
+++ b/tests/compiler/additional_benches/medium_5.leo
@@ -47,7 +47,7 @@ function cD4r (const Ef4DK: u8) -> bool {
     return 4170085385614217102u64 > 2900170916628410432u64 && (8859831151384150600u64, 9584u16, 64997411429767251474068675400579704411u128, 51394u16) != (8694497216948073522u64, 12295u16, Rjka, 26950u16) || aleo1j3c7r67xcd5qd9hyc03jnsazss4thwsdckeun24sggvxcgyaxuxq5sexds == aleo1jupcxnkqw94s8es4342man4ggx964l5cuct6p47u6w7zh99z9u8qshynps;
 }
 
-circuit FKmZ {
+struct FKmZ {
     M8qe: i32,
     D73jn: bool,
     zqD4: u64,
diff --git a/tests/compiler/additional_benches/small_3.leo b/tests/compiler/additional_benches/small_3.leo
index 36472018cf..790c27768d 100644
--- a/tests/compiler/additional_benches/small_3.leo
+++ b/tests/compiler/additional_benches/small_3.leo
@@ -21,7 +21,7 @@ const xfK1Q: u8 = 211u8;
 const xQ3fN: u32 = 2283742765u32;
 
 
-circuit JFjRt {
+struct JFjRt {
     P08i: i8,
     JVRV: [char; 3],
     FCVt: [u16; 4],
diff --git a/tests/compiler/additional_benches/small_4.leo b/tests/compiler/additional_benches/small_4.leo
index 4bf2973fd1..b0416831c8 100644
--- a/tests/compiler/additional_benches/small_4.leo
+++ b/tests/compiler/additional_benches/small_4.leo
@@ -43,5 +43,5 @@ function uaKPx (const QNzSh: i128) -> (
     return (1055028656, MsgN[1..][0u32]);
 }
 
-circuit PANW {
+struct PANW {
 }
diff --git a/tests/compiler/additional_benches/small_5.leo b/tests/compiler/additional_benches/small_5.leo
index a9e476bee8..5c794eb22e 100644
--- a/tests/compiler/additional_benches/small_5.leo
+++ b/tests/compiler/additional_benches/small_5.leo
@@ -20,7 +20,7 @@ const f2Tb9: i128 = 45051584313652375601764187183414341445;
 const V5kfY: i16 = -8790i16;
 
 
-circuit Sjme {
+struct Sjme {
     hmJC: i16,
     CcHF: [u128; 2],
     ZoZp: char,
diff --git a/tests/compiler/circuits/circuit_contains_record_fail.leo b/tests/compiler/circuits/circuit_contains_record_fail.leo
index bc5d58b545..b31bbd603d 100644
--- a/tests/compiler/circuits/circuit_contains_record_fail.leo
+++ b/tests/compiler/circuits/circuit_contains_record_fail.leo
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Fail
 */
 
-circuit Foo {
+struct Foo {
     // The token amount.
     token: Token,
 }
diff --git a/tests/compiler/circuits/circuit_function_namespace_conflict_fail.leo b/tests/compiler/circuits/circuit_function_namespace_conflict_fail.leo
index c024676521..043fcaf190 100644
--- a/tests/compiler/circuits/circuit_function_namespace_conflict_fail.leo
+++ b/tests/compiler/circuits/circuit_function_namespace_conflict_fail.leo
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Fail
 */
 
-circuit Foo {
+struct Foo {
     x: u8;
 }
 
diff --git a/tests/compiler/circuits/duplicate_circuit_variable.leo b/tests/compiler/circuits/duplicate_circuit_variable.leo
index e5946aa17f..f7fd4245bc 100644
--- a/tests/compiler/circuits/duplicate_circuit_variable.leo
+++ b/tests/compiler/circuits/duplicate_circuit_variable.leo
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Fail
 */
 
-circuit Bar {
+struct Bar {
     x: u32,
     x: u32,
 }
diff --git a/tests/compiler/circuits/duplicate_name_context.leo b/tests/compiler/circuits/duplicate_name_context.leo
index 948d4d8b74..9f92b9e2d8 100644
--- a/tests/compiler/circuits/duplicate_name_context.leo
+++ b/tests/compiler/circuits/duplicate_name_context.leo
@@ -4,7 +4,7 @@ expectation: Fail
 input_file: input/dummy.in
 */
 
-circuit Bar {
+struct Bar {
     b2: u32
 }
 
diff --git a/tests/compiler/circuits/inline.leo b/tests/compiler/circuits/inline.leo
index 6a38731690..7c41a47d5b 100644
--- a/tests/compiler/circuits/inline.leo
+++ b/tests/compiler/circuits/inline.leo
@@ -10,7 +10,7 @@ inputs:
     r0: u32 = 0;
 */
 
-circuit Foo {
+struct Foo {
     x: u32
 }
 
diff --git a/tests/compiler/circuits/inline_fail.leo b/tests/compiler/circuits/inline_fail.leo
index 648102e956..bccc2274e0 100644
--- a/tests/compiler/circuits/inline_fail.leo
+++ b/tests/compiler/circuits/inline_fail.leo
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Fail
 */
 
-circuit Foo {
+struct Foo {
     x: u32;
 }
 
diff --git a/tests/compiler/circuits/inline_member_fail.leo b/tests/compiler/circuits/inline_member_fail.leo
index abbd79d2bd..a8006b7b9a 100644
--- a/tests/compiler/circuits/inline_member_fail.leo
+++ b/tests/compiler/circuits/inline_member_fail.leo
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Fail
 */
 
-circuit Foo {
+struct Foo {
     x: u8;
 }
 
diff --git a/tests/compiler/circuits/inline_member_pass.leo b/tests/compiler/circuits/inline_member_pass.leo
index c64bc45acc..5a0d21d4ca 100644
--- a/tests/compiler/circuits/inline_member_pass.leo
+++ b/tests/compiler/circuits/inline_member_pass.leo
@@ -13,7 +13,7 @@ inputs:
     r0: bool = false;  
 */
 
-circuit Foo {
+struct Foo {
     x: u8
 }
 
diff --git a/tests/compiler/circuits/member_variable.leo b/tests/compiler/circuits/member_variable.leo
index bd678f030e..3bfa246015 100644
--- a/tests/compiler/circuits/member_variable.leo
+++ b/tests/compiler/circuits/member_variable.leo
@@ -4,7 +4,7 @@ expectation: Pass
 input_file: input/dummy.in
 */
 
-circuit Foo {
+struct Foo {
     x: u32,
 }
 
diff --git a/tests/compiler/circuits/member_variable_fail.leo b/tests/compiler/circuits/member_variable_fail.leo
index 0710226182..8174a8a4cb 100644
--- a/tests/compiler/circuits/member_variable_fail.leo
+++ b/tests/compiler/circuits/member_variable_fail.leo
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Fail
 */
 
-circuit Foo {
+struct Foo {
     x: u32;
 }
 
diff --git a/tests/compiler/circuits/unknown_member_type_fail.leo b/tests/compiler/circuits/unknown_member_type_fail.leo
index 3ae7ea0a4a..2c3ef2a168 100644
--- a/tests/compiler/circuits/unknown_member_type_fail.leo
+++ b/tests/compiler/circuits/unknown_member_type_fail.leo
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Fail
 */
 
-circuit Foo {
+struct Foo {
     a: u8,
     bar: Bar,
 }
diff --git a/tests/compiler/console/assert.leo b/tests/compiler/console/assert.leo
index ea8dcf25f4..683a746358 100644
--- a/tests/compiler/console/assert.leo
+++ b/tests/compiler/console/assert.leo
@@ -4,7 +4,7 @@ expectation: Pass
 input_file: inputs/true.in
 */
 
-circuit Foo {
+struct Foo {
     a: u8;
 }
 
diff --git a/tests/compiler/core/algorithms/bhp1024_commit.leo b/tests/compiler/core/algorithms/bhp1024_commit.leo
index f1c0c9d218..9232373757 100644
--- a/tests/compiler/core/algorithms/bhp1024_commit.leo
+++ b/tests/compiler/core/algorithms/bhp1024_commit.leo
@@ -4,7 +4,7 @@ expectation: Pass
 input_file: inputs/int64.in
 */
 
-circuit Foo {
+struct Foo {
     a: u128,
     b: u128,
 }
diff --git a/tests/compiler/core/algorithms/bhp1024_hash.leo b/tests/compiler/core/algorithms/bhp1024_hash.leo
index f909e28405..5ed4a659dc 100644
--- a/tests/compiler/core/algorithms/bhp1024_hash.leo
+++ b/tests/compiler/core/algorithms/bhp1024_hash.leo
@@ -4,7 +4,7 @@ expectation: Pass
 input_file: inputs/int64.in
 */
 
-circuit Foo {
+struct Foo {
     a: u128,
     b: u128,
 }
diff --git a/tests/compiler/core/algorithms/bhp256_commit.leo b/tests/compiler/core/algorithms/bhp256_commit.leo
index 379ad65ecb..6460596d24 100644
--- a/tests/compiler/core/algorithms/bhp256_commit.leo
+++ b/tests/compiler/core/algorithms/bhp256_commit.leo
@@ -4,7 +4,7 @@ expectation: Pass
 input_file: inputs/int64.in
 */
 
-circuit Foo {
+struct Foo {
     a: u128,
     b: u128,
 }
diff --git a/tests/compiler/core/algorithms/bhp256_hash.leo b/tests/compiler/core/algorithms/bhp256_hash.leo
index 95e17aaed0..2c3eb8f29a 100644
--- a/tests/compiler/core/algorithms/bhp256_hash.leo
+++ b/tests/compiler/core/algorithms/bhp256_hash.leo
@@ -4,7 +4,7 @@ expectation: Pass
 input_file: inputs/int64.in
 */
 
-circuit Foo {
+struct Foo {
     a: u128,
     b: u128,
 }
diff --git a/tests/compiler/core/algorithms/bhp512_commit.leo b/tests/compiler/core/algorithms/bhp512_commit.leo
index 52a0644e09..96cdab4aea 100644
--- a/tests/compiler/core/algorithms/bhp512_commit.leo
+++ b/tests/compiler/core/algorithms/bhp512_commit.leo
@@ -4,7 +4,7 @@ expectation: Pass
 input_file: inputs/int64.in
 */
 
-circuit Foo {
+struct Foo {
     a: u128,
     b: u128,
 }
diff --git a/tests/compiler/core/algorithms/bhp512_hash.leo b/tests/compiler/core/algorithms/bhp512_hash.leo
index 3dc99ed59f..f6e6445ca5 100644
--- a/tests/compiler/core/algorithms/bhp512_hash.leo
+++ b/tests/compiler/core/algorithms/bhp512_hash.leo
@@ -4,7 +4,7 @@ expectation: Pass
 input_file: inputs/int64.in
 */
 
-circuit Foo {
+struct Foo {
     a: u128,
     b: u128,
 }
diff --git a/tests/compiler/core/algorithms/bhp768_commit.leo b/tests/compiler/core/algorithms/bhp768_commit.leo
index 3d36c99b2d..8c1179497d 100644
--- a/tests/compiler/core/algorithms/bhp768_commit.leo
+++ b/tests/compiler/core/algorithms/bhp768_commit.leo
@@ -4,7 +4,7 @@ expectation: Pass
 input_file: inputs/int64.in
 */
 
-circuit Foo {
+struct Foo {
     a: u128,
     b: u128,
 }
diff --git a/tests/compiler/core/algorithms/bhp768_hash.leo b/tests/compiler/core/algorithms/bhp768_hash.leo
index a737992112..5d3cbf8ca1 100644
--- a/tests/compiler/core/algorithms/bhp768_hash.leo
+++ b/tests/compiler/core/algorithms/bhp768_hash.leo
@@ -4,7 +4,7 @@ expectation: Pass
 input_file: inputs/int64.in
 */
 
-circuit Foo {
+struct Foo {
     a: u128,
     b: u128,
 }
diff --git a/tests/compiler/core/algorithms/poseidon2_hash.leo b/tests/compiler/core/algorithms/poseidon2_hash.leo
index a9e6a95e63..fbae168ac9 100644
--- a/tests/compiler/core/algorithms/poseidon2_hash.leo
+++ b/tests/compiler/core/algorithms/poseidon2_hash.leo
@@ -4,7 +4,7 @@ expectation: Pass
 input_file: inputs/int64.in
 */
 
-circuit Foo {
+struct Foo {
     a: u128,
     b: u128,
 }
diff --git a/tests/compiler/core/algorithms/poseidon4_hash.leo b/tests/compiler/core/algorithms/poseidon4_hash.leo
index 798142f6e6..938f8ce5dc 100644
--- a/tests/compiler/core/algorithms/poseidon4_hash.leo
+++ b/tests/compiler/core/algorithms/poseidon4_hash.leo
@@ -4,7 +4,7 @@ expectation: Pass
 input_file: inputs/int64.in
 */
 
-circuit Foo {
+struct Foo {
     a: u128,
     b: u128,
 }
diff --git a/tests/compiler/core/algorithms/poseidon8_hash.leo b/tests/compiler/core/algorithms/poseidon8_hash.leo
index ca792af63d..2796badd6e 100644
--- a/tests/compiler/core/algorithms/poseidon8_hash.leo
+++ b/tests/compiler/core/algorithms/poseidon8_hash.leo
@@ -4,7 +4,7 @@ expectation: Pass
 input_file: inputs/int64.in
 */
 
-circuit Foo {
+struct Foo {
     a: u128,
     b: u128,
 }
diff --git a/tests/compiler/definition/out_of_order.leo b/tests/compiler/definition/out_of_order.leo
index bed6821d67..e957b74b3f 100644
--- a/tests/compiler/definition/out_of_order.leo
+++ b/tests/compiler/definition/out_of_order.leo
@@ -12,4 +12,4 @@ function main(y: bool) -> bool {
     return y == true;
 }
 
-// circuit Foo {}
+// struct Foo {}
diff --git a/tests/compiler/finalize/mapping.leo b/tests/compiler/finalize/mapping.leo
index 4c7a9eb393..2a9847f3a1 100644
--- a/tests/compiler/finalize/mapping.leo
+++ b/tests/compiler/finalize/mapping.leo
@@ -5,18 +5,18 @@ expectation: Pass
 
 mapping balances: address => u128;
 
-circuit Token {
+struct Token {
     owner: address;
     balance: u128;
 }
 
 mapping tokens: address => Token;
 
-circuit Bar {
+struct Bar {
     a: u128;
 }
 
-circuit Baz {
+struct Baz {
     a: u128;
 }
 
diff --git a/tests/compiler/finalize/shadow_mapping_fail.leo b/tests/compiler/finalize/shadow_mapping_fail.leo
index 87871fdab3..8695cc6d50 100644
--- a/tests/compiler/finalize/shadow_mapping_fail.leo
+++ b/tests/compiler/finalize/shadow_mapping_fail.leo
@@ -22,6 +22,6 @@ function baz(a: u8) -> u8 {
     return bar;
 }
 
-circuit bar {
+struct bar {
     a: u64;
 }
diff --git a/tests/compiler/function/flatten_test.leo b/tests/compiler/function/flatten_test.leo
index 2605e8975d..9b7c81336c 100644
--- a/tests/compiler/function/flatten_test.leo
+++ b/tests/compiler/function/flatten_test.leo
@@ -3,13 +3,13 @@ namespace: Compile
 expectation: Pass
 */
 
-circuit Row {
+struct Row {
     e1: u8,
     e2: u8,
     e3: u8
 }
 
-circuit Board {
+struct Board {
     r1: Row,
     r2: Row,
     r3: Row,
diff --git a/tests/compiler/function/helper_function_with_interface.leo b/tests/compiler/function/helper_function_with_interface.leo
index 858a9a6594..0347e91e20 100644
--- a/tests/compiler/function/helper_function_with_interface.leo
+++ b/tests/compiler/function/helper_function_with_interface.leo
@@ -9,7 +9,7 @@ function main(public a: u32, b: u32) -> u32 {
     return c;
 }
 
-circuit Board {
+struct Board {
    foo: u8,
 }
 
diff --git a/tests/compiler/records/duplicate_circuit_name_fail.leo b/tests/compiler/records/duplicate_circuit_name_fail.leo
index 54feec25c8..71d2ed06a0 100644
--- a/tests/compiler/records/duplicate_circuit_name_fail.leo
+++ b/tests/compiler/records/duplicate_circuit_name_fail.leo
@@ -12,7 +12,7 @@ record Token {
     amount: u64,
 }
 
-circuit Token { // This circuit cannot have the same name as the record defined above it.
+struct Token { // This struct cannot have the same name as the record defined above it.
     x: u32,
 }
 
diff --git a/tests/compiler/records/nested_record.leo b/tests/compiler/records/nested_record.leo
index 0e19f10e0c..a7b12a83cb 100644
--- a/tests/compiler/records/nested_record.leo
+++ b/tests/compiler/records/nested_record.leo
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 */
 
-circuit Amount {
+struct Amount {
     amount: u64,
     amt: u64,
 }
diff --git a/tests/compiler/records/nested_record_3_fail.leo b/tests/compiler/records/nested_record_3_fail.leo
index 1446830a7d..d9f6adfd81 100644
--- a/tests/compiler/records/nested_record_3_fail.leo
+++ b/tests/compiler/records/nested_record_3_fail.leo
@@ -10,7 +10,7 @@ record Token {
 }
 
 
-circuit Bar {
+struct Bar {
     bar: Foo,
 }
 
diff --git a/tests/compiler/records/nested_record_4_fail.leo b/tests/compiler/records/nested_record_4_fail.leo
index 535cdbbc5e..cafe2ad463 100644
--- a/tests/compiler/records/nested_record_4_fail.leo
+++ b/tests/compiler/records/nested_record_4_fail.leo
@@ -9,7 +9,7 @@ record Token3 {
     bar: (Bar, Bar),
 }
 
-circuit Bar {
+struct Bar {
     bar: (Token, Token),
 }
 
diff --git a/tests/compiler/tuple/tuple_not_allowed.leo b/tests/compiler/tuple/tuple_not_allowed.leo
index c681d026ef..6069ae4d07 100644
--- a/tests/compiler/tuple/tuple_not_allowed.leo
+++ b/tests/compiler/tuple/tuple_not_allowed.leo
@@ -20,6 +20,6 @@ function baz() -> u8 {
     return 0u8;
 }
 
-circuit A {
+struct A {
     mem: (u8, u16)
 }
diff --git a/tests/expectations/compiler/circuits/circuit_contains_record_fail.out b/tests/expectations/compiler/circuits/circuit_contains_record_fail.out
index 872dc2d75a..8048435dee 100644
--- a/tests/expectations/compiler/circuits/circuit_contains_record_fail.out
+++ b/tests/expectations/compiler/circuits/circuit_contains_record_fail.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ETYC0372030]: A circuit or record cannot contain another record.\n    --> compiler-test:5:5\n     |\n   5 |     token: Token,\n     |     ^^^^^\n     |\n     = Remove the record `Token` from `Foo`.\n"
+  - "Error [ETYC0372030]: A struct or record cannot contain another record.\n    --> compiler-test:5:5\n     |\n   5 |     token: Token,\n     |     ^^^^^\n     |\n     = Remove the record `Token` from `Foo`.\n"
diff --git a/tests/expectations/compiler/circuits/circuit_function_namespace_conflict_fail.out b/tests/expectations/compiler/circuits/circuit_function_namespace_conflict_fail.out
index a32152dd64..cd197421c1 100644
--- a/tests/expectations/compiler/circuits/circuit_function_namespace_conflict_fail.out
+++ b/tests/expectations/compiler/circuits/circuit_function_namespace_conflict_fail.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EAST0372009]: circuit `Foo` shadowed by\n    --> compiler-test:7:1\n     |\n   7 | function Foo() {}\n     | ^^^^^^^^^^^^^^^^^\n"
+  - "Error [EAST0372009]: struct `Foo` shadowed by\n    --> compiler-test:7:1\n     |\n   7 | function Foo() {}\n     | ^^^^^^^^^^^^^^^^^\n"
diff --git a/tests/expectations/compiler/circuits/duplicate_circuit_variable.out b/tests/expectations/compiler/circuits/duplicate_circuit_variable.out
index 1beb7652ae..73926ab1fe 100644
--- a/tests/expectations/compiler/circuits/duplicate_circuit_variable.out
+++ b/tests/expectations/compiler/circuits/duplicate_circuit_variable.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ETYC0372015]: Circuit Bar defined with more than one member with the same name.\n    --> compiler-test:3:1\n     |\n   3 | circuit Bar {\n   4 |     x: u32,\n   5 |     x: u32,\n   6 | }\n     | ^\n"
+  - "Error [ETYC0372015]: Circuit Bar defined with more than one member with the same name.\n    --> compiler-test:3:1\n     |\n   3 | struct Bar {\n   4 |     x: u32,\n   5 |     x: u32,\n   6 | }\n     | ^\n"
diff --git a/tests/expectations/compiler/circuits/duplicate_name_context.out b/tests/expectations/compiler/circuits/duplicate_name_context.out
index 02541292d0..e5eab41a6b 100644
--- a/tests/expectations/compiler/circuits/duplicate_name_context.out
+++ b/tests/expectations/compiler/circuits/duplicate_name_context.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EAST0372009]: circuit `Bar` shadowed by\n    --> compiler-test:8:5\n     |\n   8 |     const Bar: u32 = 66u32;\n     |     ^^^^^^^^^^^^^^^^^^^^^^\n"
+  - "Error [EAST0372009]: struct `Bar` shadowed by\n    --> compiler-test:8:5\n     |\n   8 |     const Bar: u32 = 66u32;\n     |     ^^^^^^^^^^^^^^^^^^^^^^\n"
diff --git a/tests/expectations/compiler/circuits/inline_undefined.out b/tests/expectations/compiler/circuits/inline_undefined.out
index e90564518c..f8c94b8ac6 100644
--- a/tests/expectations/compiler/circuits/inline_undefined.out
+++ b/tests/expectations/compiler/circuits/inline_undefined.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ETYC0372017]: The type `Foo` is not found in the current scope.\n    --> compiler-test:4:5\n     |\n   4 |     const a: Foo = Foo { };\n     |     ^^^^^^^^^^^^^^^^^^^^^^\nError [ETYC0372005]: Unknown circuit `Foo`\n    --> compiler-test:4:20\n     |\n   4 |     const a: Foo = Foo { };\n     |                    ^^^\n"
+  - "Error [ETYC0372017]: The type `Foo` is not found in the current scope.\n    --> compiler-test:4:5\n     |\n   4 |     const a: Foo = Foo { };\n     |     ^^^^^^^^^^^^^^^^^^^^^^\nError [ETYC0372005]: Unknown struct `Foo`\n    --> compiler-test:4:20\n     |\n   4 |     const a: Foo = Foo { };\n     |                    ^^^\n"
diff --git a/tests/expectations/compiler/circuits/unknown_member_type_fail.out b/tests/expectations/compiler/circuits/unknown_member_type_fail.out
index 620975de68..c7cef05447 100644
--- a/tests/expectations/compiler/circuits/unknown_member_type_fail.out
+++ b/tests/expectations/compiler/circuits/unknown_member_type_fail.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ETYC0372017]: The type `Bar` is not found in the current scope.\n    --> compiler-test:3:1\n     |\n   3 | circuit Foo {\n   4 |     a: u8,\n   5 |     bar: Bar,\n   6 | }\n     | ^\n"
+  - "Error [ETYC0372017]: The type `Bar` is not found in the current scope.\n    --> compiler-test:3:1\n     |\n   3 | struct Foo {\n   4 |     a: u8,\n   5 |     bar: Bar,\n   6 | }\n     | ^\n"
diff --git a/tests/expectations/compiler/finalize/shadow_mapping_fail.out b/tests/expectations/compiler/finalize/shadow_mapping_fail.out
index 896027d7df..ad8fd2b750 100644
--- a/tests/expectations/compiler/finalize/shadow_mapping_fail.out
+++ b/tests/expectations/compiler/finalize/shadow_mapping_fail.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EAST0372009]: circuit `bar` shadowed by\n    --> compiler-test:4:1\n     |\n   4 | mapping bar: u8 => u8;\n     | ^^^^^^^^^^^^^^^^^^^^^^\nError [EAST0372009]: circuit `bar` shadowed by\n    --> compiler-test:7:1\n     |\n   7 | function bar(a: u8) -> u8 {\n   8 |     return a + 1u8;\n   9 | }\n     | ^\n"
+  - "Error [EAST0372009]: struct `bar` shadowed by\n    --> compiler-test:4:1\n     |\n   4 | mapping bar: u8 => u8;\n     | ^^^^^^^^^^^^^^^^^^^^^^\nError [EAST0372009]: struct `bar` shadowed by\n    --> compiler-test:7:1\n     |\n   7 | function bar(a: u8) -> u8 {\n   8 |     return a + 1u8;\n   9 | }\n     | ^\n"
diff --git a/tests/expectations/compiler/records/duplicate_circuit_name_fail.out b/tests/expectations/compiler/records/duplicate_circuit_name_fail.out
index d2a0d3a021..6df4a12bcf 100644
--- a/tests/expectations/compiler/records/duplicate_circuit_name_fail.out
+++ b/tests/expectations/compiler/records/duplicate_circuit_name_fail.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EAST0372010]: record `Token` shadowed by\n    --> compiler-test:12:1\n     |\n  12 | circuit Token { // This circuit cannot have the same name as the record defined above it.\n  13 |     x: u32,\n  14 | }\n     | ^\n"
+  - "Error [EAST0372010]: record `Token` shadowed by\n    --> compiler-test:12:1\n     |\n  12 | struct Token { // This struct cannot have the same name as the record defined above it.\n  13 |     x: u32,\n  14 | }\n     | ^\n"
diff --git a/tests/expectations/compiler/records/nested_record_1_fail.out b/tests/expectations/compiler/records/nested_record_1_fail.out
index af467f7ddb..0c5a20a9cc 100644
--- a/tests/expectations/compiler/records/nested_record_1_fail.out
+++ b/tests/expectations/compiler/records/nested_record_1_fail.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ETYC0372030]: A circuit or record cannot contain another record.\n    --> compiler-test:12:5\n     |\n  12 |     foo: Foo,\n     |     ^^^\n     |\n     = Remove the record `Foo` from `Token`.\n"
+  - "Error [ETYC0372030]: A struct or record cannot contain another record.\n    --> compiler-test:12:5\n     |\n  12 |     foo: Foo,\n     |     ^^^\n     |\n     = Remove the record `Foo` from `Token`.\n"
diff --git a/tests/expectations/compiler/records/nested_record_3_fail.out b/tests/expectations/compiler/records/nested_record_3_fail.out
index 76a19ae055..afd309a8b3 100644
--- a/tests/expectations/compiler/records/nested_record_3_fail.out
+++ b/tests/expectations/compiler/records/nested_record_3_fail.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ETYC0372030]: A circuit or record cannot contain another record.\n    --> compiler-test:11:5\n     |\n  11 |     bar: Foo,\n     |     ^^^\n     |\n     = Remove the record `Foo` from `Bar`.\n"
+  - "Error [ETYC0372030]: A struct or record cannot contain another record.\n    --> compiler-test:11:5\n     |\n  11 |     bar: Foo,\n     |     ^^^\n     |\n     = Remove the record `Foo` from `Bar`.\n"
diff --git a/tests/expectations/parser/expression/literal/comment.out b/tests/expectations/parser/expression/literal/comment.out
index 4dc36b2839..b86b417243 100644
--- a/tests/expectations/parser/expression/literal/comment.out
+++ b/tests/expectations/parser/expression/literal/comment.out
@@ -6,6 +6,6 @@ outputs:
     network: ""
     expected_input: []
     imports: {}
-    circuits: {}
+    structs: {}
     mappings: {}
     functions: {}
diff --git a/tests/expectations/parser/finalize/finalize.out b/tests/expectations/parser/finalize/finalize.out
index af705688e2..560d569487 100644
--- a/tests/expectations/parser/finalize/finalize.out
+++ b/tests/expectations/parser/finalize/finalize.out
@@ -6,7 +6,7 @@ outputs:
     network: ""
     expected_input: []
     imports: {}
-    circuits: {}
+    structs: {}
     mappings: {}
     functions:
       "{\"name\":\"main\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":15}\"}":
diff --git a/tests/expectations/parser/finalize/mapping.out b/tests/expectations/parser/finalize/mapping.out
index 564be714c6..e4a22e98d2 100644
--- a/tests/expectations/parser/finalize/mapping.out
+++ b/tests/expectations/parser/finalize/mapping.out
@@ -6,7 +6,7 @@ outputs:
     network: ""
     expected_input: []
     imports: {}
-    circuits: {}
+    structs: {}
     mappings:
       "{\"name\":\"foo\",\"span\":\"{\\\"lo\\\":10,\\\"hi\\\":13}\"}":
         identifier: "{\"name\":\"foo\",\"span\":\"{\\\"lo\\\":10,\\\"hi\\\":13}\"}"
diff --git a/tests/expectations/parser/functions/annotated_context.out b/tests/expectations/parser/functions/annotated_context.out
index 19417d3d9c..8b82dbf557 100644
--- a/tests/expectations/parser/functions/annotated_context.out
+++ b/tests/expectations/parser/functions/annotated_context.out
@@ -6,7 +6,7 @@ outputs:
     network: ""
     expected_input: []
     imports: {}
-    circuits: {}
+    structs: {}
     mappings: {}
     functions:
       "{\"name\":\"f\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}":
diff --git a/tests/expectations/parser/functions/annotated_functions.out b/tests/expectations/parser/functions/annotated_functions.out
index aca4dc5917..7cea1139ad 100644
--- a/tests/expectations/parser/functions/annotated_functions.out
+++ b/tests/expectations/parser/functions/annotated_functions.out
@@ -6,7 +6,7 @@ outputs:
     network: ""
     expected_input: []
     imports: {}
-    circuits: {}
+    structs: {}
     mappings: {}
     functions:
       "{\"name\":\"foo\",\"span\":\"{\\\"lo\\\":26,\\\"hi\\\":29}\"}":
diff --git a/tests/expectations/parser/functions/const_input.out b/tests/expectations/parser/functions/const_input.out
index 4e05aab49a..92543f4298 100644
--- a/tests/expectations/parser/functions/const_input.out
+++ b/tests/expectations/parser/functions/const_input.out
@@ -6,7 +6,7 @@ outputs:
     network: ""
     expected_input: []
     imports: {}
-    circuits: {}
+    structs: {}
     mappings: {}
     functions:
       "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}":
diff --git a/tests/expectations/parser/functions/const_param.out b/tests/expectations/parser/functions/const_param.out
index 96f4de9244..f621cd478e 100644
--- a/tests/expectations/parser/functions/const_param.out
+++ b/tests/expectations/parser/functions/const_param.out
@@ -6,7 +6,7 @@ outputs:
     network: ""
     expected_input: []
     imports: {}
-    circuits: {}
+    structs: {}
     mappings: {}
     functions:
       "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}":
diff --git a/tests/expectations/parser/functions/danling_annotations_fail.out b/tests/expectations/parser/functions/danling_annotations_fail.out
index d5e11a8a5c..10de61e58a 100644
--- a/tests/expectations/parser/functions/danling_annotations_fail.out
+++ b/tests/expectations/parser/functions/danling_annotations_fail.out
@@ -6,7 +6,7 @@ outputs:
     network: ""
     expected_input: []
     imports: {}
-    circuits: {}
+    structs: {}
     mappings: {}
     functions:
       "{\"name\":\"test\",\"span\":\"{\\\"lo\\\":94,\\\"hi\\\":98}\"}":
diff --git a/tests/expectations/parser/functions/empty2.out b/tests/expectations/parser/functions/empty2.out
index 08839929fb..69d93a02b9 100644
--- a/tests/expectations/parser/functions/empty2.out
+++ b/tests/expectations/parser/functions/empty2.out
@@ -6,7 +6,7 @@ outputs:
     network: ""
     expected_input: []
     imports: {}
-    circuits: {}
+    structs: {}
     mappings: {}
     functions:
       "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}":
diff --git a/tests/expectations/parser/functions/ident_token_fail.out b/tests/expectations/parser/functions/ident_token_fail.out
index 6ed7a2602a..d63c1c6ab7 100644
--- a/tests/expectations/parser/functions/ident_token_fail.out
+++ b/tests/expectations/parser/functions/ident_token_fail.out
@@ -2,4 +2,4 @@
 namespace: Parse
 expectation: Fail
 outputs:
-  - "Error [EPAR0370005]: expected 'function', 'circuit', 'test' -- found '1'\n    --> test:3:1\n     |\n   3 | 1 main() {}\n     | ^"
+  - "Error [EPAR0370005]: expected 'function', 'struct', 'test' -- found '1'\n    --> test:3:1\n     |\n   3 | 1 main() {}\n     | ^"
diff --git a/tests/expectations/parser/functions/params.out b/tests/expectations/parser/functions/params.out
index 27462aec0b..557eeeba1e 100644
--- a/tests/expectations/parser/functions/params.out
+++ b/tests/expectations/parser/functions/params.out
@@ -6,7 +6,7 @@ outputs:
     network: ""
     expected_input: []
     imports: {}
-    circuits: {}
+    structs: {}
     mappings: {}
     functions:
       "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}":
diff --git a/tests/expectations/parser/functions/params_return.out b/tests/expectations/parser/functions/params_return.out
index cb3bf7b826..01da653adc 100644
--- a/tests/expectations/parser/functions/params_return.out
+++ b/tests/expectations/parser/functions/params_return.out
@@ -6,7 +6,7 @@ outputs:
     network: ""
     expected_input: []
     imports: {}
-    circuits: {}
+    structs: {}
     mappings: {}
     functions:
       "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}":
diff --git a/tests/expectations/parser/functions/public_param.out b/tests/expectations/parser/functions/public_param.out
index b89ee62337..07a14652d1 100644
--- a/tests/expectations/parser/functions/public_param.out
+++ b/tests/expectations/parser/functions/public_param.out
@@ -6,7 +6,7 @@ outputs:
     network: ""
     expected_input: []
     imports: {}
-    circuits: {}
+    structs: {}
     mappings: {}
     functions:
       "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}":
diff --git a/tests/expectations/parser/functions/return.out b/tests/expectations/parser/functions/return.out
index 189aa643fa..8e6ea9354a 100644
--- a/tests/expectations/parser/functions/return.out
+++ b/tests/expectations/parser/functions/return.out
@@ -6,7 +6,7 @@ outputs:
     network: ""
     expected_input: []
     imports: {}
-    circuits: {}
+    structs: {}
     mappings: {}
     functions:
       "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}":
diff --git a/tests/expectations/parser/program/mapping.out b/tests/expectations/parser/program/mapping.out
index 0687c0b617..11e8ec686f 100644
--- a/tests/expectations/parser/program/mapping.out
+++ b/tests/expectations/parser/program/mapping.out
@@ -6,7 +6,7 @@ outputs:
     network: ""
     expected_input: []
     imports: {}
-    circuits: {}
+    structs: {}
     mappings:
       "{\"name\":\"balances\",\"span\":\"{\\\"lo\\\":10,\\\"hi\\\":18}\"}":
         identifier: "{\"name\":\"balances\",\"span\":\"{\\\"lo\\\":10,\\\"hi\\\":18}\"}"
diff --git a/tests/expectations/parser/program/mapping_fail.out b/tests/expectations/parser/program/mapping_fail.out
index 8f53155fc1..b12308ec1e 100644
--- a/tests/expectations/parser/program/mapping_fail.out
+++ b/tests/expectations/parser/program/mapping_fail.out
@@ -2,4 +2,4 @@
 namespace: Parse
 expectation: Fail
 outputs:
-  - "Error [EPAR0370005]: expected 'function', 'circuit', 'test' -- found 'mappin'\n    --> test:3:1\n     |\n   3 | mappin balances: address => u128;\n     | ^^^^^^"
+  - "Error [EPAR0370005]: expected 'function', 'struct', 'test' -- found 'mappin'\n    --> test:3:1\n     |\n   3 | mappin balances: address => u128;\n     | ^^^^^^"
diff --git a/tests/expectations/parser/serialize/one_plus_one.out b/tests/expectations/parser/serialize/one_plus_one.out
index c3421fa121..d4fad1ea45 100644
--- a/tests/expectations/parser/serialize/one_plus_one.out
+++ b/tests/expectations/parser/serialize/one_plus_one.out
@@ -6,7 +6,7 @@ outputs:
     network: ""
     expected_input: []
     imports: {}
-    circuits: {}
+    structs: {}
     mappings: {}
     functions:
       "{\"name\":\"main\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":15}\"}":
diff --git a/tests/expectations/parser/serialize/parser_error.out b/tests/expectations/parser/serialize/parser_error.out
index d37e0e45a0..6148de712c 100644
--- a/tests/expectations/parser/serialize/parser_error.out
+++ b/tests/expectations/parser/serialize/parser_error.out
@@ -2,4 +2,4 @@
 namespace: Serialize
 expectation: Fail
 outputs:
-  - "Error [EPAR0370005]: expected 'function', 'circuit', 'test' -- found 'invalid'\n    --> test:3:1\n     |\n   3 | invalid\n     | ^^^^^^^"
+  - "Error [EPAR0370005]: expected 'function', 'struct', 'test' -- found 'invalid'\n    --> test:3:1\n     |\n   3 | invalid\n     | ^^^^^^^"
diff --git a/tests/expectations/parser/unreachable/eat_ident.out b/tests/expectations/parser/unreachable/eat_ident.out
index 39f564c282..99c9199333 100644
--- a/tests/expectations/parser/unreachable/eat_ident.out
+++ b/tests/expectations/parser/unreachable/eat_ident.out
@@ -2,4 +2,4 @@
 namespace: Parse
 expectation: Fail
 outputs:
-  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found ';'\n    --> test:3:9\n     |\n   3 | circuit ;\n     |         ^"
+  - "Error [EPAR0370009]: unexpected string: expected 'identifier', found ';'\n    --> test:3:9\n     |\n   3 | struct ;\n     |         ^"
diff --git a/tests/parser/unreachable/eat_ident.leo b/tests/parser/unreachable/eat_ident.leo
index 44c1e6e2c4..49edfac0d1 100644
--- a/tests/parser/unreachable/eat_ident.leo
+++ b/tests/parser/unreachable/eat_ident.leo
@@ -3,106 +3,106 @@ namespace: Parse
 expectation: Fail
 */
 
-circuit ;
+struct ;
 
-circuit .
+struct .
 
-circuit import
+struct import
 
-circuit ,
+struct ,
 
-circuit *
+struct *
 
-circuit +
+struct +
 
-circuit -
+struct -
 
-circuit /
+struct /
 
-circuit [
+struct [
 
-circuit ]
+struct ]
 
-circuit {
+struct {
 
-circuit }
+struct }
 
-circuit (
+struct (
 
-circuit )
+struct )
 
-circuit :
+struct :
 
-circuit ::
+struct ::
 
-circuit ?
+struct ?
 
-circuit _
+struct _
 
-circuit =
+struct =
 
-circuit ==
+struct ==
 
-circuit !
+struct !
 
-circuit !=
+struct !=
 
-circuit >
+struct >
 
-circuit >=
+struct >=
 
-circuit <
+struct <
 
-circuit <=
+struct <=
 
-circuit >
+struct >
 
-circuit ..
+struct ..
 
-circuit as
+struct as
 
-circuit console
+struct console
 
-circuit const
+struct const
 
-circuit let
+struct let
 
-circuit for
+struct for
 
-circuit if
+struct if
 
-circuit else
+struct else
 
-circuit i8
+struct i8
 
-circuit i16
+struct i16
 
-circuit i32
+struct i32
 
-circuit i64
+struct i64
 
-circuit i128
+struct i128
 
-circuit u8
+struct u8
 
-circuit u16
+struct u16
 
-circuit u32
+struct u32
 
-circuit u64
+struct u64
 
-circuit u128
+struct u128
 
-circuit &
+struct &
 
-circuit return
+struct return
 
-circuit self
+struct self
 
-circuit Self
+struct Self
 
-circuit true
+struct true
 
-circuit false
+struct false
 
-circuit 0
\ No newline at end of file
+struct 0
\ No newline at end of file