From 5f0dec069feac5052767cc666dca3face520fc1c Mon Sep 17 00:00:00 2001
From: Daniel McGregor <daniel.mcgregor@makerx.com.au>
Date: Thu, 19 Dec 2024 19:25:18 +0800
Subject: [PATCH] chore: fix IR approval filenames

---
 ...r => ConstantProductAMM.approval.0.ssa.ir} |   0
 ... ConstantProductAMM.approval.1.ssa.opt.ir} |   0
 ... ConstantProductAMM.approval.2.ssa.opt.ir} |   0
 ... ConstantProductAMM.approval.3.ssa.opt.ir} |   0
 ...tantProductAMM.approval.4.destructured.ir} |   0
 ...a.ir => ConstantProductAMM.clear.0.ssa.ir} |   0
 ...onstantProductAMM.clear.1.destructured.ir} |   0
 ...tantProductAMM.approval.0.destructured.ir} |   0
 ...onstantProductAMM.clear.0.destructured.ir} |   0
 ...tantProductAMM.approval.0.destructured.ir} |   0
 ...onstantProductAMM.clear.0.destructured.ir} |   0
 examples/amm/puya.log                         |  14 +-
 examples/amm/puya_O2.log                      |   4 +-
 examples/amm/puya_unoptimized.log             |   4 +-
 ....ssa.ir => EventEmitter.approval.0.ssa.ir} |   0
 ....ir => EventEmitter.approval.1.ssa.opt.ir} |   0
 ....ir => EventEmitter.approval.2.ssa.opt.ir} |   0
 ...> EventEmitter.approval.3.destructured.ir} |   0
 ...ear.ssa.ir => EventEmitter.clear.0.ssa.ir} |   0
 ...r => EventEmitter.clear.1.destructured.ir} |   0
 ...> EventEmitter.approval.0.destructured.ir} |   0
 ...r => EventEmitter.clear.0.destructured.ir} |   0
 ...> EventEmitter.approval.0.destructured.ir} |   0
 ...r => EventEmitter.clear.0.destructured.ir} |   0
 examples/arc_28/puya.log                      |  12 +-
 examples/arc_28/puya_O2.log                   |   4 +-
 examples/arc_28/puya_unoptimized.log          |   4 +-
 ...roval.ssa.ir => Auction.approval.0.ssa.ir} |   0
 ...a.opt.ir => Auction.approval.1.ssa.opt.ir} |   0
 ...a.opt.ir => Auction.approval.2.ssa.opt.ir} |   0
 ....ir => Auction.approval.3.destructured.ir} |   0
 ....0.clear.ssa.ir => Auction.clear.0.ssa.ir} |   0
 ...red.ir => Auction.clear.1.destructured.ir} |   0
 ....ir => Auction.approval.0.destructured.ir} |   0
 ...red.ir => Auction.clear.0.destructured.ir} |   0
 ....ir => Auction.approval.0.destructured.ir} |   0
 ...red.ir => Auction.clear.0.destructured.ir} |   0
 examples/auction/puya.log                     |  12 +-
 examples/auction/puya_O2.log                  |   4 +-
 examples/auction/puya_unoptimized.log         |   4 +-
 ...l.ssa.ir => BoxContract.approval.0.ssa.ir} |   0
 ...t.ir => BoxContract.approval.1.ssa.opt.ir} |   0
 ...t.ir => BoxContract.approval.2.ssa.opt.ir} |   0
 ...t.ir => BoxContract.approval.3.ssa.opt.ir} |   0
 ...=> BoxContract.approval.4.destructured.ir} |   0
 ...lear.ssa.ir => BoxContract.clear.0.ssa.ir} |   0
 ...ir => BoxContract.clear.1.destructured.ir} |   0
 ...=> BoxContract.approval.0.destructured.ir} |   0
 ...ir => BoxContract.clear.0.destructured.ir} |   0
 ...=> BoxContract.approval.0.destructured.ir} |   0
 ...ir => BoxContract.clear.0.destructured.ir} |   0
 examples/box_storage/puya.log                 |  14 +-
 examples/box_storage/puya_O2.log              |   4 +-
 examples/box_storage/puya_unoptimized.log     |   4 +-
 ...al.ssa.ir => MyContract.approval.0.ssa.ir} |   0
 ...pt.ir => MyContract.approval.1.ssa.opt.ir} |   0
 ...pt.ir => MyContract.approval.2.ssa.opt.ir} |   0
 ... => MyContract.approval.3.destructured.ir} |   0
 ...clear.ssa.ir => MyContract.clear.0.ssa.ir} |   0
 ....ir => MyContract.clear.1.destructured.ir} |   0
 ... => MyContract.approval.0.destructured.ir} |   0
 ....ir => MyContract.clear.0.destructured.ir} |   0
 ... => MyContract.approval.0.destructured.ir} |   0
 ....ir => MyContract.clear.0.destructured.ir} |   0
 examples/calculator/puya.log                  |  12 +-
 examples/calculator/puya_O2.log               |   4 +-
 examples/calculator/puya_unoptimized.log      |   4 +-
 ....ir => AppStateContract.approval.0.ssa.ir} |   0
 ...=> AppStateContract.approval.1.ssa.opt.ir} |   0
 ...=> AppStateContract.approval.2.ssa.opt.ir} |   0
 ...pStateContract.approval.3.destructured.ir} |   0
 ...ssa.ir => AppStateContract.clear.0.ssa.ir} |   0
 ... AppStateContract.clear.1.destructured.ir} |   0
 ...pStateContract.approval.0.destructured.ir} |   0
 ... AppStateContract.clear.0.destructured.ir} |   0
 ...pStateContract.approval.0.destructured.ir} |   0
 ... AppStateContract.clear.0.destructured.ir} |   0
 examples/global_state/puya.log                |  12 +-
 examples/global_state/puya_O2.log             |   4 +-
 examples/global_state/puya_unoptimized.log    |   4 +-
 ...r => HelloWorldContract.approval.0.ssa.ir} |   0
 ...oWorldContract.approval.1.destructured.ir} |   0
 ...a.ir => HelloWorldContract.clear.0.ssa.ir} |   0
 ...elloWorldContract.clear.1.destructured.ir} |   0
 ...oWorldContract.approval.0.destructured.ir} |   0
 ...elloWorldContract.clear.0.destructured.ir} |   0
 ...oWorldContract.approval.0.destructured.ir} |   0
 ...elloWorldContract.clear.0.destructured.ir} |   0
 examples/hello_world/puya.log                 |   8 +-
 examples/hello_world/puya_O2.log              |   4 +-
 examples/hello_world/puya_unoptimized.log     |   4 +-
 ...r => HelloWorldContract.approval.0.ssa.ir} |   0
 ... HelloWorldContract.approval.1.ssa.opt.ir} |   0
 ... HelloWorldContract.approval.2.ssa.opt.ir} |   0
 ...oWorldContract.approval.3.destructured.ir} |   0
 ...a.ir => HelloWorldContract.clear.0.ssa.ir} |   0
 ...elloWorldContract.clear.1.destructured.ir} |   0
 ...oWorldContract.approval.0.destructured.ir} |   0
 ...elloWorldContract.clear.0.destructured.ir} |   0
 ...oWorldContract.approval.0.destructured.ir} |   0
 ...elloWorldContract.clear.0.destructured.ir} |   0
 examples/hello_world_arc4/puya.log            |  12 +-
 examples/hello_world_arc4/puya_O2.log         |   4 +-
 .../hello_world_arc4/puya_unoptimized.log     |   4 +-
 ...r => LocalStateContract.approval.0.ssa.ir} |   0
 ... LocalStateContract.approval.1.ssa.opt.ir} |   0
 ... LocalStateContract.approval.2.ssa.opt.ir} |   0
 ...lStateContract.approval.3.destructured.ir} |   0
 ...a.ir => LocalStateContract.clear.0.ssa.ir} |   0
 ...ocalStateContract.clear.1.destructured.ir} |   0
 ...> LocalStateWithOffsets.approval.0.ssa.ir} |   0
 ...calStateWithOffsets.approval.1.ssa.opt.ir} |   0
 ...calStateWithOffsets.approval.2.ssa.opt.ir} |   0
 ...ateWithOffsets.approval.3.destructured.ir} |   0
 ...r => LocalStateWithOffsets.clear.0.ssa.ir} |   0
 ...lStateWithOffsets.clear.1.destructured.ir} |   0
 ...lStateContract.approval.0.destructured.ir} |   0
 ...ocalStateContract.clear.0.destructured.ir} |   0
 ...ateWithOffsets.approval.0.destructured.ir} |   0
 ...lStateWithOffsets.clear.0.destructured.ir} |   0
 ...lStateContract.approval.0.destructured.ir} |   0
 ...ocalStateContract.clear.0.destructured.ir} |   0
 ...ateWithOffsets.approval.0.destructured.ir} |   0
 ...lStateWithOffsets.clear.0.destructured.ir} |   0
 examples/local_state/puya.log                 |  24 +--
 examples/local_state/puya_O2.log              |   8 +-
 examples/local_state/puya_unoptimized.log     |   8 +-
 ...al.ssa.ir => MerkleTree.approval.0.ssa.ir} |   0
 ...pt.ir => MerkleTree.approval.1.ssa.opt.ir} |   0
 ...pt.ir => MerkleTree.approval.2.ssa.opt.ir} |   0
 ... => MerkleTree.approval.3.destructured.ir} |   0
 ...clear.ssa.ir => MerkleTree.clear.0.ssa.ir} |   0
 ....ir => MerkleTree.clear.1.destructured.ir} |   0
 ... => MerkleTree.approval.0.destructured.ir} |   0
 ....ir => MerkleTree.clear.0.destructured.ir} |   0
 ... => MerkleTree.approval.0.destructured.ir} |   0
 ....ir => MerkleTree.clear.0.destructured.ir} |   0
 examples/merkle/puya.log                      |  12 +-
 examples/merkle/puya_O2.log                   |   4 +-
 examples/merkle/puya_unoptimized.log          |   4 +-
 ...a.ir => ExampleContract.approval.0.ssa.ir} |   0
 ... => ExampleContract.approval.1.ssa.opt.ir} |   0
 ... => ExampleContract.approval.2.ssa.opt.ir} |   0
 ... => ExampleContract.approval.3.ssa.opt.ir} |   0
 ...xampleContract.approval.4.destructured.ir} |   0
 ....ssa.ir => ExampleContract.clear.0.ssa.ir} |   0
 ...> ExampleContract.clear.1.destructured.ir} |   0
 ...xampleContract.approval.0.destructured.ir} |   0
 ...> ExampleContract.clear.0.destructured.ir} |   0
 ...xampleContract.approval.0.destructured.ir} |   0
 ...> ExampleContract.clear.0.destructured.ir} |   0
 examples/struct_in_box/puya.log               |  14 +-
 examples/struct_in_box/puya_O2.log            |   4 +-
 examples/struct_in_box/puya_unoptimized.log   |   4 +-
 ...ir => TicTacToeContract.approval.0.ssa.ir} |   0
 ...> TicTacToeContract.approval.1.ssa.opt.ir} |   0
 ...> TicTacToeContract.approval.2.ssa.opt.ir} |   0
 ...TacToeContract.approval.3.destructured.ir} |   0
 ...sa.ir => TicTacToeContract.clear.0.ssa.ir} |   0
 ...TicTacToeContract.clear.1.destructured.ir} |   0
 ...TacToeContract.approval.0.destructured.ir} |   0
 ...TicTacToeContract.clear.0.destructured.ir} |   0
 ...TacToeContract.approval.0.destructured.ir} |   0
 ...TicTacToeContract.clear.0.destructured.ir} |   0
 examples/tictactoe/puya.log                   |  12 +-
 examples/tictactoe/puya_O2.log                |   4 +-
 examples/tictactoe/puya_unoptimized.log       |   4 +-
 ...sa.ir => VotingRoundApp.approval.0.ssa.ir} |   0
 ...r => VotingRoundApp.approval.1.ssa.opt.ir} |   0
 ...r => VotingRoundApp.approval.2.ssa.opt.ir} |   0
 ...r => VotingRoundApp.approval.3.ssa.opt.ir} |   0
 ...VotingRoundApp.approval.4.destructured.ir} |   0
 ...r.ssa.ir => VotingRoundApp.clear.0.ssa.ir} |   0
 ...=> VotingRoundApp.clear.1.destructured.ir} |   0
 ...VotingRoundApp.approval.0.destructured.ir} |   0
 ...=> VotingRoundApp.clear.0.destructured.ir} |   0
 ...VotingRoundApp.approval.0.destructured.ir} |   0
 ...=> VotingRoundApp.clear.0.destructured.ir} |   0
 examples/voting/puya.log                      |  14 +-
 examples/voting/puya_O2.log                   |   4 +-
 examples/voting/puya_unoptimized.log          |   4 +-
 src/puya/ir/to_text_visitor.py                |   3 -
 ...sa.ir => CustomApproval.approval.0.ssa.ir} |   0
 ...r => CustomApproval.approval.1.ssa.opt.ir} |   0
 ...r => CustomApproval.approval.2.ssa.opt.ir} |   0
 ...r => CustomApproval.approval.3.ssa.opt.ir} |   0
 ...CustomApproval.approval.4.destructured.ir} |   0
 ...r.ssa.ir => CustomApproval.clear.0.ssa.ir} |   0
 ...=> CustomApproval.clear.1.destructured.ir} |   0
 ...l.ssa.ir => MinimumARC4.approval.0.ssa.ir} |   0
 ...t.ir => MinimumARC4.approval.1.ssa.opt.ir} |   0
 ...t.ir => MinimumARC4.approval.2.ssa.opt.ir} |   0
 ...=> MinimumARC4.approval.3.destructured.ir} |   0
 ...lear.ssa.ir => MinimumARC4.clear.0.ssa.ir} |   0
 ...ir => MinimumARC4.clear.1.destructured.ir} |   0
 ...val.ssa.ir => Reference.approval.0.ssa.ir} |   0
 ...opt.ir => Reference.approval.1.ssa.opt.ir} |   0
 ...opt.ir => Reference.approval.2.ssa.opt.ir} |   0
 ...r => Reference.approval.3.destructured.ir} |   0
 ....clear.ssa.ir => Reference.clear.0.ssa.ir} |   0
 ...d.ir => Reference.clear.1.destructured.ir} |   0
 ...CustomApproval.approval.0.destructured.ir} |   0
 ...=> CustomApproval.clear.0.destructured.ir} |   0
 ...=> MinimumARC4.approval.0.destructured.ir} |   0
 ...ir => MinimumARC4.clear.0.destructured.ir} |   0
 ...r => Reference.approval.0.destructured.ir} |   0
 ...d.ir => Reference.clear.0.destructured.ir} |   0
 ...CustomApproval.approval.0.destructured.ir} |   0
 ...=> CustomApproval.clear.0.destructured.ir} |   0
 ...=> MinimumARC4.approval.0.destructured.ir} |   0
 ...ir => MinimumARC4.clear.0.destructured.ir} |   0
 ...r => Reference.approval.0.destructured.ir} |   0
 ...d.ir => Reference.clear.0.destructured.ir} |   0
 test_cases/abi_routing/puya.log               |  38 ++--
 test_cases/abi_routing/puya_O2.log            |  12 +-
 test_cases/abi_routing/puya_unoptimized.log   |  12 +-
 ...val.ssa.ir => Reference.approval.0.ssa.ir} |   0
 ...opt.ir => Reference.approval.1.ssa.opt.ir} |   0
 ...opt.ir => Reference.approval.2.ssa.opt.ir} |   0
 ...r => Reference.approval.3.destructured.ir} |   0
 ....clear.ssa.ir => Reference.clear.0.ssa.ir} |   0
 ...d.ir => Reference.clear.1.destructured.ir} |   0
 ...r => Reference.approval.0.destructured.ir} |   0
 ...d.ir => Reference.clear.0.destructured.ir} |   0
 ...r => Reference.approval.0.destructured.ir} |   0
 ...d.ir => Reference.clear.0.destructured.ir} |   0
 test_cases/application/puya.log               |  12 +-
 test_cases/application/puya_O2.log            |   4 +-
 test_cases/application/puya_unoptimized.log   |   4 +-
 ...=> DynamicArrayContract.approval.0.ssa.ir} |   0
 ...ynamicArrayContract.approval.1.ssa.opt.ir} |   0
 ...ynamicArrayContract.approval.2.ssa.opt.ir} |   0
 ...ynamicArrayContract.approval.3.ssa.opt.ir} |   0
 ...cArrayContract.approval.4.destructured.ir} |   0
 ...ir => DynamicArrayContract.clear.0.ssa.ir} |   0
 ...amicArrayContract.clear.1.destructured.ir} |   0
 ...cArrayContract.approval.0.destructured.ir} |   0
 ...amicArrayContract.clear.0.destructured.ir} |   0
 ...cArrayContract.approval.0.destructured.ir} |   0
 ...amicArrayContract.clear.0.destructured.ir} |   0
 test_cases/arc4_dynamic_arrays/puya.log       |  14 +-
 test_cases/arc4_dynamic_arrays/puya_O2.log    |   4 +-
 .../arc4_dynamic_arrays/puya_unoptimized.log  |   4 +-
 ...ssa.ir => UIntNOrdering.approval.0.ssa.ir} |   0
 ...ir => UIntNOrdering.approval.1.ssa.opt.ir} |   0
 ... UIntNOrdering.approval.2.destructured.ir} |   0
 ...ar.ssa.ir => UIntNOrdering.clear.0.ssa.ir} |   0
 ... => UIntNOrdering.clear.1.destructured.ir} |   0
 ... UIntNOrdering.approval.0.destructured.ir} |   0
 ... => UIntNOrdering.clear.0.destructured.ir} |   0
 ... UIntNOrdering.approval.0.destructured.ir} |   0
 ... => UIntNOrdering.clear.0.destructured.ir} |   0
 test_cases/arc4_numeric_comparisons/puya.log  |  10 +-
 .../arc4_numeric_comparisons/puya_O2.log      |   4 +-
 .../puya_unoptimized.log                      |   4 +-
 ... => Arc4AddressContract.approval.0.ssa.ir} |   0
 ...Arc4AddressContract.approval.1.ssa.opt.ir} |   0
 ...ddressContract.approval.2.destructured.ir} |   0
 ....ir => Arc4AddressContract.clear.0.ssa.ir} |   0
 ...c4AddressContract.clear.1.destructured.ir} |   0
 ...r => Arc4ArraysContract.approval.0.ssa.ir} |   0
 ... Arc4ArraysContract.approval.1.ssa.opt.ir} |   0
 ... Arc4ArraysContract.approval.2.ssa.opt.ir} |   0
 ...ArraysContract.approval.3.destructured.ir} |   0
 ...a.ir => Arc4ArraysContract.clear.0.ssa.ir} |   0
 ...rc4ArraysContract.clear.1.destructured.ir} |   0
 ...=> Arc4BoolEvalContract.approval.0.ssa.ir} |   0
 ...rc4BoolEvalContract.approval.1.ssa.opt.ir} |   0
 ...olEvalContract.approval.2.destructured.ir} |   0
 ...ir => Arc4BoolEvalContract.clear.0.ssa.ir} |   0
 ...4BoolEvalContract.clear.1.destructured.ir} |   0
 ...=> Arc4BoolTypeContract.approval.0.ssa.ir} |   0
 ...rc4BoolTypeContract.approval.1.ssa.opt.ir} |   0
 ...olTypeContract.approval.2.destructured.ir} |   0
 ...ir => Arc4BoolTypeContract.clear.0.ssa.ir} |   0
 ...4BoolTypeContract.clear.1.destructured.ir} |   0
 ...rc4DynamicBytesContract.approval.0.ssa.ir} |   0
 ...ynamicBytesContract.approval.1.ssa.opt.ir} |   0
 ...cBytesContract.approval.2.destructured.ir} |   0
 ...> Arc4DynamicBytesContract.clear.0.ssa.ir} |   0
 ...amicBytesContract.clear.1.destructured.ir} |   0
 ...amicStringArrayContract.approval.0.ssa.ir} |   0
 ...StringArrayContract.approval.1.ssa.opt.ir} |   0
 ...StringArrayContract.approval.2.ssa.opt.ir} |   0
 ...gArrayContract.approval.3.destructured.ir} |   0
 ...DynamicStringArrayContract.clear.0.ssa.ir} |   0
 ...ringArrayContract.clear.1.destructured.ir} |   0
 ...c4MutableParamsContract.approval.0.ssa.ir} |   0
 ...tableParamsContract.approval.1.ssa.opt.ir} |   0
 ...tableParamsContract.approval.2.ssa.opt.ir} |   0
 ...tableParamsContract.approval.3.ssa.opt.ir} |   0
 ...ParamsContract.approval.4.destructured.ir} |   0
 ... Arc4MutableParamsContract.clear.0.ssa.ir} |   0
 ...bleParamsContract.clear.1.destructured.ir} |   0
 ...=> Arc4MutationContract.approval.0.ssa.ir} |   0
 ...rc4MutationContract.approval.1.ssa.opt.ir} |   0
 ...rc4MutationContract.approval.2.ssa.opt.ir} |   0
 ...tationContract.approval.3.destructured.ir} |   0
 ...ir => Arc4MutationContract.clear.0.ssa.ir} |   0
 ...4MutationContract.clear.1.destructured.ir} |   0
 ...rc4NumericTypesContract.approval.0.ssa.ir} |   0
 ...umericTypesContract.approval.1.ssa.opt.ir} |   0
 ...umericTypesContract.approval.2.ssa.opt.ir} |   0
 ...cTypesContract.approval.3.destructured.ir} |   0
 ...> Arc4NumericTypesContract.clear.0.ssa.ir} |   0
 ...c4NumericTypesContract.clear.1.ssa.opt.ir} |   0
 ...ericTypesContract.clear.2.destructured.ir} |   0
 ...=> Arc4RefTypesContract.approval.0.ssa.ir} |   0
 ...rc4RefTypesContract.approval.1.ssa.opt.ir} |   0
 ...fTypesContract.approval.2.destructured.ir} |   0
 ...ir => Arc4RefTypesContract.clear.0.ssa.ir} |   0
 ...4RefTypesContract.clear.1.destructured.ir} |   0
 ...Arc4StringTypesContract.approval.0.ssa.ir} |   0
 ...StringTypesContract.approval.1.ssa.opt.ir} |   0
 ...gTypesContract.approval.2.destructured.ir} |   0
 ...=> Arc4StringTypesContract.clear.0.ssa.ir} |   0
 ...ringTypesContract.clear.1.destructured.ir} |   0
 ...tructsFromAnotherModule.approval.0.ssa.ir} |   0
 ...tsFromAnotherModule.approval.1.ssa.opt.ir} |   0
 ...mAnotherModule.approval.2.destructured.ir} |   0
 ...c4StructsFromAnotherModule.clear.0.ssa.ir} |   0
 ...FromAnotherModule.clear.1.destructured.ir} |   0
 ...Arc4StructsTypeContract.approval.0.ssa.ir} |   0
 ...StructsTypeContract.approval.1.ssa.opt.ir} |   0
 ...StructsTypeContract.approval.2.ssa.opt.ir} |   0
 ...tsTypeContract.approval.3.destructured.ir} |   0
 ...=> Arc4StructsTypeContract.clear.0.ssa.ir} |   0
 ...ructsTypeContract.clear.1.destructured.ir} |   0
 ... Arc4TuplesTypeContract.approval.0.ssa.ir} |   0
 ...4TuplesTypeContract.approval.1.ssa.opt.ir} |   0
 ...4TuplesTypeContract.approval.2.ssa.opt.ir} |   0
 ...esTypeContract.approval.3.destructured.ir} |   0
 ... => Arc4TuplesTypeContract.clear.0.ssa.ir} |   0
 ...uplesTypeContract.clear.1.destructured.ir} |   0
 ...sa.ir => MutableParams2.approval.0.ssa.ir} |   0
 ...r => MutableParams2.approval.1.ssa.opt.ir} |   0
 ...r => MutableParams2.approval.2.ssa.opt.ir} |   0
 ...MutableParams2.approval.3.destructured.ir} |   0
 ...r.ssa.ir => MutableParams2.clear.0.ssa.ir} |   0
 ...=> MutableParams2.clear.1.destructured.ir} |   0
 ...ddressContract.approval.0.destructured.ir} |   0
 ...c4AddressContract.clear.0.destructured.ir} |   0
 ...ArraysContract.approval.0.destructured.ir} |   0
 ...rc4ArraysContract.clear.0.destructured.ir} |   0
 ...olEvalContract.approval.0.destructured.ir} |   0
 ...4BoolEvalContract.clear.0.destructured.ir} |   0
 ...olTypeContract.approval.0.destructured.ir} |   0
 ...4BoolTypeContract.clear.0.destructured.ir} |   0
 ...cBytesContract.approval.0.destructured.ir} |   0
 ...amicBytesContract.clear.0.destructured.ir} |   0
 ...gArrayContract.approval.0.destructured.ir} |   0
 ...ringArrayContract.clear.0.destructured.ir} |   0
 ...ParamsContract.approval.0.destructured.ir} |   0
 ...bleParamsContract.clear.0.destructured.ir} |   0
 ...tationContract.approval.0.destructured.ir} |   0
 ...4MutationContract.clear.0.destructured.ir} |   0
 ...cTypesContract.approval.0.destructured.ir} |   0
 ...ericTypesContract.clear.0.destructured.ir} |   0
 ...fTypesContract.approval.0.destructured.ir} |   0
 ...4RefTypesContract.clear.0.destructured.ir} |   0
 ...gTypesContract.approval.0.destructured.ir} |   0
 ...ringTypesContract.clear.0.destructured.ir} |   0
 ...mAnotherModule.approval.0.destructured.ir} |   0
 ...FromAnotherModule.clear.0.destructured.ir} |   0
 ...tsTypeContract.approval.0.destructured.ir} |   0
 ...ructsTypeContract.clear.0.destructured.ir} |   0
 ...esTypeContract.approval.0.destructured.ir} |   0
 ...uplesTypeContract.clear.0.destructured.ir} |   0
 ...MutableParams2.approval.0.destructured.ir} |   0
 ...=> MutableParams2.clear.0.destructured.ir} |   0
 ...ddressContract.approval.0.destructured.ir} |   0
 ...c4AddressContract.clear.0.destructured.ir} |   0
 ...ArraysContract.approval.0.destructured.ir} |   0
 ...rc4ArraysContract.clear.0.destructured.ir} |   0
 ...olEvalContract.approval.0.destructured.ir} |   0
 ...4BoolEvalContract.clear.0.destructured.ir} |   0
 ...olTypeContract.approval.0.destructured.ir} |   0
 ...4BoolTypeContract.clear.0.destructured.ir} |   0
 ...cBytesContract.approval.0.destructured.ir} |   0
 ...amicBytesContract.clear.0.destructured.ir} |   0
 ...gArrayContract.approval.0.destructured.ir} |   0
 ...ringArrayContract.clear.0.destructured.ir} |   0
 ...ParamsContract.approval.0.destructured.ir} |   0
 ...bleParamsContract.clear.0.destructured.ir} |   0
 ...tationContract.approval.0.destructured.ir} |   0
 ...4MutationContract.clear.0.destructured.ir} |   0
 ...cTypesContract.approval.0.destructured.ir} |   0
 ...ericTypesContract.clear.0.destructured.ir} |   0
 ...fTypesContract.approval.0.destructured.ir} |   0
 ...4RefTypesContract.clear.0.destructured.ir} |   0
 ...gTypesContract.approval.0.destructured.ir} |   0
 ...ringTypesContract.clear.0.destructured.ir} |   0
 ...mAnotherModule.approval.0.destructured.ir} |   0
 ...FromAnotherModule.clear.0.destructured.ir} |   0
 ...tsTypeContract.approval.0.destructured.ir} |   0
 ...ructsTypeContract.clear.0.destructured.ir} |   0
 ...esTypeContract.approval.0.destructured.ir} |   0
 ...uplesTypeContract.clear.0.destructured.ir} |   0
 ...MutableParams2.approval.0.destructured.ir} |   0
 ...=> MutableParams2.clear.0.destructured.ir} |   0
 test_cases/arc4_types/puya.log                | 170 +++++++++---------
 test_cases/arc4_types/puya_O2.log             |  60 +++----
 test_cases/arc4_types/puya_unoptimized.log    |  60 +++----
 ...oval.ssa.ir => Contract.approval.0.ssa.ir} |   0
 ....opt.ir => Contract.approval.1.ssa.opt.ir} |   0
 ....opt.ir => Contract.approval.2.ssa.opt.ir} |   0
 ...ir => Contract.approval.3.destructured.ir} |   0
 ...0.clear.ssa.ir => Contract.clear.0.ssa.ir} |   0
 ...ed.ir => Contract.clear.1.destructured.ir} |   0
 ...ir => Contract.approval.0.destructured.ir} |   0
 ...ed.ir => Contract.clear.0.destructured.ir} |   0
 ...ir => Contract.approval.0.destructured.ir} |   0
 ...ed.ir => Contract.clear.0.destructured.ir} |   0
 test_cases/arc_56/puya.log                    |  12 +-
 test_cases/arc_56/puya_O2.log                 |   4 +-
 test_cases/arc_56/puya_unoptimized.log        |   4 +-
 ...val.ssa.ir => Reference.approval.0.ssa.ir} |   0
 ...opt.ir => Reference.approval.1.ssa.opt.ir} |   0
 ...opt.ir => Reference.approval.2.ssa.opt.ir} |   0
 ...r => Reference.approval.3.destructured.ir} |   0
 ....clear.ssa.ir => Reference.clear.0.ssa.ir} |   0
 ...d.ir => Reference.clear.1.destructured.ir} |   0
 ...r => Reference.approval.0.destructured.ir} |   0
 ...d.ir => Reference.clear.0.destructured.ir} |   0
 ...r => Reference.approval.0.destructured.ir} |   0
 ...d.ir => Reference.clear.0.destructured.ir} |   0
 test_cases/asset/puya.log                     |  12 +-
 test_cases/asset/puya_O2.log                  |   4 +-
 test_cases/asset/puya_unoptimized.log         |   4 +-
 ...val.ssa.ir => Augmented.approval.0.ssa.ir} |   0
 ...opt.ir => Augmented.approval.1.ssa.opt.ir} |   0
 ...r => Augmented.approval.2.destructured.ir} |   0
 ....clear.ssa.ir => Augmented.clear.0.ssa.ir} |   0
 ...d.ir => Augmented.clear.1.destructured.ir} |   0
 ...r => Augmented.approval.0.destructured.ir} |   0
 ...d.ir => Augmented.clear.0.destructured.ir} |   0
 ...r => Augmented.approval.0.destructured.ir} |   0
 ...d.ir => Augmented.clear.0.destructured.ir} |   0
 test_cases/augmented_assignment/puya.log      |  10 +-
 test_cases/augmented_assignment/puya_O2.log   |   4 +-
 .../augmented_assignment/puya_unoptimized.log |   4 +-
 ...oval.ssa.ir => Contract.approval.0.ssa.ir} |   0
 ....opt.ir => Contract.approval.1.ssa.opt.ir} |   0
 ....opt.ir => Contract.approval.2.ssa.opt.ir} |   0
 ...ir => Contract.approval.3.destructured.ir} |   0
 ...0.clear.ssa.ir => Contract.clear.0.ssa.ir} |   0
 ...ed.ir => Contract.clear.1.destructured.ir} |   0
 ...ir => Contract.approval.0.destructured.ir} |   0
 ...ed.ir => Contract.clear.0.destructured.ir} |   0
 ...ir => Contract.approval.0.destructured.ir} |   0
 ...ed.ir => Contract.clear.0.destructured.ir} |   0
 test_cases/avm_11/puya.log                    |  12 +-
 test_cases/avm_11/puya_O2.log                 |   4 +-
 test_cases/avm_11/puya_unoptimized.log        |   4 +-
 ....ssa.ir => TestContract.approval.0.ssa.ir} |   0
 ....ir => TestContract.approval.1.ssa.opt.ir} |   0
 ....ir => TestContract.approval.2.ssa.opt.ir} |   0
 ...> TestContract.approval.3.destructured.ir} |   0
 ...ear.ssa.ir => TestContract.clear.0.ssa.ir} |   0
 ...r => TestContract.clear.1.destructured.ir} |   0
 ...> TestContract.approval.0.destructured.ir} |   0
 ...r => TestContract.clear.0.destructured.ir} |   0
 ...> TestContract.approval.0.destructured.ir} |   0
 ...r => TestContract.clear.0.destructured.ir} |   0
 test_cases/avm_types_in_abi/puya.log          |  12 +-
 test_cases/avm_types_in_abi/puya_O2.log       |   4 +-
 .../avm_types_in_abi/puya_unoptimized.log     |   4 +-
 ....ir => BiguintBinaryOps.approval.0.ssa.ir} |   0
 ...=> BiguintBinaryOps.approval.1.ssa.opt.ir} |   0
 ...=> BiguintBinaryOps.approval.2.ssa.opt.ir} |   0
 ...guintBinaryOps.approval.3.destructured.ir} |   0
 ...ssa.ir => BiguintBinaryOps.clear.0.ssa.ir} |   0
 ... BiguintBinaryOps.clear.1.destructured.ir} |   0
 ...guintBinaryOps.approval.0.destructured.ir} |   0
 ... BiguintBinaryOps.clear.0.destructured.ir} |   0
 ...guintBinaryOps.approval.0.destructured.ir} |   0
 ... BiguintBinaryOps.clear.0.destructured.ir} |   0
 test_cases/biguint_binary_ops/puya.log        |  12 +-
 test_cases/biguint_binary_ops/puya_O2.log     |   4 +-
 .../biguint_binary_ops/puya_unoptimized.log   |   4 +-
 ....ir => BooleanBinaryOps.approval.0.ssa.ir} |   0
 ...=> BooleanBinaryOps.approval.1.ssa.opt.ir} |   0
 ...=> BooleanBinaryOps.approval.2.ssa.opt.ir} |   0
 ...=> BooleanBinaryOps.approval.3.ssa.opt.ir} |   0
 ...oleanBinaryOps.approval.4.destructured.ir} |   0
 ...ssa.ir => BooleanBinaryOps.clear.0.ssa.ir} |   0
 ...ir => BooleanBinaryOps.clear.1.ssa.opt.ir} |   0
 ... BooleanBinaryOps.clear.2.destructured.ir} |   0
 ...oleanBinaryOps.approval.0.destructured.ir} |   0
 ... BooleanBinaryOps.clear.0.destructured.ir} |   0
 ...oleanBinaryOps.approval.0.destructured.ir} |   0
 ... BooleanBinaryOps.clear.0.destructured.ir} |   0
 test_cases/boolean_binary_ops/puya.log        |  16 +-
 test_cases/boolean_binary_ops/puya_O2.log     |   4 +-
 .../boolean_binary_ops/puya_unoptimized.log   |   4 +-
 ...al.ssa.ir => MyContract.approval.0.ssa.ir} |   0
 ...pt.ir => MyContract.approval.1.ssa.opt.ir} |   0
 ... => MyContract.approval.2.destructured.ir} |   0
 ...clear.ssa.ir => MyContract.clear.0.ssa.ir} |   0
 ....ir => MyContract.clear.1.destructured.ir} |   0
 ... => MyContract.approval.0.destructured.ir} |   0
 ....ir => MyContract.clear.0.destructured.ir} |   0
 ... => MyContract.approval.0.destructured.ir} |   0
 ....ir => MyContract.clear.0.destructured.ir} |   0
 test_cases/bug_load_store_load_store/puya.log |  10 +-
 .../bug_load_store_load_store/puya_O2.log     |   4 +-
 .../puya_unoptimized.log                      |   4 +-
 ....ir => BiguintBinaryOps.approval.0.ssa.ir} |   0
 ...=> BiguintBinaryOps.approval.1.ssa.opt.ir} |   0
 ...guintBinaryOps.approval.2.destructured.ir} |   0
 ...ssa.ir => BiguintBinaryOps.clear.0.ssa.ir} |   0
 ... BiguintBinaryOps.clear.1.destructured.ir} |   0
 ...guintBinaryOps.approval.0.destructured.ir} |   0
 ... BiguintBinaryOps.clear.0.destructured.ir} |   0
 ...guintBinaryOps.approval.0.destructured.ir} |   0
 ... BiguintBinaryOps.clear.0.destructured.ir} |   0
 test_cases/bytes_ops/puya.log                 |  10 +-
 test_cases/bytes_ops/puya_O2.log              |   4 +-
 test_cases/bytes_ops/puya_unoptimized.log     |   4 +-
 ...al.ssa.ir => MyContract.approval.0.ssa.ir} |   0
 ...pt.ir => MyContract.approval.1.ssa.opt.ir} |   0
 ... => MyContract.approval.2.destructured.ir} |   0
 ...clear.ssa.ir => MyContract.clear.0.ssa.ir} |   0
 ....ir => MyContract.clear.1.destructured.ir} |   0
 ... => MyContract.approval.0.destructured.ir} |   0
 ....ir => MyContract.clear.0.destructured.ir} |   0
 ... => MyContract.approval.0.destructured.ir} |   0
 ....ir => MyContract.clear.0.destructured.ir} |   0
 test_cases/callsub/puya.log                   |  10 +-
 test_cases/callsub/puya_O2.log                |   4 +-
 test_cases/callsub/puya_unoptimized.log       |   4 +-
 ...ir => ChainedAssignment.approval.0.ssa.ir} |   0
 ...> ChainedAssignment.approval.1.ssa.opt.ir} |   0
 ...> ChainedAssignment.approval.2.ssa.opt.ir} |   0
 ...inedAssignment.approval.3.destructured.ir} |   0
 ...sa.ir => ChainedAssignment.clear.0.ssa.ir} |   0
 ...ChainedAssignment.clear.1.destructured.ir} |   0
 ...inedAssignment.approval.0.destructured.ir} |   0
 ...ChainedAssignment.clear.0.destructured.ir} |   0
 ...inedAssignment.approval.0.destructured.ir} |   0
 ...ChainedAssignment.clear.0.destructured.ir} |   0
 test_cases/chained_assignment/puya.log        |  12 +-
 test_cases/chained_assignment/puya_O2.log     |   4 +-
 .../chained_assignment/puya_unoptimized.log   |   4 +-
 ...pproval.ssa.ir => Hello.approval.0.ssa.ir} |   0
 ...ssa.opt.ir => Hello.approval.1.ssa.opt.ir} |   0
 ...ssa.opt.ir => Hello.approval.2.ssa.opt.ir} |   0
 ...ed.ir => Hello.approval.3.destructured.ir} |   0
 ...ar.0.clear.ssa.ir => Hello.clear.0.ssa.ir} |   0
 ...tured.ir => Hello.clear.1.destructured.ir} |   0
 ...val.ssa.ir => HelloBase.approval.0.ssa.ir} |   0
 ...opt.ir => HelloBase.approval.1.ssa.opt.ir} |   0
 ...opt.ir => HelloBase.approval.2.ssa.opt.ir} |   0
 ...r => HelloBase.approval.3.destructured.ir} |   0
 ....clear.ssa.ir => HelloBase.clear.0.ssa.ir} |   0
 ...d.ir => HelloBase.clear.1.destructured.ir} |   0
 ....ssa.ir => HelloFactory.approval.0.ssa.ir} |   0
 ....ir => HelloFactory.approval.1.ssa.opt.ir} |   0
 ....ir => HelloFactory.approval.2.ssa.opt.ir} |   0
 ...> HelloFactory.approval.3.destructured.ir} |   0
 ...ear.ssa.ir => HelloFactory.clear.0.ssa.ir} |   0
 ...r => HelloFactory.clear.1.destructured.ir} |   0
 ... => HelloOtherConstants.approval.0.ssa.ir} |   0
 ...HelloOtherConstants.approval.1.ssa.opt.ir} |   0
 ...HelloOtherConstants.approval.2.ssa.opt.ir} |   0
 ...OtherConstants.approval.3.destructured.ir} |   0
 ....ir => HelloOtherConstants.clear.0.ssa.ir} |   0
 ...lloOtherConstants.clear.1.destructured.ir} |   0
 ...val.ssa.ir => HelloPrfx.approval.0.ssa.ir} |   0
 ...opt.ir => HelloPrfx.approval.1.ssa.opt.ir} |   0
 ...opt.ir => HelloPrfx.approval.2.ssa.opt.ir} |   0
 ...r => HelloPrfx.approval.3.destructured.ir} |   0
 ....clear.ssa.ir => HelloPrfx.clear.0.ssa.ir} |   0
 ...d.ir => HelloPrfx.clear.1.destructured.ir} |   0
 ...val.ssa.ir => HelloTmpl.approval.0.ssa.ir} |   0
 ...opt.ir => HelloTmpl.approval.1.ssa.opt.ir} |   0
 ...opt.ir => HelloTmpl.approval.2.ssa.opt.ir} |   0
 ...r => HelloTmpl.approval.3.destructured.ir} |   0
 ....clear.ssa.ir => HelloTmpl.clear.0.ssa.ir} |   0
 ...d.ir => HelloTmpl.clear.1.destructured.ir} |   0
 ....ssa.ir => LargeProgram.approval.0.ssa.ir} |   0
 ....ir => LargeProgram.approval.1.ssa.opt.ir} |   0
 ....ir => LargeProgram.approval.2.ssa.opt.ir} |   0
 ...> LargeProgram.approval.3.destructured.ir} |   0
 ...ear.ssa.ir => LargeProgram.clear.0.ssa.ir} |   0
 ...r => LargeProgram.clear.1.destructured.ir} |   0
 ...ed.ir => Hello.approval.0.destructured.ir} |   0
 ...tured.ir => Hello.clear.0.destructured.ir} |   0
 ...r => HelloBase.approval.0.destructured.ir} |   0
 ...d.ir => HelloBase.clear.0.destructured.ir} |   0
 ...> HelloFactory.approval.0.destructured.ir} |   0
 ...r => HelloFactory.clear.0.destructured.ir} |   0
 ...OtherConstants.approval.0.destructured.ir} |   0
 ...lloOtherConstants.clear.0.destructured.ir} |   0
 ...r => HelloPrfx.approval.0.destructured.ir} |   0
 ...d.ir => HelloPrfx.clear.0.destructured.ir} |   0
 ...r => HelloTmpl.approval.0.destructured.ir} |   0
 ...d.ir => HelloTmpl.clear.0.destructured.ir} |   0
 ...> LargeProgram.approval.0.destructured.ir} |   0
 ...r => LargeProgram.clear.0.destructured.ir} |   0
 ...ed.ir => Hello.approval.0.destructured.ir} |   0
 ...tured.ir => Hello.clear.0.destructured.ir} |   0
 ...r => HelloBase.approval.0.destructured.ir} |   0
 ...d.ir => HelloBase.clear.0.destructured.ir} |   0
 ...> HelloFactory.approval.0.destructured.ir} |   0
 ...r => HelloFactory.clear.0.destructured.ir} |   0
 ...OtherConstants.approval.0.destructured.ir} |   0
 ...lloOtherConstants.clear.0.destructured.ir} |   0
 ...r => HelloPrfx.approval.0.destructured.ir} |   0
 ...d.ir => HelloPrfx.clear.0.destructured.ir} |   0
 ...r => HelloTmpl.approval.0.destructured.ir} |   0
 ...d.ir => HelloTmpl.clear.0.destructured.ir} |   0
 ...> LargeProgram.approval.0.destructured.ir} |   0
 ...r => LargeProgram.clear.0.destructured.ir} |   0
 test_cases/compile/puya.log                   |  84 ++++-----
 test_cases/compile/puya_O2.log                |  28 +--
 test_cases/compile/puya_unoptimized.log       |  28 +--
 ...tionalExecutionContract.approval.0.ssa.ir} |   0
 ...alExecutionContract.approval.1.ssa.opt.ir} |   0
 ...alExecutionContract.approval.2.ssa.opt.ir} |   0
 ...alExecutionContract.approval.3.ssa.opt.ir} |   0
 ...alExecutionContract.approval.4.ssa.opt.ir} |   0
 ...cutionContract.approval.5.destructured.ir} |   0
 ...nditionalExecutionContract.clear.0.ssa.ir} |   0
 ...ExecutionContract.clear.1.destructured.ir} |   0
 ...cutionContract.approval.0.destructured.ir} |   0
 ...ExecutionContract.clear.0.destructured.ir} |   0
 ...cutionContract.approval.0.destructured.ir} |   0
 ...ExecutionContract.clear.0.destructured.ir} |   0
 test_cases/conditional_execution/puya.log     |  16 +-
 test_cases/conditional_execution/puya_O2.log  |   4 +-
 .../puya_unoptimized.log                      |   4 +-
 ...oval.ssa.ir => Literals.approval.0.ssa.ir} |   0
 ....opt.ir => Literals.approval.1.ssa.opt.ir} |   0
 ...ir => Literals.approval.2.destructured.ir} |   0
 ...0.clear.ssa.ir => Literals.clear.0.ssa.ir} |   0
 ...ed.ir => Literals.clear.1.destructured.ir} |   0
 ...al.ssa.ir => MyContract.approval.0.ssa.ir} |   0
 ...pt.ir => MyContract.approval.1.ssa.opt.ir} |   0
 ...pt.ir => MyContract.approval.2.ssa.opt.ir} |   0
 ... => MyContract.approval.3.destructured.ir} |   0
 ...clear.ssa.ir => MyContract.clear.0.ssa.ir} |   0
 ....ir => MyContract.clear.1.destructured.ir} |   0
 ...ir => Literals.approval.0.destructured.ir} |   0
 ...ed.ir => Literals.clear.0.destructured.ir} |   0
 ... => MyContract.approval.0.destructured.ir} |   0
 ....ir => MyContract.clear.0.destructured.ir} |   0
 ...ir => Literals.approval.0.destructured.ir} |   0
 ...ed.ir => Literals.clear.0.destructured.ir} |   0
 ... => MyContract.approval.0.destructured.ir} |   0
 ....ir => MyContract.clear.0.destructured.ir} |   0
 test_cases/conditional_expressions/puya.log   |  22 +--
 .../conditional_expressions/puya_O2.log       |   8 +-
 .../puya_unoptimized.log                      |   8 +-
 ...AddressConstantContract.approval.0.ssa.ir} |   0
 ...essConstantContract.approval.1.ssa.opt.ir} |   0
 ...nstantContract.approval.2.destructured.ir} |   0
 ...=> AddressConstantContract.clear.0.ssa.ir} |   0
 ...sConstantContract.clear.1.destructured.ir} |   0
 ...> ByteConstantsContract.approval.0.ssa.ir} |   0
 ...teConstantsContract.approval.1.ssa.opt.ir} |   0
 ...stantsContract.approval.2.destructured.ir} |   0
 ...r => ByteConstantsContract.clear.0.ssa.ir} |   0
 ...ConstantsContract.clear.1.destructured.ir} |   0
 ...nstantContract.approval.0.destructured.ir} |   0
 ...sConstantContract.clear.0.destructured.ir} |   0
 ...stantsContract.approval.0.destructured.ir} |   0
 ...ConstantsContract.clear.0.destructured.ir} |   0
 ...nstantContract.approval.0.destructured.ir} |   0
 ...sConstantContract.clear.0.destructured.ir} |   0
 ...stantsContract.approval.0.destructured.ir} |   0
 ...ConstantsContract.clear.0.destructured.ir} |   0
 test_cases/constants/puya.log                 |  20 +--
 test_cases/constants/puya_O2.log              |   8 +-
 test_cases/constants/puya_unoptimized.log     |   8 +-
 ...al.ssa.ir => MyContract.approval.0.ssa.ir} |   0
 ...pt.ir => MyContract.approval.1.ssa.opt.ir} |   0
 ...pt.ir => MyContract.approval.2.ssa.opt.ir} |   0
 ...pt.ir => MyContract.approval.3.ssa.opt.ir} |   0
 ... => MyContract.approval.4.destructured.ir} |   0
 ...clear.ssa.ir => MyContract.clear.0.ssa.ir} |   0
 ....ir => MyContract.clear.1.destructured.ir} |   0
 ... => MyContract.approval.0.destructured.ir} |   0
 ....ir => MyContract.clear.0.destructured.ir} |   0
 ... => MyContract.approval.0.destructured.ir} |   0
 ....ir => MyContract.clear.0.destructured.ir} |   0
 test_cases/contains/puya.log                  |  14 +-
 test_cases/contains/puya_O2.log               |   4 +-
 test_cases/contains/puya_unoptimized.log      |   4 +-
 ...al.ssa.ir => MyContract.approval.0.ssa.ir} |   0
 ...pt.ir => MyContract.approval.1.ssa.opt.ir} |   0
 ... => MyContract.approval.2.destructured.ir} |   0
 ...clear.ssa.ir => MyContract.clear.0.ssa.ir} |   0
 ....ir => MyContract.clear.1.destructured.ir} |   0
 ... => MyContract.approval.0.destructured.ir} |   0
 ....ir => MyContract.clear.0.destructured.ir} |   0
 ... => MyContract.approval.0.destructured.ir} |   0
 ....ir => MyContract.clear.0.destructured.ir} |   0
 test_cases/control_op_simplification/puya.log |  10 +-
 .../control_op_simplification/puya_O2.log     |   4 +-
 .../puya_unoptimized.log                      |   4 +-
 ...ssa.ir => DebugContract.approval.0.ssa.ir} |   0
 ...ir => DebugContract.approval.1.ssa.opt.ir} |   0
 ...ir => DebugContract.approval.2.ssa.opt.ir} |   0
 ... DebugContract.approval.3.destructured.ir} |   0
 ...ar.ssa.ir => DebugContract.clear.0.ssa.ir} |   0
 ... => DebugContract.clear.1.destructured.ir} |   0
 ... DebugContract.approval.0.destructured.ir} |   0
 ... => DebugContract.clear.0.destructured.ir} |   0
 ... DebugContract.approval.0.destructured.ir} |   0
 ... => DebugContract.clear.0.destructured.ir} |   0
 test_cases/debug/puya.log                     |  12 +-
 test_cases/debug/puya_O2.log                  |   4 +-
 test_cases/debug/puya_unoptimized.log         |   4 +-
 ...pproval.ssa.ir => Base1.approval.0.ssa.ir} |   0
 ...ssa.opt.ir => Base1.approval.1.ssa.opt.ir} |   0
 ...ssa.opt.ir => Base1.approval.2.ssa.opt.ir} |   0
 ...ed.ir => Base1.approval.3.destructured.ir} |   0
 ...ar.0.clear.ssa.ir => Base1.clear.0.ssa.ir} |   0
 ...tured.ir => Base1.clear.1.destructured.ir} |   0
 ...pproval.ssa.ir => Base2.approval.0.ssa.ir} |   0
 ...ssa.opt.ir => Base2.approval.1.ssa.opt.ir} |   0
 ...ssa.opt.ir => Base2.approval.2.ssa.opt.ir} |   0
 ...ed.ir => Base2.approval.3.destructured.ir} |   0
 ...ar.0.clear.ssa.ir => Base2.clear.0.ssa.ir} |   0
 ...tured.ir => Base2.clear.1.destructured.ir} |   0
 ...roval.ssa.ir => Derived.approval.0.ssa.ir} |   0
 ...a.opt.ir => Derived.approval.1.ssa.opt.ir} |   0
 ...a.opt.ir => Derived.approval.2.ssa.opt.ir} |   0
 ...a.opt.ir => Derived.approval.3.ssa.opt.ir} |   0
 ....ir => Derived.approval.4.destructured.ir} |   0
 ....0.clear.ssa.ir => Derived.clear.0.ssa.ir} |   0
 ...red.ir => Derived.clear.1.destructured.ir} |   0
 ...0.approval.ssa.ir => GP.approval.0.ssa.ir} |   0
 ...al.ssa.opt.ir => GP.approval.1.ssa.opt.ir} |   0
 ...al.ssa.opt.ir => GP.approval.2.ssa.opt.ir} |   0
 ...tured.ir => GP.approval.3.destructured.ir} |   0
 ...clear.0.clear.ssa.ir => GP.clear.0.ssa.ir} |   0
 ...ructured.ir => GP.clear.1.destructured.ir} |   0
 ...ed.ir => Base1.approval.0.destructured.ir} |   0
 ...tured.ir => Base1.clear.0.destructured.ir} |   0
 ...ed.ir => Base2.approval.0.destructured.ir} |   0
 ...tured.ir => Base2.clear.0.destructured.ir} |   0
 ....ir => Derived.approval.0.destructured.ir} |   0
 ...red.ir => Derived.clear.0.destructured.ir} |   0
 ...tured.ir => GP.approval.0.destructured.ir} |   0
 ...ructured.ir => GP.clear.0.destructured.ir} |   0
 ...ed.ir => Base1.approval.0.destructured.ir} |   0
 ...tured.ir => Base1.clear.0.destructured.ir} |   0
 ...ed.ir => Base2.approval.0.destructured.ir} |   0
 ...tured.ir => Base2.clear.0.destructured.ir} |   0
 ....ir => Derived.approval.0.destructured.ir} |   0
 ...red.ir => Derived.clear.0.destructured.ir} |   0
 ...tured.ir => GP.approval.0.destructured.ir} |   0
 ...ructured.ir => GP.clear.0.destructured.ir} |   0
 test_cases/diamond_mro/puya.log               |  50 +++---
 test_cases/diamond_mro/puya_O2.log            |  16 +-
 test_cases/diamond_mro/puya_unoptimized.log   |  16 +-
 ...al.ssa.ir => MyContract.approval.0.ssa.ir} |   0
 ...pt.ir => MyContract.approval.1.ssa.opt.ir} |   0
 ... => MyContract.approval.2.destructured.ir} |   0
 ...clear.ssa.ir => MyContract.clear.0.ssa.ir} |   0
 ....ir => MyContract.clear.1.destructured.ir} |   0
 ... => MyContract.approval.0.destructured.ir} |   0
 ....ir => MyContract.clear.0.destructured.ir} |   0
 ... => MyContract.approval.0.destructured.ir} |   0
 ....ir => MyContract.clear.0.destructured.ir} |   0
 test_cases/dup2_optimization_bug/puya.log     |  10 +-
 test_cases/dup2_optimization_bug/puya_O2.log  |   4 +-
 .../puya_unoptimized.log                      |   4 +-
 ...sa.ir => VerifyContract.approval.0.ssa.ir} |   0
 ...r => VerifyContract.approval.1.ssa.opt.ir} |   0
 ...VerifyContract.approval.2.destructured.ir} |   0
 ...r.ssa.ir => VerifyContract.clear.0.ssa.ir} |   0
 ...=> VerifyContract.clear.1.destructured.ir} |   0
 ...VerifyContract.approval.0.destructured.ir} |   0
 ...=> VerifyContract.clear.0.destructured.ir} |   0
 ...VerifyContract.approval.0.destructured.ir} |   0
 ...=> VerifyContract.clear.0.destructured.ir} |   0
 test_cases/edverify/puya.log                  |  10 +-
 test_cases/edverify/puya_O2.log               |   4 +-
 test_cases/edverify/puya_unoptimized.log      |   4 +-
 ... => EnumerationContract.approval.0.ssa.ir} |   0
 ...EnumerationContract.approval.1.ssa.opt.ir} |   0
 ...rationContract.approval.2.destructured.ir} |   0
 ....ir => EnumerationContract.clear.0.ssa.ir} |   0
 ...umerationContract.clear.1.destructured.ir} |   0
 ...rationContract.approval.0.destructured.ir} |   0
 ...umerationContract.clear.0.destructured.ir} |   0
 ...rationContract.approval.0.destructured.ir} |   0
 ...umerationContract.clear.0.destructured.ir} |   0
 test_cases/enumeration/puya.log               |  10 +-
 test_cases/enumeration/puya_O2.log            |   4 +-
 test_cases/enumeration/puya_unoptimized.log   |   4 +-
 ...al.ssa.ir => MyContract.approval.0.ssa.ir} |   0
 ...pt.ir => MyContract.approval.1.ssa.opt.ir} |   0
 ...pt.ir => MyContract.approval.2.ssa.opt.ir} |   0
 ...pt.ir => MyContract.approval.3.ssa.opt.ir} |   0
 ... => MyContract.approval.4.destructured.ir} |   0
 ...clear.ssa.ir => MyContract.clear.0.ssa.ir} |   0
 ...a.opt.ir => MyContract.clear.1.ssa.opt.ir} |   0
 ...a.opt.ir => MyContract.clear.2.ssa.opt.ir} |   0
 ....ir => MyContract.clear.3.destructured.ir} |   0
 ... => MyContract.approval.0.destructured.ir} |   0
 ....ir => MyContract.clear.0.destructured.ir} |   0
 ... => MyContract.approval.0.destructured.ir} |   0
 ....ir => MyContract.clear.0.destructured.ir} |   0
 test_cases/everything/puya.log                |  18 +-
 test_cases/everything/puya_O2.log             |   4 +-
 test_cases/everything/puya_unoptimized.log    |   4 +-
 ...roval.ssa.ir => AppCall.approval.0.ssa.ir} |   0
 ...a.opt.ir => AppCall.approval.1.ssa.opt.ir} |   0
 ...a.opt.ir => AppCall.approval.2.ssa.opt.ir} |   0
 ....ir => AppCall.approval.3.destructured.ir} |   0
 ....0.clear.ssa.ir => AppCall.clear.0.ssa.ir} |   0
 ...red.ir => AppCall.clear.1.destructured.ir} |   0
 ... => AppExpectingEffects.approval.0.ssa.ir} |   0
 ...AppExpectingEffects.approval.1.ssa.opt.ir} |   0
 ...AppExpectingEffects.approval.2.ssa.opt.ir} |   0
 ...pectingEffects.approval.3.destructured.ir} |   0
 ....ir => AppExpectingEffects.clear.0.ssa.ir} |   0
 ...pExpectingEffects.clear.1.destructured.ir} |   0
 ....ir => AppCall.approval.0.destructured.ir} |   0
 ...red.ir => AppCall.clear.0.destructured.ir} |   0
 ...pectingEffects.approval.0.destructured.ir} |   0
 ...pExpectingEffects.clear.0.destructured.ir} |   0
 ....ir => AppCall.approval.0.destructured.ir} |   0
 ...red.ir => AppCall.clear.0.destructured.ir} |   0
 ...pectingEffects.approval.0.destructured.ir} |   0
 ...pExpectingEffects.clear.0.destructured.ir} |   0
 test_cases/group_side_effects/puya.log        |  24 +--
 test_cases/group_side_effects/puya_O2.log     |   8 +-
 .../group_side_effects/puya_unoptimized.log   |   8 +-
 ...ssa.ir => ChildContract.approval.0.ssa.ir} |   0
 ...ir => ChildContract.approval.1.ssa.opt.ir} |   0
 ...ir => ChildContract.approval.2.ssa.opt.ir} |   0
 ... ChildContract.approval.3.destructured.ir} |   0
 ...ar.ssa.ir => ChildContract.clear.0.ssa.ir} |   0
 ... => ChildContract.clear.1.destructured.ir} |   0
 ... => GrandParentContract.approval.0.ssa.ir} |   0
 ...GrandParentContract.approval.1.ssa.opt.ir} |   0
 ...ParentContract.approval.2.destructured.ir} |   0
 ....ir => GrandParentContract.clear.0.ssa.ir} |   0
 ...andParentContract.clear.1.destructured.ir} |   0
 ...reatGrandParentContract.approval.0.ssa.ir} |   0
 ...GrandParentContract.approval.1.ssa.opt.ir} |   0
 ...ParentContract.approval.2.destructured.ir} |   0
 ...> GreatGrandParentContract.clear.0.ssa.ir} |   0
 ...andParentContract.clear.1.destructured.ir} |   0
 ...sa.ir => ParentContract.approval.0.ssa.ir} |   0
 ...r => ParentContract.approval.1.ssa.opt.ir} |   0
 ...r => ParentContract.approval.2.ssa.opt.ir} |   0
 ...ParentContract.approval.3.destructured.ir} |   0
 ...r.ssa.ir => ParentContract.clear.0.ssa.ir} |   0
 ...=> ParentContract.clear.1.destructured.ir} |   0
 ... ChildContract.approval.0.destructured.ir} |   0
 ... => ChildContract.clear.0.destructured.ir} |   0
 ...ParentContract.approval.0.destructured.ir} |   0
 ...andParentContract.clear.0.destructured.ir} |   0
 ...ParentContract.approval.0.destructured.ir} |   0
 ...andParentContract.clear.0.destructured.ir} |   0
 ...ParentContract.approval.0.destructured.ir} |   0
 ...=> ParentContract.clear.0.destructured.ir} |   0
 ... ChildContract.approval.0.destructured.ir} |   0
 ... => ChildContract.clear.0.destructured.ir} |   0
 ...ParentContract.approval.0.destructured.ir} |   0
 ...andParentContract.clear.0.destructured.ir} |   0
 ...ParentContract.approval.0.destructured.ir} |   0
 ...andParentContract.clear.0.destructured.ir} |   0
 ...ParentContract.approval.0.destructured.ir} |   0
 ...=> ParentContract.clear.0.destructured.ir} |   0
 test_cases/inheritance/puya.log               |  44 ++---
 test_cases/inheritance/puya_O2.log            |  16 +-
 test_cases/inheritance/puya_unoptimized.log   |  16 +-
 ...al.ssa.ir => MyContract.approval.0.ssa.ir} |   0
 ...pt.ir => MyContract.approval.1.ssa.opt.ir} |   0
 ...pt.ir => MyContract.approval.2.ssa.opt.ir} |   0
 ... => MyContract.approval.3.destructured.ir} |   0
 ...clear.ssa.ir => MyContract.clear.0.ssa.ir} |   0
 ....ir => MyContract.clear.1.destructured.ir} |   0
 ... => MyContract.approval.0.destructured.ir} |   0
 ....ir => MyContract.clear.0.destructured.ir} |   0
 ... => MyContract.approval.0.destructured.ir} |   0
 ....ir => MyContract.clear.0.destructured.ir} |   0
 test_cases/inlining/puya.log                  |  12 +-
 test_cases/inlining/puya_O2.log               |   4 +-
 test_cases/inlining/puya_unoptimized.log      |   4 +-
 ... => ArrayAccessContract.approval.0.ssa.ir} |   0
 ...ArrayAccessContract.approval.1.ssa.opt.ir} |   0
 ...ArrayAccessContract.approval.2.ssa.opt.ir} |   0
 ...AccessContract.approval.3.destructured.ir} |   0
 ....ir => ArrayAccessContract.clear.0.ssa.ir} |   0
 ...rayAccessContract.clear.1.destructured.ir} |   0
 ...eateAndTransferContract.approval.0.ssa.ir} |   0
 ...AndTransferContract.approval.1.ssa.opt.ir} |   0
 ...AndTransferContract.approval.2.ssa.opt.ir} |   0
 ...ansferContract.approval.3.destructured.ir} |   0
 ... CreateAndTransferContract.clear.0.ssa.ir} |   0
 ...dTransferContract.clear.1.destructured.ir} |   0
 ...r => FieldTupleContract.approval.0.ssa.ir} |   0
 ... FieldTupleContract.approval.1.ssa.opt.ir} |   0
 ... FieldTupleContract.approval.2.ssa.opt.ir} |   0
 ...dTupleContract.approval.3.destructured.ir} |   0
 ...a.ir => FieldTupleContract.clear.0.ssa.ir} |   0
 ...ieldTupleContract.clear.1.destructured.ir} |   0
 ...roval.ssa.ir => Greeter.approval.0.ssa.ir} |   0
 ...a.opt.ir => Greeter.approval.1.ssa.opt.ir} |   0
 ...a.opt.ir => Greeter.approval.2.ssa.opt.ir} |   0
 ....ir => Greeter.approval.3.destructured.ir} |   0
 ....0.clear.ssa.ir => Greeter.clear.0.ssa.ir} |   0
 ...red.ir => Greeter.clear.1.destructured.ir} |   0
 ...al.ssa.ir => MyContract.approval.0.ssa.ir} |   0
 ...pt.ir => MyContract.approval.1.ssa.opt.ir} |   0
 ...pt.ir => MyContract.approval.2.ssa.opt.ir} |   0
 ... => MyContract.approval.3.destructured.ir} |   0
 ...clear.ssa.ir => MyContract.clear.0.ssa.ir} |   0
 ....ir => MyContract.clear.1.destructured.ir} |   0
 ...val.ssa.ir => itxn_loop.approval.0.ssa.ir} |   0
 ...opt.ir => itxn_loop.approval.1.ssa.opt.ir} |   0
 ...r => itxn_loop.approval.2.destructured.ir} |   0
 ....clear.ssa.ir => itxn_loop.clear.0.ssa.ir} |   0
 ...d.ir => itxn_loop.clear.1.destructured.ir} |   0
 ...AccessContract.approval.0.destructured.ir} |   0
 ...rayAccessContract.clear.0.destructured.ir} |   0
 ...ansferContract.approval.0.destructured.ir} |   0
 ...dTransferContract.clear.0.destructured.ir} |   0
 ...dTupleContract.approval.0.destructured.ir} |   0
 ...ieldTupleContract.clear.0.destructured.ir} |   0
 ....ir => Greeter.approval.0.destructured.ir} |   0
 ...red.ir => Greeter.clear.0.destructured.ir} |   0
 ... => MyContract.approval.0.destructured.ir} |   0
 ....ir => MyContract.clear.0.destructured.ir} |   0
 ...r => itxn_loop.approval.0.destructured.ir} |   0
 ...d.ir => itxn_loop.clear.0.destructured.ir} |   0
 ...AccessContract.approval.0.destructured.ir} |   0
 ...rayAccessContract.clear.0.destructured.ir} |   0
 ...ansferContract.approval.0.destructured.ir} |   0
 ...dTransferContract.clear.0.destructured.ir} |   0
 ...dTupleContract.approval.0.destructured.ir} |   0
 ...ieldTupleContract.clear.0.destructured.ir} |   0
 ....ir => Greeter.approval.0.destructured.ir} |   0
 ...red.ir => Greeter.clear.0.destructured.ir} |   0
 ... => MyContract.approval.0.destructured.ir} |   0
 ....ir => MyContract.clear.0.destructured.ir} |   0
 ...r => itxn_loop.approval.0.destructured.ir} |   0
 ...d.ir => itxn_loop.clear.0.destructured.ir} |   0
 test_cases/inner_transactions/puya.log        |  70 ++++----
 test_cases/inner_transactions/puya_O2.log     |  24 +--
 .../inner_transactions/puya_unoptimized.log   |  24 +--
 ...oval.ssa.ir => Contract.approval.0.ssa.ir} |   0
 ....opt.ir => Contract.approval.1.ssa.opt.ir} |   0
 ....opt.ir => Contract.approval.2.ssa.opt.ir} |   0
 ...ir => Contract.approval.3.destructured.ir} |   0
 ...0.clear.ssa.ir => Contract.clear.0.ssa.ir} |   0
 ...ed.ir => Contract.clear.1.destructured.ir} |   0
 ...ir => Contract.approval.0.destructured.ir} |   0
 ...ed.ir => Contract.clear.0.destructured.ir} |   0
 ...ir => Contract.approval.0.destructured.ir} |   0
 ...ed.ir => Contract.clear.0.destructured.ir} |   0
 .../inner_transactions_assignment/puya.log    |  12 +-
 .../inner_transactions_assignment/puya_O2.log |   4 +-
 .../puya_unoptimized.log                      |   4 +-
 ...ir => ImmediateVariants.approval.0.ssa.ir} |   0
 ...> ImmediateVariants.approval.1.ssa.opt.ir} |   0
 ...ediateVariants.approval.2.destructured.ir} |   0
 ...sa.ir => ImmediateVariants.clear.0.ssa.ir} |   0
 ...ImmediateVariants.clear.1.destructured.ir} |   0
 ...al.ssa.ir => Overloaded.approval.0.ssa.ir} |   0
 ...pt.ir => Overloaded.approval.1.ssa.opt.ir} |   0
 ... => Overloaded.approval.2.destructured.ir} |   0
 ...clear.ssa.ir => Overloaded.clear.0.ssa.ir} |   0
 ....ir => Overloaded.clear.1.destructured.ir} |   0
 ...ediateVariants.approval.0.destructured.ir} |   0
 ...ImmediateVariants.clear.0.destructured.ir} |   0
 ... => Overloaded.approval.0.destructured.ir} |   0
 ....ir => Overloaded.clear.0.destructured.ir} |   0
 ...ediateVariants.approval.0.destructured.ir} |   0
 ...ImmediateVariants.clear.0.destructured.ir} |   0
 ... => Overloaded.approval.0.destructured.ir} |   0
 ....ir => Overloaded.clear.0.destructured.ir} |   0
 test_cases/intrinsics/puya.log                |  20 +--
 test_cases/intrinsics/puya_O2.log             |   8 +-
 test_cases/intrinsics/puya_unoptimized.log    |   8 +-
 ... IndexableIterationTest.approval.0.ssa.ir} |   0
 ...exableIterationTest.approval.1.ssa.opt.ir} |   0
 ...eIterationTest.approval.2.destructured.ir} |   0
 ... => IndexableIterationTest.clear.0.ssa.ir} |   0
 ...ableIterationTest.clear.1.destructured.ir} |   0
 ...r => TupleIterationTest.approval.0.ssa.ir} |   0
 ... TupleIterationTest.approval.1.ssa.opt.ir} |   0
 ...eIterationTest.approval.2.destructured.ir} |   0
 ...a.ir => TupleIterationTest.clear.0.ssa.ir} |   0
 ...upleIterationTest.clear.1.destructured.ir} |   0
 ... => URangeIterationTest.approval.0.ssa.ir} |   0
 ...URangeIterationTest.approval.1.ssa.opt.ir} |   0
 ...eIterationTest.approval.2.destructured.ir} |   0
 ....ir => URangeIterationTest.clear.0.ssa.ir} |   0
 ...angeIterationTest.clear.1.destructured.ir} |   0
 ...eIterationTest.approval.0.destructured.ir} |   0
 ...ableIterationTest.clear.0.destructured.ir} |   0
 ...eIterationTest.approval.0.destructured.ir} |   0
 ...upleIterationTest.clear.0.destructured.ir} |   0
 ...eIterationTest.approval.0.destructured.ir} |   0
 ...angeIterationTest.clear.0.destructured.ir} |   0
 ...eIterationTest.approval.0.destructured.ir} |   0
 ...ableIterationTest.clear.0.destructured.ir} |   0
 ...eIterationTest.approval.0.destructured.ir} |   0
 ...upleIterationTest.clear.0.destructured.ir} |   0
 ...eIterationTest.approval.0.destructured.ir} |   0
 ...angeIterationTest.clear.0.destructured.ir} |   0
 test_cases/iteration/puya.log                 |  30 ++--
 test_cases/iteration/puya_O2.log              |  12 +-
 test_cases/iteration/puya_unoptimized.log     |  12 +-
 ...al.ssa.ir => MyContract.approval.0.ssa.ir} |   0
 ...pt.ir => MyContract.approval.1.ssa.opt.ir} |   0
 ... => MyContract.approval.2.destructured.ir} |   0
 ...clear.ssa.ir => MyContract.clear.0.ssa.ir} |   0
 ....ir => MyContract.clear.1.destructured.ir} |   0
 ... => MyContract.approval.0.destructured.ir} |   0
 ....ir => MyContract.clear.0.destructured.ir} |   0
 ... => MyContract.approval.0.destructured.ir} |   0
 ....ir => MyContract.clear.0.destructured.ir} |   0
 test_cases/koopman/puya.log                   |  10 +-
 test_cases/koopman/puya_O2.log                |   4 +-
 test_cases/koopman/puya_unoptimized.log       |   4 +-
 ...al.ssa.ir => MyContract.approval.0.ssa.ir} |   0
 ...pt.ir => MyContract.approval.1.ssa.opt.ir} |   0
 ...pt.ir => MyContract.approval.2.ssa.opt.ir} |   0
 ... => MyContract.approval.3.destructured.ir} |   0
 ...clear.ssa.ir => MyContract.clear.0.ssa.ir} |   0
 ...a.opt.ir => MyContract.clear.1.ssa.opt.ir} |   0
 ....ir => MyContract.clear.2.destructured.ir} |   0
 ... => MyContract.approval.0.destructured.ir} |   0
 ....ir => MyContract.clear.0.destructured.ir} |   0
 ... => MyContract.approval.0.destructured.ir} |   0
 ....ir => MyContract.clear.0.destructured.ir} |   0
 test_cases/less_simple/puya.log               |  14 +-
 test_cases/less_simple/puya_O2.log            |   4 +-
 test_cases/less_simple/puya_unoptimized.log   |   4 +-
 ...sa.ir => LiteralFolding.approval.0.ssa.ir} |   0
 ...r => LiteralFolding.approval.1.ssa.opt.ir} |   0
 ...LiteralFolding.approval.2.destructured.ir} |   0
 ...r.ssa.ir => LiteralFolding.clear.0.ssa.ir} |   0
 ...=> LiteralFolding.clear.1.destructured.ir} |   0
 ...LiteralFolding.approval.0.destructured.ir} |   0
 ...=> LiteralFolding.clear.0.destructured.ir} |   0
 ...LiteralFolding.approval.0.destructured.ir} |   0
 ...=> LiteralFolding.clear.0.destructured.ir} |   0
 test_cases/literals/puya.log                  |  10 +-
 test_cases/literals/puya_O2.log               |   4 +-
 test_cases/literals/puya_unoptimized.log      |   4 +-
 ...al.ssa.ir => MyContract.approval.0.ssa.ir} |   0
 ...pt.ir => MyContract.approval.1.ssa.opt.ir} |   0
 ... => MyContract.approval.2.destructured.ir} |   0
 ...clear.ssa.ir => MyContract.clear.0.ssa.ir} |   0
 ....ir => MyContract.clear.1.destructured.ir} |   0
 ... => MyContract.approval.0.destructured.ir} |   0
 ....ir => MyContract.clear.0.destructured.ir} |   0
 ... => MyContract.approval.0.destructured.ir} |   0
 ....ir => MyContract.clear.0.destructured.ir} |   0
 test_cases/log/puya.log                       |  10 +-
 test_cases/log/puya_O2.log                    |   4 +-
 test_cases/log/puya_unoptimized.log           |   4 +-
 ....ir => LoopElseContract.approval.0.ssa.ir} |   0
 ...=> LoopElseContract.approval.1.ssa.opt.ir} |   0
 ...=> LoopElseContract.approval.2.ssa.opt.ir} |   0
 ...opElseContract.approval.3.destructured.ir} |   0
 ...ssa.ir => LoopElseContract.clear.0.ssa.ir} |   0
 ... LoopElseContract.clear.1.destructured.ir} |   0
 ...opElseContract.approval.0.destructured.ir} |   0
 ... LoopElseContract.clear.0.destructured.ir} |   0
 ...opElseContract.approval.0.destructured.ir} |   0
 ... LoopElseContract.clear.0.destructured.ir} |   0
 test_cases/loop_else/puya.log                 |  12 +-
 test_cases/loop_else/puya_O2.log              |   4 +-
 test_cases/loop_else/puya_unoptimized.log     |   4 +-
 ...roval.ssa.ir => Counter.approval.0.ssa.ir} |   0
 ...a.opt.ir => Counter.approval.1.ssa.opt.ir} |   0
 ...a.opt.ir => Counter.approval.2.ssa.opt.ir} |   0
 ....ir => Counter.approval.3.destructured.ir} |   0
 ....0.clear.ssa.ir => Counter.clear.0.ssa.ir} |   0
 ...red.ir => Counter.clear.1.destructured.ir} |   0
 ...al.ssa.ir => MyContract.approval.0.ssa.ir} |   0
 ...pt.ir => MyContract.approval.1.ssa.opt.ir} |   0
 ... => MyContract.approval.2.destructured.ir} |   0
 ...clear.ssa.ir => MyContract.clear.0.ssa.ir} |   0
 ....ir => MyContract.clear.1.destructured.ir} |   0
 ....ir => Counter.approval.0.destructured.ir} |   0
 ...red.ir => Counter.clear.0.destructured.ir} |   0
 ... => MyContract.approval.0.destructured.ir} |   0
 ....ir => MyContract.clear.0.destructured.ir} |   0
 ....ir => Counter.approval.0.destructured.ir} |   0
 ...red.ir => Counter.clear.0.destructured.ir} |   0
 ... => MyContract.approval.0.destructured.ir} |   0
 ....ir => MyContract.clear.0.destructured.ir} |   0
 test_cases/match/puya.log                     |  22 +--
 test_cases/match/puya_O2.log                  |   8 +-
 test_cases/match/puya_unoptimized.log         |   8 +-
 ...al.ssa.ir => MyContract.approval.0.ssa.ir} |   0
 ...pt.ir => MyContract.approval.1.ssa.opt.ir} |   0
 ... => MyContract.approval.2.destructured.ir} |   0
 ...clear.ssa.ir => MyContract.clear.0.ssa.ir} |   0
 ....ir => MyContract.clear.1.destructured.ir} |   0
 ... => MyContract.approval.0.destructured.ir} |   0
 ....ir => MyContract.clear.0.destructured.ir} |   0
 ... => MyContract.approval.0.destructured.ir} |   0
 ....ir => MyContract.clear.0.destructured.ir} |   0
 test_cases/module_consts/puya.log             |  10 +-
 test_cases/module_consts/puya_O2.log          |   4 +-
 test_cases/module_consts/puya_unoptimized.log |   4 +-
 ... => NamedTuplesContract.approval.0.ssa.ir} |   0
 ...NamedTuplesContract.approval.1.ssa.opt.ir} |   0
 ...NamedTuplesContract.approval.2.ssa.opt.ir} |   0
 ...TuplesContract.approval.3.destructured.ir} |   0
 ....ir => NamedTuplesContract.clear.0.ssa.ir} |   0
 ...medTuplesContract.clear.1.destructured.ir} |   0
 ...TuplesContract.approval.0.destructured.ir} |   0
 ...medTuplesContract.clear.0.destructured.ir} |   0
 ...TuplesContract.approval.0.destructured.ir} |   0
 ...medTuplesContract.clear.0.destructured.ir} |   0
 test_cases/named_tuples/puya.log              |  12 +-
 test_cases/named_tuples/puya_O2.log           |   4 +-
 test_cases/named_tuples/puya_unoptimized.log  |   4 +-
 ...proval.ssa.ir => Nested.approval.0.ssa.ir} |   0
 ...sa.opt.ir => Nested.approval.1.ssa.opt.ir} |   0
 ...d.ir => Nested.approval.2.destructured.ir} |   0
 ...r.0.clear.ssa.ir => Nested.clear.0.ssa.ir} |   0
 ...ured.ir => Nested.clear.1.destructured.ir} |   0
 ...d.ir => Nested.approval.0.destructured.ir} |   0
 ...ured.ir => Nested.clear.0.destructured.ir} |   0
 ...d.ir => Nested.approval.0.destructured.ir} |   0
 ...ured.ir => Nested.clear.0.destructured.ir} |   0
 test_cases/nested_loops/puya.log              |  10 +-
 test_cases/nested_loops/puya_O2.log           |   4 +-
 test_cases/nested_loops/puya_unoptimized.log  |   4 +-
 ...oval.ssa.ir => Issue118.approval.0.ssa.ir} |   0
 ....opt.ir => Issue118.approval.1.ssa.opt.ir} |   0
 ....opt.ir => Issue118.approval.2.ssa.opt.ir} |   0
 ...ir => Issue118.approval.3.destructured.ir} |   0
 ...0.clear.ssa.ir => Issue118.clear.0.ssa.ir} |   0
 ...ed.ir => Issue118.clear.1.destructured.ir} |   0
 ...oval.ssa.ir => Issue194.approval.0.ssa.ir} |   0
 ....opt.ir => Issue194.approval.1.ssa.opt.ir} |   0
 ...ir => Issue194.approval.2.destructured.ir} |   0
 ...0.clear.ssa.ir => Issue194.clear.0.ssa.ir} |   0
 ...ed.ir => Issue194.clear.1.destructured.ir} |   0
 ...ir => Issue118.approval.0.destructured.ir} |   0
 ...ed.ir => Issue118.clear.0.destructured.ir} |   0
 ...ir => Issue194.approval.0.destructured.ir} |   0
 ...ed.ir => Issue194.clear.0.destructured.ir} |   0
 ...ir => Issue118.approval.0.destructured.ir} |   0
 ...ed.ir => Issue118.clear.0.destructured.ir} |   0
 ...ir => Issue194.approval.0.destructured.ir} |   0
 ...ed.ir => Issue194.clear.0.destructured.ir} |   0
 test_cases/regression_tests/puya.log          |  22 +--
 test_cases/regression_tests/puya_O2.log       |   8 +-
 .../regression_tests/puya_unoptimized.log     |   8 +-
 ...oval.ssa.ir => Contract.approval.0.ssa.ir} |   0
 ....opt.ir => Contract.approval.1.ssa.opt.ir} |   0
 ....opt.ir => Contract.approval.2.ssa.opt.ir} |   0
 ...ir => Contract.approval.3.destructured.ir} |   0
 ...0.clear.ssa.ir => Contract.clear.0.ssa.ir} |   0
 ...ed.ir => Contract.clear.1.destructured.ir} |   0
 ...ir => Contract.approval.0.destructured.ir} |   0
 ...ed.ir => Contract.clear.0.destructured.ir} |   0
 ...ir => Contract.approval.0.destructured.ir} |   0
 ...ed.ir => Contract.clear.0.destructured.ir} |   0
 test_cases/reinterpret_cast/puya.log          |  12 +-
 test_cases/reinterpret_cast/puya_O2.log       |   4 +-
 .../reinterpret_cast/puya_unoptimized.log     |   4 +-
 ...al.ssa.ir => MyContract.approval.0.ssa.ir} |   0
 ...pt.ir => MyContract.approval.1.ssa.opt.ir} |   0
 ... => MyContract.approval.2.destructured.ir} |   0
 ...clear.ssa.ir => MyContract.clear.0.ssa.ir} |   0
 ....ir => MyContract.clear.1.destructured.ir} |   0
 ...l.ssa.ir => MyContract2.approval.0.ssa.ir} |   0
 ...t.ir => MyContract2.approval.1.ssa.opt.ir} |   0
 ...=> MyContract2.approval.2.destructured.ir} |   0
 ...lear.ssa.ir => MyContract2.clear.0.ssa.ir} |   0
 ...ir => MyContract2.clear.1.destructured.ir} |   0
 ...a.ir => MyOtherContract.approval.0.ssa.ir} |   0
 ...yOtherContract.approval.1.destructured.ir} |   0
 ....ssa.ir => MyOtherContract.clear.0.ssa.ir} |   0
 ...> MyOtherContract.clear.1.destructured.ir} |   0
 ... => MyContract.approval.0.destructured.ir} |   0
 ....ir => MyContract.clear.0.destructured.ir} |   0
 ...=> MyContract2.approval.0.destructured.ir} |   0
 ...ir => MyContract2.clear.0.destructured.ir} |   0
 ...yOtherContract.approval.0.destructured.ir} |   0
 ...> MyOtherContract.clear.0.destructured.ir} |   0
 ... => MyContract.approval.0.destructured.ir} |   0
 ....ir => MyContract.clear.0.destructured.ir} |   0
 ...=> MyContract2.approval.0.destructured.ir} |   0
 ...ir => MyContract2.clear.0.destructured.ir} |   0
 ...yOtherContract.approval.0.destructured.ir} |   0
 ...> MyOtherContract.clear.0.destructured.ir} |   0
 test_cases/scratch_slots/puya.log             |  28 +--
 test_cases/scratch_slots/puya_O2.log          |  12 +-
 test_cases/scratch_slots/puya_unoptimized.log |  12 +-
 ...al.ssa.ir => MyContract.approval.0.ssa.ir} |   0
 ...pt.ir => MyContract.approval.1.ssa.opt.ir} |   0
 ... => MyContract.approval.2.destructured.ir} |   0
 ...clear.ssa.ir => MyContract.clear.0.ssa.ir} |   0
 ...a.opt.ir => MyContract.clear.1.ssa.opt.ir} |   0
 ....ir => MyContract.clear.2.destructured.ir} |   0
 ... => MyContract.approval.0.destructured.ir} |   0
 ....ir => MyContract.clear.0.destructured.ir} |   0
 ... => MyContract.approval.0.destructured.ir} |   0
 ....ir => MyContract.clear.0.destructured.ir} |   0
 test_cases/simple/puya.log                    |  12 +-
 test_cases/simple/puya_O2.log                 |   4 +-
 test_cases/simple/puya_unoptimized.log        |   4 +-
 ...oval.ssa.ir => Simplish.approval.0.ssa.ir} |   0
 ....opt.ir => Simplish.approval.1.ssa.opt.ir} |   0
 ....opt.ir => Simplish.approval.2.ssa.opt.ir} |   0
 ....opt.ir => Simplish.approval.3.ssa.opt.ir} |   0
 ...ir => Simplish.approval.4.destructured.ir} |   0
 ...0.clear.ssa.ir => Simplish.clear.0.ssa.ir} |   0
 ...ed.ir => Simplish.clear.1.destructured.ir} |   0
 ...ir => Simplish.approval.0.destructured.ir} |   0
 ...ed.ir => Simplish.clear.0.destructured.ir} |   0
 ...ir => Simplish.approval.0.destructured.ir} |   0
 ...ed.ir => Simplish.clear.0.destructured.ir} |   0
 test_cases/simplish/puya.log                  |  14 +-
 test_cases/simplish/puya_O2.log               |   4 +-
 test_cases/simplish/puya_unoptimized.log      |   4 +-
 ...al.ssa.ir => MyContract.approval.0.ssa.ir} |   0
 ...pt.ir => MyContract.approval.1.ssa.opt.ir} |   0
 ...pt.ir => MyContract.approval.2.ssa.opt.ir} |   0
 ... => MyContract.approval.3.destructured.ir} |   0
 ...clear.ssa.ir => MyContract.clear.0.ssa.ir} |   0
 ...a.opt.ir => MyContract.clear.1.ssa.opt.ir} |   0
 ...a.opt.ir => MyContract.clear.2.ssa.opt.ir} |   0
 ....ir => MyContract.clear.3.destructured.ir} |   0
 ... => MyContract.approval.0.destructured.ir} |   0
 ....ir => MyContract.clear.0.destructured.ir} |   0
 ... => MyContract.approval.0.destructured.ir} |   0
 ....ir => MyContract.clear.0.destructured.ir} |   0
 test_cases/ssa/puya.log                       |  16 +-
 test_cases/ssa/puya_O2.log                    |   4 +-
 test_cases/ssa/puya_unoptimized.log           |   4 +-
 ...al.ssa.ir => MyContract.approval.0.ssa.ir} |   0
 ...pt.ir => MyContract.approval.1.ssa.opt.ir} |   0
 ... => MyContract.approval.2.destructured.ir} |   0
 ...clear.ssa.ir => MyContract.clear.0.ssa.ir} |   0
 ...a.opt.ir => MyContract.clear.1.ssa.opt.ir} |   0
 ...a.opt.ir => MyContract.clear.2.ssa.opt.ir} |   0
 ....ir => MyContract.clear.3.destructured.ir} |   0
 ... => MyContract.approval.0.destructured.ir} |   0
 ....ir => MyContract.clear.0.destructured.ir} |   0
 ... => MyContract.approval.0.destructured.ir} |   0
 ....ir => MyContract.clear.0.destructured.ir} |   0
 test_cases/ssa2/puya.log                      |  14 +-
 test_cases/ssa2/puya_O2.log                   |   4 +-
 test_cases/ssa2/puya_unoptimized.log          |   4 +-
 ...oval.ssa.ir => Contract.approval.0.ssa.ir} |   0
 ....opt.ir => Contract.approval.1.ssa.opt.ir} |   0
 ....opt.ir => Contract.approval.2.ssa.opt.ir} |   0
 ...ir => Contract.approval.3.destructured.ir} |   0
 ...0.clear.ssa.ir => Contract.clear.0.ssa.ir} |   0
 ...ed.ir => Contract.clear.1.destructured.ir} |   0
 ...ir => Contract.approval.0.destructured.ir} |   0
 ...ed.ir => Contract.clear.0.destructured.ir} |   0
 ...ir => Contract.approval.0.destructured.ir} |   0
 ...ed.ir => Contract.clear.0.destructured.ir} |   0
 test_cases/state_mutations/puya.log           |  12 +-
 test_cases/state_mutations/puya_O2.log        |   4 +-
 .../state_mutations/puya_unoptimized.log      |   4 +-
 ...r => StateProxyContract.approval.0.ssa.ir} |   0
 ... StateProxyContract.approval.1.ssa.opt.ir} |   0
 ... StateProxyContract.approval.2.ssa.opt.ir} |   0
 ...eProxyContract.approval.3.destructured.ir} |   0
 ...a.ir => StateProxyContract.clear.0.ssa.ir} |   0
 ...tateProxyContract.clear.1.destructured.ir} |   0
 ...eProxyContract.approval.0.destructured.ir} |   0
 ...tateProxyContract.clear.0.destructured.ir} |   0
 ...eProxyContract.approval.0.destructured.ir} |   0
 ...tateProxyContract.clear.0.destructured.ir} |   0
 test_cases/state_proxies/puya.log             |  12 +-
 test_cases/state_proxies/puya_O2.log          |   4 +-
 test_cases/state_proxies/puya_unoptimized.log |   4 +-
 ...oval.ssa.ir => Contract.approval.0.ssa.ir} |   0
 ....opt.ir => Contract.approval.1.ssa.opt.ir} |   0
 ....opt.ir => Contract.approval.2.ssa.opt.ir} |   0
 ...ir => Contract.approval.3.destructured.ir} |   0
 ...0.clear.ssa.ir => Contract.clear.0.ssa.ir} |   0
 ...ed.ir => Contract.clear.1.destructured.ir} |   0
 ...ir => Contract.approval.0.destructured.ir} |   0
 ...ed.ir => Contract.clear.0.destructured.ir} |   0
 ...ir => Contract.approval.0.destructured.ir} |   0
 ...ed.ir => Contract.clear.0.destructured.ir} |   0
 test_cases/state_totals/puya.log              |  12 +-
 test_cases/state_totals/puya_O2.log           |   4 +-
 test_cases/state_totals/puya_unoptimized.log  |   4 +-
 ...ruteForceRotationSearch.approval.0.ssa.ir} |   0
 ...ForceRotationSearch.approval.1.ssa.opt.ir} |   0
 ...RotationSearch.approval.2.destructured.ir} |   0
 ...> BruteForceRotationSearch.clear.0.ssa.ir} |   0
 ...rceRotationSearch.clear.1.destructured.ir} |   0
 ...RotationSearch.approval.0.destructured.ir} |   0
 ...rceRotationSearch.clear.0.destructured.ir} |   0
 ...RotationSearch.approval.0.destructured.ir} |   0
 ...rceRotationSearch.clear.0.destructured.ir} |   0
 test_cases/stress_tests/puya.log              |  10 +-
 test_cases/stress_tests/puya_O2.log           |   4 +-
 test_cases/stress_tests/puya_unoptimized.log  |   4 +-
 ...al.ssa.ir => MyContract.approval.0.ssa.ir} |   0
 ...pt.ir => MyContract.approval.1.ssa.opt.ir} |   0
 ... => MyContract.approval.2.destructured.ir} |   0
 ...clear.ssa.ir => MyContract.clear.0.ssa.ir} |   0
 ....ir => MyContract.clear.1.destructured.ir} |   0
 ... => MyContract.approval.0.destructured.ir} |   0
 ....ir => MyContract.clear.0.destructured.ir} |   0
 ... => MyContract.approval.0.destructured.ir} |   0
 ....ir => MyContract.clear.0.destructured.ir} |   0
 test_cases/string_ops/puya.log                |  10 +-
 test_cases/string_ops/puya_O2.log             |   4 +-
 test_cases/string_ops/puya_unoptimized.log    |   4 +-
 ....ssa.ir => DemoContract.approval.0.ssa.ir} |   0
 ....ir => DemoContract.approval.1.ssa.opt.ir} |   0
 ....ir => DemoContract.approval.2.ssa.opt.ir} |   0
 ....ir => DemoContract.approval.3.ssa.opt.ir} |   0
 ...> DemoContract.approval.4.destructured.ir} |   0
 ...ear.ssa.ir => DemoContract.clear.0.ssa.ir} |   0
 ...r => DemoContract.clear.1.destructured.ir} |   0
 ...> DemoContract.approval.0.destructured.ir} |   0
 ...r => DemoContract.clear.0.destructured.ir} |   0
 ...> DemoContract.approval.0.destructured.ir} |   0
 ...r => DemoContract.clear.0.destructured.ir} |   0
 test_cases/struct_by_name/puya.log            |  14 +-
 test_cases/struct_by_name/puya_O2.log         |   4 +-
 .../struct_by_name/puya_unoptimized.log       |   4 +-
 ...a.ir => BigUIntContract.approval.0.ssa.ir} |   0
 ... => BigUIntContract.approval.1.ssa.opt.ir} |   0
 ...igUIntContract.approval.2.destructured.ir} |   0
 ....ssa.ir => BigUIntContract.clear.0.ssa.ir} |   0
 ....ir => BigUIntContract.clear.1.ssa.opt.ir} |   0
 ...> BigUIntContract.clear.2.destructured.ir} |   0
 ...ssa.ir => BytesContract.approval.0.ssa.ir} |   0
 ...ir => BytesContract.approval.1.ssa.opt.ir} |   0
 ...ir => BytesContract.approval.2.ssa.opt.ir} |   0
 ... BytesContract.approval.3.destructured.ir} |   0
 ...ar.ssa.ir => BytesContract.clear.0.ssa.ir} |   0
 ... => BytesContract.clear.1.destructured.ir} |   0
 ...sa.ir => StringContract.approval.0.ssa.ir} |   0
 ...r => StringContract.approval.1.ssa.opt.ir} |   0
 ...r => StringContract.approval.2.ssa.opt.ir} |   0
 ...StringContract.approval.3.destructured.ir} |   0
 ...r.ssa.ir => StringContract.clear.0.ssa.ir} |   0
 ...=> StringContract.clear.1.destructured.ir} |   0
 ...sa.ir => Uint64Contract.approval.0.ssa.ir} |   0
 ...r => Uint64Contract.approval.1.ssa.opt.ir} |   0
 ...Uint64Contract.approval.2.destructured.ir} |   0
 ...r.ssa.ir => Uint64Contract.clear.0.ssa.ir} |   0
 ...t.ir => Uint64Contract.clear.1.ssa.opt.ir} |   0
 ...=> Uint64Contract.clear.2.destructured.ir} |   0
 ...igUIntContract.approval.0.destructured.ir} |   0
 ...> BigUIntContract.clear.0.destructured.ir} |   0
 ... BytesContract.approval.0.destructured.ir} |   0
 ... => BytesContract.clear.0.destructured.ir} |   0
 ...StringContract.approval.0.destructured.ir} |   0
 ...=> StringContract.clear.0.destructured.ir} |   0
 ...Uint64Contract.approval.0.destructured.ir} |   0
 ...=> Uint64Contract.clear.0.destructured.ir} |   0
 ...igUIntContract.approval.0.destructured.ir} |   0
 ...> BigUIntContract.clear.0.destructured.ir} |   0
 ... BytesContract.approval.0.destructured.ir} |   0
 ... => BytesContract.clear.0.destructured.ir} |   0
 ...StringContract.approval.0.destructured.ir} |   0
 ...=> StringContract.clear.0.destructured.ir} |   0
 ...Uint64Contract.approval.0.destructured.ir} |   0
 ...=> Uint64Contract.clear.0.destructured.ir} |   0
 test_cases/stubs/puya.log                     |  48 ++---
 test_cases/stubs/puya_O2.log                  |  16 +-
 test_cases/stubs/puya_unoptimized.log         |  16 +-
 ...mplateVariablesContract.approval.0.ssa.ir} |   0
 ...teVariablesContract.approval.1.ssa.opt.ir} |   0
 ...teVariablesContract.approval.2.ssa.opt.ir} |   0
 ...iablesContract.approval.3.destructured.ir} |   0
 ... TemplateVariablesContract.clear.0.ssa.ir} |   0
 ...VariablesContract.clear.1.destructured.ir} |   0
 ...iablesContract.approval.0.destructured.ir} |   0
 ...VariablesContract.clear.0.destructured.ir} |   0
 ...iablesContract.approval.0.destructured.ir} |   0
 ...VariablesContract.clear.0.destructured.ir} |   0
 test_cases/template_variables/puya.log        |  12 +-
 test_cases/template_variables/puya_O2.log     |   4 +-
 .../template_variables/puya_unoptimized.log   |   4 +-
 ...al.ssa.ir => MyContract.approval.0.ssa.ir} |   0
 ...pt.ir => MyContract.approval.1.ssa.opt.ir} |   0
 ...pt.ir => MyContract.approval.2.ssa.opt.ir} |   0
 ... => MyContract.approval.3.destructured.ir} |   0
 ...clear.ssa.ir => MyContract.clear.0.ssa.ir} |   0
 ....ir => MyContract.clear.1.destructured.ir} |   0
 ... => MyContract.approval.0.destructured.ir} |   0
 ....ir => MyContract.clear.0.destructured.ir} |   0
 ... => MyContract.approval.0.destructured.ir} |   0
 ....ir => MyContract.clear.0.destructured.ir} |   0
 test_cases/too_many_permutations/puya.log     |  12 +-
 test_cases/too_many_permutations/puya_O2.log  |   4 +-
 .../puya_unoptimized.log                      |   4 +-
 ... => TransactionContract.approval.0.ssa.ir} |   0
 ...TransactionContract.approval.1.ssa.opt.ir} |   0
 ...TransactionContract.approval.2.ssa.opt.ir} |   0
 ...actionContract.approval.3.destructured.ir} |   0
 ....ir => TransactionContract.clear.0.ssa.ir} |   0
 ...ansactionContract.clear.1.destructured.ir} |   0
 ...actionContract.approval.0.destructured.ir} |   0
 ...ansactionContract.clear.0.destructured.ir} |   0
 ...actionContract.approval.0.destructured.ir} |   0
 ...ansactionContract.clear.0.destructured.ir} |   0
 test_cases/transaction/puya.log               |  12 +-
 test_cases/transaction/puya_O2.log            |   4 +-
 test_cases/transaction/puya_unoptimized.log   |   4 +-
 ....ssa.ir => NestedTuples.approval.0.ssa.ir} |   0
 ....ir => NestedTuples.approval.1.ssa.opt.ir} |   0
 ....ir => NestedTuples.approval.2.ssa.opt.ir} |   0
 ....ir => NestedTuples.approval.3.ssa.opt.ir} |   0
 ...> NestedTuples.approval.4.destructured.ir} |   0
 ...ear.ssa.ir => NestedTuples.clear.0.ssa.ir} |   0
 ...r => NestedTuples.clear.1.destructured.ir} |   0
 ....ir => TupleComparisons.approval.0.ssa.ir} |   0
 ...=> TupleComparisons.approval.1.ssa.opt.ir} |   0
 ...=> TupleComparisons.approval.2.ssa.opt.ir} |   0
 ...pleComparisons.approval.3.destructured.ir} |   0
 ...ssa.ir => TupleComparisons.clear.0.ssa.ir} |   0
 ... TupleComparisons.clear.1.destructured.ir} |   0
 ....ssa.ir => TupleSupport.approval.0.ssa.ir} |   0
 ....ir => TupleSupport.approval.1.ssa.opt.ir} |   0
 ....ir => TupleSupport.approval.2.ssa.opt.ir} |   0
 ...> TupleSupport.approval.3.destructured.ir} |   0
 ...ear.ssa.ir => TupleSupport.clear.0.ssa.ir} |   0
 ...r => TupleSupport.clear.1.destructured.ir} |   0
 ...> NestedTuples.approval.0.destructured.ir} |   0
 ...r => NestedTuples.clear.0.destructured.ir} |   0
 ...pleComparisons.approval.0.destructured.ir} |   0
 ... TupleComparisons.clear.0.destructured.ir} |   0
 ...> TupleSupport.approval.0.destructured.ir} |   0
 ...r => TupleSupport.clear.0.destructured.ir} |   0
 ...> NestedTuples.approval.0.destructured.ir} |   0
 ...r => NestedTuples.clear.0.destructured.ir} |   0
 ...pleComparisons.approval.0.destructured.ir} |   0
 ... TupleComparisons.clear.0.destructured.ir} |   0
 ...> TupleSupport.approval.0.destructured.ir} |   0
 ...r => TupleSupport.clear.0.destructured.ir} |   0
 test_cases/tuple_support/puya.log             |  38 ++--
 test_cases/tuple_support/puya_O2.log          |  12 +-
 test_cases/tuple_support/puya_unoptimized.log |  12 +-
 ...roval.ssa.ir => Greeter.approval.0.ssa.ir} |   0
 ...a.opt.ir => Greeter.approval.1.ssa.opt.ir} |   0
 ...a.opt.ir => Greeter.approval.2.ssa.opt.ir} |   0
 ....ir => Greeter.approval.3.destructured.ir} |   0
 ....0.clear.ssa.ir => Greeter.clear.0.ssa.ir} |   0
 ...red.ir => Greeter.clear.1.destructured.ir} |   0
 ...proval.ssa.ir => Logger.approval.0.ssa.ir} |   0
 ...sa.opt.ir => Logger.approval.1.ssa.opt.ir} |   0
 ...sa.opt.ir => Logger.approval.2.ssa.opt.ir} |   0
 ...d.ir => Logger.approval.3.destructured.ir} |   0
 ...r.0.clear.ssa.ir => Logger.clear.0.ssa.ir} |   0
 ...ured.ir => Logger.clear.1.destructured.ir} |   0
 ....ir => Greeter.approval.0.destructured.ir} |   0
 ...red.ir => Greeter.clear.0.destructured.ir} |   0
 ...d.ir => Logger.approval.0.destructured.ir} |   0
 ...ured.ir => Logger.clear.0.destructured.ir} |   0
 ....ir => Greeter.approval.0.destructured.ir} |   0
 ...red.ir => Greeter.clear.0.destructured.ir} |   0
 ...d.ir => Logger.approval.0.destructured.ir} |   0
 ...ured.ir => Logger.clear.0.destructured.ir} |   0
 test_cases/typed_abi_call/puya.log            |  24 +--
 test_cases/typed_abi_call/puya_O2.log         |   8 +-
 .../typed_abi_call/puya_unoptimized.log       |   8 +-
 ...proval.ssa.ir => Caller.approval.0.ssa.ir} |   0
 ...sa.opt.ir => Caller.approval.1.ssa.opt.ir} |   0
 ...sa.opt.ir => Caller.approval.2.ssa.opt.ir} |   0
 ...d.ir => Caller.approval.3.destructured.ir} |   0
 ...r.0.clear.ssa.ir => Caller.clear.0.ssa.ir} |   0
 ...ured.ir => Caller.clear.1.destructured.ir} |   0
 ...l.ssa.ir => TxnContract.approval.0.ssa.ir} |   0
 ...t.ir => TxnContract.approval.1.ssa.opt.ir} |   0
 ...t.ir => TxnContract.approval.2.ssa.opt.ir} |   0
 ...=> TxnContract.approval.3.destructured.ir} |   0
 ...lear.ssa.ir => TxnContract.clear.0.ssa.ir} |   0
 ...ir => TxnContract.clear.1.destructured.ir} |   0
 ...d.ir => Caller.approval.0.destructured.ir} |   0
 ...ured.ir => Caller.clear.0.destructured.ir} |   0
 ...=> TxnContract.approval.0.destructured.ir} |   0
 ...ir => TxnContract.clear.0.destructured.ir} |   0
 ...d.ir => Caller.approval.0.destructured.ir} |   0
 ...ured.ir => Caller.clear.0.destructured.ir} |   0
 ...=> TxnContract.approval.0.destructured.ir} |   0
 ...ir => TxnContract.clear.0.destructured.ir} |   0
 test_cases/typed_abi_call_txn/puya.log        |  24 +--
 test_cases/typed_abi_call_txn/puya_O2.log     |   8 +-
 .../typed_abi_call_txn/puya_unoptimized.log   |   8 +-
 ...ssa.ir => UnaryContract.approval.0.ssa.ir} |   0
 ...ir => UnaryContract.approval.1.ssa.opt.ir} |   0
 ... UnaryContract.approval.2.destructured.ir} |   0
 ...ar.ssa.ir => UnaryContract.clear.0.ssa.ir} |   0
 ... => UnaryContract.clear.1.destructured.ir} |   0
 ... UnaryContract.approval.0.destructured.ir} |   0
 ... => UnaryContract.clear.0.destructured.ir} |   0
 ... UnaryContract.approval.0.destructured.ir} |   0
 ... => UnaryContract.clear.0.destructured.ir} |   0
 test_cases/unary/puya.log                     |  10 +-
 test_cases/unary/puya_O2.log                  |   4 +-
 test_cases/unary/puya_unoptimized.log         |   4 +-
 ...al.ssa.ir => Unassigned.approval.0.ssa.ir} |   0
 ...pt.ir => Unassigned.approval.1.ssa.opt.ir} |   0
 ...pt.ir => Unassigned.approval.2.ssa.opt.ir} |   0
 ... => Unassigned.approval.3.destructured.ir} |   0
 ...clear.ssa.ir => Unassigned.clear.0.ssa.ir} |   0
 ....ir => Unassigned.clear.1.destructured.ir} |   0
 ... => Unassigned.approval.0.destructured.ir} |   0
 ....ir => Unassigned.clear.0.destructured.ir} |   0
 ... => Unassigned.approval.0.destructured.ir} |   0
 ....ir => Unassigned.clear.0.destructured.ir} |   0
 test_cases/unassigned_expression/puya.log     |  12 +-
 test_cases/unassigned_expression/puya_O2.log  |   4 +-
 .../puya_unoptimized.log                      |   4 +-
 ...proval.ssa.ir => Baddie.approval.0.ssa.ir} |   0
 ...sa.opt.ir => Baddie.approval.1.ssa.opt.ir} |   0
 ...sa.opt.ir => Baddie.approval.2.ssa.opt.ir} |   0
 ...sa.opt.ir => Baddie.approval.3.ssa.opt.ir} |   0
 ...d.ir => Baddie.approval.4.destructured.ir} |   0
 ...r.0.clear.ssa.ir => Baddie.clear.0.ssa.ir} |   0
 ...ured.ir => Baddie.clear.1.destructured.ir} |   0
 ...d.ir => Baddie.approval.0.destructured.ir} |   0
 ...ured.ir => Baddie.clear.0.destructured.ir} |   0
 ...d.ir => Baddie.approval.0.destructured.ir} |   0
 ...ured.ir => Baddie.clear.0.destructured.ir} |   0
 test_cases/undefined_phi_args/puya.log        |  14 +-
 test_cases/undefined_phi_args/puya_O2.log     |   4 +-
 .../undefined_phi_args/puya_unoptimized.log   |   4 +-
 ...ssa.ir => UnSSAContract.approval.0.ssa.ir} |   0
 ...ir => UnSSAContract.approval.1.ssa.opt.ir} |   0
 ...ir => UnSSAContract.approval.2.ssa.opt.ir} |   0
 ... UnSSAContract.approval.3.destructured.ir} |   0
 ...ar.ssa.ir => UnSSAContract.clear.0.ssa.ir} |   0
 ... => UnSSAContract.clear.1.destructured.ir} |   0
 ... UnSSAContract.approval.0.destructured.ir} |   0
 ... => UnSSAContract.clear.0.destructured.ir} |   0
 ... UnSSAContract.approval.0.destructured.ir} |   0
 ... => UnSSAContract.clear.0.destructured.ir} |   0
 test_cases/unssa/puya.log                     |  12 +-
 test_cases/unssa/puya_O2.log                  |   4 +-
 test_cases/unssa/puya_unoptimized.log         |   4 +-
 ...sa.ir => WithReentrancy.approval.0.ssa.ir} |   0
 ...r => WithReentrancy.approval.1.ssa.opt.ir} |   0
 ...r => WithReentrancy.approval.2.ssa.opt.ir} |   0
 ...WithReentrancy.approval.3.destructured.ir} |   0
 ...r.ssa.ir => WithReentrancy.clear.0.ssa.ir} |   0
 ...=> WithReentrancy.clear.1.destructured.ir} |   0
 ...WithReentrancy.approval.0.destructured.ir} |   0
 ...=> WithReentrancy.clear.0.destructured.ir} |   0
 ...WithReentrancy.approval.0.destructured.ir} |   0
 ...=> WithReentrancy.clear.0.destructured.ir} |   0
 test_cases/with_reentrancy/puya.log           |  12 +-
 test_cases/with_reentrancy/puya_O2.log        |   4 +-
 .../with_reentrancy/puya_unoptimized.log      |   4 +-
 1559 files changed, 1312 insertions(+), 1315 deletions(-)
 rename examples/amm/out/ConstantProductAMM.ir/{ConstantProductAMM.approval.0.approval.ssa.ir => ConstantProductAMM.approval.0.ssa.ir} (100%)
 rename examples/amm/out/ConstantProductAMM.ir/{ConstantProductAMM.approval.1.approval.ssa.opt.ir => ConstantProductAMM.approval.1.ssa.opt.ir} (100%)
 rename examples/amm/out/ConstantProductAMM.ir/{ConstantProductAMM.approval.2.approval.ssa.opt.ir => ConstantProductAMM.approval.2.ssa.opt.ir} (100%)
 rename examples/amm/out/ConstantProductAMM.ir/{ConstantProductAMM.approval.3.approval.ssa.opt.ir => ConstantProductAMM.approval.3.ssa.opt.ir} (100%)
 rename examples/amm/out/ConstantProductAMM.ir/{ConstantProductAMM.approval.4.approval.destructured.ir => ConstantProductAMM.approval.4.destructured.ir} (100%)
 rename examples/amm/out/ConstantProductAMM.ir/{ConstantProductAMM.clear.0.clear.ssa.ir => ConstantProductAMM.clear.0.ssa.ir} (100%)
 rename examples/amm/out/ConstantProductAMM.ir/{ConstantProductAMM.clear.1.clear.destructured.ir => ConstantProductAMM.clear.1.destructured.ir} (100%)
 rename examples/amm/out_O2/ConstantProductAMM.ir/{ConstantProductAMM.approval.0.approval.destructured.ir => ConstantProductAMM.approval.0.destructured.ir} (100%)
 rename examples/amm/out_O2/ConstantProductAMM.ir/{ConstantProductAMM.clear.0.clear.destructured.ir => ConstantProductAMM.clear.0.destructured.ir} (100%)
 rename examples/amm/out_unoptimized/ConstantProductAMM.ir/{ConstantProductAMM.approval.0.approval.destructured.ir => ConstantProductAMM.approval.0.destructured.ir} (100%)
 rename examples/amm/out_unoptimized/ConstantProductAMM.ir/{ConstantProductAMM.clear.0.clear.destructured.ir => ConstantProductAMM.clear.0.destructured.ir} (100%)
 rename examples/arc_28/out/EventEmitter.ir/{EventEmitter.approval.0.approval.ssa.ir => EventEmitter.approval.0.ssa.ir} (100%)
 rename examples/arc_28/out/EventEmitter.ir/{EventEmitter.approval.1.approval.ssa.opt.ir => EventEmitter.approval.1.ssa.opt.ir} (100%)
 rename examples/arc_28/out/EventEmitter.ir/{EventEmitter.approval.2.approval.ssa.opt.ir => EventEmitter.approval.2.ssa.opt.ir} (100%)
 rename examples/arc_28/out/EventEmitter.ir/{EventEmitter.approval.3.approval.destructured.ir => EventEmitter.approval.3.destructured.ir} (100%)
 rename examples/arc_28/out/EventEmitter.ir/{EventEmitter.clear.0.clear.ssa.ir => EventEmitter.clear.0.ssa.ir} (100%)
 rename examples/arc_28/out/EventEmitter.ir/{EventEmitter.clear.1.clear.destructured.ir => EventEmitter.clear.1.destructured.ir} (100%)
 rename examples/arc_28/out_O2/EventEmitter.ir/{EventEmitter.approval.0.approval.destructured.ir => EventEmitter.approval.0.destructured.ir} (100%)
 rename examples/arc_28/out_O2/EventEmitter.ir/{EventEmitter.clear.0.clear.destructured.ir => EventEmitter.clear.0.destructured.ir} (100%)
 rename examples/arc_28/out_unoptimized/EventEmitter.ir/{EventEmitter.approval.0.approval.destructured.ir => EventEmitter.approval.0.destructured.ir} (100%)
 rename examples/arc_28/out_unoptimized/EventEmitter.ir/{EventEmitter.clear.0.clear.destructured.ir => EventEmitter.clear.0.destructured.ir} (100%)
 rename examples/auction/out/Auction.ir/{Auction.approval.0.approval.ssa.ir => Auction.approval.0.ssa.ir} (100%)
 rename examples/auction/out/Auction.ir/{Auction.approval.1.approval.ssa.opt.ir => Auction.approval.1.ssa.opt.ir} (100%)
 rename examples/auction/out/Auction.ir/{Auction.approval.2.approval.ssa.opt.ir => Auction.approval.2.ssa.opt.ir} (100%)
 rename examples/auction/out/Auction.ir/{Auction.approval.3.approval.destructured.ir => Auction.approval.3.destructured.ir} (100%)
 rename examples/auction/out/Auction.ir/{Auction.clear.0.clear.ssa.ir => Auction.clear.0.ssa.ir} (100%)
 rename examples/auction/out/Auction.ir/{Auction.clear.1.clear.destructured.ir => Auction.clear.1.destructured.ir} (100%)
 rename examples/auction/out_O2/Auction.ir/{Auction.approval.0.approval.destructured.ir => Auction.approval.0.destructured.ir} (100%)
 rename examples/auction/out_O2/Auction.ir/{Auction.clear.0.clear.destructured.ir => Auction.clear.0.destructured.ir} (100%)
 rename examples/auction/out_unoptimized/Auction.ir/{Auction.approval.0.approval.destructured.ir => Auction.approval.0.destructured.ir} (100%)
 rename examples/auction/out_unoptimized/Auction.ir/{Auction.clear.0.clear.destructured.ir => Auction.clear.0.destructured.ir} (100%)
 rename examples/box_storage/out/BoxContract.ir/{BoxContract.approval.0.approval.ssa.ir => BoxContract.approval.0.ssa.ir} (100%)
 rename examples/box_storage/out/BoxContract.ir/{BoxContract.approval.1.approval.ssa.opt.ir => BoxContract.approval.1.ssa.opt.ir} (100%)
 rename examples/box_storage/out/BoxContract.ir/{BoxContract.approval.2.approval.ssa.opt.ir => BoxContract.approval.2.ssa.opt.ir} (100%)
 rename examples/box_storage/out/BoxContract.ir/{BoxContract.approval.3.approval.ssa.opt.ir => BoxContract.approval.3.ssa.opt.ir} (100%)
 rename examples/box_storage/out/BoxContract.ir/{BoxContract.approval.4.approval.destructured.ir => BoxContract.approval.4.destructured.ir} (100%)
 rename examples/box_storage/out/BoxContract.ir/{BoxContract.clear.0.clear.ssa.ir => BoxContract.clear.0.ssa.ir} (100%)
 rename examples/box_storage/out/BoxContract.ir/{BoxContract.clear.1.clear.destructured.ir => BoxContract.clear.1.destructured.ir} (100%)
 rename examples/box_storage/out_O2/BoxContract.ir/{BoxContract.approval.0.approval.destructured.ir => BoxContract.approval.0.destructured.ir} (100%)
 rename examples/box_storage/out_O2/BoxContract.ir/{BoxContract.clear.0.clear.destructured.ir => BoxContract.clear.0.destructured.ir} (100%)
 rename examples/box_storage/out_unoptimized/BoxContract.ir/{BoxContract.approval.0.approval.destructured.ir => BoxContract.approval.0.destructured.ir} (100%)
 rename examples/box_storage/out_unoptimized/BoxContract.ir/{BoxContract.clear.0.clear.destructured.ir => BoxContract.clear.0.destructured.ir} (100%)
 rename examples/calculator/out/MyContract.ir/{MyContract.approval.0.approval.ssa.ir => MyContract.approval.0.ssa.ir} (100%)
 rename examples/calculator/out/MyContract.ir/{MyContract.approval.1.approval.ssa.opt.ir => MyContract.approval.1.ssa.opt.ir} (100%)
 rename examples/calculator/out/MyContract.ir/{MyContract.approval.2.approval.ssa.opt.ir => MyContract.approval.2.ssa.opt.ir} (100%)
 rename examples/calculator/out/MyContract.ir/{MyContract.approval.3.approval.destructured.ir => MyContract.approval.3.destructured.ir} (100%)
 rename examples/calculator/out/MyContract.ir/{MyContract.clear.0.clear.ssa.ir => MyContract.clear.0.ssa.ir} (100%)
 rename examples/calculator/out/MyContract.ir/{MyContract.clear.1.clear.destructured.ir => MyContract.clear.1.destructured.ir} (100%)
 rename examples/calculator/out_O2/MyContract.ir/{MyContract.approval.0.approval.destructured.ir => MyContract.approval.0.destructured.ir} (100%)
 rename examples/calculator/out_O2/MyContract.ir/{MyContract.clear.0.clear.destructured.ir => MyContract.clear.0.destructured.ir} (100%)
 rename examples/calculator/out_unoptimized/MyContract.ir/{MyContract.approval.0.approval.destructured.ir => MyContract.approval.0.destructured.ir} (100%)
 rename examples/calculator/out_unoptimized/MyContract.ir/{MyContract.clear.0.clear.destructured.ir => MyContract.clear.0.destructured.ir} (100%)
 rename examples/global_state/out/AppStateContract.ir/{AppStateContract.approval.0.approval.ssa.ir => AppStateContract.approval.0.ssa.ir} (100%)
 rename examples/global_state/out/AppStateContract.ir/{AppStateContract.approval.1.approval.ssa.opt.ir => AppStateContract.approval.1.ssa.opt.ir} (100%)
 rename examples/global_state/out/AppStateContract.ir/{AppStateContract.approval.2.approval.ssa.opt.ir => AppStateContract.approval.2.ssa.opt.ir} (100%)
 rename examples/global_state/out/AppStateContract.ir/{AppStateContract.approval.3.approval.destructured.ir => AppStateContract.approval.3.destructured.ir} (100%)
 rename examples/global_state/out/AppStateContract.ir/{AppStateContract.clear.0.clear.ssa.ir => AppStateContract.clear.0.ssa.ir} (100%)
 rename examples/global_state/out/AppStateContract.ir/{AppStateContract.clear.1.clear.destructured.ir => AppStateContract.clear.1.destructured.ir} (100%)
 rename examples/global_state/out_O2/AppStateContract.ir/{AppStateContract.approval.0.approval.destructured.ir => AppStateContract.approval.0.destructured.ir} (100%)
 rename examples/global_state/out_O2/AppStateContract.ir/{AppStateContract.clear.0.clear.destructured.ir => AppStateContract.clear.0.destructured.ir} (100%)
 rename examples/global_state/out_unoptimized/AppStateContract.ir/{AppStateContract.approval.0.approval.destructured.ir => AppStateContract.approval.0.destructured.ir} (100%)
 rename examples/global_state/out_unoptimized/AppStateContract.ir/{AppStateContract.clear.0.clear.destructured.ir => AppStateContract.clear.0.destructured.ir} (100%)
 rename examples/hello_world/out/HelloWorldContract.ir/{HelloWorldContract.approval.0.approval.ssa.ir => HelloWorldContract.approval.0.ssa.ir} (100%)
 rename examples/hello_world/out/HelloWorldContract.ir/{HelloWorldContract.approval.1.approval.destructured.ir => HelloWorldContract.approval.1.destructured.ir} (100%)
 rename examples/hello_world/out/HelloWorldContract.ir/{HelloWorldContract.clear.0.clear.ssa.ir => HelloWorldContract.clear.0.ssa.ir} (100%)
 rename examples/hello_world/out/HelloWorldContract.ir/{HelloWorldContract.clear.1.clear.destructured.ir => HelloWorldContract.clear.1.destructured.ir} (100%)
 rename examples/hello_world/out_O2/HelloWorldContract.ir/{HelloWorldContract.approval.0.approval.destructured.ir => HelloWorldContract.approval.0.destructured.ir} (100%)
 rename examples/hello_world/out_O2/HelloWorldContract.ir/{HelloWorldContract.clear.0.clear.destructured.ir => HelloWorldContract.clear.0.destructured.ir} (100%)
 rename examples/hello_world/out_unoptimized/HelloWorldContract.ir/{HelloWorldContract.approval.0.approval.destructured.ir => HelloWorldContract.approval.0.destructured.ir} (100%)
 rename examples/hello_world/out_unoptimized/HelloWorldContract.ir/{HelloWorldContract.clear.0.clear.destructured.ir => HelloWorldContract.clear.0.destructured.ir} (100%)
 rename examples/hello_world_arc4/out/HelloWorldContract.ir/{HelloWorldContract.approval.0.approval.ssa.ir => HelloWorldContract.approval.0.ssa.ir} (100%)
 rename examples/hello_world_arc4/out/HelloWorldContract.ir/{HelloWorldContract.approval.1.approval.ssa.opt.ir => HelloWorldContract.approval.1.ssa.opt.ir} (100%)
 rename examples/hello_world_arc4/out/HelloWorldContract.ir/{HelloWorldContract.approval.2.approval.ssa.opt.ir => HelloWorldContract.approval.2.ssa.opt.ir} (100%)
 rename examples/hello_world_arc4/out/HelloWorldContract.ir/{HelloWorldContract.approval.3.approval.destructured.ir => HelloWorldContract.approval.3.destructured.ir} (100%)
 rename examples/hello_world_arc4/out/HelloWorldContract.ir/{HelloWorldContract.clear.0.clear.ssa.ir => HelloWorldContract.clear.0.ssa.ir} (100%)
 rename examples/hello_world_arc4/out/HelloWorldContract.ir/{HelloWorldContract.clear.1.clear.destructured.ir => HelloWorldContract.clear.1.destructured.ir} (100%)
 rename examples/hello_world_arc4/out_O2/HelloWorldContract.ir/{HelloWorldContract.approval.0.approval.destructured.ir => HelloWorldContract.approval.0.destructured.ir} (100%)
 rename examples/hello_world_arc4/out_O2/HelloWorldContract.ir/{HelloWorldContract.clear.0.clear.destructured.ir => HelloWorldContract.clear.0.destructured.ir} (100%)
 rename examples/hello_world_arc4/out_unoptimized/HelloWorldContract.ir/{HelloWorldContract.approval.0.approval.destructured.ir => HelloWorldContract.approval.0.destructured.ir} (100%)
 rename examples/hello_world_arc4/out_unoptimized/HelloWorldContract.ir/{HelloWorldContract.clear.0.clear.destructured.ir => HelloWorldContract.clear.0.destructured.ir} (100%)
 rename examples/local_state/out/LocalStateContract.ir/{LocalStateContract.approval.0.approval.ssa.ir => LocalStateContract.approval.0.ssa.ir} (100%)
 rename examples/local_state/out/LocalStateContract.ir/{LocalStateContract.approval.1.approval.ssa.opt.ir => LocalStateContract.approval.1.ssa.opt.ir} (100%)
 rename examples/local_state/out/LocalStateContract.ir/{LocalStateContract.approval.2.approval.ssa.opt.ir => LocalStateContract.approval.2.ssa.opt.ir} (100%)
 rename examples/local_state/out/LocalStateContract.ir/{LocalStateContract.approval.3.approval.destructured.ir => LocalStateContract.approval.3.destructured.ir} (100%)
 rename examples/local_state/out/LocalStateContract.ir/{LocalStateContract.clear.0.clear.ssa.ir => LocalStateContract.clear.0.ssa.ir} (100%)
 rename examples/local_state/out/LocalStateContract.ir/{LocalStateContract.clear.1.clear.destructured.ir => LocalStateContract.clear.1.destructured.ir} (100%)
 rename examples/local_state/out/LocalStateWithOffsets.ir/{LocalStateWithOffsets.approval.0.approval.ssa.ir => LocalStateWithOffsets.approval.0.ssa.ir} (100%)
 rename examples/local_state/out/LocalStateWithOffsets.ir/{LocalStateWithOffsets.approval.1.approval.ssa.opt.ir => LocalStateWithOffsets.approval.1.ssa.opt.ir} (100%)
 rename examples/local_state/out/LocalStateWithOffsets.ir/{LocalStateWithOffsets.approval.2.approval.ssa.opt.ir => LocalStateWithOffsets.approval.2.ssa.opt.ir} (100%)
 rename examples/local_state/out/LocalStateWithOffsets.ir/{LocalStateWithOffsets.approval.3.approval.destructured.ir => LocalStateWithOffsets.approval.3.destructured.ir} (100%)
 rename examples/local_state/out/LocalStateWithOffsets.ir/{LocalStateWithOffsets.clear.0.clear.ssa.ir => LocalStateWithOffsets.clear.0.ssa.ir} (100%)
 rename examples/local_state/out/LocalStateWithOffsets.ir/{LocalStateWithOffsets.clear.1.clear.destructured.ir => LocalStateWithOffsets.clear.1.destructured.ir} (100%)
 rename examples/local_state/out_O2/LocalStateContract.ir/{LocalStateContract.approval.0.approval.destructured.ir => LocalStateContract.approval.0.destructured.ir} (100%)
 rename examples/local_state/out_O2/LocalStateContract.ir/{LocalStateContract.clear.0.clear.destructured.ir => LocalStateContract.clear.0.destructured.ir} (100%)
 rename examples/local_state/out_O2/LocalStateWithOffsets.ir/{LocalStateWithOffsets.approval.0.approval.destructured.ir => LocalStateWithOffsets.approval.0.destructured.ir} (100%)
 rename examples/local_state/out_O2/LocalStateWithOffsets.ir/{LocalStateWithOffsets.clear.0.clear.destructured.ir => LocalStateWithOffsets.clear.0.destructured.ir} (100%)
 rename examples/local_state/out_unoptimized/LocalStateContract.ir/{LocalStateContract.approval.0.approval.destructured.ir => LocalStateContract.approval.0.destructured.ir} (100%)
 rename examples/local_state/out_unoptimized/LocalStateContract.ir/{LocalStateContract.clear.0.clear.destructured.ir => LocalStateContract.clear.0.destructured.ir} (100%)
 rename examples/local_state/out_unoptimized/LocalStateWithOffsets.ir/{LocalStateWithOffsets.approval.0.approval.destructured.ir => LocalStateWithOffsets.approval.0.destructured.ir} (100%)
 rename examples/local_state/out_unoptimized/LocalStateWithOffsets.ir/{LocalStateWithOffsets.clear.0.clear.destructured.ir => LocalStateWithOffsets.clear.0.destructured.ir} (100%)
 rename examples/merkle/out/MerkleTree.ir/{MerkleTree.approval.0.approval.ssa.ir => MerkleTree.approval.0.ssa.ir} (100%)
 rename examples/merkle/out/MerkleTree.ir/{MerkleTree.approval.1.approval.ssa.opt.ir => MerkleTree.approval.1.ssa.opt.ir} (100%)
 rename examples/merkle/out/MerkleTree.ir/{MerkleTree.approval.2.approval.ssa.opt.ir => MerkleTree.approval.2.ssa.opt.ir} (100%)
 rename examples/merkle/out/MerkleTree.ir/{MerkleTree.approval.3.approval.destructured.ir => MerkleTree.approval.3.destructured.ir} (100%)
 rename examples/merkle/out/MerkleTree.ir/{MerkleTree.clear.0.clear.ssa.ir => MerkleTree.clear.0.ssa.ir} (100%)
 rename examples/merkle/out/MerkleTree.ir/{MerkleTree.clear.1.clear.destructured.ir => MerkleTree.clear.1.destructured.ir} (100%)
 rename examples/merkle/out_O2/MerkleTree.ir/{MerkleTree.approval.0.approval.destructured.ir => MerkleTree.approval.0.destructured.ir} (100%)
 rename examples/merkle/out_O2/MerkleTree.ir/{MerkleTree.clear.0.clear.destructured.ir => MerkleTree.clear.0.destructured.ir} (100%)
 rename examples/merkle/out_unoptimized/MerkleTree.ir/{MerkleTree.approval.0.approval.destructured.ir => MerkleTree.approval.0.destructured.ir} (100%)
 rename examples/merkle/out_unoptimized/MerkleTree.ir/{MerkleTree.clear.0.clear.destructured.ir => MerkleTree.clear.0.destructured.ir} (100%)
 rename examples/struct_in_box/out/ExampleContract.ir/{ExampleContract.approval.0.approval.ssa.ir => ExampleContract.approval.0.ssa.ir} (100%)
 rename examples/struct_in_box/out/ExampleContract.ir/{ExampleContract.approval.1.approval.ssa.opt.ir => ExampleContract.approval.1.ssa.opt.ir} (100%)
 rename examples/struct_in_box/out/ExampleContract.ir/{ExampleContract.approval.2.approval.ssa.opt.ir => ExampleContract.approval.2.ssa.opt.ir} (100%)
 rename examples/struct_in_box/out/ExampleContract.ir/{ExampleContract.approval.3.approval.ssa.opt.ir => ExampleContract.approval.3.ssa.opt.ir} (100%)
 rename examples/struct_in_box/out/ExampleContract.ir/{ExampleContract.approval.4.approval.destructured.ir => ExampleContract.approval.4.destructured.ir} (100%)
 rename examples/struct_in_box/out/ExampleContract.ir/{ExampleContract.clear.0.clear.ssa.ir => ExampleContract.clear.0.ssa.ir} (100%)
 rename examples/struct_in_box/out/ExampleContract.ir/{ExampleContract.clear.1.clear.destructured.ir => ExampleContract.clear.1.destructured.ir} (100%)
 rename examples/struct_in_box/out_O2/ExampleContract.ir/{ExampleContract.approval.0.approval.destructured.ir => ExampleContract.approval.0.destructured.ir} (100%)
 rename examples/struct_in_box/out_O2/ExampleContract.ir/{ExampleContract.clear.0.clear.destructured.ir => ExampleContract.clear.0.destructured.ir} (100%)
 rename examples/struct_in_box/out_unoptimized/ExampleContract.ir/{ExampleContract.approval.0.approval.destructured.ir => ExampleContract.approval.0.destructured.ir} (100%)
 rename examples/struct_in_box/out_unoptimized/ExampleContract.ir/{ExampleContract.clear.0.clear.destructured.ir => ExampleContract.clear.0.destructured.ir} (100%)
 rename examples/tictactoe/out/TicTacToeContract.ir/{TicTacToeContract.approval.0.approval.ssa.ir => TicTacToeContract.approval.0.ssa.ir} (100%)
 rename examples/tictactoe/out/TicTacToeContract.ir/{TicTacToeContract.approval.1.approval.ssa.opt.ir => TicTacToeContract.approval.1.ssa.opt.ir} (100%)
 rename examples/tictactoe/out/TicTacToeContract.ir/{TicTacToeContract.approval.2.approval.ssa.opt.ir => TicTacToeContract.approval.2.ssa.opt.ir} (100%)
 rename examples/tictactoe/out/TicTacToeContract.ir/{TicTacToeContract.approval.3.approval.destructured.ir => TicTacToeContract.approval.3.destructured.ir} (100%)
 rename examples/tictactoe/out/TicTacToeContract.ir/{TicTacToeContract.clear.0.clear.ssa.ir => TicTacToeContract.clear.0.ssa.ir} (100%)
 rename examples/tictactoe/out/TicTacToeContract.ir/{TicTacToeContract.clear.1.clear.destructured.ir => TicTacToeContract.clear.1.destructured.ir} (100%)
 rename examples/tictactoe/out_O2/TicTacToeContract.ir/{TicTacToeContract.approval.0.approval.destructured.ir => TicTacToeContract.approval.0.destructured.ir} (100%)
 rename examples/tictactoe/out_O2/TicTacToeContract.ir/{TicTacToeContract.clear.0.clear.destructured.ir => TicTacToeContract.clear.0.destructured.ir} (100%)
 rename examples/tictactoe/out_unoptimized/TicTacToeContract.ir/{TicTacToeContract.approval.0.approval.destructured.ir => TicTacToeContract.approval.0.destructured.ir} (100%)
 rename examples/tictactoe/out_unoptimized/TicTacToeContract.ir/{TicTacToeContract.clear.0.clear.destructured.ir => TicTacToeContract.clear.0.destructured.ir} (100%)
 rename examples/voting/out/VotingRoundApp.ir/{VotingRoundApp.approval.0.approval.ssa.ir => VotingRoundApp.approval.0.ssa.ir} (100%)
 rename examples/voting/out/VotingRoundApp.ir/{VotingRoundApp.approval.1.approval.ssa.opt.ir => VotingRoundApp.approval.1.ssa.opt.ir} (100%)
 rename examples/voting/out/VotingRoundApp.ir/{VotingRoundApp.approval.2.approval.ssa.opt.ir => VotingRoundApp.approval.2.ssa.opt.ir} (100%)
 rename examples/voting/out/VotingRoundApp.ir/{VotingRoundApp.approval.3.approval.ssa.opt.ir => VotingRoundApp.approval.3.ssa.opt.ir} (100%)
 rename examples/voting/out/VotingRoundApp.ir/{VotingRoundApp.approval.4.approval.destructured.ir => VotingRoundApp.approval.4.destructured.ir} (100%)
 rename examples/voting/out/VotingRoundApp.ir/{VotingRoundApp.clear.0.clear.ssa.ir => VotingRoundApp.clear.0.ssa.ir} (100%)
 rename examples/voting/out/VotingRoundApp.ir/{VotingRoundApp.clear.1.clear.destructured.ir => VotingRoundApp.clear.1.destructured.ir} (100%)
 rename examples/voting/out_O2/VotingRoundApp.ir/{VotingRoundApp.approval.0.approval.destructured.ir => VotingRoundApp.approval.0.destructured.ir} (100%)
 rename examples/voting/out_O2/VotingRoundApp.ir/{VotingRoundApp.clear.0.clear.destructured.ir => VotingRoundApp.clear.0.destructured.ir} (100%)
 rename examples/voting/out_unoptimized/VotingRoundApp.ir/{VotingRoundApp.approval.0.approval.destructured.ir => VotingRoundApp.approval.0.destructured.ir} (100%)
 rename examples/voting/out_unoptimized/VotingRoundApp.ir/{VotingRoundApp.clear.0.clear.destructured.ir => VotingRoundApp.clear.0.destructured.ir} (100%)
 rename test_cases/abi_routing/out/CustomApproval.ir/{CustomApproval.approval.0.approval.ssa.ir => CustomApproval.approval.0.ssa.ir} (100%)
 rename test_cases/abi_routing/out/CustomApproval.ir/{CustomApproval.approval.1.approval.ssa.opt.ir => CustomApproval.approval.1.ssa.opt.ir} (100%)
 rename test_cases/abi_routing/out/CustomApproval.ir/{CustomApproval.approval.2.approval.ssa.opt.ir => CustomApproval.approval.2.ssa.opt.ir} (100%)
 rename test_cases/abi_routing/out/CustomApproval.ir/{CustomApproval.approval.3.approval.ssa.opt.ir => CustomApproval.approval.3.ssa.opt.ir} (100%)
 rename test_cases/abi_routing/out/CustomApproval.ir/{CustomApproval.approval.4.approval.destructured.ir => CustomApproval.approval.4.destructured.ir} (100%)
 rename test_cases/abi_routing/out/CustomApproval.ir/{CustomApproval.clear.0.clear.ssa.ir => CustomApproval.clear.0.ssa.ir} (100%)
 rename test_cases/abi_routing/out/CustomApproval.ir/{CustomApproval.clear.1.clear.destructured.ir => CustomApproval.clear.1.destructured.ir} (100%)
 rename test_cases/abi_routing/out/MinimumARC4.ir/{MinimumARC4.approval.0.approval.ssa.ir => MinimumARC4.approval.0.ssa.ir} (100%)
 rename test_cases/abi_routing/out/MinimumARC4.ir/{MinimumARC4.approval.1.approval.ssa.opt.ir => MinimumARC4.approval.1.ssa.opt.ir} (100%)
 rename test_cases/abi_routing/out/MinimumARC4.ir/{MinimumARC4.approval.2.approval.ssa.opt.ir => MinimumARC4.approval.2.ssa.opt.ir} (100%)
 rename test_cases/abi_routing/out/MinimumARC4.ir/{MinimumARC4.approval.3.approval.destructured.ir => MinimumARC4.approval.3.destructured.ir} (100%)
 rename test_cases/abi_routing/out/MinimumARC4.ir/{MinimumARC4.clear.0.clear.ssa.ir => MinimumARC4.clear.0.ssa.ir} (100%)
 rename test_cases/abi_routing/out/MinimumARC4.ir/{MinimumARC4.clear.1.clear.destructured.ir => MinimumARC4.clear.1.destructured.ir} (100%)
 rename test_cases/abi_routing/out/Reference.ir/{Reference.approval.0.approval.ssa.ir => Reference.approval.0.ssa.ir} (100%)
 rename test_cases/abi_routing/out/Reference.ir/{Reference.approval.1.approval.ssa.opt.ir => Reference.approval.1.ssa.opt.ir} (100%)
 rename test_cases/abi_routing/out/Reference.ir/{Reference.approval.2.approval.ssa.opt.ir => Reference.approval.2.ssa.opt.ir} (100%)
 rename test_cases/abi_routing/out/Reference.ir/{Reference.approval.3.approval.destructured.ir => Reference.approval.3.destructured.ir} (100%)
 rename test_cases/abi_routing/out/Reference.ir/{Reference.clear.0.clear.ssa.ir => Reference.clear.0.ssa.ir} (100%)
 rename test_cases/abi_routing/out/Reference.ir/{Reference.clear.1.clear.destructured.ir => Reference.clear.1.destructured.ir} (100%)
 rename test_cases/abi_routing/out_O2/CustomApproval.ir/{CustomApproval.approval.0.approval.destructured.ir => CustomApproval.approval.0.destructured.ir} (100%)
 rename test_cases/abi_routing/out_O2/CustomApproval.ir/{CustomApproval.clear.0.clear.destructured.ir => CustomApproval.clear.0.destructured.ir} (100%)
 rename test_cases/abi_routing/out_O2/MinimumARC4.ir/{MinimumARC4.approval.0.approval.destructured.ir => MinimumARC4.approval.0.destructured.ir} (100%)
 rename test_cases/abi_routing/out_O2/MinimumARC4.ir/{MinimumARC4.clear.0.clear.destructured.ir => MinimumARC4.clear.0.destructured.ir} (100%)
 rename test_cases/abi_routing/out_O2/Reference.ir/{Reference.approval.0.approval.destructured.ir => Reference.approval.0.destructured.ir} (100%)
 rename test_cases/abi_routing/out_O2/Reference.ir/{Reference.clear.0.clear.destructured.ir => Reference.clear.0.destructured.ir} (100%)
 rename test_cases/abi_routing/out_unoptimized/CustomApproval.ir/{CustomApproval.approval.0.approval.destructured.ir => CustomApproval.approval.0.destructured.ir} (100%)
 rename test_cases/abi_routing/out_unoptimized/CustomApproval.ir/{CustomApproval.clear.0.clear.destructured.ir => CustomApproval.clear.0.destructured.ir} (100%)
 rename test_cases/abi_routing/out_unoptimized/MinimumARC4.ir/{MinimumARC4.approval.0.approval.destructured.ir => MinimumARC4.approval.0.destructured.ir} (100%)
 rename test_cases/abi_routing/out_unoptimized/MinimumARC4.ir/{MinimumARC4.clear.0.clear.destructured.ir => MinimumARC4.clear.0.destructured.ir} (100%)
 rename test_cases/abi_routing/out_unoptimized/Reference.ir/{Reference.approval.0.approval.destructured.ir => Reference.approval.0.destructured.ir} (100%)
 rename test_cases/abi_routing/out_unoptimized/Reference.ir/{Reference.clear.0.clear.destructured.ir => Reference.clear.0.destructured.ir} (100%)
 rename test_cases/application/out/Reference.ir/{Reference.approval.0.approval.ssa.ir => Reference.approval.0.ssa.ir} (100%)
 rename test_cases/application/out/Reference.ir/{Reference.approval.1.approval.ssa.opt.ir => Reference.approval.1.ssa.opt.ir} (100%)
 rename test_cases/application/out/Reference.ir/{Reference.approval.2.approval.ssa.opt.ir => Reference.approval.2.ssa.opt.ir} (100%)
 rename test_cases/application/out/Reference.ir/{Reference.approval.3.approval.destructured.ir => Reference.approval.3.destructured.ir} (100%)
 rename test_cases/application/out/Reference.ir/{Reference.clear.0.clear.ssa.ir => Reference.clear.0.ssa.ir} (100%)
 rename test_cases/application/out/Reference.ir/{Reference.clear.1.clear.destructured.ir => Reference.clear.1.destructured.ir} (100%)
 rename test_cases/application/out_O2/Reference.ir/{Reference.approval.0.approval.destructured.ir => Reference.approval.0.destructured.ir} (100%)
 rename test_cases/application/out_O2/Reference.ir/{Reference.clear.0.clear.destructured.ir => Reference.clear.0.destructured.ir} (100%)
 rename test_cases/application/out_unoptimized/Reference.ir/{Reference.approval.0.approval.destructured.ir => Reference.approval.0.destructured.ir} (100%)
 rename test_cases/application/out_unoptimized/Reference.ir/{Reference.clear.0.clear.destructured.ir => Reference.clear.0.destructured.ir} (100%)
 rename test_cases/arc4_dynamic_arrays/out/DynamicArrayContract.ir/{DynamicArrayContract.approval.0.approval.ssa.ir => DynamicArrayContract.approval.0.ssa.ir} (100%)
 rename test_cases/arc4_dynamic_arrays/out/DynamicArrayContract.ir/{DynamicArrayContract.approval.1.approval.ssa.opt.ir => DynamicArrayContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/arc4_dynamic_arrays/out/DynamicArrayContract.ir/{DynamicArrayContract.approval.2.approval.ssa.opt.ir => DynamicArrayContract.approval.2.ssa.opt.ir} (100%)
 rename test_cases/arc4_dynamic_arrays/out/DynamicArrayContract.ir/{DynamicArrayContract.approval.3.approval.ssa.opt.ir => DynamicArrayContract.approval.3.ssa.opt.ir} (100%)
 rename test_cases/arc4_dynamic_arrays/out/DynamicArrayContract.ir/{DynamicArrayContract.approval.4.approval.destructured.ir => DynamicArrayContract.approval.4.destructured.ir} (100%)
 rename test_cases/arc4_dynamic_arrays/out/DynamicArrayContract.ir/{DynamicArrayContract.clear.0.clear.ssa.ir => DynamicArrayContract.clear.0.ssa.ir} (100%)
 rename test_cases/arc4_dynamic_arrays/out/DynamicArrayContract.ir/{DynamicArrayContract.clear.1.clear.destructured.ir => DynamicArrayContract.clear.1.destructured.ir} (100%)
 rename test_cases/arc4_dynamic_arrays/out_O2/DynamicArrayContract.ir/{DynamicArrayContract.approval.0.approval.destructured.ir => DynamicArrayContract.approval.0.destructured.ir} (100%)
 rename test_cases/arc4_dynamic_arrays/out_O2/DynamicArrayContract.ir/{DynamicArrayContract.clear.0.clear.destructured.ir => DynamicArrayContract.clear.0.destructured.ir} (100%)
 rename test_cases/arc4_dynamic_arrays/out_unoptimized/DynamicArrayContract.ir/{DynamicArrayContract.approval.0.approval.destructured.ir => DynamicArrayContract.approval.0.destructured.ir} (100%)
 rename test_cases/arc4_dynamic_arrays/out_unoptimized/DynamicArrayContract.ir/{DynamicArrayContract.clear.0.clear.destructured.ir => DynamicArrayContract.clear.0.destructured.ir} (100%)
 rename test_cases/arc4_numeric_comparisons/out/UIntNOrdering.ir/{UIntNOrdering.approval.0.approval.ssa.ir => UIntNOrdering.approval.0.ssa.ir} (100%)
 rename test_cases/arc4_numeric_comparisons/out/UIntNOrdering.ir/{UIntNOrdering.approval.1.approval.ssa.opt.ir => UIntNOrdering.approval.1.ssa.opt.ir} (100%)
 rename test_cases/arc4_numeric_comparisons/out/UIntNOrdering.ir/{UIntNOrdering.approval.2.approval.destructured.ir => UIntNOrdering.approval.2.destructured.ir} (100%)
 rename test_cases/arc4_numeric_comparisons/out/UIntNOrdering.ir/{UIntNOrdering.clear.0.clear.ssa.ir => UIntNOrdering.clear.0.ssa.ir} (100%)
 rename test_cases/arc4_numeric_comparisons/out/UIntNOrdering.ir/{UIntNOrdering.clear.1.clear.destructured.ir => UIntNOrdering.clear.1.destructured.ir} (100%)
 rename test_cases/arc4_numeric_comparisons/out_O2/UIntNOrdering.ir/{UIntNOrdering.approval.0.approval.destructured.ir => UIntNOrdering.approval.0.destructured.ir} (100%)
 rename test_cases/arc4_numeric_comparisons/out_O2/UIntNOrdering.ir/{UIntNOrdering.clear.0.clear.destructured.ir => UIntNOrdering.clear.0.destructured.ir} (100%)
 rename test_cases/arc4_numeric_comparisons/out_unoptimized/UIntNOrdering.ir/{UIntNOrdering.approval.0.approval.destructured.ir => UIntNOrdering.approval.0.destructured.ir} (100%)
 rename test_cases/arc4_numeric_comparisons/out_unoptimized/UIntNOrdering.ir/{UIntNOrdering.clear.0.clear.destructured.ir => UIntNOrdering.clear.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out/Arc4AddressContract.ir/{Arc4AddressContract.approval.0.approval.ssa.ir => Arc4AddressContract.approval.0.ssa.ir} (100%)
 rename test_cases/arc4_types/out/Arc4AddressContract.ir/{Arc4AddressContract.approval.1.approval.ssa.opt.ir => Arc4AddressContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/arc4_types/out/Arc4AddressContract.ir/{Arc4AddressContract.approval.2.approval.destructured.ir => Arc4AddressContract.approval.2.destructured.ir} (100%)
 rename test_cases/arc4_types/out/Arc4AddressContract.ir/{Arc4AddressContract.clear.0.clear.ssa.ir => Arc4AddressContract.clear.0.ssa.ir} (100%)
 rename test_cases/arc4_types/out/Arc4AddressContract.ir/{Arc4AddressContract.clear.1.clear.destructured.ir => Arc4AddressContract.clear.1.destructured.ir} (100%)
 rename test_cases/arc4_types/out/Arc4ArraysContract.ir/{Arc4ArraysContract.approval.0.approval.ssa.ir => Arc4ArraysContract.approval.0.ssa.ir} (100%)
 rename test_cases/arc4_types/out/Arc4ArraysContract.ir/{Arc4ArraysContract.approval.1.approval.ssa.opt.ir => Arc4ArraysContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/arc4_types/out/Arc4ArraysContract.ir/{Arc4ArraysContract.approval.2.approval.ssa.opt.ir => Arc4ArraysContract.approval.2.ssa.opt.ir} (100%)
 rename test_cases/arc4_types/out/Arc4ArraysContract.ir/{Arc4ArraysContract.approval.3.approval.destructured.ir => Arc4ArraysContract.approval.3.destructured.ir} (100%)
 rename test_cases/arc4_types/out/Arc4ArraysContract.ir/{Arc4ArraysContract.clear.0.clear.ssa.ir => Arc4ArraysContract.clear.0.ssa.ir} (100%)
 rename test_cases/arc4_types/out/Arc4ArraysContract.ir/{Arc4ArraysContract.clear.1.clear.destructured.ir => Arc4ArraysContract.clear.1.destructured.ir} (100%)
 rename test_cases/arc4_types/out/Arc4BoolEvalContract.ir/{Arc4BoolEvalContract.approval.0.approval.ssa.ir => Arc4BoolEvalContract.approval.0.ssa.ir} (100%)
 rename test_cases/arc4_types/out/Arc4BoolEvalContract.ir/{Arc4BoolEvalContract.approval.1.approval.ssa.opt.ir => Arc4BoolEvalContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/arc4_types/out/Arc4BoolEvalContract.ir/{Arc4BoolEvalContract.approval.2.approval.destructured.ir => Arc4BoolEvalContract.approval.2.destructured.ir} (100%)
 rename test_cases/arc4_types/out/Arc4BoolEvalContract.ir/{Arc4BoolEvalContract.clear.0.clear.ssa.ir => Arc4BoolEvalContract.clear.0.ssa.ir} (100%)
 rename test_cases/arc4_types/out/Arc4BoolEvalContract.ir/{Arc4BoolEvalContract.clear.1.clear.destructured.ir => Arc4BoolEvalContract.clear.1.destructured.ir} (100%)
 rename test_cases/arc4_types/out/Arc4BoolTypeContract.ir/{Arc4BoolTypeContract.approval.0.approval.ssa.ir => Arc4BoolTypeContract.approval.0.ssa.ir} (100%)
 rename test_cases/arc4_types/out/Arc4BoolTypeContract.ir/{Arc4BoolTypeContract.approval.1.approval.ssa.opt.ir => Arc4BoolTypeContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/arc4_types/out/Arc4BoolTypeContract.ir/{Arc4BoolTypeContract.approval.2.approval.destructured.ir => Arc4BoolTypeContract.approval.2.destructured.ir} (100%)
 rename test_cases/arc4_types/out/Arc4BoolTypeContract.ir/{Arc4BoolTypeContract.clear.0.clear.ssa.ir => Arc4BoolTypeContract.clear.0.ssa.ir} (100%)
 rename test_cases/arc4_types/out/Arc4BoolTypeContract.ir/{Arc4BoolTypeContract.clear.1.clear.destructured.ir => Arc4BoolTypeContract.clear.1.destructured.ir} (100%)
 rename test_cases/arc4_types/out/Arc4DynamicBytesContract.ir/{Arc4DynamicBytesContract.approval.0.approval.ssa.ir => Arc4DynamicBytesContract.approval.0.ssa.ir} (100%)
 rename test_cases/arc4_types/out/Arc4DynamicBytesContract.ir/{Arc4DynamicBytesContract.approval.1.approval.ssa.opt.ir => Arc4DynamicBytesContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/arc4_types/out/Arc4DynamicBytesContract.ir/{Arc4DynamicBytesContract.approval.2.approval.destructured.ir => Arc4DynamicBytesContract.approval.2.destructured.ir} (100%)
 rename test_cases/arc4_types/out/Arc4DynamicBytesContract.ir/{Arc4DynamicBytesContract.clear.0.clear.ssa.ir => Arc4DynamicBytesContract.clear.0.ssa.ir} (100%)
 rename test_cases/arc4_types/out/Arc4DynamicBytesContract.ir/{Arc4DynamicBytesContract.clear.1.clear.destructured.ir => Arc4DynamicBytesContract.clear.1.destructured.ir} (100%)
 rename test_cases/arc4_types/out/Arc4DynamicStringArrayContract.ir/{Arc4DynamicStringArrayContract.approval.0.approval.ssa.ir => Arc4DynamicStringArrayContract.approval.0.ssa.ir} (100%)
 rename test_cases/arc4_types/out/Arc4DynamicStringArrayContract.ir/{Arc4DynamicStringArrayContract.approval.1.approval.ssa.opt.ir => Arc4DynamicStringArrayContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/arc4_types/out/Arc4DynamicStringArrayContract.ir/{Arc4DynamicStringArrayContract.approval.2.approval.ssa.opt.ir => Arc4DynamicStringArrayContract.approval.2.ssa.opt.ir} (100%)
 rename test_cases/arc4_types/out/Arc4DynamicStringArrayContract.ir/{Arc4DynamicStringArrayContract.approval.3.approval.destructured.ir => Arc4DynamicStringArrayContract.approval.3.destructured.ir} (100%)
 rename test_cases/arc4_types/out/Arc4DynamicStringArrayContract.ir/{Arc4DynamicStringArrayContract.clear.0.clear.ssa.ir => Arc4DynamicStringArrayContract.clear.0.ssa.ir} (100%)
 rename test_cases/arc4_types/out/Arc4DynamicStringArrayContract.ir/{Arc4DynamicStringArrayContract.clear.1.clear.destructured.ir => Arc4DynamicStringArrayContract.clear.1.destructured.ir} (100%)
 rename test_cases/arc4_types/out/Arc4MutableParamsContract.ir/{Arc4MutableParamsContract.approval.0.approval.ssa.ir => Arc4MutableParamsContract.approval.0.ssa.ir} (100%)
 rename test_cases/arc4_types/out/Arc4MutableParamsContract.ir/{Arc4MutableParamsContract.approval.1.approval.ssa.opt.ir => Arc4MutableParamsContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/arc4_types/out/Arc4MutableParamsContract.ir/{Arc4MutableParamsContract.approval.2.approval.ssa.opt.ir => Arc4MutableParamsContract.approval.2.ssa.opt.ir} (100%)
 rename test_cases/arc4_types/out/Arc4MutableParamsContract.ir/{Arc4MutableParamsContract.approval.3.approval.ssa.opt.ir => Arc4MutableParamsContract.approval.3.ssa.opt.ir} (100%)
 rename test_cases/arc4_types/out/Arc4MutableParamsContract.ir/{Arc4MutableParamsContract.approval.4.approval.destructured.ir => Arc4MutableParamsContract.approval.4.destructured.ir} (100%)
 rename test_cases/arc4_types/out/Arc4MutableParamsContract.ir/{Arc4MutableParamsContract.clear.0.clear.ssa.ir => Arc4MutableParamsContract.clear.0.ssa.ir} (100%)
 rename test_cases/arc4_types/out/Arc4MutableParamsContract.ir/{Arc4MutableParamsContract.clear.1.clear.destructured.ir => Arc4MutableParamsContract.clear.1.destructured.ir} (100%)
 rename test_cases/arc4_types/out/Arc4MutationContract.ir/{Arc4MutationContract.approval.0.approval.ssa.ir => Arc4MutationContract.approval.0.ssa.ir} (100%)
 rename test_cases/arc4_types/out/Arc4MutationContract.ir/{Arc4MutationContract.approval.1.approval.ssa.opt.ir => Arc4MutationContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/arc4_types/out/Arc4MutationContract.ir/{Arc4MutationContract.approval.2.approval.ssa.opt.ir => Arc4MutationContract.approval.2.ssa.opt.ir} (100%)
 rename test_cases/arc4_types/out/Arc4MutationContract.ir/{Arc4MutationContract.approval.3.approval.destructured.ir => Arc4MutationContract.approval.3.destructured.ir} (100%)
 rename test_cases/arc4_types/out/Arc4MutationContract.ir/{Arc4MutationContract.clear.0.clear.ssa.ir => Arc4MutationContract.clear.0.ssa.ir} (100%)
 rename test_cases/arc4_types/out/Arc4MutationContract.ir/{Arc4MutationContract.clear.1.clear.destructured.ir => Arc4MutationContract.clear.1.destructured.ir} (100%)
 rename test_cases/arc4_types/out/Arc4NumericTypesContract.ir/{Arc4NumericTypesContract.approval.0.approval.ssa.ir => Arc4NumericTypesContract.approval.0.ssa.ir} (100%)
 rename test_cases/arc4_types/out/Arc4NumericTypesContract.ir/{Arc4NumericTypesContract.approval.1.approval.ssa.opt.ir => Arc4NumericTypesContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/arc4_types/out/Arc4NumericTypesContract.ir/{Arc4NumericTypesContract.approval.2.approval.ssa.opt.ir => Arc4NumericTypesContract.approval.2.ssa.opt.ir} (100%)
 rename test_cases/arc4_types/out/Arc4NumericTypesContract.ir/{Arc4NumericTypesContract.approval.3.approval.destructured.ir => Arc4NumericTypesContract.approval.3.destructured.ir} (100%)
 rename test_cases/arc4_types/out/Arc4NumericTypesContract.ir/{Arc4NumericTypesContract.clear.0.clear.ssa.ir => Arc4NumericTypesContract.clear.0.ssa.ir} (100%)
 rename test_cases/arc4_types/out/Arc4NumericTypesContract.ir/{Arc4NumericTypesContract.clear.1.clear.ssa.opt.ir => Arc4NumericTypesContract.clear.1.ssa.opt.ir} (100%)
 rename test_cases/arc4_types/out/Arc4NumericTypesContract.ir/{Arc4NumericTypesContract.clear.2.clear.destructured.ir => Arc4NumericTypesContract.clear.2.destructured.ir} (100%)
 rename test_cases/arc4_types/out/Arc4RefTypesContract.ir/{Arc4RefTypesContract.approval.0.approval.ssa.ir => Arc4RefTypesContract.approval.0.ssa.ir} (100%)
 rename test_cases/arc4_types/out/Arc4RefTypesContract.ir/{Arc4RefTypesContract.approval.1.approval.ssa.opt.ir => Arc4RefTypesContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/arc4_types/out/Arc4RefTypesContract.ir/{Arc4RefTypesContract.approval.2.approval.destructured.ir => Arc4RefTypesContract.approval.2.destructured.ir} (100%)
 rename test_cases/arc4_types/out/Arc4RefTypesContract.ir/{Arc4RefTypesContract.clear.0.clear.ssa.ir => Arc4RefTypesContract.clear.0.ssa.ir} (100%)
 rename test_cases/arc4_types/out/Arc4RefTypesContract.ir/{Arc4RefTypesContract.clear.1.clear.destructured.ir => Arc4RefTypesContract.clear.1.destructured.ir} (100%)
 rename test_cases/arc4_types/out/Arc4StringTypesContract.ir/{Arc4StringTypesContract.approval.0.approval.ssa.ir => Arc4StringTypesContract.approval.0.ssa.ir} (100%)
 rename test_cases/arc4_types/out/Arc4StringTypesContract.ir/{Arc4StringTypesContract.approval.1.approval.ssa.opt.ir => Arc4StringTypesContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/arc4_types/out/Arc4StringTypesContract.ir/{Arc4StringTypesContract.approval.2.approval.destructured.ir => Arc4StringTypesContract.approval.2.destructured.ir} (100%)
 rename test_cases/arc4_types/out/Arc4StringTypesContract.ir/{Arc4StringTypesContract.clear.0.clear.ssa.ir => Arc4StringTypesContract.clear.0.ssa.ir} (100%)
 rename test_cases/arc4_types/out/Arc4StringTypesContract.ir/{Arc4StringTypesContract.clear.1.clear.destructured.ir => Arc4StringTypesContract.clear.1.destructured.ir} (100%)
 rename test_cases/arc4_types/out/Arc4StructsFromAnotherModule.ir/{Arc4StructsFromAnotherModule.approval.0.approval.ssa.ir => Arc4StructsFromAnotherModule.approval.0.ssa.ir} (100%)
 rename test_cases/arc4_types/out/Arc4StructsFromAnotherModule.ir/{Arc4StructsFromAnotherModule.approval.1.approval.ssa.opt.ir => Arc4StructsFromAnotherModule.approval.1.ssa.opt.ir} (100%)
 rename test_cases/arc4_types/out/Arc4StructsFromAnotherModule.ir/{Arc4StructsFromAnotherModule.approval.2.approval.destructured.ir => Arc4StructsFromAnotherModule.approval.2.destructured.ir} (100%)
 rename test_cases/arc4_types/out/Arc4StructsFromAnotherModule.ir/{Arc4StructsFromAnotherModule.clear.0.clear.ssa.ir => Arc4StructsFromAnotherModule.clear.0.ssa.ir} (100%)
 rename test_cases/arc4_types/out/Arc4StructsFromAnotherModule.ir/{Arc4StructsFromAnotherModule.clear.1.clear.destructured.ir => Arc4StructsFromAnotherModule.clear.1.destructured.ir} (100%)
 rename test_cases/arc4_types/out/Arc4StructsTypeContract.ir/{Arc4StructsTypeContract.approval.0.approval.ssa.ir => Arc4StructsTypeContract.approval.0.ssa.ir} (100%)
 rename test_cases/arc4_types/out/Arc4StructsTypeContract.ir/{Arc4StructsTypeContract.approval.1.approval.ssa.opt.ir => Arc4StructsTypeContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/arc4_types/out/Arc4StructsTypeContract.ir/{Arc4StructsTypeContract.approval.2.approval.ssa.opt.ir => Arc4StructsTypeContract.approval.2.ssa.opt.ir} (100%)
 rename test_cases/arc4_types/out/Arc4StructsTypeContract.ir/{Arc4StructsTypeContract.approval.3.approval.destructured.ir => Arc4StructsTypeContract.approval.3.destructured.ir} (100%)
 rename test_cases/arc4_types/out/Arc4StructsTypeContract.ir/{Arc4StructsTypeContract.clear.0.clear.ssa.ir => Arc4StructsTypeContract.clear.0.ssa.ir} (100%)
 rename test_cases/arc4_types/out/Arc4StructsTypeContract.ir/{Arc4StructsTypeContract.clear.1.clear.destructured.ir => Arc4StructsTypeContract.clear.1.destructured.ir} (100%)
 rename test_cases/arc4_types/out/Arc4TuplesTypeContract.ir/{Arc4TuplesTypeContract.approval.0.approval.ssa.ir => Arc4TuplesTypeContract.approval.0.ssa.ir} (100%)
 rename test_cases/arc4_types/out/Arc4TuplesTypeContract.ir/{Arc4TuplesTypeContract.approval.1.approval.ssa.opt.ir => Arc4TuplesTypeContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/arc4_types/out/Arc4TuplesTypeContract.ir/{Arc4TuplesTypeContract.approval.2.approval.ssa.opt.ir => Arc4TuplesTypeContract.approval.2.ssa.opt.ir} (100%)
 rename test_cases/arc4_types/out/Arc4TuplesTypeContract.ir/{Arc4TuplesTypeContract.approval.3.approval.destructured.ir => Arc4TuplesTypeContract.approval.3.destructured.ir} (100%)
 rename test_cases/arc4_types/out/Arc4TuplesTypeContract.ir/{Arc4TuplesTypeContract.clear.0.clear.ssa.ir => Arc4TuplesTypeContract.clear.0.ssa.ir} (100%)
 rename test_cases/arc4_types/out/Arc4TuplesTypeContract.ir/{Arc4TuplesTypeContract.clear.1.clear.destructured.ir => Arc4TuplesTypeContract.clear.1.destructured.ir} (100%)
 rename test_cases/arc4_types/out/MutableParams2.ir/{MutableParams2.approval.0.approval.ssa.ir => MutableParams2.approval.0.ssa.ir} (100%)
 rename test_cases/arc4_types/out/MutableParams2.ir/{MutableParams2.approval.1.approval.ssa.opt.ir => MutableParams2.approval.1.ssa.opt.ir} (100%)
 rename test_cases/arc4_types/out/MutableParams2.ir/{MutableParams2.approval.2.approval.ssa.opt.ir => MutableParams2.approval.2.ssa.opt.ir} (100%)
 rename test_cases/arc4_types/out/MutableParams2.ir/{MutableParams2.approval.3.approval.destructured.ir => MutableParams2.approval.3.destructured.ir} (100%)
 rename test_cases/arc4_types/out/MutableParams2.ir/{MutableParams2.clear.0.clear.ssa.ir => MutableParams2.clear.0.ssa.ir} (100%)
 rename test_cases/arc4_types/out/MutableParams2.ir/{MutableParams2.clear.1.clear.destructured.ir => MutableParams2.clear.1.destructured.ir} (100%)
 rename test_cases/arc4_types/out_O2/Arc4AddressContract.ir/{Arc4AddressContract.approval.0.approval.destructured.ir => Arc4AddressContract.approval.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_O2/Arc4AddressContract.ir/{Arc4AddressContract.clear.0.clear.destructured.ir => Arc4AddressContract.clear.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_O2/Arc4ArraysContract.ir/{Arc4ArraysContract.approval.0.approval.destructured.ir => Arc4ArraysContract.approval.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_O2/Arc4ArraysContract.ir/{Arc4ArraysContract.clear.0.clear.destructured.ir => Arc4ArraysContract.clear.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_O2/Arc4BoolEvalContract.ir/{Arc4BoolEvalContract.approval.0.approval.destructured.ir => Arc4BoolEvalContract.approval.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_O2/Arc4BoolEvalContract.ir/{Arc4BoolEvalContract.clear.0.clear.destructured.ir => Arc4BoolEvalContract.clear.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_O2/Arc4BoolTypeContract.ir/{Arc4BoolTypeContract.approval.0.approval.destructured.ir => Arc4BoolTypeContract.approval.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_O2/Arc4BoolTypeContract.ir/{Arc4BoolTypeContract.clear.0.clear.destructured.ir => Arc4BoolTypeContract.clear.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_O2/Arc4DynamicBytesContract.ir/{Arc4DynamicBytesContract.approval.0.approval.destructured.ir => Arc4DynamicBytesContract.approval.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_O2/Arc4DynamicBytesContract.ir/{Arc4DynamicBytesContract.clear.0.clear.destructured.ir => Arc4DynamicBytesContract.clear.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_O2/Arc4DynamicStringArrayContract.ir/{Arc4DynamicStringArrayContract.approval.0.approval.destructured.ir => Arc4DynamicStringArrayContract.approval.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_O2/Arc4DynamicStringArrayContract.ir/{Arc4DynamicStringArrayContract.clear.0.clear.destructured.ir => Arc4DynamicStringArrayContract.clear.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_O2/Arc4MutableParamsContract.ir/{Arc4MutableParamsContract.approval.0.approval.destructured.ir => Arc4MutableParamsContract.approval.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_O2/Arc4MutableParamsContract.ir/{Arc4MutableParamsContract.clear.0.clear.destructured.ir => Arc4MutableParamsContract.clear.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_O2/Arc4MutationContract.ir/{Arc4MutationContract.approval.0.approval.destructured.ir => Arc4MutationContract.approval.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_O2/Arc4MutationContract.ir/{Arc4MutationContract.clear.0.clear.destructured.ir => Arc4MutationContract.clear.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_O2/Arc4NumericTypesContract.ir/{Arc4NumericTypesContract.approval.0.approval.destructured.ir => Arc4NumericTypesContract.approval.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_O2/Arc4NumericTypesContract.ir/{Arc4NumericTypesContract.clear.0.clear.destructured.ir => Arc4NumericTypesContract.clear.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_O2/Arc4RefTypesContract.ir/{Arc4RefTypesContract.approval.0.approval.destructured.ir => Arc4RefTypesContract.approval.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_O2/Arc4RefTypesContract.ir/{Arc4RefTypesContract.clear.0.clear.destructured.ir => Arc4RefTypesContract.clear.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_O2/Arc4StringTypesContract.ir/{Arc4StringTypesContract.approval.0.approval.destructured.ir => Arc4StringTypesContract.approval.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_O2/Arc4StringTypesContract.ir/{Arc4StringTypesContract.clear.0.clear.destructured.ir => Arc4StringTypesContract.clear.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_O2/Arc4StructsFromAnotherModule.ir/{Arc4StructsFromAnotherModule.approval.0.approval.destructured.ir => Arc4StructsFromAnotherModule.approval.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_O2/Arc4StructsFromAnotherModule.ir/{Arc4StructsFromAnotherModule.clear.0.clear.destructured.ir => Arc4StructsFromAnotherModule.clear.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_O2/Arc4StructsTypeContract.ir/{Arc4StructsTypeContract.approval.0.approval.destructured.ir => Arc4StructsTypeContract.approval.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_O2/Arc4StructsTypeContract.ir/{Arc4StructsTypeContract.clear.0.clear.destructured.ir => Arc4StructsTypeContract.clear.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_O2/Arc4TuplesTypeContract.ir/{Arc4TuplesTypeContract.approval.0.approval.destructured.ir => Arc4TuplesTypeContract.approval.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_O2/Arc4TuplesTypeContract.ir/{Arc4TuplesTypeContract.clear.0.clear.destructured.ir => Arc4TuplesTypeContract.clear.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_O2/MutableParams2.ir/{MutableParams2.approval.0.approval.destructured.ir => MutableParams2.approval.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_O2/MutableParams2.ir/{MutableParams2.clear.0.clear.destructured.ir => MutableParams2.clear.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_unoptimized/Arc4AddressContract.ir/{Arc4AddressContract.approval.0.approval.destructured.ir => Arc4AddressContract.approval.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_unoptimized/Arc4AddressContract.ir/{Arc4AddressContract.clear.0.clear.destructured.ir => Arc4AddressContract.clear.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_unoptimized/Arc4ArraysContract.ir/{Arc4ArraysContract.approval.0.approval.destructured.ir => Arc4ArraysContract.approval.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_unoptimized/Arc4ArraysContract.ir/{Arc4ArraysContract.clear.0.clear.destructured.ir => Arc4ArraysContract.clear.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_unoptimized/Arc4BoolEvalContract.ir/{Arc4BoolEvalContract.approval.0.approval.destructured.ir => Arc4BoolEvalContract.approval.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_unoptimized/Arc4BoolEvalContract.ir/{Arc4BoolEvalContract.clear.0.clear.destructured.ir => Arc4BoolEvalContract.clear.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_unoptimized/Arc4BoolTypeContract.ir/{Arc4BoolTypeContract.approval.0.approval.destructured.ir => Arc4BoolTypeContract.approval.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_unoptimized/Arc4BoolTypeContract.ir/{Arc4BoolTypeContract.clear.0.clear.destructured.ir => Arc4BoolTypeContract.clear.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_unoptimized/Arc4DynamicBytesContract.ir/{Arc4DynamicBytesContract.approval.0.approval.destructured.ir => Arc4DynamicBytesContract.approval.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_unoptimized/Arc4DynamicBytesContract.ir/{Arc4DynamicBytesContract.clear.0.clear.destructured.ir => Arc4DynamicBytesContract.clear.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_unoptimized/Arc4DynamicStringArrayContract.ir/{Arc4DynamicStringArrayContract.approval.0.approval.destructured.ir => Arc4DynamicStringArrayContract.approval.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_unoptimized/Arc4DynamicStringArrayContract.ir/{Arc4DynamicStringArrayContract.clear.0.clear.destructured.ir => Arc4DynamicStringArrayContract.clear.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_unoptimized/Arc4MutableParamsContract.ir/{Arc4MutableParamsContract.approval.0.approval.destructured.ir => Arc4MutableParamsContract.approval.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_unoptimized/Arc4MutableParamsContract.ir/{Arc4MutableParamsContract.clear.0.clear.destructured.ir => Arc4MutableParamsContract.clear.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_unoptimized/Arc4MutationContract.ir/{Arc4MutationContract.approval.0.approval.destructured.ir => Arc4MutationContract.approval.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_unoptimized/Arc4MutationContract.ir/{Arc4MutationContract.clear.0.clear.destructured.ir => Arc4MutationContract.clear.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_unoptimized/Arc4NumericTypesContract.ir/{Arc4NumericTypesContract.approval.0.approval.destructured.ir => Arc4NumericTypesContract.approval.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_unoptimized/Arc4NumericTypesContract.ir/{Arc4NumericTypesContract.clear.0.clear.destructured.ir => Arc4NumericTypesContract.clear.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_unoptimized/Arc4RefTypesContract.ir/{Arc4RefTypesContract.approval.0.approval.destructured.ir => Arc4RefTypesContract.approval.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_unoptimized/Arc4RefTypesContract.ir/{Arc4RefTypesContract.clear.0.clear.destructured.ir => Arc4RefTypesContract.clear.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_unoptimized/Arc4StringTypesContract.ir/{Arc4StringTypesContract.approval.0.approval.destructured.ir => Arc4StringTypesContract.approval.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_unoptimized/Arc4StringTypesContract.ir/{Arc4StringTypesContract.clear.0.clear.destructured.ir => Arc4StringTypesContract.clear.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_unoptimized/Arc4StructsFromAnotherModule.ir/{Arc4StructsFromAnotherModule.approval.0.approval.destructured.ir => Arc4StructsFromAnotherModule.approval.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_unoptimized/Arc4StructsFromAnotherModule.ir/{Arc4StructsFromAnotherModule.clear.0.clear.destructured.ir => Arc4StructsFromAnotherModule.clear.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_unoptimized/Arc4StructsTypeContract.ir/{Arc4StructsTypeContract.approval.0.approval.destructured.ir => Arc4StructsTypeContract.approval.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_unoptimized/Arc4StructsTypeContract.ir/{Arc4StructsTypeContract.clear.0.clear.destructured.ir => Arc4StructsTypeContract.clear.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_unoptimized/Arc4TuplesTypeContract.ir/{Arc4TuplesTypeContract.approval.0.approval.destructured.ir => Arc4TuplesTypeContract.approval.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_unoptimized/Arc4TuplesTypeContract.ir/{Arc4TuplesTypeContract.clear.0.clear.destructured.ir => Arc4TuplesTypeContract.clear.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_unoptimized/MutableParams2.ir/{MutableParams2.approval.0.approval.destructured.ir => MutableParams2.approval.0.destructured.ir} (100%)
 rename test_cases/arc4_types/out_unoptimized/MutableParams2.ir/{MutableParams2.clear.0.clear.destructured.ir => MutableParams2.clear.0.destructured.ir} (100%)
 rename test_cases/arc_56/out/Contract.ir/{Contract.approval.0.approval.ssa.ir => Contract.approval.0.ssa.ir} (100%)
 rename test_cases/arc_56/out/Contract.ir/{Contract.approval.1.approval.ssa.opt.ir => Contract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/arc_56/out/Contract.ir/{Contract.approval.2.approval.ssa.opt.ir => Contract.approval.2.ssa.opt.ir} (100%)
 rename test_cases/arc_56/out/Contract.ir/{Contract.approval.3.approval.destructured.ir => Contract.approval.3.destructured.ir} (100%)
 rename test_cases/arc_56/out/Contract.ir/{Contract.clear.0.clear.ssa.ir => Contract.clear.0.ssa.ir} (100%)
 rename test_cases/arc_56/out/Contract.ir/{Contract.clear.1.clear.destructured.ir => Contract.clear.1.destructured.ir} (100%)
 rename test_cases/arc_56/out_O2/Contract.ir/{Contract.approval.0.approval.destructured.ir => Contract.approval.0.destructured.ir} (100%)
 rename test_cases/arc_56/out_O2/Contract.ir/{Contract.clear.0.clear.destructured.ir => Contract.clear.0.destructured.ir} (100%)
 rename test_cases/arc_56/out_unoptimized/Contract.ir/{Contract.approval.0.approval.destructured.ir => Contract.approval.0.destructured.ir} (100%)
 rename test_cases/arc_56/out_unoptimized/Contract.ir/{Contract.clear.0.clear.destructured.ir => Contract.clear.0.destructured.ir} (100%)
 rename test_cases/asset/out/Reference.ir/{Reference.approval.0.approval.ssa.ir => Reference.approval.0.ssa.ir} (100%)
 rename test_cases/asset/out/Reference.ir/{Reference.approval.1.approval.ssa.opt.ir => Reference.approval.1.ssa.opt.ir} (100%)
 rename test_cases/asset/out/Reference.ir/{Reference.approval.2.approval.ssa.opt.ir => Reference.approval.2.ssa.opt.ir} (100%)
 rename test_cases/asset/out/Reference.ir/{Reference.approval.3.approval.destructured.ir => Reference.approval.3.destructured.ir} (100%)
 rename test_cases/asset/out/Reference.ir/{Reference.clear.0.clear.ssa.ir => Reference.clear.0.ssa.ir} (100%)
 rename test_cases/asset/out/Reference.ir/{Reference.clear.1.clear.destructured.ir => Reference.clear.1.destructured.ir} (100%)
 rename test_cases/asset/out_O2/Reference.ir/{Reference.approval.0.approval.destructured.ir => Reference.approval.0.destructured.ir} (100%)
 rename test_cases/asset/out_O2/Reference.ir/{Reference.clear.0.clear.destructured.ir => Reference.clear.0.destructured.ir} (100%)
 rename test_cases/asset/out_unoptimized/Reference.ir/{Reference.approval.0.approval.destructured.ir => Reference.approval.0.destructured.ir} (100%)
 rename test_cases/asset/out_unoptimized/Reference.ir/{Reference.clear.0.clear.destructured.ir => Reference.clear.0.destructured.ir} (100%)
 rename test_cases/augmented_assignment/out/Augmented.ir/{Augmented.approval.0.approval.ssa.ir => Augmented.approval.0.ssa.ir} (100%)
 rename test_cases/augmented_assignment/out/Augmented.ir/{Augmented.approval.1.approval.ssa.opt.ir => Augmented.approval.1.ssa.opt.ir} (100%)
 rename test_cases/augmented_assignment/out/Augmented.ir/{Augmented.approval.2.approval.destructured.ir => Augmented.approval.2.destructured.ir} (100%)
 rename test_cases/augmented_assignment/out/Augmented.ir/{Augmented.clear.0.clear.ssa.ir => Augmented.clear.0.ssa.ir} (100%)
 rename test_cases/augmented_assignment/out/Augmented.ir/{Augmented.clear.1.clear.destructured.ir => Augmented.clear.1.destructured.ir} (100%)
 rename test_cases/augmented_assignment/out_O2/Augmented.ir/{Augmented.approval.0.approval.destructured.ir => Augmented.approval.0.destructured.ir} (100%)
 rename test_cases/augmented_assignment/out_O2/Augmented.ir/{Augmented.clear.0.clear.destructured.ir => Augmented.clear.0.destructured.ir} (100%)
 rename test_cases/augmented_assignment/out_unoptimized/Augmented.ir/{Augmented.approval.0.approval.destructured.ir => Augmented.approval.0.destructured.ir} (100%)
 rename test_cases/augmented_assignment/out_unoptimized/Augmented.ir/{Augmented.clear.0.clear.destructured.ir => Augmented.clear.0.destructured.ir} (100%)
 rename test_cases/avm_11/out/Contract.ir/{Contract.approval.0.approval.ssa.ir => Contract.approval.0.ssa.ir} (100%)
 rename test_cases/avm_11/out/Contract.ir/{Contract.approval.1.approval.ssa.opt.ir => Contract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/avm_11/out/Contract.ir/{Contract.approval.2.approval.ssa.opt.ir => Contract.approval.2.ssa.opt.ir} (100%)
 rename test_cases/avm_11/out/Contract.ir/{Contract.approval.3.approval.destructured.ir => Contract.approval.3.destructured.ir} (100%)
 rename test_cases/avm_11/out/Contract.ir/{Contract.clear.0.clear.ssa.ir => Contract.clear.0.ssa.ir} (100%)
 rename test_cases/avm_11/out/Contract.ir/{Contract.clear.1.clear.destructured.ir => Contract.clear.1.destructured.ir} (100%)
 rename test_cases/avm_11/out_O2/Contract.ir/{Contract.approval.0.approval.destructured.ir => Contract.approval.0.destructured.ir} (100%)
 rename test_cases/avm_11/out_O2/Contract.ir/{Contract.clear.0.clear.destructured.ir => Contract.clear.0.destructured.ir} (100%)
 rename test_cases/avm_11/out_unoptimized/Contract.ir/{Contract.approval.0.approval.destructured.ir => Contract.approval.0.destructured.ir} (100%)
 rename test_cases/avm_11/out_unoptimized/Contract.ir/{Contract.clear.0.clear.destructured.ir => Contract.clear.0.destructured.ir} (100%)
 rename test_cases/avm_types_in_abi/out/TestContract.ir/{TestContract.approval.0.approval.ssa.ir => TestContract.approval.0.ssa.ir} (100%)
 rename test_cases/avm_types_in_abi/out/TestContract.ir/{TestContract.approval.1.approval.ssa.opt.ir => TestContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/avm_types_in_abi/out/TestContract.ir/{TestContract.approval.2.approval.ssa.opt.ir => TestContract.approval.2.ssa.opt.ir} (100%)
 rename test_cases/avm_types_in_abi/out/TestContract.ir/{TestContract.approval.3.approval.destructured.ir => TestContract.approval.3.destructured.ir} (100%)
 rename test_cases/avm_types_in_abi/out/TestContract.ir/{TestContract.clear.0.clear.ssa.ir => TestContract.clear.0.ssa.ir} (100%)
 rename test_cases/avm_types_in_abi/out/TestContract.ir/{TestContract.clear.1.clear.destructured.ir => TestContract.clear.1.destructured.ir} (100%)
 rename test_cases/avm_types_in_abi/out_O2/TestContract.ir/{TestContract.approval.0.approval.destructured.ir => TestContract.approval.0.destructured.ir} (100%)
 rename test_cases/avm_types_in_abi/out_O2/TestContract.ir/{TestContract.clear.0.clear.destructured.ir => TestContract.clear.0.destructured.ir} (100%)
 rename test_cases/avm_types_in_abi/out_unoptimized/TestContract.ir/{TestContract.approval.0.approval.destructured.ir => TestContract.approval.0.destructured.ir} (100%)
 rename test_cases/avm_types_in_abi/out_unoptimized/TestContract.ir/{TestContract.clear.0.clear.destructured.ir => TestContract.clear.0.destructured.ir} (100%)
 rename test_cases/biguint_binary_ops/out/BiguintBinaryOps.ir/{BiguintBinaryOps.approval.0.approval.ssa.ir => BiguintBinaryOps.approval.0.ssa.ir} (100%)
 rename test_cases/biguint_binary_ops/out/BiguintBinaryOps.ir/{BiguintBinaryOps.approval.1.approval.ssa.opt.ir => BiguintBinaryOps.approval.1.ssa.opt.ir} (100%)
 rename test_cases/biguint_binary_ops/out/BiguintBinaryOps.ir/{BiguintBinaryOps.approval.2.approval.ssa.opt.ir => BiguintBinaryOps.approval.2.ssa.opt.ir} (100%)
 rename test_cases/biguint_binary_ops/out/BiguintBinaryOps.ir/{BiguintBinaryOps.approval.3.approval.destructured.ir => BiguintBinaryOps.approval.3.destructured.ir} (100%)
 rename test_cases/biguint_binary_ops/out/BiguintBinaryOps.ir/{BiguintBinaryOps.clear.0.clear.ssa.ir => BiguintBinaryOps.clear.0.ssa.ir} (100%)
 rename test_cases/biguint_binary_ops/out/BiguintBinaryOps.ir/{BiguintBinaryOps.clear.1.clear.destructured.ir => BiguintBinaryOps.clear.1.destructured.ir} (100%)
 rename test_cases/biguint_binary_ops/out_O2/BiguintBinaryOps.ir/{BiguintBinaryOps.approval.0.approval.destructured.ir => BiguintBinaryOps.approval.0.destructured.ir} (100%)
 rename test_cases/biguint_binary_ops/out_O2/BiguintBinaryOps.ir/{BiguintBinaryOps.clear.0.clear.destructured.ir => BiguintBinaryOps.clear.0.destructured.ir} (100%)
 rename test_cases/biguint_binary_ops/out_unoptimized/BiguintBinaryOps.ir/{BiguintBinaryOps.approval.0.approval.destructured.ir => BiguintBinaryOps.approval.0.destructured.ir} (100%)
 rename test_cases/biguint_binary_ops/out_unoptimized/BiguintBinaryOps.ir/{BiguintBinaryOps.clear.0.clear.destructured.ir => BiguintBinaryOps.clear.0.destructured.ir} (100%)
 rename test_cases/boolean_binary_ops/out/BooleanBinaryOps.ir/{BooleanBinaryOps.approval.0.approval.ssa.ir => BooleanBinaryOps.approval.0.ssa.ir} (100%)
 rename test_cases/boolean_binary_ops/out/BooleanBinaryOps.ir/{BooleanBinaryOps.approval.1.approval.ssa.opt.ir => BooleanBinaryOps.approval.1.ssa.opt.ir} (100%)
 rename test_cases/boolean_binary_ops/out/BooleanBinaryOps.ir/{BooleanBinaryOps.approval.2.approval.ssa.opt.ir => BooleanBinaryOps.approval.2.ssa.opt.ir} (100%)
 rename test_cases/boolean_binary_ops/out/BooleanBinaryOps.ir/{BooleanBinaryOps.approval.3.approval.ssa.opt.ir => BooleanBinaryOps.approval.3.ssa.opt.ir} (100%)
 rename test_cases/boolean_binary_ops/out/BooleanBinaryOps.ir/{BooleanBinaryOps.approval.4.approval.destructured.ir => BooleanBinaryOps.approval.4.destructured.ir} (100%)
 rename test_cases/boolean_binary_ops/out/BooleanBinaryOps.ir/{BooleanBinaryOps.clear.0.clear.ssa.ir => BooleanBinaryOps.clear.0.ssa.ir} (100%)
 rename test_cases/boolean_binary_ops/out/BooleanBinaryOps.ir/{BooleanBinaryOps.clear.1.clear.ssa.opt.ir => BooleanBinaryOps.clear.1.ssa.opt.ir} (100%)
 rename test_cases/boolean_binary_ops/out/BooleanBinaryOps.ir/{BooleanBinaryOps.clear.2.clear.destructured.ir => BooleanBinaryOps.clear.2.destructured.ir} (100%)
 rename test_cases/boolean_binary_ops/out_O2/BooleanBinaryOps.ir/{BooleanBinaryOps.approval.0.approval.destructured.ir => BooleanBinaryOps.approval.0.destructured.ir} (100%)
 rename test_cases/boolean_binary_ops/out_O2/BooleanBinaryOps.ir/{BooleanBinaryOps.clear.0.clear.destructured.ir => BooleanBinaryOps.clear.0.destructured.ir} (100%)
 rename test_cases/boolean_binary_ops/out_unoptimized/BooleanBinaryOps.ir/{BooleanBinaryOps.approval.0.approval.destructured.ir => BooleanBinaryOps.approval.0.destructured.ir} (100%)
 rename test_cases/boolean_binary_ops/out_unoptimized/BooleanBinaryOps.ir/{BooleanBinaryOps.clear.0.clear.destructured.ir => BooleanBinaryOps.clear.0.destructured.ir} (100%)
 rename test_cases/bug_load_store_load_store/out/MyContract.ir/{MyContract.approval.0.approval.ssa.ir => MyContract.approval.0.ssa.ir} (100%)
 rename test_cases/bug_load_store_load_store/out/MyContract.ir/{MyContract.approval.1.approval.ssa.opt.ir => MyContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/bug_load_store_load_store/out/MyContract.ir/{MyContract.approval.2.approval.destructured.ir => MyContract.approval.2.destructured.ir} (100%)
 rename test_cases/bug_load_store_load_store/out/MyContract.ir/{MyContract.clear.0.clear.ssa.ir => MyContract.clear.0.ssa.ir} (100%)
 rename test_cases/bug_load_store_load_store/out/MyContract.ir/{MyContract.clear.1.clear.destructured.ir => MyContract.clear.1.destructured.ir} (100%)
 rename test_cases/bug_load_store_load_store/out_O2/MyContract.ir/{MyContract.approval.0.approval.destructured.ir => MyContract.approval.0.destructured.ir} (100%)
 rename test_cases/bug_load_store_load_store/out_O2/MyContract.ir/{MyContract.clear.0.clear.destructured.ir => MyContract.clear.0.destructured.ir} (100%)
 rename test_cases/bug_load_store_load_store/out_unoptimized/MyContract.ir/{MyContract.approval.0.approval.destructured.ir => MyContract.approval.0.destructured.ir} (100%)
 rename test_cases/bug_load_store_load_store/out_unoptimized/MyContract.ir/{MyContract.clear.0.clear.destructured.ir => MyContract.clear.0.destructured.ir} (100%)
 rename test_cases/bytes_ops/out/BiguintBinaryOps.ir/{BiguintBinaryOps.approval.0.approval.ssa.ir => BiguintBinaryOps.approval.0.ssa.ir} (100%)
 rename test_cases/bytes_ops/out/BiguintBinaryOps.ir/{BiguintBinaryOps.approval.1.approval.ssa.opt.ir => BiguintBinaryOps.approval.1.ssa.opt.ir} (100%)
 rename test_cases/bytes_ops/out/BiguintBinaryOps.ir/{BiguintBinaryOps.approval.2.approval.destructured.ir => BiguintBinaryOps.approval.2.destructured.ir} (100%)
 rename test_cases/bytes_ops/out/BiguintBinaryOps.ir/{BiguintBinaryOps.clear.0.clear.ssa.ir => BiguintBinaryOps.clear.0.ssa.ir} (100%)
 rename test_cases/bytes_ops/out/BiguintBinaryOps.ir/{BiguintBinaryOps.clear.1.clear.destructured.ir => BiguintBinaryOps.clear.1.destructured.ir} (100%)
 rename test_cases/bytes_ops/out_O2/BiguintBinaryOps.ir/{BiguintBinaryOps.approval.0.approval.destructured.ir => BiguintBinaryOps.approval.0.destructured.ir} (100%)
 rename test_cases/bytes_ops/out_O2/BiguintBinaryOps.ir/{BiguintBinaryOps.clear.0.clear.destructured.ir => BiguintBinaryOps.clear.0.destructured.ir} (100%)
 rename test_cases/bytes_ops/out_unoptimized/BiguintBinaryOps.ir/{BiguintBinaryOps.approval.0.approval.destructured.ir => BiguintBinaryOps.approval.0.destructured.ir} (100%)
 rename test_cases/bytes_ops/out_unoptimized/BiguintBinaryOps.ir/{BiguintBinaryOps.clear.0.clear.destructured.ir => BiguintBinaryOps.clear.0.destructured.ir} (100%)
 rename test_cases/callsub/out/MyContract.ir/{MyContract.approval.0.approval.ssa.ir => MyContract.approval.0.ssa.ir} (100%)
 rename test_cases/callsub/out/MyContract.ir/{MyContract.approval.1.approval.ssa.opt.ir => MyContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/callsub/out/MyContract.ir/{MyContract.approval.2.approval.destructured.ir => MyContract.approval.2.destructured.ir} (100%)
 rename test_cases/callsub/out/MyContract.ir/{MyContract.clear.0.clear.ssa.ir => MyContract.clear.0.ssa.ir} (100%)
 rename test_cases/callsub/out/MyContract.ir/{MyContract.clear.1.clear.destructured.ir => MyContract.clear.1.destructured.ir} (100%)
 rename test_cases/callsub/out_O2/MyContract.ir/{MyContract.approval.0.approval.destructured.ir => MyContract.approval.0.destructured.ir} (100%)
 rename test_cases/callsub/out_O2/MyContract.ir/{MyContract.clear.0.clear.destructured.ir => MyContract.clear.0.destructured.ir} (100%)
 rename test_cases/callsub/out_unoptimized/MyContract.ir/{MyContract.approval.0.approval.destructured.ir => MyContract.approval.0.destructured.ir} (100%)
 rename test_cases/callsub/out_unoptimized/MyContract.ir/{MyContract.clear.0.clear.destructured.ir => MyContract.clear.0.destructured.ir} (100%)
 rename test_cases/chained_assignment/out/ChainedAssignment.ir/{ChainedAssignment.approval.0.approval.ssa.ir => ChainedAssignment.approval.0.ssa.ir} (100%)
 rename test_cases/chained_assignment/out/ChainedAssignment.ir/{ChainedAssignment.approval.1.approval.ssa.opt.ir => ChainedAssignment.approval.1.ssa.opt.ir} (100%)
 rename test_cases/chained_assignment/out/ChainedAssignment.ir/{ChainedAssignment.approval.2.approval.ssa.opt.ir => ChainedAssignment.approval.2.ssa.opt.ir} (100%)
 rename test_cases/chained_assignment/out/ChainedAssignment.ir/{ChainedAssignment.approval.3.approval.destructured.ir => ChainedAssignment.approval.3.destructured.ir} (100%)
 rename test_cases/chained_assignment/out/ChainedAssignment.ir/{ChainedAssignment.clear.0.clear.ssa.ir => ChainedAssignment.clear.0.ssa.ir} (100%)
 rename test_cases/chained_assignment/out/ChainedAssignment.ir/{ChainedAssignment.clear.1.clear.destructured.ir => ChainedAssignment.clear.1.destructured.ir} (100%)
 rename test_cases/chained_assignment/out_O2/ChainedAssignment.ir/{ChainedAssignment.approval.0.approval.destructured.ir => ChainedAssignment.approval.0.destructured.ir} (100%)
 rename test_cases/chained_assignment/out_O2/ChainedAssignment.ir/{ChainedAssignment.clear.0.clear.destructured.ir => ChainedAssignment.clear.0.destructured.ir} (100%)
 rename test_cases/chained_assignment/out_unoptimized/ChainedAssignment.ir/{ChainedAssignment.approval.0.approval.destructured.ir => ChainedAssignment.approval.0.destructured.ir} (100%)
 rename test_cases/chained_assignment/out_unoptimized/ChainedAssignment.ir/{ChainedAssignment.clear.0.clear.destructured.ir => ChainedAssignment.clear.0.destructured.ir} (100%)
 rename test_cases/compile/out/Hello.ir/{Hello.approval.0.approval.ssa.ir => Hello.approval.0.ssa.ir} (100%)
 rename test_cases/compile/out/Hello.ir/{Hello.approval.1.approval.ssa.opt.ir => Hello.approval.1.ssa.opt.ir} (100%)
 rename test_cases/compile/out/Hello.ir/{Hello.approval.2.approval.ssa.opt.ir => Hello.approval.2.ssa.opt.ir} (100%)
 rename test_cases/compile/out/Hello.ir/{Hello.approval.3.approval.destructured.ir => Hello.approval.3.destructured.ir} (100%)
 rename test_cases/compile/out/Hello.ir/{Hello.clear.0.clear.ssa.ir => Hello.clear.0.ssa.ir} (100%)
 rename test_cases/compile/out/Hello.ir/{Hello.clear.1.clear.destructured.ir => Hello.clear.1.destructured.ir} (100%)
 rename test_cases/compile/out/HelloBase.ir/{HelloBase.approval.0.approval.ssa.ir => HelloBase.approval.0.ssa.ir} (100%)
 rename test_cases/compile/out/HelloBase.ir/{HelloBase.approval.1.approval.ssa.opt.ir => HelloBase.approval.1.ssa.opt.ir} (100%)
 rename test_cases/compile/out/HelloBase.ir/{HelloBase.approval.2.approval.ssa.opt.ir => HelloBase.approval.2.ssa.opt.ir} (100%)
 rename test_cases/compile/out/HelloBase.ir/{HelloBase.approval.3.approval.destructured.ir => HelloBase.approval.3.destructured.ir} (100%)
 rename test_cases/compile/out/HelloBase.ir/{HelloBase.clear.0.clear.ssa.ir => HelloBase.clear.0.ssa.ir} (100%)
 rename test_cases/compile/out/HelloBase.ir/{HelloBase.clear.1.clear.destructured.ir => HelloBase.clear.1.destructured.ir} (100%)
 rename test_cases/compile/out/HelloFactory.ir/{HelloFactory.approval.0.approval.ssa.ir => HelloFactory.approval.0.ssa.ir} (100%)
 rename test_cases/compile/out/HelloFactory.ir/{HelloFactory.approval.1.approval.ssa.opt.ir => HelloFactory.approval.1.ssa.opt.ir} (100%)
 rename test_cases/compile/out/HelloFactory.ir/{HelloFactory.approval.2.approval.ssa.opt.ir => HelloFactory.approval.2.ssa.opt.ir} (100%)
 rename test_cases/compile/out/HelloFactory.ir/{HelloFactory.approval.3.approval.destructured.ir => HelloFactory.approval.3.destructured.ir} (100%)
 rename test_cases/compile/out/HelloFactory.ir/{HelloFactory.clear.0.clear.ssa.ir => HelloFactory.clear.0.ssa.ir} (100%)
 rename test_cases/compile/out/HelloFactory.ir/{HelloFactory.clear.1.clear.destructured.ir => HelloFactory.clear.1.destructured.ir} (100%)
 rename test_cases/compile/out/HelloOtherConstants.ir/{HelloOtherConstants.approval.0.approval.ssa.ir => HelloOtherConstants.approval.0.ssa.ir} (100%)
 rename test_cases/compile/out/HelloOtherConstants.ir/{HelloOtherConstants.approval.1.approval.ssa.opt.ir => HelloOtherConstants.approval.1.ssa.opt.ir} (100%)
 rename test_cases/compile/out/HelloOtherConstants.ir/{HelloOtherConstants.approval.2.approval.ssa.opt.ir => HelloOtherConstants.approval.2.ssa.opt.ir} (100%)
 rename test_cases/compile/out/HelloOtherConstants.ir/{HelloOtherConstants.approval.3.approval.destructured.ir => HelloOtherConstants.approval.3.destructured.ir} (100%)
 rename test_cases/compile/out/HelloOtherConstants.ir/{HelloOtherConstants.clear.0.clear.ssa.ir => HelloOtherConstants.clear.0.ssa.ir} (100%)
 rename test_cases/compile/out/HelloOtherConstants.ir/{HelloOtherConstants.clear.1.clear.destructured.ir => HelloOtherConstants.clear.1.destructured.ir} (100%)
 rename test_cases/compile/out/HelloPrfx.ir/{HelloPrfx.approval.0.approval.ssa.ir => HelloPrfx.approval.0.ssa.ir} (100%)
 rename test_cases/compile/out/HelloPrfx.ir/{HelloPrfx.approval.1.approval.ssa.opt.ir => HelloPrfx.approval.1.ssa.opt.ir} (100%)
 rename test_cases/compile/out/HelloPrfx.ir/{HelloPrfx.approval.2.approval.ssa.opt.ir => HelloPrfx.approval.2.ssa.opt.ir} (100%)
 rename test_cases/compile/out/HelloPrfx.ir/{HelloPrfx.approval.3.approval.destructured.ir => HelloPrfx.approval.3.destructured.ir} (100%)
 rename test_cases/compile/out/HelloPrfx.ir/{HelloPrfx.clear.0.clear.ssa.ir => HelloPrfx.clear.0.ssa.ir} (100%)
 rename test_cases/compile/out/HelloPrfx.ir/{HelloPrfx.clear.1.clear.destructured.ir => HelloPrfx.clear.1.destructured.ir} (100%)
 rename test_cases/compile/out/HelloTmpl.ir/{HelloTmpl.approval.0.approval.ssa.ir => HelloTmpl.approval.0.ssa.ir} (100%)
 rename test_cases/compile/out/HelloTmpl.ir/{HelloTmpl.approval.1.approval.ssa.opt.ir => HelloTmpl.approval.1.ssa.opt.ir} (100%)
 rename test_cases/compile/out/HelloTmpl.ir/{HelloTmpl.approval.2.approval.ssa.opt.ir => HelloTmpl.approval.2.ssa.opt.ir} (100%)
 rename test_cases/compile/out/HelloTmpl.ir/{HelloTmpl.approval.3.approval.destructured.ir => HelloTmpl.approval.3.destructured.ir} (100%)
 rename test_cases/compile/out/HelloTmpl.ir/{HelloTmpl.clear.0.clear.ssa.ir => HelloTmpl.clear.0.ssa.ir} (100%)
 rename test_cases/compile/out/HelloTmpl.ir/{HelloTmpl.clear.1.clear.destructured.ir => HelloTmpl.clear.1.destructured.ir} (100%)
 rename test_cases/compile/out/LargeProgram.ir/{LargeProgram.approval.0.approval.ssa.ir => LargeProgram.approval.0.ssa.ir} (100%)
 rename test_cases/compile/out/LargeProgram.ir/{LargeProgram.approval.1.approval.ssa.opt.ir => LargeProgram.approval.1.ssa.opt.ir} (100%)
 rename test_cases/compile/out/LargeProgram.ir/{LargeProgram.approval.2.approval.ssa.opt.ir => LargeProgram.approval.2.ssa.opt.ir} (100%)
 rename test_cases/compile/out/LargeProgram.ir/{LargeProgram.approval.3.approval.destructured.ir => LargeProgram.approval.3.destructured.ir} (100%)
 rename test_cases/compile/out/LargeProgram.ir/{LargeProgram.clear.0.clear.ssa.ir => LargeProgram.clear.0.ssa.ir} (100%)
 rename test_cases/compile/out/LargeProgram.ir/{LargeProgram.clear.1.clear.destructured.ir => LargeProgram.clear.1.destructured.ir} (100%)
 rename test_cases/compile/out_O2/Hello.ir/{Hello.approval.0.approval.destructured.ir => Hello.approval.0.destructured.ir} (100%)
 rename test_cases/compile/out_O2/Hello.ir/{Hello.clear.0.clear.destructured.ir => Hello.clear.0.destructured.ir} (100%)
 rename test_cases/compile/out_O2/HelloBase.ir/{HelloBase.approval.0.approval.destructured.ir => HelloBase.approval.0.destructured.ir} (100%)
 rename test_cases/compile/out_O2/HelloBase.ir/{HelloBase.clear.0.clear.destructured.ir => HelloBase.clear.0.destructured.ir} (100%)
 rename test_cases/compile/out_O2/HelloFactory.ir/{HelloFactory.approval.0.approval.destructured.ir => HelloFactory.approval.0.destructured.ir} (100%)
 rename test_cases/compile/out_O2/HelloFactory.ir/{HelloFactory.clear.0.clear.destructured.ir => HelloFactory.clear.0.destructured.ir} (100%)
 rename test_cases/compile/out_O2/HelloOtherConstants.ir/{HelloOtherConstants.approval.0.approval.destructured.ir => HelloOtherConstants.approval.0.destructured.ir} (100%)
 rename test_cases/compile/out_O2/HelloOtherConstants.ir/{HelloOtherConstants.clear.0.clear.destructured.ir => HelloOtherConstants.clear.0.destructured.ir} (100%)
 rename test_cases/compile/out_O2/HelloPrfx.ir/{HelloPrfx.approval.0.approval.destructured.ir => HelloPrfx.approval.0.destructured.ir} (100%)
 rename test_cases/compile/out_O2/HelloPrfx.ir/{HelloPrfx.clear.0.clear.destructured.ir => HelloPrfx.clear.0.destructured.ir} (100%)
 rename test_cases/compile/out_O2/HelloTmpl.ir/{HelloTmpl.approval.0.approval.destructured.ir => HelloTmpl.approval.0.destructured.ir} (100%)
 rename test_cases/compile/out_O2/HelloTmpl.ir/{HelloTmpl.clear.0.clear.destructured.ir => HelloTmpl.clear.0.destructured.ir} (100%)
 rename test_cases/compile/out_O2/LargeProgram.ir/{LargeProgram.approval.0.approval.destructured.ir => LargeProgram.approval.0.destructured.ir} (100%)
 rename test_cases/compile/out_O2/LargeProgram.ir/{LargeProgram.clear.0.clear.destructured.ir => LargeProgram.clear.0.destructured.ir} (100%)
 rename test_cases/compile/out_unoptimized/Hello.ir/{Hello.approval.0.approval.destructured.ir => Hello.approval.0.destructured.ir} (100%)
 rename test_cases/compile/out_unoptimized/Hello.ir/{Hello.clear.0.clear.destructured.ir => Hello.clear.0.destructured.ir} (100%)
 rename test_cases/compile/out_unoptimized/HelloBase.ir/{HelloBase.approval.0.approval.destructured.ir => HelloBase.approval.0.destructured.ir} (100%)
 rename test_cases/compile/out_unoptimized/HelloBase.ir/{HelloBase.clear.0.clear.destructured.ir => HelloBase.clear.0.destructured.ir} (100%)
 rename test_cases/compile/out_unoptimized/HelloFactory.ir/{HelloFactory.approval.0.approval.destructured.ir => HelloFactory.approval.0.destructured.ir} (100%)
 rename test_cases/compile/out_unoptimized/HelloFactory.ir/{HelloFactory.clear.0.clear.destructured.ir => HelloFactory.clear.0.destructured.ir} (100%)
 rename test_cases/compile/out_unoptimized/HelloOtherConstants.ir/{HelloOtherConstants.approval.0.approval.destructured.ir => HelloOtherConstants.approval.0.destructured.ir} (100%)
 rename test_cases/compile/out_unoptimized/HelloOtherConstants.ir/{HelloOtherConstants.clear.0.clear.destructured.ir => HelloOtherConstants.clear.0.destructured.ir} (100%)
 rename test_cases/compile/out_unoptimized/HelloPrfx.ir/{HelloPrfx.approval.0.approval.destructured.ir => HelloPrfx.approval.0.destructured.ir} (100%)
 rename test_cases/compile/out_unoptimized/HelloPrfx.ir/{HelloPrfx.clear.0.clear.destructured.ir => HelloPrfx.clear.0.destructured.ir} (100%)
 rename test_cases/compile/out_unoptimized/HelloTmpl.ir/{HelloTmpl.approval.0.approval.destructured.ir => HelloTmpl.approval.0.destructured.ir} (100%)
 rename test_cases/compile/out_unoptimized/HelloTmpl.ir/{HelloTmpl.clear.0.clear.destructured.ir => HelloTmpl.clear.0.destructured.ir} (100%)
 rename test_cases/compile/out_unoptimized/LargeProgram.ir/{LargeProgram.approval.0.approval.destructured.ir => LargeProgram.approval.0.destructured.ir} (100%)
 rename test_cases/compile/out_unoptimized/LargeProgram.ir/{LargeProgram.clear.0.clear.destructured.ir => LargeProgram.clear.0.destructured.ir} (100%)
 rename test_cases/conditional_execution/out/ConditionalExecutionContract.ir/{ConditionalExecutionContract.approval.0.approval.ssa.ir => ConditionalExecutionContract.approval.0.ssa.ir} (100%)
 rename test_cases/conditional_execution/out/ConditionalExecutionContract.ir/{ConditionalExecutionContract.approval.1.approval.ssa.opt.ir => ConditionalExecutionContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/conditional_execution/out/ConditionalExecutionContract.ir/{ConditionalExecutionContract.approval.2.approval.ssa.opt.ir => ConditionalExecutionContract.approval.2.ssa.opt.ir} (100%)
 rename test_cases/conditional_execution/out/ConditionalExecutionContract.ir/{ConditionalExecutionContract.approval.3.approval.ssa.opt.ir => ConditionalExecutionContract.approval.3.ssa.opt.ir} (100%)
 rename test_cases/conditional_execution/out/ConditionalExecutionContract.ir/{ConditionalExecutionContract.approval.4.approval.ssa.opt.ir => ConditionalExecutionContract.approval.4.ssa.opt.ir} (100%)
 rename test_cases/conditional_execution/out/ConditionalExecutionContract.ir/{ConditionalExecutionContract.approval.5.approval.destructured.ir => ConditionalExecutionContract.approval.5.destructured.ir} (100%)
 rename test_cases/conditional_execution/out/ConditionalExecutionContract.ir/{ConditionalExecutionContract.clear.0.clear.ssa.ir => ConditionalExecutionContract.clear.0.ssa.ir} (100%)
 rename test_cases/conditional_execution/out/ConditionalExecutionContract.ir/{ConditionalExecutionContract.clear.1.clear.destructured.ir => ConditionalExecutionContract.clear.1.destructured.ir} (100%)
 rename test_cases/conditional_execution/out_O2/ConditionalExecutionContract.ir/{ConditionalExecutionContract.approval.0.approval.destructured.ir => ConditionalExecutionContract.approval.0.destructured.ir} (100%)
 rename test_cases/conditional_execution/out_O2/ConditionalExecutionContract.ir/{ConditionalExecutionContract.clear.0.clear.destructured.ir => ConditionalExecutionContract.clear.0.destructured.ir} (100%)
 rename test_cases/conditional_execution/out_unoptimized/ConditionalExecutionContract.ir/{ConditionalExecutionContract.approval.0.approval.destructured.ir => ConditionalExecutionContract.approval.0.destructured.ir} (100%)
 rename test_cases/conditional_execution/out_unoptimized/ConditionalExecutionContract.ir/{ConditionalExecutionContract.clear.0.clear.destructured.ir => ConditionalExecutionContract.clear.0.destructured.ir} (100%)
 rename test_cases/conditional_expressions/out/Literals.ir/{Literals.approval.0.approval.ssa.ir => Literals.approval.0.ssa.ir} (100%)
 rename test_cases/conditional_expressions/out/Literals.ir/{Literals.approval.1.approval.ssa.opt.ir => Literals.approval.1.ssa.opt.ir} (100%)
 rename test_cases/conditional_expressions/out/Literals.ir/{Literals.approval.2.approval.destructured.ir => Literals.approval.2.destructured.ir} (100%)
 rename test_cases/conditional_expressions/out/Literals.ir/{Literals.clear.0.clear.ssa.ir => Literals.clear.0.ssa.ir} (100%)
 rename test_cases/conditional_expressions/out/Literals.ir/{Literals.clear.1.clear.destructured.ir => Literals.clear.1.destructured.ir} (100%)
 rename test_cases/conditional_expressions/out/MyContract.ir/{MyContract.approval.0.approval.ssa.ir => MyContract.approval.0.ssa.ir} (100%)
 rename test_cases/conditional_expressions/out/MyContract.ir/{MyContract.approval.1.approval.ssa.opt.ir => MyContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/conditional_expressions/out/MyContract.ir/{MyContract.approval.2.approval.ssa.opt.ir => MyContract.approval.2.ssa.opt.ir} (100%)
 rename test_cases/conditional_expressions/out/MyContract.ir/{MyContract.approval.3.approval.destructured.ir => MyContract.approval.3.destructured.ir} (100%)
 rename test_cases/conditional_expressions/out/MyContract.ir/{MyContract.clear.0.clear.ssa.ir => MyContract.clear.0.ssa.ir} (100%)
 rename test_cases/conditional_expressions/out/MyContract.ir/{MyContract.clear.1.clear.destructured.ir => MyContract.clear.1.destructured.ir} (100%)
 rename test_cases/conditional_expressions/out_O2/Literals.ir/{Literals.approval.0.approval.destructured.ir => Literals.approval.0.destructured.ir} (100%)
 rename test_cases/conditional_expressions/out_O2/Literals.ir/{Literals.clear.0.clear.destructured.ir => Literals.clear.0.destructured.ir} (100%)
 rename test_cases/conditional_expressions/out_O2/MyContract.ir/{MyContract.approval.0.approval.destructured.ir => MyContract.approval.0.destructured.ir} (100%)
 rename test_cases/conditional_expressions/out_O2/MyContract.ir/{MyContract.clear.0.clear.destructured.ir => MyContract.clear.0.destructured.ir} (100%)
 rename test_cases/conditional_expressions/out_unoptimized/Literals.ir/{Literals.approval.0.approval.destructured.ir => Literals.approval.0.destructured.ir} (100%)
 rename test_cases/conditional_expressions/out_unoptimized/Literals.ir/{Literals.clear.0.clear.destructured.ir => Literals.clear.0.destructured.ir} (100%)
 rename test_cases/conditional_expressions/out_unoptimized/MyContract.ir/{MyContract.approval.0.approval.destructured.ir => MyContract.approval.0.destructured.ir} (100%)
 rename test_cases/conditional_expressions/out_unoptimized/MyContract.ir/{MyContract.clear.0.clear.destructured.ir => MyContract.clear.0.destructured.ir} (100%)
 rename test_cases/constants/out/AddressConstantContract.ir/{AddressConstantContract.approval.0.approval.ssa.ir => AddressConstantContract.approval.0.ssa.ir} (100%)
 rename test_cases/constants/out/AddressConstantContract.ir/{AddressConstantContract.approval.1.approval.ssa.opt.ir => AddressConstantContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/constants/out/AddressConstantContract.ir/{AddressConstantContract.approval.2.approval.destructured.ir => AddressConstantContract.approval.2.destructured.ir} (100%)
 rename test_cases/constants/out/AddressConstantContract.ir/{AddressConstantContract.clear.0.clear.ssa.ir => AddressConstantContract.clear.0.ssa.ir} (100%)
 rename test_cases/constants/out/AddressConstantContract.ir/{AddressConstantContract.clear.1.clear.destructured.ir => AddressConstantContract.clear.1.destructured.ir} (100%)
 rename test_cases/constants/out/ByteConstantsContract.ir/{ByteConstantsContract.approval.0.approval.ssa.ir => ByteConstantsContract.approval.0.ssa.ir} (100%)
 rename test_cases/constants/out/ByteConstantsContract.ir/{ByteConstantsContract.approval.1.approval.ssa.opt.ir => ByteConstantsContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/constants/out/ByteConstantsContract.ir/{ByteConstantsContract.approval.2.approval.destructured.ir => ByteConstantsContract.approval.2.destructured.ir} (100%)
 rename test_cases/constants/out/ByteConstantsContract.ir/{ByteConstantsContract.clear.0.clear.ssa.ir => ByteConstantsContract.clear.0.ssa.ir} (100%)
 rename test_cases/constants/out/ByteConstantsContract.ir/{ByteConstantsContract.clear.1.clear.destructured.ir => ByteConstantsContract.clear.1.destructured.ir} (100%)
 rename test_cases/constants/out_O2/AddressConstantContract.ir/{AddressConstantContract.approval.0.approval.destructured.ir => AddressConstantContract.approval.0.destructured.ir} (100%)
 rename test_cases/constants/out_O2/AddressConstantContract.ir/{AddressConstantContract.clear.0.clear.destructured.ir => AddressConstantContract.clear.0.destructured.ir} (100%)
 rename test_cases/constants/out_O2/ByteConstantsContract.ir/{ByteConstantsContract.approval.0.approval.destructured.ir => ByteConstantsContract.approval.0.destructured.ir} (100%)
 rename test_cases/constants/out_O2/ByteConstantsContract.ir/{ByteConstantsContract.clear.0.clear.destructured.ir => ByteConstantsContract.clear.0.destructured.ir} (100%)
 rename test_cases/constants/out_unoptimized/AddressConstantContract.ir/{AddressConstantContract.approval.0.approval.destructured.ir => AddressConstantContract.approval.0.destructured.ir} (100%)
 rename test_cases/constants/out_unoptimized/AddressConstantContract.ir/{AddressConstantContract.clear.0.clear.destructured.ir => AddressConstantContract.clear.0.destructured.ir} (100%)
 rename test_cases/constants/out_unoptimized/ByteConstantsContract.ir/{ByteConstantsContract.approval.0.approval.destructured.ir => ByteConstantsContract.approval.0.destructured.ir} (100%)
 rename test_cases/constants/out_unoptimized/ByteConstantsContract.ir/{ByteConstantsContract.clear.0.clear.destructured.ir => ByteConstantsContract.clear.0.destructured.ir} (100%)
 rename test_cases/contains/out/MyContract.ir/{MyContract.approval.0.approval.ssa.ir => MyContract.approval.0.ssa.ir} (100%)
 rename test_cases/contains/out/MyContract.ir/{MyContract.approval.1.approval.ssa.opt.ir => MyContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/contains/out/MyContract.ir/{MyContract.approval.2.approval.ssa.opt.ir => MyContract.approval.2.ssa.opt.ir} (100%)
 rename test_cases/contains/out/MyContract.ir/{MyContract.approval.3.approval.ssa.opt.ir => MyContract.approval.3.ssa.opt.ir} (100%)
 rename test_cases/contains/out/MyContract.ir/{MyContract.approval.4.approval.destructured.ir => MyContract.approval.4.destructured.ir} (100%)
 rename test_cases/contains/out/MyContract.ir/{MyContract.clear.0.clear.ssa.ir => MyContract.clear.0.ssa.ir} (100%)
 rename test_cases/contains/out/MyContract.ir/{MyContract.clear.1.clear.destructured.ir => MyContract.clear.1.destructured.ir} (100%)
 rename test_cases/contains/out_O2/MyContract.ir/{MyContract.approval.0.approval.destructured.ir => MyContract.approval.0.destructured.ir} (100%)
 rename test_cases/contains/out_O2/MyContract.ir/{MyContract.clear.0.clear.destructured.ir => MyContract.clear.0.destructured.ir} (100%)
 rename test_cases/contains/out_unoptimized/MyContract.ir/{MyContract.approval.0.approval.destructured.ir => MyContract.approval.0.destructured.ir} (100%)
 rename test_cases/contains/out_unoptimized/MyContract.ir/{MyContract.clear.0.clear.destructured.ir => MyContract.clear.0.destructured.ir} (100%)
 rename test_cases/control_op_simplification/out/MyContract.ir/{MyContract.approval.0.approval.ssa.ir => MyContract.approval.0.ssa.ir} (100%)
 rename test_cases/control_op_simplification/out/MyContract.ir/{MyContract.approval.1.approval.ssa.opt.ir => MyContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/control_op_simplification/out/MyContract.ir/{MyContract.approval.2.approval.destructured.ir => MyContract.approval.2.destructured.ir} (100%)
 rename test_cases/control_op_simplification/out/MyContract.ir/{MyContract.clear.0.clear.ssa.ir => MyContract.clear.0.ssa.ir} (100%)
 rename test_cases/control_op_simplification/out/MyContract.ir/{MyContract.clear.1.clear.destructured.ir => MyContract.clear.1.destructured.ir} (100%)
 rename test_cases/control_op_simplification/out_O2/MyContract.ir/{MyContract.approval.0.approval.destructured.ir => MyContract.approval.0.destructured.ir} (100%)
 rename test_cases/control_op_simplification/out_O2/MyContract.ir/{MyContract.clear.0.clear.destructured.ir => MyContract.clear.0.destructured.ir} (100%)
 rename test_cases/control_op_simplification/out_unoptimized/MyContract.ir/{MyContract.approval.0.approval.destructured.ir => MyContract.approval.0.destructured.ir} (100%)
 rename test_cases/control_op_simplification/out_unoptimized/MyContract.ir/{MyContract.clear.0.clear.destructured.ir => MyContract.clear.0.destructured.ir} (100%)
 rename test_cases/debug/out/DebugContract.ir/{DebugContract.approval.0.approval.ssa.ir => DebugContract.approval.0.ssa.ir} (100%)
 rename test_cases/debug/out/DebugContract.ir/{DebugContract.approval.1.approval.ssa.opt.ir => DebugContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/debug/out/DebugContract.ir/{DebugContract.approval.2.approval.ssa.opt.ir => DebugContract.approval.2.ssa.opt.ir} (100%)
 rename test_cases/debug/out/DebugContract.ir/{DebugContract.approval.3.approval.destructured.ir => DebugContract.approval.3.destructured.ir} (100%)
 rename test_cases/debug/out/DebugContract.ir/{DebugContract.clear.0.clear.ssa.ir => DebugContract.clear.0.ssa.ir} (100%)
 rename test_cases/debug/out/DebugContract.ir/{DebugContract.clear.1.clear.destructured.ir => DebugContract.clear.1.destructured.ir} (100%)
 rename test_cases/debug/out_O2/DebugContract.ir/{DebugContract.approval.0.approval.destructured.ir => DebugContract.approval.0.destructured.ir} (100%)
 rename test_cases/debug/out_O2/DebugContract.ir/{DebugContract.clear.0.clear.destructured.ir => DebugContract.clear.0.destructured.ir} (100%)
 rename test_cases/debug/out_unoptimized/DebugContract.ir/{DebugContract.approval.0.approval.destructured.ir => DebugContract.approval.0.destructured.ir} (100%)
 rename test_cases/debug/out_unoptimized/DebugContract.ir/{DebugContract.clear.0.clear.destructured.ir => DebugContract.clear.0.destructured.ir} (100%)
 rename test_cases/diamond_mro/out/Base1.ir/{Base1.approval.0.approval.ssa.ir => Base1.approval.0.ssa.ir} (100%)
 rename test_cases/diamond_mro/out/Base1.ir/{Base1.approval.1.approval.ssa.opt.ir => Base1.approval.1.ssa.opt.ir} (100%)
 rename test_cases/diamond_mro/out/Base1.ir/{Base1.approval.2.approval.ssa.opt.ir => Base1.approval.2.ssa.opt.ir} (100%)
 rename test_cases/diamond_mro/out/Base1.ir/{Base1.approval.3.approval.destructured.ir => Base1.approval.3.destructured.ir} (100%)
 rename test_cases/diamond_mro/out/Base1.ir/{Base1.clear.0.clear.ssa.ir => Base1.clear.0.ssa.ir} (100%)
 rename test_cases/diamond_mro/out/Base1.ir/{Base1.clear.1.clear.destructured.ir => Base1.clear.1.destructured.ir} (100%)
 rename test_cases/diamond_mro/out/Base2.ir/{Base2.approval.0.approval.ssa.ir => Base2.approval.0.ssa.ir} (100%)
 rename test_cases/diamond_mro/out/Base2.ir/{Base2.approval.1.approval.ssa.opt.ir => Base2.approval.1.ssa.opt.ir} (100%)
 rename test_cases/diamond_mro/out/Base2.ir/{Base2.approval.2.approval.ssa.opt.ir => Base2.approval.2.ssa.opt.ir} (100%)
 rename test_cases/diamond_mro/out/Base2.ir/{Base2.approval.3.approval.destructured.ir => Base2.approval.3.destructured.ir} (100%)
 rename test_cases/diamond_mro/out/Base2.ir/{Base2.clear.0.clear.ssa.ir => Base2.clear.0.ssa.ir} (100%)
 rename test_cases/diamond_mro/out/Base2.ir/{Base2.clear.1.clear.destructured.ir => Base2.clear.1.destructured.ir} (100%)
 rename test_cases/diamond_mro/out/Derived.ir/{Derived.approval.0.approval.ssa.ir => Derived.approval.0.ssa.ir} (100%)
 rename test_cases/diamond_mro/out/Derived.ir/{Derived.approval.1.approval.ssa.opt.ir => Derived.approval.1.ssa.opt.ir} (100%)
 rename test_cases/diamond_mro/out/Derived.ir/{Derived.approval.2.approval.ssa.opt.ir => Derived.approval.2.ssa.opt.ir} (100%)
 rename test_cases/diamond_mro/out/Derived.ir/{Derived.approval.3.approval.ssa.opt.ir => Derived.approval.3.ssa.opt.ir} (100%)
 rename test_cases/diamond_mro/out/Derived.ir/{Derived.approval.4.approval.destructured.ir => Derived.approval.4.destructured.ir} (100%)
 rename test_cases/diamond_mro/out/Derived.ir/{Derived.clear.0.clear.ssa.ir => Derived.clear.0.ssa.ir} (100%)
 rename test_cases/diamond_mro/out/Derived.ir/{Derived.clear.1.clear.destructured.ir => Derived.clear.1.destructured.ir} (100%)
 rename test_cases/diamond_mro/out/GP.ir/{GP.approval.0.approval.ssa.ir => GP.approval.0.ssa.ir} (100%)
 rename test_cases/diamond_mro/out/GP.ir/{GP.approval.1.approval.ssa.opt.ir => GP.approval.1.ssa.opt.ir} (100%)
 rename test_cases/diamond_mro/out/GP.ir/{GP.approval.2.approval.ssa.opt.ir => GP.approval.2.ssa.opt.ir} (100%)
 rename test_cases/diamond_mro/out/GP.ir/{GP.approval.3.approval.destructured.ir => GP.approval.3.destructured.ir} (100%)
 rename test_cases/diamond_mro/out/GP.ir/{GP.clear.0.clear.ssa.ir => GP.clear.0.ssa.ir} (100%)
 rename test_cases/diamond_mro/out/GP.ir/{GP.clear.1.clear.destructured.ir => GP.clear.1.destructured.ir} (100%)
 rename test_cases/diamond_mro/out_O2/Base1.ir/{Base1.approval.0.approval.destructured.ir => Base1.approval.0.destructured.ir} (100%)
 rename test_cases/diamond_mro/out_O2/Base1.ir/{Base1.clear.0.clear.destructured.ir => Base1.clear.0.destructured.ir} (100%)
 rename test_cases/diamond_mro/out_O2/Base2.ir/{Base2.approval.0.approval.destructured.ir => Base2.approval.0.destructured.ir} (100%)
 rename test_cases/diamond_mro/out_O2/Base2.ir/{Base2.clear.0.clear.destructured.ir => Base2.clear.0.destructured.ir} (100%)
 rename test_cases/diamond_mro/out_O2/Derived.ir/{Derived.approval.0.approval.destructured.ir => Derived.approval.0.destructured.ir} (100%)
 rename test_cases/diamond_mro/out_O2/Derived.ir/{Derived.clear.0.clear.destructured.ir => Derived.clear.0.destructured.ir} (100%)
 rename test_cases/diamond_mro/out_O2/GP.ir/{GP.approval.0.approval.destructured.ir => GP.approval.0.destructured.ir} (100%)
 rename test_cases/diamond_mro/out_O2/GP.ir/{GP.clear.0.clear.destructured.ir => GP.clear.0.destructured.ir} (100%)
 rename test_cases/diamond_mro/out_unoptimized/Base1.ir/{Base1.approval.0.approval.destructured.ir => Base1.approval.0.destructured.ir} (100%)
 rename test_cases/diamond_mro/out_unoptimized/Base1.ir/{Base1.clear.0.clear.destructured.ir => Base1.clear.0.destructured.ir} (100%)
 rename test_cases/diamond_mro/out_unoptimized/Base2.ir/{Base2.approval.0.approval.destructured.ir => Base2.approval.0.destructured.ir} (100%)
 rename test_cases/diamond_mro/out_unoptimized/Base2.ir/{Base2.clear.0.clear.destructured.ir => Base2.clear.0.destructured.ir} (100%)
 rename test_cases/diamond_mro/out_unoptimized/Derived.ir/{Derived.approval.0.approval.destructured.ir => Derived.approval.0.destructured.ir} (100%)
 rename test_cases/diamond_mro/out_unoptimized/Derived.ir/{Derived.clear.0.clear.destructured.ir => Derived.clear.0.destructured.ir} (100%)
 rename test_cases/diamond_mro/out_unoptimized/GP.ir/{GP.approval.0.approval.destructured.ir => GP.approval.0.destructured.ir} (100%)
 rename test_cases/diamond_mro/out_unoptimized/GP.ir/{GP.clear.0.clear.destructured.ir => GP.clear.0.destructured.ir} (100%)
 rename test_cases/dup2_optimization_bug/out/MyContract.ir/{MyContract.approval.0.approval.ssa.ir => MyContract.approval.0.ssa.ir} (100%)
 rename test_cases/dup2_optimization_bug/out/MyContract.ir/{MyContract.approval.1.approval.ssa.opt.ir => MyContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/dup2_optimization_bug/out/MyContract.ir/{MyContract.approval.2.approval.destructured.ir => MyContract.approval.2.destructured.ir} (100%)
 rename test_cases/dup2_optimization_bug/out/MyContract.ir/{MyContract.clear.0.clear.ssa.ir => MyContract.clear.0.ssa.ir} (100%)
 rename test_cases/dup2_optimization_bug/out/MyContract.ir/{MyContract.clear.1.clear.destructured.ir => MyContract.clear.1.destructured.ir} (100%)
 rename test_cases/dup2_optimization_bug/out_O2/MyContract.ir/{MyContract.approval.0.approval.destructured.ir => MyContract.approval.0.destructured.ir} (100%)
 rename test_cases/dup2_optimization_bug/out_O2/MyContract.ir/{MyContract.clear.0.clear.destructured.ir => MyContract.clear.0.destructured.ir} (100%)
 rename test_cases/dup2_optimization_bug/out_unoptimized/MyContract.ir/{MyContract.approval.0.approval.destructured.ir => MyContract.approval.0.destructured.ir} (100%)
 rename test_cases/dup2_optimization_bug/out_unoptimized/MyContract.ir/{MyContract.clear.0.clear.destructured.ir => MyContract.clear.0.destructured.ir} (100%)
 rename test_cases/edverify/out/VerifyContract.ir/{VerifyContract.approval.0.approval.ssa.ir => VerifyContract.approval.0.ssa.ir} (100%)
 rename test_cases/edverify/out/VerifyContract.ir/{VerifyContract.approval.1.approval.ssa.opt.ir => VerifyContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/edverify/out/VerifyContract.ir/{VerifyContract.approval.2.approval.destructured.ir => VerifyContract.approval.2.destructured.ir} (100%)
 rename test_cases/edverify/out/VerifyContract.ir/{VerifyContract.clear.0.clear.ssa.ir => VerifyContract.clear.0.ssa.ir} (100%)
 rename test_cases/edverify/out/VerifyContract.ir/{VerifyContract.clear.1.clear.destructured.ir => VerifyContract.clear.1.destructured.ir} (100%)
 rename test_cases/edverify/out_O2/VerifyContract.ir/{VerifyContract.approval.0.approval.destructured.ir => VerifyContract.approval.0.destructured.ir} (100%)
 rename test_cases/edverify/out_O2/VerifyContract.ir/{VerifyContract.clear.0.clear.destructured.ir => VerifyContract.clear.0.destructured.ir} (100%)
 rename test_cases/edverify/out_unoptimized/VerifyContract.ir/{VerifyContract.approval.0.approval.destructured.ir => VerifyContract.approval.0.destructured.ir} (100%)
 rename test_cases/edverify/out_unoptimized/VerifyContract.ir/{VerifyContract.clear.0.clear.destructured.ir => VerifyContract.clear.0.destructured.ir} (100%)
 rename test_cases/enumeration/out/EnumerationContract.ir/{EnumerationContract.approval.0.approval.ssa.ir => EnumerationContract.approval.0.ssa.ir} (100%)
 rename test_cases/enumeration/out/EnumerationContract.ir/{EnumerationContract.approval.1.approval.ssa.opt.ir => EnumerationContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/enumeration/out/EnumerationContract.ir/{EnumerationContract.approval.2.approval.destructured.ir => EnumerationContract.approval.2.destructured.ir} (100%)
 rename test_cases/enumeration/out/EnumerationContract.ir/{EnumerationContract.clear.0.clear.ssa.ir => EnumerationContract.clear.0.ssa.ir} (100%)
 rename test_cases/enumeration/out/EnumerationContract.ir/{EnumerationContract.clear.1.clear.destructured.ir => EnumerationContract.clear.1.destructured.ir} (100%)
 rename test_cases/enumeration/out_O2/EnumerationContract.ir/{EnumerationContract.approval.0.approval.destructured.ir => EnumerationContract.approval.0.destructured.ir} (100%)
 rename test_cases/enumeration/out_O2/EnumerationContract.ir/{EnumerationContract.clear.0.clear.destructured.ir => EnumerationContract.clear.0.destructured.ir} (100%)
 rename test_cases/enumeration/out_unoptimized/EnumerationContract.ir/{EnumerationContract.approval.0.approval.destructured.ir => EnumerationContract.approval.0.destructured.ir} (100%)
 rename test_cases/enumeration/out_unoptimized/EnumerationContract.ir/{EnumerationContract.clear.0.clear.destructured.ir => EnumerationContract.clear.0.destructured.ir} (100%)
 rename test_cases/everything/out/MyContract.ir/{MyContract.approval.0.approval.ssa.ir => MyContract.approval.0.ssa.ir} (100%)
 rename test_cases/everything/out/MyContract.ir/{MyContract.approval.1.approval.ssa.opt.ir => MyContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/everything/out/MyContract.ir/{MyContract.approval.2.approval.ssa.opt.ir => MyContract.approval.2.ssa.opt.ir} (100%)
 rename test_cases/everything/out/MyContract.ir/{MyContract.approval.3.approval.ssa.opt.ir => MyContract.approval.3.ssa.opt.ir} (100%)
 rename test_cases/everything/out/MyContract.ir/{MyContract.approval.4.approval.destructured.ir => MyContract.approval.4.destructured.ir} (100%)
 rename test_cases/everything/out/MyContract.ir/{MyContract.clear.0.clear.ssa.ir => MyContract.clear.0.ssa.ir} (100%)
 rename test_cases/everything/out/MyContract.ir/{MyContract.clear.1.clear.ssa.opt.ir => MyContract.clear.1.ssa.opt.ir} (100%)
 rename test_cases/everything/out/MyContract.ir/{MyContract.clear.2.clear.ssa.opt.ir => MyContract.clear.2.ssa.opt.ir} (100%)
 rename test_cases/everything/out/MyContract.ir/{MyContract.clear.3.clear.destructured.ir => MyContract.clear.3.destructured.ir} (100%)
 rename test_cases/everything/out_O2/MyContract.ir/{MyContract.approval.0.approval.destructured.ir => MyContract.approval.0.destructured.ir} (100%)
 rename test_cases/everything/out_O2/MyContract.ir/{MyContract.clear.0.clear.destructured.ir => MyContract.clear.0.destructured.ir} (100%)
 rename test_cases/everything/out_unoptimized/MyContract.ir/{MyContract.approval.0.approval.destructured.ir => MyContract.approval.0.destructured.ir} (100%)
 rename test_cases/everything/out_unoptimized/MyContract.ir/{MyContract.clear.0.clear.destructured.ir => MyContract.clear.0.destructured.ir} (100%)
 rename test_cases/group_side_effects/out/AppCall.ir/{AppCall.approval.0.approval.ssa.ir => AppCall.approval.0.ssa.ir} (100%)
 rename test_cases/group_side_effects/out/AppCall.ir/{AppCall.approval.1.approval.ssa.opt.ir => AppCall.approval.1.ssa.opt.ir} (100%)
 rename test_cases/group_side_effects/out/AppCall.ir/{AppCall.approval.2.approval.ssa.opt.ir => AppCall.approval.2.ssa.opt.ir} (100%)
 rename test_cases/group_side_effects/out/AppCall.ir/{AppCall.approval.3.approval.destructured.ir => AppCall.approval.3.destructured.ir} (100%)
 rename test_cases/group_side_effects/out/AppCall.ir/{AppCall.clear.0.clear.ssa.ir => AppCall.clear.0.ssa.ir} (100%)
 rename test_cases/group_side_effects/out/AppCall.ir/{AppCall.clear.1.clear.destructured.ir => AppCall.clear.1.destructured.ir} (100%)
 rename test_cases/group_side_effects/out/AppExpectingEffects.ir/{AppExpectingEffects.approval.0.approval.ssa.ir => AppExpectingEffects.approval.0.ssa.ir} (100%)
 rename test_cases/group_side_effects/out/AppExpectingEffects.ir/{AppExpectingEffects.approval.1.approval.ssa.opt.ir => AppExpectingEffects.approval.1.ssa.opt.ir} (100%)
 rename test_cases/group_side_effects/out/AppExpectingEffects.ir/{AppExpectingEffects.approval.2.approval.ssa.opt.ir => AppExpectingEffects.approval.2.ssa.opt.ir} (100%)
 rename test_cases/group_side_effects/out/AppExpectingEffects.ir/{AppExpectingEffects.approval.3.approval.destructured.ir => AppExpectingEffects.approval.3.destructured.ir} (100%)
 rename test_cases/group_side_effects/out/AppExpectingEffects.ir/{AppExpectingEffects.clear.0.clear.ssa.ir => AppExpectingEffects.clear.0.ssa.ir} (100%)
 rename test_cases/group_side_effects/out/AppExpectingEffects.ir/{AppExpectingEffects.clear.1.clear.destructured.ir => AppExpectingEffects.clear.1.destructured.ir} (100%)
 rename test_cases/group_side_effects/out_O2/AppCall.ir/{AppCall.approval.0.approval.destructured.ir => AppCall.approval.0.destructured.ir} (100%)
 rename test_cases/group_side_effects/out_O2/AppCall.ir/{AppCall.clear.0.clear.destructured.ir => AppCall.clear.0.destructured.ir} (100%)
 rename test_cases/group_side_effects/out_O2/AppExpectingEffects.ir/{AppExpectingEffects.approval.0.approval.destructured.ir => AppExpectingEffects.approval.0.destructured.ir} (100%)
 rename test_cases/group_side_effects/out_O2/AppExpectingEffects.ir/{AppExpectingEffects.clear.0.clear.destructured.ir => AppExpectingEffects.clear.0.destructured.ir} (100%)
 rename test_cases/group_side_effects/out_unoptimized/AppCall.ir/{AppCall.approval.0.approval.destructured.ir => AppCall.approval.0.destructured.ir} (100%)
 rename test_cases/group_side_effects/out_unoptimized/AppCall.ir/{AppCall.clear.0.clear.destructured.ir => AppCall.clear.0.destructured.ir} (100%)
 rename test_cases/group_side_effects/out_unoptimized/AppExpectingEffects.ir/{AppExpectingEffects.approval.0.approval.destructured.ir => AppExpectingEffects.approval.0.destructured.ir} (100%)
 rename test_cases/group_side_effects/out_unoptimized/AppExpectingEffects.ir/{AppExpectingEffects.clear.0.clear.destructured.ir => AppExpectingEffects.clear.0.destructured.ir} (100%)
 rename test_cases/inheritance/out/ChildContract.ir/{ChildContract.approval.0.approval.ssa.ir => ChildContract.approval.0.ssa.ir} (100%)
 rename test_cases/inheritance/out/ChildContract.ir/{ChildContract.approval.1.approval.ssa.opt.ir => ChildContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/inheritance/out/ChildContract.ir/{ChildContract.approval.2.approval.ssa.opt.ir => ChildContract.approval.2.ssa.opt.ir} (100%)
 rename test_cases/inheritance/out/ChildContract.ir/{ChildContract.approval.3.approval.destructured.ir => ChildContract.approval.3.destructured.ir} (100%)
 rename test_cases/inheritance/out/ChildContract.ir/{ChildContract.clear.0.clear.ssa.ir => ChildContract.clear.0.ssa.ir} (100%)
 rename test_cases/inheritance/out/ChildContract.ir/{ChildContract.clear.1.clear.destructured.ir => ChildContract.clear.1.destructured.ir} (100%)
 rename test_cases/inheritance/out/GrandParentContract.ir/{GrandParentContract.approval.0.approval.ssa.ir => GrandParentContract.approval.0.ssa.ir} (100%)
 rename test_cases/inheritance/out/GrandParentContract.ir/{GrandParentContract.approval.1.approval.ssa.opt.ir => GrandParentContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/inheritance/out/GrandParentContract.ir/{GrandParentContract.approval.2.approval.destructured.ir => GrandParentContract.approval.2.destructured.ir} (100%)
 rename test_cases/inheritance/out/GrandParentContract.ir/{GrandParentContract.clear.0.clear.ssa.ir => GrandParentContract.clear.0.ssa.ir} (100%)
 rename test_cases/inheritance/out/GrandParentContract.ir/{GrandParentContract.clear.1.clear.destructured.ir => GrandParentContract.clear.1.destructured.ir} (100%)
 rename test_cases/inheritance/out/GreatGrandParentContract.ir/{GreatGrandParentContract.approval.0.approval.ssa.ir => GreatGrandParentContract.approval.0.ssa.ir} (100%)
 rename test_cases/inheritance/out/GreatGrandParentContract.ir/{GreatGrandParentContract.approval.1.approval.ssa.opt.ir => GreatGrandParentContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/inheritance/out/GreatGrandParentContract.ir/{GreatGrandParentContract.approval.2.approval.destructured.ir => GreatGrandParentContract.approval.2.destructured.ir} (100%)
 rename test_cases/inheritance/out/GreatGrandParentContract.ir/{GreatGrandParentContract.clear.0.clear.ssa.ir => GreatGrandParentContract.clear.0.ssa.ir} (100%)
 rename test_cases/inheritance/out/GreatGrandParentContract.ir/{GreatGrandParentContract.clear.1.clear.destructured.ir => GreatGrandParentContract.clear.1.destructured.ir} (100%)
 rename test_cases/inheritance/out/ParentContract.ir/{ParentContract.approval.0.approval.ssa.ir => ParentContract.approval.0.ssa.ir} (100%)
 rename test_cases/inheritance/out/ParentContract.ir/{ParentContract.approval.1.approval.ssa.opt.ir => ParentContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/inheritance/out/ParentContract.ir/{ParentContract.approval.2.approval.ssa.opt.ir => ParentContract.approval.2.ssa.opt.ir} (100%)
 rename test_cases/inheritance/out/ParentContract.ir/{ParentContract.approval.3.approval.destructured.ir => ParentContract.approval.3.destructured.ir} (100%)
 rename test_cases/inheritance/out/ParentContract.ir/{ParentContract.clear.0.clear.ssa.ir => ParentContract.clear.0.ssa.ir} (100%)
 rename test_cases/inheritance/out/ParentContract.ir/{ParentContract.clear.1.clear.destructured.ir => ParentContract.clear.1.destructured.ir} (100%)
 rename test_cases/inheritance/out_O2/ChildContract.ir/{ChildContract.approval.0.approval.destructured.ir => ChildContract.approval.0.destructured.ir} (100%)
 rename test_cases/inheritance/out_O2/ChildContract.ir/{ChildContract.clear.0.clear.destructured.ir => ChildContract.clear.0.destructured.ir} (100%)
 rename test_cases/inheritance/out_O2/GrandParentContract.ir/{GrandParentContract.approval.0.approval.destructured.ir => GrandParentContract.approval.0.destructured.ir} (100%)
 rename test_cases/inheritance/out_O2/GrandParentContract.ir/{GrandParentContract.clear.0.clear.destructured.ir => GrandParentContract.clear.0.destructured.ir} (100%)
 rename test_cases/inheritance/out_O2/GreatGrandParentContract.ir/{GreatGrandParentContract.approval.0.approval.destructured.ir => GreatGrandParentContract.approval.0.destructured.ir} (100%)
 rename test_cases/inheritance/out_O2/GreatGrandParentContract.ir/{GreatGrandParentContract.clear.0.clear.destructured.ir => GreatGrandParentContract.clear.0.destructured.ir} (100%)
 rename test_cases/inheritance/out_O2/ParentContract.ir/{ParentContract.approval.0.approval.destructured.ir => ParentContract.approval.0.destructured.ir} (100%)
 rename test_cases/inheritance/out_O2/ParentContract.ir/{ParentContract.clear.0.clear.destructured.ir => ParentContract.clear.0.destructured.ir} (100%)
 rename test_cases/inheritance/out_unoptimized/ChildContract.ir/{ChildContract.approval.0.approval.destructured.ir => ChildContract.approval.0.destructured.ir} (100%)
 rename test_cases/inheritance/out_unoptimized/ChildContract.ir/{ChildContract.clear.0.clear.destructured.ir => ChildContract.clear.0.destructured.ir} (100%)
 rename test_cases/inheritance/out_unoptimized/GrandParentContract.ir/{GrandParentContract.approval.0.approval.destructured.ir => GrandParentContract.approval.0.destructured.ir} (100%)
 rename test_cases/inheritance/out_unoptimized/GrandParentContract.ir/{GrandParentContract.clear.0.clear.destructured.ir => GrandParentContract.clear.0.destructured.ir} (100%)
 rename test_cases/inheritance/out_unoptimized/GreatGrandParentContract.ir/{GreatGrandParentContract.approval.0.approval.destructured.ir => GreatGrandParentContract.approval.0.destructured.ir} (100%)
 rename test_cases/inheritance/out_unoptimized/GreatGrandParentContract.ir/{GreatGrandParentContract.clear.0.clear.destructured.ir => GreatGrandParentContract.clear.0.destructured.ir} (100%)
 rename test_cases/inheritance/out_unoptimized/ParentContract.ir/{ParentContract.approval.0.approval.destructured.ir => ParentContract.approval.0.destructured.ir} (100%)
 rename test_cases/inheritance/out_unoptimized/ParentContract.ir/{ParentContract.clear.0.clear.destructured.ir => ParentContract.clear.0.destructured.ir} (100%)
 rename test_cases/inlining/out/MyContract.ir/{MyContract.approval.0.approval.ssa.ir => MyContract.approval.0.ssa.ir} (100%)
 rename test_cases/inlining/out/MyContract.ir/{MyContract.approval.1.approval.ssa.opt.ir => MyContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/inlining/out/MyContract.ir/{MyContract.approval.2.approval.ssa.opt.ir => MyContract.approval.2.ssa.opt.ir} (100%)
 rename test_cases/inlining/out/MyContract.ir/{MyContract.approval.3.approval.destructured.ir => MyContract.approval.3.destructured.ir} (100%)
 rename test_cases/inlining/out/MyContract.ir/{MyContract.clear.0.clear.ssa.ir => MyContract.clear.0.ssa.ir} (100%)
 rename test_cases/inlining/out/MyContract.ir/{MyContract.clear.1.clear.destructured.ir => MyContract.clear.1.destructured.ir} (100%)
 rename test_cases/inlining/out_O2/MyContract.ir/{MyContract.approval.0.approval.destructured.ir => MyContract.approval.0.destructured.ir} (100%)
 rename test_cases/inlining/out_O2/MyContract.ir/{MyContract.clear.0.clear.destructured.ir => MyContract.clear.0.destructured.ir} (100%)
 rename test_cases/inlining/out_unoptimized/MyContract.ir/{MyContract.approval.0.approval.destructured.ir => MyContract.approval.0.destructured.ir} (100%)
 rename test_cases/inlining/out_unoptimized/MyContract.ir/{MyContract.clear.0.clear.destructured.ir => MyContract.clear.0.destructured.ir} (100%)
 rename test_cases/inner_transactions/out/ArrayAccessContract.ir/{ArrayAccessContract.approval.0.approval.ssa.ir => ArrayAccessContract.approval.0.ssa.ir} (100%)
 rename test_cases/inner_transactions/out/ArrayAccessContract.ir/{ArrayAccessContract.approval.1.approval.ssa.opt.ir => ArrayAccessContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/inner_transactions/out/ArrayAccessContract.ir/{ArrayAccessContract.approval.2.approval.ssa.opt.ir => ArrayAccessContract.approval.2.ssa.opt.ir} (100%)
 rename test_cases/inner_transactions/out/ArrayAccessContract.ir/{ArrayAccessContract.approval.3.approval.destructured.ir => ArrayAccessContract.approval.3.destructured.ir} (100%)
 rename test_cases/inner_transactions/out/ArrayAccessContract.ir/{ArrayAccessContract.clear.0.clear.ssa.ir => ArrayAccessContract.clear.0.ssa.ir} (100%)
 rename test_cases/inner_transactions/out/ArrayAccessContract.ir/{ArrayAccessContract.clear.1.clear.destructured.ir => ArrayAccessContract.clear.1.destructured.ir} (100%)
 rename test_cases/inner_transactions/out/CreateAndTransferContract.ir/{CreateAndTransferContract.approval.0.approval.ssa.ir => CreateAndTransferContract.approval.0.ssa.ir} (100%)
 rename test_cases/inner_transactions/out/CreateAndTransferContract.ir/{CreateAndTransferContract.approval.1.approval.ssa.opt.ir => CreateAndTransferContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/inner_transactions/out/CreateAndTransferContract.ir/{CreateAndTransferContract.approval.2.approval.ssa.opt.ir => CreateAndTransferContract.approval.2.ssa.opt.ir} (100%)
 rename test_cases/inner_transactions/out/CreateAndTransferContract.ir/{CreateAndTransferContract.approval.3.approval.destructured.ir => CreateAndTransferContract.approval.3.destructured.ir} (100%)
 rename test_cases/inner_transactions/out/CreateAndTransferContract.ir/{CreateAndTransferContract.clear.0.clear.ssa.ir => CreateAndTransferContract.clear.0.ssa.ir} (100%)
 rename test_cases/inner_transactions/out/CreateAndTransferContract.ir/{CreateAndTransferContract.clear.1.clear.destructured.ir => CreateAndTransferContract.clear.1.destructured.ir} (100%)
 rename test_cases/inner_transactions/out/FieldTupleContract.ir/{FieldTupleContract.approval.0.approval.ssa.ir => FieldTupleContract.approval.0.ssa.ir} (100%)
 rename test_cases/inner_transactions/out/FieldTupleContract.ir/{FieldTupleContract.approval.1.approval.ssa.opt.ir => FieldTupleContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/inner_transactions/out/FieldTupleContract.ir/{FieldTupleContract.approval.2.approval.ssa.opt.ir => FieldTupleContract.approval.2.ssa.opt.ir} (100%)
 rename test_cases/inner_transactions/out/FieldTupleContract.ir/{FieldTupleContract.approval.3.approval.destructured.ir => FieldTupleContract.approval.3.destructured.ir} (100%)
 rename test_cases/inner_transactions/out/FieldTupleContract.ir/{FieldTupleContract.clear.0.clear.ssa.ir => FieldTupleContract.clear.0.ssa.ir} (100%)
 rename test_cases/inner_transactions/out/FieldTupleContract.ir/{FieldTupleContract.clear.1.clear.destructured.ir => FieldTupleContract.clear.1.destructured.ir} (100%)
 rename test_cases/inner_transactions/out/Greeter.ir/{Greeter.approval.0.approval.ssa.ir => Greeter.approval.0.ssa.ir} (100%)
 rename test_cases/inner_transactions/out/Greeter.ir/{Greeter.approval.1.approval.ssa.opt.ir => Greeter.approval.1.ssa.opt.ir} (100%)
 rename test_cases/inner_transactions/out/Greeter.ir/{Greeter.approval.2.approval.ssa.opt.ir => Greeter.approval.2.ssa.opt.ir} (100%)
 rename test_cases/inner_transactions/out/Greeter.ir/{Greeter.approval.3.approval.destructured.ir => Greeter.approval.3.destructured.ir} (100%)
 rename test_cases/inner_transactions/out/Greeter.ir/{Greeter.clear.0.clear.ssa.ir => Greeter.clear.0.ssa.ir} (100%)
 rename test_cases/inner_transactions/out/Greeter.ir/{Greeter.clear.1.clear.destructured.ir => Greeter.clear.1.destructured.ir} (100%)
 rename test_cases/inner_transactions/out/MyContract.ir/{MyContract.approval.0.approval.ssa.ir => MyContract.approval.0.ssa.ir} (100%)
 rename test_cases/inner_transactions/out/MyContract.ir/{MyContract.approval.1.approval.ssa.opt.ir => MyContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/inner_transactions/out/MyContract.ir/{MyContract.approval.2.approval.ssa.opt.ir => MyContract.approval.2.ssa.opt.ir} (100%)
 rename test_cases/inner_transactions/out/MyContract.ir/{MyContract.approval.3.approval.destructured.ir => MyContract.approval.3.destructured.ir} (100%)
 rename test_cases/inner_transactions/out/MyContract.ir/{MyContract.clear.0.clear.ssa.ir => MyContract.clear.0.ssa.ir} (100%)
 rename test_cases/inner_transactions/out/MyContract.ir/{MyContract.clear.1.clear.destructured.ir => MyContract.clear.1.destructured.ir} (100%)
 rename test_cases/inner_transactions/out/itxn_loop.ir/{itxn_loop.approval.0.approval.ssa.ir => itxn_loop.approval.0.ssa.ir} (100%)
 rename test_cases/inner_transactions/out/itxn_loop.ir/{itxn_loop.approval.1.approval.ssa.opt.ir => itxn_loop.approval.1.ssa.opt.ir} (100%)
 rename test_cases/inner_transactions/out/itxn_loop.ir/{itxn_loop.approval.2.approval.destructured.ir => itxn_loop.approval.2.destructured.ir} (100%)
 rename test_cases/inner_transactions/out/itxn_loop.ir/{itxn_loop.clear.0.clear.ssa.ir => itxn_loop.clear.0.ssa.ir} (100%)
 rename test_cases/inner_transactions/out/itxn_loop.ir/{itxn_loop.clear.1.clear.destructured.ir => itxn_loop.clear.1.destructured.ir} (100%)
 rename test_cases/inner_transactions/out_O2/ArrayAccessContract.ir/{ArrayAccessContract.approval.0.approval.destructured.ir => ArrayAccessContract.approval.0.destructured.ir} (100%)
 rename test_cases/inner_transactions/out_O2/ArrayAccessContract.ir/{ArrayAccessContract.clear.0.clear.destructured.ir => ArrayAccessContract.clear.0.destructured.ir} (100%)
 rename test_cases/inner_transactions/out_O2/CreateAndTransferContract.ir/{CreateAndTransferContract.approval.0.approval.destructured.ir => CreateAndTransferContract.approval.0.destructured.ir} (100%)
 rename test_cases/inner_transactions/out_O2/CreateAndTransferContract.ir/{CreateAndTransferContract.clear.0.clear.destructured.ir => CreateAndTransferContract.clear.0.destructured.ir} (100%)
 rename test_cases/inner_transactions/out_O2/FieldTupleContract.ir/{FieldTupleContract.approval.0.approval.destructured.ir => FieldTupleContract.approval.0.destructured.ir} (100%)
 rename test_cases/inner_transactions/out_O2/FieldTupleContract.ir/{FieldTupleContract.clear.0.clear.destructured.ir => FieldTupleContract.clear.0.destructured.ir} (100%)
 rename test_cases/inner_transactions/out_O2/Greeter.ir/{Greeter.approval.0.approval.destructured.ir => Greeter.approval.0.destructured.ir} (100%)
 rename test_cases/inner_transactions/out_O2/Greeter.ir/{Greeter.clear.0.clear.destructured.ir => Greeter.clear.0.destructured.ir} (100%)
 rename test_cases/inner_transactions/out_O2/MyContract.ir/{MyContract.approval.0.approval.destructured.ir => MyContract.approval.0.destructured.ir} (100%)
 rename test_cases/inner_transactions/out_O2/MyContract.ir/{MyContract.clear.0.clear.destructured.ir => MyContract.clear.0.destructured.ir} (100%)
 rename test_cases/inner_transactions/out_O2/itxn_loop.ir/{itxn_loop.approval.0.approval.destructured.ir => itxn_loop.approval.0.destructured.ir} (100%)
 rename test_cases/inner_transactions/out_O2/itxn_loop.ir/{itxn_loop.clear.0.clear.destructured.ir => itxn_loop.clear.0.destructured.ir} (100%)
 rename test_cases/inner_transactions/out_unoptimized/ArrayAccessContract.ir/{ArrayAccessContract.approval.0.approval.destructured.ir => ArrayAccessContract.approval.0.destructured.ir} (100%)
 rename test_cases/inner_transactions/out_unoptimized/ArrayAccessContract.ir/{ArrayAccessContract.clear.0.clear.destructured.ir => ArrayAccessContract.clear.0.destructured.ir} (100%)
 rename test_cases/inner_transactions/out_unoptimized/CreateAndTransferContract.ir/{CreateAndTransferContract.approval.0.approval.destructured.ir => CreateAndTransferContract.approval.0.destructured.ir} (100%)
 rename test_cases/inner_transactions/out_unoptimized/CreateAndTransferContract.ir/{CreateAndTransferContract.clear.0.clear.destructured.ir => CreateAndTransferContract.clear.0.destructured.ir} (100%)
 rename test_cases/inner_transactions/out_unoptimized/FieldTupleContract.ir/{FieldTupleContract.approval.0.approval.destructured.ir => FieldTupleContract.approval.0.destructured.ir} (100%)
 rename test_cases/inner_transactions/out_unoptimized/FieldTupleContract.ir/{FieldTupleContract.clear.0.clear.destructured.ir => FieldTupleContract.clear.0.destructured.ir} (100%)
 rename test_cases/inner_transactions/out_unoptimized/Greeter.ir/{Greeter.approval.0.approval.destructured.ir => Greeter.approval.0.destructured.ir} (100%)
 rename test_cases/inner_transactions/out_unoptimized/Greeter.ir/{Greeter.clear.0.clear.destructured.ir => Greeter.clear.0.destructured.ir} (100%)
 rename test_cases/inner_transactions/out_unoptimized/MyContract.ir/{MyContract.approval.0.approval.destructured.ir => MyContract.approval.0.destructured.ir} (100%)
 rename test_cases/inner_transactions/out_unoptimized/MyContract.ir/{MyContract.clear.0.clear.destructured.ir => MyContract.clear.0.destructured.ir} (100%)
 rename test_cases/inner_transactions/out_unoptimized/itxn_loop.ir/{itxn_loop.approval.0.approval.destructured.ir => itxn_loop.approval.0.destructured.ir} (100%)
 rename test_cases/inner_transactions/out_unoptimized/itxn_loop.ir/{itxn_loop.clear.0.clear.destructured.ir => itxn_loop.clear.0.destructured.ir} (100%)
 rename test_cases/inner_transactions_assignment/out/Contract.ir/{Contract.approval.0.approval.ssa.ir => Contract.approval.0.ssa.ir} (100%)
 rename test_cases/inner_transactions_assignment/out/Contract.ir/{Contract.approval.1.approval.ssa.opt.ir => Contract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/inner_transactions_assignment/out/Contract.ir/{Contract.approval.2.approval.ssa.opt.ir => Contract.approval.2.ssa.opt.ir} (100%)
 rename test_cases/inner_transactions_assignment/out/Contract.ir/{Contract.approval.3.approval.destructured.ir => Contract.approval.3.destructured.ir} (100%)
 rename test_cases/inner_transactions_assignment/out/Contract.ir/{Contract.clear.0.clear.ssa.ir => Contract.clear.0.ssa.ir} (100%)
 rename test_cases/inner_transactions_assignment/out/Contract.ir/{Contract.clear.1.clear.destructured.ir => Contract.clear.1.destructured.ir} (100%)
 rename test_cases/inner_transactions_assignment/out_O2/Contract.ir/{Contract.approval.0.approval.destructured.ir => Contract.approval.0.destructured.ir} (100%)
 rename test_cases/inner_transactions_assignment/out_O2/Contract.ir/{Contract.clear.0.clear.destructured.ir => Contract.clear.0.destructured.ir} (100%)
 rename test_cases/inner_transactions_assignment/out_unoptimized/Contract.ir/{Contract.approval.0.approval.destructured.ir => Contract.approval.0.destructured.ir} (100%)
 rename test_cases/inner_transactions_assignment/out_unoptimized/Contract.ir/{Contract.clear.0.clear.destructured.ir => Contract.clear.0.destructured.ir} (100%)
 rename test_cases/intrinsics/out/ImmediateVariants.ir/{ImmediateVariants.approval.0.approval.ssa.ir => ImmediateVariants.approval.0.ssa.ir} (100%)
 rename test_cases/intrinsics/out/ImmediateVariants.ir/{ImmediateVariants.approval.1.approval.ssa.opt.ir => ImmediateVariants.approval.1.ssa.opt.ir} (100%)
 rename test_cases/intrinsics/out/ImmediateVariants.ir/{ImmediateVariants.approval.2.approval.destructured.ir => ImmediateVariants.approval.2.destructured.ir} (100%)
 rename test_cases/intrinsics/out/ImmediateVariants.ir/{ImmediateVariants.clear.0.clear.ssa.ir => ImmediateVariants.clear.0.ssa.ir} (100%)
 rename test_cases/intrinsics/out/ImmediateVariants.ir/{ImmediateVariants.clear.1.clear.destructured.ir => ImmediateVariants.clear.1.destructured.ir} (100%)
 rename test_cases/intrinsics/out/Overloaded.ir/{Overloaded.approval.0.approval.ssa.ir => Overloaded.approval.0.ssa.ir} (100%)
 rename test_cases/intrinsics/out/Overloaded.ir/{Overloaded.approval.1.approval.ssa.opt.ir => Overloaded.approval.1.ssa.opt.ir} (100%)
 rename test_cases/intrinsics/out/Overloaded.ir/{Overloaded.approval.2.approval.destructured.ir => Overloaded.approval.2.destructured.ir} (100%)
 rename test_cases/intrinsics/out/Overloaded.ir/{Overloaded.clear.0.clear.ssa.ir => Overloaded.clear.0.ssa.ir} (100%)
 rename test_cases/intrinsics/out/Overloaded.ir/{Overloaded.clear.1.clear.destructured.ir => Overloaded.clear.1.destructured.ir} (100%)
 rename test_cases/intrinsics/out_O2/ImmediateVariants.ir/{ImmediateVariants.approval.0.approval.destructured.ir => ImmediateVariants.approval.0.destructured.ir} (100%)
 rename test_cases/intrinsics/out_O2/ImmediateVariants.ir/{ImmediateVariants.clear.0.clear.destructured.ir => ImmediateVariants.clear.0.destructured.ir} (100%)
 rename test_cases/intrinsics/out_O2/Overloaded.ir/{Overloaded.approval.0.approval.destructured.ir => Overloaded.approval.0.destructured.ir} (100%)
 rename test_cases/intrinsics/out_O2/Overloaded.ir/{Overloaded.clear.0.clear.destructured.ir => Overloaded.clear.0.destructured.ir} (100%)
 rename test_cases/intrinsics/out_unoptimized/ImmediateVariants.ir/{ImmediateVariants.approval.0.approval.destructured.ir => ImmediateVariants.approval.0.destructured.ir} (100%)
 rename test_cases/intrinsics/out_unoptimized/ImmediateVariants.ir/{ImmediateVariants.clear.0.clear.destructured.ir => ImmediateVariants.clear.0.destructured.ir} (100%)
 rename test_cases/intrinsics/out_unoptimized/Overloaded.ir/{Overloaded.approval.0.approval.destructured.ir => Overloaded.approval.0.destructured.ir} (100%)
 rename test_cases/intrinsics/out_unoptimized/Overloaded.ir/{Overloaded.clear.0.clear.destructured.ir => Overloaded.clear.0.destructured.ir} (100%)
 rename test_cases/iteration/out/IndexableIterationTest.ir/{IndexableIterationTest.approval.0.approval.ssa.ir => IndexableIterationTest.approval.0.ssa.ir} (100%)
 rename test_cases/iteration/out/IndexableIterationTest.ir/{IndexableIterationTest.approval.1.approval.ssa.opt.ir => IndexableIterationTest.approval.1.ssa.opt.ir} (100%)
 rename test_cases/iteration/out/IndexableIterationTest.ir/{IndexableIterationTest.approval.2.approval.destructured.ir => IndexableIterationTest.approval.2.destructured.ir} (100%)
 rename test_cases/iteration/out/IndexableIterationTest.ir/{IndexableIterationTest.clear.0.clear.ssa.ir => IndexableIterationTest.clear.0.ssa.ir} (100%)
 rename test_cases/iteration/out/IndexableIterationTest.ir/{IndexableIterationTest.clear.1.clear.destructured.ir => IndexableIterationTest.clear.1.destructured.ir} (100%)
 rename test_cases/iteration/out/TupleIterationTest.ir/{TupleIterationTest.approval.0.approval.ssa.ir => TupleIterationTest.approval.0.ssa.ir} (100%)
 rename test_cases/iteration/out/TupleIterationTest.ir/{TupleIterationTest.approval.1.approval.ssa.opt.ir => TupleIterationTest.approval.1.ssa.opt.ir} (100%)
 rename test_cases/iteration/out/TupleIterationTest.ir/{TupleIterationTest.approval.2.approval.destructured.ir => TupleIterationTest.approval.2.destructured.ir} (100%)
 rename test_cases/iteration/out/TupleIterationTest.ir/{TupleIterationTest.clear.0.clear.ssa.ir => TupleIterationTest.clear.0.ssa.ir} (100%)
 rename test_cases/iteration/out/TupleIterationTest.ir/{TupleIterationTest.clear.1.clear.destructured.ir => TupleIterationTest.clear.1.destructured.ir} (100%)
 rename test_cases/iteration/out/URangeIterationTest.ir/{URangeIterationTest.approval.0.approval.ssa.ir => URangeIterationTest.approval.0.ssa.ir} (100%)
 rename test_cases/iteration/out/URangeIterationTest.ir/{URangeIterationTest.approval.1.approval.ssa.opt.ir => URangeIterationTest.approval.1.ssa.opt.ir} (100%)
 rename test_cases/iteration/out/URangeIterationTest.ir/{URangeIterationTest.approval.2.approval.destructured.ir => URangeIterationTest.approval.2.destructured.ir} (100%)
 rename test_cases/iteration/out/URangeIterationTest.ir/{URangeIterationTest.clear.0.clear.ssa.ir => URangeIterationTest.clear.0.ssa.ir} (100%)
 rename test_cases/iteration/out/URangeIterationTest.ir/{URangeIterationTest.clear.1.clear.destructured.ir => URangeIterationTest.clear.1.destructured.ir} (100%)
 rename test_cases/iteration/out_O2/IndexableIterationTest.ir/{IndexableIterationTest.approval.0.approval.destructured.ir => IndexableIterationTest.approval.0.destructured.ir} (100%)
 rename test_cases/iteration/out_O2/IndexableIterationTest.ir/{IndexableIterationTest.clear.0.clear.destructured.ir => IndexableIterationTest.clear.0.destructured.ir} (100%)
 rename test_cases/iteration/out_O2/TupleIterationTest.ir/{TupleIterationTest.approval.0.approval.destructured.ir => TupleIterationTest.approval.0.destructured.ir} (100%)
 rename test_cases/iteration/out_O2/TupleIterationTest.ir/{TupleIterationTest.clear.0.clear.destructured.ir => TupleIterationTest.clear.0.destructured.ir} (100%)
 rename test_cases/iteration/out_O2/URangeIterationTest.ir/{URangeIterationTest.approval.0.approval.destructured.ir => URangeIterationTest.approval.0.destructured.ir} (100%)
 rename test_cases/iteration/out_O2/URangeIterationTest.ir/{URangeIterationTest.clear.0.clear.destructured.ir => URangeIterationTest.clear.0.destructured.ir} (100%)
 rename test_cases/iteration/out_unoptimized/IndexableIterationTest.ir/{IndexableIterationTest.approval.0.approval.destructured.ir => IndexableIterationTest.approval.0.destructured.ir} (100%)
 rename test_cases/iteration/out_unoptimized/IndexableIterationTest.ir/{IndexableIterationTest.clear.0.clear.destructured.ir => IndexableIterationTest.clear.0.destructured.ir} (100%)
 rename test_cases/iteration/out_unoptimized/TupleIterationTest.ir/{TupleIterationTest.approval.0.approval.destructured.ir => TupleIterationTest.approval.0.destructured.ir} (100%)
 rename test_cases/iteration/out_unoptimized/TupleIterationTest.ir/{TupleIterationTest.clear.0.clear.destructured.ir => TupleIterationTest.clear.0.destructured.ir} (100%)
 rename test_cases/iteration/out_unoptimized/URangeIterationTest.ir/{URangeIterationTest.approval.0.approval.destructured.ir => URangeIterationTest.approval.0.destructured.ir} (100%)
 rename test_cases/iteration/out_unoptimized/URangeIterationTest.ir/{URangeIterationTest.clear.0.clear.destructured.ir => URangeIterationTest.clear.0.destructured.ir} (100%)
 rename test_cases/koopman/out/MyContract.ir/{MyContract.approval.0.approval.ssa.ir => MyContract.approval.0.ssa.ir} (100%)
 rename test_cases/koopman/out/MyContract.ir/{MyContract.approval.1.approval.ssa.opt.ir => MyContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/koopman/out/MyContract.ir/{MyContract.approval.2.approval.destructured.ir => MyContract.approval.2.destructured.ir} (100%)
 rename test_cases/koopman/out/MyContract.ir/{MyContract.clear.0.clear.ssa.ir => MyContract.clear.0.ssa.ir} (100%)
 rename test_cases/koopman/out/MyContract.ir/{MyContract.clear.1.clear.destructured.ir => MyContract.clear.1.destructured.ir} (100%)
 rename test_cases/koopman/out_O2/MyContract.ir/{MyContract.approval.0.approval.destructured.ir => MyContract.approval.0.destructured.ir} (100%)
 rename test_cases/koopman/out_O2/MyContract.ir/{MyContract.clear.0.clear.destructured.ir => MyContract.clear.0.destructured.ir} (100%)
 rename test_cases/koopman/out_unoptimized/MyContract.ir/{MyContract.approval.0.approval.destructured.ir => MyContract.approval.0.destructured.ir} (100%)
 rename test_cases/koopman/out_unoptimized/MyContract.ir/{MyContract.clear.0.clear.destructured.ir => MyContract.clear.0.destructured.ir} (100%)
 rename test_cases/less_simple/out/MyContract.ir/{MyContract.approval.0.approval.ssa.ir => MyContract.approval.0.ssa.ir} (100%)
 rename test_cases/less_simple/out/MyContract.ir/{MyContract.approval.1.approval.ssa.opt.ir => MyContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/less_simple/out/MyContract.ir/{MyContract.approval.2.approval.ssa.opt.ir => MyContract.approval.2.ssa.opt.ir} (100%)
 rename test_cases/less_simple/out/MyContract.ir/{MyContract.approval.3.approval.destructured.ir => MyContract.approval.3.destructured.ir} (100%)
 rename test_cases/less_simple/out/MyContract.ir/{MyContract.clear.0.clear.ssa.ir => MyContract.clear.0.ssa.ir} (100%)
 rename test_cases/less_simple/out/MyContract.ir/{MyContract.clear.1.clear.ssa.opt.ir => MyContract.clear.1.ssa.opt.ir} (100%)
 rename test_cases/less_simple/out/MyContract.ir/{MyContract.clear.2.clear.destructured.ir => MyContract.clear.2.destructured.ir} (100%)
 rename test_cases/less_simple/out_O2/MyContract.ir/{MyContract.approval.0.approval.destructured.ir => MyContract.approval.0.destructured.ir} (100%)
 rename test_cases/less_simple/out_O2/MyContract.ir/{MyContract.clear.0.clear.destructured.ir => MyContract.clear.0.destructured.ir} (100%)
 rename test_cases/less_simple/out_unoptimized/MyContract.ir/{MyContract.approval.0.approval.destructured.ir => MyContract.approval.0.destructured.ir} (100%)
 rename test_cases/less_simple/out_unoptimized/MyContract.ir/{MyContract.clear.0.clear.destructured.ir => MyContract.clear.0.destructured.ir} (100%)
 rename test_cases/literals/out/LiteralFolding.ir/{LiteralFolding.approval.0.approval.ssa.ir => LiteralFolding.approval.0.ssa.ir} (100%)
 rename test_cases/literals/out/LiteralFolding.ir/{LiteralFolding.approval.1.approval.ssa.opt.ir => LiteralFolding.approval.1.ssa.opt.ir} (100%)
 rename test_cases/literals/out/LiteralFolding.ir/{LiteralFolding.approval.2.approval.destructured.ir => LiteralFolding.approval.2.destructured.ir} (100%)
 rename test_cases/literals/out/LiteralFolding.ir/{LiteralFolding.clear.0.clear.ssa.ir => LiteralFolding.clear.0.ssa.ir} (100%)
 rename test_cases/literals/out/LiteralFolding.ir/{LiteralFolding.clear.1.clear.destructured.ir => LiteralFolding.clear.1.destructured.ir} (100%)
 rename test_cases/literals/out_O2/LiteralFolding.ir/{LiteralFolding.approval.0.approval.destructured.ir => LiteralFolding.approval.0.destructured.ir} (100%)
 rename test_cases/literals/out_O2/LiteralFolding.ir/{LiteralFolding.clear.0.clear.destructured.ir => LiteralFolding.clear.0.destructured.ir} (100%)
 rename test_cases/literals/out_unoptimized/LiteralFolding.ir/{LiteralFolding.approval.0.approval.destructured.ir => LiteralFolding.approval.0.destructured.ir} (100%)
 rename test_cases/literals/out_unoptimized/LiteralFolding.ir/{LiteralFolding.clear.0.clear.destructured.ir => LiteralFolding.clear.0.destructured.ir} (100%)
 rename test_cases/log/out/MyContract.ir/{MyContract.approval.0.approval.ssa.ir => MyContract.approval.0.ssa.ir} (100%)
 rename test_cases/log/out/MyContract.ir/{MyContract.approval.1.approval.ssa.opt.ir => MyContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/log/out/MyContract.ir/{MyContract.approval.2.approval.destructured.ir => MyContract.approval.2.destructured.ir} (100%)
 rename test_cases/log/out/MyContract.ir/{MyContract.clear.0.clear.ssa.ir => MyContract.clear.0.ssa.ir} (100%)
 rename test_cases/log/out/MyContract.ir/{MyContract.clear.1.clear.destructured.ir => MyContract.clear.1.destructured.ir} (100%)
 rename test_cases/log/out_O2/MyContract.ir/{MyContract.approval.0.approval.destructured.ir => MyContract.approval.0.destructured.ir} (100%)
 rename test_cases/log/out_O2/MyContract.ir/{MyContract.clear.0.clear.destructured.ir => MyContract.clear.0.destructured.ir} (100%)
 rename test_cases/log/out_unoptimized/MyContract.ir/{MyContract.approval.0.approval.destructured.ir => MyContract.approval.0.destructured.ir} (100%)
 rename test_cases/log/out_unoptimized/MyContract.ir/{MyContract.clear.0.clear.destructured.ir => MyContract.clear.0.destructured.ir} (100%)
 rename test_cases/loop_else/out/LoopElseContract.ir/{LoopElseContract.approval.0.approval.ssa.ir => LoopElseContract.approval.0.ssa.ir} (100%)
 rename test_cases/loop_else/out/LoopElseContract.ir/{LoopElseContract.approval.1.approval.ssa.opt.ir => LoopElseContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/loop_else/out/LoopElseContract.ir/{LoopElseContract.approval.2.approval.ssa.opt.ir => LoopElseContract.approval.2.ssa.opt.ir} (100%)
 rename test_cases/loop_else/out/LoopElseContract.ir/{LoopElseContract.approval.3.approval.destructured.ir => LoopElseContract.approval.3.destructured.ir} (100%)
 rename test_cases/loop_else/out/LoopElseContract.ir/{LoopElseContract.clear.0.clear.ssa.ir => LoopElseContract.clear.0.ssa.ir} (100%)
 rename test_cases/loop_else/out/LoopElseContract.ir/{LoopElseContract.clear.1.clear.destructured.ir => LoopElseContract.clear.1.destructured.ir} (100%)
 rename test_cases/loop_else/out_O2/LoopElseContract.ir/{LoopElseContract.approval.0.approval.destructured.ir => LoopElseContract.approval.0.destructured.ir} (100%)
 rename test_cases/loop_else/out_O2/LoopElseContract.ir/{LoopElseContract.clear.0.clear.destructured.ir => LoopElseContract.clear.0.destructured.ir} (100%)
 rename test_cases/loop_else/out_unoptimized/LoopElseContract.ir/{LoopElseContract.approval.0.approval.destructured.ir => LoopElseContract.approval.0.destructured.ir} (100%)
 rename test_cases/loop_else/out_unoptimized/LoopElseContract.ir/{LoopElseContract.clear.0.clear.destructured.ir => LoopElseContract.clear.0.destructured.ir} (100%)
 rename test_cases/match/out/Counter.ir/{Counter.approval.0.approval.ssa.ir => Counter.approval.0.ssa.ir} (100%)
 rename test_cases/match/out/Counter.ir/{Counter.approval.1.approval.ssa.opt.ir => Counter.approval.1.ssa.opt.ir} (100%)
 rename test_cases/match/out/Counter.ir/{Counter.approval.2.approval.ssa.opt.ir => Counter.approval.2.ssa.opt.ir} (100%)
 rename test_cases/match/out/Counter.ir/{Counter.approval.3.approval.destructured.ir => Counter.approval.3.destructured.ir} (100%)
 rename test_cases/match/out/Counter.ir/{Counter.clear.0.clear.ssa.ir => Counter.clear.0.ssa.ir} (100%)
 rename test_cases/match/out/Counter.ir/{Counter.clear.1.clear.destructured.ir => Counter.clear.1.destructured.ir} (100%)
 rename test_cases/match/out/MyContract.ir/{MyContract.approval.0.approval.ssa.ir => MyContract.approval.0.ssa.ir} (100%)
 rename test_cases/match/out/MyContract.ir/{MyContract.approval.1.approval.ssa.opt.ir => MyContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/match/out/MyContract.ir/{MyContract.approval.2.approval.destructured.ir => MyContract.approval.2.destructured.ir} (100%)
 rename test_cases/match/out/MyContract.ir/{MyContract.clear.0.clear.ssa.ir => MyContract.clear.0.ssa.ir} (100%)
 rename test_cases/match/out/MyContract.ir/{MyContract.clear.1.clear.destructured.ir => MyContract.clear.1.destructured.ir} (100%)
 rename test_cases/match/out_O2/Counter.ir/{Counter.approval.0.approval.destructured.ir => Counter.approval.0.destructured.ir} (100%)
 rename test_cases/match/out_O2/Counter.ir/{Counter.clear.0.clear.destructured.ir => Counter.clear.0.destructured.ir} (100%)
 rename test_cases/match/out_O2/MyContract.ir/{MyContract.approval.0.approval.destructured.ir => MyContract.approval.0.destructured.ir} (100%)
 rename test_cases/match/out_O2/MyContract.ir/{MyContract.clear.0.clear.destructured.ir => MyContract.clear.0.destructured.ir} (100%)
 rename test_cases/match/out_unoptimized/Counter.ir/{Counter.approval.0.approval.destructured.ir => Counter.approval.0.destructured.ir} (100%)
 rename test_cases/match/out_unoptimized/Counter.ir/{Counter.clear.0.clear.destructured.ir => Counter.clear.0.destructured.ir} (100%)
 rename test_cases/match/out_unoptimized/MyContract.ir/{MyContract.approval.0.approval.destructured.ir => MyContract.approval.0.destructured.ir} (100%)
 rename test_cases/match/out_unoptimized/MyContract.ir/{MyContract.clear.0.clear.destructured.ir => MyContract.clear.0.destructured.ir} (100%)
 rename test_cases/module_consts/out/MyContract.ir/{MyContract.approval.0.approval.ssa.ir => MyContract.approval.0.ssa.ir} (100%)
 rename test_cases/module_consts/out/MyContract.ir/{MyContract.approval.1.approval.ssa.opt.ir => MyContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/module_consts/out/MyContract.ir/{MyContract.approval.2.approval.destructured.ir => MyContract.approval.2.destructured.ir} (100%)
 rename test_cases/module_consts/out/MyContract.ir/{MyContract.clear.0.clear.ssa.ir => MyContract.clear.0.ssa.ir} (100%)
 rename test_cases/module_consts/out/MyContract.ir/{MyContract.clear.1.clear.destructured.ir => MyContract.clear.1.destructured.ir} (100%)
 rename test_cases/module_consts/out_O2/MyContract.ir/{MyContract.approval.0.approval.destructured.ir => MyContract.approval.0.destructured.ir} (100%)
 rename test_cases/module_consts/out_O2/MyContract.ir/{MyContract.clear.0.clear.destructured.ir => MyContract.clear.0.destructured.ir} (100%)
 rename test_cases/module_consts/out_unoptimized/MyContract.ir/{MyContract.approval.0.approval.destructured.ir => MyContract.approval.0.destructured.ir} (100%)
 rename test_cases/module_consts/out_unoptimized/MyContract.ir/{MyContract.clear.0.clear.destructured.ir => MyContract.clear.0.destructured.ir} (100%)
 rename test_cases/named_tuples/out/NamedTuplesContract.ir/{NamedTuplesContract.approval.0.approval.ssa.ir => NamedTuplesContract.approval.0.ssa.ir} (100%)
 rename test_cases/named_tuples/out/NamedTuplesContract.ir/{NamedTuplesContract.approval.1.approval.ssa.opt.ir => NamedTuplesContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/named_tuples/out/NamedTuplesContract.ir/{NamedTuplesContract.approval.2.approval.ssa.opt.ir => NamedTuplesContract.approval.2.ssa.opt.ir} (100%)
 rename test_cases/named_tuples/out/NamedTuplesContract.ir/{NamedTuplesContract.approval.3.approval.destructured.ir => NamedTuplesContract.approval.3.destructured.ir} (100%)
 rename test_cases/named_tuples/out/NamedTuplesContract.ir/{NamedTuplesContract.clear.0.clear.ssa.ir => NamedTuplesContract.clear.0.ssa.ir} (100%)
 rename test_cases/named_tuples/out/NamedTuplesContract.ir/{NamedTuplesContract.clear.1.clear.destructured.ir => NamedTuplesContract.clear.1.destructured.ir} (100%)
 rename test_cases/named_tuples/out_O2/NamedTuplesContract.ir/{NamedTuplesContract.approval.0.approval.destructured.ir => NamedTuplesContract.approval.0.destructured.ir} (100%)
 rename test_cases/named_tuples/out_O2/NamedTuplesContract.ir/{NamedTuplesContract.clear.0.clear.destructured.ir => NamedTuplesContract.clear.0.destructured.ir} (100%)
 rename test_cases/named_tuples/out_unoptimized/NamedTuplesContract.ir/{NamedTuplesContract.approval.0.approval.destructured.ir => NamedTuplesContract.approval.0.destructured.ir} (100%)
 rename test_cases/named_tuples/out_unoptimized/NamedTuplesContract.ir/{NamedTuplesContract.clear.0.clear.destructured.ir => NamedTuplesContract.clear.0.destructured.ir} (100%)
 rename test_cases/nested_loops/out/Nested.ir/{Nested.approval.0.approval.ssa.ir => Nested.approval.0.ssa.ir} (100%)
 rename test_cases/nested_loops/out/Nested.ir/{Nested.approval.1.approval.ssa.opt.ir => Nested.approval.1.ssa.opt.ir} (100%)
 rename test_cases/nested_loops/out/Nested.ir/{Nested.approval.2.approval.destructured.ir => Nested.approval.2.destructured.ir} (100%)
 rename test_cases/nested_loops/out/Nested.ir/{Nested.clear.0.clear.ssa.ir => Nested.clear.0.ssa.ir} (100%)
 rename test_cases/nested_loops/out/Nested.ir/{Nested.clear.1.clear.destructured.ir => Nested.clear.1.destructured.ir} (100%)
 rename test_cases/nested_loops/out_O2/Nested.ir/{Nested.approval.0.approval.destructured.ir => Nested.approval.0.destructured.ir} (100%)
 rename test_cases/nested_loops/out_O2/Nested.ir/{Nested.clear.0.clear.destructured.ir => Nested.clear.0.destructured.ir} (100%)
 rename test_cases/nested_loops/out_unoptimized/Nested.ir/{Nested.approval.0.approval.destructured.ir => Nested.approval.0.destructured.ir} (100%)
 rename test_cases/nested_loops/out_unoptimized/Nested.ir/{Nested.clear.0.clear.destructured.ir => Nested.clear.0.destructured.ir} (100%)
 rename test_cases/regression_tests/out/Issue118.ir/{Issue118.approval.0.approval.ssa.ir => Issue118.approval.0.ssa.ir} (100%)
 rename test_cases/regression_tests/out/Issue118.ir/{Issue118.approval.1.approval.ssa.opt.ir => Issue118.approval.1.ssa.opt.ir} (100%)
 rename test_cases/regression_tests/out/Issue118.ir/{Issue118.approval.2.approval.ssa.opt.ir => Issue118.approval.2.ssa.opt.ir} (100%)
 rename test_cases/regression_tests/out/Issue118.ir/{Issue118.approval.3.approval.destructured.ir => Issue118.approval.3.destructured.ir} (100%)
 rename test_cases/regression_tests/out/Issue118.ir/{Issue118.clear.0.clear.ssa.ir => Issue118.clear.0.ssa.ir} (100%)
 rename test_cases/regression_tests/out/Issue118.ir/{Issue118.clear.1.clear.destructured.ir => Issue118.clear.1.destructured.ir} (100%)
 rename test_cases/regression_tests/out/Issue194.ir/{Issue194.approval.0.approval.ssa.ir => Issue194.approval.0.ssa.ir} (100%)
 rename test_cases/regression_tests/out/Issue194.ir/{Issue194.approval.1.approval.ssa.opt.ir => Issue194.approval.1.ssa.opt.ir} (100%)
 rename test_cases/regression_tests/out/Issue194.ir/{Issue194.approval.2.approval.destructured.ir => Issue194.approval.2.destructured.ir} (100%)
 rename test_cases/regression_tests/out/Issue194.ir/{Issue194.clear.0.clear.ssa.ir => Issue194.clear.0.ssa.ir} (100%)
 rename test_cases/regression_tests/out/Issue194.ir/{Issue194.clear.1.clear.destructured.ir => Issue194.clear.1.destructured.ir} (100%)
 rename test_cases/regression_tests/out_O2/Issue118.ir/{Issue118.approval.0.approval.destructured.ir => Issue118.approval.0.destructured.ir} (100%)
 rename test_cases/regression_tests/out_O2/Issue118.ir/{Issue118.clear.0.clear.destructured.ir => Issue118.clear.0.destructured.ir} (100%)
 rename test_cases/regression_tests/out_O2/Issue194.ir/{Issue194.approval.0.approval.destructured.ir => Issue194.approval.0.destructured.ir} (100%)
 rename test_cases/regression_tests/out_O2/Issue194.ir/{Issue194.clear.0.clear.destructured.ir => Issue194.clear.0.destructured.ir} (100%)
 rename test_cases/regression_tests/out_unoptimized/Issue118.ir/{Issue118.approval.0.approval.destructured.ir => Issue118.approval.0.destructured.ir} (100%)
 rename test_cases/regression_tests/out_unoptimized/Issue118.ir/{Issue118.clear.0.clear.destructured.ir => Issue118.clear.0.destructured.ir} (100%)
 rename test_cases/regression_tests/out_unoptimized/Issue194.ir/{Issue194.approval.0.approval.destructured.ir => Issue194.approval.0.destructured.ir} (100%)
 rename test_cases/regression_tests/out_unoptimized/Issue194.ir/{Issue194.clear.0.clear.destructured.ir => Issue194.clear.0.destructured.ir} (100%)
 rename test_cases/reinterpret_cast/out/Contract.ir/{Contract.approval.0.approval.ssa.ir => Contract.approval.0.ssa.ir} (100%)
 rename test_cases/reinterpret_cast/out/Contract.ir/{Contract.approval.1.approval.ssa.opt.ir => Contract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/reinterpret_cast/out/Contract.ir/{Contract.approval.2.approval.ssa.opt.ir => Contract.approval.2.ssa.opt.ir} (100%)
 rename test_cases/reinterpret_cast/out/Contract.ir/{Contract.approval.3.approval.destructured.ir => Contract.approval.3.destructured.ir} (100%)
 rename test_cases/reinterpret_cast/out/Contract.ir/{Contract.clear.0.clear.ssa.ir => Contract.clear.0.ssa.ir} (100%)
 rename test_cases/reinterpret_cast/out/Contract.ir/{Contract.clear.1.clear.destructured.ir => Contract.clear.1.destructured.ir} (100%)
 rename test_cases/reinterpret_cast/out_O2/Contract.ir/{Contract.approval.0.approval.destructured.ir => Contract.approval.0.destructured.ir} (100%)
 rename test_cases/reinterpret_cast/out_O2/Contract.ir/{Contract.clear.0.clear.destructured.ir => Contract.clear.0.destructured.ir} (100%)
 rename test_cases/reinterpret_cast/out_unoptimized/Contract.ir/{Contract.approval.0.approval.destructured.ir => Contract.approval.0.destructured.ir} (100%)
 rename test_cases/reinterpret_cast/out_unoptimized/Contract.ir/{Contract.clear.0.clear.destructured.ir => Contract.clear.0.destructured.ir} (100%)
 rename test_cases/scratch_slots/out/MyContract.ir/{MyContract.approval.0.approval.ssa.ir => MyContract.approval.0.ssa.ir} (100%)
 rename test_cases/scratch_slots/out/MyContract.ir/{MyContract.approval.1.approval.ssa.opt.ir => MyContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/scratch_slots/out/MyContract.ir/{MyContract.approval.2.approval.destructured.ir => MyContract.approval.2.destructured.ir} (100%)
 rename test_cases/scratch_slots/out/MyContract.ir/{MyContract.clear.0.clear.ssa.ir => MyContract.clear.0.ssa.ir} (100%)
 rename test_cases/scratch_slots/out/MyContract.ir/{MyContract.clear.1.clear.destructured.ir => MyContract.clear.1.destructured.ir} (100%)
 rename test_cases/scratch_slots/out/MyContract2.ir/{MyContract2.approval.0.approval.ssa.ir => MyContract2.approval.0.ssa.ir} (100%)
 rename test_cases/scratch_slots/out/MyContract2.ir/{MyContract2.approval.1.approval.ssa.opt.ir => MyContract2.approval.1.ssa.opt.ir} (100%)
 rename test_cases/scratch_slots/out/MyContract2.ir/{MyContract2.approval.2.approval.destructured.ir => MyContract2.approval.2.destructured.ir} (100%)
 rename test_cases/scratch_slots/out/MyContract2.ir/{MyContract2.clear.0.clear.ssa.ir => MyContract2.clear.0.ssa.ir} (100%)
 rename test_cases/scratch_slots/out/MyContract2.ir/{MyContract2.clear.1.clear.destructured.ir => MyContract2.clear.1.destructured.ir} (100%)
 rename test_cases/scratch_slots/out/MyOtherContract.ir/{MyOtherContract.approval.0.approval.ssa.ir => MyOtherContract.approval.0.ssa.ir} (100%)
 rename test_cases/scratch_slots/out/MyOtherContract.ir/{MyOtherContract.approval.1.approval.destructured.ir => MyOtherContract.approval.1.destructured.ir} (100%)
 rename test_cases/scratch_slots/out/MyOtherContract.ir/{MyOtherContract.clear.0.clear.ssa.ir => MyOtherContract.clear.0.ssa.ir} (100%)
 rename test_cases/scratch_slots/out/MyOtherContract.ir/{MyOtherContract.clear.1.clear.destructured.ir => MyOtherContract.clear.1.destructured.ir} (100%)
 rename test_cases/scratch_slots/out_O2/MyContract.ir/{MyContract.approval.0.approval.destructured.ir => MyContract.approval.0.destructured.ir} (100%)
 rename test_cases/scratch_slots/out_O2/MyContract.ir/{MyContract.clear.0.clear.destructured.ir => MyContract.clear.0.destructured.ir} (100%)
 rename test_cases/scratch_slots/out_O2/MyContract2.ir/{MyContract2.approval.0.approval.destructured.ir => MyContract2.approval.0.destructured.ir} (100%)
 rename test_cases/scratch_slots/out_O2/MyContract2.ir/{MyContract2.clear.0.clear.destructured.ir => MyContract2.clear.0.destructured.ir} (100%)
 rename test_cases/scratch_slots/out_O2/MyOtherContract.ir/{MyOtherContract.approval.0.approval.destructured.ir => MyOtherContract.approval.0.destructured.ir} (100%)
 rename test_cases/scratch_slots/out_O2/MyOtherContract.ir/{MyOtherContract.clear.0.clear.destructured.ir => MyOtherContract.clear.0.destructured.ir} (100%)
 rename test_cases/scratch_slots/out_unoptimized/MyContract.ir/{MyContract.approval.0.approval.destructured.ir => MyContract.approval.0.destructured.ir} (100%)
 rename test_cases/scratch_slots/out_unoptimized/MyContract.ir/{MyContract.clear.0.clear.destructured.ir => MyContract.clear.0.destructured.ir} (100%)
 rename test_cases/scratch_slots/out_unoptimized/MyContract2.ir/{MyContract2.approval.0.approval.destructured.ir => MyContract2.approval.0.destructured.ir} (100%)
 rename test_cases/scratch_slots/out_unoptimized/MyContract2.ir/{MyContract2.clear.0.clear.destructured.ir => MyContract2.clear.0.destructured.ir} (100%)
 rename test_cases/scratch_slots/out_unoptimized/MyOtherContract.ir/{MyOtherContract.approval.0.approval.destructured.ir => MyOtherContract.approval.0.destructured.ir} (100%)
 rename test_cases/scratch_slots/out_unoptimized/MyOtherContract.ir/{MyOtherContract.clear.0.clear.destructured.ir => MyOtherContract.clear.0.destructured.ir} (100%)
 rename test_cases/simple/out/MyContract.ir/{MyContract.approval.0.approval.ssa.ir => MyContract.approval.0.ssa.ir} (100%)
 rename test_cases/simple/out/MyContract.ir/{MyContract.approval.1.approval.ssa.opt.ir => MyContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/simple/out/MyContract.ir/{MyContract.approval.2.approval.destructured.ir => MyContract.approval.2.destructured.ir} (100%)
 rename test_cases/simple/out/MyContract.ir/{MyContract.clear.0.clear.ssa.ir => MyContract.clear.0.ssa.ir} (100%)
 rename test_cases/simple/out/MyContract.ir/{MyContract.clear.1.clear.ssa.opt.ir => MyContract.clear.1.ssa.opt.ir} (100%)
 rename test_cases/simple/out/MyContract.ir/{MyContract.clear.2.clear.destructured.ir => MyContract.clear.2.destructured.ir} (100%)
 rename test_cases/simple/out_O2/MyContract.ir/{MyContract.approval.0.approval.destructured.ir => MyContract.approval.0.destructured.ir} (100%)
 rename test_cases/simple/out_O2/MyContract.ir/{MyContract.clear.0.clear.destructured.ir => MyContract.clear.0.destructured.ir} (100%)
 rename test_cases/simple/out_unoptimized/MyContract.ir/{MyContract.approval.0.approval.destructured.ir => MyContract.approval.0.destructured.ir} (100%)
 rename test_cases/simple/out_unoptimized/MyContract.ir/{MyContract.clear.0.clear.destructured.ir => MyContract.clear.0.destructured.ir} (100%)
 rename test_cases/simplish/out/Simplish.ir/{Simplish.approval.0.approval.ssa.ir => Simplish.approval.0.ssa.ir} (100%)
 rename test_cases/simplish/out/Simplish.ir/{Simplish.approval.1.approval.ssa.opt.ir => Simplish.approval.1.ssa.opt.ir} (100%)
 rename test_cases/simplish/out/Simplish.ir/{Simplish.approval.2.approval.ssa.opt.ir => Simplish.approval.2.ssa.opt.ir} (100%)
 rename test_cases/simplish/out/Simplish.ir/{Simplish.approval.3.approval.ssa.opt.ir => Simplish.approval.3.ssa.opt.ir} (100%)
 rename test_cases/simplish/out/Simplish.ir/{Simplish.approval.4.approval.destructured.ir => Simplish.approval.4.destructured.ir} (100%)
 rename test_cases/simplish/out/Simplish.ir/{Simplish.clear.0.clear.ssa.ir => Simplish.clear.0.ssa.ir} (100%)
 rename test_cases/simplish/out/Simplish.ir/{Simplish.clear.1.clear.destructured.ir => Simplish.clear.1.destructured.ir} (100%)
 rename test_cases/simplish/out_O2/Simplish.ir/{Simplish.approval.0.approval.destructured.ir => Simplish.approval.0.destructured.ir} (100%)
 rename test_cases/simplish/out_O2/Simplish.ir/{Simplish.clear.0.clear.destructured.ir => Simplish.clear.0.destructured.ir} (100%)
 rename test_cases/simplish/out_unoptimized/Simplish.ir/{Simplish.approval.0.approval.destructured.ir => Simplish.approval.0.destructured.ir} (100%)
 rename test_cases/simplish/out_unoptimized/Simplish.ir/{Simplish.clear.0.clear.destructured.ir => Simplish.clear.0.destructured.ir} (100%)
 rename test_cases/ssa/out/MyContract.ir/{MyContract.approval.0.approval.ssa.ir => MyContract.approval.0.ssa.ir} (100%)
 rename test_cases/ssa/out/MyContract.ir/{MyContract.approval.1.approval.ssa.opt.ir => MyContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/ssa/out/MyContract.ir/{MyContract.approval.2.approval.ssa.opt.ir => MyContract.approval.2.ssa.opt.ir} (100%)
 rename test_cases/ssa/out/MyContract.ir/{MyContract.approval.3.approval.destructured.ir => MyContract.approval.3.destructured.ir} (100%)
 rename test_cases/ssa/out/MyContract.ir/{MyContract.clear.0.clear.ssa.ir => MyContract.clear.0.ssa.ir} (100%)
 rename test_cases/ssa/out/MyContract.ir/{MyContract.clear.1.clear.ssa.opt.ir => MyContract.clear.1.ssa.opt.ir} (100%)
 rename test_cases/ssa/out/MyContract.ir/{MyContract.clear.2.clear.ssa.opt.ir => MyContract.clear.2.ssa.opt.ir} (100%)
 rename test_cases/ssa/out/MyContract.ir/{MyContract.clear.3.clear.destructured.ir => MyContract.clear.3.destructured.ir} (100%)
 rename test_cases/ssa/out_O2/MyContract.ir/{MyContract.approval.0.approval.destructured.ir => MyContract.approval.0.destructured.ir} (100%)
 rename test_cases/ssa/out_O2/MyContract.ir/{MyContract.clear.0.clear.destructured.ir => MyContract.clear.0.destructured.ir} (100%)
 rename test_cases/ssa/out_unoptimized/MyContract.ir/{MyContract.approval.0.approval.destructured.ir => MyContract.approval.0.destructured.ir} (100%)
 rename test_cases/ssa/out_unoptimized/MyContract.ir/{MyContract.clear.0.clear.destructured.ir => MyContract.clear.0.destructured.ir} (100%)
 rename test_cases/ssa2/out/MyContract.ir/{MyContract.approval.0.approval.ssa.ir => MyContract.approval.0.ssa.ir} (100%)
 rename test_cases/ssa2/out/MyContract.ir/{MyContract.approval.1.approval.ssa.opt.ir => MyContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/ssa2/out/MyContract.ir/{MyContract.approval.2.approval.destructured.ir => MyContract.approval.2.destructured.ir} (100%)
 rename test_cases/ssa2/out/MyContract.ir/{MyContract.clear.0.clear.ssa.ir => MyContract.clear.0.ssa.ir} (100%)
 rename test_cases/ssa2/out/MyContract.ir/{MyContract.clear.1.clear.ssa.opt.ir => MyContract.clear.1.ssa.opt.ir} (100%)
 rename test_cases/ssa2/out/MyContract.ir/{MyContract.clear.2.clear.ssa.opt.ir => MyContract.clear.2.ssa.opt.ir} (100%)
 rename test_cases/ssa2/out/MyContract.ir/{MyContract.clear.3.clear.destructured.ir => MyContract.clear.3.destructured.ir} (100%)
 rename test_cases/ssa2/out_O2/MyContract.ir/{MyContract.approval.0.approval.destructured.ir => MyContract.approval.0.destructured.ir} (100%)
 rename test_cases/ssa2/out_O2/MyContract.ir/{MyContract.clear.0.clear.destructured.ir => MyContract.clear.0.destructured.ir} (100%)
 rename test_cases/ssa2/out_unoptimized/MyContract.ir/{MyContract.approval.0.approval.destructured.ir => MyContract.approval.0.destructured.ir} (100%)
 rename test_cases/ssa2/out_unoptimized/MyContract.ir/{MyContract.clear.0.clear.destructured.ir => MyContract.clear.0.destructured.ir} (100%)
 rename test_cases/state_mutations/out/Contract.ir/{Contract.approval.0.approval.ssa.ir => Contract.approval.0.ssa.ir} (100%)
 rename test_cases/state_mutations/out/Contract.ir/{Contract.approval.1.approval.ssa.opt.ir => Contract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/state_mutations/out/Contract.ir/{Contract.approval.2.approval.ssa.opt.ir => Contract.approval.2.ssa.opt.ir} (100%)
 rename test_cases/state_mutations/out/Contract.ir/{Contract.approval.3.approval.destructured.ir => Contract.approval.3.destructured.ir} (100%)
 rename test_cases/state_mutations/out/Contract.ir/{Contract.clear.0.clear.ssa.ir => Contract.clear.0.ssa.ir} (100%)
 rename test_cases/state_mutations/out/Contract.ir/{Contract.clear.1.clear.destructured.ir => Contract.clear.1.destructured.ir} (100%)
 rename test_cases/state_mutations/out_O2/Contract.ir/{Contract.approval.0.approval.destructured.ir => Contract.approval.0.destructured.ir} (100%)
 rename test_cases/state_mutations/out_O2/Contract.ir/{Contract.clear.0.clear.destructured.ir => Contract.clear.0.destructured.ir} (100%)
 rename test_cases/state_mutations/out_unoptimized/Contract.ir/{Contract.approval.0.approval.destructured.ir => Contract.approval.0.destructured.ir} (100%)
 rename test_cases/state_mutations/out_unoptimized/Contract.ir/{Contract.clear.0.clear.destructured.ir => Contract.clear.0.destructured.ir} (100%)
 rename test_cases/state_proxies/out/StateProxyContract.ir/{StateProxyContract.approval.0.approval.ssa.ir => StateProxyContract.approval.0.ssa.ir} (100%)
 rename test_cases/state_proxies/out/StateProxyContract.ir/{StateProxyContract.approval.1.approval.ssa.opt.ir => StateProxyContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/state_proxies/out/StateProxyContract.ir/{StateProxyContract.approval.2.approval.ssa.opt.ir => StateProxyContract.approval.2.ssa.opt.ir} (100%)
 rename test_cases/state_proxies/out/StateProxyContract.ir/{StateProxyContract.approval.3.approval.destructured.ir => StateProxyContract.approval.3.destructured.ir} (100%)
 rename test_cases/state_proxies/out/StateProxyContract.ir/{StateProxyContract.clear.0.clear.ssa.ir => StateProxyContract.clear.0.ssa.ir} (100%)
 rename test_cases/state_proxies/out/StateProxyContract.ir/{StateProxyContract.clear.1.clear.destructured.ir => StateProxyContract.clear.1.destructured.ir} (100%)
 rename test_cases/state_proxies/out_O2/StateProxyContract.ir/{StateProxyContract.approval.0.approval.destructured.ir => StateProxyContract.approval.0.destructured.ir} (100%)
 rename test_cases/state_proxies/out_O2/StateProxyContract.ir/{StateProxyContract.clear.0.clear.destructured.ir => StateProxyContract.clear.0.destructured.ir} (100%)
 rename test_cases/state_proxies/out_unoptimized/StateProxyContract.ir/{StateProxyContract.approval.0.approval.destructured.ir => StateProxyContract.approval.0.destructured.ir} (100%)
 rename test_cases/state_proxies/out_unoptimized/StateProxyContract.ir/{StateProxyContract.clear.0.clear.destructured.ir => StateProxyContract.clear.0.destructured.ir} (100%)
 rename test_cases/state_totals/out/Contract.ir/{Contract.approval.0.approval.ssa.ir => Contract.approval.0.ssa.ir} (100%)
 rename test_cases/state_totals/out/Contract.ir/{Contract.approval.1.approval.ssa.opt.ir => Contract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/state_totals/out/Contract.ir/{Contract.approval.2.approval.ssa.opt.ir => Contract.approval.2.ssa.opt.ir} (100%)
 rename test_cases/state_totals/out/Contract.ir/{Contract.approval.3.approval.destructured.ir => Contract.approval.3.destructured.ir} (100%)
 rename test_cases/state_totals/out/Contract.ir/{Contract.clear.0.clear.ssa.ir => Contract.clear.0.ssa.ir} (100%)
 rename test_cases/state_totals/out/Contract.ir/{Contract.clear.1.clear.destructured.ir => Contract.clear.1.destructured.ir} (100%)
 rename test_cases/state_totals/out_O2/Contract.ir/{Contract.approval.0.approval.destructured.ir => Contract.approval.0.destructured.ir} (100%)
 rename test_cases/state_totals/out_O2/Contract.ir/{Contract.clear.0.clear.destructured.ir => Contract.clear.0.destructured.ir} (100%)
 rename test_cases/state_totals/out_unoptimized/Contract.ir/{Contract.approval.0.approval.destructured.ir => Contract.approval.0.destructured.ir} (100%)
 rename test_cases/state_totals/out_unoptimized/Contract.ir/{Contract.clear.0.clear.destructured.ir => Contract.clear.0.destructured.ir} (100%)
 rename test_cases/stress_tests/out/BruteForceRotationSearch.ir/{BruteForceRotationSearch.approval.0.approval.ssa.ir => BruteForceRotationSearch.approval.0.ssa.ir} (100%)
 rename test_cases/stress_tests/out/BruteForceRotationSearch.ir/{BruteForceRotationSearch.approval.1.approval.ssa.opt.ir => BruteForceRotationSearch.approval.1.ssa.opt.ir} (100%)
 rename test_cases/stress_tests/out/BruteForceRotationSearch.ir/{BruteForceRotationSearch.approval.2.approval.destructured.ir => BruteForceRotationSearch.approval.2.destructured.ir} (100%)
 rename test_cases/stress_tests/out/BruteForceRotationSearch.ir/{BruteForceRotationSearch.clear.0.clear.ssa.ir => BruteForceRotationSearch.clear.0.ssa.ir} (100%)
 rename test_cases/stress_tests/out/BruteForceRotationSearch.ir/{BruteForceRotationSearch.clear.1.clear.destructured.ir => BruteForceRotationSearch.clear.1.destructured.ir} (100%)
 rename test_cases/stress_tests/out_O2/BruteForceRotationSearch.ir/{BruteForceRotationSearch.approval.0.approval.destructured.ir => BruteForceRotationSearch.approval.0.destructured.ir} (100%)
 rename test_cases/stress_tests/out_O2/BruteForceRotationSearch.ir/{BruteForceRotationSearch.clear.0.clear.destructured.ir => BruteForceRotationSearch.clear.0.destructured.ir} (100%)
 rename test_cases/stress_tests/out_unoptimized/BruteForceRotationSearch.ir/{BruteForceRotationSearch.approval.0.approval.destructured.ir => BruteForceRotationSearch.approval.0.destructured.ir} (100%)
 rename test_cases/stress_tests/out_unoptimized/BruteForceRotationSearch.ir/{BruteForceRotationSearch.clear.0.clear.destructured.ir => BruteForceRotationSearch.clear.0.destructured.ir} (100%)
 rename test_cases/string_ops/out/MyContract.ir/{MyContract.approval.0.approval.ssa.ir => MyContract.approval.0.ssa.ir} (100%)
 rename test_cases/string_ops/out/MyContract.ir/{MyContract.approval.1.approval.ssa.opt.ir => MyContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/string_ops/out/MyContract.ir/{MyContract.approval.2.approval.destructured.ir => MyContract.approval.2.destructured.ir} (100%)
 rename test_cases/string_ops/out/MyContract.ir/{MyContract.clear.0.clear.ssa.ir => MyContract.clear.0.ssa.ir} (100%)
 rename test_cases/string_ops/out/MyContract.ir/{MyContract.clear.1.clear.destructured.ir => MyContract.clear.1.destructured.ir} (100%)
 rename test_cases/string_ops/out_O2/MyContract.ir/{MyContract.approval.0.approval.destructured.ir => MyContract.approval.0.destructured.ir} (100%)
 rename test_cases/string_ops/out_O2/MyContract.ir/{MyContract.clear.0.clear.destructured.ir => MyContract.clear.0.destructured.ir} (100%)
 rename test_cases/string_ops/out_unoptimized/MyContract.ir/{MyContract.approval.0.approval.destructured.ir => MyContract.approval.0.destructured.ir} (100%)
 rename test_cases/string_ops/out_unoptimized/MyContract.ir/{MyContract.clear.0.clear.destructured.ir => MyContract.clear.0.destructured.ir} (100%)
 rename test_cases/struct_by_name/out/DemoContract.ir/{DemoContract.approval.0.approval.ssa.ir => DemoContract.approval.0.ssa.ir} (100%)
 rename test_cases/struct_by_name/out/DemoContract.ir/{DemoContract.approval.1.approval.ssa.opt.ir => DemoContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/struct_by_name/out/DemoContract.ir/{DemoContract.approval.2.approval.ssa.opt.ir => DemoContract.approval.2.ssa.opt.ir} (100%)
 rename test_cases/struct_by_name/out/DemoContract.ir/{DemoContract.approval.3.approval.ssa.opt.ir => DemoContract.approval.3.ssa.opt.ir} (100%)
 rename test_cases/struct_by_name/out/DemoContract.ir/{DemoContract.approval.4.approval.destructured.ir => DemoContract.approval.4.destructured.ir} (100%)
 rename test_cases/struct_by_name/out/DemoContract.ir/{DemoContract.clear.0.clear.ssa.ir => DemoContract.clear.0.ssa.ir} (100%)
 rename test_cases/struct_by_name/out/DemoContract.ir/{DemoContract.clear.1.clear.destructured.ir => DemoContract.clear.1.destructured.ir} (100%)
 rename test_cases/struct_by_name/out_O2/DemoContract.ir/{DemoContract.approval.0.approval.destructured.ir => DemoContract.approval.0.destructured.ir} (100%)
 rename test_cases/struct_by_name/out_O2/DemoContract.ir/{DemoContract.clear.0.clear.destructured.ir => DemoContract.clear.0.destructured.ir} (100%)
 rename test_cases/struct_by_name/out_unoptimized/DemoContract.ir/{DemoContract.approval.0.approval.destructured.ir => DemoContract.approval.0.destructured.ir} (100%)
 rename test_cases/struct_by_name/out_unoptimized/DemoContract.ir/{DemoContract.clear.0.clear.destructured.ir => DemoContract.clear.0.destructured.ir} (100%)
 rename test_cases/stubs/out/BigUIntContract.ir/{BigUIntContract.approval.0.approval.ssa.ir => BigUIntContract.approval.0.ssa.ir} (100%)
 rename test_cases/stubs/out/BigUIntContract.ir/{BigUIntContract.approval.1.approval.ssa.opt.ir => BigUIntContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/stubs/out/BigUIntContract.ir/{BigUIntContract.approval.2.approval.destructured.ir => BigUIntContract.approval.2.destructured.ir} (100%)
 rename test_cases/stubs/out/BigUIntContract.ir/{BigUIntContract.clear.0.clear.ssa.ir => BigUIntContract.clear.0.ssa.ir} (100%)
 rename test_cases/stubs/out/BigUIntContract.ir/{BigUIntContract.clear.1.clear.ssa.opt.ir => BigUIntContract.clear.1.ssa.opt.ir} (100%)
 rename test_cases/stubs/out/BigUIntContract.ir/{BigUIntContract.clear.2.clear.destructured.ir => BigUIntContract.clear.2.destructured.ir} (100%)
 rename test_cases/stubs/out/BytesContract.ir/{BytesContract.approval.0.approval.ssa.ir => BytesContract.approval.0.ssa.ir} (100%)
 rename test_cases/stubs/out/BytesContract.ir/{BytesContract.approval.1.approval.ssa.opt.ir => BytesContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/stubs/out/BytesContract.ir/{BytesContract.approval.2.approval.ssa.opt.ir => BytesContract.approval.2.ssa.opt.ir} (100%)
 rename test_cases/stubs/out/BytesContract.ir/{BytesContract.approval.3.approval.destructured.ir => BytesContract.approval.3.destructured.ir} (100%)
 rename test_cases/stubs/out/BytesContract.ir/{BytesContract.clear.0.clear.ssa.ir => BytesContract.clear.0.ssa.ir} (100%)
 rename test_cases/stubs/out/BytesContract.ir/{BytesContract.clear.1.clear.destructured.ir => BytesContract.clear.1.destructured.ir} (100%)
 rename test_cases/stubs/out/StringContract.ir/{StringContract.approval.0.approval.ssa.ir => StringContract.approval.0.ssa.ir} (100%)
 rename test_cases/stubs/out/StringContract.ir/{StringContract.approval.1.approval.ssa.opt.ir => StringContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/stubs/out/StringContract.ir/{StringContract.approval.2.approval.ssa.opt.ir => StringContract.approval.2.ssa.opt.ir} (100%)
 rename test_cases/stubs/out/StringContract.ir/{StringContract.approval.3.approval.destructured.ir => StringContract.approval.3.destructured.ir} (100%)
 rename test_cases/stubs/out/StringContract.ir/{StringContract.clear.0.clear.ssa.ir => StringContract.clear.0.ssa.ir} (100%)
 rename test_cases/stubs/out/StringContract.ir/{StringContract.clear.1.clear.destructured.ir => StringContract.clear.1.destructured.ir} (100%)
 rename test_cases/stubs/out/Uint64Contract.ir/{Uint64Contract.approval.0.approval.ssa.ir => Uint64Contract.approval.0.ssa.ir} (100%)
 rename test_cases/stubs/out/Uint64Contract.ir/{Uint64Contract.approval.1.approval.ssa.opt.ir => Uint64Contract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/stubs/out/Uint64Contract.ir/{Uint64Contract.approval.2.approval.destructured.ir => Uint64Contract.approval.2.destructured.ir} (100%)
 rename test_cases/stubs/out/Uint64Contract.ir/{Uint64Contract.clear.0.clear.ssa.ir => Uint64Contract.clear.0.ssa.ir} (100%)
 rename test_cases/stubs/out/Uint64Contract.ir/{Uint64Contract.clear.1.clear.ssa.opt.ir => Uint64Contract.clear.1.ssa.opt.ir} (100%)
 rename test_cases/stubs/out/Uint64Contract.ir/{Uint64Contract.clear.2.clear.destructured.ir => Uint64Contract.clear.2.destructured.ir} (100%)
 rename test_cases/stubs/out_O2/BigUIntContract.ir/{BigUIntContract.approval.0.approval.destructured.ir => BigUIntContract.approval.0.destructured.ir} (100%)
 rename test_cases/stubs/out_O2/BigUIntContract.ir/{BigUIntContract.clear.0.clear.destructured.ir => BigUIntContract.clear.0.destructured.ir} (100%)
 rename test_cases/stubs/out_O2/BytesContract.ir/{BytesContract.approval.0.approval.destructured.ir => BytesContract.approval.0.destructured.ir} (100%)
 rename test_cases/stubs/out_O2/BytesContract.ir/{BytesContract.clear.0.clear.destructured.ir => BytesContract.clear.0.destructured.ir} (100%)
 rename test_cases/stubs/out_O2/StringContract.ir/{StringContract.approval.0.approval.destructured.ir => StringContract.approval.0.destructured.ir} (100%)
 rename test_cases/stubs/out_O2/StringContract.ir/{StringContract.clear.0.clear.destructured.ir => StringContract.clear.0.destructured.ir} (100%)
 rename test_cases/stubs/out_O2/Uint64Contract.ir/{Uint64Contract.approval.0.approval.destructured.ir => Uint64Contract.approval.0.destructured.ir} (100%)
 rename test_cases/stubs/out_O2/Uint64Contract.ir/{Uint64Contract.clear.0.clear.destructured.ir => Uint64Contract.clear.0.destructured.ir} (100%)
 rename test_cases/stubs/out_unoptimized/BigUIntContract.ir/{BigUIntContract.approval.0.approval.destructured.ir => BigUIntContract.approval.0.destructured.ir} (100%)
 rename test_cases/stubs/out_unoptimized/BigUIntContract.ir/{BigUIntContract.clear.0.clear.destructured.ir => BigUIntContract.clear.0.destructured.ir} (100%)
 rename test_cases/stubs/out_unoptimized/BytesContract.ir/{BytesContract.approval.0.approval.destructured.ir => BytesContract.approval.0.destructured.ir} (100%)
 rename test_cases/stubs/out_unoptimized/BytesContract.ir/{BytesContract.clear.0.clear.destructured.ir => BytesContract.clear.0.destructured.ir} (100%)
 rename test_cases/stubs/out_unoptimized/StringContract.ir/{StringContract.approval.0.approval.destructured.ir => StringContract.approval.0.destructured.ir} (100%)
 rename test_cases/stubs/out_unoptimized/StringContract.ir/{StringContract.clear.0.clear.destructured.ir => StringContract.clear.0.destructured.ir} (100%)
 rename test_cases/stubs/out_unoptimized/Uint64Contract.ir/{Uint64Contract.approval.0.approval.destructured.ir => Uint64Contract.approval.0.destructured.ir} (100%)
 rename test_cases/stubs/out_unoptimized/Uint64Contract.ir/{Uint64Contract.clear.0.clear.destructured.ir => Uint64Contract.clear.0.destructured.ir} (100%)
 rename test_cases/template_variables/out/TemplateVariablesContract.ir/{TemplateVariablesContract.approval.0.approval.ssa.ir => TemplateVariablesContract.approval.0.ssa.ir} (100%)
 rename test_cases/template_variables/out/TemplateVariablesContract.ir/{TemplateVariablesContract.approval.1.approval.ssa.opt.ir => TemplateVariablesContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/template_variables/out/TemplateVariablesContract.ir/{TemplateVariablesContract.approval.2.approval.ssa.opt.ir => TemplateVariablesContract.approval.2.ssa.opt.ir} (100%)
 rename test_cases/template_variables/out/TemplateVariablesContract.ir/{TemplateVariablesContract.approval.3.approval.destructured.ir => TemplateVariablesContract.approval.3.destructured.ir} (100%)
 rename test_cases/template_variables/out/TemplateVariablesContract.ir/{TemplateVariablesContract.clear.0.clear.ssa.ir => TemplateVariablesContract.clear.0.ssa.ir} (100%)
 rename test_cases/template_variables/out/TemplateVariablesContract.ir/{TemplateVariablesContract.clear.1.clear.destructured.ir => TemplateVariablesContract.clear.1.destructured.ir} (100%)
 rename test_cases/template_variables/out_O2/TemplateVariablesContract.ir/{TemplateVariablesContract.approval.0.approval.destructured.ir => TemplateVariablesContract.approval.0.destructured.ir} (100%)
 rename test_cases/template_variables/out_O2/TemplateVariablesContract.ir/{TemplateVariablesContract.clear.0.clear.destructured.ir => TemplateVariablesContract.clear.0.destructured.ir} (100%)
 rename test_cases/template_variables/out_unoptimized/TemplateVariablesContract.ir/{TemplateVariablesContract.approval.0.approval.destructured.ir => TemplateVariablesContract.approval.0.destructured.ir} (100%)
 rename test_cases/template_variables/out_unoptimized/TemplateVariablesContract.ir/{TemplateVariablesContract.clear.0.clear.destructured.ir => TemplateVariablesContract.clear.0.destructured.ir} (100%)
 rename test_cases/too_many_permutations/out/MyContract.ir/{MyContract.approval.0.approval.ssa.ir => MyContract.approval.0.ssa.ir} (100%)
 rename test_cases/too_many_permutations/out/MyContract.ir/{MyContract.approval.1.approval.ssa.opt.ir => MyContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/too_many_permutations/out/MyContract.ir/{MyContract.approval.2.approval.ssa.opt.ir => MyContract.approval.2.ssa.opt.ir} (100%)
 rename test_cases/too_many_permutations/out/MyContract.ir/{MyContract.approval.3.approval.destructured.ir => MyContract.approval.3.destructured.ir} (100%)
 rename test_cases/too_many_permutations/out/MyContract.ir/{MyContract.clear.0.clear.ssa.ir => MyContract.clear.0.ssa.ir} (100%)
 rename test_cases/too_many_permutations/out/MyContract.ir/{MyContract.clear.1.clear.destructured.ir => MyContract.clear.1.destructured.ir} (100%)
 rename test_cases/too_many_permutations/out_O2/MyContract.ir/{MyContract.approval.0.approval.destructured.ir => MyContract.approval.0.destructured.ir} (100%)
 rename test_cases/too_many_permutations/out_O2/MyContract.ir/{MyContract.clear.0.clear.destructured.ir => MyContract.clear.0.destructured.ir} (100%)
 rename test_cases/too_many_permutations/out_unoptimized/MyContract.ir/{MyContract.approval.0.approval.destructured.ir => MyContract.approval.0.destructured.ir} (100%)
 rename test_cases/too_many_permutations/out_unoptimized/MyContract.ir/{MyContract.clear.0.clear.destructured.ir => MyContract.clear.0.destructured.ir} (100%)
 rename test_cases/transaction/out/TransactionContract.ir/{TransactionContract.approval.0.approval.ssa.ir => TransactionContract.approval.0.ssa.ir} (100%)
 rename test_cases/transaction/out/TransactionContract.ir/{TransactionContract.approval.1.approval.ssa.opt.ir => TransactionContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/transaction/out/TransactionContract.ir/{TransactionContract.approval.2.approval.ssa.opt.ir => TransactionContract.approval.2.ssa.opt.ir} (100%)
 rename test_cases/transaction/out/TransactionContract.ir/{TransactionContract.approval.3.approval.destructured.ir => TransactionContract.approval.3.destructured.ir} (100%)
 rename test_cases/transaction/out/TransactionContract.ir/{TransactionContract.clear.0.clear.ssa.ir => TransactionContract.clear.0.ssa.ir} (100%)
 rename test_cases/transaction/out/TransactionContract.ir/{TransactionContract.clear.1.clear.destructured.ir => TransactionContract.clear.1.destructured.ir} (100%)
 rename test_cases/transaction/out_O2/TransactionContract.ir/{TransactionContract.approval.0.approval.destructured.ir => TransactionContract.approval.0.destructured.ir} (100%)
 rename test_cases/transaction/out_O2/TransactionContract.ir/{TransactionContract.clear.0.clear.destructured.ir => TransactionContract.clear.0.destructured.ir} (100%)
 rename test_cases/transaction/out_unoptimized/TransactionContract.ir/{TransactionContract.approval.0.approval.destructured.ir => TransactionContract.approval.0.destructured.ir} (100%)
 rename test_cases/transaction/out_unoptimized/TransactionContract.ir/{TransactionContract.clear.0.clear.destructured.ir => TransactionContract.clear.0.destructured.ir} (100%)
 rename test_cases/tuple_support/out/NestedTuples.ir/{NestedTuples.approval.0.approval.ssa.ir => NestedTuples.approval.0.ssa.ir} (100%)
 rename test_cases/tuple_support/out/NestedTuples.ir/{NestedTuples.approval.1.approval.ssa.opt.ir => NestedTuples.approval.1.ssa.opt.ir} (100%)
 rename test_cases/tuple_support/out/NestedTuples.ir/{NestedTuples.approval.2.approval.ssa.opt.ir => NestedTuples.approval.2.ssa.opt.ir} (100%)
 rename test_cases/tuple_support/out/NestedTuples.ir/{NestedTuples.approval.3.approval.ssa.opt.ir => NestedTuples.approval.3.ssa.opt.ir} (100%)
 rename test_cases/tuple_support/out/NestedTuples.ir/{NestedTuples.approval.4.approval.destructured.ir => NestedTuples.approval.4.destructured.ir} (100%)
 rename test_cases/tuple_support/out/NestedTuples.ir/{NestedTuples.clear.0.clear.ssa.ir => NestedTuples.clear.0.ssa.ir} (100%)
 rename test_cases/tuple_support/out/NestedTuples.ir/{NestedTuples.clear.1.clear.destructured.ir => NestedTuples.clear.1.destructured.ir} (100%)
 rename test_cases/tuple_support/out/TupleComparisons.ir/{TupleComparisons.approval.0.approval.ssa.ir => TupleComparisons.approval.0.ssa.ir} (100%)
 rename test_cases/tuple_support/out/TupleComparisons.ir/{TupleComparisons.approval.1.approval.ssa.opt.ir => TupleComparisons.approval.1.ssa.opt.ir} (100%)
 rename test_cases/tuple_support/out/TupleComparisons.ir/{TupleComparisons.approval.2.approval.ssa.opt.ir => TupleComparisons.approval.2.ssa.opt.ir} (100%)
 rename test_cases/tuple_support/out/TupleComparisons.ir/{TupleComparisons.approval.3.approval.destructured.ir => TupleComparisons.approval.3.destructured.ir} (100%)
 rename test_cases/tuple_support/out/TupleComparisons.ir/{TupleComparisons.clear.0.clear.ssa.ir => TupleComparisons.clear.0.ssa.ir} (100%)
 rename test_cases/tuple_support/out/TupleComparisons.ir/{TupleComparisons.clear.1.clear.destructured.ir => TupleComparisons.clear.1.destructured.ir} (100%)
 rename test_cases/tuple_support/out/TupleSupport.ir/{TupleSupport.approval.0.approval.ssa.ir => TupleSupport.approval.0.ssa.ir} (100%)
 rename test_cases/tuple_support/out/TupleSupport.ir/{TupleSupport.approval.1.approval.ssa.opt.ir => TupleSupport.approval.1.ssa.opt.ir} (100%)
 rename test_cases/tuple_support/out/TupleSupport.ir/{TupleSupport.approval.2.approval.ssa.opt.ir => TupleSupport.approval.2.ssa.opt.ir} (100%)
 rename test_cases/tuple_support/out/TupleSupport.ir/{TupleSupport.approval.3.approval.destructured.ir => TupleSupport.approval.3.destructured.ir} (100%)
 rename test_cases/tuple_support/out/TupleSupport.ir/{TupleSupport.clear.0.clear.ssa.ir => TupleSupport.clear.0.ssa.ir} (100%)
 rename test_cases/tuple_support/out/TupleSupport.ir/{TupleSupport.clear.1.clear.destructured.ir => TupleSupport.clear.1.destructured.ir} (100%)
 rename test_cases/tuple_support/out_O2/NestedTuples.ir/{NestedTuples.approval.0.approval.destructured.ir => NestedTuples.approval.0.destructured.ir} (100%)
 rename test_cases/tuple_support/out_O2/NestedTuples.ir/{NestedTuples.clear.0.clear.destructured.ir => NestedTuples.clear.0.destructured.ir} (100%)
 rename test_cases/tuple_support/out_O2/TupleComparisons.ir/{TupleComparisons.approval.0.approval.destructured.ir => TupleComparisons.approval.0.destructured.ir} (100%)
 rename test_cases/tuple_support/out_O2/TupleComparisons.ir/{TupleComparisons.clear.0.clear.destructured.ir => TupleComparisons.clear.0.destructured.ir} (100%)
 rename test_cases/tuple_support/out_O2/TupleSupport.ir/{TupleSupport.approval.0.approval.destructured.ir => TupleSupport.approval.0.destructured.ir} (100%)
 rename test_cases/tuple_support/out_O2/TupleSupport.ir/{TupleSupport.clear.0.clear.destructured.ir => TupleSupport.clear.0.destructured.ir} (100%)
 rename test_cases/tuple_support/out_unoptimized/NestedTuples.ir/{NestedTuples.approval.0.approval.destructured.ir => NestedTuples.approval.0.destructured.ir} (100%)
 rename test_cases/tuple_support/out_unoptimized/NestedTuples.ir/{NestedTuples.clear.0.clear.destructured.ir => NestedTuples.clear.0.destructured.ir} (100%)
 rename test_cases/tuple_support/out_unoptimized/TupleComparisons.ir/{TupleComparisons.approval.0.approval.destructured.ir => TupleComparisons.approval.0.destructured.ir} (100%)
 rename test_cases/tuple_support/out_unoptimized/TupleComparisons.ir/{TupleComparisons.clear.0.clear.destructured.ir => TupleComparisons.clear.0.destructured.ir} (100%)
 rename test_cases/tuple_support/out_unoptimized/TupleSupport.ir/{TupleSupport.approval.0.approval.destructured.ir => TupleSupport.approval.0.destructured.ir} (100%)
 rename test_cases/tuple_support/out_unoptimized/TupleSupport.ir/{TupleSupport.clear.0.clear.destructured.ir => TupleSupport.clear.0.destructured.ir} (100%)
 rename test_cases/typed_abi_call/out/Greeter.ir/{Greeter.approval.0.approval.ssa.ir => Greeter.approval.0.ssa.ir} (100%)
 rename test_cases/typed_abi_call/out/Greeter.ir/{Greeter.approval.1.approval.ssa.opt.ir => Greeter.approval.1.ssa.opt.ir} (100%)
 rename test_cases/typed_abi_call/out/Greeter.ir/{Greeter.approval.2.approval.ssa.opt.ir => Greeter.approval.2.ssa.opt.ir} (100%)
 rename test_cases/typed_abi_call/out/Greeter.ir/{Greeter.approval.3.approval.destructured.ir => Greeter.approval.3.destructured.ir} (100%)
 rename test_cases/typed_abi_call/out/Greeter.ir/{Greeter.clear.0.clear.ssa.ir => Greeter.clear.0.ssa.ir} (100%)
 rename test_cases/typed_abi_call/out/Greeter.ir/{Greeter.clear.1.clear.destructured.ir => Greeter.clear.1.destructured.ir} (100%)
 rename test_cases/typed_abi_call/out/Logger.ir/{Logger.approval.0.approval.ssa.ir => Logger.approval.0.ssa.ir} (100%)
 rename test_cases/typed_abi_call/out/Logger.ir/{Logger.approval.1.approval.ssa.opt.ir => Logger.approval.1.ssa.opt.ir} (100%)
 rename test_cases/typed_abi_call/out/Logger.ir/{Logger.approval.2.approval.ssa.opt.ir => Logger.approval.2.ssa.opt.ir} (100%)
 rename test_cases/typed_abi_call/out/Logger.ir/{Logger.approval.3.approval.destructured.ir => Logger.approval.3.destructured.ir} (100%)
 rename test_cases/typed_abi_call/out/Logger.ir/{Logger.clear.0.clear.ssa.ir => Logger.clear.0.ssa.ir} (100%)
 rename test_cases/typed_abi_call/out/Logger.ir/{Logger.clear.1.clear.destructured.ir => Logger.clear.1.destructured.ir} (100%)
 rename test_cases/typed_abi_call/out_O2/Greeter.ir/{Greeter.approval.0.approval.destructured.ir => Greeter.approval.0.destructured.ir} (100%)
 rename test_cases/typed_abi_call/out_O2/Greeter.ir/{Greeter.clear.0.clear.destructured.ir => Greeter.clear.0.destructured.ir} (100%)
 rename test_cases/typed_abi_call/out_O2/Logger.ir/{Logger.approval.0.approval.destructured.ir => Logger.approval.0.destructured.ir} (100%)
 rename test_cases/typed_abi_call/out_O2/Logger.ir/{Logger.clear.0.clear.destructured.ir => Logger.clear.0.destructured.ir} (100%)
 rename test_cases/typed_abi_call/out_unoptimized/Greeter.ir/{Greeter.approval.0.approval.destructured.ir => Greeter.approval.0.destructured.ir} (100%)
 rename test_cases/typed_abi_call/out_unoptimized/Greeter.ir/{Greeter.clear.0.clear.destructured.ir => Greeter.clear.0.destructured.ir} (100%)
 rename test_cases/typed_abi_call/out_unoptimized/Logger.ir/{Logger.approval.0.approval.destructured.ir => Logger.approval.0.destructured.ir} (100%)
 rename test_cases/typed_abi_call/out_unoptimized/Logger.ir/{Logger.clear.0.clear.destructured.ir => Logger.clear.0.destructured.ir} (100%)
 rename test_cases/typed_abi_call_txn/out/Caller.ir/{Caller.approval.0.approval.ssa.ir => Caller.approval.0.ssa.ir} (100%)
 rename test_cases/typed_abi_call_txn/out/Caller.ir/{Caller.approval.1.approval.ssa.opt.ir => Caller.approval.1.ssa.opt.ir} (100%)
 rename test_cases/typed_abi_call_txn/out/Caller.ir/{Caller.approval.2.approval.ssa.opt.ir => Caller.approval.2.ssa.opt.ir} (100%)
 rename test_cases/typed_abi_call_txn/out/Caller.ir/{Caller.approval.3.approval.destructured.ir => Caller.approval.3.destructured.ir} (100%)
 rename test_cases/typed_abi_call_txn/out/Caller.ir/{Caller.clear.0.clear.ssa.ir => Caller.clear.0.ssa.ir} (100%)
 rename test_cases/typed_abi_call_txn/out/Caller.ir/{Caller.clear.1.clear.destructured.ir => Caller.clear.1.destructured.ir} (100%)
 rename test_cases/typed_abi_call_txn/out/TxnContract.ir/{TxnContract.approval.0.approval.ssa.ir => TxnContract.approval.0.ssa.ir} (100%)
 rename test_cases/typed_abi_call_txn/out/TxnContract.ir/{TxnContract.approval.1.approval.ssa.opt.ir => TxnContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/typed_abi_call_txn/out/TxnContract.ir/{TxnContract.approval.2.approval.ssa.opt.ir => TxnContract.approval.2.ssa.opt.ir} (100%)
 rename test_cases/typed_abi_call_txn/out/TxnContract.ir/{TxnContract.approval.3.approval.destructured.ir => TxnContract.approval.3.destructured.ir} (100%)
 rename test_cases/typed_abi_call_txn/out/TxnContract.ir/{TxnContract.clear.0.clear.ssa.ir => TxnContract.clear.0.ssa.ir} (100%)
 rename test_cases/typed_abi_call_txn/out/TxnContract.ir/{TxnContract.clear.1.clear.destructured.ir => TxnContract.clear.1.destructured.ir} (100%)
 rename test_cases/typed_abi_call_txn/out_O2/Caller.ir/{Caller.approval.0.approval.destructured.ir => Caller.approval.0.destructured.ir} (100%)
 rename test_cases/typed_abi_call_txn/out_O2/Caller.ir/{Caller.clear.0.clear.destructured.ir => Caller.clear.0.destructured.ir} (100%)
 rename test_cases/typed_abi_call_txn/out_O2/TxnContract.ir/{TxnContract.approval.0.approval.destructured.ir => TxnContract.approval.0.destructured.ir} (100%)
 rename test_cases/typed_abi_call_txn/out_O2/TxnContract.ir/{TxnContract.clear.0.clear.destructured.ir => TxnContract.clear.0.destructured.ir} (100%)
 rename test_cases/typed_abi_call_txn/out_unoptimized/Caller.ir/{Caller.approval.0.approval.destructured.ir => Caller.approval.0.destructured.ir} (100%)
 rename test_cases/typed_abi_call_txn/out_unoptimized/Caller.ir/{Caller.clear.0.clear.destructured.ir => Caller.clear.0.destructured.ir} (100%)
 rename test_cases/typed_abi_call_txn/out_unoptimized/TxnContract.ir/{TxnContract.approval.0.approval.destructured.ir => TxnContract.approval.0.destructured.ir} (100%)
 rename test_cases/typed_abi_call_txn/out_unoptimized/TxnContract.ir/{TxnContract.clear.0.clear.destructured.ir => TxnContract.clear.0.destructured.ir} (100%)
 rename test_cases/unary/out/UnaryContract.ir/{UnaryContract.approval.0.approval.ssa.ir => UnaryContract.approval.0.ssa.ir} (100%)
 rename test_cases/unary/out/UnaryContract.ir/{UnaryContract.approval.1.approval.ssa.opt.ir => UnaryContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/unary/out/UnaryContract.ir/{UnaryContract.approval.2.approval.destructured.ir => UnaryContract.approval.2.destructured.ir} (100%)
 rename test_cases/unary/out/UnaryContract.ir/{UnaryContract.clear.0.clear.ssa.ir => UnaryContract.clear.0.ssa.ir} (100%)
 rename test_cases/unary/out/UnaryContract.ir/{UnaryContract.clear.1.clear.destructured.ir => UnaryContract.clear.1.destructured.ir} (100%)
 rename test_cases/unary/out_O2/UnaryContract.ir/{UnaryContract.approval.0.approval.destructured.ir => UnaryContract.approval.0.destructured.ir} (100%)
 rename test_cases/unary/out_O2/UnaryContract.ir/{UnaryContract.clear.0.clear.destructured.ir => UnaryContract.clear.0.destructured.ir} (100%)
 rename test_cases/unary/out_unoptimized/UnaryContract.ir/{UnaryContract.approval.0.approval.destructured.ir => UnaryContract.approval.0.destructured.ir} (100%)
 rename test_cases/unary/out_unoptimized/UnaryContract.ir/{UnaryContract.clear.0.clear.destructured.ir => UnaryContract.clear.0.destructured.ir} (100%)
 rename test_cases/unassigned_expression/out/Unassigned.ir/{Unassigned.approval.0.approval.ssa.ir => Unassigned.approval.0.ssa.ir} (100%)
 rename test_cases/unassigned_expression/out/Unassigned.ir/{Unassigned.approval.1.approval.ssa.opt.ir => Unassigned.approval.1.ssa.opt.ir} (100%)
 rename test_cases/unassigned_expression/out/Unassigned.ir/{Unassigned.approval.2.approval.ssa.opt.ir => Unassigned.approval.2.ssa.opt.ir} (100%)
 rename test_cases/unassigned_expression/out/Unassigned.ir/{Unassigned.approval.3.approval.destructured.ir => Unassigned.approval.3.destructured.ir} (100%)
 rename test_cases/unassigned_expression/out/Unassigned.ir/{Unassigned.clear.0.clear.ssa.ir => Unassigned.clear.0.ssa.ir} (100%)
 rename test_cases/unassigned_expression/out/Unassigned.ir/{Unassigned.clear.1.clear.destructured.ir => Unassigned.clear.1.destructured.ir} (100%)
 rename test_cases/unassigned_expression/out_O2/Unassigned.ir/{Unassigned.approval.0.approval.destructured.ir => Unassigned.approval.0.destructured.ir} (100%)
 rename test_cases/unassigned_expression/out_O2/Unassigned.ir/{Unassigned.clear.0.clear.destructured.ir => Unassigned.clear.0.destructured.ir} (100%)
 rename test_cases/unassigned_expression/out_unoptimized/Unassigned.ir/{Unassigned.approval.0.approval.destructured.ir => Unassigned.approval.0.destructured.ir} (100%)
 rename test_cases/unassigned_expression/out_unoptimized/Unassigned.ir/{Unassigned.clear.0.clear.destructured.ir => Unassigned.clear.0.destructured.ir} (100%)
 rename test_cases/undefined_phi_args/out/Baddie.ir/{Baddie.approval.0.approval.ssa.ir => Baddie.approval.0.ssa.ir} (100%)
 rename test_cases/undefined_phi_args/out/Baddie.ir/{Baddie.approval.1.approval.ssa.opt.ir => Baddie.approval.1.ssa.opt.ir} (100%)
 rename test_cases/undefined_phi_args/out/Baddie.ir/{Baddie.approval.2.approval.ssa.opt.ir => Baddie.approval.2.ssa.opt.ir} (100%)
 rename test_cases/undefined_phi_args/out/Baddie.ir/{Baddie.approval.3.approval.ssa.opt.ir => Baddie.approval.3.ssa.opt.ir} (100%)
 rename test_cases/undefined_phi_args/out/Baddie.ir/{Baddie.approval.4.approval.destructured.ir => Baddie.approval.4.destructured.ir} (100%)
 rename test_cases/undefined_phi_args/out/Baddie.ir/{Baddie.clear.0.clear.ssa.ir => Baddie.clear.0.ssa.ir} (100%)
 rename test_cases/undefined_phi_args/out/Baddie.ir/{Baddie.clear.1.clear.destructured.ir => Baddie.clear.1.destructured.ir} (100%)
 rename test_cases/undefined_phi_args/out_O2/Baddie.ir/{Baddie.approval.0.approval.destructured.ir => Baddie.approval.0.destructured.ir} (100%)
 rename test_cases/undefined_phi_args/out_O2/Baddie.ir/{Baddie.clear.0.clear.destructured.ir => Baddie.clear.0.destructured.ir} (100%)
 rename test_cases/undefined_phi_args/out_unoptimized/Baddie.ir/{Baddie.approval.0.approval.destructured.ir => Baddie.approval.0.destructured.ir} (100%)
 rename test_cases/undefined_phi_args/out_unoptimized/Baddie.ir/{Baddie.clear.0.clear.destructured.ir => Baddie.clear.0.destructured.ir} (100%)
 rename test_cases/unssa/out/UnSSAContract.ir/{UnSSAContract.approval.0.approval.ssa.ir => UnSSAContract.approval.0.ssa.ir} (100%)
 rename test_cases/unssa/out/UnSSAContract.ir/{UnSSAContract.approval.1.approval.ssa.opt.ir => UnSSAContract.approval.1.ssa.opt.ir} (100%)
 rename test_cases/unssa/out/UnSSAContract.ir/{UnSSAContract.approval.2.approval.ssa.opt.ir => UnSSAContract.approval.2.ssa.opt.ir} (100%)
 rename test_cases/unssa/out/UnSSAContract.ir/{UnSSAContract.approval.3.approval.destructured.ir => UnSSAContract.approval.3.destructured.ir} (100%)
 rename test_cases/unssa/out/UnSSAContract.ir/{UnSSAContract.clear.0.clear.ssa.ir => UnSSAContract.clear.0.ssa.ir} (100%)
 rename test_cases/unssa/out/UnSSAContract.ir/{UnSSAContract.clear.1.clear.destructured.ir => UnSSAContract.clear.1.destructured.ir} (100%)
 rename test_cases/unssa/out_O2/UnSSAContract.ir/{UnSSAContract.approval.0.approval.destructured.ir => UnSSAContract.approval.0.destructured.ir} (100%)
 rename test_cases/unssa/out_O2/UnSSAContract.ir/{UnSSAContract.clear.0.clear.destructured.ir => UnSSAContract.clear.0.destructured.ir} (100%)
 rename test_cases/unssa/out_unoptimized/UnSSAContract.ir/{UnSSAContract.approval.0.approval.destructured.ir => UnSSAContract.approval.0.destructured.ir} (100%)
 rename test_cases/unssa/out_unoptimized/UnSSAContract.ir/{UnSSAContract.clear.0.clear.destructured.ir => UnSSAContract.clear.0.destructured.ir} (100%)
 rename test_cases/with_reentrancy/out/WithReentrancy.ir/{WithReentrancy.approval.0.approval.ssa.ir => WithReentrancy.approval.0.ssa.ir} (100%)
 rename test_cases/with_reentrancy/out/WithReentrancy.ir/{WithReentrancy.approval.1.approval.ssa.opt.ir => WithReentrancy.approval.1.ssa.opt.ir} (100%)
 rename test_cases/with_reentrancy/out/WithReentrancy.ir/{WithReentrancy.approval.2.approval.ssa.opt.ir => WithReentrancy.approval.2.ssa.opt.ir} (100%)
 rename test_cases/with_reentrancy/out/WithReentrancy.ir/{WithReentrancy.approval.3.approval.destructured.ir => WithReentrancy.approval.3.destructured.ir} (100%)
 rename test_cases/with_reentrancy/out/WithReentrancy.ir/{WithReentrancy.clear.0.clear.ssa.ir => WithReentrancy.clear.0.ssa.ir} (100%)
 rename test_cases/with_reentrancy/out/WithReentrancy.ir/{WithReentrancy.clear.1.clear.destructured.ir => WithReentrancy.clear.1.destructured.ir} (100%)
 rename test_cases/with_reentrancy/out_O2/WithReentrancy.ir/{WithReentrancy.approval.0.approval.destructured.ir => WithReentrancy.approval.0.destructured.ir} (100%)
 rename test_cases/with_reentrancy/out_O2/WithReentrancy.ir/{WithReentrancy.clear.0.clear.destructured.ir => WithReentrancy.clear.0.destructured.ir} (100%)
 rename test_cases/with_reentrancy/out_unoptimized/WithReentrancy.ir/{WithReentrancy.approval.0.approval.destructured.ir => WithReentrancy.approval.0.destructured.ir} (100%)
 rename test_cases/with_reentrancy/out_unoptimized/WithReentrancy.ir/{WithReentrancy.clear.0.clear.destructured.ir => WithReentrancy.clear.0.destructured.ir} (100%)

diff --git a/examples/amm/out/ConstantProductAMM.ir/ConstantProductAMM.approval.0.approval.ssa.ir b/examples/amm/out/ConstantProductAMM.ir/ConstantProductAMM.approval.0.ssa.ir
similarity index 100%
rename from examples/amm/out/ConstantProductAMM.ir/ConstantProductAMM.approval.0.approval.ssa.ir
rename to examples/amm/out/ConstantProductAMM.ir/ConstantProductAMM.approval.0.ssa.ir
diff --git a/examples/amm/out/ConstantProductAMM.ir/ConstantProductAMM.approval.1.approval.ssa.opt.ir b/examples/amm/out/ConstantProductAMM.ir/ConstantProductAMM.approval.1.ssa.opt.ir
similarity index 100%
rename from examples/amm/out/ConstantProductAMM.ir/ConstantProductAMM.approval.1.approval.ssa.opt.ir
rename to examples/amm/out/ConstantProductAMM.ir/ConstantProductAMM.approval.1.ssa.opt.ir
diff --git a/examples/amm/out/ConstantProductAMM.ir/ConstantProductAMM.approval.2.approval.ssa.opt.ir b/examples/amm/out/ConstantProductAMM.ir/ConstantProductAMM.approval.2.ssa.opt.ir
similarity index 100%
rename from examples/amm/out/ConstantProductAMM.ir/ConstantProductAMM.approval.2.approval.ssa.opt.ir
rename to examples/amm/out/ConstantProductAMM.ir/ConstantProductAMM.approval.2.ssa.opt.ir
diff --git a/examples/amm/out/ConstantProductAMM.ir/ConstantProductAMM.approval.3.approval.ssa.opt.ir b/examples/amm/out/ConstantProductAMM.ir/ConstantProductAMM.approval.3.ssa.opt.ir
similarity index 100%
rename from examples/amm/out/ConstantProductAMM.ir/ConstantProductAMM.approval.3.approval.ssa.opt.ir
rename to examples/amm/out/ConstantProductAMM.ir/ConstantProductAMM.approval.3.ssa.opt.ir
diff --git a/examples/amm/out/ConstantProductAMM.ir/ConstantProductAMM.approval.4.approval.destructured.ir b/examples/amm/out/ConstantProductAMM.ir/ConstantProductAMM.approval.4.destructured.ir
similarity index 100%
rename from examples/amm/out/ConstantProductAMM.ir/ConstantProductAMM.approval.4.approval.destructured.ir
rename to examples/amm/out/ConstantProductAMM.ir/ConstantProductAMM.approval.4.destructured.ir
diff --git a/examples/amm/out/ConstantProductAMM.ir/ConstantProductAMM.clear.0.clear.ssa.ir b/examples/amm/out/ConstantProductAMM.ir/ConstantProductAMM.clear.0.ssa.ir
similarity index 100%
rename from examples/amm/out/ConstantProductAMM.ir/ConstantProductAMM.clear.0.clear.ssa.ir
rename to examples/amm/out/ConstantProductAMM.ir/ConstantProductAMM.clear.0.ssa.ir
diff --git a/examples/amm/out/ConstantProductAMM.ir/ConstantProductAMM.clear.1.clear.destructured.ir b/examples/amm/out/ConstantProductAMM.ir/ConstantProductAMM.clear.1.destructured.ir
similarity index 100%
rename from examples/amm/out/ConstantProductAMM.ir/ConstantProductAMM.clear.1.clear.destructured.ir
rename to examples/amm/out/ConstantProductAMM.ir/ConstantProductAMM.clear.1.destructured.ir
diff --git a/examples/amm/out_O2/ConstantProductAMM.ir/ConstantProductAMM.approval.0.approval.destructured.ir b/examples/amm/out_O2/ConstantProductAMM.ir/ConstantProductAMM.approval.0.destructured.ir
similarity index 100%
rename from examples/amm/out_O2/ConstantProductAMM.ir/ConstantProductAMM.approval.0.approval.destructured.ir
rename to examples/amm/out_O2/ConstantProductAMM.ir/ConstantProductAMM.approval.0.destructured.ir
diff --git a/examples/amm/out_O2/ConstantProductAMM.ir/ConstantProductAMM.clear.0.clear.destructured.ir b/examples/amm/out_O2/ConstantProductAMM.ir/ConstantProductAMM.clear.0.destructured.ir
similarity index 100%
rename from examples/amm/out_O2/ConstantProductAMM.ir/ConstantProductAMM.clear.0.clear.destructured.ir
rename to examples/amm/out_O2/ConstantProductAMM.ir/ConstantProductAMM.clear.0.destructured.ir
diff --git a/examples/amm/out_unoptimized/ConstantProductAMM.ir/ConstantProductAMM.approval.0.approval.destructured.ir b/examples/amm/out_unoptimized/ConstantProductAMM.ir/ConstantProductAMM.approval.0.destructured.ir
similarity index 100%
rename from examples/amm/out_unoptimized/ConstantProductAMM.ir/ConstantProductAMM.approval.0.approval.destructured.ir
rename to examples/amm/out_unoptimized/ConstantProductAMM.ir/ConstantProductAMM.approval.0.destructured.ir
diff --git a/examples/amm/out_unoptimized/ConstantProductAMM.ir/ConstantProductAMM.clear.0.clear.destructured.ir b/examples/amm/out_unoptimized/ConstantProductAMM.ir/ConstantProductAMM.clear.0.destructured.ir
similarity index 100%
rename from examples/amm/out_unoptimized/ConstantProductAMM.ir/ConstantProductAMM.clear.0.clear.destructured.ir
rename to examples/amm/out_unoptimized/ConstantProductAMM.ir/ConstantProductAMM.clear.0.destructured.ir
diff --git a/examples/amm/puya.log b/examples/amm/puya.log
index 9e3be47d07..480686051d 100644
--- a/examples/amm/puya.log
+++ b/examples/amm/puya.log
@@ -597,7 +597,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to amm/out/ConstantProductAMM.ir/ConstantProductAMM.approval.0.approval.ssa.ir
+debug: Output IR to amm/out/ConstantProductAMM.ir/ConstantProductAMM.approval.0.ssa.ir
 info: optimizing approval program of examples.amm.contract.ConstantProductAMM at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function examples.amm.contract.ConstantProductAMM.__init__ for inlining
@@ -1236,7 +1236,7 @@ debug: removing unused subroutine examples.amm.contract.ConstantProductAMM._crea
 debug: removing unused subroutine examples.amm.contract.tokens_to_mint
 debug: removing unused subroutine examples.amm.contract.tokens_to_swap
 debug: removing unused subroutine examples.amm.contract.ConstantProductAMM.__algopy_default_create
-debug: Output IR to amm/out/ConstantProductAMM.ir/ConstantProductAMM.approval.1.approval.ssa.opt.ir
+debug: Output IR to amm/out/ConstantProductAMM.ir/ConstantProductAMM.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine examples.amm.contract.ConstantProductAMM.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -1483,7 +1483,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine examples.amm.contract.ConstantProductAMM.__puya_arc4_router__
-debug: Output IR to amm/out/ConstantProductAMM.ir/ConstantProductAMM.approval.2.approval.ssa.opt.ir
+debug: Output IR to amm/out/ConstantProductAMM.ir/ConstantProductAMM.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: marking simple function examples.amm.contract.ConstantProductAMM._do_opt_in for inlining (complexity=2 <= threshold=3)
 debug: marking simple function examples.amm.contract.ConstantProductAMM._check_bootstrapped for inlining (complexity=3 <= threshold=3)
@@ -1768,7 +1768,7 @@ debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine examples.amm.contract.ConstantProductAMM._do_opt_in
 debug: removing unused subroutine examples.amm.contract.ConstantProductAMM._check_bootstrapped
 debug: removing unused subroutine examples.amm.contract.tokens_to_burn
-debug: Output IR to amm/out/ConstantProductAMM.ir/ConstantProductAMM.approval.3.approval.ssa.opt.ir
+debug: Output IR to amm/out/ConstantProductAMM.ir/ConstantProductAMM.approval.3.ssa.opt.ir
 debug: Begin optimization pass 4/100
 debug: Optimizing subroutine examples.amm.contract.ConstantProductAMM.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -2080,8 +2080,8 @@ debug: * to_do out_asset#0
 debug: * to_do out_supply#0
 debug: * to_do in_supply#0
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to amm/out/ConstantProductAMM.ir/ConstantProductAMM.approval.4.approval.destructured.ir
-debug: Output IR to amm/out/ConstantProductAMM.ir/ConstantProductAMM.clear.0.clear.ssa.ir
+debug: Output IR to amm/out/ConstantProductAMM.ir/ConstantProductAMM.approval.4.destructured.ir
+debug: Output IR to amm/out/ConstantProductAMM.ir/ConstantProductAMM.clear.0.ssa.ir
 info: optimizing clear program of examples.amm.contract.ConstantProductAMM at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -2107,7 +2107,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to amm/out/ConstantProductAMM.ir/ConstantProductAMM.clear.1.clear.destructured.ir
+debug: Output IR to amm/out/ConstantProductAMM.ir/ConstantProductAMM.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_call___init__@1.ops[7]: 'l-store-copy new_state_value%0#0 0'
diff --git a/examples/amm/puya_O2.log b/examples/amm/puya_O2.log
index c5249781fa..87173c944f 100644
--- a/examples/amm/puya_O2.log
+++ b/examples/amm/puya_O2.log
@@ -2207,7 +2207,7 @@ debug: Coalescing local variables in examples.amm.contract.ConstantProductAMM._u
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in examples.amm.contract.ConstantProductAMM._update_ratio
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to amm/out_O2/ConstantProductAMM.ir/ConstantProductAMM.approval.0.approval.destructured.ir
+debug: Output IR to amm/out_O2/ConstantProductAMM.ir/ConstantProductAMM.approval.0.destructured.ir
 info: optimizing clear program of examples.amm.contract.ConstantProductAMM at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -2233,7 +2233,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to amm/out_O2/ConstantProductAMM.ir/ConstantProductAMM.clear.0.clear.destructured.ir
+debug: Output IR to amm/out_O2/ConstantProductAMM.ir/ConstantProductAMM.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_call___init__@1.ops[7]: 'l-store-copy new_state_value%0#0 0'
diff --git a/examples/amm/puya_unoptimized.log b/examples/amm/puya_unoptimized.log
index af54039e5d..261eeb2bec 100644
--- a/examples/amm/puya_unoptimized.log
+++ b/examples/amm/puya_unoptimized.log
@@ -1325,7 +1325,7 @@ debug: Coalescing local variables in examples.amm.contract.tokens_to_swap using
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in examples.amm.contract.tokens_to_swap
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to amm/out_unoptimized/ConstantProductAMM.ir/ConstantProductAMM.approval.0.approval.destructured.ir
+debug: Output IR to amm/out_unoptimized/ConstantProductAMM.ir/ConstantProductAMM.approval.0.destructured.ir
 info: optimizing clear program of examples.amm.contract.ConstantProductAMM at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -1343,7 +1343,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to amm/out_unoptimized/ConstantProductAMM.ir/ConstantProductAMM.clear.0.clear.destructured.ir
+debug: Output IR to amm/out_unoptimized/ConstantProductAMM.ir/ConstantProductAMM.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%1#0 0'
diff --git a/examples/arc_28/out/EventEmitter.ir/EventEmitter.approval.0.approval.ssa.ir b/examples/arc_28/out/EventEmitter.ir/EventEmitter.approval.0.ssa.ir
similarity index 100%
rename from examples/arc_28/out/EventEmitter.ir/EventEmitter.approval.0.approval.ssa.ir
rename to examples/arc_28/out/EventEmitter.ir/EventEmitter.approval.0.ssa.ir
diff --git a/examples/arc_28/out/EventEmitter.ir/EventEmitter.approval.1.approval.ssa.opt.ir b/examples/arc_28/out/EventEmitter.ir/EventEmitter.approval.1.ssa.opt.ir
similarity index 100%
rename from examples/arc_28/out/EventEmitter.ir/EventEmitter.approval.1.approval.ssa.opt.ir
rename to examples/arc_28/out/EventEmitter.ir/EventEmitter.approval.1.ssa.opt.ir
diff --git a/examples/arc_28/out/EventEmitter.ir/EventEmitter.approval.2.approval.ssa.opt.ir b/examples/arc_28/out/EventEmitter.ir/EventEmitter.approval.2.ssa.opt.ir
similarity index 100%
rename from examples/arc_28/out/EventEmitter.ir/EventEmitter.approval.2.approval.ssa.opt.ir
rename to examples/arc_28/out/EventEmitter.ir/EventEmitter.approval.2.ssa.opt.ir
diff --git a/examples/arc_28/out/EventEmitter.ir/EventEmitter.approval.3.approval.destructured.ir b/examples/arc_28/out/EventEmitter.ir/EventEmitter.approval.3.destructured.ir
similarity index 100%
rename from examples/arc_28/out/EventEmitter.ir/EventEmitter.approval.3.approval.destructured.ir
rename to examples/arc_28/out/EventEmitter.ir/EventEmitter.approval.3.destructured.ir
diff --git a/examples/arc_28/out/EventEmitter.ir/EventEmitter.clear.0.clear.ssa.ir b/examples/arc_28/out/EventEmitter.ir/EventEmitter.clear.0.ssa.ir
similarity index 100%
rename from examples/arc_28/out/EventEmitter.ir/EventEmitter.clear.0.clear.ssa.ir
rename to examples/arc_28/out/EventEmitter.ir/EventEmitter.clear.0.ssa.ir
diff --git a/examples/arc_28/out/EventEmitter.ir/EventEmitter.clear.1.clear.destructured.ir b/examples/arc_28/out/EventEmitter.ir/EventEmitter.clear.1.destructured.ir
similarity index 100%
rename from examples/arc_28/out/EventEmitter.ir/EventEmitter.clear.1.clear.destructured.ir
rename to examples/arc_28/out/EventEmitter.ir/EventEmitter.clear.1.destructured.ir
diff --git a/examples/arc_28/out_O2/EventEmitter.ir/EventEmitter.approval.0.approval.destructured.ir b/examples/arc_28/out_O2/EventEmitter.ir/EventEmitter.approval.0.destructured.ir
similarity index 100%
rename from examples/arc_28/out_O2/EventEmitter.ir/EventEmitter.approval.0.approval.destructured.ir
rename to examples/arc_28/out_O2/EventEmitter.ir/EventEmitter.approval.0.destructured.ir
diff --git a/examples/arc_28/out_O2/EventEmitter.ir/EventEmitter.clear.0.clear.destructured.ir b/examples/arc_28/out_O2/EventEmitter.ir/EventEmitter.clear.0.destructured.ir
similarity index 100%
rename from examples/arc_28/out_O2/EventEmitter.ir/EventEmitter.clear.0.clear.destructured.ir
rename to examples/arc_28/out_O2/EventEmitter.ir/EventEmitter.clear.0.destructured.ir
diff --git a/examples/arc_28/out_unoptimized/EventEmitter.ir/EventEmitter.approval.0.approval.destructured.ir b/examples/arc_28/out_unoptimized/EventEmitter.ir/EventEmitter.approval.0.destructured.ir
similarity index 100%
rename from examples/arc_28/out_unoptimized/EventEmitter.ir/EventEmitter.approval.0.approval.destructured.ir
rename to examples/arc_28/out_unoptimized/EventEmitter.ir/EventEmitter.approval.0.destructured.ir
diff --git a/examples/arc_28/out_unoptimized/EventEmitter.ir/EventEmitter.clear.0.clear.destructured.ir b/examples/arc_28/out_unoptimized/EventEmitter.ir/EventEmitter.clear.0.destructured.ir
similarity index 100%
rename from examples/arc_28/out_unoptimized/EventEmitter.ir/EventEmitter.clear.0.clear.destructured.ir
rename to examples/arc_28/out_unoptimized/EventEmitter.ir/EventEmitter.clear.0.destructured.ir
diff --git a/examples/arc_28/puya.log b/examples/arc_28/puya.log
index 58a79d9551..2c429db5f8 100644
--- a/examples/arc_28/puya.log
+++ b/examples/arc_28/puya.log
@@ -430,7 +430,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to arc_28/out/EventEmitter.ir/EventEmitter.approval.0.approval.ssa.ir
+debug: Output IR to arc_28/out/EventEmitter.ir/EventEmitter.approval.0.ssa.ir
 info: optimizing approval program of examples.arc_28.contract.EventEmitter at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
@@ -573,7 +573,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine examples.arc_28.contract.EventEmitter.__puya_arc4_router__
-debug: Output IR to arc_28/out/EventEmitter.ir/EventEmitter.approval.1.approval.ssa.opt.ir
+debug: Output IR to arc_28/out/EventEmitter.ir/EventEmitter.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -641,7 +641,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine examples.arc_28.contract.EventEmitter.__algopy_default_create
-debug: Output IR to arc_28/out/EventEmitter.ir/EventEmitter.approval.2.approval.ssa.opt.ir
+debug: Output IR to arc_28/out/EventEmitter.ir/EventEmitter.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -712,8 +712,8 @@ debug: Coalescing local variables in examples.arc_28.contract.EventEmitter.emit_
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in examples.arc_28.contract.EventEmitter.emit_ufixed
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to arc_28/out/EventEmitter.ir/EventEmitter.approval.3.approval.destructured.ir
-debug: Output IR to arc_28/out/EventEmitter.ir/EventEmitter.clear.0.clear.ssa.ir
+debug: Output IR to arc_28/out/EventEmitter.ir/EventEmitter.approval.3.destructured.ir
+debug: Output IR to arc_28/out/EventEmitter.ir/EventEmitter.clear.0.ssa.ir
 info: optimizing clear program of examples.arc_28.contract.EventEmitter at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -739,7 +739,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to arc_28/out/EventEmitter.ir/EventEmitter.clear.1.clear.destructured.ir
+debug: Output IR to arc_28/out/EventEmitter.ir/EventEmitter.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/examples/arc_28/puya_O2.log b/examples/arc_28/puya_O2.log
index d746e221ac..47a150ed99 100644
--- a/examples/arc_28/puya_O2.log
+++ b/examples/arc_28/puya_O2.log
@@ -726,7 +726,7 @@ debug: Coalescing tmp%0#0 with [tmp%0#2]
 debug: Coalescing resulted in 21 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to arc_28/out_O2/EventEmitter.ir/EventEmitter.approval.0.approval.destructured.ir
+debug: Output IR to arc_28/out_O2/EventEmitter.ir/EventEmitter.approval.0.destructured.ir
 info: optimizing clear program of examples.arc_28.contract.EventEmitter at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -752,7 +752,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to arc_28/out_O2/EventEmitter.ir/EventEmitter.clear.0.clear.destructured.ir
+debug: Output IR to arc_28/out_O2/EventEmitter.ir/EventEmitter.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/examples/arc_28/puya_unoptimized.log b/examples/arc_28/puya_unoptimized.log
index bcf5e61037..edc85ffa04 100644
--- a/examples/arc_28/puya_unoptimized.log
+++ b/examples/arc_28/puya_unoptimized.log
@@ -554,7 +554,7 @@ debug: Coalescing local variables in examples.arc_28.contract.EventEmitter.emit_
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in examples.arc_28.contract.EventEmitter.emit_ufixed
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to arc_28/out_unoptimized/EventEmitter.ir/EventEmitter.approval.0.approval.destructured.ir
+debug: Output IR to arc_28/out_unoptimized/EventEmitter.ir/EventEmitter.approval.0.destructured.ir
 info: optimizing clear program of examples.arc_28.contract.EventEmitter at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -572,7 +572,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to arc_28/out_unoptimized/EventEmitter.ir/EventEmitter.clear.0.clear.destructured.ir
+debug: Output IR to arc_28/out_unoptimized/EventEmitter.ir/EventEmitter.clear.0.destructured.ir
 debug: Inserted main_block@1.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main_block@1.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_block@1.ops[6]: 'l-store-copy tmp%1#0 0'
diff --git a/examples/auction/out/Auction.ir/Auction.approval.0.approval.ssa.ir b/examples/auction/out/Auction.ir/Auction.approval.0.ssa.ir
similarity index 100%
rename from examples/auction/out/Auction.ir/Auction.approval.0.approval.ssa.ir
rename to examples/auction/out/Auction.ir/Auction.approval.0.ssa.ir
diff --git a/examples/auction/out/Auction.ir/Auction.approval.1.approval.ssa.opt.ir b/examples/auction/out/Auction.ir/Auction.approval.1.ssa.opt.ir
similarity index 100%
rename from examples/auction/out/Auction.ir/Auction.approval.1.approval.ssa.opt.ir
rename to examples/auction/out/Auction.ir/Auction.approval.1.ssa.opt.ir
diff --git a/examples/auction/out/Auction.ir/Auction.approval.2.approval.ssa.opt.ir b/examples/auction/out/Auction.ir/Auction.approval.2.ssa.opt.ir
similarity index 100%
rename from examples/auction/out/Auction.ir/Auction.approval.2.approval.ssa.opt.ir
rename to examples/auction/out/Auction.ir/Auction.approval.2.ssa.opt.ir
diff --git a/examples/auction/out/Auction.ir/Auction.approval.3.approval.destructured.ir b/examples/auction/out/Auction.ir/Auction.approval.3.destructured.ir
similarity index 100%
rename from examples/auction/out/Auction.ir/Auction.approval.3.approval.destructured.ir
rename to examples/auction/out/Auction.ir/Auction.approval.3.destructured.ir
diff --git a/examples/auction/out/Auction.ir/Auction.clear.0.clear.ssa.ir b/examples/auction/out/Auction.ir/Auction.clear.0.ssa.ir
similarity index 100%
rename from examples/auction/out/Auction.ir/Auction.clear.0.clear.ssa.ir
rename to examples/auction/out/Auction.ir/Auction.clear.0.ssa.ir
diff --git a/examples/auction/out/Auction.ir/Auction.clear.1.clear.destructured.ir b/examples/auction/out/Auction.ir/Auction.clear.1.destructured.ir
similarity index 100%
rename from examples/auction/out/Auction.ir/Auction.clear.1.clear.destructured.ir
rename to examples/auction/out/Auction.ir/Auction.clear.1.destructured.ir
diff --git a/examples/auction/out_O2/Auction.ir/Auction.approval.0.approval.destructured.ir b/examples/auction/out_O2/Auction.ir/Auction.approval.0.destructured.ir
similarity index 100%
rename from examples/auction/out_O2/Auction.ir/Auction.approval.0.approval.destructured.ir
rename to examples/auction/out_O2/Auction.ir/Auction.approval.0.destructured.ir
diff --git a/examples/auction/out_O2/Auction.ir/Auction.clear.0.clear.destructured.ir b/examples/auction/out_O2/Auction.ir/Auction.clear.0.destructured.ir
similarity index 100%
rename from examples/auction/out_O2/Auction.ir/Auction.clear.0.clear.destructured.ir
rename to examples/auction/out_O2/Auction.ir/Auction.clear.0.destructured.ir
diff --git a/examples/auction/out_unoptimized/Auction.ir/Auction.approval.0.approval.destructured.ir b/examples/auction/out_unoptimized/Auction.ir/Auction.approval.0.destructured.ir
similarity index 100%
rename from examples/auction/out_unoptimized/Auction.ir/Auction.approval.0.approval.destructured.ir
rename to examples/auction/out_unoptimized/Auction.ir/Auction.approval.0.destructured.ir
diff --git a/examples/auction/out_unoptimized/Auction.ir/Auction.clear.0.clear.destructured.ir b/examples/auction/out_unoptimized/Auction.ir/Auction.clear.0.destructured.ir
similarity index 100%
rename from examples/auction/out_unoptimized/Auction.ir/Auction.clear.0.clear.destructured.ir
rename to examples/auction/out_unoptimized/Auction.ir/Auction.clear.0.destructured.ir
diff --git a/examples/auction/puya.log b/examples/auction/puya.log
index 00ed97741b..92540148ad 100644
--- a/examples/auction/puya.log
+++ b/examples/auction/puya.log
@@ -479,7 +479,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to auction/out/Auction.ir/Auction.approval.0.approval.ssa.ir
+debug: Output IR to auction/out/Auction.ir/Auction.approval.0.ssa.ir
 info: optimizing approval program of examples.auction.contract.Auction at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function examples.auction.contract.Auction.__init__ for inlining
@@ -908,7 +908,7 @@ debug: removing unused subroutine examples.auction.contract.Auction.__init__
 debug: removing unused subroutine algopy.arc4.ARC4Contract.approval_program
 debug: removing unused subroutine examples.auction.contract.Auction.opt_in
 debug: removing unused subroutine examples.auction.contract.Auction.__algopy_default_create
-debug: Output IR to auction/out/Auction.ir/Auction.approval.1.approval.ssa.opt.ir
+debug: Output IR to auction/out/Auction.ir/Auction.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine examples.auction.contract.Auction.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -1020,7 +1020,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine examples.auction.contract.Auction.__puya_arc4_router__
-debug: Output IR to auction/out/Auction.ir/Auction.approval.2.approval.ssa.opt.ir
+debug: Output IR to auction/out/Auction.ir/Auction.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine examples.auction.contract.Auction.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -1158,8 +1158,8 @@ debug: Coalescing local variables in examples.auction.contract.Auction.claim_ass
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in examples.auction.contract.Auction.claim_asset
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to auction/out/Auction.ir/Auction.approval.3.approval.destructured.ir
-debug: Output IR to auction/out/Auction.ir/Auction.clear.0.clear.ssa.ir
+debug: Output IR to auction/out/Auction.ir/Auction.approval.3.destructured.ir
+debug: Output IR to auction/out/Auction.ir/Auction.clear.0.ssa.ir
 info: optimizing clear program of examples.auction.contract.Auction at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine examples.auction.contract.Auction.clear_state_program
@@ -1185,7 +1185,7 @@ debug: Coalescing local variables in examples.auction.contract.Auction.clear_sta
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in examples.auction.contract.Auction.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to auction/out/Auction.ir/Auction.clear.1.clear.destructured.ir
+debug: Output IR to auction/out/Auction.ir/Auction.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_call___init__@1.ops[13]: 'l-store-copy new_state_value%0#0 0'
diff --git a/examples/auction/puya_O2.log b/examples/auction/puya_O2.log
index ace4d57ddf..800cf39954 100644
--- a/examples/auction/puya_O2.log
+++ b/examples/auction/puya_O2.log
@@ -1207,7 +1207,7 @@ debug: Coalescing maybe_exists%2#0 with [maybe_exists%2#1]
 debug: Coalescing resulted in 93 replacement/s
 debug: Sequentializing parallel copies in examples.auction.contract.Auction.__algopy_entrypoint_with_init
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to auction/out_O2/Auction.ir/Auction.approval.0.approval.destructured.ir
+debug: Output IR to auction/out_O2/Auction.ir/Auction.approval.0.destructured.ir
 info: optimizing clear program of examples.auction.contract.Auction at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine examples.auction.contract.Auction.clear_state_program
@@ -1233,7 +1233,7 @@ debug: Coalescing local variables in examples.auction.contract.Auction.clear_sta
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in examples.auction.contract.Auction.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to auction/out_O2/Auction.ir/Auction.clear.0.clear.destructured.ir
+debug: Output IR to auction/out_O2/Auction.ir/Auction.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_call___init__@1.ops[13]: 'l-store-copy new_state_value%0#0 0'
diff --git a/examples/auction/puya_unoptimized.log b/examples/auction/puya_unoptimized.log
index a778058933..9e2e6c699e 100644
--- a/examples/auction/puya_unoptimized.log
+++ b/examples/auction/puya_unoptimized.log
@@ -926,7 +926,7 @@ debug: Coalescing local variables in examples.auction.contract.Auction.claim_ass
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in examples.auction.contract.Auction.claim_asset
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to auction/out_unoptimized/Auction.ir/Auction.approval.0.approval.destructured.ir
+debug: Output IR to auction/out_unoptimized/Auction.ir/Auction.approval.0.destructured.ir
 info: optimizing clear program of examples.auction.contract.Auction at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine examples.auction.contract.Auction.clear_state_program
@@ -944,7 +944,7 @@ debug: Coalescing local variables in examples.auction.contract.Auction.clear_sta
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in examples.auction.contract.Auction.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to auction/out_unoptimized/Auction.ir/Auction.clear.0.clear.destructured.ir
+debug: Output IR to auction/out_unoptimized/Auction.ir/Auction.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%1#0 0'
diff --git a/examples/box_storage/out/BoxContract.ir/BoxContract.approval.0.approval.ssa.ir b/examples/box_storage/out/BoxContract.ir/BoxContract.approval.0.ssa.ir
similarity index 100%
rename from examples/box_storage/out/BoxContract.ir/BoxContract.approval.0.approval.ssa.ir
rename to examples/box_storage/out/BoxContract.ir/BoxContract.approval.0.ssa.ir
diff --git a/examples/box_storage/out/BoxContract.ir/BoxContract.approval.1.approval.ssa.opt.ir b/examples/box_storage/out/BoxContract.ir/BoxContract.approval.1.ssa.opt.ir
similarity index 100%
rename from examples/box_storage/out/BoxContract.ir/BoxContract.approval.1.approval.ssa.opt.ir
rename to examples/box_storage/out/BoxContract.ir/BoxContract.approval.1.ssa.opt.ir
diff --git a/examples/box_storage/out/BoxContract.ir/BoxContract.approval.2.approval.ssa.opt.ir b/examples/box_storage/out/BoxContract.ir/BoxContract.approval.2.ssa.opt.ir
similarity index 100%
rename from examples/box_storage/out/BoxContract.ir/BoxContract.approval.2.approval.ssa.opt.ir
rename to examples/box_storage/out/BoxContract.ir/BoxContract.approval.2.ssa.opt.ir
diff --git a/examples/box_storage/out/BoxContract.ir/BoxContract.approval.3.approval.ssa.opt.ir b/examples/box_storage/out/BoxContract.ir/BoxContract.approval.3.ssa.opt.ir
similarity index 100%
rename from examples/box_storage/out/BoxContract.ir/BoxContract.approval.3.approval.ssa.opt.ir
rename to examples/box_storage/out/BoxContract.ir/BoxContract.approval.3.ssa.opt.ir
diff --git a/examples/box_storage/out/BoxContract.ir/BoxContract.approval.4.approval.destructured.ir b/examples/box_storage/out/BoxContract.ir/BoxContract.approval.4.destructured.ir
similarity index 100%
rename from examples/box_storage/out/BoxContract.ir/BoxContract.approval.4.approval.destructured.ir
rename to examples/box_storage/out/BoxContract.ir/BoxContract.approval.4.destructured.ir
diff --git a/examples/box_storage/out/BoxContract.ir/BoxContract.clear.0.clear.ssa.ir b/examples/box_storage/out/BoxContract.ir/BoxContract.clear.0.ssa.ir
similarity index 100%
rename from examples/box_storage/out/BoxContract.ir/BoxContract.clear.0.clear.ssa.ir
rename to examples/box_storage/out/BoxContract.ir/BoxContract.clear.0.ssa.ir
diff --git a/examples/box_storage/out/BoxContract.ir/BoxContract.clear.1.clear.destructured.ir b/examples/box_storage/out/BoxContract.ir/BoxContract.clear.1.destructured.ir
similarity index 100%
rename from examples/box_storage/out/BoxContract.ir/BoxContract.clear.1.clear.destructured.ir
rename to examples/box_storage/out/BoxContract.ir/BoxContract.clear.1.destructured.ir
diff --git a/examples/box_storage/out_O2/BoxContract.ir/BoxContract.approval.0.approval.destructured.ir b/examples/box_storage/out_O2/BoxContract.ir/BoxContract.approval.0.destructured.ir
similarity index 100%
rename from examples/box_storage/out_O2/BoxContract.ir/BoxContract.approval.0.approval.destructured.ir
rename to examples/box_storage/out_O2/BoxContract.ir/BoxContract.approval.0.destructured.ir
diff --git a/examples/box_storage/out_O2/BoxContract.ir/BoxContract.clear.0.clear.destructured.ir b/examples/box_storage/out_O2/BoxContract.ir/BoxContract.clear.0.destructured.ir
similarity index 100%
rename from examples/box_storage/out_O2/BoxContract.ir/BoxContract.clear.0.clear.destructured.ir
rename to examples/box_storage/out_O2/BoxContract.ir/BoxContract.clear.0.destructured.ir
diff --git a/examples/box_storage/out_unoptimized/BoxContract.ir/BoxContract.approval.0.approval.destructured.ir b/examples/box_storage/out_unoptimized/BoxContract.ir/BoxContract.approval.0.destructured.ir
similarity index 100%
rename from examples/box_storage/out_unoptimized/BoxContract.ir/BoxContract.approval.0.approval.destructured.ir
rename to examples/box_storage/out_unoptimized/BoxContract.ir/BoxContract.approval.0.destructured.ir
diff --git a/examples/box_storage/out_unoptimized/BoxContract.ir/BoxContract.clear.0.clear.destructured.ir b/examples/box_storage/out_unoptimized/BoxContract.ir/BoxContract.clear.0.destructured.ir
similarity index 100%
rename from examples/box_storage/out_unoptimized/BoxContract.ir/BoxContract.clear.0.clear.destructured.ir
rename to examples/box_storage/out_unoptimized/BoxContract.ir/BoxContract.clear.0.destructured.ir
diff --git a/examples/box_storage/puya.log b/examples/box_storage/puya.log
index e7376982c2..c5093c4f89 100644
--- a/examples/box_storage/puya.log
+++ b/examples/box_storage/puya.log
@@ -534,7 +534,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to box_storage/out/BoxContract.ir/BoxContract.approval.0.approval.ssa.ir
+debug: Output IR to box_storage/out/BoxContract.ir/BoxContract.approval.0.ssa.ir
 info: optimizing approval program of examples.box_storage.contract.BoxContract at level 1
 debug: Begin optimization pass 1/100
 debug: marking trivial method examples.box_storage.contract.BoxContract.__init__ as inlineable
@@ -1152,7 +1152,7 @@ debug: removing unused subroutine examples.box_storage.contract.get_box_value_pl
 debug: removing unused subroutine examples.box_storage.contract.get_box_ref_length
 debug: removing unused subroutine examples.box_storage.contract.get_box_map_value_from_key_plus_1
 debug: removing unused subroutine examples.box_storage.contract.BoxContract.__algopy_default_create
-debug: Output IR to box_storage/out/BoxContract.ir/BoxContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to box_storage/out/BoxContract.ir/BoxContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking trivial method examples.box_storage.contract.BoxContract.check_keys as inlineable
 debug: Optimizing subroutine examples.box_storage.contract.BoxContract.__algopy_entrypoint_with_init
@@ -1394,7 +1394,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine examples.box_storage.contract.BoxContract.__puya_arc4_router__
-debug: Output IR to box_storage/out/BoxContract.ir/BoxContract.approval.2.approval.ssa.opt.ir
+debug: Output IR to box_storage/out/BoxContract.ir/BoxContract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: marking trivial method examples.box_storage.contract.BoxContract.check_keys as inlineable
 debug: Optimizing subroutine examples.box_storage.contract.BoxContract.__algopy_entrypoint_with_init
@@ -1613,7 +1613,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine examples.box_storage.contract.BoxContract.check_keys
-debug: Output IR to box_storage/out/BoxContract.ir/BoxContract.approval.3.approval.ssa.opt.ir
+debug: Output IR to box_storage/out/BoxContract.ir/BoxContract.approval.3.ssa.opt.ir
 debug: Begin optimization pass 4/100
 debug: Optimizing subroutine examples.box_storage.contract.BoxContract.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -1910,8 +1910,8 @@ debug: Coalescing local variables in examples.box_storage.contract.BoxContract.b
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in examples.box_storage.contract.BoxContract.box_map_exists
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to box_storage/out/BoxContract.ir/BoxContract.approval.4.approval.destructured.ir
-debug: Output IR to box_storage/out/BoxContract.ir/BoxContract.clear.0.clear.ssa.ir
+debug: Output IR to box_storage/out/BoxContract.ir/BoxContract.approval.4.destructured.ir
+debug: Output IR to box_storage/out/BoxContract.ir/BoxContract.clear.0.ssa.ir
 info: optimizing clear program of examples.box_storage.contract.BoxContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -1937,7 +1937,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to box_storage/out/BoxContract.ir/BoxContract.clear.1.clear.destructured.ir
+debug: Output IR to box_storage/out/BoxContract.ir/BoxContract.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#2 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#2' with 'l-load tmp%0#2'
 debug: Inserted main_abi_routing@4.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/examples/box_storage/puya_O2.log b/examples/box_storage/puya_O2.log
index 0115b2b392..8c36247695 100644
--- a/examples/box_storage/puya_O2.log
+++ b/examples/box_storage/puya_O2.log
@@ -1679,7 +1679,7 @@ debug: Coalescing key#0 with [key#3, key#2, key#1]
 debug: Coalescing resulted in 292 replacement/s
 debug: Sequentializing parallel copies in examples.box_storage.contract.BoxContract.__algopy_entrypoint_with_init
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to box_storage/out_O2/BoxContract.ir/BoxContract.approval.0.approval.destructured.ir
+debug: Output IR to box_storage/out_O2/BoxContract.ir/BoxContract.approval.0.destructured.ir
 info: optimizing clear program of examples.box_storage.contract.BoxContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -1705,7 +1705,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to box_storage/out_O2/BoxContract.ir/BoxContract.clear.0.clear.destructured.ir
+debug: Output IR to box_storage/out_O2/BoxContract.ir/BoxContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#2 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#2' with 'l-load tmp%0#2'
 debug: Inserted main_abi_routing@4.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/examples/box_storage/puya_unoptimized.log b/examples/box_storage/puya_unoptimized.log
index e532efd725..5bdc7b2d6e 100644
--- a/examples/box_storage/puya_unoptimized.log
+++ b/examples/box_storage/puya_unoptimized.log
@@ -1125,7 +1125,7 @@ debug: Coalescing local variables in examples.box_storage.contract.BoxContract.b
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in examples.box_storage.contract.BoxContract.box_map_exists
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to box_storage/out_unoptimized/BoxContract.ir/BoxContract.approval.0.approval.destructured.ir
+debug: Output IR to box_storage/out_unoptimized/BoxContract.ir/BoxContract.approval.0.destructured.ir
 info: optimizing clear program of examples.box_storage.contract.BoxContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -1143,7 +1143,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to box_storage/out_unoptimized/BoxContract.ir/BoxContract.clear.0.clear.destructured.ir
+debug: Output IR to box_storage/out_unoptimized/BoxContract.ir/BoxContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%1#0 0'
diff --git a/examples/calculator/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir b/examples/calculator/out/MyContract.ir/MyContract.approval.0.ssa.ir
similarity index 100%
rename from examples/calculator/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir
rename to examples/calculator/out/MyContract.ir/MyContract.approval.0.ssa.ir
diff --git a/examples/calculator/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir b/examples/calculator/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
similarity index 100%
rename from examples/calculator/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir
rename to examples/calculator/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
diff --git a/examples/calculator/out/MyContract.ir/MyContract.approval.2.approval.ssa.opt.ir b/examples/calculator/out/MyContract.ir/MyContract.approval.2.ssa.opt.ir
similarity index 100%
rename from examples/calculator/out/MyContract.ir/MyContract.approval.2.approval.ssa.opt.ir
rename to examples/calculator/out/MyContract.ir/MyContract.approval.2.ssa.opt.ir
diff --git a/examples/calculator/out/MyContract.ir/MyContract.approval.3.approval.destructured.ir b/examples/calculator/out/MyContract.ir/MyContract.approval.3.destructured.ir
similarity index 100%
rename from examples/calculator/out/MyContract.ir/MyContract.approval.3.approval.destructured.ir
rename to examples/calculator/out/MyContract.ir/MyContract.approval.3.destructured.ir
diff --git a/examples/calculator/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir b/examples/calculator/out/MyContract.ir/MyContract.clear.0.ssa.ir
similarity index 100%
rename from examples/calculator/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir
rename to examples/calculator/out/MyContract.ir/MyContract.clear.0.ssa.ir
diff --git a/examples/calculator/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir b/examples/calculator/out/MyContract.ir/MyContract.clear.1.destructured.ir
similarity index 100%
rename from examples/calculator/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir
rename to examples/calculator/out/MyContract.ir/MyContract.clear.1.destructured.ir
diff --git a/examples/calculator/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir b/examples/calculator/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
similarity index 100%
rename from examples/calculator/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir
rename to examples/calculator/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
diff --git a/examples/calculator/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir b/examples/calculator/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
similarity index 100%
rename from examples/calculator/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir
rename to examples/calculator/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
diff --git a/examples/calculator/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir b/examples/calculator/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
similarity index 100%
rename from examples/calculator/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir
rename to examples/calculator/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
diff --git a/examples/calculator/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir b/examples/calculator/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
similarity index 100%
rename from examples/calculator/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir
rename to examples/calculator/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
diff --git a/examples/calculator/puya.log b/examples/calculator/puya.log
index ae5c7a2a3d..743036ed4f 100644
--- a/examples/calculator/puya.log
+++ b/examples/calculator/puya.log
@@ -479,7 +479,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to calculator/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir
+debug: Output IR to calculator/out/MyContract.ir/MyContract.approval.0.ssa.ir
 info: optimizing approval program of examples.calculator.contract.MyContract at level 1
 debug: Begin optimization pass 1/100
 calculator/contract.py:9 debug: function is auto-recursive: examples.calculator.contract.itoa
@@ -667,7 +667,7 @@ debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine examples.calculator.contract.MyContract.do_calc
 debug: removing unused subroutine examples.calculator.contract.MyContract.op
-debug: Output IR to calculator/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to calculator/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking single-use function examples.calculator.contract.MyContract.add for inlining
 debug: marking single-use function examples.calculator.contract.MyContract.sub for inlining
@@ -795,7 +795,7 @@ debug: removing unused subroutine examples.calculator.contract.MyContract.add
 debug: removing unused subroutine examples.calculator.contract.MyContract.sub
 debug: removing unused subroutine examples.calculator.contract.MyContract.mul
 debug: removing unused subroutine examples.calculator.contract.MyContract.div
-debug: Output IR to calculator/out/MyContract.ir/MyContract.approval.2.approval.ssa.opt.ir
+debug: Output IR to calculator/out/MyContract.ir/MyContract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine examples.calculator.contract.MyContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -872,8 +872,8 @@ debug: Coalescing local variables in examples.calculator.contract.itoa using str
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in examples.calculator.contract.itoa
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to calculator/out/MyContract.ir/MyContract.approval.3.approval.destructured.ir
-debug: Output IR to calculator/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir
+debug: Output IR to calculator/out/MyContract.ir/MyContract.approval.3.destructured.ir
+debug: Output IR to calculator/out/MyContract.ir/MyContract.clear.0.ssa.ir
 info: optimizing clear program of examples.calculator.contract.MyContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine examples.calculator.contract.MyContract.clear_state_program
@@ -899,7 +899,7 @@ debug: Coalescing local variables in examples.calculator.contract.MyContract.cle
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in examples.calculator.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to calculator/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir
+debug: Output IR to calculator/out/MyContract.ir/MyContract.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy num_args#0 0'
 debug: Replaced main.ops[3]: 'v-load num_args#0' with 'l-load num_args#0'
 debug: Inserted main_if_body@1.ops[8]: 'l-store-copy tmp%1#0 0'
diff --git a/examples/calculator/puya_O2.log b/examples/calculator/puya_O2.log
index cd17aaedcd..acc5eab482 100644
--- a/examples/calculator/puya_O2.log
+++ b/examples/calculator/puya_O2.log
@@ -870,7 +870,7 @@ debug: Coalescing local variables in examples.calculator.contract.itoa using str
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in examples.calculator.contract.itoa
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to calculator/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir
+debug: Output IR to calculator/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
 info: optimizing clear program of examples.calculator.contract.MyContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine examples.calculator.contract.MyContract.clear_state_program
@@ -896,7 +896,7 @@ debug: Coalescing local variables in examples.calculator.contract.MyContract.cle
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in examples.calculator.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to calculator/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir
+debug: Output IR to calculator/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy num_args#0 0'
 debug: Replaced main.ops[3]: 'v-load num_args#0' with 'l-load num_args#0'
 debug: Inserted main_if_body@1.ops[8]: 'l-store-copy tmp%1#0 0'
diff --git a/examples/calculator/puya_unoptimized.log b/examples/calculator/puya_unoptimized.log
index 991b296dcf..2c968a0922 100644
--- a/examples/calculator/puya_unoptimized.log
+++ b/examples/calculator/puya_unoptimized.log
@@ -676,7 +676,7 @@ debug: Coalescing local variables in examples.calculator.contract.MyContract.op
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in examples.calculator.contract.MyContract.op
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to calculator/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir
+debug: Output IR to calculator/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
 info: optimizing clear program of examples.calculator.contract.MyContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine examples.calculator.contract.MyContract.clear_state_program
@@ -694,7 +694,7 @@ debug: Coalescing local variables in examples.calculator.contract.MyContract.cle
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in examples.calculator.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to calculator/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir
+debug: Output IR to calculator/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy num_args#0 0'
 debug: Replaced main.ops[3]: 'v-load num_args#0' with 'l-load num_args#0'
 debug: Inserted main.ops[6]: 'l-store-copy tmp%0#0 0'
diff --git a/examples/global_state/out/AppStateContract.ir/AppStateContract.approval.0.approval.ssa.ir b/examples/global_state/out/AppStateContract.ir/AppStateContract.approval.0.ssa.ir
similarity index 100%
rename from examples/global_state/out/AppStateContract.ir/AppStateContract.approval.0.approval.ssa.ir
rename to examples/global_state/out/AppStateContract.ir/AppStateContract.approval.0.ssa.ir
diff --git a/examples/global_state/out/AppStateContract.ir/AppStateContract.approval.1.approval.ssa.opt.ir b/examples/global_state/out/AppStateContract.ir/AppStateContract.approval.1.ssa.opt.ir
similarity index 100%
rename from examples/global_state/out/AppStateContract.ir/AppStateContract.approval.1.approval.ssa.opt.ir
rename to examples/global_state/out/AppStateContract.ir/AppStateContract.approval.1.ssa.opt.ir
diff --git a/examples/global_state/out/AppStateContract.ir/AppStateContract.approval.2.approval.ssa.opt.ir b/examples/global_state/out/AppStateContract.ir/AppStateContract.approval.2.ssa.opt.ir
similarity index 100%
rename from examples/global_state/out/AppStateContract.ir/AppStateContract.approval.2.approval.ssa.opt.ir
rename to examples/global_state/out/AppStateContract.ir/AppStateContract.approval.2.ssa.opt.ir
diff --git a/examples/global_state/out/AppStateContract.ir/AppStateContract.approval.3.approval.destructured.ir b/examples/global_state/out/AppStateContract.ir/AppStateContract.approval.3.destructured.ir
similarity index 100%
rename from examples/global_state/out/AppStateContract.ir/AppStateContract.approval.3.approval.destructured.ir
rename to examples/global_state/out/AppStateContract.ir/AppStateContract.approval.3.destructured.ir
diff --git a/examples/global_state/out/AppStateContract.ir/AppStateContract.clear.0.clear.ssa.ir b/examples/global_state/out/AppStateContract.ir/AppStateContract.clear.0.ssa.ir
similarity index 100%
rename from examples/global_state/out/AppStateContract.ir/AppStateContract.clear.0.clear.ssa.ir
rename to examples/global_state/out/AppStateContract.ir/AppStateContract.clear.0.ssa.ir
diff --git a/examples/global_state/out/AppStateContract.ir/AppStateContract.clear.1.clear.destructured.ir b/examples/global_state/out/AppStateContract.ir/AppStateContract.clear.1.destructured.ir
similarity index 100%
rename from examples/global_state/out/AppStateContract.ir/AppStateContract.clear.1.clear.destructured.ir
rename to examples/global_state/out/AppStateContract.ir/AppStateContract.clear.1.destructured.ir
diff --git a/examples/global_state/out_O2/AppStateContract.ir/AppStateContract.approval.0.approval.destructured.ir b/examples/global_state/out_O2/AppStateContract.ir/AppStateContract.approval.0.destructured.ir
similarity index 100%
rename from examples/global_state/out_O2/AppStateContract.ir/AppStateContract.approval.0.approval.destructured.ir
rename to examples/global_state/out_O2/AppStateContract.ir/AppStateContract.approval.0.destructured.ir
diff --git a/examples/global_state/out_O2/AppStateContract.ir/AppStateContract.clear.0.clear.destructured.ir b/examples/global_state/out_O2/AppStateContract.ir/AppStateContract.clear.0.destructured.ir
similarity index 100%
rename from examples/global_state/out_O2/AppStateContract.ir/AppStateContract.clear.0.clear.destructured.ir
rename to examples/global_state/out_O2/AppStateContract.ir/AppStateContract.clear.0.destructured.ir
diff --git a/examples/global_state/out_unoptimized/AppStateContract.ir/AppStateContract.approval.0.approval.destructured.ir b/examples/global_state/out_unoptimized/AppStateContract.ir/AppStateContract.approval.0.destructured.ir
similarity index 100%
rename from examples/global_state/out_unoptimized/AppStateContract.ir/AppStateContract.approval.0.approval.destructured.ir
rename to examples/global_state/out_unoptimized/AppStateContract.ir/AppStateContract.approval.0.destructured.ir
diff --git a/examples/global_state/out_unoptimized/AppStateContract.ir/AppStateContract.clear.0.clear.destructured.ir b/examples/global_state/out_unoptimized/AppStateContract.ir/AppStateContract.clear.0.destructured.ir
similarity index 100%
rename from examples/global_state/out_unoptimized/AppStateContract.ir/AppStateContract.clear.0.clear.destructured.ir
rename to examples/global_state/out_unoptimized/AppStateContract.ir/AppStateContract.clear.0.destructured.ir
diff --git a/examples/global_state/puya.log b/examples/global_state/puya.log
index ef4ce9fa4e..4b2a9e3c93 100644
--- a/examples/global_state/puya.log
+++ b/examples/global_state/puya.log
@@ -426,7 +426,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to global_state/out/AppStateContract.ir/AppStateContract.approval.0.approval.ssa.ir
+debug: Output IR to global_state/out/AppStateContract.ir/AppStateContract.approval.0.ssa.ir
 info: optimizing approval program of examples.global_state.contract.AppStateContract at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function examples.global_state.contract.AppStateContract.__init__ for inlining
@@ -570,7 +570,7 @@ debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine examples.global_state.contract.AppStateContract.__init__
 debug: removing unused subroutine examples.global_state.contract.AppStateContract.approval_program
-debug: Output IR to global_state/out/AppStateContract.ir/AppStateContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to global_state/out/AppStateContract.ir/AppStateContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking single-use function examples.global_state.contract.read_global_uint64 for inlining
 debug: marking single-use function examples.global_state.contract.read_global_bytes for inlining
@@ -659,7 +659,7 @@ debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine examples.global_state.contract.read_global_uint64
 debug: removing unused subroutine examples.global_state.contract.read_global_bytes
 debug: removing unused subroutine examples.global_state.contract.get_global_state_plus_1
-debug: Output IR to global_state/out/AppStateContract.ir/AppStateContract.approval.2.approval.ssa.opt.ir
+debug: Output IR to global_state/out/AppStateContract.ir/AppStateContract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine examples.global_state.contract.AppStateContract.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -689,8 +689,8 @@ debug: Coalescing b_exists#0 with [b_exists#1]
 debug: Coalescing resulted in 15 replacement/s
 debug: Sequentializing parallel copies in examples.global_state.contract.AppStateContract.__algopy_entrypoint_with_init
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to global_state/out/AppStateContract.ir/AppStateContract.approval.3.approval.destructured.ir
-debug: Output IR to global_state/out/AppStateContract.ir/AppStateContract.clear.0.clear.ssa.ir
+debug: Output IR to global_state/out/AppStateContract.ir/AppStateContract.approval.3.destructured.ir
+debug: Output IR to global_state/out/AppStateContract.ir/AppStateContract.clear.0.ssa.ir
 info: optimizing clear program of examples.global_state.contract.AppStateContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine examples.global_state.contract.AppStateContract.clear_state_program
@@ -716,7 +716,7 @@ debug: Coalescing local variables in examples.global_state.contract.AppStateCont
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in examples.global_state.contract.AppStateContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to global_state/out/AppStateContract.ir/AppStateContract.clear.1.clear.destructured.ir
+debug: Output IR to global_state/out/AppStateContract.ir/AppStateContract.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[10]: 'l-store-copy tmp%0#0 0'
diff --git a/examples/global_state/puya_O2.log b/examples/global_state/puya_O2.log
index 882b7d8700..b9c839bc32 100644
--- a/examples/global_state/puya_O2.log
+++ b/examples/global_state/puya_O2.log
@@ -685,7 +685,7 @@ debug: Coalescing b_exists#0 with [b_exists#1]
 debug: Coalescing resulted in 15 replacement/s
 debug: Sequentializing parallel copies in examples.global_state.contract.AppStateContract.__algopy_entrypoint_with_init
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to global_state/out_O2/AppStateContract.ir/AppStateContract.approval.0.approval.destructured.ir
+debug: Output IR to global_state/out_O2/AppStateContract.ir/AppStateContract.approval.0.destructured.ir
 info: optimizing clear program of examples.global_state.contract.AppStateContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine examples.global_state.contract.AppStateContract.clear_state_program
@@ -711,7 +711,7 @@ debug: Coalescing local variables in examples.global_state.contract.AppStateCont
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in examples.global_state.contract.AppStateContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to global_state/out_O2/AppStateContract.ir/AppStateContract.clear.0.clear.destructured.ir
+debug: Output IR to global_state/out_O2/AppStateContract.ir/AppStateContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[10]: 'l-store-copy tmp%0#0 0'
diff --git a/examples/global_state/puya_unoptimized.log b/examples/global_state/puya_unoptimized.log
index a290262b52..34eecbd28c 100644
--- a/examples/global_state/puya_unoptimized.log
+++ b/examples/global_state/puya_unoptimized.log
@@ -557,7 +557,7 @@ debug: Coalescing local variables in examples.global_state.contract.get_global_s
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in examples.global_state.contract.get_global_state_plus_1
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to global_state/out_unoptimized/AppStateContract.ir/AppStateContract.approval.0.approval.destructured.ir
+debug: Output IR to global_state/out_unoptimized/AppStateContract.ir/AppStateContract.approval.0.destructured.ir
 info: optimizing clear program of examples.global_state.contract.AppStateContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine examples.global_state.contract.AppStateContract.clear_state_program
@@ -575,7 +575,7 @@ debug: Coalescing local variables in examples.global_state.contract.AppStateCont
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in examples.global_state.contract.AppStateContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to global_state/out_unoptimized/AppStateContract.ir/AppStateContract.clear.0.clear.destructured.ir
+debug: Output IR to global_state/out_unoptimized/AppStateContract.ir/AppStateContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%1#0 0'
diff --git a/examples/hello_world/out/HelloWorldContract.ir/HelloWorldContract.approval.0.approval.ssa.ir b/examples/hello_world/out/HelloWorldContract.ir/HelloWorldContract.approval.0.ssa.ir
similarity index 100%
rename from examples/hello_world/out/HelloWorldContract.ir/HelloWorldContract.approval.0.approval.ssa.ir
rename to examples/hello_world/out/HelloWorldContract.ir/HelloWorldContract.approval.0.ssa.ir
diff --git a/examples/hello_world/out/HelloWorldContract.ir/HelloWorldContract.approval.1.approval.destructured.ir b/examples/hello_world/out/HelloWorldContract.ir/HelloWorldContract.approval.1.destructured.ir
similarity index 100%
rename from examples/hello_world/out/HelloWorldContract.ir/HelloWorldContract.approval.1.approval.destructured.ir
rename to examples/hello_world/out/HelloWorldContract.ir/HelloWorldContract.approval.1.destructured.ir
diff --git a/examples/hello_world/out/HelloWorldContract.ir/HelloWorldContract.clear.0.clear.ssa.ir b/examples/hello_world/out/HelloWorldContract.ir/HelloWorldContract.clear.0.ssa.ir
similarity index 100%
rename from examples/hello_world/out/HelloWorldContract.ir/HelloWorldContract.clear.0.clear.ssa.ir
rename to examples/hello_world/out/HelloWorldContract.ir/HelloWorldContract.clear.0.ssa.ir
diff --git a/examples/hello_world/out/HelloWorldContract.ir/HelloWorldContract.clear.1.clear.destructured.ir b/examples/hello_world/out/HelloWorldContract.ir/HelloWorldContract.clear.1.destructured.ir
similarity index 100%
rename from examples/hello_world/out/HelloWorldContract.ir/HelloWorldContract.clear.1.clear.destructured.ir
rename to examples/hello_world/out/HelloWorldContract.ir/HelloWorldContract.clear.1.destructured.ir
diff --git a/examples/hello_world/out_O2/HelloWorldContract.ir/HelloWorldContract.approval.0.approval.destructured.ir b/examples/hello_world/out_O2/HelloWorldContract.ir/HelloWorldContract.approval.0.destructured.ir
similarity index 100%
rename from examples/hello_world/out_O2/HelloWorldContract.ir/HelloWorldContract.approval.0.approval.destructured.ir
rename to examples/hello_world/out_O2/HelloWorldContract.ir/HelloWorldContract.approval.0.destructured.ir
diff --git a/examples/hello_world/out_O2/HelloWorldContract.ir/HelloWorldContract.clear.0.clear.destructured.ir b/examples/hello_world/out_O2/HelloWorldContract.ir/HelloWorldContract.clear.0.destructured.ir
similarity index 100%
rename from examples/hello_world/out_O2/HelloWorldContract.ir/HelloWorldContract.clear.0.clear.destructured.ir
rename to examples/hello_world/out_O2/HelloWorldContract.ir/HelloWorldContract.clear.0.destructured.ir
diff --git a/examples/hello_world/out_unoptimized/HelloWorldContract.ir/HelloWorldContract.approval.0.approval.destructured.ir b/examples/hello_world/out_unoptimized/HelloWorldContract.ir/HelloWorldContract.approval.0.destructured.ir
similarity index 100%
rename from examples/hello_world/out_unoptimized/HelloWorldContract.ir/HelloWorldContract.approval.0.approval.destructured.ir
rename to examples/hello_world/out_unoptimized/HelloWorldContract.ir/HelloWorldContract.approval.0.destructured.ir
diff --git a/examples/hello_world/out_unoptimized/HelloWorldContract.ir/HelloWorldContract.clear.0.clear.destructured.ir b/examples/hello_world/out_unoptimized/HelloWorldContract.ir/HelloWorldContract.clear.0.destructured.ir
similarity index 100%
rename from examples/hello_world/out_unoptimized/HelloWorldContract.ir/HelloWorldContract.clear.0.clear.destructured.ir
rename to examples/hello_world/out_unoptimized/HelloWorldContract.ir/HelloWorldContract.clear.0.destructured.ir
diff --git a/examples/hello_world/puya.log b/examples/hello_world/puya.log
index d6086096a6..81a0ef2125 100644
--- a/examples/hello_world/puya.log
+++ b/examples/hello_world/puya.log
@@ -407,7 +407,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to hello_world/out/HelloWorldContract.ir/HelloWorldContract.approval.0.approval.ssa.ir
+debug: Output IR to hello_world/out/HelloWorldContract.ir/HelloWorldContract.approval.0.ssa.ir
 info: optimizing approval program of examples.hello_world.contract.HelloWorldContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine examples.hello_world.contract.HelloWorldContract.approval_program
@@ -433,8 +433,8 @@ debug: Coalescing local variables in examples.hello_world.contract.HelloWorldCon
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in examples.hello_world.contract.HelloWorldContract.approval_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to hello_world/out/HelloWorldContract.ir/HelloWorldContract.approval.1.approval.destructured.ir
-debug: Output IR to hello_world/out/HelloWorldContract.ir/HelloWorldContract.clear.0.clear.ssa.ir
+debug: Output IR to hello_world/out/HelloWorldContract.ir/HelloWorldContract.approval.1.destructured.ir
+debug: Output IR to hello_world/out/HelloWorldContract.ir/HelloWorldContract.clear.0.ssa.ir
 info: optimizing clear program of examples.hello_world.contract.HelloWorldContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine examples.hello_world.contract.HelloWorldContract.clear_state_program
@@ -460,7 +460,7 @@ debug: Coalescing local variables in examples.hello_world.contract.HelloWorldCon
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in examples.hello_world.contract.HelloWorldContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to hello_world/out/HelloWorldContract.ir/HelloWorldContract.clear.1.clear.destructured.ir
+debug: Output IR to hello_world/out/HelloWorldContract.ir/HelloWorldContract.clear.1.destructured.ir
 debug: Inserted main.ops[5]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[7]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[1]: 'l-store-copy name#0 0'
diff --git a/examples/hello_world/puya_O2.log b/examples/hello_world/puya_O2.log
index 5650ee8541..f2965b92f0 100644
--- a/examples/hello_world/puya_O2.log
+++ b/examples/hello_world/puya_O2.log
@@ -431,7 +431,7 @@ debug: Coalescing local variables in examples.hello_world.contract.HelloWorldCon
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in examples.hello_world.contract.HelloWorldContract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to hello_world/out_O2/HelloWorldContract.ir/HelloWorldContract.approval.0.approval.destructured.ir
+debug: Output IR to hello_world/out_O2/HelloWorldContract.ir/HelloWorldContract.approval.0.destructured.ir
 info: optimizing clear program of examples.hello_world.contract.HelloWorldContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine examples.hello_world.contract.HelloWorldContract.clear_state_program
@@ -457,7 +457,7 @@ debug: Coalescing local variables in examples.hello_world.contract.HelloWorldCon
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in examples.hello_world.contract.HelloWorldContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to hello_world/out_O2/HelloWorldContract.ir/HelloWorldContract.clear.0.clear.destructured.ir
+debug: Output IR to hello_world/out_O2/HelloWorldContract.ir/HelloWorldContract.clear.0.destructured.ir
 debug: Inserted main.ops[5]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[7]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[1]: 'l-store-copy name#0 0'
diff --git a/examples/hello_world/puya_unoptimized.log b/examples/hello_world/puya_unoptimized.log
index c2f220439f..0aaed45b5f 100644
--- a/examples/hello_world/puya_unoptimized.log
+++ b/examples/hello_world/puya_unoptimized.log
@@ -423,7 +423,7 @@ debug: Coalescing local variables in examples.hello_world.contract.HelloWorldCon
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in examples.hello_world.contract.HelloWorldContract.approval_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to hello_world/out_unoptimized/HelloWorldContract.ir/HelloWorldContract.approval.0.approval.destructured.ir
+debug: Output IR to hello_world/out_unoptimized/HelloWorldContract.ir/HelloWorldContract.approval.0.destructured.ir
 info: optimizing clear program of examples.hello_world.contract.HelloWorldContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine examples.hello_world.contract.HelloWorldContract.clear_state_program
@@ -441,7 +441,7 @@ debug: Coalescing local variables in examples.hello_world.contract.HelloWorldCon
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in examples.hello_world.contract.HelloWorldContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to hello_world/out_unoptimized/HelloWorldContract.ir/HelloWorldContract.clear.0.clear.destructured.ir
+debug: Output IR to hello_world/out_unoptimized/HelloWorldContract.ir/HelloWorldContract.clear.0.destructured.ir
 debug: Inserted main.ops[5]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[7]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[1]: 'l-store-copy name#0 0'
diff --git a/examples/hello_world_arc4/out/HelloWorldContract.ir/HelloWorldContract.approval.0.approval.ssa.ir b/examples/hello_world_arc4/out/HelloWorldContract.ir/HelloWorldContract.approval.0.ssa.ir
similarity index 100%
rename from examples/hello_world_arc4/out/HelloWorldContract.ir/HelloWorldContract.approval.0.approval.ssa.ir
rename to examples/hello_world_arc4/out/HelloWorldContract.ir/HelloWorldContract.approval.0.ssa.ir
diff --git a/examples/hello_world_arc4/out/HelloWorldContract.ir/HelloWorldContract.approval.1.approval.ssa.opt.ir b/examples/hello_world_arc4/out/HelloWorldContract.ir/HelloWorldContract.approval.1.ssa.opt.ir
similarity index 100%
rename from examples/hello_world_arc4/out/HelloWorldContract.ir/HelloWorldContract.approval.1.approval.ssa.opt.ir
rename to examples/hello_world_arc4/out/HelloWorldContract.ir/HelloWorldContract.approval.1.ssa.opt.ir
diff --git a/examples/hello_world_arc4/out/HelloWorldContract.ir/HelloWorldContract.approval.2.approval.ssa.opt.ir b/examples/hello_world_arc4/out/HelloWorldContract.ir/HelloWorldContract.approval.2.ssa.opt.ir
similarity index 100%
rename from examples/hello_world_arc4/out/HelloWorldContract.ir/HelloWorldContract.approval.2.approval.ssa.opt.ir
rename to examples/hello_world_arc4/out/HelloWorldContract.ir/HelloWorldContract.approval.2.ssa.opt.ir
diff --git a/examples/hello_world_arc4/out/HelloWorldContract.ir/HelloWorldContract.approval.3.approval.destructured.ir b/examples/hello_world_arc4/out/HelloWorldContract.ir/HelloWorldContract.approval.3.destructured.ir
similarity index 100%
rename from examples/hello_world_arc4/out/HelloWorldContract.ir/HelloWorldContract.approval.3.approval.destructured.ir
rename to examples/hello_world_arc4/out/HelloWorldContract.ir/HelloWorldContract.approval.3.destructured.ir
diff --git a/examples/hello_world_arc4/out/HelloWorldContract.ir/HelloWorldContract.clear.0.clear.ssa.ir b/examples/hello_world_arc4/out/HelloWorldContract.ir/HelloWorldContract.clear.0.ssa.ir
similarity index 100%
rename from examples/hello_world_arc4/out/HelloWorldContract.ir/HelloWorldContract.clear.0.clear.ssa.ir
rename to examples/hello_world_arc4/out/HelloWorldContract.ir/HelloWorldContract.clear.0.ssa.ir
diff --git a/examples/hello_world_arc4/out/HelloWorldContract.ir/HelloWorldContract.clear.1.clear.destructured.ir b/examples/hello_world_arc4/out/HelloWorldContract.ir/HelloWorldContract.clear.1.destructured.ir
similarity index 100%
rename from examples/hello_world_arc4/out/HelloWorldContract.ir/HelloWorldContract.clear.1.clear.destructured.ir
rename to examples/hello_world_arc4/out/HelloWorldContract.ir/HelloWorldContract.clear.1.destructured.ir
diff --git a/examples/hello_world_arc4/out_O2/HelloWorldContract.ir/HelloWorldContract.approval.0.approval.destructured.ir b/examples/hello_world_arc4/out_O2/HelloWorldContract.ir/HelloWorldContract.approval.0.destructured.ir
similarity index 100%
rename from examples/hello_world_arc4/out_O2/HelloWorldContract.ir/HelloWorldContract.approval.0.approval.destructured.ir
rename to examples/hello_world_arc4/out_O2/HelloWorldContract.ir/HelloWorldContract.approval.0.destructured.ir
diff --git a/examples/hello_world_arc4/out_O2/HelloWorldContract.ir/HelloWorldContract.clear.0.clear.destructured.ir b/examples/hello_world_arc4/out_O2/HelloWorldContract.ir/HelloWorldContract.clear.0.destructured.ir
similarity index 100%
rename from examples/hello_world_arc4/out_O2/HelloWorldContract.ir/HelloWorldContract.clear.0.clear.destructured.ir
rename to examples/hello_world_arc4/out_O2/HelloWorldContract.ir/HelloWorldContract.clear.0.destructured.ir
diff --git a/examples/hello_world_arc4/out_unoptimized/HelloWorldContract.ir/HelloWorldContract.approval.0.approval.destructured.ir b/examples/hello_world_arc4/out_unoptimized/HelloWorldContract.ir/HelloWorldContract.approval.0.destructured.ir
similarity index 100%
rename from examples/hello_world_arc4/out_unoptimized/HelloWorldContract.ir/HelloWorldContract.approval.0.approval.destructured.ir
rename to examples/hello_world_arc4/out_unoptimized/HelloWorldContract.ir/HelloWorldContract.approval.0.destructured.ir
diff --git a/examples/hello_world_arc4/out_unoptimized/HelloWorldContract.ir/HelloWorldContract.clear.0.clear.destructured.ir b/examples/hello_world_arc4/out_unoptimized/HelloWorldContract.ir/HelloWorldContract.clear.0.destructured.ir
similarity index 100%
rename from examples/hello_world_arc4/out_unoptimized/HelloWorldContract.ir/HelloWorldContract.clear.0.clear.destructured.ir
rename to examples/hello_world_arc4/out_unoptimized/HelloWorldContract.ir/HelloWorldContract.clear.0.destructured.ir
diff --git a/examples/hello_world_arc4/puya.log b/examples/hello_world_arc4/puya.log
index 80b4023d3d..15315bb793 100644
--- a/examples/hello_world_arc4/puya.log
+++ b/examples/hello_world_arc4/puya.log
@@ -425,7 +425,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to hello_world_arc4/out/HelloWorldContract.ir/HelloWorldContract.approval.0.approval.ssa.ir
+debug: Output IR to hello_world_arc4/out/HelloWorldContract.ir/HelloWorldContract.approval.0.ssa.ir
 info: optimizing approval program of examples.hello_world_arc4.contract.HelloWorldContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
@@ -525,7 +525,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine examples.hello_world_arc4.contract.HelloWorldContract.__puya_arc4_router__
-debug: Output IR to hello_world_arc4/out/HelloWorldContract.ir/HelloWorldContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to hello_world_arc4/out/HelloWorldContract.ir/HelloWorldContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -578,7 +578,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine examples.hello_world_arc4.contract.HelloWorldContract.__algopy_default_create
-debug: Output IR to hello_world_arc4/out/HelloWorldContract.ir/HelloWorldContract.approval.2.approval.ssa.opt.ir
+debug: Output IR to hello_world_arc4/out/HelloWorldContract.ir/HelloWorldContract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -627,8 +627,8 @@ debug: Coalescing local variables in examples.hello_world_arc4.contract.HelloWor
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in examples.hello_world_arc4.contract.HelloWorldContract.hello
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to hello_world_arc4/out/HelloWorldContract.ir/HelloWorldContract.approval.3.approval.destructured.ir
-debug: Output IR to hello_world_arc4/out/HelloWorldContract.ir/HelloWorldContract.clear.0.clear.ssa.ir
+debug: Output IR to hello_world_arc4/out/HelloWorldContract.ir/HelloWorldContract.approval.3.destructured.ir
+debug: Output IR to hello_world_arc4/out/HelloWorldContract.ir/HelloWorldContract.clear.0.ssa.ir
 info: optimizing clear program of examples.hello_world_arc4.contract.HelloWorldContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -654,7 +654,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to hello_world_arc4/out/HelloWorldContract.ir/HelloWorldContract.clear.1.clear.destructured.ir
+debug: Output IR to hello_world_arc4/out/HelloWorldContract.ir/HelloWorldContract.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/examples/hello_world_arc4/puya_O2.log b/examples/hello_world_arc4/puya_O2.log
index 9c45539354..e1a47cf7f7 100644
--- a/examples/hello_world_arc4/puya_O2.log
+++ b/examples/hello_world_arc4/puya_O2.log
@@ -619,7 +619,7 @@ debug: Coalescing tmp%0#0 with [tmp%0#3]
 debug: Coalescing resulted in 8 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to hello_world_arc4/out_O2/HelloWorldContract.ir/HelloWorldContract.approval.0.approval.destructured.ir
+debug: Output IR to hello_world_arc4/out_O2/HelloWorldContract.ir/HelloWorldContract.approval.0.destructured.ir
 info: optimizing clear program of examples.hello_world_arc4.contract.HelloWorldContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -645,7 +645,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to hello_world_arc4/out_O2/HelloWorldContract.ir/HelloWorldContract.clear.0.clear.destructured.ir
+debug: Output IR to hello_world_arc4/out_O2/HelloWorldContract.ir/HelloWorldContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/examples/hello_world_arc4/puya_unoptimized.log b/examples/hello_world_arc4/puya_unoptimized.log
index 7b7c05525d..a3dbe4391e 100644
--- a/examples/hello_world_arc4/puya_unoptimized.log
+++ b/examples/hello_world_arc4/puya_unoptimized.log
@@ -513,7 +513,7 @@ debug: Coalescing local variables in examples.hello_world_arc4.contract.HelloWor
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in examples.hello_world_arc4.contract.HelloWorldContract.hello
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to hello_world_arc4/out_unoptimized/HelloWorldContract.ir/HelloWorldContract.approval.0.approval.destructured.ir
+debug: Output IR to hello_world_arc4/out_unoptimized/HelloWorldContract.ir/HelloWorldContract.approval.0.destructured.ir
 info: optimizing clear program of examples.hello_world_arc4.contract.HelloWorldContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -531,7 +531,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to hello_world_arc4/out_unoptimized/HelloWorldContract.ir/HelloWorldContract.clear.0.clear.destructured.ir
+debug: Output IR to hello_world_arc4/out_unoptimized/HelloWorldContract.ir/HelloWorldContract.clear.0.destructured.ir
 debug: Inserted main_block@1.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main_block@1.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_block@1.ops[6]: 'l-store-copy tmp%1#0 0'
diff --git a/examples/local_state/out/LocalStateContract.ir/LocalStateContract.approval.0.approval.ssa.ir b/examples/local_state/out/LocalStateContract.ir/LocalStateContract.approval.0.ssa.ir
similarity index 100%
rename from examples/local_state/out/LocalStateContract.ir/LocalStateContract.approval.0.approval.ssa.ir
rename to examples/local_state/out/LocalStateContract.ir/LocalStateContract.approval.0.ssa.ir
diff --git a/examples/local_state/out/LocalStateContract.ir/LocalStateContract.approval.1.approval.ssa.opt.ir b/examples/local_state/out/LocalStateContract.ir/LocalStateContract.approval.1.ssa.opt.ir
similarity index 100%
rename from examples/local_state/out/LocalStateContract.ir/LocalStateContract.approval.1.approval.ssa.opt.ir
rename to examples/local_state/out/LocalStateContract.ir/LocalStateContract.approval.1.ssa.opt.ir
diff --git a/examples/local_state/out/LocalStateContract.ir/LocalStateContract.approval.2.approval.ssa.opt.ir b/examples/local_state/out/LocalStateContract.ir/LocalStateContract.approval.2.ssa.opt.ir
similarity index 100%
rename from examples/local_state/out/LocalStateContract.ir/LocalStateContract.approval.2.approval.ssa.opt.ir
rename to examples/local_state/out/LocalStateContract.ir/LocalStateContract.approval.2.ssa.opt.ir
diff --git a/examples/local_state/out/LocalStateContract.ir/LocalStateContract.approval.3.approval.destructured.ir b/examples/local_state/out/LocalStateContract.ir/LocalStateContract.approval.3.destructured.ir
similarity index 100%
rename from examples/local_state/out/LocalStateContract.ir/LocalStateContract.approval.3.approval.destructured.ir
rename to examples/local_state/out/LocalStateContract.ir/LocalStateContract.approval.3.destructured.ir
diff --git a/examples/local_state/out/LocalStateContract.ir/LocalStateContract.clear.0.clear.ssa.ir b/examples/local_state/out/LocalStateContract.ir/LocalStateContract.clear.0.ssa.ir
similarity index 100%
rename from examples/local_state/out/LocalStateContract.ir/LocalStateContract.clear.0.clear.ssa.ir
rename to examples/local_state/out/LocalStateContract.ir/LocalStateContract.clear.0.ssa.ir
diff --git a/examples/local_state/out/LocalStateContract.ir/LocalStateContract.clear.1.clear.destructured.ir b/examples/local_state/out/LocalStateContract.ir/LocalStateContract.clear.1.destructured.ir
similarity index 100%
rename from examples/local_state/out/LocalStateContract.ir/LocalStateContract.clear.1.clear.destructured.ir
rename to examples/local_state/out/LocalStateContract.ir/LocalStateContract.clear.1.destructured.ir
diff --git a/examples/local_state/out/LocalStateWithOffsets.ir/LocalStateWithOffsets.approval.0.approval.ssa.ir b/examples/local_state/out/LocalStateWithOffsets.ir/LocalStateWithOffsets.approval.0.ssa.ir
similarity index 100%
rename from examples/local_state/out/LocalStateWithOffsets.ir/LocalStateWithOffsets.approval.0.approval.ssa.ir
rename to examples/local_state/out/LocalStateWithOffsets.ir/LocalStateWithOffsets.approval.0.ssa.ir
diff --git a/examples/local_state/out/LocalStateWithOffsets.ir/LocalStateWithOffsets.approval.1.approval.ssa.opt.ir b/examples/local_state/out/LocalStateWithOffsets.ir/LocalStateWithOffsets.approval.1.ssa.opt.ir
similarity index 100%
rename from examples/local_state/out/LocalStateWithOffsets.ir/LocalStateWithOffsets.approval.1.approval.ssa.opt.ir
rename to examples/local_state/out/LocalStateWithOffsets.ir/LocalStateWithOffsets.approval.1.ssa.opt.ir
diff --git a/examples/local_state/out/LocalStateWithOffsets.ir/LocalStateWithOffsets.approval.2.approval.ssa.opt.ir b/examples/local_state/out/LocalStateWithOffsets.ir/LocalStateWithOffsets.approval.2.ssa.opt.ir
similarity index 100%
rename from examples/local_state/out/LocalStateWithOffsets.ir/LocalStateWithOffsets.approval.2.approval.ssa.opt.ir
rename to examples/local_state/out/LocalStateWithOffsets.ir/LocalStateWithOffsets.approval.2.ssa.opt.ir
diff --git a/examples/local_state/out/LocalStateWithOffsets.ir/LocalStateWithOffsets.approval.3.approval.destructured.ir b/examples/local_state/out/LocalStateWithOffsets.ir/LocalStateWithOffsets.approval.3.destructured.ir
similarity index 100%
rename from examples/local_state/out/LocalStateWithOffsets.ir/LocalStateWithOffsets.approval.3.approval.destructured.ir
rename to examples/local_state/out/LocalStateWithOffsets.ir/LocalStateWithOffsets.approval.3.destructured.ir
diff --git a/examples/local_state/out/LocalStateWithOffsets.ir/LocalStateWithOffsets.clear.0.clear.ssa.ir b/examples/local_state/out/LocalStateWithOffsets.ir/LocalStateWithOffsets.clear.0.ssa.ir
similarity index 100%
rename from examples/local_state/out/LocalStateWithOffsets.ir/LocalStateWithOffsets.clear.0.clear.ssa.ir
rename to examples/local_state/out/LocalStateWithOffsets.ir/LocalStateWithOffsets.clear.0.ssa.ir
diff --git a/examples/local_state/out/LocalStateWithOffsets.ir/LocalStateWithOffsets.clear.1.clear.destructured.ir b/examples/local_state/out/LocalStateWithOffsets.ir/LocalStateWithOffsets.clear.1.destructured.ir
similarity index 100%
rename from examples/local_state/out/LocalStateWithOffsets.ir/LocalStateWithOffsets.clear.1.clear.destructured.ir
rename to examples/local_state/out/LocalStateWithOffsets.ir/LocalStateWithOffsets.clear.1.destructured.ir
diff --git a/examples/local_state/out_O2/LocalStateContract.ir/LocalStateContract.approval.0.approval.destructured.ir b/examples/local_state/out_O2/LocalStateContract.ir/LocalStateContract.approval.0.destructured.ir
similarity index 100%
rename from examples/local_state/out_O2/LocalStateContract.ir/LocalStateContract.approval.0.approval.destructured.ir
rename to examples/local_state/out_O2/LocalStateContract.ir/LocalStateContract.approval.0.destructured.ir
diff --git a/examples/local_state/out_O2/LocalStateContract.ir/LocalStateContract.clear.0.clear.destructured.ir b/examples/local_state/out_O2/LocalStateContract.ir/LocalStateContract.clear.0.destructured.ir
similarity index 100%
rename from examples/local_state/out_O2/LocalStateContract.ir/LocalStateContract.clear.0.clear.destructured.ir
rename to examples/local_state/out_O2/LocalStateContract.ir/LocalStateContract.clear.0.destructured.ir
diff --git a/examples/local_state/out_O2/LocalStateWithOffsets.ir/LocalStateWithOffsets.approval.0.approval.destructured.ir b/examples/local_state/out_O2/LocalStateWithOffsets.ir/LocalStateWithOffsets.approval.0.destructured.ir
similarity index 100%
rename from examples/local_state/out_O2/LocalStateWithOffsets.ir/LocalStateWithOffsets.approval.0.approval.destructured.ir
rename to examples/local_state/out_O2/LocalStateWithOffsets.ir/LocalStateWithOffsets.approval.0.destructured.ir
diff --git a/examples/local_state/out_O2/LocalStateWithOffsets.ir/LocalStateWithOffsets.clear.0.clear.destructured.ir b/examples/local_state/out_O2/LocalStateWithOffsets.ir/LocalStateWithOffsets.clear.0.destructured.ir
similarity index 100%
rename from examples/local_state/out_O2/LocalStateWithOffsets.ir/LocalStateWithOffsets.clear.0.clear.destructured.ir
rename to examples/local_state/out_O2/LocalStateWithOffsets.ir/LocalStateWithOffsets.clear.0.destructured.ir
diff --git a/examples/local_state/out_unoptimized/LocalStateContract.ir/LocalStateContract.approval.0.approval.destructured.ir b/examples/local_state/out_unoptimized/LocalStateContract.ir/LocalStateContract.approval.0.destructured.ir
similarity index 100%
rename from examples/local_state/out_unoptimized/LocalStateContract.ir/LocalStateContract.approval.0.approval.destructured.ir
rename to examples/local_state/out_unoptimized/LocalStateContract.ir/LocalStateContract.approval.0.destructured.ir
diff --git a/examples/local_state/out_unoptimized/LocalStateContract.ir/LocalStateContract.clear.0.clear.destructured.ir b/examples/local_state/out_unoptimized/LocalStateContract.ir/LocalStateContract.clear.0.destructured.ir
similarity index 100%
rename from examples/local_state/out_unoptimized/LocalStateContract.ir/LocalStateContract.clear.0.clear.destructured.ir
rename to examples/local_state/out_unoptimized/LocalStateContract.ir/LocalStateContract.clear.0.destructured.ir
diff --git a/examples/local_state/out_unoptimized/LocalStateWithOffsets.ir/LocalStateWithOffsets.approval.0.approval.destructured.ir b/examples/local_state/out_unoptimized/LocalStateWithOffsets.ir/LocalStateWithOffsets.approval.0.destructured.ir
similarity index 100%
rename from examples/local_state/out_unoptimized/LocalStateWithOffsets.ir/LocalStateWithOffsets.approval.0.approval.destructured.ir
rename to examples/local_state/out_unoptimized/LocalStateWithOffsets.ir/LocalStateWithOffsets.approval.0.destructured.ir
diff --git a/examples/local_state/out_unoptimized/LocalStateWithOffsets.ir/LocalStateWithOffsets.clear.0.clear.destructured.ir b/examples/local_state/out_unoptimized/LocalStateWithOffsets.ir/LocalStateWithOffsets.clear.0.destructured.ir
similarity index 100%
rename from examples/local_state/out_unoptimized/LocalStateWithOffsets.ir/LocalStateWithOffsets.clear.0.clear.destructured.ir
rename to examples/local_state/out_unoptimized/LocalStateWithOffsets.ir/LocalStateWithOffsets.clear.0.destructured.ir
diff --git a/examples/local_state/puya.log b/examples/local_state/puya.log
index 667c96feea..92ec6ec0a5 100644
--- a/examples/local_state/puya.log
+++ b/examples/local_state/puya.log
@@ -613,7 +613,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to local_state/out/LocalStateWithOffsets.ir/LocalStateWithOffsets.approval.0.approval.ssa.ir
+debug: Output IR to local_state/out/LocalStateWithOffsets.ir/LocalStateWithOffsets.approval.0.ssa.ir
 info: optimizing approval program of examples.local_state.local_state_with_offsets.LocalStateContract at level 1
 debug: Begin optimization pass 1/100
 debug: marking trivial method examples.local_state.local_state_with_offsets.LocalStateContract.__init__ as inlineable
@@ -814,7 +814,7 @@ debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine examples.local_state.local_state_with_offsets.LocalStateContract.__init__
 debug: removing unused subroutine examples.local_state.local_state_with_offsets.LocalStateContract.approval_program
-debug: Output IR to local_state/out/LocalStateWithOffsets.ir/LocalStateWithOffsets.approval.1.approval.ssa.opt.ir
+debug: Output IR to local_state/out/LocalStateWithOffsets.ir/LocalStateWithOffsets.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking single-use function examples.local_state.local_state_with_offsets.LocalStateContract.get_guaranteed_data for inlining
 debug: marking single-use function examples.local_state.local_state_with_offsets.LocalStateContract.get_data_or_assert for inlining
@@ -954,7 +954,7 @@ debug: removing unused subroutine examples.local_state.local_state_with_offsets.
 debug: removing unused subroutine examples.local_state.local_state_with_offsets.LocalStateContract.delete_data
 debug: removing unused subroutine examples.local_state.local_state_with_offsets.LocalStateContract.set_data
 debug: removing unused subroutine examples.local_state.local_state_with_offsets.LocalStateContract.get_data_with_default
-debug: Output IR to local_state/out/LocalStateWithOffsets.ir/LocalStateWithOffsets.approval.2.approval.ssa.opt.ir
+debug: Output IR to local_state/out/LocalStateWithOffsets.ir/LocalStateWithOffsets.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine examples.local_state.local_state_with_offsets.LocalStateContract.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -983,8 +983,8 @@ debug: Coalescing maybe_exists%0#0 with [maybe_exists%0#1]
 debug: Coalescing resulted in 27 replacement/s
 debug: Sequentializing parallel copies in examples.local_state.local_state_with_offsets.LocalStateContract.__algopy_entrypoint_with_init
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to local_state/out/LocalStateWithOffsets.ir/LocalStateWithOffsets.approval.3.approval.destructured.ir
-debug: Output IR to local_state/out/LocalStateWithOffsets.ir/LocalStateWithOffsets.clear.0.clear.ssa.ir
+debug: Output IR to local_state/out/LocalStateWithOffsets.ir/LocalStateWithOffsets.approval.3.destructured.ir
+debug: Output IR to local_state/out/LocalStateWithOffsets.ir/LocalStateWithOffsets.clear.0.ssa.ir
 info: optimizing clear program of examples.local_state.local_state_with_offsets.LocalStateContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine examples.local_state.local_state_with_offsets.LocalStateContract.clear_state_program
@@ -1010,7 +1010,7 @@ debug: Coalescing local variables in examples.local_state.local_state_with_offse
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in examples.local_state.local_state_with_offsets.LocalStateContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to local_state/out/LocalStateWithOffsets.ir/LocalStateWithOffsets.clear.1.clear.destructured.ir
+debug: Output IR to local_state/out/LocalStateWithOffsets.ir/LocalStateWithOffsets.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_if_body@4.ops[1]: 'l-store-copy examples.local_state.local_state_with_offsets.LocalStateContract.approval_program%0#0 0'
@@ -1110,7 +1110,7 @@ debug: inlining single reference block main_if_body@25 into main_else_body@24
 debug: removing explicit jump to fall-through block main_after_if_else@20
 debug: removing explicit jump to fall-through block main_after_if_else@28
 local_state/local_state_with_offsets.py:50 debug: optimizing TEAL subroutine examples.local_state.local_state_with_offsets.LocalStateContract.clear_state_program() -> uint64:
-debug: Output IR to local_state/out/LocalStateContract.ir/LocalStateContract.approval.0.approval.ssa.ir
+debug: Output IR to local_state/out/LocalStateContract.ir/LocalStateContract.approval.0.ssa.ir
 info: optimizing approval program of examples.local_state.local_state_contract.LocalStateContract at level 1
 debug: Begin optimization pass 1/100
 debug: marking trivial method examples.local_state.local_state_contract.LocalStateContract.__init__ as inlineable
@@ -1395,7 +1395,7 @@ debug: removing unused subroutine examples.local_state.local_state_contract.Loca
 debug: removing unused subroutine examples.local_state.local_state_contract.get_local_state_length
 debug: removing unused subroutine examples.local_state.local_state_contract.local_bytes_exists
 debug: removing unused subroutine examples.local_state.local_state_contract.read_local_bytes
-debug: Output IR to local_state/out/LocalStateContract.ir/LocalStateContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to local_state/out/LocalStateContract.ir/LocalStateContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking single-use function examples.local_state.local_state_contract.LocalStateContract.get_guaranteed_data for inlining
 debug: marking single-use function examples.local_state.local_state_contract.LocalStateContract.get_data_or_assert for inlining
@@ -1540,7 +1540,7 @@ debug: removing unused subroutine examples.local_state.local_state_contract.Loca
 debug: removing unused subroutine examples.local_state.local_state_contract.LocalStateContract.delete_data
 debug: removing unused subroutine examples.local_state.local_state_contract.LocalStateContract.set_data
 debug: removing unused subroutine examples.local_state.local_state_contract.LocalStateContract.get_data_with_default
-debug: Output IR to local_state/out/LocalStateContract.ir/LocalStateContract.approval.2.approval.ssa.opt.ir
+debug: Output IR to local_state/out/LocalStateContract.ir/LocalStateContract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine examples.local_state.local_state_contract.LocalStateContract.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -1572,8 +1572,8 @@ debug: Coalescing maybe_value%0#0 with [maybe_value%0#2, maybe_value%0#3, maybe_
 debug: Coalescing resulted in 53 replacement/s
 debug: Sequentializing parallel copies in examples.local_state.local_state_contract.LocalStateContract.__algopy_entrypoint_with_init
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to local_state/out/LocalStateContract.ir/LocalStateContract.approval.3.approval.destructured.ir
-debug: Output IR to local_state/out/LocalStateContract.ir/LocalStateContract.clear.0.clear.ssa.ir
+debug: Output IR to local_state/out/LocalStateContract.ir/LocalStateContract.approval.3.destructured.ir
+debug: Output IR to local_state/out/LocalStateContract.ir/LocalStateContract.clear.0.ssa.ir
 info: optimizing clear program of examples.local_state.local_state_contract.LocalStateContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine examples.local_state.local_state_contract.LocalStateContract.clear_state_program
@@ -1599,7 +1599,7 @@ debug: Coalescing local variables in examples.local_state.local_state_contract.L
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in examples.local_state.local_state_contract.LocalStateContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to local_state/out/LocalStateContract.ir/LocalStateContract.clear.1.clear.destructured.ir
+debug: Output IR to local_state/out/LocalStateContract.ir/LocalStateContract.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_if_body@4.ops[1]: 'l-store-copy examples.local_state.local_state_contract.LocalStateContract.approval_program%0#0 0'
diff --git a/examples/local_state/puya_O2.log b/examples/local_state/puya_O2.log
index 0bac257835..3b8117d75b 100644
--- a/examples/local_state/puya_O2.log
+++ b/examples/local_state/puya_O2.log
@@ -991,7 +991,7 @@ debug: Removing duplicated block block@28 and updating references to block@4
 debug: Replaced predecessor block@28 with block@4 in block@30
 debug: Removing duplicated block block@29 and updating references to block@7
 debug: Replaced predecessor block@29 with block@7 in block@30
-debug: Output IR to local_state/out_O2/LocalStateWithOffsets.ir/LocalStateWithOffsets.approval.0.approval.destructured.ir
+debug: Output IR to local_state/out_O2/LocalStateWithOffsets.ir/LocalStateWithOffsets.approval.0.destructured.ir
 info: optimizing clear program of examples.local_state.local_state_with_offsets.LocalStateContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine examples.local_state.local_state_with_offsets.LocalStateContract.clear_state_program
@@ -1017,7 +1017,7 @@ debug: Coalescing local variables in examples.local_state.local_state_with_offse
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in examples.local_state.local_state_with_offsets.LocalStateContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to local_state/out_O2/LocalStateWithOffsets.ir/LocalStateWithOffsets.clear.0.clear.destructured.ir
+debug: Output IR to local_state/out_O2/LocalStateWithOffsets.ir/LocalStateWithOffsets.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_if_body@4.ops[1]: 'l-store-copy examples.local_state.local_state_with_offsets.LocalStateContract.approval_program%0#0 0'
@@ -1562,7 +1562,7 @@ debug: Removing duplicated block block@28 and updating references to block@4
 debug: Replaced predecessor block@28 with block@4 in block@30
 debug: Removing duplicated block block@29 and updating references to block@7
 debug: Replaced predecessor block@29 with block@7 in block@30
-debug: Output IR to local_state/out_O2/LocalStateContract.ir/LocalStateContract.approval.0.approval.destructured.ir
+debug: Output IR to local_state/out_O2/LocalStateContract.ir/LocalStateContract.approval.0.destructured.ir
 info: optimizing clear program of examples.local_state.local_state_contract.LocalStateContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine examples.local_state.local_state_contract.LocalStateContract.clear_state_program
@@ -1588,7 +1588,7 @@ debug: Coalescing local variables in examples.local_state.local_state_contract.L
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in examples.local_state.local_state_contract.LocalStateContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to local_state/out_O2/LocalStateContract.ir/LocalStateContract.clear.0.clear.destructured.ir
+debug: Output IR to local_state/out_O2/LocalStateContract.ir/LocalStateContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_if_body@4.ops[1]: 'l-store-copy examples.local_state.local_state_contract.LocalStateContract.approval_program%0#0 0'
diff --git a/examples/local_state/puya_unoptimized.log b/examples/local_state/puya_unoptimized.log
index 23878cc927..34b74c5b5a 100644
--- a/examples/local_state/puya_unoptimized.log
+++ b/examples/local_state/puya_unoptimized.log
@@ -727,7 +727,7 @@ debug: Coalescing local variables in examples.local_state.local_state_with_offse
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in examples.local_state.local_state_with_offsets.LocalStateContract.get_data_with_default
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to local_state/out_unoptimized/LocalStateWithOffsets.ir/LocalStateWithOffsets.approval.0.approval.destructured.ir
+debug: Output IR to local_state/out_unoptimized/LocalStateWithOffsets.ir/LocalStateWithOffsets.approval.0.destructured.ir
 info: optimizing clear program of examples.local_state.local_state_with_offsets.LocalStateContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine examples.local_state.local_state_with_offsets.LocalStateContract.clear_state_program
@@ -745,7 +745,7 @@ debug: Coalescing local variables in examples.local_state.local_state_with_offse
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in examples.local_state.local_state_with_offsets.LocalStateContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to local_state/out_unoptimized/LocalStateWithOffsets.ir/LocalStateWithOffsets.clear.0.clear.destructured.ir
+debug: Output IR to local_state/out_unoptimized/LocalStateWithOffsets.ir/LocalStateWithOffsets.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%1#0 0'
@@ -1000,7 +1000,7 @@ debug: Coalescing local variables in examples.local_state.local_state_contract.L
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in examples.local_state.local_state_contract.LocalStateContract.get_data_with_default
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to local_state/out_unoptimized/LocalStateContract.ir/LocalStateContract.approval.0.approval.destructured.ir
+debug: Output IR to local_state/out_unoptimized/LocalStateContract.ir/LocalStateContract.approval.0.destructured.ir
 info: optimizing clear program of examples.local_state.local_state_contract.LocalStateContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine examples.local_state.local_state_contract.LocalStateContract.clear_state_program
@@ -1018,7 +1018,7 @@ debug: Coalescing local variables in examples.local_state.local_state_contract.L
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in examples.local_state.local_state_contract.LocalStateContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to local_state/out_unoptimized/LocalStateContract.ir/LocalStateContract.clear.0.clear.destructured.ir
+debug: Output IR to local_state/out_unoptimized/LocalStateContract.ir/LocalStateContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%1#0 0'
diff --git a/examples/merkle/out/MerkleTree.ir/MerkleTree.approval.0.approval.ssa.ir b/examples/merkle/out/MerkleTree.ir/MerkleTree.approval.0.ssa.ir
similarity index 100%
rename from examples/merkle/out/MerkleTree.ir/MerkleTree.approval.0.approval.ssa.ir
rename to examples/merkle/out/MerkleTree.ir/MerkleTree.approval.0.ssa.ir
diff --git a/examples/merkle/out/MerkleTree.ir/MerkleTree.approval.1.approval.ssa.opt.ir b/examples/merkle/out/MerkleTree.ir/MerkleTree.approval.1.ssa.opt.ir
similarity index 100%
rename from examples/merkle/out/MerkleTree.ir/MerkleTree.approval.1.approval.ssa.opt.ir
rename to examples/merkle/out/MerkleTree.ir/MerkleTree.approval.1.ssa.opt.ir
diff --git a/examples/merkle/out/MerkleTree.ir/MerkleTree.approval.2.approval.ssa.opt.ir b/examples/merkle/out/MerkleTree.ir/MerkleTree.approval.2.ssa.opt.ir
similarity index 100%
rename from examples/merkle/out/MerkleTree.ir/MerkleTree.approval.2.approval.ssa.opt.ir
rename to examples/merkle/out/MerkleTree.ir/MerkleTree.approval.2.ssa.opt.ir
diff --git a/examples/merkle/out/MerkleTree.ir/MerkleTree.approval.3.approval.destructured.ir b/examples/merkle/out/MerkleTree.ir/MerkleTree.approval.3.destructured.ir
similarity index 100%
rename from examples/merkle/out/MerkleTree.ir/MerkleTree.approval.3.approval.destructured.ir
rename to examples/merkle/out/MerkleTree.ir/MerkleTree.approval.3.destructured.ir
diff --git a/examples/merkle/out/MerkleTree.ir/MerkleTree.clear.0.clear.ssa.ir b/examples/merkle/out/MerkleTree.ir/MerkleTree.clear.0.ssa.ir
similarity index 100%
rename from examples/merkle/out/MerkleTree.ir/MerkleTree.clear.0.clear.ssa.ir
rename to examples/merkle/out/MerkleTree.ir/MerkleTree.clear.0.ssa.ir
diff --git a/examples/merkle/out/MerkleTree.ir/MerkleTree.clear.1.clear.destructured.ir b/examples/merkle/out/MerkleTree.ir/MerkleTree.clear.1.destructured.ir
similarity index 100%
rename from examples/merkle/out/MerkleTree.ir/MerkleTree.clear.1.clear.destructured.ir
rename to examples/merkle/out/MerkleTree.ir/MerkleTree.clear.1.destructured.ir
diff --git a/examples/merkle/out_O2/MerkleTree.ir/MerkleTree.approval.0.approval.destructured.ir b/examples/merkle/out_O2/MerkleTree.ir/MerkleTree.approval.0.destructured.ir
similarity index 100%
rename from examples/merkle/out_O2/MerkleTree.ir/MerkleTree.approval.0.approval.destructured.ir
rename to examples/merkle/out_O2/MerkleTree.ir/MerkleTree.approval.0.destructured.ir
diff --git a/examples/merkle/out_O2/MerkleTree.ir/MerkleTree.clear.0.clear.destructured.ir b/examples/merkle/out_O2/MerkleTree.ir/MerkleTree.clear.0.destructured.ir
similarity index 100%
rename from examples/merkle/out_O2/MerkleTree.ir/MerkleTree.clear.0.clear.destructured.ir
rename to examples/merkle/out_O2/MerkleTree.ir/MerkleTree.clear.0.destructured.ir
diff --git a/examples/merkle/out_unoptimized/MerkleTree.ir/MerkleTree.approval.0.approval.destructured.ir b/examples/merkle/out_unoptimized/MerkleTree.ir/MerkleTree.approval.0.destructured.ir
similarity index 100%
rename from examples/merkle/out_unoptimized/MerkleTree.ir/MerkleTree.approval.0.approval.destructured.ir
rename to examples/merkle/out_unoptimized/MerkleTree.ir/MerkleTree.approval.0.destructured.ir
diff --git a/examples/merkle/out_unoptimized/MerkleTree.ir/MerkleTree.clear.0.clear.destructured.ir b/examples/merkle/out_unoptimized/MerkleTree.ir/MerkleTree.clear.0.destructured.ir
similarity index 100%
rename from examples/merkle/out_unoptimized/MerkleTree.ir/MerkleTree.clear.0.clear.destructured.ir
rename to examples/merkle/out_unoptimized/MerkleTree.ir/MerkleTree.clear.0.destructured.ir
diff --git a/examples/merkle/puya.log b/examples/merkle/puya.log
index 3311b37963..e992b3b541 100644
--- a/examples/merkle/puya.log
+++ b/examples/merkle/puya.log
@@ -459,7 +459,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to merkle/out/MerkleTree.ir/MerkleTree.approval.0.approval.ssa.ir
+debug: Output IR to merkle/out/MerkleTree.ir/MerkleTree.approval.0.ssa.ir
 info: optimizing approval program of examples.merkle.contract.MerkleTree at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function examples.merkle.contract.compute_root_hash for inlining
@@ -607,7 +607,7 @@ debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine examples.merkle.contract.MerkleTree.__puya_arc4_router__
 debug: removing unused subroutine examples.merkle.contract.compute_root_hash
-debug: Output IR to merkle/out/MerkleTree.ir/MerkleTree.approval.1.approval.ssa.opt.ir
+debug: Output IR to merkle/out/MerkleTree.ir/MerkleTree.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking single-use function examples.merkle.contract.hash_pair for inlining
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
@@ -681,7 +681,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine examples.merkle.contract.hash_pair
-debug: Output IR to merkle/out/MerkleTree.ir/MerkleTree.approval.2.approval.ssa.opt.ir
+debug: Output IR to merkle/out/MerkleTree.ir/MerkleTree.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -776,8 +776,8 @@ debug: to_do: idx#0, computed#1
 debug: * to_do computed#1
 debug: * to_do idx#0
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to merkle/out/MerkleTree.ir/MerkleTree.approval.3.approval.destructured.ir
-debug: Output IR to merkle/out/MerkleTree.ir/MerkleTree.clear.0.clear.ssa.ir
+debug: Output IR to merkle/out/MerkleTree.ir/MerkleTree.approval.3.destructured.ir
+debug: Output IR to merkle/out/MerkleTree.ir/MerkleTree.clear.0.ssa.ir
 info: optimizing clear program of examples.merkle.contract.MerkleTree at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -803,7 +803,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to merkle/out/MerkleTree.ir/MerkleTree.clear.1.clear.destructured.ir
+debug: Output IR to merkle/out/MerkleTree.ir/MerkleTree.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/examples/merkle/puya_O2.log b/examples/merkle/puya_O2.log
index efb3de1f6a..3e52eb4c63 100644
--- a/examples/merkle/puya_O2.log
+++ b/examples/merkle/puya_O2.log
@@ -805,7 +805,7 @@ debug: to_do: idx#0, computed#1
 debug: * to_do computed#1
 debug: * to_do idx#0
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to merkle/out_O2/MerkleTree.ir/MerkleTree.approval.0.approval.destructured.ir
+debug: Output IR to merkle/out_O2/MerkleTree.ir/MerkleTree.approval.0.destructured.ir
 info: optimizing clear program of examples.merkle.contract.MerkleTree at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -831,7 +831,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to merkle/out_O2/MerkleTree.ir/MerkleTree.clear.0.clear.destructured.ir
+debug: Output IR to merkle/out_O2/MerkleTree.ir/MerkleTree.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/examples/merkle/puya_unoptimized.log b/examples/merkle/puya_unoptimized.log
index 034514e944..c79585bec6 100644
--- a/examples/merkle/puya_unoptimized.log
+++ b/examples/merkle/puya_unoptimized.log
@@ -602,7 +602,7 @@ debug: Coalescing ternary_result%0#0 with [ternary_result%0#5, ternary_result%0#
 debug: Coalescing resulted in 7 replacement/s
 debug: Sequentializing parallel copies in examples.merkle.contract.hash_pair
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to merkle/out_unoptimized/MerkleTree.ir/MerkleTree.approval.0.approval.destructured.ir
+debug: Output IR to merkle/out_unoptimized/MerkleTree.ir/MerkleTree.approval.0.destructured.ir
 info: optimizing clear program of examples.merkle.contract.MerkleTree at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -620,7 +620,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to merkle/out_unoptimized/MerkleTree.ir/MerkleTree.clear.0.clear.destructured.ir
+debug: Output IR to merkle/out_unoptimized/MerkleTree.ir/MerkleTree.clear.0.destructured.ir
 debug: Inserted main_block@1.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main_block@1.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_block@1.ops[6]: 'l-store-copy tmp%1#0 0'
diff --git a/examples/struct_in_box/out/ExampleContract.ir/ExampleContract.approval.0.approval.ssa.ir b/examples/struct_in_box/out/ExampleContract.ir/ExampleContract.approval.0.ssa.ir
similarity index 100%
rename from examples/struct_in_box/out/ExampleContract.ir/ExampleContract.approval.0.approval.ssa.ir
rename to examples/struct_in_box/out/ExampleContract.ir/ExampleContract.approval.0.ssa.ir
diff --git a/examples/struct_in_box/out/ExampleContract.ir/ExampleContract.approval.1.approval.ssa.opt.ir b/examples/struct_in_box/out/ExampleContract.ir/ExampleContract.approval.1.ssa.opt.ir
similarity index 100%
rename from examples/struct_in_box/out/ExampleContract.ir/ExampleContract.approval.1.approval.ssa.opt.ir
rename to examples/struct_in_box/out/ExampleContract.ir/ExampleContract.approval.1.ssa.opt.ir
diff --git a/examples/struct_in_box/out/ExampleContract.ir/ExampleContract.approval.2.approval.ssa.opt.ir b/examples/struct_in_box/out/ExampleContract.ir/ExampleContract.approval.2.ssa.opt.ir
similarity index 100%
rename from examples/struct_in_box/out/ExampleContract.ir/ExampleContract.approval.2.approval.ssa.opt.ir
rename to examples/struct_in_box/out/ExampleContract.ir/ExampleContract.approval.2.ssa.opt.ir
diff --git a/examples/struct_in_box/out/ExampleContract.ir/ExampleContract.approval.3.approval.ssa.opt.ir b/examples/struct_in_box/out/ExampleContract.ir/ExampleContract.approval.3.ssa.opt.ir
similarity index 100%
rename from examples/struct_in_box/out/ExampleContract.ir/ExampleContract.approval.3.approval.ssa.opt.ir
rename to examples/struct_in_box/out/ExampleContract.ir/ExampleContract.approval.3.ssa.opt.ir
diff --git a/examples/struct_in_box/out/ExampleContract.ir/ExampleContract.approval.4.approval.destructured.ir b/examples/struct_in_box/out/ExampleContract.ir/ExampleContract.approval.4.destructured.ir
similarity index 100%
rename from examples/struct_in_box/out/ExampleContract.ir/ExampleContract.approval.4.approval.destructured.ir
rename to examples/struct_in_box/out/ExampleContract.ir/ExampleContract.approval.4.destructured.ir
diff --git a/examples/struct_in_box/out/ExampleContract.ir/ExampleContract.clear.0.clear.ssa.ir b/examples/struct_in_box/out/ExampleContract.ir/ExampleContract.clear.0.ssa.ir
similarity index 100%
rename from examples/struct_in_box/out/ExampleContract.ir/ExampleContract.clear.0.clear.ssa.ir
rename to examples/struct_in_box/out/ExampleContract.ir/ExampleContract.clear.0.ssa.ir
diff --git a/examples/struct_in_box/out/ExampleContract.ir/ExampleContract.clear.1.clear.destructured.ir b/examples/struct_in_box/out/ExampleContract.ir/ExampleContract.clear.1.destructured.ir
similarity index 100%
rename from examples/struct_in_box/out/ExampleContract.ir/ExampleContract.clear.1.clear.destructured.ir
rename to examples/struct_in_box/out/ExampleContract.ir/ExampleContract.clear.1.destructured.ir
diff --git a/examples/struct_in_box/out_O2/ExampleContract.ir/ExampleContract.approval.0.approval.destructured.ir b/examples/struct_in_box/out_O2/ExampleContract.ir/ExampleContract.approval.0.destructured.ir
similarity index 100%
rename from examples/struct_in_box/out_O2/ExampleContract.ir/ExampleContract.approval.0.approval.destructured.ir
rename to examples/struct_in_box/out_O2/ExampleContract.ir/ExampleContract.approval.0.destructured.ir
diff --git a/examples/struct_in_box/out_O2/ExampleContract.ir/ExampleContract.clear.0.clear.destructured.ir b/examples/struct_in_box/out_O2/ExampleContract.ir/ExampleContract.clear.0.destructured.ir
similarity index 100%
rename from examples/struct_in_box/out_O2/ExampleContract.ir/ExampleContract.clear.0.clear.destructured.ir
rename to examples/struct_in_box/out_O2/ExampleContract.ir/ExampleContract.clear.0.destructured.ir
diff --git a/examples/struct_in_box/out_unoptimized/ExampleContract.ir/ExampleContract.approval.0.approval.destructured.ir b/examples/struct_in_box/out_unoptimized/ExampleContract.ir/ExampleContract.approval.0.destructured.ir
similarity index 100%
rename from examples/struct_in_box/out_unoptimized/ExampleContract.ir/ExampleContract.approval.0.approval.destructured.ir
rename to examples/struct_in_box/out_unoptimized/ExampleContract.ir/ExampleContract.approval.0.destructured.ir
diff --git a/examples/struct_in_box/out_unoptimized/ExampleContract.ir/ExampleContract.clear.0.clear.destructured.ir b/examples/struct_in_box/out_unoptimized/ExampleContract.ir/ExampleContract.clear.0.destructured.ir
similarity index 100%
rename from examples/struct_in_box/out_unoptimized/ExampleContract.ir/ExampleContract.clear.0.clear.destructured.ir
rename to examples/struct_in_box/out_unoptimized/ExampleContract.ir/ExampleContract.clear.0.destructured.ir
diff --git a/examples/struct_in_box/puya.log b/examples/struct_in_box/puya.log
index c0554eb028..a175b076e1 100644
--- a/examples/struct_in_box/puya.log
+++ b/examples/struct_in_box/puya.log
@@ -445,7 +445,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to struct_in_box/out/ExampleContract.ir/ExampleContract.approval.0.approval.ssa.ir
+debug: Output IR to struct_in_box/out/ExampleContract.ir/ExampleContract.approval.0.ssa.ir
 info: optimizing approval program of examples.struct_in_box.contract.ExampleContract at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function examples.struct_in_box.contract.ExampleContract.box_exists for inlining
@@ -657,7 +657,7 @@ debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine examples.struct_in_box.contract.ExampleContract.__puya_arc4_router__
 debug: removing unused subroutine examples.struct_in_box.contract.ExampleContract.box_exists
-debug: Output IR to struct_in_box/out/ExampleContract.ir/ExampleContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to struct_in_box/out/ExampleContract.ir/ExampleContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -772,7 +772,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine examples.struct_in_box.contract.ExampleContract.__algopy_default_create
-debug: Output IR to struct_in_box/out/ExampleContract.ir/ExampleContract.approval.2.approval.ssa.opt.ir
+debug: Output IR to struct_in_box/out/ExampleContract.ir/ExampleContract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: marking simple function examples.struct_in_box.contract.ExampleContract.write_to_box for inlining (complexity=3 <= threshold=3)
 debug: marking simple function examples.struct_in_box.contract.ExampleContract.read_from_box for inlining (complexity=2 <= threshold=3)
@@ -897,7 +897,7 @@ debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine examples.struct_in_box.contract.ExampleContract.write_to_box
 debug: removing unused subroutine examples.struct_in_box.contract.ExampleContract.read_from_box
-debug: Output IR to struct_in_box/out/ExampleContract.ir/ExampleContract.approval.3.approval.ssa.opt.ir
+debug: Output IR to struct_in_box/out/ExampleContract.ir/ExampleContract.approval.3.ssa.opt.ir
 debug: Begin optimization pass 4/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -990,8 +990,8 @@ debug: Coalescing local variables in examples.struct_in_box.contract.ExampleCont
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in examples.struct_in_box.contract.ExampleContract.get_user
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to struct_in_box/out/ExampleContract.ir/ExampleContract.approval.4.approval.destructured.ir
-debug: Output IR to struct_in_box/out/ExampleContract.ir/ExampleContract.clear.0.clear.ssa.ir
+debug: Output IR to struct_in_box/out/ExampleContract.ir/ExampleContract.approval.4.destructured.ir
+debug: Output IR to struct_in_box/out/ExampleContract.ir/ExampleContract.clear.0.ssa.ir
 info: optimizing clear program of examples.struct_in_box.contract.ExampleContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -1017,7 +1017,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to struct_in_box/out/ExampleContract.ir/ExampleContract.clear.1.clear.destructured.ir
+debug: Output IR to struct_in_box/out/ExampleContract.ir/ExampleContract.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/examples/struct_in_box/puya_O2.log b/examples/struct_in_box/puya_O2.log
index 516ffd267b..64e538e89c 100644
--- a/examples/struct_in_box/puya_O2.log
+++ b/examples/struct_in_box/puya_O2.log
@@ -937,7 +937,7 @@ debug: Coalescing box_data#0 with [box_data#1]
 debug: Coalescing resulted in 29 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to struct_in_box/out_O2/ExampleContract.ir/ExampleContract.approval.0.approval.destructured.ir
+debug: Output IR to struct_in_box/out_O2/ExampleContract.ir/ExampleContract.approval.0.destructured.ir
 info: optimizing clear program of examples.struct_in_box.contract.ExampleContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -963,7 +963,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to struct_in_box/out_O2/ExampleContract.ir/ExampleContract.clear.0.clear.destructured.ir
+debug: Output IR to struct_in_box/out_O2/ExampleContract.ir/ExampleContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/examples/struct_in_box/puya_unoptimized.log b/examples/struct_in_box/puya_unoptimized.log
index 1f397d9c1e..f870719f12 100644
--- a/examples/struct_in_box/puya_unoptimized.log
+++ b/examples/struct_in_box/puya_unoptimized.log
@@ -682,7 +682,7 @@ debug: Coalescing local variables in examples.struct_in_box.contract.ExampleCont
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in examples.struct_in_box.contract.ExampleContract.get_user
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to struct_in_box/out_unoptimized/ExampleContract.ir/ExampleContract.approval.0.approval.destructured.ir
+debug: Output IR to struct_in_box/out_unoptimized/ExampleContract.ir/ExampleContract.approval.0.destructured.ir
 info: optimizing clear program of examples.struct_in_box.contract.ExampleContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -700,7 +700,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to struct_in_box/out_unoptimized/ExampleContract.ir/ExampleContract.clear.0.clear.destructured.ir
+debug: Output IR to struct_in_box/out_unoptimized/ExampleContract.ir/ExampleContract.clear.0.destructured.ir
 debug: Inserted main_block@1.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main_block@1.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_block@1.ops[6]: 'l-store-copy tmp%1#0 0'
diff --git a/examples/tictactoe/out/TicTacToeContract.ir/TicTacToeContract.approval.0.approval.ssa.ir b/examples/tictactoe/out/TicTacToeContract.ir/TicTacToeContract.approval.0.ssa.ir
similarity index 100%
rename from examples/tictactoe/out/TicTacToeContract.ir/TicTacToeContract.approval.0.approval.ssa.ir
rename to examples/tictactoe/out/TicTacToeContract.ir/TicTacToeContract.approval.0.ssa.ir
diff --git a/examples/tictactoe/out/TicTacToeContract.ir/TicTacToeContract.approval.1.approval.ssa.opt.ir b/examples/tictactoe/out/TicTacToeContract.ir/TicTacToeContract.approval.1.ssa.opt.ir
similarity index 100%
rename from examples/tictactoe/out/TicTacToeContract.ir/TicTacToeContract.approval.1.approval.ssa.opt.ir
rename to examples/tictactoe/out/TicTacToeContract.ir/TicTacToeContract.approval.1.ssa.opt.ir
diff --git a/examples/tictactoe/out/TicTacToeContract.ir/TicTacToeContract.approval.2.approval.ssa.opt.ir b/examples/tictactoe/out/TicTacToeContract.ir/TicTacToeContract.approval.2.ssa.opt.ir
similarity index 100%
rename from examples/tictactoe/out/TicTacToeContract.ir/TicTacToeContract.approval.2.approval.ssa.opt.ir
rename to examples/tictactoe/out/TicTacToeContract.ir/TicTacToeContract.approval.2.ssa.opt.ir
diff --git a/examples/tictactoe/out/TicTacToeContract.ir/TicTacToeContract.approval.3.approval.destructured.ir b/examples/tictactoe/out/TicTacToeContract.ir/TicTacToeContract.approval.3.destructured.ir
similarity index 100%
rename from examples/tictactoe/out/TicTacToeContract.ir/TicTacToeContract.approval.3.approval.destructured.ir
rename to examples/tictactoe/out/TicTacToeContract.ir/TicTacToeContract.approval.3.destructured.ir
diff --git a/examples/tictactoe/out/TicTacToeContract.ir/TicTacToeContract.clear.0.clear.ssa.ir b/examples/tictactoe/out/TicTacToeContract.ir/TicTacToeContract.clear.0.ssa.ir
similarity index 100%
rename from examples/tictactoe/out/TicTacToeContract.ir/TicTacToeContract.clear.0.clear.ssa.ir
rename to examples/tictactoe/out/TicTacToeContract.ir/TicTacToeContract.clear.0.ssa.ir
diff --git a/examples/tictactoe/out/TicTacToeContract.ir/TicTacToeContract.clear.1.clear.destructured.ir b/examples/tictactoe/out/TicTacToeContract.ir/TicTacToeContract.clear.1.destructured.ir
similarity index 100%
rename from examples/tictactoe/out/TicTacToeContract.ir/TicTacToeContract.clear.1.clear.destructured.ir
rename to examples/tictactoe/out/TicTacToeContract.ir/TicTacToeContract.clear.1.destructured.ir
diff --git a/examples/tictactoe/out_O2/TicTacToeContract.ir/TicTacToeContract.approval.0.approval.destructured.ir b/examples/tictactoe/out_O2/TicTacToeContract.ir/TicTacToeContract.approval.0.destructured.ir
similarity index 100%
rename from examples/tictactoe/out_O2/TicTacToeContract.ir/TicTacToeContract.approval.0.approval.destructured.ir
rename to examples/tictactoe/out_O2/TicTacToeContract.ir/TicTacToeContract.approval.0.destructured.ir
diff --git a/examples/tictactoe/out_O2/TicTacToeContract.ir/TicTacToeContract.clear.0.clear.destructured.ir b/examples/tictactoe/out_O2/TicTacToeContract.ir/TicTacToeContract.clear.0.destructured.ir
similarity index 100%
rename from examples/tictactoe/out_O2/TicTacToeContract.ir/TicTacToeContract.clear.0.clear.destructured.ir
rename to examples/tictactoe/out_O2/TicTacToeContract.ir/TicTacToeContract.clear.0.destructured.ir
diff --git a/examples/tictactoe/out_unoptimized/TicTacToeContract.ir/TicTacToeContract.approval.0.approval.destructured.ir b/examples/tictactoe/out_unoptimized/TicTacToeContract.ir/TicTacToeContract.approval.0.destructured.ir
similarity index 100%
rename from examples/tictactoe/out_unoptimized/TicTacToeContract.ir/TicTacToeContract.approval.0.approval.destructured.ir
rename to examples/tictactoe/out_unoptimized/TicTacToeContract.ir/TicTacToeContract.approval.0.destructured.ir
diff --git a/examples/tictactoe/out_unoptimized/TicTacToeContract.ir/TicTacToeContract.clear.0.clear.destructured.ir b/examples/tictactoe/out_unoptimized/TicTacToeContract.ir/TicTacToeContract.clear.0.destructured.ir
similarity index 100%
rename from examples/tictactoe/out_unoptimized/TicTacToeContract.ir/TicTacToeContract.clear.0.clear.destructured.ir
rename to examples/tictactoe/out_unoptimized/TicTacToeContract.ir/TicTacToeContract.clear.0.destructured.ir
diff --git a/examples/tictactoe/puya.log b/examples/tictactoe/puya.log
index 5a4f893337..6ddb3c97d4 100644
--- a/examples/tictactoe/puya.log
+++ b/examples/tictactoe/puya.log
@@ -671,7 +671,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to tictactoe/out/TicTacToeContract.ir/TicTacToeContract.approval.0.approval.ssa.ir
+debug: Output IR to tictactoe/out/TicTacToeContract.ir/TicTacToeContract.approval.0.ssa.ir
 info: optimizing approval program of examples.tictactoe.tictactoe.TicTacToeContract at level 1
 debug: Begin optimization pass 1/100
 debug: marking trivial method examples.tictactoe.tictactoe.TicTacToeContract.__init__ as inlineable
@@ -1092,7 +1092,7 @@ debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine examples.tictactoe.tictactoe.TicTacToeContract.__init__
 debug: removing unused subroutine algopy.arc4.ARC4Contract.approval_program
 debug: removing unused subroutine examples.tictactoe.tictactoe.TicTacToeContract.did_win
-debug: Output IR to tictactoe/out/TicTacToeContract.ir/TicTacToeContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to tictactoe/out/TicTacToeContract.ir/TicTacToeContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine examples.tictactoe.tictactoe.TicTacToeContract.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -1207,7 +1207,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine examples.tictactoe.tictactoe.TicTacToeContract.__puya_arc4_router__
-debug: Output IR to tictactoe/out/TicTacToeContract.ir/TicTacToeContract.approval.2.approval.ssa.opt.ir
+debug: Output IR to tictactoe/out/TicTacToeContract.ir/TicTacToeContract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine examples.tictactoe.tictactoe.TicTacToeContract.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -1351,8 +1351,8 @@ debug: Coalescing player#0 with [player#5, player#1, player#2]
 debug: Coalescing resulted in 7 replacement/s
 debug: Sequentializing parallel copies in examples.tictactoe.tictactoe.TicTacToeContract.play
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to tictactoe/out/TicTacToeContract.ir/TicTacToeContract.approval.3.approval.destructured.ir
-debug: Output IR to tictactoe/out/TicTacToeContract.ir/TicTacToeContract.clear.0.clear.ssa.ir
+debug: Output IR to tictactoe/out/TicTacToeContract.ir/TicTacToeContract.approval.3.destructured.ir
+debug: Output IR to tictactoe/out/TicTacToeContract.ir/TicTacToeContract.clear.0.ssa.ir
 info: optimizing clear program of examples.tictactoe.tictactoe.TicTacToeContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -1378,7 +1378,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to tictactoe/out/TicTacToeContract.ir/TicTacToeContract.clear.1.clear.destructured.ir
+debug: Output IR to tictactoe/out/TicTacToeContract.ir/TicTacToeContract.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#2 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#2' with 'l-load tmp%0#2'
 debug: Inserted main_abi_routing@4.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/examples/tictactoe/puya_O2.log b/examples/tictactoe/puya_O2.log
index 75234bec75..a4a68d3360 100644
--- a/examples/tictactoe/puya_O2.log
+++ b/examples/tictactoe/puya_O2.log
@@ -1266,7 +1266,7 @@ debug: Removing duplicated block block@19 and updating references to block@12
 debug: Replaced predecessor block@19 with block@12 in block@25
 debug: Removing duplicated block block@22 and updating references to block@12
 debug: Replaced predecessor block@22 with block@12 in block@25
-debug: Output IR to tictactoe/out_O2/TicTacToeContract.ir/TicTacToeContract.approval.0.approval.destructured.ir
+debug: Output IR to tictactoe/out_O2/TicTacToeContract.ir/TicTacToeContract.approval.0.destructured.ir
 info: optimizing clear program of examples.tictactoe.tictactoe.TicTacToeContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -1292,7 +1292,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to tictactoe/out_O2/TicTacToeContract.ir/TicTacToeContract.clear.0.clear.destructured.ir
+debug: Output IR to tictactoe/out_O2/TicTacToeContract.ir/TicTacToeContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#2 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#2' with 'l-load tmp%0#2'
 debug: Inserted main_abi_routing@4.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/examples/tictactoe/puya_unoptimized.log b/examples/tictactoe/puya_unoptimized.log
index e1ce53af94..5b7f70ba30 100644
--- a/examples/tictactoe/puya_unoptimized.log
+++ b/examples/tictactoe/puya_unoptimized.log
@@ -883,7 +883,7 @@ debug: Coalescing player#0 with [player#5, player#1, player#2]
 debug: Coalescing resulted in 7 replacement/s
 debug: Sequentializing parallel copies in examples.tictactoe.tictactoe.TicTacToeContract.play
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to tictactoe/out_unoptimized/TicTacToeContract.ir/TicTacToeContract.approval.0.approval.destructured.ir
+debug: Output IR to tictactoe/out_unoptimized/TicTacToeContract.ir/TicTacToeContract.approval.0.destructured.ir
 info: optimizing clear program of examples.tictactoe.tictactoe.TicTacToeContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -901,7 +901,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to tictactoe/out_unoptimized/TicTacToeContract.ir/TicTacToeContract.clear.0.clear.destructured.ir
+debug: Output IR to tictactoe/out_unoptimized/TicTacToeContract.ir/TicTacToeContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%1#0 0'
diff --git a/examples/voting/out/VotingRoundApp.ir/VotingRoundApp.approval.0.approval.ssa.ir b/examples/voting/out/VotingRoundApp.ir/VotingRoundApp.approval.0.ssa.ir
similarity index 100%
rename from examples/voting/out/VotingRoundApp.ir/VotingRoundApp.approval.0.approval.ssa.ir
rename to examples/voting/out/VotingRoundApp.ir/VotingRoundApp.approval.0.ssa.ir
diff --git a/examples/voting/out/VotingRoundApp.ir/VotingRoundApp.approval.1.approval.ssa.opt.ir b/examples/voting/out/VotingRoundApp.ir/VotingRoundApp.approval.1.ssa.opt.ir
similarity index 100%
rename from examples/voting/out/VotingRoundApp.ir/VotingRoundApp.approval.1.approval.ssa.opt.ir
rename to examples/voting/out/VotingRoundApp.ir/VotingRoundApp.approval.1.ssa.opt.ir
diff --git a/examples/voting/out/VotingRoundApp.ir/VotingRoundApp.approval.2.approval.ssa.opt.ir b/examples/voting/out/VotingRoundApp.ir/VotingRoundApp.approval.2.ssa.opt.ir
similarity index 100%
rename from examples/voting/out/VotingRoundApp.ir/VotingRoundApp.approval.2.approval.ssa.opt.ir
rename to examples/voting/out/VotingRoundApp.ir/VotingRoundApp.approval.2.ssa.opt.ir
diff --git a/examples/voting/out/VotingRoundApp.ir/VotingRoundApp.approval.3.approval.ssa.opt.ir b/examples/voting/out/VotingRoundApp.ir/VotingRoundApp.approval.3.ssa.opt.ir
similarity index 100%
rename from examples/voting/out/VotingRoundApp.ir/VotingRoundApp.approval.3.approval.ssa.opt.ir
rename to examples/voting/out/VotingRoundApp.ir/VotingRoundApp.approval.3.ssa.opt.ir
diff --git a/examples/voting/out/VotingRoundApp.ir/VotingRoundApp.approval.4.approval.destructured.ir b/examples/voting/out/VotingRoundApp.ir/VotingRoundApp.approval.4.destructured.ir
similarity index 100%
rename from examples/voting/out/VotingRoundApp.ir/VotingRoundApp.approval.4.approval.destructured.ir
rename to examples/voting/out/VotingRoundApp.ir/VotingRoundApp.approval.4.destructured.ir
diff --git a/examples/voting/out/VotingRoundApp.ir/VotingRoundApp.clear.0.clear.ssa.ir b/examples/voting/out/VotingRoundApp.ir/VotingRoundApp.clear.0.ssa.ir
similarity index 100%
rename from examples/voting/out/VotingRoundApp.ir/VotingRoundApp.clear.0.clear.ssa.ir
rename to examples/voting/out/VotingRoundApp.ir/VotingRoundApp.clear.0.ssa.ir
diff --git a/examples/voting/out/VotingRoundApp.ir/VotingRoundApp.clear.1.clear.destructured.ir b/examples/voting/out/VotingRoundApp.ir/VotingRoundApp.clear.1.destructured.ir
similarity index 100%
rename from examples/voting/out/VotingRoundApp.ir/VotingRoundApp.clear.1.clear.destructured.ir
rename to examples/voting/out/VotingRoundApp.ir/VotingRoundApp.clear.1.destructured.ir
diff --git a/examples/voting/out_O2/VotingRoundApp.ir/VotingRoundApp.approval.0.approval.destructured.ir b/examples/voting/out_O2/VotingRoundApp.ir/VotingRoundApp.approval.0.destructured.ir
similarity index 100%
rename from examples/voting/out_O2/VotingRoundApp.ir/VotingRoundApp.approval.0.approval.destructured.ir
rename to examples/voting/out_O2/VotingRoundApp.ir/VotingRoundApp.approval.0.destructured.ir
diff --git a/examples/voting/out_O2/VotingRoundApp.ir/VotingRoundApp.clear.0.clear.destructured.ir b/examples/voting/out_O2/VotingRoundApp.ir/VotingRoundApp.clear.0.destructured.ir
similarity index 100%
rename from examples/voting/out_O2/VotingRoundApp.ir/VotingRoundApp.clear.0.clear.destructured.ir
rename to examples/voting/out_O2/VotingRoundApp.ir/VotingRoundApp.clear.0.destructured.ir
diff --git a/examples/voting/out_unoptimized/VotingRoundApp.ir/VotingRoundApp.approval.0.approval.destructured.ir b/examples/voting/out_unoptimized/VotingRoundApp.ir/VotingRoundApp.approval.0.destructured.ir
similarity index 100%
rename from examples/voting/out_unoptimized/VotingRoundApp.ir/VotingRoundApp.approval.0.approval.destructured.ir
rename to examples/voting/out_unoptimized/VotingRoundApp.ir/VotingRoundApp.approval.0.destructured.ir
diff --git a/examples/voting/out_unoptimized/VotingRoundApp.ir/VotingRoundApp.clear.0.clear.destructured.ir b/examples/voting/out_unoptimized/VotingRoundApp.ir/VotingRoundApp.clear.0.destructured.ir
similarity index 100%
rename from examples/voting/out_unoptimized/VotingRoundApp.ir/VotingRoundApp.clear.0.clear.destructured.ir
rename to examples/voting/out_unoptimized/VotingRoundApp.ir/VotingRoundApp.clear.0.destructured.ir
diff --git a/examples/voting/puya.log b/examples/voting/puya.log
index 1d0599b2bf..7eb70d6e8c 100644
--- a/examples/voting/puya.log
+++ b/examples/voting/puya.log
@@ -621,7 +621,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to voting/out/VotingRoundApp.ir/VotingRoundApp.approval.0.approval.ssa.ir
+debug: Output IR to voting/out/VotingRoundApp.ir/VotingRoundApp.approval.0.ssa.ir
 info: optimizing approval program of examples.voting.voting.VotingRoundApp at level 1
 debug: Begin optimization pass 1/100
 voting/voting.py:249 debug: function is auto-recursive: examples.voting.voting.itoa
@@ -1069,7 +1069,7 @@ debug: removing unused subroutine examples.voting.voting.VotingRoundApp.__init__
 debug: removing unused subroutine algopy.arc4.ARC4Contract.approval_program
 debug: removing unused subroutine examples.voting.voting.VotingRoundApp.store_option_counts
 debug: removing unused subroutine examples.voting.voting.VotingRoundApp.increment_vote_in_box
-debug: Output IR to voting/out/VotingRoundApp.ir/VotingRoundApp.approval.1.approval.ssa.opt.ir
+debug: Output IR to voting/out/VotingRoundApp.ir/VotingRoundApp.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine examples.voting.voting.VotingRoundApp.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -1271,7 +1271,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine examples.voting.voting.VotingRoundApp.__puya_arc4_router__
-debug: Output IR to voting/out/VotingRoundApp.ir/VotingRoundApp.approval.2.approval.ssa.opt.ir
+debug: Output IR to voting/out/VotingRoundApp.ir/VotingRoundApp.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: marking simple function examples.voting.voting.VotingRoundApp.get_vote_from_box for inlining (complexity=2 <= threshold=3)
 debug: marking simple function examples.voting.voting.VotingRoundApp.already_voted for inlining (complexity=2 <= threshold=3)
@@ -1485,7 +1485,7 @@ debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine examples.voting.voting.VotingRoundApp.get_vote_from_box
 debug: removing unused subroutine examples.voting.voting.VotingRoundApp.already_voted
-debug: Output IR to voting/out/VotingRoundApp.ir/VotingRoundApp.approval.3.approval.ssa.opt.ir
+debug: Output IR to voting/out/VotingRoundApp.ir/VotingRoundApp.approval.3.ssa.opt.ir
 debug: Begin optimization pass 4/100
 debug: Optimizing subroutine examples.voting.voting.VotingRoundApp.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -1835,8 +1835,8 @@ debug: Coalescing local variables in _puya_lib.util.ensure_budget using strategy
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in _puya_lib.util.ensure_budget
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to voting/out/VotingRoundApp.ir/VotingRoundApp.approval.4.approval.destructured.ir
-debug: Output IR to voting/out/VotingRoundApp.ir/VotingRoundApp.clear.0.clear.ssa.ir
+debug: Output IR to voting/out/VotingRoundApp.ir/VotingRoundApp.approval.4.destructured.ir
+debug: Output IR to voting/out/VotingRoundApp.ir/VotingRoundApp.clear.0.ssa.ir
 info: optimizing clear program of examples.voting.voting.VotingRoundApp at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -1862,7 +1862,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to voting/out/VotingRoundApp.ir/VotingRoundApp.clear.1.clear.destructured.ir
+debug: Output IR to voting/out/VotingRoundApp.ir/VotingRoundApp.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%0#2 0'
diff --git a/examples/voting/puya_O2.log b/examples/voting/puya_O2.log
index 578e3d74b9..72ab78ff3d 100644
--- a/examples/voting/puya_O2.log
+++ b/examples/voting/puya_O2.log
@@ -1924,7 +1924,7 @@ debug: Coalescing local variables in _puya_lib.util.ensure_budget using strategy
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in _puya_lib.util.ensure_budget
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to voting/out_O2/VotingRoundApp.ir/VotingRoundApp.approval.0.approval.destructured.ir
+debug: Output IR to voting/out_O2/VotingRoundApp.ir/VotingRoundApp.approval.0.destructured.ir
 info: optimizing clear program of examples.voting.voting.VotingRoundApp at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -1950,7 +1950,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to voting/out_O2/VotingRoundApp.ir/VotingRoundApp.clear.0.clear.destructured.ir
+debug: Output IR to voting/out_O2/VotingRoundApp.ir/VotingRoundApp.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%0#2 0'
diff --git a/examples/voting/puya_unoptimized.log b/examples/voting/puya_unoptimized.log
index d62000b6b4..cc3059ff89 100644
--- a/examples/voting/puya_unoptimized.log
+++ b/examples/voting/puya_unoptimized.log
@@ -1156,7 +1156,7 @@ debug: Coalescing local variables in _puya_lib.util.ensure_budget using strategy
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in _puya_lib.util.ensure_budget
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to voting/out_unoptimized/VotingRoundApp.ir/VotingRoundApp.approval.0.approval.destructured.ir
+debug: Output IR to voting/out_unoptimized/VotingRoundApp.ir/VotingRoundApp.approval.0.destructured.ir
 info: optimizing clear program of examples.voting.voting.VotingRoundApp at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -1174,7 +1174,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to voting/out_unoptimized/VotingRoundApp.ir/VotingRoundApp.clear.0.clear.destructured.ir
+debug: Output IR to voting/out_unoptimized/VotingRoundApp.ir/VotingRoundApp.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%1#0 0'
diff --git a/src/puya/ir/to_text_visitor.py b/src/puya/ir/to_text_visitor.py
index c4eadb4b63..3136ef874e 100644
--- a/src/puya/ir/to_text_visitor.py
+++ b/src/puya/ir/to_text_visitor.py
@@ -8,7 +8,6 @@
 from puya.ir.types_ import IRType
 from puya.ir.utils import format_bytes, format_error_comment
 from puya.ir.visitor import IRVisitor
-from puya.models import ProgramKind
 from puya.utils import make_path_relative_to_cwd
 
 logger = log.get_logger(__name__)
@@ -229,8 +228,6 @@ def render_program(
         emitter.append(f"subroutine {sub.id}({args}) -> {returns}:")
         with emitter.indent():
             _render_body(emitter, sub.body)
-    if program.kind is not ProgramKind.logic_signature:
-        qualifier = f"{program.kind}.{qualifier}"
     path = context.sequential_path(program.kind, qualifier, "ir")
     path.write_text("\n".join(emitter.lines), encoding="utf-8")
     logger.debug(f"Output IR to {make_path_relative_to_cwd(path)}")
diff --git a/test_cases/abi_routing/out/CustomApproval.ir/CustomApproval.approval.0.approval.ssa.ir b/test_cases/abi_routing/out/CustomApproval.ir/CustomApproval.approval.0.ssa.ir
similarity index 100%
rename from test_cases/abi_routing/out/CustomApproval.ir/CustomApproval.approval.0.approval.ssa.ir
rename to test_cases/abi_routing/out/CustomApproval.ir/CustomApproval.approval.0.ssa.ir
diff --git a/test_cases/abi_routing/out/CustomApproval.ir/CustomApproval.approval.1.approval.ssa.opt.ir b/test_cases/abi_routing/out/CustomApproval.ir/CustomApproval.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/abi_routing/out/CustomApproval.ir/CustomApproval.approval.1.approval.ssa.opt.ir
rename to test_cases/abi_routing/out/CustomApproval.ir/CustomApproval.approval.1.ssa.opt.ir
diff --git a/test_cases/abi_routing/out/CustomApproval.ir/CustomApproval.approval.2.approval.ssa.opt.ir b/test_cases/abi_routing/out/CustomApproval.ir/CustomApproval.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/abi_routing/out/CustomApproval.ir/CustomApproval.approval.2.approval.ssa.opt.ir
rename to test_cases/abi_routing/out/CustomApproval.ir/CustomApproval.approval.2.ssa.opt.ir
diff --git a/test_cases/abi_routing/out/CustomApproval.ir/CustomApproval.approval.3.approval.ssa.opt.ir b/test_cases/abi_routing/out/CustomApproval.ir/CustomApproval.approval.3.ssa.opt.ir
similarity index 100%
rename from test_cases/abi_routing/out/CustomApproval.ir/CustomApproval.approval.3.approval.ssa.opt.ir
rename to test_cases/abi_routing/out/CustomApproval.ir/CustomApproval.approval.3.ssa.opt.ir
diff --git a/test_cases/abi_routing/out/CustomApproval.ir/CustomApproval.approval.4.approval.destructured.ir b/test_cases/abi_routing/out/CustomApproval.ir/CustomApproval.approval.4.destructured.ir
similarity index 100%
rename from test_cases/abi_routing/out/CustomApproval.ir/CustomApproval.approval.4.approval.destructured.ir
rename to test_cases/abi_routing/out/CustomApproval.ir/CustomApproval.approval.4.destructured.ir
diff --git a/test_cases/abi_routing/out/CustomApproval.ir/CustomApproval.clear.0.clear.ssa.ir b/test_cases/abi_routing/out/CustomApproval.ir/CustomApproval.clear.0.ssa.ir
similarity index 100%
rename from test_cases/abi_routing/out/CustomApproval.ir/CustomApproval.clear.0.clear.ssa.ir
rename to test_cases/abi_routing/out/CustomApproval.ir/CustomApproval.clear.0.ssa.ir
diff --git a/test_cases/abi_routing/out/CustomApproval.ir/CustomApproval.clear.1.clear.destructured.ir b/test_cases/abi_routing/out/CustomApproval.ir/CustomApproval.clear.1.destructured.ir
similarity index 100%
rename from test_cases/abi_routing/out/CustomApproval.ir/CustomApproval.clear.1.clear.destructured.ir
rename to test_cases/abi_routing/out/CustomApproval.ir/CustomApproval.clear.1.destructured.ir
diff --git a/test_cases/abi_routing/out/MinimumARC4.ir/MinimumARC4.approval.0.approval.ssa.ir b/test_cases/abi_routing/out/MinimumARC4.ir/MinimumARC4.approval.0.ssa.ir
similarity index 100%
rename from test_cases/abi_routing/out/MinimumARC4.ir/MinimumARC4.approval.0.approval.ssa.ir
rename to test_cases/abi_routing/out/MinimumARC4.ir/MinimumARC4.approval.0.ssa.ir
diff --git a/test_cases/abi_routing/out/MinimumARC4.ir/MinimumARC4.approval.1.approval.ssa.opt.ir b/test_cases/abi_routing/out/MinimumARC4.ir/MinimumARC4.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/abi_routing/out/MinimumARC4.ir/MinimumARC4.approval.1.approval.ssa.opt.ir
rename to test_cases/abi_routing/out/MinimumARC4.ir/MinimumARC4.approval.1.ssa.opt.ir
diff --git a/test_cases/abi_routing/out/MinimumARC4.ir/MinimumARC4.approval.2.approval.ssa.opt.ir b/test_cases/abi_routing/out/MinimumARC4.ir/MinimumARC4.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/abi_routing/out/MinimumARC4.ir/MinimumARC4.approval.2.approval.ssa.opt.ir
rename to test_cases/abi_routing/out/MinimumARC4.ir/MinimumARC4.approval.2.ssa.opt.ir
diff --git a/test_cases/abi_routing/out/MinimumARC4.ir/MinimumARC4.approval.3.approval.destructured.ir b/test_cases/abi_routing/out/MinimumARC4.ir/MinimumARC4.approval.3.destructured.ir
similarity index 100%
rename from test_cases/abi_routing/out/MinimumARC4.ir/MinimumARC4.approval.3.approval.destructured.ir
rename to test_cases/abi_routing/out/MinimumARC4.ir/MinimumARC4.approval.3.destructured.ir
diff --git a/test_cases/abi_routing/out/MinimumARC4.ir/MinimumARC4.clear.0.clear.ssa.ir b/test_cases/abi_routing/out/MinimumARC4.ir/MinimumARC4.clear.0.ssa.ir
similarity index 100%
rename from test_cases/abi_routing/out/MinimumARC4.ir/MinimumARC4.clear.0.clear.ssa.ir
rename to test_cases/abi_routing/out/MinimumARC4.ir/MinimumARC4.clear.0.ssa.ir
diff --git a/test_cases/abi_routing/out/MinimumARC4.ir/MinimumARC4.clear.1.clear.destructured.ir b/test_cases/abi_routing/out/MinimumARC4.ir/MinimumARC4.clear.1.destructured.ir
similarity index 100%
rename from test_cases/abi_routing/out/MinimumARC4.ir/MinimumARC4.clear.1.clear.destructured.ir
rename to test_cases/abi_routing/out/MinimumARC4.ir/MinimumARC4.clear.1.destructured.ir
diff --git a/test_cases/abi_routing/out/Reference.ir/Reference.approval.0.approval.ssa.ir b/test_cases/abi_routing/out/Reference.ir/Reference.approval.0.ssa.ir
similarity index 100%
rename from test_cases/abi_routing/out/Reference.ir/Reference.approval.0.approval.ssa.ir
rename to test_cases/abi_routing/out/Reference.ir/Reference.approval.0.ssa.ir
diff --git a/test_cases/abi_routing/out/Reference.ir/Reference.approval.1.approval.ssa.opt.ir b/test_cases/abi_routing/out/Reference.ir/Reference.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/abi_routing/out/Reference.ir/Reference.approval.1.approval.ssa.opt.ir
rename to test_cases/abi_routing/out/Reference.ir/Reference.approval.1.ssa.opt.ir
diff --git a/test_cases/abi_routing/out/Reference.ir/Reference.approval.2.approval.ssa.opt.ir b/test_cases/abi_routing/out/Reference.ir/Reference.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/abi_routing/out/Reference.ir/Reference.approval.2.approval.ssa.opt.ir
rename to test_cases/abi_routing/out/Reference.ir/Reference.approval.2.ssa.opt.ir
diff --git a/test_cases/abi_routing/out/Reference.ir/Reference.approval.3.approval.destructured.ir b/test_cases/abi_routing/out/Reference.ir/Reference.approval.3.destructured.ir
similarity index 100%
rename from test_cases/abi_routing/out/Reference.ir/Reference.approval.3.approval.destructured.ir
rename to test_cases/abi_routing/out/Reference.ir/Reference.approval.3.destructured.ir
diff --git a/test_cases/abi_routing/out/Reference.ir/Reference.clear.0.clear.ssa.ir b/test_cases/abi_routing/out/Reference.ir/Reference.clear.0.ssa.ir
similarity index 100%
rename from test_cases/abi_routing/out/Reference.ir/Reference.clear.0.clear.ssa.ir
rename to test_cases/abi_routing/out/Reference.ir/Reference.clear.0.ssa.ir
diff --git a/test_cases/abi_routing/out/Reference.ir/Reference.clear.1.clear.destructured.ir b/test_cases/abi_routing/out/Reference.ir/Reference.clear.1.destructured.ir
similarity index 100%
rename from test_cases/abi_routing/out/Reference.ir/Reference.clear.1.clear.destructured.ir
rename to test_cases/abi_routing/out/Reference.ir/Reference.clear.1.destructured.ir
diff --git a/test_cases/abi_routing/out_O2/CustomApproval.ir/CustomApproval.approval.0.approval.destructured.ir b/test_cases/abi_routing/out_O2/CustomApproval.ir/CustomApproval.approval.0.destructured.ir
similarity index 100%
rename from test_cases/abi_routing/out_O2/CustomApproval.ir/CustomApproval.approval.0.approval.destructured.ir
rename to test_cases/abi_routing/out_O2/CustomApproval.ir/CustomApproval.approval.0.destructured.ir
diff --git a/test_cases/abi_routing/out_O2/CustomApproval.ir/CustomApproval.clear.0.clear.destructured.ir b/test_cases/abi_routing/out_O2/CustomApproval.ir/CustomApproval.clear.0.destructured.ir
similarity index 100%
rename from test_cases/abi_routing/out_O2/CustomApproval.ir/CustomApproval.clear.0.clear.destructured.ir
rename to test_cases/abi_routing/out_O2/CustomApproval.ir/CustomApproval.clear.0.destructured.ir
diff --git a/test_cases/abi_routing/out_O2/MinimumARC4.ir/MinimumARC4.approval.0.approval.destructured.ir b/test_cases/abi_routing/out_O2/MinimumARC4.ir/MinimumARC4.approval.0.destructured.ir
similarity index 100%
rename from test_cases/abi_routing/out_O2/MinimumARC4.ir/MinimumARC4.approval.0.approval.destructured.ir
rename to test_cases/abi_routing/out_O2/MinimumARC4.ir/MinimumARC4.approval.0.destructured.ir
diff --git a/test_cases/abi_routing/out_O2/MinimumARC4.ir/MinimumARC4.clear.0.clear.destructured.ir b/test_cases/abi_routing/out_O2/MinimumARC4.ir/MinimumARC4.clear.0.destructured.ir
similarity index 100%
rename from test_cases/abi_routing/out_O2/MinimumARC4.ir/MinimumARC4.clear.0.clear.destructured.ir
rename to test_cases/abi_routing/out_O2/MinimumARC4.ir/MinimumARC4.clear.0.destructured.ir
diff --git a/test_cases/abi_routing/out_O2/Reference.ir/Reference.approval.0.approval.destructured.ir b/test_cases/abi_routing/out_O2/Reference.ir/Reference.approval.0.destructured.ir
similarity index 100%
rename from test_cases/abi_routing/out_O2/Reference.ir/Reference.approval.0.approval.destructured.ir
rename to test_cases/abi_routing/out_O2/Reference.ir/Reference.approval.0.destructured.ir
diff --git a/test_cases/abi_routing/out_O2/Reference.ir/Reference.clear.0.clear.destructured.ir b/test_cases/abi_routing/out_O2/Reference.ir/Reference.clear.0.destructured.ir
similarity index 100%
rename from test_cases/abi_routing/out_O2/Reference.ir/Reference.clear.0.clear.destructured.ir
rename to test_cases/abi_routing/out_O2/Reference.ir/Reference.clear.0.destructured.ir
diff --git a/test_cases/abi_routing/out_unoptimized/CustomApproval.ir/CustomApproval.approval.0.approval.destructured.ir b/test_cases/abi_routing/out_unoptimized/CustomApproval.ir/CustomApproval.approval.0.destructured.ir
similarity index 100%
rename from test_cases/abi_routing/out_unoptimized/CustomApproval.ir/CustomApproval.approval.0.approval.destructured.ir
rename to test_cases/abi_routing/out_unoptimized/CustomApproval.ir/CustomApproval.approval.0.destructured.ir
diff --git a/test_cases/abi_routing/out_unoptimized/CustomApproval.ir/CustomApproval.clear.0.clear.destructured.ir b/test_cases/abi_routing/out_unoptimized/CustomApproval.ir/CustomApproval.clear.0.destructured.ir
similarity index 100%
rename from test_cases/abi_routing/out_unoptimized/CustomApproval.ir/CustomApproval.clear.0.clear.destructured.ir
rename to test_cases/abi_routing/out_unoptimized/CustomApproval.ir/CustomApproval.clear.0.destructured.ir
diff --git a/test_cases/abi_routing/out_unoptimized/MinimumARC4.ir/MinimumARC4.approval.0.approval.destructured.ir b/test_cases/abi_routing/out_unoptimized/MinimumARC4.ir/MinimumARC4.approval.0.destructured.ir
similarity index 100%
rename from test_cases/abi_routing/out_unoptimized/MinimumARC4.ir/MinimumARC4.approval.0.approval.destructured.ir
rename to test_cases/abi_routing/out_unoptimized/MinimumARC4.ir/MinimumARC4.approval.0.destructured.ir
diff --git a/test_cases/abi_routing/out_unoptimized/MinimumARC4.ir/MinimumARC4.clear.0.clear.destructured.ir b/test_cases/abi_routing/out_unoptimized/MinimumARC4.ir/MinimumARC4.clear.0.destructured.ir
similarity index 100%
rename from test_cases/abi_routing/out_unoptimized/MinimumARC4.ir/MinimumARC4.clear.0.clear.destructured.ir
rename to test_cases/abi_routing/out_unoptimized/MinimumARC4.ir/MinimumARC4.clear.0.destructured.ir
diff --git a/test_cases/abi_routing/out_unoptimized/Reference.ir/Reference.approval.0.approval.destructured.ir b/test_cases/abi_routing/out_unoptimized/Reference.ir/Reference.approval.0.destructured.ir
similarity index 100%
rename from test_cases/abi_routing/out_unoptimized/Reference.ir/Reference.approval.0.approval.destructured.ir
rename to test_cases/abi_routing/out_unoptimized/Reference.ir/Reference.approval.0.destructured.ir
diff --git a/test_cases/abi_routing/out_unoptimized/Reference.ir/Reference.clear.0.clear.destructured.ir b/test_cases/abi_routing/out_unoptimized/Reference.ir/Reference.clear.0.destructured.ir
similarity index 100%
rename from test_cases/abi_routing/out_unoptimized/Reference.ir/Reference.clear.0.clear.destructured.ir
rename to test_cases/abi_routing/out_unoptimized/Reference.ir/Reference.clear.0.destructured.ir
diff --git a/test_cases/abi_routing/puya.log b/test_cases/abi_routing/puya.log
index 0baaed2601..7fdcca22dd 100644
--- a/test_cases/abi_routing/puya.log
+++ b/test_cases/abi_routing/puya.log
@@ -652,7 +652,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to abi_routing/out/MinimumARC4.ir/MinimumARC4.approval.0.approval.ssa.ir
+debug: Output IR to abi_routing/out/MinimumARC4.ir/MinimumARC4.approval.0.ssa.ir
 info: optimizing approval program of test_cases.abi_routing.minimal.MinimumARC4 at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.abi_routing.minimal.MinimumARC4.__init__ for inlining
@@ -774,7 +774,7 @@ debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.abi_routing.minimal.MinimumARC4.__init__
 debug: removing unused subroutine algopy.arc4.ARC4Contract.approval_program
 debug: removing unused subroutine test_cases.abi_routing.minimal.MinimumARC4.__algopy_default_create
-debug: Output IR to abi_routing/out/MinimumARC4.ir/MinimumARC4.approval.1.approval.ssa.opt.ir
+debug: Output IR to abi_routing/out/MinimumARC4.ir/MinimumARC4.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.abi_routing.minimal.MinimumARC4.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -811,7 +811,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.abi_routing.minimal.MinimumARC4.__puya_arc4_router__
-debug: Output IR to abi_routing/out/MinimumARC4.ir/MinimumARC4.approval.2.approval.ssa.opt.ir
+debug: Output IR to abi_routing/out/MinimumARC4.ir/MinimumARC4.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.abi_routing.minimal.MinimumARC4.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -838,8 +838,8 @@ debug: Coalescing test_cases.abi_routing.minimal.MinimumARC4.__puya_arc4_router_
 debug: Coalescing resulted in 7 replacement/s
 debug: Sequentializing parallel copies in test_cases.abi_routing.minimal.MinimumARC4.__algopy_entrypoint_with_init
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to abi_routing/out/MinimumARC4.ir/MinimumARC4.approval.3.approval.destructured.ir
-debug: Output IR to abi_routing/out/MinimumARC4.ir/MinimumARC4.clear.0.clear.ssa.ir
+debug: Output IR to abi_routing/out/MinimumARC4.ir/MinimumARC4.approval.3.destructured.ir
+debug: Output IR to abi_routing/out/MinimumARC4.ir/MinimumARC4.clear.0.ssa.ir
 info: optimizing clear program of test_cases.abi_routing.minimal.MinimumARC4 at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -865,7 +865,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to abi_routing/out/MinimumARC4.ir/MinimumARC4.clear.1.clear.destructured.ir
+debug: Output IR to abi_routing/out/MinimumARC4.ir/MinimumARC4.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%0#2 0'
@@ -892,7 +892,7 @@ debug: inlining single reference block main___algopy_default_create@5 into main_
 debug: inlining single reference block main_after_inlined_test_cases.abi_routing.minimal.MinimumARC4.__puya_arc4_router__@7 into main_after_if_else@2
 debug: removing explicit jump to fall-through block main_after_if_else@2
 debug: optimizing TEAL subroutine algopy.arc4.ARC4Contract.clear_state_program() -> uint64:
-debug: Output IR to abi_routing/out/CustomApproval.ir/CustomApproval.approval.0.approval.ssa.ir
+debug: Output IR to abi_routing/out/CustomApproval.ir/CustomApproval.approval.0.ssa.ir
 info: optimizing approval program of test_cases.abi_routing.custom_approval.CustomApproval at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.abi_routing.custom_approval.CustomApproval.__init__ for inlining
@@ -1064,7 +1064,7 @@ debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.abi_routing.custom_approval.CustomApproval.__init__
 debug: removing unused subroutine test_cases.abi_routing.custom_approval.CustomApproval.approval_program
 debug: removing unused subroutine test_cases.abi_routing.custom_approval.CustomApproval.__puya_arc4_router__
-debug: Output IR to abi_routing/out/CustomApproval.ir/CustomApproval.approval.1.approval.ssa.opt.ir
+debug: Output IR to abi_routing/out/CustomApproval.ir/CustomApproval.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking single-use function algopy.arc4.ARC4Contract.approval_program for inlining
 debug: Optimizing subroutine test_cases.abi_routing.custom_approval.CustomApproval.__algopy_entrypoint_with_init
@@ -1142,7 +1142,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine algopy.arc4.ARC4Contract.approval_program
-debug: Output IR to abi_routing/out/CustomApproval.ir/CustomApproval.approval.2.approval.ssa.opt.ir
+debug: Output IR to abi_routing/out/CustomApproval.ir/CustomApproval.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.abi_routing.custom_approval.CustomApproval.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -1195,7 +1195,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.abi_routing.custom_approval.CustomApproval.__algopy_default_create
-debug: Output IR to abi_routing/out/CustomApproval.ir/CustomApproval.approval.3.approval.ssa.opt.ir
+debug: Output IR to abi_routing/out/CustomApproval.ir/CustomApproval.approval.3.ssa.opt.ir
 debug: Begin optimization pass 4/100
 debug: Optimizing subroutine test_cases.abi_routing.custom_approval.CustomApproval.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -1248,8 +1248,8 @@ debug: Coalescing local variables in test_cases.abi_routing.custom_approval.Cust
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.abi_routing.custom_approval.CustomApproval.add_one
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to abi_routing/out/CustomApproval.ir/CustomApproval.approval.4.approval.destructured.ir
-debug: Output IR to abi_routing/out/CustomApproval.ir/CustomApproval.clear.0.clear.ssa.ir
+debug: Output IR to abi_routing/out/CustomApproval.ir/CustomApproval.approval.4.destructured.ir
+debug: Output IR to abi_routing/out/CustomApproval.ir/CustomApproval.clear.0.ssa.ir
 info: optimizing clear program of test_cases.abi_routing.custom_approval.CustomApproval at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -1275,7 +1275,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to abi_routing/out/CustomApproval.ir/CustomApproval.clear.1.clear.destructured.ir
+debug: Output IR to abi_routing/out/CustomApproval.ir/CustomApproval.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_call___init__@1.ops[1]: 'l-store-copy tmp%0#1 0'
@@ -1343,7 +1343,7 @@ debug: removing explicit jump to fall-through block main_after_inlined_test_case
 debug: removing explicit jump to fall-through block main_after_if_else@8
 abi_routing/custom_approval.py:23 debug: optimizing TEAL subroutine test_cases.abi_routing.custom_approval.CustomApproval.add_one(x: uint64) -> uint64:
 debug: optimizing TEAL subroutine algopy.arc4.ARC4Contract.clear_state_program() -> uint64:
-debug: Output IR to abi_routing/out/Reference.ir/Reference.approval.0.approval.ssa.ir
+debug: Output IR to abi_routing/out/Reference.ir/Reference.approval.0.ssa.ir
 info: optimizing approval program of test_cases.abi_routing.contract.Reference at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.abi_routing.contract.Reference.__init__ for inlining
@@ -1806,7 +1806,7 @@ debug: removing unused subroutine algopy.arc4.ARC4Contract.approval_program
 debug: removing unused subroutine test_cases.abi_routing.contract.Reference.get_asset
 debug: removing unused subroutine test_cases.abi_routing.contract.Reference.get_app
 debug: removing unused subroutine test_cases.abi_routing.contract.Reference.get_a_int
-debug: Output IR to abi_routing/out/Reference.ir/Reference.approval.1.approval.ssa.opt.ir
+debug: Output IR to abi_routing/out/Reference.ir/Reference.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.abi_routing.contract.Reference.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -2023,7 +2023,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.abi_routing.contract.Reference.__puya_arc4_router__
-debug: Output IR to abi_routing/out/Reference.ir/Reference.approval.2.approval.ssa.opt.ir
+debug: Output IR to abi_routing/out/Reference.ir/Reference.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.abi_routing.contract.Reference.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -2314,8 +2314,8 @@ debug: Coalescing local variables in test_cases.abi_routing.contract.Reference.b
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.abi_routing.contract.Reference.bare_abi_config
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to abi_routing/out/Reference.ir/Reference.approval.3.approval.destructured.ir
-debug: Output IR to abi_routing/out/Reference.ir/Reference.clear.0.clear.ssa.ir
+debug: Output IR to abi_routing/out/Reference.ir/Reference.approval.3.destructured.ir
+debug: Output IR to abi_routing/out/Reference.ir/Reference.clear.0.ssa.ir
 info: optimizing clear program of test_cases.abi_routing.contract.Reference at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -2341,7 +2341,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to abi_routing/out/Reference.ir/Reference.clear.1.clear.destructured.ir
+debug: Output IR to abi_routing/out/Reference.ir/Reference.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_call___init__@1.ops[10]: 'l-store-copy new_state_value%0#0 0'
diff --git a/test_cases/abi_routing/puya_O2.log b/test_cases/abi_routing/puya_O2.log
index 635567bcca..a289fcb17c 100644
--- a/test_cases/abi_routing/puya_O2.log
+++ b/test_cases/abi_routing/puya_O2.log
@@ -834,7 +834,7 @@ debug: Coalescing test_cases.abi_routing.minimal.MinimumARC4.__puya_arc4_router_
 debug: Coalescing resulted in 7 replacement/s
 debug: Sequentializing parallel copies in test_cases.abi_routing.minimal.MinimumARC4.__algopy_entrypoint_with_init
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to abi_routing/out_O2/MinimumARC4.ir/MinimumARC4.approval.0.approval.destructured.ir
+debug: Output IR to abi_routing/out_O2/MinimumARC4.ir/MinimumARC4.approval.0.destructured.ir
 info: optimizing clear program of test_cases.abi_routing.minimal.MinimumARC4 at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -860,7 +860,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to abi_routing/out_O2/MinimumARC4.ir/MinimumARC4.clear.0.clear.destructured.ir
+debug: Output IR to abi_routing/out_O2/MinimumARC4.ir/MinimumARC4.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%0#2 0'
@@ -1244,7 +1244,7 @@ debug: Coalescing result#0 with [result#1]
 debug: Coalescing resulted in 20 replacement/s
 debug: Sequentializing parallel copies in test_cases.abi_routing.custom_approval.CustomApproval.__algopy_entrypoint_with_init
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to abi_routing/out_O2/CustomApproval.ir/CustomApproval.approval.0.approval.destructured.ir
+debug: Output IR to abi_routing/out_O2/CustomApproval.ir/CustomApproval.approval.0.destructured.ir
 info: optimizing clear program of test_cases.abi_routing.custom_approval.CustomApproval at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -1270,7 +1270,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to abi_routing/out_O2/CustomApproval.ir/CustomApproval.clear.0.clear.destructured.ir
+debug: Output IR to abi_routing/out_O2/CustomApproval.ir/CustomApproval.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_call___init__@1.ops[1]: 'l-store-copy tmp%0#1 0'
@@ -2059,7 +2059,7 @@ debug: Coalescing tmp%12#1 with [tmp%12#2]
 debug: Coalescing resulted in 175 replacement/s
 debug: Sequentializing parallel copies in test_cases.abi_routing.contract.Reference.__algopy_entrypoint_with_init
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to abi_routing/out_O2/Reference.ir/Reference.approval.0.approval.destructured.ir
+debug: Output IR to abi_routing/out_O2/Reference.ir/Reference.approval.0.destructured.ir
 info: optimizing clear program of test_cases.abi_routing.contract.Reference at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -2085,7 +2085,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to abi_routing/out_O2/Reference.ir/Reference.clear.0.clear.destructured.ir
+debug: Output IR to abi_routing/out_O2/Reference.ir/Reference.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_call___init__@1.ops[10]: 'l-store-copy new_state_value%0#0 0'
diff --git a/test_cases/abi_routing/puya_unoptimized.log b/test_cases/abi_routing/puya_unoptimized.log
index 7e2afcd4b9..d32a1e1430 100644
--- a/test_cases/abi_routing/puya_unoptimized.log
+++ b/test_cases/abi_routing/puya_unoptimized.log
@@ -768,7 +768,7 @@ debug: Coalescing tmp%0#0 with [tmp%0#2]
 debug: Coalescing resulted in 5 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.approval_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to abi_routing/out_unoptimized/MinimumARC4.ir/MinimumARC4.approval.0.approval.destructured.ir
+debug: Output IR to abi_routing/out_unoptimized/MinimumARC4.ir/MinimumARC4.approval.0.destructured.ir
 info: optimizing clear program of test_cases.abi_routing.minimal.MinimumARC4 at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -786,7 +786,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to abi_routing/out_unoptimized/MinimumARC4.ir/MinimumARC4.clear.0.clear.destructured.ir
+debug: Output IR to abi_routing/out_unoptimized/MinimumARC4.ir/MinimumARC4.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%1#0 0'
@@ -997,7 +997,7 @@ debug: Coalescing local variables in test_cases.abi_routing.custom_approval.Cust
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.abi_routing.custom_approval.CustomApproval.add_one
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to abi_routing/out_unoptimized/CustomApproval.ir/CustomApproval.approval.0.approval.destructured.ir
+debug: Output IR to abi_routing/out_unoptimized/CustomApproval.ir/CustomApproval.approval.0.destructured.ir
 info: optimizing clear program of test_cases.abi_routing.custom_approval.CustomApproval at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -1015,7 +1015,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to abi_routing/out_unoptimized/CustomApproval.ir/CustomApproval.clear.0.clear.destructured.ir
+debug: Output IR to abi_routing/out_unoptimized/CustomApproval.ir/CustomApproval.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%1#0 0'
@@ -1502,7 +1502,7 @@ debug: Coalescing local variables in test_cases.abi_routing.contract.Reference.b
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.abi_routing.contract.Reference.bare_abi_config
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to abi_routing/out_unoptimized/Reference.ir/Reference.approval.0.approval.destructured.ir
+debug: Output IR to abi_routing/out_unoptimized/Reference.ir/Reference.approval.0.destructured.ir
 info: optimizing clear program of test_cases.abi_routing.contract.Reference at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -1520,7 +1520,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to abi_routing/out_unoptimized/Reference.ir/Reference.clear.0.clear.destructured.ir
+debug: Output IR to abi_routing/out_unoptimized/Reference.ir/Reference.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/application/out/Reference.ir/Reference.approval.0.approval.ssa.ir b/test_cases/application/out/Reference.ir/Reference.approval.0.ssa.ir
similarity index 100%
rename from test_cases/application/out/Reference.ir/Reference.approval.0.approval.ssa.ir
rename to test_cases/application/out/Reference.ir/Reference.approval.0.ssa.ir
diff --git a/test_cases/application/out/Reference.ir/Reference.approval.1.approval.ssa.opt.ir b/test_cases/application/out/Reference.ir/Reference.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/application/out/Reference.ir/Reference.approval.1.approval.ssa.opt.ir
rename to test_cases/application/out/Reference.ir/Reference.approval.1.ssa.opt.ir
diff --git a/test_cases/application/out/Reference.ir/Reference.approval.2.approval.ssa.opt.ir b/test_cases/application/out/Reference.ir/Reference.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/application/out/Reference.ir/Reference.approval.2.approval.ssa.opt.ir
rename to test_cases/application/out/Reference.ir/Reference.approval.2.ssa.opt.ir
diff --git a/test_cases/application/out/Reference.ir/Reference.approval.3.approval.destructured.ir b/test_cases/application/out/Reference.ir/Reference.approval.3.destructured.ir
similarity index 100%
rename from test_cases/application/out/Reference.ir/Reference.approval.3.approval.destructured.ir
rename to test_cases/application/out/Reference.ir/Reference.approval.3.destructured.ir
diff --git a/test_cases/application/out/Reference.ir/Reference.clear.0.clear.ssa.ir b/test_cases/application/out/Reference.ir/Reference.clear.0.ssa.ir
similarity index 100%
rename from test_cases/application/out/Reference.ir/Reference.clear.0.clear.ssa.ir
rename to test_cases/application/out/Reference.ir/Reference.clear.0.ssa.ir
diff --git a/test_cases/application/out/Reference.ir/Reference.clear.1.clear.destructured.ir b/test_cases/application/out/Reference.ir/Reference.clear.1.destructured.ir
similarity index 100%
rename from test_cases/application/out/Reference.ir/Reference.clear.1.clear.destructured.ir
rename to test_cases/application/out/Reference.ir/Reference.clear.1.destructured.ir
diff --git a/test_cases/application/out_O2/Reference.ir/Reference.approval.0.approval.destructured.ir b/test_cases/application/out_O2/Reference.ir/Reference.approval.0.destructured.ir
similarity index 100%
rename from test_cases/application/out_O2/Reference.ir/Reference.approval.0.approval.destructured.ir
rename to test_cases/application/out_O2/Reference.ir/Reference.approval.0.destructured.ir
diff --git a/test_cases/application/out_O2/Reference.ir/Reference.clear.0.clear.destructured.ir b/test_cases/application/out_O2/Reference.ir/Reference.clear.0.destructured.ir
similarity index 100%
rename from test_cases/application/out_O2/Reference.ir/Reference.clear.0.clear.destructured.ir
rename to test_cases/application/out_O2/Reference.ir/Reference.clear.0.destructured.ir
diff --git a/test_cases/application/out_unoptimized/Reference.ir/Reference.approval.0.approval.destructured.ir b/test_cases/application/out_unoptimized/Reference.ir/Reference.approval.0.destructured.ir
similarity index 100%
rename from test_cases/application/out_unoptimized/Reference.ir/Reference.approval.0.approval.destructured.ir
rename to test_cases/application/out_unoptimized/Reference.ir/Reference.approval.0.destructured.ir
diff --git a/test_cases/application/out_unoptimized/Reference.ir/Reference.clear.0.clear.destructured.ir b/test_cases/application/out_unoptimized/Reference.ir/Reference.clear.0.destructured.ir
similarity index 100%
rename from test_cases/application/out_unoptimized/Reference.ir/Reference.clear.0.clear.destructured.ir
rename to test_cases/application/out_unoptimized/Reference.ir/Reference.clear.0.destructured.ir
diff --git a/test_cases/application/puya.log b/test_cases/application/puya.log
index 51e9c76120..3232970524 100644
--- a/test_cases/application/puya.log
+++ b/test_cases/application/puya.log
@@ -430,7 +430,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to application/out/Reference.ir/Reference.approval.0.approval.ssa.ir
+debug: Output IR to application/out/Reference.ir/Reference.approval.0.ssa.ir
 info: optimizing approval program of test_cases.application.contract.Reference at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.application.contract.Reference.__init__ for inlining
@@ -534,7 +534,7 @@ debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.application.contract.Reference.__init__
 debug: removing unused subroutine test_cases.application.contract.Reference.approval_program
-debug: Output IR to application/out/Reference.ir/Reference.approval.1.approval.ssa.opt.ir
+debug: Output IR to application/out/Reference.ir/Reference.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking single-use function test_cases.application.contract.Reference.validate_asset for inlining
 debug: Optimizing subroutine test_cases.application.contract.Reference.__algopy_entrypoint_with_init
@@ -575,7 +575,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.application.contract.Reference.validate_asset
-debug: Output IR to application/out/Reference.ir/Reference.approval.2.approval.ssa.opt.ir
+debug: Output IR to application/out/Reference.ir/Reference.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.application.contract.Reference.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -601,8 +601,8 @@ debug: Coalescing tmp%1#1 with [tmp%1#2]
 debug: Coalescing resulted in 2 replacement/s
 debug: Sequentializing parallel copies in test_cases.application.contract.Reference.__algopy_entrypoint_with_init
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to application/out/Reference.ir/Reference.approval.3.approval.destructured.ir
-debug: Output IR to application/out/Reference.ir/Reference.clear.0.clear.ssa.ir
+debug: Output IR to application/out/Reference.ir/Reference.approval.3.destructured.ir
+debug: Output IR to application/out/Reference.ir/Reference.clear.0.ssa.ir
 info: optimizing clear program of test_cases.application.contract.Reference at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.application.contract.Reference.clear_state_program
@@ -628,7 +628,7 @@ debug: Coalescing local variables in test_cases.application.contract.Reference.c
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.application.contract.Reference.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to application/out/Reference.ir/Reference.clear.1.clear.destructured.ir
+debug: Output IR to application/out/Reference.ir/Reference.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%0#1 0'
diff --git a/test_cases/application/puya_O2.log b/test_cases/application/puya_O2.log
index 6e64a0856e..60c1f5b6cc 100644
--- a/test_cases/application/puya_O2.log
+++ b/test_cases/application/puya_O2.log
@@ -597,7 +597,7 @@ debug: Coalescing tmp%1#1 with [tmp%1#2]
 debug: Coalescing resulted in 2 replacement/s
 debug: Sequentializing parallel copies in test_cases.application.contract.Reference.__algopy_entrypoint_with_init
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to application/out_O2/Reference.ir/Reference.approval.0.approval.destructured.ir
+debug: Output IR to application/out_O2/Reference.ir/Reference.approval.0.destructured.ir
 info: optimizing clear program of test_cases.application.contract.Reference at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.application.contract.Reference.clear_state_program
@@ -623,7 +623,7 @@ debug: Coalescing local variables in test_cases.application.contract.Reference.c
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.application.contract.Reference.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to application/out_O2/Reference.ir/Reference.clear.0.clear.destructured.ir
+debug: Output IR to application/out_O2/Reference.ir/Reference.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%0#1 0'
diff --git a/test_cases/application/puya_unoptimized.log b/test_cases/application/puya_unoptimized.log
index a65153aec0..0b6ddee82b 100644
--- a/test_cases/application/puya_unoptimized.log
+++ b/test_cases/application/puya_unoptimized.log
@@ -488,7 +488,7 @@ debug: Coalescing local variables in test_cases.application.contract.Reference.v
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.application.contract.Reference.validate_asset
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to application/out_unoptimized/Reference.ir/Reference.approval.0.approval.destructured.ir
+debug: Output IR to application/out_unoptimized/Reference.ir/Reference.approval.0.destructured.ir
 info: optimizing clear program of test_cases.application.contract.Reference at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.application.contract.Reference.clear_state_program
@@ -506,7 +506,7 @@ debug: Coalescing local variables in test_cases.application.contract.Reference.c
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.application.contract.Reference.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to application/out_unoptimized/Reference.ir/Reference.clear.0.clear.destructured.ir
+debug: Output IR to application/out_unoptimized/Reference.ir/Reference.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/arc4_dynamic_arrays/out/DynamicArrayContract.ir/DynamicArrayContract.approval.0.approval.ssa.ir b/test_cases/arc4_dynamic_arrays/out/DynamicArrayContract.ir/DynamicArrayContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/arc4_dynamic_arrays/out/DynamicArrayContract.ir/DynamicArrayContract.approval.0.approval.ssa.ir
rename to test_cases/arc4_dynamic_arrays/out/DynamicArrayContract.ir/DynamicArrayContract.approval.0.ssa.ir
diff --git a/test_cases/arc4_dynamic_arrays/out/DynamicArrayContract.ir/DynamicArrayContract.approval.1.approval.ssa.opt.ir b/test_cases/arc4_dynamic_arrays/out/DynamicArrayContract.ir/DynamicArrayContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/arc4_dynamic_arrays/out/DynamicArrayContract.ir/DynamicArrayContract.approval.1.approval.ssa.opt.ir
rename to test_cases/arc4_dynamic_arrays/out/DynamicArrayContract.ir/DynamicArrayContract.approval.1.ssa.opt.ir
diff --git a/test_cases/arc4_dynamic_arrays/out/DynamicArrayContract.ir/DynamicArrayContract.approval.2.approval.ssa.opt.ir b/test_cases/arc4_dynamic_arrays/out/DynamicArrayContract.ir/DynamicArrayContract.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/arc4_dynamic_arrays/out/DynamicArrayContract.ir/DynamicArrayContract.approval.2.approval.ssa.opt.ir
rename to test_cases/arc4_dynamic_arrays/out/DynamicArrayContract.ir/DynamicArrayContract.approval.2.ssa.opt.ir
diff --git a/test_cases/arc4_dynamic_arrays/out/DynamicArrayContract.ir/DynamicArrayContract.approval.3.approval.ssa.opt.ir b/test_cases/arc4_dynamic_arrays/out/DynamicArrayContract.ir/DynamicArrayContract.approval.3.ssa.opt.ir
similarity index 100%
rename from test_cases/arc4_dynamic_arrays/out/DynamicArrayContract.ir/DynamicArrayContract.approval.3.approval.ssa.opt.ir
rename to test_cases/arc4_dynamic_arrays/out/DynamicArrayContract.ir/DynamicArrayContract.approval.3.ssa.opt.ir
diff --git a/test_cases/arc4_dynamic_arrays/out/DynamicArrayContract.ir/DynamicArrayContract.approval.4.approval.destructured.ir b/test_cases/arc4_dynamic_arrays/out/DynamicArrayContract.ir/DynamicArrayContract.approval.4.destructured.ir
similarity index 100%
rename from test_cases/arc4_dynamic_arrays/out/DynamicArrayContract.ir/DynamicArrayContract.approval.4.approval.destructured.ir
rename to test_cases/arc4_dynamic_arrays/out/DynamicArrayContract.ir/DynamicArrayContract.approval.4.destructured.ir
diff --git a/test_cases/arc4_dynamic_arrays/out/DynamicArrayContract.ir/DynamicArrayContract.clear.0.clear.ssa.ir b/test_cases/arc4_dynamic_arrays/out/DynamicArrayContract.ir/DynamicArrayContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/arc4_dynamic_arrays/out/DynamicArrayContract.ir/DynamicArrayContract.clear.0.clear.ssa.ir
rename to test_cases/arc4_dynamic_arrays/out/DynamicArrayContract.ir/DynamicArrayContract.clear.0.ssa.ir
diff --git a/test_cases/arc4_dynamic_arrays/out/DynamicArrayContract.ir/DynamicArrayContract.clear.1.clear.destructured.ir b/test_cases/arc4_dynamic_arrays/out/DynamicArrayContract.ir/DynamicArrayContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/arc4_dynamic_arrays/out/DynamicArrayContract.ir/DynamicArrayContract.clear.1.clear.destructured.ir
rename to test_cases/arc4_dynamic_arrays/out/DynamicArrayContract.ir/DynamicArrayContract.clear.1.destructured.ir
diff --git a/test_cases/arc4_dynamic_arrays/out_O2/DynamicArrayContract.ir/DynamicArrayContract.approval.0.approval.destructured.ir b/test_cases/arc4_dynamic_arrays/out_O2/DynamicArrayContract.ir/DynamicArrayContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_dynamic_arrays/out_O2/DynamicArrayContract.ir/DynamicArrayContract.approval.0.approval.destructured.ir
rename to test_cases/arc4_dynamic_arrays/out_O2/DynamicArrayContract.ir/DynamicArrayContract.approval.0.destructured.ir
diff --git a/test_cases/arc4_dynamic_arrays/out_O2/DynamicArrayContract.ir/DynamicArrayContract.clear.0.clear.destructured.ir b/test_cases/arc4_dynamic_arrays/out_O2/DynamicArrayContract.ir/DynamicArrayContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_dynamic_arrays/out_O2/DynamicArrayContract.ir/DynamicArrayContract.clear.0.clear.destructured.ir
rename to test_cases/arc4_dynamic_arrays/out_O2/DynamicArrayContract.ir/DynamicArrayContract.clear.0.destructured.ir
diff --git a/test_cases/arc4_dynamic_arrays/out_unoptimized/DynamicArrayContract.ir/DynamicArrayContract.approval.0.approval.destructured.ir b/test_cases/arc4_dynamic_arrays/out_unoptimized/DynamicArrayContract.ir/DynamicArrayContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_dynamic_arrays/out_unoptimized/DynamicArrayContract.ir/DynamicArrayContract.approval.0.approval.destructured.ir
rename to test_cases/arc4_dynamic_arrays/out_unoptimized/DynamicArrayContract.ir/DynamicArrayContract.approval.0.destructured.ir
diff --git a/test_cases/arc4_dynamic_arrays/out_unoptimized/DynamicArrayContract.ir/DynamicArrayContract.clear.0.clear.destructured.ir b/test_cases/arc4_dynamic_arrays/out_unoptimized/DynamicArrayContract.ir/DynamicArrayContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_dynamic_arrays/out_unoptimized/DynamicArrayContract.ir/DynamicArrayContract.clear.0.clear.destructured.ir
rename to test_cases/arc4_dynamic_arrays/out_unoptimized/DynamicArrayContract.ir/DynamicArrayContract.clear.0.destructured.ir
diff --git a/test_cases/arc4_dynamic_arrays/puya.log b/test_cases/arc4_dynamic_arrays/puya.log
index 50dd136a96..488fa1b638 100644
--- a/test_cases/arc4_dynamic_arrays/puya.log
+++ b/test_cases/arc4_dynamic_arrays/puya.log
@@ -481,7 +481,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to arc4_dynamic_arrays/out/DynamicArrayContract.ir/DynamicArrayContract.approval.0.approval.ssa.ir
+debug: Output IR to arc4_dynamic_arrays/out/DynamicArrayContract.ir/DynamicArrayContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.arc4_dynamic_arrays.contract.DynamicArrayContract at level 1
 debug: Begin optimization pass 1/100
 debug: marking trivial method test_cases.arc4_dynamic_arrays.contract.get_byte1 as inlineable
@@ -2122,7 +2122,7 @@ debug: removing unused subroutine test_cases.arc4_dynamic_arrays.contract.get_st
 debug: removing unused subroutine test_cases.arc4_dynamic_arrays.contract.get_string3
 debug: removing unused subroutine test_cases.arc4_dynamic_arrays.contract.get_u16_arr2
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
-debug: Output IR to arc4_dynamic_arrays/out/DynamicArrayContract.ir/DynamicArrayContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to arc4_dynamic_arrays/out/DynamicArrayContract.ir/DynamicArrayContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking trivial method test_cases.arc4_dynamic_arrays.contract.get_u16_arr1 as inlineable
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
@@ -2505,7 +2505,7 @@ debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.arc4_dynamic_arrays.contract.get_u16_arr1
 debug: removing unused subroutine test_cases.arc4_dynamic_arrays.contract.DynamicArrayContract.__algopy_default_create
-debug: Output IR to arc4_dynamic_arrays/out/DynamicArrayContract.ir/DynamicArrayContract.approval.2.approval.ssa.opt.ir
+debug: Output IR to arc4_dynamic_arrays/out/DynamicArrayContract.ir/DynamicArrayContract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: marking trivial method test_cases.arc4_dynamic_arrays.contract.DynamicArrayContract.test_nested_struct_replacement as inlineable
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
@@ -2679,7 +2679,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.arc4_dynamic_arrays.contract.DynamicArrayContract.test_nested_struct_replacement
-debug: Output IR to arc4_dynamic_arrays/out/DynamicArrayContract.ir/DynamicArrayContract.approval.3.approval.ssa.opt.ir
+debug: Output IR to arc4_dynamic_arrays/out/DynamicArrayContract.ir/DynamicArrayContract.approval.3.ssa.opt.ir
 debug: Begin optimization pass 4/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -2990,8 +2990,8 @@ debug: to_do: head_offset#0, new_head_and_tail#0
 debug: * to_do new_head_and_tail#0
 debug: * to_do head_offset#0
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to arc4_dynamic_arrays/out/DynamicArrayContract.ir/DynamicArrayContract.approval.4.approval.destructured.ir
-debug: Output IR to arc4_dynamic_arrays/out/DynamicArrayContract.ir/DynamicArrayContract.clear.0.clear.ssa.ir
+debug: Output IR to arc4_dynamic_arrays/out/DynamicArrayContract.ir/DynamicArrayContract.approval.4.destructured.ir
+debug: Output IR to arc4_dynamic_arrays/out/DynamicArrayContract.ir/DynamicArrayContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.arc4_dynamic_arrays.contract.DynamicArrayContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -3017,7 +3017,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to arc4_dynamic_arrays/out/DynamicArrayContract.ir/DynamicArrayContract.clear.1.clear.destructured.ir
+debug: Output IR to arc4_dynamic_arrays/out/DynamicArrayContract.ir/DynamicArrayContract.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/arc4_dynamic_arrays/puya_O2.log b/test_cases/arc4_dynamic_arrays/puya_O2.log
index ab4069909a..6fe855c89c 100644
--- a/test_cases/arc4_dynamic_arrays/puya_O2.log
+++ b/test_cases/arc4_dynamic_arrays/puya_O2.log
@@ -3510,7 +3510,7 @@ debug: to_do: head_offset#0, new_head_and_tail#0
 debug: * to_do new_head_and_tail#0
 debug: * to_do head_offset#0
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to arc4_dynamic_arrays/out_O2/DynamicArrayContract.ir/DynamicArrayContract.approval.0.approval.destructured.ir
+debug: Output IR to arc4_dynamic_arrays/out_O2/DynamicArrayContract.ir/DynamicArrayContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.arc4_dynamic_arrays.contract.DynamicArrayContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -3536,7 +3536,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to arc4_dynamic_arrays/out_O2/DynamicArrayContract.ir/DynamicArrayContract.clear.0.clear.destructured.ir
+debug: Output IR to arc4_dynamic_arrays/out_O2/DynamicArrayContract.ir/DynamicArrayContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/arc4_dynamic_arrays/puya_unoptimized.log b/test_cases/arc4_dynamic_arrays/puya_unoptimized.log
index 722ef74cb7..1fbaa7c8c1 100644
--- a/test_cases/arc4_dynamic_arrays/puya_unoptimized.log
+++ b/test_cases/arc4_dynamic_arrays/puya_unoptimized.log
@@ -1346,7 +1346,7 @@ debug: to_do: head_offset#0, new_head_and_tail#0
 debug: * to_do new_head_and_tail#0
 debug: * to_do head_offset#0
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to arc4_dynamic_arrays/out_unoptimized/DynamicArrayContract.ir/DynamicArrayContract.approval.0.approval.destructured.ir
+debug: Output IR to arc4_dynamic_arrays/out_unoptimized/DynamicArrayContract.ir/DynamicArrayContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.arc4_dynamic_arrays.contract.DynamicArrayContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -1364,7 +1364,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to arc4_dynamic_arrays/out_unoptimized/DynamicArrayContract.ir/DynamicArrayContract.clear.0.clear.destructured.ir
+debug: Output IR to arc4_dynamic_arrays/out_unoptimized/DynamicArrayContract.ir/DynamicArrayContract.clear.0.destructured.ir
 debug: Inserted main_block@1.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main_block@1.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_block@1.ops[6]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/arc4_numeric_comparisons/out/UIntNOrdering.ir/UIntNOrdering.approval.0.approval.ssa.ir b/test_cases/arc4_numeric_comparisons/out/UIntNOrdering.ir/UIntNOrdering.approval.0.ssa.ir
similarity index 100%
rename from test_cases/arc4_numeric_comparisons/out/UIntNOrdering.ir/UIntNOrdering.approval.0.approval.ssa.ir
rename to test_cases/arc4_numeric_comparisons/out/UIntNOrdering.ir/UIntNOrdering.approval.0.ssa.ir
diff --git a/test_cases/arc4_numeric_comparisons/out/UIntNOrdering.ir/UIntNOrdering.approval.1.approval.ssa.opt.ir b/test_cases/arc4_numeric_comparisons/out/UIntNOrdering.ir/UIntNOrdering.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/arc4_numeric_comparisons/out/UIntNOrdering.ir/UIntNOrdering.approval.1.approval.ssa.opt.ir
rename to test_cases/arc4_numeric_comparisons/out/UIntNOrdering.ir/UIntNOrdering.approval.1.ssa.opt.ir
diff --git a/test_cases/arc4_numeric_comparisons/out/UIntNOrdering.ir/UIntNOrdering.approval.2.approval.destructured.ir b/test_cases/arc4_numeric_comparisons/out/UIntNOrdering.ir/UIntNOrdering.approval.2.destructured.ir
similarity index 100%
rename from test_cases/arc4_numeric_comparisons/out/UIntNOrdering.ir/UIntNOrdering.approval.2.approval.destructured.ir
rename to test_cases/arc4_numeric_comparisons/out/UIntNOrdering.ir/UIntNOrdering.approval.2.destructured.ir
diff --git a/test_cases/arc4_numeric_comparisons/out/UIntNOrdering.ir/UIntNOrdering.clear.0.clear.ssa.ir b/test_cases/arc4_numeric_comparisons/out/UIntNOrdering.ir/UIntNOrdering.clear.0.ssa.ir
similarity index 100%
rename from test_cases/arc4_numeric_comparisons/out/UIntNOrdering.ir/UIntNOrdering.clear.0.clear.ssa.ir
rename to test_cases/arc4_numeric_comparisons/out/UIntNOrdering.ir/UIntNOrdering.clear.0.ssa.ir
diff --git a/test_cases/arc4_numeric_comparisons/out/UIntNOrdering.ir/UIntNOrdering.clear.1.clear.destructured.ir b/test_cases/arc4_numeric_comparisons/out/UIntNOrdering.ir/UIntNOrdering.clear.1.destructured.ir
similarity index 100%
rename from test_cases/arc4_numeric_comparisons/out/UIntNOrdering.ir/UIntNOrdering.clear.1.clear.destructured.ir
rename to test_cases/arc4_numeric_comparisons/out/UIntNOrdering.ir/UIntNOrdering.clear.1.destructured.ir
diff --git a/test_cases/arc4_numeric_comparisons/out_O2/UIntNOrdering.ir/UIntNOrdering.approval.0.approval.destructured.ir b/test_cases/arc4_numeric_comparisons/out_O2/UIntNOrdering.ir/UIntNOrdering.approval.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_numeric_comparisons/out_O2/UIntNOrdering.ir/UIntNOrdering.approval.0.approval.destructured.ir
rename to test_cases/arc4_numeric_comparisons/out_O2/UIntNOrdering.ir/UIntNOrdering.approval.0.destructured.ir
diff --git a/test_cases/arc4_numeric_comparisons/out_O2/UIntNOrdering.ir/UIntNOrdering.clear.0.clear.destructured.ir b/test_cases/arc4_numeric_comparisons/out_O2/UIntNOrdering.ir/UIntNOrdering.clear.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_numeric_comparisons/out_O2/UIntNOrdering.ir/UIntNOrdering.clear.0.clear.destructured.ir
rename to test_cases/arc4_numeric_comparisons/out_O2/UIntNOrdering.ir/UIntNOrdering.clear.0.destructured.ir
diff --git a/test_cases/arc4_numeric_comparisons/out_unoptimized/UIntNOrdering.ir/UIntNOrdering.approval.0.approval.destructured.ir b/test_cases/arc4_numeric_comparisons/out_unoptimized/UIntNOrdering.ir/UIntNOrdering.approval.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_numeric_comparisons/out_unoptimized/UIntNOrdering.ir/UIntNOrdering.approval.0.approval.destructured.ir
rename to test_cases/arc4_numeric_comparisons/out_unoptimized/UIntNOrdering.ir/UIntNOrdering.approval.0.destructured.ir
diff --git a/test_cases/arc4_numeric_comparisons/out_unoptimized/UIntNOrdering.ir/UIntNOrdering.clear.0.clear.destructured.ir b/test_cases/arc4_numeric_comparisons/out_unoptimized/UIntNOrdering.ir/UIntNOrdering.clear.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_numeric_comparisons/out_unoptimized/UIntNOrdering.ir/UIntNOrdering.clear.0.clear.destructured.ir
rename to test_cases/arc4_numeric_comparisons/out_unoptimized/UIntNOrdering.ir/UIntNOrdering.clear.0.destructured.ir
diff --git a/test_cases/arc4_numeric_comparisons/puya.log b/test_cases/arc4_numeric_comparisons/puya.log
index 04b52fbb17..a46ead5f9d 100644
--- a/test_cases/arc4_numeric_comparisons/puya.log
+++ b/test_cases/arc4_numeric_comparisons/puya.log
@@ -416,7 +416,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to arc4_numeric_comparisons/out/UIntNOrdering.ir/UIntNOrdering.approval.0.approval.ssa.ir
+debug: Output IR to arc4_numeric_comparisons/out/UIntNOrdering.ir/UIntNOrdering.approval.0.ssa.ir
 info: optimizing approval program of test_cases.arc4_numeric_comparisons.uint_n.UIntNOrdering at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.arc4_numeric_comparisons.uint_n.check_both_uint_n for inlining
@@ -1534,7 +1534,7 @@ debug: Removing redundant assert of tmp%43#0
 debug: removing unused subroutine test_cases.arc4_numeric_comparisons.uint_n.check_both_uint_n
 debug: removing unused subroutine test_cases.arc4_numeric_comparisons.uint_n.check_mixed
 debug: removing unused subroutine test_cases.arc4_numeric_comparisons.uint_n.check_both_big_uint_n
-debug: Output IR to arc4_numeric_comparisons/out/UIntNOrdering.ir/UIntNOrdering.approval.1.approval.ssa.opt.ir
+debug: Output IR to arc4_numeric_comparisons/out/UIntNOrdering.ir/UIntNOrdering.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.arc4_numeric_comparisons.uint_n.UIntNOrdering.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -1559,8 +1559,8 @@ debug: Coalescing local variables in test_cases.arc4_numeric_comparisons.uint_n.
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_numeric_comparisons.uint_n.UIntNOrdering.approval_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to arc4_numeric_comparisons/out/UIntNOrdering.ir/UIntNOrdering.approval.2.approval.destructured.ir
-debug: Output IR to arc4_numeric_comparisons/out/UIntNOrdering.ir/UIntNOrdering.clear.0.clear.ssa.ir
+debug: Output IR to arc4_numeric_comparisons/out/UIntNOrdering.ir/UIntNOrdering.approval.2.destructured.ir
+debug: Output IR to arc4_numeric_comparisons/out/UIntNOrdering.ir/UIntNOrdering.clear.0.ssa.ir
 info: optimizing clear program of test_cases.arc4_numeric_comparisons.uint_n.UIntNOrdering at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_numeric_comparisons.uint_n.UIntNOrdering.clear_state_program
@@ -1586,7 +1586,7 @@ debug: Coalescing local variables in test_cases.arc4_numeric_comparisons.uint_n.
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_numeric_comparisons.uint_n.UIntNOrdering.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to arc4_numeric_comparisons/out/UIntNOrdering.ir/UIntNOrdering.clear.1.clear.destructured.ir
+debug: Output IR to arc4_numeric_comparisons/out/UIntNOrdering.ir/UIntNOrdering.clear.1.destructured.ir
 arc4_numeric_comparisons/uint_n.py:8 debug: optimizing TEAL subroutine test_cases.arc4_numeric_comparisons.uint_n.UIntNOrdering.approval_program() -> uint64:
 arc4_numeric_comparisons/uint_n.py:14 debug: optimizing TEAL subroutine test_cases.arc4_numeric_comparisons.uint_n.UIntNOrdering.clear_state_program() -> uint64:
 info: Writing arc4_numeric_comparisons/out/UIntNOrdering.approval.teal
diff --git a/test_cases/arc4_numeric_comparisons/puya_O2.log b/test_cases/arc4_numeric_comparisons/puya_O2.log
index 8ada3568d3..4c4a9446df 100644
--- a/test_cases/arc4_numeric_comparisons/puya_O2.log
+++ b/test_cases/arc4_numeric_comparisons/puya_O2.log
@@ -1556,7 +1556,7 @@ debug: Coalescing local variables in test_cases.arc4_numeric_comparisons.uint_n.
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_numeric_comparisons.uint_n.UIntNOrdering.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to arc4_numeric_comparisons/out_O2/UIntNOrdering.ir/UIntNOrdering.approval.0.approval.destructured.ir
+debug: Output IR to arc4_numeric_comparisons/out_O2/UIntNOrdering.ir/UIntNOrdering.approval.0.destructured.ir
 info: optimizing clear program of test_cases.arc4_numeric_comparisons.uint_n.UIntNOrdering at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_numeric_comparisons.uint_n.UIntNOrdering.clear_state_program
@@ -1582,7 +1582,7 @@ debug: Coalescing local variables in test_cases.arc4_numeric_comparisons.uint_n.
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_numeric_comparisons.uint_n.UIntNOrdering.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to arc4_numeric_comparisons/out_O2/UIntNOrdering.ir/UIntNOrdering.clear.0.clear.destructured.ir
+debug: Output IR to arc4_numeric_comparisons/out_O2/UIntNOrdering.ir/UIntNOrdering.clear.0.destructured.ir
 arc4_numeric_comparisons/uint_n.py:8 debug: optimizing TEAL subroutine test_cases.arc4_numeric_comparisons.uint_n.UIntNOrdering.approval_program() -> uint64:
 arc4_numeric_comparisons/uint_n.py:14 debug: optimizing TEAL subroutine test_cases.arc4_numeric_comparisons.uint_n.UIntNOrdering.clear_state_program() -> uint64:
 info: Writing arc4_numeric_comparisons/out_O2/UIntNOrdering.approval.teal
diff --git a/test_cases/arc4_numeric_comparisons/puya_unoptimized.log b/test_cases/arc4_numeric_comparisons/puya_unoptimized.log
index bda262d86b..ff9ef135bd 100644
--- a/test_cases/arc4_numeric_comparisons/puya_unoptimized.log
+++ b/test_cases/arc4_numeric_comparisons/puya_unoptimized.log
@@ -569,7 +569,7 @@ debug: Coalescing local variables in test_cases.arc4_numeric_comparisons.uint_n.
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_numeric_comparisons.uint_n.check_both_big_uint_n
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to arc4_numeric_comparisons/out_unoptimized/UIntNOrdering.ir/UIntNOrdering.approval.0.approval.destructured.ir
+debug: Output IR to arc4_numeric_comparisons/out_unoptimized/UIntNOrdering.ir/UIntNOrdering.approval.0.destructured.ir
 info: optimizing clear program of test_cases.arc4_numeric_comparisons.uint_n.UIntNOrdering at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_numeric_comparisons.uint_n.UIntNOrdering.clear_state_program
@@ -587,7 +587,7 @@ debug: Coalescing local variables in test_cases.arc4_numeric_comparisons.uint_n.
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_numeric_comparisons.uint_n.UIntNOrdering.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to arc4_numeric_comparisons/out_unoptimized/UIntNOrdering.ir/UIntNOrdering.clear.0.clear.destructured.ir
+debug: Output IR to arc4_numeric_comparisons/out_unoptimized/UIntNOrdering.ir/UIntNOrdering.clear.0.destructured.ir
 debug: Inserted check_both_uint_n.ops[1]: 'l-store-copy reinterpret_biguint%0#0 0'
 debug: Replaced check_both_uint_n.ops[3]: 'v-load reinterpret_biguint%0#0' with 'l-load reinterpret_biguint%0#0'
 debug: Inserted check_both_uint_n.ops[6]: 'l-store-copy tmp%0#0 0'
diff --git a/test_cases/arc4_types/out/Arc4AddressContract.ir/Arc4AddressContract.approval.0.approval.ssa.ir b/test_cases/arc4_types/out/Arc4AddressContract.ir/Arc4AddressContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4AddressContract.ir/Arc4AddressContract.approval.0.approval.ssa.ir
rename to test_cases/arc4_types/out/Arc4AddressContract.ir/Arc4AddressContract.approval.0.ssa.ir
diff --git a/test_cases/arc4_types/out/Arc4AddressContract.ir/Arc4AddressContract.approval.1.approval.ssa.opt.ir b/test_cases/arc4_types/out/Arc4AddressContract.ir/Arc4AddressContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4AddressContract.ir/Arc4AddressContract.approval.1.approval.ssa.opt.ir
rename to test_cases/arc4_types/out/Arc4AddressContract.ir/Arc4AddressContract.approval.1.ssa.opt.ir
diff --git a/test_cases/arc4_types/out/Arc4AddressContract.ir/Arc4AddressContract.approval.2.approval.destructured.ir b/test_cases/arc4_types/out/Arc4AddressContract.ir/Arc4AddressContract.approval.2.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4AddressContract.ir/Arc4AddressContract.approval.2.approval.destructured.ir
rename to test_cases/arc4_types/out/Arc4AddressContract.ir/Arc4AddressContract.approval.2.destructured.ir
diff --git a/test_cases/arc4_types/out/Arc4AddressContract.ir/Arc4AddressContract.clear.0.clear.ssa.ir b/test_cases/arc4_types/out/Arc4AddressContract.ir/Arc4AddressContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4AddressContract.ir/Arc4AddressContract.clear.0.clear.ssa.ir
rename to test_cases/arc4_types/out/Arc4AddressContract.ir/Arc4AddressContract.clear.0.ssa.ir
diff --git a/test_cases/arc4_types/out/Arc4AddressContract.ir/Arc4AddressContract.clear.1.clear.destructured.ir b/test_cases/arc4_types/out/Arc4AddressContract.ir/Arc4AddressContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4AddressContract.ir/Arc4AddressContract.clear.1.clear.destructured.ir
rename to test_cases/arc4_types/out/Arc4AddressContract.ir/Arc4AddressContract.clear.1.destructured.ir
diff --git a/test_cases/arc4_types/out/Arc4ArraysContract.ir/Arc4ArraysContract.approval.0.approval.ssa.ir b/test_cases/arc4_types/out/Arc4ArraysContract.ir/Arc4ArraysContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4ArraysContract.ir/Arc4ArraysContract.approval.0.approval.ssa.ir
rename to test_cases/arc4_types/out/Arc4ArraysContract.ir/Arc4ArraysContract.approval.0.ssa.ir
diff --git a/test_cases/arc4_types/out/Arc4ArraysContract.ir/Arc4ArraysContract.approval.1.approval.ssa.opt.ir b/test_cases/arc4_types/out/Arc4ArraysContract.ir/Arc4ArraysContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4ArraysContract.ir/Arc4ArraysContract.approval.1.approval.ssa.opt.ir
rename to test_cases/arc4_types/out/Arc4ArraysContract.ir/Arc4ArraysContract.approval.1.ssa.opt.ir
diff --git a/test_cases/arc4_types/out/Arc4ArraysContract.ir/Arc4ArraysContract.approval.2.approval.ssa.opt.ir b/test_cases/arc4_types/out/Arc4ArraysContract.ir/Arc4ArraysContract.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4ArraysContract.ir/Arc4ArraysContract.approval.2.approval.ssa.opt.ir
rename to test_cases/arc4_types/out/Arc4ArraysContract.ir/Arc4ArraysContract.approval.2.ssa.opt.ir
diff --git a/test_cases/arc4_types/out/Arc4ArraysContract.ir/Arc4ArraysContract.approval.3.approval.destructured.ir b/test_cases/arc4_types/out/Arc4ArraysContract.ir/Arc4ArraysContract.approval.3.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4ArraysContract.ir/Arc4ArraysContract.approval.3.approval.destructured.ir
rename to test_cases/arc4_types/out/Arc4ArraysContract.ir/Arc4ArraysContract.approval.3.destructured.ir
diff --git a/test_cases/arc4_types/out/Arc4ArraysContract.ir/Arc4ArraysContract.clear.0.clear.ssa.ir b/test_cases/arc4_types/out/Arc4ArraysContract.ir/Arc4ArraysContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4ArraysContract.ir/Arc4ArraysContract.clear.0.clear.ssa.ir
rename to test_cases/arc4_types/out/Arc4ArraysContract.ir/Arc4ArraysContract.clear.0.ssa.ir
diff --git a/test_cases/arc4_types/out/Arc4ArraysContract.ir/Arc4ArraysContract.clear.1.clear.destructured.ir b/test_cases/arc4_types/out/Arc4ArraysContract.ir/Arc4ArraysContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4ArraysContract.ir/Arc4ArraysContract.clear.1.clear.destructured.ir
rename to test_cases/arc4_types/out/Arc4ArraysContract.ir/Arc4ArraysContract.clear.1.destructured.ir
diff --git a/test_cases/arc4_types/out/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.approval.0.approval.ssa.ir b/test_cases/arc4_types/out/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.approval.0.approval.ssa.ir
rename to test_cases/arc4_types/out/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.approval.0.ssa.ir
diff --git a/test_cases/arc4_types/out/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.approval.1.approval.ssa.opt.ir b/test_cases/arc4_types/out/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.approval.1.approval.ssa.opt.ir
rename to test_cases/arc4_types/out/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.approval.1.ssa.opt.ir
diff --git a/test_cases/arc4_types/out/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.approval.2.approval.destructured.ir b/test_cases/arc4_types/out/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.approval.2.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.approval.2.approval.destructured.ir
rename to test_cases/arc4_types/out/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.approval.2.destructured.ir
diff --git a/test_cases/arc4_types/out/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.clear.0.clear.ssa.ir b/test_cases/arc4_types/out/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.clear.0.clear.ssa.ir
rename to test_cases/arc4_types/out/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.clear.0.ssa.ir
diff --git a/test_cases/arc4_types/out/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.clear.1.clear.destructured.ir b/test_cases/arc4_types/out/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.clear.1.clear.destructured.ir
rename to test_cases/arc4_types/out/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.clear.1.destructured.ir
diff --git a/test_cases/arc4_types/out/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.approval.0.approval.ssa.ir b/test_cases/arc4_types/out/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.approval.0.approval.ssa.ir
rename to test_cases/arc4_types/out/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.approval.0.ssa.ir
diff --git a/test_cases/arc4_types/out/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.approval.1.approval.ssa.opt.ir b/test_cases/arc4_types/out/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.approval.1.approval.ssa.opt.ir
rename to test_cases/arc4_types/out/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.approval.1.ssa.opt.ir
diff --git a/test_cases/arc4_types/out/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.approval.2.approval.destructured.ir b/test_cases/arc4_types/out/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.approval.2.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.approval.2.approval.destructured.ir
rename to test_cases/arc4_types/out/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.approval.2.destructured.ir
diff --git a/test_cases/arc4_types/out/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.clear.0.clear.ssa.ir b/test_cases/arc4_types/out/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.clear.0.clear.ssa.ir
rename to test_cases/arc4_types/out/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.clear.0.ssa.ir
diff --git a/test_cases/arc4_types/out/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.clear.1.clear.destructured.ir b/test_cases/arc4_types/out/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.clear.1.clear.destructured.ir
rename to test_cases/arc4_types/out/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.clear.1.destructured.ir
diff --git a/test_cases/arc4_types/out/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.approval.0.approval.ssa.ir b/test_cases/arc4_types/out/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.approval.0.approval.ssa.ir
rename to test_cases/arc4_types/out/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.approval.0.ssa.ir
diff --git a/test_cases/arc4_types/out/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.approval.1.approval.ssa.opt.ir b/test_cases/arc4_types/out/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.approval.1.approval.ssa.opt.ir
rename to test_cases/arc4_types/out/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.approval.1.ssa.opt.ir
diff --git a/test_cases/arc4_types/out/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.approval.2.approval.destructured.ir b/test_cases/arc4_types/out/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.approval.2.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.approval.2.approval.destructured.ir
rename to test_cases/arc4_types/out/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.approval.2.destructured.ir
diff --git a/test_cases/arc4_types/out/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.clear.0.clear.ssa.ir b/test_cases/arc4_types/out/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.clear.0.clear.ssa.ir
rename to test_cases/arc4_types/out/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.clear.0.ssa.ir
diff --git a/test_cases/arc4_types/out/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.clear.1.clear.destructured.ir b/test_cases/arc4_types/out/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.clear.1.clear.destructured.ir
rename to test_cases/arc4_types/out/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.clear.1.destructured.ir
diff --git a/test_cases/arc4_types/out/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.approval.0.approval.ssa.ir b/test_cases/arc4_types/out/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.approval.0.approval.ssa.ir
rename to test_cases/arc4_types/out/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.approval.0.ssa.ir
diff --git a/test_cases/arc4_types/out/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.approval.1.approval.ssa.opt.ir b/test_cases/arc4_types/out/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.approval.1.approval.ssa.opt.ir
rename to test_cases/arc4_types/out/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.approval.1.ssa.opt.ir
diff --git a/test_cases/arc4_types/out/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.approval.2.approval.ssa.opt.ir b/test_cases/arc4_types/out/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.approval.2.approval.ssa.opt.ir
rename to test_cases/arc4_types/out/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.approval.2.ssa.opt.ir
diff --git a/test_cases/arc4_types/out/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.approval.3.approval.destructured.ir b/test_cases/arc4_types/out/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.approval.3.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.approval.3.approval.destructured.ir
rename to test_cases/arc4_types/out/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.approval.3.destructured.ir
diff --git a/test_cases/arc4_types/out/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.clear.0.clear.ssa.ir b/test_cases/arc4_types/out/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.clear.0.clear.ssa.ir
rename to test_cases/arc4_types/out/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.clear.0.ssa.ir
diff --git a/test_cases/arc4_types/out/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.clear.1.clear.destructured.ir b/test_cases/arc4_types/out/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.clear.1.clear.destructured.ir
rename to test_cases/arc4_types/out/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.clear.1.destructured.ir
diff --git a/test_cases/arc4_types/out/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.approval.0.approval.ssa.ir b/test_cases/arc4_types/out/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.approval.0.approval.ssa.ir
rename to test_cases/arc4_types/out/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.approval.0.ssa.ir
diff --git a/test_cases/arc4_types/out/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.approval.1.approval.ssa.opt.ir b/test_cases/arc4_types/out/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.approval.1.approval.ssa.opt.ir
rename to test_cases/arc4_types/out/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.approval.1.ssa.opt.ir
diff --git a/test_cases/arc4_types/out/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.approval.2.approval.ssa.opt.ir b/test_cases/arc4_types/out/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.approval.2.approval.ssa.opt.ir
rename to test_cases/arc4_types/out/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.approval.2.ssa.opt.ir
diff --git a/test_cases/arc4_types/out/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.approval.3.approval.ssa.opt.ir b/test_cases/arc4_types/out/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.approval.3.ssa.opt.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.approval.3.approval.ssa.opt.ir
rename to test_cases/arc4_types/out/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.approval.3.ssa.opt.ir
diff --git a/test_cases/arc4_types/out/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.approval.4.approval.destructured.ir b/test_cases/arc4_types/out/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.approval.4.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.approval.4.approval.destructured.ir
rename to test_cases/arc4_types/out/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.approval.4.destructured.ir
diff --git a/test_cases/arc4_types/out/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.clear.0.clear.ssa.ir b/test_cases/arc4_types/out/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.clear.0.clear.ssa.ir
rename to test_cases/arc4_types/out/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.clear.0.ssa.ir
diff --git a/test_cases/arc4_types/out/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.clear.1.clear.destructured.ir b/test_cases/arc4_types/out/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.clear.1.clear.destructured.ir
rename to test_cases/arc4_types/out/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.clear.1.destructured.ir
diff --git a/test_cases/arc4_types/out/Arc4MutationContract.ir/Arc4MutationContract.approval.0.approval.ssa.ir b/test_cases/arc4_types/out/Arc4MutationContract.ir/Arc4MutationContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4MutationContract.ir/Arc4MutationContract.approval.0.approval.ssa.ir
rename to test_cases/arc4_types/out/Arc4MutationContract.ir/Arc4MutationContract.approval.0.ssa.ir
diff --git a/test_cases/arc4_types/out/Arc4MutationContract.ir/Arc4MutationContract.approval.1.approval.ssa.opt.ir b/test_cases/arc4_types/out/Arc4MutationContract.ir/Arc4MutationContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4MutationContract.ir/Arc4MutationContract.approval.1.approval.ssa.opt.ir
rename to test_cases/arc4_types/out/Arc4MutationContract.ir/Arc4MutationContract.approval.1.ssa.opt.ir
diff --git a/test_cases/arc4_types/out/Arc4MutationContract.ir/Arc4MutationContract.approval.2.approval.ssa.opt.ir b/test_cases/arc4_types/out/Arc4MutationContract.ir/Arc4MutationContract.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4MutationContract.ir/Arc4MutationContract.approval.2.approval.ssa.opt.ir
rename to test_cases/arc4_types/out/Arc4MutationContract.ir/Arc4MutationContract.approval.2.ssa.opt.ir
diff --git a/test_cases/arc4_types/out/Arc4MutationContract.ir/Arc4MutationContract.approval.3.approval.destructured.ir b/test_cases/arc4_types/out/Arc4MutationContract.ir/Arc4MutationContract.approval.3.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4MutationContract.ir/Arc4MutationContract.approval.3.approval.destructured.ir
rename to test_cases/arc4_types/out/Arc4MutationContract.ir/Arc4MutationContract.approval.3.destructured.ir
diff --git a/test_cases/arc4_types/out/Arc4MutationContract.ir/Arc4MutationContract.clear.0.clear.ssa.ir b/test_cases/arc4_types/out/Arc4MutationContract.ir/Arc4MutationContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4MutationContract.ir/Arc4MutationContract.clear.0.clear.ssa.ir
rename to test_cases/arc4_types/out/Arc4MutationContract.ir/Arc4MutationContract.clear.0.ssa.ir
diff --git a/test_cases/arc4_types/out/Arc4MutationContract.ir/Arc4MutationContract.clear.1.clear.destructured.ir b/test_cases/arc4_types/out/Arc4MutationContract.ir/Arc4MutationContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4MutationContract.ir/Arc4MutationContract.clear.1.clear.destructured.ir
rename to test_cases/arc4_types/out/Arc4MutationContract.ir/Arc4MutationContract.clear.1.destructured.ir
diff --git a/test_cases/arc4_types/out/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.approval.0.approval.ssa.ir b/test_cases/arc4_types/out/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.approval.0.approval.ssa.ir
rename to test_cases/arc4_types/out/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.approval.0.ssa.ir
diff --git a/test_cases/arc4_types/out/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.approval.1.approval.ssa.opt.ir b/test_cases/arc4_types/out/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.approval.1.approval.ssa.opt.ir
rename to test_cases/arc4_types/out/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.approval.1.ssa.opt.ir
diff --git a/test_cases/arc4_types/out/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.approval.2.approval.ssa.opt.ir b/test_cases/arc4_types/out/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.approval.2.approval.ssa.opt.ir
rename to test_cases/arc4_types/out/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.approval.2.ssa.opt.ir
diff --git a/test_cases/arc4_types/out/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.approval.3.approval.destructured.ir b/test_cases/arc4_types/out/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.approval.3.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.approval.3.approval.destructured.ir
rename to test_cases/arc4_types/out/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.approval.3.destructured.ir
diff --git a/test_cases/arc4_types/out/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.clear.0.clear.ssa.ir b/test_cases/arc4_types/out/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.clear.0.clear.ssa.ir
rename to test_cases/arc4_types/out/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.clear.0.ssa.ir
diff --git a/test_cases/arc4_types/out/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.clear.1.clear.ssa.opt.ir b/test_cases/arc4_types/out/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.clear.1.ssa.opt.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.clear.1.clear.ssa.opt.ir
rename to test_cases/arc4_types/out/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.clear.1.ssa.opt.ir
diff --git a/test_cases/arc4_types/out/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.clear.2.clear.destructured.ir b/test_cases/arc4_types/out/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.clear.2.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.clear.2.clear.destructured.ir
rename to test_cases/arc4_types/out/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.clear.2.destructured.ir
diff --git a/test_cases/arc4_types/out/Arc4RefTypesContract.ir/Arc4RefTypesContract.approval.0.approval.ssa.ir b/test_cases/arc4_types/out/Arc4RefTypesContract.ir/Arc4RefTypesContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4RefTypesContract.ir/Arc4RefTypesContract.approval.0.approval.ssa.ir
rename to test_cases/arc4_types/out/Arc4RefTypesContract.ir/Arc4RefTypesContract.approval.0.ssa.ir
diff --git a/test_cases/arc4_types/out/Arc4RefTypesContract.ir/Arc4RefTypesContract.approval.1.approval.ssa.opt.ir b/test_cases/arc4_types/out/Arc4RefTypesContract.ir/Arc4RefTypesContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4RefTypesContract.ir/Arc4RefTypesContract.approval.1.approval.ssa.opt.ir
rename to test_cases/arc4_types/out/Arc4RefTypesContract.ir/Arc4RefTypesContract.approval.1.ssa.opt.ir
diff --git a/test_cases/arc4_types/out/Arc4RefTypesContract.ir/Arc4RefTypesContract.approval.2.approval.destructured.ir b/test_cases/arc4_types/out/Arc4RefTypesContract.ir/Arc4RefTypesContract.approval.2.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4RefTypesContract.ir/Arc4RefTypesContract.approval.2.approval.destructured.ir
rename to test_cases/arc4_types/out/Arc4RefTypesContract.ir/Arc4RefTypesContract.approval.2.destructured.ir
diff --git a/test_cases/arc4_types/out/Arc4RefTypesContract.ir/Arc4RefTypesContract.clear.0.clear.ssa.ir b/test_cases/arc4_types/out/Arc4RefTypesContract.ir/Arc4RefTypesContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4RefTypesContract.ir/Arc4RefTypesContract.clear.0.clear.ssa.ir
rename to test_cases/arc4_types/out/Arc4RefTypesContract.ir/Arc4RefTypesContract.clear.0.ssa.ir
diff --git a/test_cases/arc4_types/out/Arc4RefTypesContract.ir/Arc4RefTypesContract.clear.1.clear.destructured.ir b/test_cases/arc4_types/out/Arc4RefTypesContract.ir/Arc4RefTypesContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4RefTypesContract.ir/Arc4RefTypesContract.clear.1.clear.destructured.ir
rename to test_cases/arc4_types/out/Arc4RefTypesContract.ir/Arc4RefTypesContract.clear.1.destructured.ir
diff --git a/test_cases/arc4_types/out/Arc4StringTypesContract.ir/Arc4StringTypesContract.approval.0.approval.ssa.ir b/test_cases/arc4_types/out/Arc4StringTypesContract.ir/Arc4StringTypesContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4StringTypesContract.ir/Arc4StringTypesContract.approval.0.approval.ssa.ir
rename to test_cases/arc4_types/out/Arc4StringTypesContract.ir/Arc4StringTypesContract.approval.0.ssa.ir
diff --git a/test_cases/arc4_types/out/Arc4StringTypesContract.ir/Arc4StringTypesContract.approval.1.approval.ssa.opt.ir b/test_cases/arc4_types/out/Arc4StringTypesContract.ir/Arc4StringTypesContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4StringTypesContract.ir/Arc4StringTypesContract.approval.1.approval.ssa.opt.ir
rename to test_cases/arc4_types/out/Arc4StringTypesContract.ir/Arc4StringTypesContract.approval.1.ssa.opt.ir
diff --git a/test_cases/arc4_types/out/Arc4StringTypesContract.ir/Arc4StringTypesContract.approval.2.approval.destructured.ir b/test_cases/arc4_types/out/Arc4StringTypesContract.ir/Arc4StringTypesContract.approval.2.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4StringTypesContract.ir/Arc4StringTypesContract.approval.2.approval.destructured.ir
rename to test_cases/arc4_types/out/Arc4StringTypesContract.ir/Arc4StringTypesContract.approval.2.destructured.ir
diff --git a/test_cases/arc4_types/out/Arc4StringTypesContract.ir/Arc4StringTypesContract.clear.0.clear.ssa.ir b/test_cases/arc4_types/out/Arc4StringTypesContract.ir/Arc4StringTypesContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4StringTypesContract.ir/Arc4StringTypesContract.clear.0.clear.ssa.ir
rename to test_cases/arc4_types/out/Arc4StringTypesContract.ir/Arc4StringTypesContract.clear.0.ssa.ir
diff --git a/test_cases/arc4_types/out/Arc4StringTypesContract.ir/Arc4StringTypesContract.clear.1.clear.destructured.ir b/test_cases/arc4_types/out/Arc4StringTypesContract.ir/Arc4StringTypesContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4StringTypesContract.ir/Arc4StringTypesContract.clear.1.clear.destructured.ir
rename to test_cases/arc4_types/out/Arc4StringTypesContract.ir/Arc4StringTypesContract.clear.1.destructured.ir
diff --git a/test_cases/arc4_types/out/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.approval.0.approval.ssa.ir b/test_cases/arc4_types/out/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.approval.0.ssa.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.approval.0.approval.ssa.ir
rename to test_cases/arc4_types/out/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.approval.0.ssa.ir
diff --git a/test_cases/arc4_types/out/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.approval.1.approval.ssa.opt.ir b/test_cases/arc4_types/out/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.approval.1.approval.ssa.opt.ir
rename to test_cases/arc4_types/out/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.approval.1.ssa.opt.ir
diff --git a/test_cases/arc4_types/out/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.approval.2.approval.destructured.ir b/test_cases/arc4_types/out/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.approval.2.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.approval.2.approval.destructured.ir
rename to test_cases/arc4_types/out/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.approval.2.destructured.ir
diff --git a/test_cases/arc4_types/out/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.clear.0.clear.ssa.ir b/test_cases/arc4_types/out/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.clear.0.ssa.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.clear.0.clear.ssa.ir
rename to test_cases/arc4_types/out/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.clear.0.ssa.ir
diff --git a/test_cases/arc4_types/out/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.clear.1.clear.destructured.ir b/test_cases/arc4_types/out/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.clear.1.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.clear.1.clear.destructured.ir
rename to test_cases/arc4_types/out/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.clear.1.destructured.ir
diff --git a/test_cases/arc4_types/out/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.approval.0.approval.ssa.ir b/test_cases/arc4_types/out/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.approval.0.approval.ssa.ir
rename to test_cases/arc4_types/out/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.approval.0.ssa.ir
diff --git a/test_cases/arc4_types/out/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.approval.1.approval.ssa.opt.ir b/test_cases/arc4_types/out/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.approval.1.approval.ssa.opt.ir
rename to test_cases/arc4_types/out/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.approval.1.ssa.opt.ir
diff --git a/test_cases/arc4_types/out/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.approval.2.approval.ssa.opt.ir b/test_cases/arc4_types/out/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.approval.2.approval.ssa.opt.ir
rename to test_cases/arc4_types/out/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.approval.2.ssa.opt.ir
diff --git a/test_cases/arc4_types/out/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.approval.3.approval.destructured.ir b/test_cases/arc4_types/out/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.approval.3.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.approval.3.approval.destructured.ir
rename to test_cases/arc4_types/out/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.approval.3.destructured.ir
diff --git a/test_cases/arc4_types/out/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.clear.0.clear.ssa.ir b/test_cases/arc4_types/out/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.clear.0.clear.ssa.ir
rename to test_cases/arc4_types/out/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.clear.0.ssa.ir
diff --git a/test_cases/arc4_types/out/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.clear.1.clear.destructured.ir b/test_cases/arc4_types/out/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.clear.1.clear.destructured.ir
rename to test_cases/arc4_types/out/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.clear.1.destructured.ir
diff --git a/test_cases/arc4_types/out/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.approval.0.approval.ssa.ir b/test_cases/arc4_types/out/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.approval.0.approval.ssa.ir
rename to test_cases/arc4_types/out/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.approval.0.ssa.ir
diff --git a/test_cases/arc4_types/out/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.approval.1.approval.ssa.opt.ir b/test_cases/arc4_types/out/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.approval.1.approval.ssa.opt.ir
rename to test_cases/arc4_types/out/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.approval.1.ssa.opt.ir
diff --git a/test_cases/arc4_types/out/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.approval.2.approval.ssa.opt.ir b/test_cases/arc4_types/out/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.approval.2.approval.ssa.opt.ir
rename to test_cases/arc4_types/out/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.approval.2.ssa.opt.ir
diff --git a/test_cases/arc4_types/out/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.approval.3.approval.destructured.ir b/test_cases/arc4_types/out/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.approval.3.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.approval.3.approval.destructured.ir
rename to test_cases/arc4_types/out/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.approval.3.destructured.ir
diff --git a/test_cases/arc4_types/out/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.clear.0.clear.ssa.ir b/test_cases/arc4_types/out/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.clear.0.clear.ssa.ir
rename to test_cases/arc4_types/out/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.clear.0.ssa.ir
diff --git a/test_cases/arc4_types/out/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.clear.1.clear.destructured.ir b/test_cases/arc4_types/out/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.clear.1.clear.destructured.ir
rename to test_cases/arc4_types/out/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.clear.1.destructured.ir
diff --git a/test_cases/arc4_types/out/MutableParams2.ir/MutableParams2.approval.0.approval.ssa.ir b/test_cases/arc4_types/out/MutableParams2.ir/MutableParams2.approval.0.ssa.ir
similarity index 100%
rename from test_cases/arc4_types/out/MutableParams2.ir/MutableParams2.approval.0.approval.ssa.ir
rename to test_cases/arc4_types/out/MutableParams2.ir/MutableParams2.approval.0.ssa.ir
diff --git a/test_cases/arc4_types/out/MutableParams2.ir/MutableParams2.approval.1.approval.ssa.opt.ir b/test_cases/arc4_types/out/MutableParams2.ir/MutableParams2.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/arc4_types/out/MutableParams2.ir/MutableParams2.approval.1.approval.ssa.opt.ir
rename to test_cases/arc4_types/out/MutableParams2.ir/MutableParams2.approval.1.ssa.opt.ir
diff --git a/test_cases/arc4_types/out/MutableParams2.ir/MutableParams2.approval.2.approval.ssa.opt.ir b/test_cases/arc4_types/out/MutableParams2.ir/MutableParams2.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/arc4_types/out/MutableParams2.ir/MutableParams2.approval.2.approval.ssa.opt.ir
rename to test_cases/arc4_types/out/MutableParams2.ir/MutableParams2.approval.2.ssa.opt.ir
diff --git a/test_cases/arc4_types/out/MutableParams2.ir/MutableParams2.approval.3.approval.destructured.ir b/test_cases/arc4_types/out/MutableParams2.ir/MutableParams2.approval.3.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out/MutableParams2.ir/MutableParams2.approval.3.approval.destructured.ir
rename to test_cases/arc4_types/out/MutableParams2.ir/MutableParams2.approval.3.destructured.ir
diff --git a/test_cases/arc4_types/out/MutableParams2.ir/MutableParams2.clear.0.clear.ssa.ir b/test_cases/arc4_types/out/MutableParams2.ir/MutableParams2.clear.0.ssa.ir
similarity index 100%
rename from test_cases/arc4_types/out/MutableParams2.ir/MutableParams2.clear.0.clear.ssa.ir
rename to test_cases/arc4_types/out/MutableParams2.ir/MutableParams2.clear.0.ssa.ir
diff --git a/test_cases/arc4_types/out/MutableParams2.ir/MutableParams2.clear.1.clear.destructured.ir b/test_cases/arc4_types/out/MutableParams2.ir/MutableParams2.clear.1.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out/MutableParams2.ir/MutableParams2.clear.1.clear.destructured.ir
rename to test_cases/arc4_types/out/MutableParams2.ir/MutableParams2.clear.1.destructured.ir
diff --git a/test_cases/arc4_types/out_O2/Arc4AddressContract.ir/Arc4AddressContract.approval.0.approval.destructured.ir b/test_cases/arc4_types/out_O2/Arc4AddressContract.ir/Arc4AddressContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_O2/Arc4AddressContract.ir/Arc4AddressContract.approval.0.approval.destructured.ir
rename to test_cases/arc4_types/out_O2/Arc4AddressContract.ir/Arc4AddressContract.approval.0.destructured.ir
diff --git a/test_cases/arc4_types/out_O2/Arc4AddressContract.ir/Arc4AddressContract.clear.0.clear.destructured.ir b/test_cases/arc4_types/out_O2/Arc4AddressContract.ir/Arc4AddressContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_O2/Arc4AddressContract.ir/Arc4AddressContract.clear.0.clear.destructured.ir
rename to test_cases/arc4_types/out_O2/Arc4AddressContract.ir/Arc4AddressContract.clear.0.destructured.ir
diff --git a/test_cases/arc4_types/out_O2/Arc4ArraysContract.ir/Arc4ArraysContract.approval.0.approval.destructured.ir b/test_cases/arc4_types/out_O2/Arc4ArraysContract.ir/Arc4ArraysContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_O2/Arc4ArraysContract.ir/Arc4ArraysContract.approval.0.approval.destructured.ir
rename to test_cases/arc4_types/out_O2/Arc4ArraysContract.ir/Arc4ArraysContract.approval.0.destructured.ir
diff --git a/test_cases/arc4_types/out_O2/Arc4ArraysContract.ir/Arc4ArraysContract.clear.0.clear.destructured.ir b/test_cases/arc4_types/out_O2/Arc4ArraysContract.ir/Arc4ArraysContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_O2/Arc4ArraysContract.ir/Arc4ArraysContract.clear.0.clear.destructured.ir
rename to test_cases/arc4_types/out_O2/Arc4ArraysContract.ir/Arc4ArraysContract.clear.0.destructured.ir
diff --git a/test_cases/arc4_types/out_O2/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.approval.0.approval.destructured.ir b/test_cases/arc4_types/out_O2/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_O2/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.approval.0.approval.destructured.ir
rename to test_cases/arc4_types/out_O2/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.approval.0.destructured.ir
diff --git a/test_cases/arc4_types/out_O2/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.clear.0.clear.destructured.ir b/test_cases/arc4_types/out_O2/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_O2/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.clear.0.clear.destructured.ir
rename to test_cases/arc4_types/out_O2/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.clear.0.destructured.ir
diff --git a/test_cases/arc4_types/out_O2/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.approval.0.approval.destructured.ir b/test_cases/arc4_types/out_O2/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_O2/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.approval.0.approval.destructured.ir
rename to test_cases/arc4_types/out_O2/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.approval.0.destructured.ir
diff --git a/test_cases/arc4_types/out_O2/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.clear.0.clear.destructured.ir b/test_cases/arc4_types/out_O2/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_O2/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.clear.0.clear.destructured.ir
rename to test_cases/arc4_types/out_O2/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.clear.0.destructured.ir
diff --git a/test_cases/arc4_types/out_O2/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.approval.0.approval.destructured.ir b/test_cases/arc4_types/out_O2/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_O2/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.approval.0.approval.destructured.ir
rename to test_cases/arc4_types/out_O2/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.approval.0.destructured.ir
diff --git a/test_cases/arc4_types/out_O2/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.clear.0.clear.destructured.ir b/test_cases/arc4_types/out_O2/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_O2/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.clear.0.clear.destructured.ir
rename to test_cases/arc4_types/out_O2/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.clear.0.destructured.ir
diff --git a/test_cases/arc4_types/out_O2/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.approval.0.approval.destructured.ir b/test_cases/arc4_types/out_O2/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_O2/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.approval.0.approval.destructured.ir
rename to test_cases/arc4_types/out_O2/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.approval.0.destructured.ir
diff --git a/test_cases/arc4_types/out_O2/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.clear.0.clear.destructured.ir b/test_cases/arc4_types/out_O2/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_O2/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.clear.0.clear.destructured.ir
rename to test_cases/arc4_types/out_O2/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.clear.0.destructured.ir
diff --git a/test_cases/arc4_types/out_O2/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.approval.0.approval.destructured.ir b/test_cases/arc4_types/out_O2/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_O2/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.approval.0.approval.destructured.ir
rename to test_cases/arc4_types/out_O2/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.approval.0.destructured.ir
diff --git a/test_cases/arc4_types/out_O2/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.clear.0.clear.destructured.ir b/test_cases/arc4_types/out_O2/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_O2/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.clear.0.clear.destructured.ir
rename to test_cases/arc4_types/out_O2/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.clear.0.destructured.ir
diff --git a/test_cases/arc4_types/out_O2/Arc4MutationContract.ir/Arc4MutationContract.approval.0.approval.destructured.ir b/test_cases/arc4_types/out_O2/Arc4MutationContract.ir/Arc4MutationContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_O2/Arc4MutationContract.ir/Arc4MutationContract.approval.0.approval.destructured.ir
rename to test_cases/arc4_types/out_O2/Arc4MutationContract.ir/Arc4MutationContract.approval.0.destructured.ir
diff --git a/test_cases/arc4_types/out_O2/Arc4MutationContract.ir/Arc4MutationContract.clear.0.clear.destructured.ir b/test_cases/arc4_types/out_O2/Arc4MutationContract.ir/Arc4MutationContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_O2/Arc4MutationContract.ir/Arc4MutationContract.clear.0.clear.destructured.ir
rename to test_cases/arc4_types/out_O2/Arc4MutationContract.ir/Arc4MutationContract.clear.0.destructured.ir
diff --git a/test_cases/arc4_types/out_O2/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.approval.0.approval.destructured.ir b/test_cases/arc4_types/out_O2/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_O2/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.approval.0.approval.destructured.ir
rename to test_cases/arc4_types/out_O2/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.approval.0.destructured.ir
diff --git a/test_cases/arc4_types/out_O2/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.clear.0.clear.destructured.ir b/test_cases/arc4_types/out_O2/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_O2/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.clear.0.clear.destructured.ir
rename to test_cases/arc4_types/out_O2/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.clear.0.destructured.ir
diff --git a/test_cases/arc4_types/out_O2/Arc4RefTypesContract.ir/Arc4RefTypesContract.approval.0.approval.destructured.ir b/test_cases/arc4_types/out_O2/Arc4RefTypesContract.ir/Arc4RefTypesContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_O2/Arc4RefTypesContract.ir/Arc4RefTypesContract.approval.0.approval.destructured.ir
rename to test_cases/arc4_types/out_O2/Arc4RefTypesContract.ir/Arc4RefTypesContract.approval.0.destructured.ir
diff --git a/test_cases/arc4_types/out_O2/Arc4RefTypesContract.ir/Arc4RefTypesContract.clear.0.clear.destructured.ir b/test_cases/arc4_types/out_O2/Arc4RefTypesContract.ir/Arc4RefTypesContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_O2/Arc4RefTypesContract.ir/Arc4RefTypesContract.clear.0.clear.destructured.ir
rename to test_cases/arc4_types/out_O2/Arc4RefTypesContract.ir/Arc4RefTypesContract.clear.0.destructured.ir
diff --git a/test_cases/arc4_types/out_O2/Arc4StringTypesContract.ir/Arc4StringTypesContract.approval.0.approval.destructured.ir b/test_cases/arc4_types/out_O2/Arc4StringTypesContract.ir/Arc4StringTypesContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_O2/Arc4StringTypesContract.ir/Arc4StringTypesContract.approval.0.approval.destructured.ir
rename to test_cases/arc4_types/out_O2/Arc4StringTypesContract.ir/Arc4StringTypesContract.approval.0.destructured.ir
diff --git a/test_cases/arc4_types/out_O2/Arc4StringTypesContract.ir/Arc4StringTypesContract.clear.0.clear.destructured.ir b/test_cases/arc4_types/out_O2/Arc4StringTypesContract.ir/Arc4StringTypesContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_O2/Arc4StringTypesContract.ir/Arc4StringTypesContract.clear.0.clear.destructured.ir
rename to test_cases/arc4_types/out_O2/Arc4StringTypesContract.ir/Arc4StringTypesContract.clear.0.destructured.ir
diff --git a/test_cases/arc4_types/out_O2/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.approval.0.approval.destructured.ir b/test_cases/arc4_types/out_O2/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.approval.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_O2/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.approval.0.approval.destructured.ir
rename to test_cases/arc4_types/out_O2/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.approval.0.destructured.ir
diff --git a/test_cases/arc4_types/out_O2/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.clear.0.clear.destructured.ir b/test_cases/arc4_types/out_O2/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.clear.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_O2/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.clear.0.clear.destructured.ir
rename to test_cases/arc4_types/out_O2/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.clear.0.destructured.ir
diff --git a/test_cases/arc4_types/out_O2/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.approval.0.approval.destructured.ir b/test_cases/arc4_types/out_O2/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_O2/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.approval.0.approval.destructured.ir
rename to test_cases/arc4_types/out_O2/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.approval.0.destructured.ir
diff --git a/test_cases/arc4_types/out_O2/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.clear.0.clear.destructured.ir b/test_cases/arc4_types/out_O2/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_O2/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.clear.0.clear.destructured.ir
rename to test_cases/arc4_types/out_O2/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.clear.0.destructured.ir
diff --git a/test_cases/arc4_types/out_O2/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.approval.0.approval.destructured.ir b/test_cases/arc4_types/out_O2/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_O2/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.approval.0.approval.destructured.ir
rename to test_cases/arc4_types/out_O2/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.approval.0.destructured.ir
diff --git a/test_cases/arc4_types/out_O2/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.clear.0.clear.destructured.ir b/test_cases/arc4_types/out_O2/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_O2/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.clear.0.clear.destructured.ir
rename to test_cases/arc4_types/out_O2/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.clear.0.destructured.ir
diff --git a/test_cases/arc4_types/out_O2/MutableParams2.ir/MutableParams2.approval.0.approval.destructured.ir b/test_cases/arc4_types/out_O2/MutableParams2.ir/MutableParams2.approval.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_O2/MutableParams2.ir/MutableParams2.approval.0.approval.destructured.ir
rename to test_cases/arc4_types/out_O2/MutableParams2.ir/MutableParams2.approval.0.destructured.ir
diff --git a/test_cases/arc4_types/out_O2/MutableParams2.ir/MutableParams2.clear.0.clear.destructured.ir b/test_cases/arc4_types/out_O2/MutableParams2.ir/MutableParams2.clear.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_O2/MutableParams2.ir/MutableParams2.clear.0.clear.destructured.ir
rename to test_cases/arc4_types/out_O2/MutableParams2.ir/MutableParams2.clear.0.destructured.ir
diff --git a/test_cases/arc4_types/out_unoptimized/Arc4AddressContract.ir/Arc4AddressContract.approval.0.approval.destructured.ir b/test_cases/arc4_types/out_unoptimized/Arc4AddressContract.ir/Arc4AddressContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_unoptimized/Arc4AddressContract.ir/Arc4AddressContract.approval.0.approval.destructured.ir
rename to test_cases/arc4_types/out_unoptimized/Arc4AddressContract.ir/Arc4AddressContract.approval.0.destructured.ir
diff --git a/test_cases/arc4_types/out_unoptimized/Arc4AddressContract.ir/Arc4AddressContract.clear.0.clear.destructured.ir b/test_cases/arc4_types/out_unoptimized/Arc4AddressContract.ir/Arc4AddressContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_unoptimized/Arc4AddressContract.ir/Arc4AddressContract.clear.0.clear.destructured.ir
rename to test_cases/arc4_types/out_unoptimized/Arc4AddressContract.ir/Arc4AddressContract.clear.0.destructured.ir
diff --git a/test_cases/arc4_types/out_unoptimized/Arc4ArraysContract.ir/Arc4ArraysContract.approval.0.approval.destructured.ir b/test_cases/arc4_types/out_unoptimized/Arc4ArraysContract.ir/Arc4ArraysContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_unoptimized/Arc4ArraysContract.ir/Arc4ArraysContract.approval.0.approval.destructured.ir
rename to test_cases/arc4_types/out_unoptimized/Arc4ArraysContract.ir/Arc4ArraysContract.approval.0.destructured.ir
diff --git a/test_cases/arc4_types/out_unoptimized/Arc4ArraysContract.ir/Arc4ArraysContract.clear.0.clear.destructured.ir b/test_cases/arc4_types/out_unoptimized/Arc4ArraysContract.ir/Arc4ArraysContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_unoptimized/Arc4ArraysContract.ir/Arc4ArraysContract.clear.0.clear.destructured.ir
rename to test_cases/arc4_types/out_unoptimized/Arc4ArraysContract.ir/Arc4ArraysContract.clear.0.destructured.ir
diff --git a/test_cases/arc4_types/out_unoptimized/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.approval.0.approval.destructured.ir b/test_cases/arc4_types/out_unoptimized/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_unoptimized/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.approval.0.approval.destructured.ir
rename to test_cases/arc4_types/out_unoptimized/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.approval.0.destructured.ir
diff --git a/test_cases/arc4_types/out_unoptimized/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.clear.0.clear.destructured.ir b/test_cases/arc4_types/out_unoptimized/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_unoptimized/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.clear.0.clear.destructured.ir
rename to test_cases/arc4_types/out_unoptimized/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.clear.0.destructured.ir
diff --git a/test_cases/arc4_types/out_unoptimized/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.approval.0.approval.destructured.ir b/test_cases/arc4_types/out_unoptimized/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_unoptimized/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.approval.0.approval.destructured.ir
rename to test_cases/arc4_types/out_unoptimized/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.approval.0.destructured.ir
diff --git a/test_cases/arc4_types/out_unoptimized/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.clear.0.clear.destructured.ir b/test_cases/arc4_types/out_unoptimized/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_unoptimized/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.clear.0.clear.destructured.ir
rename to test_cases/arc4_types/out_unoptimized/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.clear.0.destructured.ir
diff --git a/test_cases/arc4_types/out_unoptimized/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.approval.0.approval.destructured.ir b/test_cases/arc4_types/out_unoptimized/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_unoptimized/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.approval.0.approval.destructured.ir
rename to test_cases/arc4_types/out_unoptimized/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.approval.0.destructured.ir
diff --git a/test_cases/arc4_types/out_unoptimized/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.clear.0.clear.destructured.ir b/test_cases/arc4_types/out_unoptimized/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_unoptimized/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.clear.0.clear.destructured.ir
rename to test_cases/arc4_types/out_unoptimized/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.clear.0.destructured.ir
diff --git a/test_cases/arc4_types/out_unoptimized/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.approval.0.approval.destructured.ir b/test_cases/arc4_types/out_unoptimized/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_unoptimized/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.approval.0.approval.destructured.ir
rename to test_cases/arc4_types/out_unoptimized/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.approval.0.destructured.ir
diff --git a/test_cases/arc4_types/out_unoptimized/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.clear.0.clear.destructured.ir b/test_cases/arc4_types/out_unoptimized/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_unoptimized/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.clear.0.clear.destructured.ir
rename to test_cases/arc4_types/out_unoptimized/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.clear.0.destructured.ir
diff --git a/test_cases/arc4_types/out_unoptimized/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.approval.0.approval.destructured.ir b/test_cases/arc4_types/out_unoptimized/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_unoptimized/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.approval.0.approval.destructured.ir
rename to test_cases/arc4_types/out_unoptimized/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.approval.0.destructured.ir
diff --git a/test_cases/arc4_types/out_unoptimized/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.clear.0.clear.destructured.ir b/test_cases/arc4_types/out_unoptimized/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_unoptimized/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.clear.0.clear.destructured.ir
rename to test_cases/arc4_types/out_unoptimized/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.clear.0.destructured.ir
diff --git a/test_cases/arc4_types/out_unoptimized/Arc4MutationContract.ir/Arc4MutationContract.approval.0.approval.destructured.ir b/test_cases/arc4_types/out_unoptimized/Arc4MutationContract.ir/Arc4MutationContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_unoptimized/Arc4MutationContract.ir/Arc4MutationContract.approval.0.approval.destructured.ir
rename to test_cases/arc4_types/out_unoptimized/Arc4MutationContract.ir/Arc4MutationContract.approval.0.destructured.ir
diff --git a/test_cases/arc4_types/out_unoptimized/Arc4MutationContract.ir/Arc4MutationContract.clear.0.clear.destructured.ir b/test_cases/arc4_types/out_unoptimized/Arc4MutationContract.ir/Arc4MutationContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_unoptimized/Arc4MutationContract.ir/Arc4MutationContract.clear.0.clear.destructured.ir
rename to test_cases/arc4_types/out_unoptimized/Arc4MutationContract.ir/Arc4MutationContract.clear.0.destructured.ir
diff --git a/test_cases/arc4_types/out_unoptimized/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.approval.0.approval.destructured.ir b/test_cases/arc4_types/out_unoptimized/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_unoptimized/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.approval.0.approval.destructured.ir
rename to test_cases/arc4_types/out_unoptimized/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.approval.0.destructured.ir
diff --git a/test_cases/arc4_types/out_unoptimized/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.clear.0.clear.destructured.ir b/test_cases/arc4_types/out_unoptimized/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_unoptimized/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.clear.0.clear.destructured.ir
rename to test_cases/arc4_types/out_unoptimized/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.clear.0.destructured.ir
diff --git a/test_cases/arc4_types/out_unoptimized/Arc4RefTypesContract.ir/Arc4RefTypesContract.approval.0.approval.destructured.ir b/test_cases/arc4_types/out_unoptimized/Arc4RefTypesContract.ir/Arc4RefTypesContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_unoptimized/Arc4RefTypesContract.ir/Arc4RefTypesContract.approval.0.approval.destructured.ir
rename to test_cases/arc4_types/out_unoptimized/Arc4RefTypesContract.ir/Arc4RefTypesContract.approval.0.destructured.ir
diff --git a/test_cases/arc4_types/out_unoptimized/Arc4RefTypesContract.ir/Arc4RefTypesContract.clear.0.clear.destructured.ir b/test_cases/arc4_types/out_unoptimized/Arc4RefTypesContract.ir/Arc4RefTypesContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_unoptimized/Arc4RefTypesContract.ir/Arc4RefTypesContract.clear.0.clear.destructured.ir
rename to test_cases/arc4_types/out_unoptimized/Arc4RefTypesContract.ir/Arc4RefTypesContract.clear.0.destructured.ir
diff --git a/test_cases/arc4_types/out_unoptimized/Arc4StringTypesContract.ir/Arc4StringTypesContract.approval.0.approval.destructured.ir b/test_cases/arc4_types/out_unoptimized/Arc4StringTypesContract.ir/Arc4StringTypesContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_unoptimized/Arc4StringTypesContract.ir/Arc4StringTypesContract.approval.0.approval.destructured.ir
rename to test_cases/arc4_types/out_unoptimized/Arc4StringTypesContract.ir/Arc4StringTypesContract.approval.0.destructured.ir
diff --git a/test_cases/arc4_types/out_unoptimized/Arc4StringTypesContract.ir/Arc4StringTypesContract.clear.0.clear.destructured.ir b/test_cases/arc4_types/out_unoptimized/Arc4StringTypesContract.ir/Arc4StringTypesContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_unoptimized/Arc4StringTypesContract.ir/Arc4StringTypesContract.clear.0.clear.destructured.ir
rename to test_cases/arc4_types/out_unoptimized/Arc4StringTypesContract.ir/Arc4StringTypesContract.clear.0.destructured.ir
diff --git a/test_cases/arc4_types/out_unoptimized/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.approval.0.approval.destructured.ir b/test_cases/arc4_types/out_unoptimized/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.approval.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_unoptimized/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.approval.0.approval.destructured.ir
rename to test_cases/arc4_types/out_unoptimized/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.approval.0.destructured.ir
diff --git a/test_cases/arc4_types/out_unoptimized/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.clear.0.clear.destructured.ir b/test_cases/arc4_types/out_unoptimized/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.clear.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_unoptimized/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.clear.0.clear.destructured.ir
rename to test_cases/arc4_types/out_unoptimized/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.clear.0.destructured.ir
diff --git a/test_cases/arc4_types/out_unoptimized/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.approval.0.approval.destructured.ir b/test_cases/arc4_types/out_unoptimized/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_unoptimized/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.approval.0.approval.destructured.ir
rename to test_cases/arc4_types/out_unoptimized/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.approval.0.destructured.ir
diff --git a/test_cases/arc4_types/out_unoptimized/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.clear.0.clear.destructured.ir b/test_cases/arc4_types/out_unoptimized/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_unoptimized/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.clear.0.clear.destructured.ir
rename to test_cases/arc4_types/out_unoptimized/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.clear.0.destructured.ir
diff --git a/test_cases/arc4_types/out_unoptimized/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.approval.0.approval.destructured.ir b/test_cases/arc4_types/out_unoptimized/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_unoptimized/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.approval.0.approval.destructured.ir
rename to test_cases/arc4_types/out_unoptimized/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.approval.0.destructured.ir
diff --git a/test_cases/arc4_types/out_unoptimized/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.clear.0.clear.destructured.ir b/test_cases/arc4_types/out_unoptimized/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_unoptimized/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.clear.0.clear.destructured.ir
rename to test_cases/arc4_types/out_unoptimized/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.clear.0.destructured.ir
diff --git a/test_cases/arc4_types/out_unoptimized/MutableParams2.ir/MutableParams2.approval.0.approval.destructured.ir b/test_cases/arc4_types/out_unoptimized/MutableParams2.ir/MutableParams2.approval.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_unoptimized/MutableParams2.ir/MutableParams2.approval.0.approval.destructured.ir
rename to test_cases/arc4_types/out_unoptimized/MutableParams2.ir/MutableParams2.approval.0.destructured.ir
diff --git a/test_cases/arc4_types/out_unoptimized/MutableParams2.ir/MutableParams2.clear.0.clear.destructured.ir b/test_cases/arc4_types/out_unoptimized/MutableParams2.ir/MutableParams2.clear.0.destructured.ir
similarity index 100%
rename from test_cases/arc4_types/out_unoptimized/MutableParams2.ir/MutableParams2.clear.0.clear.destructured.ir
rename to test_cases/arc4_types/out_unoptimized/MutableParams2.ir/MutableParams2.clear.0.destructured.ir
diff --git a/test_cases/arc4_types/puya.log b/test_cases/arc4_types/puya.log
index 31ae206102..5d17ff558b 100644
--- a/test_cases/arc4_types/puya.log
+++ b/test_cases/arc4_types/puya.log
@@ -2411,7 +2411,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to arc4_types/out/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.approval.0.approval.ssa.ir
+debug: Output IR to arc4_types/out/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.arc4_types.tuples.Arc4TuplesTypeContract at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.arc4_types.tuples.Arc4TuplesTypeContract.test_stuff for inlining
@@ -3071,7 +3071,7 @@ debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.arc4_types.tuples.Arc4TuplesTypeContract.test_stuff
 debug: removing unused subroutine test_cases.arc4_types.tuples.Arc4TuplesTypeContract.test_copy
-debug: Output IR to arc4_types/out/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to arc4_types/out/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.arc4_types.tuples.Arc4TuplesTypeContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -3095,7 +3095,7 @@ debug: Merged linear block@13 into block@0
 debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to arc4_types/out/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.approval.2.approval.ssa.opt.ir
+debug: Output IR to arc4_types/out/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.arc4_types.tuples.Arc4TuplesTypeContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -3120,8 +3120,8 @@ debug: Coalescing local variables in test_cases.arc4_types.tuples.Arc4TuplesType
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.tuples.Arc4TuplesTypeContract.approval_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to arc4_types/out/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.approval.3.approval.destructured.ir
-debug: Output IR to arc4_types/out/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.clear.0.clear.ssa.ir
+debug: Output IR to arc4_types/out/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.approval.3.destructured.ir
+debug: Output IR to arc4_types/out/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.arc4_types.tuples.Arc4TuplesTypeContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.tuples.Arc4TuplesTypeContract.clear_state_program
@@ -3147,10 +3147,10 @@ debug: Coalescing local variables in test_cases.arc4_types.tuples.Arc4TuplesType
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.tuples.Arc4TuplesTypeContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to arc4_types/out/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.clear.1.clear.destructured.ir
+debug: Output IR to arc4_types/out/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.clear.1.destructured.ir
 arc4_types/tuples.py:14 debug: optimizing TEAL subroutine test_cases.arc4_types.tuples.Arc4TuplesTypeContract.approval_program() -> uint64:
 arc4_types/tuples.py:53 debug: optimizing TEAL subroutine test_cases.arc4_types.tuples.Arc4TuplesTypeContract.clear_state_program() -> uint64:
-debug: Output IR to arc4_types/out/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.approval.0.approval.ssa.ir
+debug: Output IR to arc4_types/out/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.arc4_types.structs.Arc4StructsTypeContract at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.arc4_types.structs.add for inlining
@@ -3446,7 +3446,7 @@ debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.arc4_types.structs.add
 debug: removing unused subroutine test_cases.arc4_types.structs.check
 debug: removing unused subroutine test_cases.arc4_types.structs.nested_decode
-debug: Output IR to arc4_types/out/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to arc4_types/out/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking simple function test_cases.arc4_types.structs.add_decimal for inlining (complexity=4 <= threshold=4)
 debug: Optimizing subroutine test_cases.arc4_types.structs.Arc4StructsTypeContract.approval_program
@@ -3515,7 +3515,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.arc4_types.structs.add_decimal
-debug: Output IR to arc4_types/out/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.approval.2.approval.ssa.opt.ir
+debug: Output IR to arc4_types/out/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.arc4_types.structs.Arc4StructsTypeContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -3562,8 +3562,8 @@ debug: * avail val#2
 debug: * to_do val#0
 debug: * to_do loop_counter%0#0
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to arc4_types/out/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.approval.3.approval.destructured.ir
-debug: Output IR to arc4_types/out/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.clear.0.clear.ssa.ir
+debug: Output IR to arc4_types/out/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.approval.3.destructured.ir
+debug: Output IR to arc4_types/out/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.arc4_types.structs.Arc4StructsTypeContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.structs.Arc4StructsTypeContract.clear_state_program
@@ -3589,7 +3589,7 @@ debug: Coalescing local variables in test_cases.arc4_types.structs.Arc4StructsTy
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.structs.Arc4StructsTypeContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to arc4_types/out/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.clear.1.clear.destructured.ir
+debug: Output IR to arc4_types/out/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.clear.1.destructured.ir
 debug: Found 2 edge set/s for test_cases.arc4_types.structs.Arc4StructsTypeContract.approval_program
 debug: Allocated 1 variable/s to x-stack: val#0
 debug: shared x-stack for main -> main_for_body@1: val#0
@@ -3600,7 +3600,7 @@ arc4_types/structs.py:35 debug: optimizing TEAL subroutine test_cases.arc4_types
 debug: inlining single reference block main_for_header_1@3 into main_for_body@1
 debug: removing explicit jump to fall-through block main_for_body@1
 arc4_types/structs.py:60 debug: optimizing TEAL subroutine test_cases.arc4_types.structs.Arc4StructsTypeContract.clear_state_program() -> uint64:
-debug: Output IR to arc4_types/out/Arc4StringTypesContract.ir/Arc4StringTypesContract.approval.0.approval.ssa.ir
+debug: Output IR to arc4_types/out/Arc4StringTypesContract.ir/Arc4StringTypesContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.arc4_types.string.Arc4StringTypesContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.string.Arc4StringTypesContract.approval_program
@@ -3771,7 +3771,7 @@ debug: Optimizer: Remove Linear Jump
 debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to arc4_types/out/Arc4StringTypesContract.ir/Arc4StringTypesContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to arc4_types/out/Arc4StringTypesContract.ir/Arc4StringTypesContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.arc4_types.string.Arc4StringTypesContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -3797,8 +3797,8 @@ debug: Coalescing ternary_result%0#0 with [ternary_result%0#5, ternary_result%0#
 debug: Coalescing resulted in 7 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.string.Arc4StringTypesContract.approval_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to arc4_types/out/Arc4StringTypesContract.ir/Arc4StringTypesContract.approval.2.approval.destructured.ir
-debug: Output IR to arc4_types/out/Arc4StringTypesContract.ir/Arc4StringTypesContract.clear.0.clear.ssa.ir
+debug: Output IR to arc4_types/out/Arc4StringTypesContract.ir/Arc4StringTypesContract.approval.2.destructured.ir
+debug: Output IR to arc4_types/out/Arc4StringTypesContract.ir/Arc4StringTypesContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.arc4_types.string.Arc4StringTypesContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.string.Arc4StringTypesContract.clear_state_program
@@ -3824,7 +3824,7 @@ debug: Coalescing local variables in test_cases.arc4_types.string.Arc4StringType
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.string.Arc4StringTypesContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to arc4_types/out/Arc4StringTypesContract.ir/Arc4StringTypesContract.clear.1.clear.destructured.ir
+debug: Output IR to arc4_types/out/Arc4StringTypesContract.ir/Arc4StringTypesContract.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%11#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%11#0' with 'l-load tmp%11#0'
 debug: Inserted main_ternary_merge@3.ops[3]: 'l-store-copy tmp%13#0 0'
@@ -3837,7 +3837,7 @@ arc4_types/string.py:7 debug: optimizing TEAL subroutine test_cases.arc4_types.s
 debug: inlining single reference block main_ternary_true@1 into main
 debug: removing explicit jump to fall-through block main_ternary_merge@3
 arc4_types/string.py:44 debug: optimizing TEAL subroutine test_cases.arc4_types.string.Arc4StringTypesContract.clear_state_program() -> uint64:
-debug: Output IR to arc4_types/out/Arc4RefTypesContract.ir/Arc4RefTypesContract.approval.0.approval.ssa.ir
+debug: Output IR to arc4_types/out/Arc4RefTypesContract.ir/Arc4RefTypesContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.arc4_types.reference_types.Arc4RefTypesContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.reference_types.Arc4RefTypesContract.approval_program
@@ -3860,7 +3860,7 @@ debug: Optimizer: Remove Linear Jump
 debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to arc4_types/out/Arc4RefTypesContract.ir/Arc4RefTypesContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to arc4_types/out/Arc4RefTypesContract.ir/Arc4RefTypesContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.arc4_types.reference_types.Arc4RefTypesContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -3886,8 +3886,8 @@ debug: Coalescing and_result%0#0 with [and_result%0#5, and_result%0#1, and_resul
 debug: Coalescing resulted in 7 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.reference_types.Arc4RefTypesContract.approval_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to arc4_types/out/Arc4RefTypesContract.ir/Arc4RefTypesContract.approval.2.approval.destructured.ir
-debug: Output IR to arc4_types/out/Arc4RefTypesContract.ir/Arc4RefTypesContract.clear.0.clear.ssa.ir
+debug: Output IR to arc4_types/out/Arc4RefTypesContract.ir/Arc4RefTypesContract.approval.2.destructured.ir
+debug: Output IR to arc4_types/out/Arc4RefTypesContract.ir/Arc4RefTypesContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.arc4_types.reference_types.Arc4RefTypesContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.reference_types.Arc4RefTypesContract.clear_state_program
@@ -3913,7 +3913,7 @@ debug: Coalescing local variables in test_cases.arc4_types.reference_types.Arc4R
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.reference_types.Arc4RefTypesContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to arc4_types/out/Arc4RefTypesContract.ir/Arc4RefTypesContract.clear.1.clear.destructured.ir
+debug: Output IR to arc4_types/out/Arc4RefTypesContract.ir/Arc4RefTypesContract.clear.1.destructured.ir
 debug: Inserted main.ops[7]: 'l-store-copy tmp%1#0 0'
 debug: Replaced main.ops[9]: 'v-load tmp%1#0' with 'l-load tmp%1#0'
 debug: Inserted main.ops[12]: 'l-store-copy checked_address#0 0'
@@ -3945,7 +3945,7 @@ debug: inlining single reference block main_and_contd@1 into main
 debug: inlining single reference block main_bool_true@2 into main
 debug: removing explicit jump to fall-through block main_bool_merge@4
 arc4_types/reference_types.py:21 debug: optimizing TEAL subroutine test_cases.arc4_types.reference_types.Arc4RefTypesContract.clear_state_program() -> uint64:
-debug: Output IR to arc4_types/out/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.approval.0.approval.ssa.ir
+debug: Output IR to arc4_types/out/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.arc4_types.numeric.Arc4NumericTypesContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.numeric.Arc4NumericTypesContract.approval_program
@@ -4122,7 +4122,7 @@ debug: Optimizer: Remove Linear Jump
 debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to arc4_types/out/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to arc4_types/out/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.arc4_types.numeric.Arc4NumericTypesContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -4140,7 +4140,7 @@ debug: Optimizer: Remove Linear Jump
 debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to arc4_types/out/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.approval.2.approval.ssa.opt.ir
+debug: Output IR to arc4_types/out/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.arc4_types.numeric.Arc4NumericTypesContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -4165,8 +4165,8 @@ debug: Coalescing local variables in test_cases.arc4_types.numeric.Arc4NumericTy
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.numeric.Arc4NumericTypesContract.approval_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to arc4_types/out/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.approval.3.approval.destructured.ir
-debug: Output IR to arc4_types/out/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.clear.0.clear.ssa.ir
+debug: Output IR to arc4_types/out/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.approval.3.destructured.ir
+debug: Output IR to arc4_types/out/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.arc4_types.numeric.Arc4NumericTypesContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.numeric.Arc4NumericTypesContract.clear_state_program
@@ -4202,7 +4202,7 @@ debug: Optimizer: Remove Linear Jump
 debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to arc4_types/out/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.clear.1.clear.ssa.opt.ir
+debug: Output IR to arc4_types/out/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.clear.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.arc4_types.numeric.Arc4NumericTypesContract.clear_state_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -4227,7 +4227,7 @@ debug: Coalescing local variables in test_cases.arc4_types.numeric.Arc4NumericTy
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.numeric.Arc4NumericTypesContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to arc4_types/out/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.clear.2.clear.destructured.ir
+debug: Output IR to arc4_types/out/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.clear.2.destructured.ir
 debug: Inserted main.ops[6]: 'l-store-copy reinterpret_biguint%0#0 0'
 debug: Replaced main.ops[8]: 'v-load reinterpret_biguint%0#0' with 'l-load reinterpret_biguint%0#0'
 debug: Inserted main.ops[11]: 'l-store-copy tmp%18#0 0'
@@ -4248,7 +4248,7 @@ debug: Inserted main.ops[33]: 'l-store-copy tmp%43#0 0'
 debug: Replaced main.ops[37]: 'v-load tmp%43#0' with 'l-load tmp%43#0'
 arc4_types/numeric.py:30 debug: optimizing TEAL subroutine test_cases.arc4_types.numeric.Arc4NumericTypesContract.approval_program() -> uint64:
 arc4_types/numeric.py:113 debug: optimizing TEAL subroutine test_cases.arc4_types.numeric.Arc4NumericTypesContract.clear_state_program() -> uint64:
-debug: Output IR to arc4_types/out/Arc4MutationContract.ir/Arc4MutationContract.approval.0.approval.ssa.ir
+debug: Output IR to arc4_types/out/Arc4MutationContract.ir/Arc4MutationContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.arc4_types.mutation.Arc4MutationContract at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.arc4_types.mutation.Arc4MutationContract.dynamic_array_fixed_size for inlining
@@ -6897,7 +6897,7 @@ debug: removing unused subroutine test_cases.arc4_types.mutation.Arc4MutationCon
 debug: removing unused subroutine test_cases.arc4_types.mutation.Arc4MutationContract.struct_assign
 debug: removing unused subroutine test_cases.arc4_types.mutation.Arc4MutationContract.array_concat
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
-debug: Output IR to arc4_types/out/Arc4MutationContract.ir/Arc4MutationContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to arc4_types/out/Arc4MutationContract.ir/Arc4MutationContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking single-use function _puya_lib.arc4.dynamic_array_pop_fixed_size for inlining
 debug: Optimizing subroutine test_cases.arc4_types.mutation.Arc4MutationContract.approval_program
@@ -7051,7 +7051,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine _puya_lib.arc4.dynamic_array_pop_fixed_size
-debug: Output IR to arc4_types/out/Arc4MutationContract.ir/Arc4MutationContract.approval.2.approval.ssa.opt.ir
+debug: Output IR to arc4_types/out/Arc4MutationContract.ir/Arc4MutationContract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.arc4_types.mutation.Arc4MutationContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -7271,8 +7271,8 @@ debug: * to_do array_head_and_tail#0
 debug: * to_do tail_offset#0
 debug: * to_do head_offset#0
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to arc4_types/out/Arc4MutationContract.ir/Arc4MutationContract.approval.3.approval.destructured.ir
-debug: Output IR to arc4_types/out/Arc4MutationContract.ir/Arc4MutationContract.clear.0.clear.ssa.ir
+debug: Output IR to arc4_types/out/Arc4MutationContract.ir/Arc4MutationContract.approval.3.destructured.ir
+debug: Output IR to arc4_types/out/Arc4MutationContract.ir/Arc4MutationContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.arc4_types.mutation.Arc4MutationContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.mutation.Arc4MutationContract.clear_state_program
@@ -7298,7 +7298,7 @@ debug: Coalescing local variables in test_cases.arc4_types.mutation.Arc4Mutation
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.mutation.Arc4MutationContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to arc4_types/out/Arc4MutationContract.ir/Arc4MutationContract.clear.1.clear.destructured.ir
+debug: Output IR to arc4_types/out/Arc4MutationContract.ir/Arc4MutationContract.clear.1.destructured.ir
 debug: Inserted main.ops[5]: 'l-store-copy dynamic_bool_array#1 0'
 debug: Replaced main.ops[7]: 'v-load dynamic_bool_array#1' with 'l-load dynamic_bool_array#1'
 debug: Inserted main.ops[10]: 'l-store-copy tmp%1#1 0'
@@ -7731,7 +7731,7 @@ debug: optimizing TEAL subroutine _puya_lib.arc4.recalculate_head_for_elements_w
 debug: inlining single reference block recalculate_head_for_elements_with_byte_length_head_for_body@2 into recalculate_head_for_elements_with_byte_length_head_for_header@1
 debug: removing explicit jump to fall-through block recalculate_head_for_elements_with_byte_length_head_for_header@1
 arc4_types/mutation.py:45 debug: optimizing TEAL subroutine test_cases.arc4_types.mutation.Arc4MutationContract.clear_state_program() -> uint64:
-debug: Output IR to arc4_types/out/MutableParams2.ir/MutableParams2.approval.0.approval.ssa.ir
+debug: Output IR to arc4_types/out/MutableParams2.ir/MutableParams2.approval.0.ssa.ir
 info: optimizing approval program of test_cases.arc4_types.mutable_params2.MutableParams2 at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
@@ -7953,7 +7953,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.arc4_types.mutable_params2.MutableParams2.__puya_arc4_router__
-debug: Output IR to arc4_types/out/MutableParams2.ir/MutableParams2.approval.1.approval.ssa.opt.ir
+debug: Output IR to arc4_types/out/MutableParams2.ir/MutableParams2.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -8030,7 +8030,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.arc4_types.mutable_params2.MutableParams2.__algopy_default_create
-debug: Output IR to arc4_types/out/MutableParams2.ir/MutableParams2.approval.2.approval.ssa.opt.ir
+debug: Output IR to arc4_types/out/MutableParams2.ir/MutableParams2.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -8129,8 +8129,8 @@ debug: * to_do a%out#7
 debug: * to_do a%is_original#0
 debug: * to_do a#0
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to arc4_types/out/MutableParams2.ir/MutableParams2.approval.3.approval.destructured.ir
-debug: Output IR to arc4_types/out/MutableParams2.ir/MutableParams2.clear.0.clear.ssa.ir
+debug: Output IR to arc4_types/out/MutableParams2.ir/MutableParams2.approval.3.destructured.ir
+debug: Output IR to arc4_types/out/MutableParams2.ir/MutableParams2.clear.0.ssa.ir
 info: optimizing clear program of test_cases.arc4_types.mutable_params2.MutableParams2 at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -8156,7 +8156,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to arc4_types/out/MutableParams2.ir/MutableParams2.clear.1.clear.destructured.ir
+debug: Output IR to arc4_types/out/MutableParams2.ir/MutableParams2.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
@@ -8249,7 +8249,7 @@ debug: inlining single reference block maybe_modify_array_if_body@14 into maybe_
 debug: removing explicit jump to fall-through block maybe_modify_array_after_if_else@13
 debug: removing explicit jump to fall-through block maybe_modify_array_after_if_else@15
 debug: optimizing TEAL subroutine algopy.arc4.ARC4Contract.clear_state_program() -> uint64:
-debug: Output IR to arc4_types/out/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.approval.0.approval.ssa.ir
+debug: Output IR to arc4_types/out/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.arc4_types.mutable_params.Arc4MutableParamsContract at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.arc4_types.mutable_params.Arc4MutableParamsContract.mutating_copies for inlining
@@ -8861,7 +8861,7 @@ debug: Found equivalence set: val_as_bytes%7#0, tmp%12#0
 debug: Found equivalence set: val_as_bytes%8#0, tmp%15#0
 debug: Copy propagation made 5 modifications
 debug: removing unused subroutine test_cases.arc4_types.mutable_params.Arc4MutableParamsContract.mutating_copies
-debug: Output IR to arc4_types/out/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to arc4_types/out/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking simple function test_cases.arc4_types.mutable_params.Arc4MutableParamsContract.other_routine_2 for inlining (complexity=1 <= threshold=3)
 debug: Optimizing subroutine test_cases.arc4_types.mutable_params.Arc4MutableParamsContract.approval_program
@@ -8968,7 +8968,7 @@ debug: Not removing empty block block@25 because it's used by phi nodes
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.arc4_types.mutable_params.Arc4MutableParamsContract.other_routine_2
-debug: Output IR to arc4_types/out/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.approval.2.approval.ssa.opt.ir
+debug: Output IR to arc4_types/out/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.arc4_types.mutable_params.Arc4MutableParamsContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -9021,7 +9021,7 @@ debug: Not removing empty block block@23 because it's used by phi nodes
 debug: Not removing empty block block@25 because it's used by phi nodes
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to arc4_types/out/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.approval.3.approval.ssa.opt.ir
+debug: Output IR to arc4_types/out/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.approval.3.ssa.opt.ir
 debug: Begin optimization pass 4/100
 debug: Optimizing subroutine test_cases.arc4_types.mutable_params.Arc4MutableParamsContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -9130,8 +9130,8 @@ debug: * to_do arrays.2%is_original#0
 debug: * to_do arrays.1%is_original#0
 debug: * to_do arrays.0%is_original#0
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to arc4_types/out/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.approval.4.approval.destructured.ir
-debug: Output IR to arc4_types/out/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.clear.0.clear.ssa.ir
+debug: Output IR to arc4_types/out/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.approval.4.destructured.ir
+debug: Output IR to arc4_types/out/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.arc4_types.mutable_params.Arc4MutableParamsContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.mutable_params.Arc4MutableParamsContract.clear_state_program
@@ -9157,7 +9157,7 @@ debug: Coalescing local variables in test_cases.arc4_types.mutable_params.Arc4Mu
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.mutable_params.Arc4MutableParamsContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to arc4_types/out/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.clear.1.clear.destructured.ir
+debug: Output IR to arc4_types/out/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.clear.1.destructured.ir
 debug: Inserted main.ops[6]: 'l-store-copy t#0 0'
 debug: Replaced main.ops[8]: 'v-load t#0' with 'l-load t#0'
 debug: Inserted main.ops[12]: 'l-store-copy tmp%2#0 0'
@@ -9395,7 +9395,7 @@ debug: removing explicit jump to fall-through block mutate_tuple_items_and_reass
 debug: removing explicit jump to fall-through block mutate_tuple_items_and_reassign_after_if_else@24
 debug: removing explicit jump to fall-through block mutate_tuple_items_and_reassign_after_if_else@26
 arc4_types/mutable_params.py:158 debug: optimizing TEAL subroutine test_cases.arc4_types.mutable_params.Arc4MutableParamsContract.clear_state_program() -> uint64:
-debug: Output IR to arc4_types/out/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.approval.0.approval.ssa.ir
+debug: Output IR to arc4_types/out/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.arc4_types.dynamic_string_array.Arc4DynamicStringArrayContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
@@ -9598,7 +9598,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.arc4_types.dynamic_string_array.Arc4DynamicStringArrayContract.__puya_arc4_router__
-debug: Output IR to arc4_types/out/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to arc4_types/out/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking trivial method test_cases.arc4_types.dynamic_string_array.Arc4DynamicStringArrayContract.xyz as inlineable
 debug: marking trivial method test_cases.arc4_types.dynamic_string_array.Arc4DynamicStringArrayContract.xyz_raw as inlineable
@@ -9686,7 +9686,7 @@ debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.arc4_types.dynamic_string_array.Arc4DynamicStringArrayContract.xyz
 debug: removing unused subroutine test_cases.arc4_types.dynamic_string_array.Arc4DynamicStringArrayContract.xyz_raw
 debug: removing unused subroutine test_cases.arc4_types.dynamic_string_array.Arc4DynamicStringArrayContract.__algopy_default_create
-debug: Output IR to arc4_types/out/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.approval.2.approval.ssa.opt.ir
+debug: Output IR to arc4_types/out/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -9713,8 +9713,8 @@ debug: Coalescing tmp%0#0 with [tmp%0#2]
 debug: Coalescing resulted in 11 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.approval_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to arc4_types/out/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.approval.3.approval.destructured.ir
-debug: Output IR to arc4_types/out/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.clear.0.clear.ssa.ir
+debug: Output IR to arc4_types/out/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.approval.3.destructured.ir
+debug: Output IR to arc4_types/out/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.arc4_types.dynamic_string_array.Arc4DynamicStringArrayContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -9740,7 +9740,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to arc4_types/out/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.clear.1.clear.destructured.ir
+debug: Output IR to arc4_types/out/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
@@ -9786,7 +9786,7 @@ debug: inlining single reference block main_after_inlined_test_cases.arc4_types.
 debug: inlining single reference block main___algopy_default_create@8 into main_bare_routing@7
 debug: removing explicit jump to fall-through block main_after_if_else@11
 debug: optimizing TEAL subroutine algopy.arc4.ARC4Contract.clear_state_program() -> uint64:
-debug: Output IR to arc4_types/out/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.approval.0.approval.ssa.ir
+debug: Output IR to arc4_types/out/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.arc4_types.dynamic_bytes.Arc4DynamicBytesContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.dynamic_bytes.Arc4DynamicBytesContract.approval_program
@@ -9925,7 +9925,7 @@ debug: Merged linear block@11 into block@10
 debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to arc4_types/out/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to arc4_types/out/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.arc4_types.dynamic_bytes.Arc4DynamicBytesContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -10010,8 +10010,8 @@ debug: to_do: item_index_internal%2#0, total#0
 debug: * to_do total#0
 debug: * to_do item_index_internal%2#0
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to arc4_types/out/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.approval.2.approval.destructured.ir
-debug: Output IR to arc4_types/out/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.clear.0.clear.ssa.ir
+debug: Output IR to arc4_types/out/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.approval.2.destructured.ir
+debug: Output IR to arc4_types/out/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.arc4_types.dynamic_bytes.Arc4DynamicBytesContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.dynamic_bytes.Arc4DynamicBytesContract.clear_state_program
@@ -10037,7 +10037,7 @@ debug: Coalescing local variables in test_cases.arc4_types.dynamic_bytes.Arc4Dyn
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.dynamic_bytes.Arc4DynamicBytesContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to arc4_types/out/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.clear.1.clear.destructured.ir
+debug: Output IR to arc4_types/out/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.clear.1.destructured.ir
 debug: Inserted main_for_header@1.ops[3]: 'l-store-copy continue_looping%0#0 0'
 debug: Replaced main_for_header@1.ops[5]: 'v-load continue_looping%0#0' with 'l-load continue_looping%0#0'
 debug: Inserted main_for_body@2.ops[4]: 'l-store-copy uint8_item#0 0'
@@ -10106,7 +10106,7 @@ debug: removing explicit jump to fall-through block main_for_header@5
 debug: removing explicit jump to fall-through block main_for_header@9
 debug: removing explicit jump to fall-through block main_ternary_merge@15
 arc4_types/dynamic_bytes.py:48 debug: optimizing TEAL subroutine test_cases.arc4_types.dynamic_bytes.Arc4DynamicBytesContract.clear_state_program() -> uint64:
-debug: Output IR to arc4_types/out/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.approval.0.approval.ssa.ir
+debug: Output IR to arc4_types/out/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.arc4_types.bool_eval.Arc4BoolEvalContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.bool_eval.Arc4BoolEvalContract.approval_program
@@ -10212,7 +10212,7 @@ debug: Optimizer: Remove Linear Jump
 debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to arc4_types/out/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to arc4_types/out/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.arc4_types.bool_eval.Arc4BoolEvalContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -10237,8 +10237,8 @@ debug: Coalescing local variables in test_cases.arc4_types.bool_eval.Arc4BoolEva
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.bool_eval.Arc4BoolEvalContract.approval_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to arc4_types/out/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.approval.2.approval.destructured.ir
-debug: Output IR to arc4_types/out/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.clear.0.clear.ssa.ir
+debug: Output IR to arc4_types/out/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.approval.2.destructured.ir
+debug: Output IR to arc4_types/out/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.arc4_types.bool_eval.Arc4BoolEvalContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.bool_eval.Arc4BoolEvalContract.clear_state_program
@@ -10264,7 +10264,7 @@ debug: Coalescing local variables in test_cases.arc4_types.bool_eval.Arc4BoolEva
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.bool_eval.Arc4BoolEvalContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to arc4_types/out/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.clear.1.clear.destructured.ir
+debug: Output IR to arc4_types/out/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.clear.1.destructured.ir
 debug: Inserted main.ops[7]: 'l-store-copy tmp%9#0 0'
 debug: Replaced main.ops[9]: 'v-load tmp%9#0' with 'l-load tmp%9#0'
 debug: Inserted main.ops[3]: 'l-store-copy tmp%8#0 0'
@@ -10273,7 +10273,7 @@ debug: Inserted main.ops[1]: 'l-store-copy tmp%7#0 0'
 debug: Replaced main.ops[6]: 'v-load tmp%7#0' with 'l-load tmp%7#0'
 arc4_types/bool_eval.py:8 debug: optimizing TEAL subroutine test_cases.arc4_types.bool_eval.Arc4BoolEvalContract.approval_program() -> uint64:
 arc4_types/bool_eval.py:60 debug: optimizing TEAL subroutine test_cases.arc4_types.bool_eval.Arc4BoolEvalContract.clear_state_program() -> uint64:
-debug: Output IR to arc4_types/out/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.approval.0.approval.ssa.ir
+debug: Output IR to arc4_types/out/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.arc4_types.bool.Arc4BoolTypeContract at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.arc4_types.bool.Arc4BoolTypeContract.test_stuff for inlining
@@ -10487,7 +10487,7 @@ debug: Found equivalence set: tmp%0#0, to_encode%0#0, tmp%5#0
 debug: Found equivalence set: tmp%1#0, to_encode%1#0
 debug: Copy propagation made 3 modifications
 debug: removing unused subroutine test_cases.arc4_types.bool.Arc4BoolTypeContract.test_stuff
-debug: Output IR to arc4_types/out/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to arc4_types/out/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.arc4_types.bool.Arc4BoolTypeContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -10512,8 +10512,8 @@ debug: Coalescing local variables in test_cases.arc4_types.bool.Arc4BoolTypeCont
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.bool.Arc4BoolTypeContract.approval_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to arc4_types/out/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.approval.2.approval.destructured.ir
-debug: Output IR to arc4_types/out/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.clear.0.clear.ssa.ir
+debug: Output IR to arc4_types/out/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.approval.2.destructured.ir
+debug: Output IR to arc4_types/out/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.arc4_types.bool.Arc4BoolTypeContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.bool.Arc4BoolTypeContract.clear_state_program
@@ -10539,7 +10539,7 @@ debug: Coalescing local variables in test_cases.arc4_types.bool.Arc4BoolTypeCont
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.bool.Arc4BoolTypeContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to arc4_types/out/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.clear.1.clear.destructured.ir
+debug: Output IR to arc4_types/out/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[10]: 'l-store-copy encoded_bool%2#0 0'
@@ -10550,7 +10550,7 @@ debug: Inserted main.ops[5]: 'l-store-copy to_encode%0#0 0'
 debug: Replaced main.ops[9]: 'v-load to_encode%0#0' with 'l-load to_encode%0#0'
 arc4_types/bool.py:12 debug: optimizing TEAL subroutine test_cases.arc4_types.bool.Arc4BoolTypeContract.approval_program() -> uint64:
 arc4_types/bool.py:51 debug: optimizing TEAL subroutine test_cases.arc4_types.bool.Arc4BoolTypeContract.clear_state_program() -> uint64:
-debug: Output IR to arc4_types/out/Arc4ArraysContract.ir/Arc4ArraysContract.approval.0.approval.ssa.ir
+debug: Output IR to arc4_types/out/Arc4ArraysContract.ir/Arc4ArraysContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.arc4_types.array.Arc4ArraysContract at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.arc4_types.array.Arc4ArraysContract.hash_as_array for inlining
@@ -10755,7 +10755,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.arc4_types.array.Arc4ArraysContract.hash_as_array
-debug: Output IR to arc4_types/out/Arc4ArraysContract.ir/Arc4ArraysContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to arc4_types/out/Arc4ArraysContract.ir/Arc4ArraysContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.arc4_types.array.Arc4ArraysContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -10774,7 +10774,7 @@ debug: Optimizer: Remove Linear Jump
 debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to arc4_types/out/Arc4ArraysContract.ir/Arc4ArraysContract.approval.2.approval.ssa.opt.ir
+debug: Output IR to arc4_types/out/Arc4ArraysContract.ir/Arc4ArraysContract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.arc4_types.array.Arc4ArraysContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -10906,8 +10906,8 @@ debug: * avail item_index_internal%4#0
 debug: * to_do result#0
 debug: * to_do index#0
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to arc4_types/out/Arc4ArraysContract.ir/Arc4ArraysContract.approval.3.approval.destructured.ir
-debug: Output IR to arc4_types/out/Arc4ArraysContract.ir/Arc4ArraysContract.clear.0.clear.ssa.ir
+debug: Output IR to arc4_types/out/Arc4ArraysContract.ir/Arc4ArraysContract.approval.3.destructured.ir
+debug: Output IR to arc4_types/out/Arc4ArraysContract.ir/Arc4ArraysContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.arc4_types.array.Arc4ArraysContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.array.Arc4ArraysContract.clear_state_program
@@ -10933,7 +10933,7 @@ debug: Coalescing local variables in test_cases.arc4_types.array.Arc4ArraysContr
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.array.Arc4ArraysContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to arc4_types/out/Arc4ArraysContract.ir/Arc4ArraysContract.clear.1.clear.destructured.ir
+debug: Output IR to arc4_types/out/Arc4ArraysContract.ir/Arc4ArraysContract.clear.1.destructured.ir
 debug: Inserted main_for_header@1.ops[3]: 'l-store-copy continue_looping%0#0 0'
 debug: Replaced main_for_header@1.ops[5]: 'v-load continue_looping%0#0' with 'l-load continue_looping%0#0'
 debug: Inserted main_for_body@2.ops[4]: 'l-store-copy uint8_item#0 0'
@@ -11040,7 +11040,7 @@ debug: removing explicit jump to fall-through block main_for_header@16
 debug: removing explicit jump to fall-through block main_for_header@20
 debug: removing explicit jump to fall-through block main_after_if_else@24
 arc4_types/array.py:79 debug: optimizing TEAL subroutine test_cases.arc4_types.array.Arc4ArraysContract.clear_state_program() -> uint64:
-debug: Output IR to arc4_types/out/Arc4AddressContract.ir/Arc4AddressContract.approval.0.approval.ssa.ir
+debug: Output IR to arc4_types/out/Arc4AddressContract.ir/Arc4AddressContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.arc4_types.address.Arc4AddressContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.address.Arc4AddressContract.approval_program
@@ -11076,7 +11076,7 @@ debug: Optimizer: Remove Linear Jump
 debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to arc4_types/out/Arc4AddressContract.ir/Arc4AddressContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to arc4_types/out/Arc4AddressContract.ir/Arc4AddressContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.arc4_types.address.Arc4AddressContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -11101,8 +11101,8 @@ debug: Coalescing local variables in test_cases.arc4_types.address.Arc4AddressCo
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.address.Arc4AddressContract.approval_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to arc4_types/out/Arc4AddressContract.ir/Arc4AddressContract.approval.2.approval.destructured.ir
-debug: Output IR to arc4_types/out/Arc4AddressContract.ir/Arc4AddressContract.clear.0.clear.ssa.ir
+debug: Output IR to arc4_types/out/Arc4AddressContract.ir/Arc4AddressContract.approval.2.destructured.ir
+debug: Output IR to arc4_types/out/Arc4AddressContract.ir/Arc4AddressContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.arc4_types.address.Arc4AddressContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.address.Arc4AddressContract.clear_state_program
@@ -11128,7 +11128,7 @@ debug: Coalescing local variables in test_cases.arc4_types.address.Arc4AddressCo
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.address.Arc4AddressContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to arc4_types/out/Arc4AddressContract.ir/Arc4AddressContract.clear.1.clear.destructured.ir
+debug: Output IR to arc4_types/out/Arc4AddressContract.ir/Arc4AddressContract.clear.1.destructured.ir
 debug: Inserted main.ops[7]: 'l-store-copy tmp%1#0 0'
 debug: Replaced main.ops[9]: 'v-load tmp%1#0' with 'l-load tmp%1#0'
 debug: Inserted main.ops[16]: 'l-store-copy tmp%4#0 0'
@@ -11143,7 +11143,7 @@ debug: Inserted main.ops[7]: 'l-store-copy address#0 1'
 debug: Replaced main.ops[17]: 'v-load address#0' with 'l-load address#0'
 arc4_types/address.py:7 debug: optimizing TEAL subroutine test_cases.arc4_types.address.Arc4AddressContract.approval_program() -> uint64:
 arc4_types/address.py:24 debug: optimizing TEAL subroutine test_cases.arc4_types.address.Arc4AddressContract.clear_state_program() -> uint64:
-debug: Output IR to arc4_types/out/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.approval.0.approval.ssa.ir
+debug: Output IR to arc4_types/out/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.approval.0.ssa.ir
 info: optimizing approval program of test_cases.arc4_types.structs2.Arc4StructsFromAnotherModule at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.structs2.Arc4StructsFromAnotherModule.approval_program
@@ -11187,7 +11187,7 @@ debug: Optimizer: Remove Linear Jump
 debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to arc4_types/out/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.approval.1.approval.ssa.opt.ir
+debug: Output IR to arc4_types/out/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.arc4_types.structs2.Arc4StructsFromAnotherModule.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -11212,8 +11212,8 @@ debug: Coalescing local variables in test_cases.arc4_types.structs2.Arc4StructsF
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.structs2.Arc4StructsFromAnotherModule.approval_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to arc4_types/out/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.approval.2.approval.destructured.ir
-debug: Output IR to arc4_types/out/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.clear.0.clear.ssa.ir
+debug: Output IR to arc4_types/out/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.approval.2.destructured.ir
+debug: Output IR to arc4_types/out/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.clear.0.ssa.ir
 info: optimizing clear program of test_cases.arc4_types.structs2.Arc4StructsFromAnotherModule at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.structs2.Arc4StructsFromAnotherModule.clear_state_program
@@ -11239,7 +11239,7 @@ debug: Coalescing local variables in test_cases.arc4_types.structs2.Arc4StructsF
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.structs2.Arc4StructsFromAnotherModule.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to arc4_types/out/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.clear.1.clear.destructured.ir
+debug: Output IR to arc4_types/out/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.clear.1.destructured.ir
 arc4_types/structs2.py:7 debug: optimizing TEAL subroutine test_cases.arc4_types.structs2.Arc4StructsFromAnotherModule.approval_program() -> uint64:
 arc4_types/structs2.py:13 debug: optimizing TEAL subroutine test_cases.arc4_types.structs2.Arc4StructsFromAnotherModule.clear_state_program() -> uint64:
 info: Writing arc4_types/out/Arc4TuplesTypeContract.approval.teal
diff --git a/test_cases/arc4_types/puya_O2.log b/test_cases/arc4_types/puya_O2.log
index d934b62087..bc2abf35d2 100644
--- a/test_cases/arc4_types/puya_O2.log
+++ b/test_cases/arc4_types/puya_O2.log
@@ -3116,7 +3116,7 @@ debug: Coalescing local variables in test_cases.arc4_types.tuples.Arc4TuplesType
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.tuples.Arc4TuplesTypeContract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to arc4_types/out_O2/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.approval.0.approval.destructured.ir
+debug: Output IR to arc4_types/out_O2/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.arc4_types.tuples.Arc4TuplesTypeContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.tuples.Arc4TuplesTypeContract.clear_state_program
@@ -3142,7 +3142,7 @@ debug: Coalescing local variables in test_cases.arc4_types.tuples.Arc4TuplesType
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.tuples.Arc4TuplesTypeContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to arc4_types/out_O2/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.clear.0.clear.destructured.ir
+debug: Output IR to arc4_types/out_O2/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.clear.0.destructured.ir
 arc4_types/tuples.py:14 debug: optimizing TEAL subroutine test_cases.arc4_types.tuples.Arc4TuplesTypeContract.approval_program() -> uint64:
 arc4_types/tuples.py:53 debug: optimizing TEAL subroutine test_cases.arc4_types.tuples.Arc4TuplesTypeContract.clear_state_program() -> uint64:
 info: optimizing approval program of test_cases.arc4_types.structs.Arc4StructsTypeContract at level 2
@@ -3554,7 +3554,7 @@ debug: * avail val#2
 debug: * to_do val#0
 debug: * to_do loop_counter%0#0
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to arc4_types/out_O2/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.approval.0.approval.destructured.ir
+debug: Output IR to arc4_types/out_O2/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.arc4_types.structs.Arc4StructsTypeContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.structs.Arc4StructsTypeContract.clear_state_program
@@ -3580,7 +3580,7 @@ debug: Coalescing local variables in test_cases.arc4_types.structs.Arc4StructsTy
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.structs.Arc4StructsTypeContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to arc4_types/out_O2/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.clear.0.clear.destructured.ir
+debug: Output IR to arc4_types/out_O2/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.clear.0.destructured.ir
 debug: Found 2 edge set/s for test_cases.arc4_types.structs.Arc4StructsTypeContract.approval_program
 debug: Allocated 1 variable/s to x-stack: val#0
 debug: shared x-stack for main -> main_for_body@1: val#0
@@ -3786,7 +3786,7 @@ debug: Coalescing ternary_result%0#0 with [ternary_result%0#5, ternary_result%0#
 debug: Coalescing resulted in 7 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.string.Arc4StringTypesContract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to arc4_types/out_O2/Arc4StringTypesContract.ir/Arc4StringTypesContract.approval.0.approval.destructured.ir
+debug: Output IR to arc4_types/out_O2/Arc4StringTypesContract.ir/Arc4StringTypesContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.arc4_types.string.Arc4StringTypesContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.string.Arc4StringTypesContract.clear_state_program
@@ -3812,7 +3812,7 @@ debug: Coalescing local variables in test_cases.arc4_types.string.Arc4StringType
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.string.Arc4StringTypesContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to arc4_types/out_O2/Arc4StringTypesContract.ir/Arc4StringTypesContract.clear.0.clear.destructured.ir
+debug: Output IR to arc4_types/out_O2/Arc4StringTypesContract.ir/Arc4StringTypesContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%11#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%11#0' with 'l-load tmp%11#0'
 debug: Inserted main_ternary_merge@3.ops[3]: 'l-store-copy tmp%13#0 0'
@@ -3872,7 +3872,7 @@ debug: Coalescing and_result%0#0 with [and_result%0#5, and_result%0#1, and_resul
 debug: Coalescing resulted in 7 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.reference_types.Arc4RefTypesContract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to arc4_types/out_O2/Arc4RefTypesContract.ir/Arc4RefTypesContract.approval.0.approval.destructured.ir
+debug: Output IR to arc4_types/out_O2/Arc4RefTypesContract.ir/Arc4RefTypesContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.arc4_types.reference_types.Arc4RefTypesContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.reference_types.Arc4RefTypesContract.clear_state_program
@@ -3898,7 +3898,7 @@ debug: Coalescing local variables in test_cases.arc4_types.reference_types.Arc4R
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.reference_types.Arc4RefTypesContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to arc4_types/out_O2/Arc4RefTypesContract.ir/Arc4RefTypesContract.clear.0.clear.destructured.ir
+debug: Output IR to arc4_types/out_O2/Arc4RefTypesContract.ir/Arc4RefTypesContract.clear.0.destructured.ir
 debug: Inserted main.ops[7]: 'l-store-copy tmp%1#0 0'
 debug: Replaced main.ops[9]: 'v-load tmp%1#0' with 'l-load tmp%1#0'
 debug: Inserted main.ops[12]: 'l-store-copy checked_address#0 0'
@@ -4147,7 +4147,7 @@ debug: Coalescing local variables in test_cases.arc4_types.numeric.Arc4NumericTy
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.numeric.Arc4NumericTypesContract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to arc4_types/out_O2/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.approval.0.approval.destructured.ir
+debug: Output IR to arc4_types/out_O2/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.arc4_types.numeric.Arc4NumericTypesContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.numeric.Arc4NumericTypesContract.clear_state_program
@@ -4207,7 +4207,7 @@ debug: Coalescing local variables in test_cases.arc4_types.numeric.Arc4NumericTy
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.numeric.Arc4NumericTypesContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to arc4_types/out_O2/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.clear.0.clear.destructured.ir
+debug: Output IR to arc4_types/out_O2/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.clear.0.destructured.ir
 debug: Inserted main.ops[6]: 'l-store-copy reinterpret_biguint%0#0 0'
 debug: Replaced main.ops[8]: 'v-load reinterpret_biguint%0#0' with 'l-load reinterpret_biguint%0#0'
 debug: Inserted main.ops[11]: 'l-store-copy tmp%18#0 0'
@@ -7248,7 +7248,7 @@ debug: * to_do array_head_and_tail#0
 debug: * to_do tail_offset#0
 debug: * to_do head_offset#0
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to arc4_types/out_O2/Arc4MutationContract.ir/Arc4MutationContract.approval.0.approval.destructured.ir
+debug: Output IR to arc4_types/out_O2/Arc4MutationContract.ir/Arc4MutationContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.arc4_types.mutation.Arc4MutationContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.mutation.Arc4MutationContract.clear_state_program
@@ -7274,7 +7274,7 @@ debug: Coalescing local variables in test_cases.arc4_types.mutation.Arc4Mutation
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.mutation.Arc4MutationContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to arc4_types/out_O2/Arc4MutationContract.ir/Arc4MutationContract.clear.0.clear.destructured.ir
+debug: Output IR to arc4_types/out_O2/Arc4MutationContract.ir/Arc4MutationContract.clear.0.destructured.ir
 debug: Inserted main.ops[5]: 'l-store-copy dynamic_bool_array#1 0'
 debug: Replaced main.ops[7]: 'v-load dynamic_bool_array#1' with 'l-load dynamic_bool_array#1'
 debug: Inserted main.ops[10]: 'l-store-copy tmp%1#1 0'
@@ -8380,7 +8380,7 @@ debug: Coalescing tmp%0#0 with [tmp%0#2]
 debug: Coalescing resulted in 8 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to arc4_types/out_O2/MutableParams2.ir/MutableParams2.approval.0.approval.destructured.ir
+debug: Output IR to arc4_types/out_O2/MutableParams2.ir/MutableParams2.approval.0.destructured.ir
 info: optimizing clear program of test_cases.arc4_types.mutable_params2.MutableParams2 at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -8406,7 +8406,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to arc4_types/out_O2/MutableParams2.ir/MutableParams2.clear.0.clear.destructured.ir
+debug: Output IR to arc4_types/out_O2/MutableParams2.ir/MutableParams2.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
@@ -9849,7 +9849,7 @@ debug: Coalescing local variables in test_cases.arc4_types.mutable_params.Arc4Mu
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.mutable_params.Arc4MutableParamsContract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to arc4_types/out_O2/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.approval.0.approval.destructured.ir
+debug: Output IR to arc4_types/out_O2/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.arc4_types.mutable_params.Arc4MutableParamsContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.mutable_params.Arc4MutableParamsContract.clear_state_program
@@ -9875,7 +9875,7 @@ debug: Coalescing local variables in test_cases.arc4_types.mutable_params.Arc4Mu
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.mutable_params.Arc4MutableParamsContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to arc4_types/out_O2/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.clear.0.clear.destructured.ir
+debug: Output IR to arc4_types/out_O2/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.clear.0.destructured.ir
 arc4_types/mutable_params.py:28 debug: optimizing TEAL subroutine test_cases.arc4_types.mutable_params.Arc4MutableParamsContract.approval_program() -> uint64:
 arc4_types/mutable_params.py:158 debug: optimizing TEAL subroutine test_cases.arc4_types.mutable_params.Arc4MutableParamsContract.clear_state_program() -> uint64:
 info: optimizing approval program of test_cases.arc4_types.dynamic_string_array.Arc4DynamicStringArrayContract at level 2
@@ -10292,7 +10292,7 @@ debug: Coalescing tmp%0#0 with [tmp%0#2]
 debug: Coalescing resulted in 11 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to arc4_types/out_O2/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.approval.0.approval.destructured.ir
+debug: Output IR to arc4_types/out_O2/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.arc4_types.dynamic_string_array.Arc4DynamicStringArrayContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -10318,7 +10318,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to arc4_types/out_O2/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.clear.0.clear.destructured.ir
+debug: Output IR to arc4_types/out_O2/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
@@ -10586,7 +10586,7 @@ debug: to_do: item_index_internal%2#0, total#0
 debug: * to_do total#0
 debug: * to_do item_index_internal%2#0
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to arc4_types/out_O2/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.approval.0.approval.destructured.ir
+debug: Output IR to arc4_types/out_O2/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.arc4_types.dynamic_bytes.Arc4DynamicBytesContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.dynamic_bytes.Arc4DynamicBytesContract.clear_state_program
@@ -10612,7 +10612,7 @@ debug: Coalescing local variables in test_cases.arc4_types.dynamic_bytes.Arc4Dyn
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.dynamic_bytes.Arc4DynamicBytesContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to arc4_types/out_O2/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.clear.0.clear.destructured.ir
+debug: Output IR to arc4_types/out_O2/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.clear.0.destructured.ir
 debug: Inserted main_for_header@1.ops[3]: 'l-store-copy continue_looping%0#0 0'
 debug: Replaced main_for_header@1.ops[5]: 'v-load continue_looping%0#0' with 'l-load continue_looping%0#0'
 debug: Inserted main_for_body@2.ops[4]: 'l-store-copy uint8_item#0 0'
@@ -10810,7 +10810,7 @@ debug: Coalescing local variables in test_cases.arc4_types.bool_eval.Arc4BoolEva
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.bool_eval.Arc4BoolEvalContract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to arc4_types/out_O2/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.approval.0.approval.destructured.ir
+debug: Output IR to arc4_types/out_O2/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.arc4_types.bool_eval.Arc4BoolEvalContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.bool_eval.Arc4BoolEvalContract.clear_state_program
@@ -10836,7 +10836,7 @@ debug: Coalescing local variables in test_cases.arc4_types.bool_eval.Arc4BoolEva
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.bool_eval.Arc4BoolEvalContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to arc4_types/out_O2/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.clear.0.clear.destructured.ir
+debug: Output IR to arc4_types/out_O2/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.clear.0.destructured.ir
 debug: Inserted main.ops[7]: 'l-store-copy tmp%9#0 0'
 debug: Replaced main.ops[9]: 'v-load tmp%9#0' with 'l-load tmp%9#0'
 debug: Inserted main.ops[3]: 'l-store-copy tmp%8#0 0'
@@ -11082,7 +11082,7 @@ debug: Coalescing local variables in test_cases.arc4_types.bool.Arc4BoolTypeCont
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.bool.Arc4BoolTypeContract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to arc4_types/out_O2/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.approval.0.approval.destructured.ir
+debug: Output IR to arc4_types/out_O2/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.arc4_types.bool.Arc4BoolTypeContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.bool.Arc4BoolTypeContract.clear_state_program
@@ -11108,7 +11108,7 @@ debug: Coalescing local variables in test_cases.arc4_types.bool.Arc4BoolTypeCont
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.bool.Arc4BoolTypeContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to arc4_types/out_O2/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.clear.0.clear.destructured.ir
+debug: Output IR to arc4_types/out_O2/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[10]: 'l-store-copy encoded_bool%2#0 0'
@@ -11472,7 +11472,7 @@ debug: * avail item_index_internal%4#0
 debug: * to_do result#0
 debug: * to_do index#0
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to arc4_types/out_O2/Arc4ArraysContract.ir/Arc4ArraysContract.approval.0.approval.destructured.ir
+debug: Output IR to arc4_types/out_O2/Arc4ArraysContract.ir/Arc4ArraysContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.arc4_types.array.Arc4ArraysContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.array.Arc4ArraysContract.clear_state_program
@@ -11498,7 +11498,7 @@ debug: Coalescing local variables in test_cases.arc4_types.array.Arc4ArraysContr
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.array.Arc4ArraysContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to arc4_types/out_O2/Arc4ArraysContract.ir/Arc4ArraysContract.clear.0.clear.destructured.ir
+debug: Output IR to arc4_types/out_O2/Arc4ArraysContract.ir/Arc4ArraysContract.clear.0.destructured.ir
 debug: Inserted main_for_header@1.ops[3]: 'l-store-copy continue_looping%0#0 0'
 debug: Replaced main_for_header@1.ops[5]: 'v-load continue_looping%0#0' with 'l-load continue_looping%0#0'
 debug: Inserted main_for_body@2.ops[4]: 'l-store-copy uint8_item#0 0'
@@ -11664,7 +11664,7 @@ debug: Coalescing local variables in test_cases.arc4_types.address.Arc4AddressCo
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.address.Arc4AddressContract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to arc4_types/out_O2/Arc4AddressContract.ir/Arc4AddressContract.approval.0.approval.destructured.ir
+debug: Output IR to arc4_types/out_O2/Arc4AddressContract.ir/Arc4AddressContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.arc4_types.address.Arc4AddressContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.address.Arc4AddressContract.clear_state_program
@@ -11690,7 +11690,7 @@ debug: Coalescing local variables in test_cases.arc4_types.address.Arc4AddressCo
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.address.Arc4AddressContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to arc4_types/out_O2/Arc4AddressContract.ir/Arc4AddressContract.clear.0.clear.destructured.ir
+debug: Output IR to arc4_types/out_O2/Arc4AddressContract.ir/Arc4AddressContract.clear.0.destructured.ir
 debug: Inserted main.ops[7]: 'l-store-copy tmp%1#0 0'
 debug: Replaced main.ops[9]: 'v-load tmp%1#0' with 'l-load tmp%1#0'
 debug: Inserted main.ops[16]: 'l-store-copy tmp%4#0 0'
@@ -11772,7 +11772,7 @@ debug: Coalescing local variables in test_cases.arc4_types.structs2.Arc4StructsF
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.structs2.Arc4StructsFromAnotherModule.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to arc4_types/out_O2/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.approval.0.approval.destructured.ir
+debug: Output IR to arc4_types/out_O2/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.approval.0.destructured.ir
 info: optimizing clear program of test_cases.arc4_types.structs2.Arc4StructsFromAnotherModule at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.structs2.Arc4StructsFromAnotherModule.clear_state_program
@@ -11798,7 +11798,7 @@ debug: Coalescing local variables in test_cases.arc4_types.structs2.Arc4StructsF
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.structs2.Arc4StructsFromAnotherModule.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to arc4_types/out_O2/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.clear.0.clear.destructured.ir
+debug: Output IR to arc4_types/out_O2/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.clear.0.destructured.ir
 arc4_types/structs2.py:7 debug: optimizing TEAL subroutine test_cases.arc4_types.structs2.Arc4StructsFromAnotherModule.approval_program() -> uint64:
 arc4_types/structs2.py:13 debug: optimizing TEAL subroutine test_cases.arc4_types.structs2.Arc4StructsFromAnotherModule.clear_state_program() -> uint64:
 info: Writing arc4_types/out_O2/Arc4TuplesTypeContract.approval.teal
diff --git a/test_cases/arc4_types/puya_unoptimized.log b/test_cases/arc4_types/puya_unoptimized.log
index c79f5bdcc1..eba99a12dc 100644
--- a/test_cases/arc4_types/puya_unoptimized.log
+++ b/test_cases/arc4_types/puya_unoptimized.log
@@ -2515,7 +2515,7 @@ debug: Coalescing tup#0 with [tup#1, tup#2]
 debug: Coalescing resulted in 14 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.tuples.Arc4TuplesTypeContract.test_copy
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to arc4_types/out_unoptimized/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.approval.0.approval.destructured.ir
+debug: Output IR to arc4_types/out_unoptimized/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.arc4_types.tuples.Arc4TuplesTypeContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.tuples.Arc4TuplesTypeContract.clear_state_program
@@ -2533,7 +2533,7 @@ debug: Coalescing local variables in test_cases.arc4_types.tuples.Arc4TuplesType
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.tuples.Arc4TuplesTypeContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to arc4_types/out_unoptimized/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.clear.0.clear.destructured.ir
+debug: Output IR to arc4_types/out_unoptimized/Arc4TuplesTypeContract.ir/Arc4TuplesTypeContract.clear.0.destructured.ir
 debug: Inserted main.ops[3]: 'l-store-copy encoded_tuple_buffer%1#0 0'
 debug: Replaced main.ops[5]: 'v-load encoded_tuple_buffer%1#0' with 'l-load encoded_tuple_buffer%1#0'
 debug: Inserted main.ops[11]: 'l-store-copy as_bytes%0#0 0'
@@ -3315,7 +3315,7 @@ debug: Coalescing local variables in test_cases.arc4_types.structs.nested_decode
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.structs.nested_decode
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to arc4_types/out_unoptimized/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.approval.0.approval.destructured.ir
+debug: Output IR to arc4_types/out_unoptimized/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.arc4_types.structs.Arc4StructsTypeContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.structs.Arc4StructsTypeContract.clear_state_program
@@ -3333,7 +3333,7 @@ debug: Coalescing local variables in test_cases.arc4_types.structs.Arc4StructsTy
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.structs.Arc4StructsTypeContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to arc4_types/out_unoptimized/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.clear.0.clear.destructured.ir
+debug: Output IR to arc4_types/out_unoptimized/Arc4StructsTypeContract.ir/Arc4StructsTypeContract.clear.0.destructured.ir
 debug: Inserted main.ops[3]: 'l-store-copy encoded_tuple_buffer%1#0 0'
 debug: Replaced main.ops[5]: 'v-load encoded_tuple_buffer%1#0' with 'l-load encoded_tuple_buffer%1#0'
 debug: Inserted main.ops[8]: 'l-store-copy encoded_tuple_buffer%2#0 0'
@@ -3598,7 +3598,7 @@ debug: Coalescing ternary_result%0#0 with [ternary_result%0#5, ternary_result%0#
 debug: Coalescing resulted in 13 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.string.Arc4StringTypesContract.approval_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to arc4_types/out_unoptimized/Arc4StringTypesContract.ir/Arc4StringTypesContract.approval.0.approval.destructured.ir
+debug: Output IR to arc4_types/out_unoptimized/Arc4StringTypesContract.ir/Arc4StringTypesContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.arc4_types.string.Arc4StringTypesContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.string.Arc4StringTypesContract.clear_state_program
@@ -3616,7 +3616,7 @@ debug: Coalescing local variables in test_cases.arc4_types.string.Arc4StringType
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.string.Arc4StringTypesContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to arc4_types/out_unoptimized/Arc4StringTypesContract.ir/Arc4StringTypesContract.clear.0.clear.destructured.ir
+debug: Output IR to arc4_types/out_unoptimized/Arc4StringTypesContract.ir/Arc4StringTypesContract.clear.0.destructured.ir
 debug: Inserted main.ops[2]: 'l-store-copy length%0#0 0'
 debug: Replaced main.ops[4]: 'v-load length%0#0' with 'l-load length%0#0'
 debug: Inserted main.ops[6]: 'l-store-copy as_bytes%0#0 0'
@@ -3837,7 +3837,7 @@ debug: Coalescing and_result%0#0 with [and_result%0#5, and_result%0#1, and_resul
 debug: Coalescing resulted in 7 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.reference_types.Arc4RefTypesContract.approval_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to arc4_types/out_unoptimized/Arc4RefTypesContract.ir/Arc4RefTypesContract.approval.0.approval.destructured.ir
+debug: Output IR to arc4_types/out_unoptimized/Arc4RefTypesContract.ir/Arc4RefTypesContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.arc4_types.reference_types.Arc4RefTypesContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.reference_types.Arc4RefTypesContract.clear_state_program
@@ -3855,7 +3855,7 @@ debug: Coalescing local variables in test_cases.arc4_types.reference_types.Arc4R
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.reference_types.Arc4RefTypesContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to arc4_types/out_unoptimized/Arc4RefTypesContract.ir/Arc4RefTypesContract.clear.0.clear.destructured.ir
+debug: Output IR to arc4_types/out_unoptimized/Arc4RefTypesContract.ir/Arc4RefTypesContract.clear.0.destructured.ir
 debug: Inserted main.ops[7]: 'l-store-copy tmp%1#0 0'
 debug: Replaced main.ops[9]: 'v-load tmp%1#0' with 'l-load tmp%1#0'
 debug: Inserted main.ops[12]: 'l-store-copy awst_tmp%0#0 0'
@@ -3940,7 +3940,7 @@ debug: Coalescing local variables in test_cases.arc4_types.numeric.Arc4NumericTy
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.numeric.Arc4NumericTypesContract.approval_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to arc4_types/out_unoptimized/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.approval.0.approval.destructured.ir
+debug: Output IR to arc4_types/out_unoptimized/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.arc4_types.numeric.Arc4NumericTypesContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.numeric.Arc4NumericTypesContract.clear_state_program
@@ -3974,7 +3974,7 @@ debug: Coalescing local variables in test_cases.arc4_types.numeric.Arc4NumericTy
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.numeric.Arc4NumericTypesContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to arc4_types/out_unoptimized/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.clear.0.clear.destructured.ir
+debug: Output IR to arc4_types/out_unoptimized/Arc4NumericTypesContract.ir/Arc4NumericTypesContract.clear.0.destructured.ir
 debug: Inserted main.ops[2]: 'l-store-copy val_as_bytes%0#0 0'
 debug: Replaced main.ops[4]: 'v-load val_as_bytes%0#0' with 'l-load val_as_bytes%0#0'
 debug: Inserted main.ops[6]: 'l-store-copy int8_encoded#0 0'
@@ -4753,7 +4753,7 @@ debug: * to_do array_head_and_tail#0
 debug: * to_do tail_offset#0
 debug: * to_do head_offset#0
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to arc4_types/out_unoptimized/Arc4MutationContract.ir/Arc4MutationContract.approval.0.approval.destructured.ir
+debug: Output IR to arc4_types/out_unoptimized/Arc4MutationContract.ir/Arc4MutationContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.arc4_types.mutation.Arc4MutationContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.mutation.Arc4MutationContract.clear_state_program
@@ -4771,7 +4771,7 @@ debug: Coalescing local variables in test_cases.arc4_types.mutation.Arc4Mutation
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.mutation.Arc4MutationContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to arc4_types/out_unoptimized/Arc4MutationContract.ir/Arc4MutationContract.clear.0.clear.destructured.ir
+debug: Output IR to arc4_types/out_unoptimized/Arc4MutationContract.ir/Arc4MutationContract.clear.0.destructured.ir
 debug: Inserted dynamic_array_fixed_size.ops[3]: 'l-store-copy result%0#0 0'
 debug: Replaced dynamic_array_fixed_size.ops[5]: 'v-load result%0#0' with 'l-load result%0#0'
 debug: Inserted dynamic_array_fixed_size.ops[12]: 'l-store-copy array_data%0#0 0'
@@ -6665,7 +6665,7 @@ debug: * to_do a%out#0
 debug: * to_do a%is_original#0
 debug: * to_do a#0
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to arc4_types/out_unoptimized/MutableParams2.ir/MutableParams2.approval.0.approval.destructured.ir
+debug: Output IR to arc4_types/out_unoptimized/MutableParams2.ir/MutableParams2.approval.0.destructured.ir
 info: optimizing clear program of test_cases.arc4_types.mutable_params2.MutableParams2 at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -6683,7 +6683,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to arc4_types/out_unoptimized/MutableParams2.ir/MutableParams2.clear.0.clear.destructured.ir
+debug: Output IR to arc4_types/out_unoptimized/MutableParams2.ir/MutableParams2.clear.0.destructured.ir
 debug: Inserted main_block@1.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main_block@1.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_block@1.ops[6]: 'l-store-copy tmp%1#0 0'
@@ -7150,7 +7150,7 @@ debug: * to_do arrays.2#0
 debug: * to_do arrays.1#0
 debug: * to_do arrays.0#0
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to arc4_types/out_unoptimized/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.approval.0.approval.destructured.ir
+debug: Output IR to arc4_types/out_unoptimized/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.arc4_types.mutable_params.Arc4MutableParamsContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.mutable_params.Arc4MutableParamsContract.clear_state_program
@@ -7168,7 +7168,7 @@ debug: Coalescing local variables in test_cases.arc4_types.mutable_params.Arc4Mu
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.mutable_params.Arc4MutableParamsContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to arc4_types/out_unoptimized/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.clear.0.clear.destructured.ir
+debug: Output IR to arc4_types/out_unoptimized/Arc4MutableParamsContract.ir/Arc4MutableParamsContract.clear.0.destructured.ir
 debug: Inserted mutating_copies.ops[3]: 'l-store-copy result%0#0 0'
 debug: Replaced mutating_copies.ops[5]: 'v-load result%0#0' with 'l-load result%0#0'
 debug: Inserted mutating_copies.ops[8]: 'l-store-copy result%1#0 0'
@@ -7903,7 +7903,7 @@ debug: Coalescing local variables in test_cases.arc4_types.dynamic_string_array.
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.dynamic_string_array.Arc4DynamicStringArrayContract.xyz_raw
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to arc4_types/out_unoptimized/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.approval.0.approval.destructured.ir
+debug: Output IR to arc4_types/out_unoptimized/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.arc4_types.dynamic_string_array.Arc4DynamicStringArrayContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -7921,7 +7921,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to arc4_types/out_unoptimized/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.clear.0.clear.destructured.ir
+debug: Output IR to arc4_types/out_unoptimized/Arc4DynamicStringArrayContract.ir/Arc4DynamicStringArrayContract.clear.0.destructured.ir
 debug: Inserted main_block@1.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main_block@1.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_block@1.ops[6]: 'l-store-copy tmp%1#0 0'
@@ -8166,7 +8166,7 @@ debug: to_do: item_index_internal%2#0, total#0
 debug: * to_do total#0
 debug: * to_do item_index_internal%2#0
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to arc4_types/out_unoptimized/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.approval.0.approval.destructured.ir
+debug: Output IR to arc4_types/out_unoptimized/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.arc4_types.dynamic_bytes.Arc4DynamicBytesContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.dynamic_bytes.Arc4DynamicBytesContract.clear_state_program
@@ -8184,7 +8184,7 @@ debug: Coalescing local variables in test_cases.arc4_types.dynamic_bytes.Arc4Dyn
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.dynamic_bytes.Arc4DynamicBytesContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to arc4_types/out_unoptimized/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.clear.0.clear.destructured.ir
+debug: Output IR to arc4_types/out_unoptimized/Arc4DynamicBytesContract.ir/Arc4DynamicBytesContract.clear.0.destructured.ir
 debug: Inserted main.ops[5]: 'l-store-copy result%0#0 0'
 debug: Replaced main.ops[7]: 'v-load result%0#0' with 'l-load result%0#0'
 debug: Inserted main.ops[10]: 'l-store-copy result%1#0 0'
@@ -8400,7 +8400,7 @@ debug: Coalescing dynamic_arr#0 with [dynamic_arr#1]
 debug: Coalescing resulted in 2 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.bool_eval.Arc4BoolEvalContract.approval_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to arc4_types/out_unoptimized/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.approval.0.approval.destructured.ir
+debug: Output IR to arc4_types/out_unoptimized/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.arc4_types.bool_eval.Arc4BoolEvalContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.bool_eval.Arc4BoolEvalContract.clear_state_program
@@ -8418,7 +8418,7 @@ debug: Coalescing local variables in test_cases.arc4_types.bool_eval.Arc4BoolEva
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.bool_eval.Arc4BoolEvalContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to arc4_types/out_unoptimized/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.clear.0.clear.destructured.ir
+debug: Output IR to arc4_types/out_unoptimized/Arc4BoolEvalContract.ir/Arc4BoolEvalContract.clear.0.destructured.ir
 debug: Inserted main.ops[4]: 'l-store-copy encoded_bool%0#0 0'
 debug: Replaced main.ops[6]: 'v-load encoded_bool%0#0' with 'l-load encoded_bool%0#0'
 debug: Inserted main.ops[9]: 'l-store-copy tmp%0#0 0'
@@ -8570,7 +8570,7 @@ debug: Coalescing local variables in test_cases.arc4_types.bool.Arc4BoolTypeCont
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.bool.Arc4BoolTypeContract.test_stuff
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to arc4_types/out_unoptimized/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.approval.0.approval.destructured.ir
+debug: Output IR to arc4_types/out_unoptimized/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.arc4_types.bool.Arc4BoolTypeContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.bool.Arc4BoolTypeContract.clear_state_program
@@ -8588,7 +8588,7 @@ debug: Coalescing local variables in test_cases.arc4_types.bool.Arc4BoolTypeCont
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.bool.Arc4BoolTypeContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to arc4_types/out_unoptimized/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.clear.0.clear.destructured.ir
+debug: Output IR to arc4_types/out_unoptimized/Arc4BoolTypeContract.ir/Arc4BoolTypeContract.clear.0.destructured.ir
 debug: Inserted main.ops[15]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[17]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[30]: 'l-store-copy encoded_bool%2#0 0'
@@ -8948,7 +8948,7 @@ debug: Coalescing local variables in test_cases.arc4_types.array.Arc4ArraysContr
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.array.Arc4ArraysContract.hash_as_array
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to arc4_types/out_unoptimized/Arc4ArraysContract.ir/Arc4ArraysContract.approval.0.approval.destructured.ir
+debug: Output IR to arc4_types/out_unoptimized/Arc4ArraysContract.ir/Arc4ArraysContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.arc4_types.array.Arc4ArraysContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.array.Arc4ArraysContract.clear_state_program
@@ -8966,7 +8966,7 @@ debug: Coalescing local variables in test_cases.arc4_types.array.Arc4ArraysContr
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.array.Arc4ArraysContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to arc4_types/out_unoptimized/Arc4ArraysContract.ir/Arc4ArraysContract.clear.0.clear.destructured.ir
+debug: Output IR to arc4_types/out_unoptimized/Arc4ArraysContract.ir/Arc4ArraysContract.clear.0.destructured.ir
 debug: Inserted main.ops[3]: 'l-store-copy result%0#0 0'
 debug: Replaced main.ops[5]: 'v-load result%0#0' with 'l-load result%0#0'
 debug: Inserted main.ops[12]: 'l-store-copy array_data%0#0 0'
@@ -9260,7 +9260,7 @@ debug: Coalescing local variables in test_cases.arc4_types.address.Arc4AddressCo
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.address.Arc4AddressContract.approval_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to arc4_types/out_unoptimized/Arc4AddressContract.ir/Arc4AddressContract.approval.0.approval.destructured.ir
+debug: Output IR to arc4_types/out_unoptimized/Arc4AddressContract.ir/Arc4AddressContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.arc4_types.address.Arc4AddressContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.address.Arc4AddressContract.clear_state_program
@@ -9278,7 +9278,7 @@ debug: Coalescing local variables in test_cases.arc4_types.address.Arc4AddressCo
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.address.Arc4AddressContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to arc4_types/out_unoptimized/Arc4AddressContract.ir/Arc4AddressContract.clear.0.clear.destructured.ir
+debug: Output IR to arc4_types/out_unoptimized/Arc4AddressContract.ir/Arc4AddressContract.clear.0.destructured.ir
 debug: Inserted main.ops[7]: 'l-store-copy tmp%1#0 0'
 debug: Replaced main.ops[9]: 'v-load tmp%1#0' with 'l-load tmp%1#0'
 debug: Inserted main.ops[14]: 'l-store-copy tmp%2#0 0'
@@ -9340,7 +9340,7 @@ debug: Coalescing local variables in test_cases.arc4_types.structs2.Arc4StructsF
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.structs2.Arc4StructsFromAnotherModule.approval_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to arc4_types/out_unoptimized/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.approval.0.approval.destructured.ir
+debug: Output IR to arc4_types/out_unoptimized/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.approval.0.destructured.ir
 info: optimizing clear program of test_cases.arc4_types.structs2.Arc4StructsFromAnotherModule at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.arc4_types.structs2.Arc4StructsFromAnotherModule.clear_state_program
@@ -9358,7 +9358,7 @@ debug: Coalescing local variables in test_cases.arc4_types.structs2.Arc4StructsF
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc4_types.structs2.Arc4StructsFromAnotherModule.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to arc4_types/out_unoptimized/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.clear.0.clear.destructured.ir
+debug: Output IR to arc4_types/out_unoptimized/Arc4StructsFromAnotherModule.ir/Arc4StructsFromAnotherModule.clear.0.destructured.ir
 debug: Inserted main.ops[50]: 'l-store-copy encoded_tuple_buffer%4#0 0'
 debug: Replaced main.ops[52]: 'v-load encoded_tuple_buffer%4#0' with 'l-load encoded_tuple_buffer%4#0'
 debug: Inserted main.ops[53]: 'l-store-copy flags#0 0'
diff --git a/test_cases/arc_56/out/Contract.ir/Contract.approval.0.approval.ssa.ir b/test_cases/arc_56/out/Contract.ir/Contract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/arc_56/out/Contract.ir/Contract.approval.0.approval.ssa.ir
rename to test_cases/arc_56/out/Contract.ir/Contract.approval.0.ssa.ir
diff --git a/test_cases/arc_56/out/Contract.ir/Contract.approval.1.approval.ssa.opt.ir b/test_cases/arc_56/out/Contract.ir/Contract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/arc_56/out/Contract.ir/Contract.approval.1.approval.ssa.opt.ir
rename to test_cases/arc_56/out/Contract.ir/Contract.approval.1.ssa.opt.ir
diff --git a/test_cases/arc_56/out/Contract.ir/Contract.approval.2.approval.ssa.opt.ir b/test_cases/arc_56/out/Contract.ir/Contract.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/arc_56/out/Contract.ir/Contract.approval.2.approval.ssa.opt.ir
rename to test_cases/arc_56/out/Contract.ir/Contract.approval.2.ssa.opt.ir
diff --git a/test_cases/arc_56/out/Contract.ir/Contract.approval.3.approval.destructured.ir b/test_cases/arc_56/out/Contract.ir/Contract.approval.3.destructured.ir
similarity index 100%
rename from test_cases/arc_56/out/Contract.ir/Contract.approval.3.approval.destructured.ir
rename to test_cases/arc_56/out/Contract.ir/Contract.approval.3.destructured.ir
diff --git a/test_cases/arc_56/out/Contract.ir/Contract.clear.0.clear.ssa.ir b/test_cases/arc_56/out/Contract.ir/Contract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/arc_56/out/Contract.ir/Contract.clear.0.clear.ssa.ir
rename to test_cases/arc_56/out/Contract.ir/Contract.clear.0.ssa.ir
diff --git a/test_cases/arc_56/out/Contract.ir/Contract.clear.1.clear.destructured.ir b/test_cases/arc_56/out/Contract.ir/Contract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/arc_56/out/Contract.ir/Contract.clear.1.clear.destructured.ir
rename to test_cases/arc_56/out/Contract.ir/Contract.clear.1.destructured.ir
diff --git a/test_cases/arc_56/out_O2/Contract.ir/Contract.approval.0.approval.destructured.ir b/test_cases/arc_56/out_O2/Contract.ir/Contract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/arc_56/out_O2/Contract.ir/Contract.approval.0.approval.destructured.ir
rename to test_cases/arc_56/out_O2/Contract.ir/Contract.approval.0.destructured.ir
diff --git a/test_cases/arc_56/out_O2/Contract.ir/Contract.clear.0.clear.destructured.ir b/test_cases/arc_56/out_O2/Contract.ir/Contract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/arc_56/out_O2/Contract.ir/Contract.clear.0.clear.destructured.ir
rename to test_cases/arc_56/out_O2/Contract.ir/Contract.clear.0.destructured.ir
diff --git a/test_cases/arc_56/out_unoptimized/Contract.ir/Contract.approval.0.approval.destructured.ir b/test_cases/arc_56/out_unoptimized/Contract.ir/Contract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/arc_56/out_unoptimized/Contract.ir/Contract.approval.0.approval.destructured.ir
rename to test_cases/arc_56/out_unoptimized/Contract.ir/Contract.approval.0.destructured.ir
diff --git a/test_cases/arc_56/out_unoptimized/Contract.ir/Contract.clear.0.clear.destructured.ir b/test_cases/arc_56/out_unoptimized/Contract.ir/Contract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/arc_56/out_unoptimized/Contract.ir/Contract.clear.0.clear.destructured.ir
rename to test_cases/arc_56/out_unoptimized/Contract.ir/Contract.clear.0.destructured.ir
diff --git a/test_cases/arc_56/puya.log b/test_cases/arc_56/puya.log
index b939124691..7210e629f2 100644
--- a/test_cases/arc_56/puya.log
+++ b/test_cases/arc_56/puya.log
@@ -477,7 +477,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to arc_56/out/Contract.ir/Contract.approval.0.approval.ssa.ir
+debug: Output IR to arc_56/out/Contract.ir/Contract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.arc_56.contract.Contract at level 1
 debug: Begin optimization pass 1/100
 debug: marking trivial method test_cases.arc_56.contract.Contract.__init__ as inlineable
@@ -942,7 +942,7 @@ debug: removing unused subroutine test_cases.arc_56.contract.echo
 debug: removing unused subroutine test_cases.arc_56.contract.Contract.template_value
 debug: removing unused subroutine test_cases.arc_56.contract.Contract.bare_create
 debug: removing unused subroutine test_cases.arc_56.contract.Contract.transient
-debug: Output IR to arc_56/out/Contract.ir/Contract.approval.1.approval.ssa.opt.ir
+debug: Output IR to arc_56/out/Contract.ir/Contract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.arc_56.contract.Contract.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -1061,7 +1061,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.arc_56.contract.Contract.__puya_arc4_router__
-debug: Output IR to arc_56/out/Contract.ir/Contract.approval.2.approval.ssa.opt.ir
+debug: Output IR to arc_56/out/Contract.ir/Contract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.arc_56.contract.Contract.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -1198,8 +1198,8 @@ debug: Coalescing local variables in test_cases.arc_56.contract.Contract.conditi
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc_56.contract.Contract.conditional_emit
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to arc_56/out/Contract.ir/Contract.approval.3.approval.destructured.ir
-debug: Output IR to arc_56/out/Contract.ir/Contract.clear.0.clear.ssa.ir
+debug: Output IR to arc_56/out/Contract.ir/Contract.approval.3.destructured.ir
+debug: Output IR to arc_56/out/Contract.ir/Contract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.arc_56.contract.Contract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -1225,7 +1225,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to arc_56/out/Contract.ir/Contract.clear.1.clear.destructured.ir
+debug: Output IR to arc_56/out/Contract.ir/Contract.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#2 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#2' with 'l-load tmp%0#2'
 debug: Inserted main_abi_routing@4.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/arc_56/puya_O2.log b/test_cases/arc_56/puya_O2.log
index db704eb46f..e8a203c3bd 100644
--- a/test_cases/arc_56/puya_O2.log
+++ b/test_cases/arc_56/puya_O2.log
@@ -1258,7 +1258,7 @@ debug: Sequentializing parallel copies in test_cases.arc_56.contract.Contract.__
 debug: Performing post-SSA optimizations at level 2
 debug: Removing duplicated block block@15 and updating references to block@12
 debug: Replaced predecessor block@15 with block@12 in block@18
-debug: Output IR to arc_56/out_O2/Contract.ir/Contract.approval.0.approval.destructured.ir
+debug: Output IR to arc_56/out_O2/Contract.ir/Contract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.arc_56.contract.Contract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -1284,7 +1284,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to arc_56/out_O2/Contract.ir/Contract.clear.0.clear.destructured.ir
+debug: Output IR to arc_56/out_O2/Contract.ir/Contract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#2 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#2' with 'l-load tmp%0#2'
 debug: Inserted main_abi_routing@4.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/arc_56/puya_unoptimized.log b/test_cases/arc_56/puya_unoptimized.log
index f00a9713f1..10e1bbbde5 100644
--- a/test_cases/arc_56/puya_unoptimized.log
+++ b/test_cases/arc_56/puya_unoptimized.log
@@ -888,7 +888,7 @@ debug: Coalescing local variables in test_cases.arc_56.contract.Contract.transie
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.arc_56.contract.Contract.transient
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to arc_56/out_unoptimized/Contract.ir/Contract.approval.0.approval.destructured.ir
+debug: Output IR to arc_56/out_unoptimized/Contract.ir/Contract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.arc_56.contract.Contract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -906,7 +906,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to arc_56/out_unoptimized/Contract.ir/Contract.clear.0.clear.destructured.ir
+debug: Output IR to arc_56/out_unoptimized/Contract.ir/Contract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/asset/out/Reference.ir/Reference.approval.0.approval.ssa.ir b/test_cases/asset/out/Reference.ir/Reference.approval.0.ssa.ir
similarity index 100%
rename from test_cases/asset/out/Reference.ir/Reference.approval.0.approval.ssa.ir
rename to test_cases/asset/out/Reference.ir/Reference.approval.0.ssa.ir
diff --git a/test_cases/asset/out/Reference.ir/Reference.approval.1.approval.ssa.opt.ir b/test_cases/asset/out/Reference.ir/Reference.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/asset/out/Reference.ir/Reference.approval.1.approval.ssa.opt.ir
rename to test_cases/asset/out/Reference.ir/Reference.approval.1.ssa.opt.ir
diff --git a/test_cases/asset/out/Reference.ir/Reference.approval.2.approval.ssa.opt.ir b/test_cases/asset/out/Reference.ir/Reference.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/asset/out/Reference.ir/Reference.approval.2.approval.ssa.opt.ir
rename to test_cases/asset/out/Reference.ir/Reference.approval.2.ssa.opt.ir
diff --git a/test_cases/asset/out/Reference.ir/Reference.approval.3.approval.destructured.ir b/test_cases/asset/out/Reference.ir/Reference.approval.3.destructured.ir
similarity index 100%
rename from test_cases/asset/out/Reference.ir/Reference.approval.3.approval.destructured.ir
rename to test_cases/asset/out/Reference.ir/Reference.approval.3.destructured.ir
diff --git a/test_cases/asset/out/Reference.ir/Reference.clear.0.clear.ssa.ir b/test_cases/asset/out/Reference.ir/Reference.clear.0.ssa.ir
similarity index 100%
rename from test_cases/asset/out/Reference.ir/Reference.clear.0.clear.ssa.ir
rename to test_cases/asset/out/Reference.ir/Reference.clear.0.ssa.ir
diff --git a/test_cases/asset/out/Reference.ir/Reference.clear.1.clear.destructured.ir b/test_cases/asset/out/Reference.ir/Reference.clear.1.destructured.ir
similarity index 100%
rename from test_cases/asset/out/Reference.ir/Reference.clear.1.clear.destructured.ir
rename to test_cases/asset/out/Reference.ir/Reference.clear.1.destructured.ir
diff --git a/test_cases/asset/out_O2/Reference.ir/Reference.approval.0.approval.destructured.ir b/test_cases/asset/out_O2/Reference.ir/Reference.approval.0.destructured.ir
similarity index 100%
rename from test_cases/asset/out_O2/Reference.ir/Reference.approval.0.approval.destructured.ir
rename to test_cases/asset/out_O2/Reference.ir/Reference.approval.0.destructured.ir
diff --git a/test_cases/asset/out_O2/Reference.ir/Reference.clear.0.clear.destructured.ir b/test_cases/asset/out_O2/Reference.ir/Reference.clear.0.destructured.ir
similarity index 100%
rename from test_cases/asset/out_O2/Reference.ir/Reference.clear.0.clear.destructured.ir
rename to test_cases/asset/out_O2/Reference.ir/Reference.clear.0.destructured.ir
diff --git a/test_cases/asset/out_unoptimized/Reference.ir/Reference.approval.0.approval.destructured.ir b/test_cases/asset/out_unoptimized/Reference.ir/Reference.approval.0.destructured.ir
similarity index 100%
rename from test_cases/asset/out_unoptimized/Reference.ir/Reference.approval.0.approval.destructured.ir
rename to test_cases/asset/out_unoptimized/Reference.ir/Reference.approval.0.destructured.ir
diff --git a/test_cases/asset/out_unoptimized/Reference.ir/Reference.clear.0.clear.destructured.ir b/test_cases/asset/out_unoptimized/Reference.ir/Reference.clear.0.destructured.ir
similarity index 100%
rename from test_cases/asset/out_unoptimized/Reference.ir/Reference.clear.0.clear.destructured.ir
rename to test_cases/asset/out_unoptimized/Reference.ir/Reference.clear.0.destructured.ir
diff --git a/test_cases/asset/puya.log b/test_cases/asset/puya.log
index d0aa44dc6f..1a91738656 100644
--- a/test_cases/asset/puya.log
+++ b/test_cases/asset/puya.log
@@ -439,7 +439,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to asset/out/Reference.ir/Reference.approval.0.approval.ssa.ir
+debug: Output IR to asset/out/Reference.ir/Reference.approval.0.ssa.ir
 info: optimizing approval program of test_cases.asset.contract.Reference at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.asset.contract.Reference.__init__ for inlining
@@ -568,7 +568,7 @@ debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.asset.contract.Reference.__init__
 debug: removing unused subroutine test_cases.asset.contract.Reference.approval_program
-debug: Output IR to asset/out/Reference.ir/Reference.approval.1.approval.ssa.opt.ir
+debug: Output IR to asset/out/Reference.ir/Reference.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking single-use function test_cases.asset.contract.Reference.opt_into_asset for inlining
 debug: marking single-use function test_cases.asset.contract.Reference.is_opted_asset for inlining
@@ -632,7 +632,7 @@ debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.asset.contract.Reference.opt_into_asset
 debug: removing unused subroutine test_cases.asset.contract.Reference.is_opted_asset
-debug: Output IR to asset/out/Reference.ir/Reference.approval.2.approval.ssa.opt.ir
+debug: Output IR to asset/out/Reference.ir/Reference.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.asset.contract.Reference.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -666,8 +666,8 @@ debug: Coalescing tmp%5#0 with [tmp%5#1]
 debug: Coalescing resulted in 33 replacement/s
 debug: Sequentializing parallel copies in test_cases.asset.contract.Reference.__algopy_entrypoint_with_init
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to asset/out/Reference.ir/Reference.approval.3.approval.destructured.ir
-debug: Output IR to asset/out/Reference.ir/Reference.clear.0.clear.ssa.ir
+debug: Output IR to asset/out/Reference.ir/Reference.approval.3.destructured.ir
+debug: Output IR to asset/out/Reference.ir/Reference.clear.0.ssa.ir
 info: optimizing clear program of test_cases.asset.contract.Reference at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.asset.contract.Reference.clear_state_program
@@ -693,7 +693,7 @@ debug: Coalescing local variables in test_cases.asset.contract.Reference.clear_s
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.asset.contract.Reference.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to asset/out/Reference.ir/Reference.clear.1.clear.destructured.ir
+debug: Output IR to asset/out/Reference.ir/Reference.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%0#1 0'
diff --git a/test_cases/asset/puya_O2.log b/test_cases/asset/puya_O2.log
index 9dfce9cfc5..7d53677bc2 100644
--- a/test_cases/asset/puya_O2.log
+++ b/test_cases/asset/puya_O2.log
@@ -662,7 +662,7 @@ debug: Coalescing tmp%5#0 with [tmp%5#1]
 debug: Coalescing resulted in 33 replacement/s
 debug: Sequentializing parallel copies in test_cases.asset.contract.Reference.__algopy_entrypoint_with_init
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to asset/out_O2/Reference.ir/Reference.approval.0.approval.destructured.ir
+debug: Output IR to asset/out_O2/Reference.ir/Reference.approval.0.destructured.ir
 info: optimizing clear program of test_cases.asset.contract.Reference at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.asset.contract.Reference.clear_state_program
@@ -688,7 +688,7 @@ debug: Coalescing local variables in test_cases.asset.contract.Reference.clear_s
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.asset.contract.Reference.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to asset/out_O2/Reference.ir/Reference.clear.0.clear.destructured.ir
+debug: Output IR to asset/out_O2/Reference.ir/Reference.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%0#1 0'
diff --git a/test_cases/asset/puya_unoptimized.log b/test_cases/asset/puya_unoptimized.log
index 63f4977c63..2929fb65fc 100644
--- a/test_cases/asset/puya_unoptimized.log
+++ b/test_cases/asset/puya_unoptimized.log
@@ -512,7 +512,7 @@ debug: Coalescing local variables in test_cases.asset.contract.Reference.is_opte
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.asset.contract.Reference.is_opted_asset
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to asset/out_unoptimized/Reference.ir/Reference.approval.0.approval.destructured.ir
+debug: Output IR to asset/out_unoptimized/Reference.ir/Reference.approval.0.destructured.ir
 info: optimizing clear program of test_cases.asset.contract.Reference at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.asset.contract.Reference.clear_state_program
@@ -530,7 +530,7 @@ debug: Coalescing local variables in test_cases.asset.contract.Reference.clear_s
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.asset.contract.Reference.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to asset/out_unoptimized/Reference.ir/Reference.clear.0.clear.destructured.ir
+debug: Output IR to asset/out_unoptimized/Reference.ir/Reference.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/augmented_assignment/out/Augmented.ir/Augmented.approval.0.approval.ssa.ir b/test_cases/augmented_assignment/out/Augmented.ir/Augmented.approval.0.ssa.ir
similarity index 100%
rename from test_cases/augmented_assignment/out/Augmented.ir/Augmented.approval.0.approval.ssa.ir
rename to test_cases/augmented_assignment/out/Augmented.ir/Augmented.approval.0.ssa.ir
diff --git a/test_cases/augmented_assignment/out/Augmented.ir/Augmented.approval.1.approval.ssa.opt.ir b/test_cases/augmented_assignment/out/Augmented.ir/Augmented.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/augmented_assignment/out/Augmented.ir/Augmented.approval.1.approval.ssa.opt.ir
rename to test_cases/augmented_assignment/out/Augmented.ir/Augmented.approval.1.ssa.opt.ir
diff --git a/test_cases/augmented_assignment/out/Augmented.ir/Augmented.approval.2.approval.destructured.ir b/test_cases/augmented_assignment/out/Augmented.ir/Augmented.approval.2.destructured.ir
similarity index 100%
rename from test_cases/augmented_assignment/out/Augmented.ir/Augmented.approval.2.approval.destructured.ir
rename to test_cases/augmented_assignment/out/Augmented.ir/Augmented.approval.2.destructured.ir
diff --git a/test_cases/augmented_assignment/out/Augmented.ir/Augmented.clear.0.clear.ssa.ir b/test_cases/augmented_assignment/out/Augmented.ir/Augmented.clear.0.ssa.ir
similarity index 100%
rename from test_cases/augmented_assignment/out/Augmented.ir/Augmented.clear.0.clear.ssa.ir
rename to test_cases/augmented_assignment/out/Augmented.ir/Augmented.clear.0.ssa.ir
diff --git a/test_cases/augmented_assignment/out/Augmented.ir/Augmented.clear.1.clear.destructured.ir b/test_cases/augmented_assignment/out/Augmented.ir/Augmented.clear.1.destructured.ir
similarity index 100%
rename from test_cases/augmented_assignment/out/Augmented.ir/Augmented.clear.1.clear.destructured.ir
rename to test_cases/augmented_assignment/out/Augmented.ir/Augmented.clear.1.destructured.ir
diff --git a/test_cases/augmented_assignment/out_O2/Augmented.ir/Augmented.approval.0.approval.destructured.ir b/test_cases/augmented_assignment/out_O2/Augmented.ir/Augmented.approval.0.destructured.ir
similarity index 100%
rename from test_cases/augmented_assignment/out_O2/Augmented.ir/Augmented.approval.0.approval.destructured.ir
rename to test_cases/augmented_assignment/out_O2/Augmented.ir/Augmented.approval.0.destructured.ir
diff --git a/test_cases/augmented_assignment/out_O2/Augmented.ir/Augmented.clear.0.clear.destructured.ir b/test_cases/augmented_assignment/out_O2/Augmented.ir/Augmented.clear.0.destructured.ir
similarity index 100%
rename from test_cases/augmented_assignment/out_O2/Augmented.ir/Augmented.clear.0.clear.destructured.ir
rename to test_cases/augmented_assignment/out_O2/Augmented.ir/Augmented.clear.0.destructured.ir
diff --git a/test_cases/augmented_assignment/out_unoptimized/Augmented.ir/Augmented.approval.0.approval.destructured.ir b/test_cases/augmented_assignment/out_unoptimized/Augmented.ir/Augmented.approval.0.destructured.ir
similarity index 100%
rename from test_cases/augmented_assignment/out_unoptimized/Augmented.ir/Augmented.approval.0.approval.destructured.ir
rename to test_cases/augmented_assignment/out_unoptimized/Augmented.ir/Augmented.approval.0.destructured.ir
diff --git a/test_cases/augmented_assignment/out_unoptimized/Augmented.ir/Augmented.clear.0.clear.destructured.ir b/test_cases/augmented_assignment/out_unoptimized/Augmented.ir/Augmented.clear.0.destructured.ir
similarity index 100%
rename from test_cases/augmented_assignment/out_unoptimized/Augmented.ir/Augmented.clear.0.clear.destructured.ir
rename to test_cases/augmented_assignment/out_unoptimized/Augmented.ir/Augmented.clear.0.destructured.ir
diff --git a/test_cases/augmented_assignment/puya.log b/test_cases/augmented_assignment/puya.log
index 8f60d124af..52db845f6e 100644
--- a/test_cases/augmented_assignment/puya.log
+++ b/test_cases/augmented_assignment/puya.log
@@ -445,7 +445,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to augmented_assignment/out/Augmented.ir/Augmented.approval.0.approval.ssa.ir
+debug: Output IR to augmented_assignment/out/Augmented.ir/Augmented.approval.0.ssa.ir
 info: optimizing approval program of test_cases.augmented_assignment.contract.Augmented at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.augmented_assignment.contract.Augmented.__init__ for inlining
@@ -529,7 +529,7 @@ debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.augmented_assignment.contract.Augmented.__init__
 debug: removing unused subroutine test_cases.augmented_assignment.contract.Augmented.approval_program
-debug: Output IR to augmented_assignment/out/Augmented.ir/Augmented.approval.1.approval.ssa.opt.ir
+debug: Output IR to augmented_assignment/out/Augmented.ir/Augmented.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.augmented_assignment.contract.Augmented.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -576,8 +576,8 @@ debug: Coalescing local variables in test_cases.augmented_assignment.contract.Au
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.augmented_assignment.contract.Augmented.get_sender_with_side_effect
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to augmented_assignment/out/Augmented.ir/Augmented.approval.2.approval.destructured.ir
-debug: Output IR to augmented_assignment/out/Augmented.ir/Augmented.clear.0.clear.ssa.ir
+debug: Output IR to augmented_assignment/out/Augmented.ir/Augmented.approval.2.destructured.ir
+debug: Output IR to augmented_assignment/out/Augmented.ir/Augmented.clear.0.ssa.ir
 info: optimizing clear program of test_cases.augmented_assignment.contract.Augmented at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.augmented_assignment.contract.Augmented.clear_state_program
@@ -603,7 +603,7 @@ debug: Coalescing local variables in test_cases.augmented_assignment.contract.Au
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.augmented_assignment.contract.Augmented.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to augmented_assignment/out/Augmented.ir/Augmented.clear.1.clear.destructured.ir
+debug: Output IR to augmented_assignment/out/Augmented.ir/Augmented.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[3]: 'l-store-copy tmp%0#1 0'
diff --git a/test_cases/augmented_assignment/puya_O2.log b/test_cases/augmented_assignment/puya_O2.log
index 0770872129..37759aca0e 100644
--- a/test_cases/augmented_assignment/puya_O2.log
+++ b/test_cases/augmented_assignment/puya_O2.log
@@ -573,7 +573,7 @@ debug: Coalescing local variables in test_cases.augmented_assignment.contract.Au
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.augmented_assignment.contract.Augmented.get_sender_with_side_effect
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to augmented_assignment/out_O2/Augmented.ir/Augmented.approval.0.approval.destructured.ir
+debug: Output IR to augmented_assignment/out_O2/Augmented.ir/Augmented.approval.0.destructured.ir
 info: optimizing clear program of test_cases.augmented_assignment.contract.Augmented at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.augmented_assignment.contract.Augmented.clear_state_program
@@ -599,7 +599,7 @@ debug: Coalescing local variables in test_cases.augmented_assignment.contract.Au
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.augmented_assignment.contract.Augmented.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to augmented_assignment/out_O2/Augmented.ir/Augmented.clear.0.clear.destructured.ir
+debug: Output IR to augmented_assignment/out_O2/Augmented.ir/Augmented.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[3]: 'l-store-copy tmp%0#1 0'
diff --git a/test_cases/augmented_assignment/puya_unoptimized.log b/test_cases/augmented_assignment/puya_unoptimized.log
index 4cdceecac6..efda76b743 100644
--- a/test_cases/augmented_assignment/puya_unoptimized.log
+++ b/test_cases/augmented_assignment/puya_unoptimized.log
@@ -503,7 +503,7 @@ debug: Coalescing local variables in test_cases.augmented_assignment.contract.Au
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.augmented_assignment.contract.Augmented.get_sender_with_side_effect
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to augmented_assignment/out_unoptimized/Augmented.ir/Augmented.approval.0.approval.destructured.ir
+debug: Output IR to augmented_assignment/out_unoptimized/Augmented.ir/Augmented.approval.0.destructured.ir
 info: optimizing clear program of test_cases.augmented_assignment.contract.Augmented at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.augmented_assignment.contract.Augmented.clear_state_program
@@ -521,7 +521,7 @@ debug: Coalescing local variables in test_cases.augmented_assignment.contract.Au
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.augmented_assignment.contract.Augmented.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to augmented_assignment/out_unoptimized/Augmented.ir/Augmented.clear.0.clear.destructured.ir
+debug: Output IR to augmented_assignment/out_unoptimized/Augmented.ir/Augmented.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/avm_11/out/Contract.ir/Contract.approval.0.approval.ssa.ir b/test_cases/avm_11/out/Contract.ir/Contract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/avm_11/out/Contract.ir/Contract.approval.0.approval.ssa.ir
rename to test_cases/avm_11/out/Contract.ir/Contract.approval.0.ssa.ir
diff --git a/test_cases/avm_11/out/Contract.ir/Contract.approval.1.approval.ssa.opt.ir b/test_cases/avm_11/out/Contract.ir/Contract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/avm_11/out/Contract.ir/Contract.approval.1.approval.ssa.opt.ir
rename to test_cases/avm_11/out/Contract.ir/Contract.approval.1.ssa.opt.ir
diff --git a/test_cases/avm_11/out/Contract.ir/Contract.approval.2.approval.ssa.opt.ir b/test_cases/avm_11/out/Contract.ir/Contract.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/avm_11/out/Contract.ir/Contract.approval.2.approval.ssa.opt.ir
rename to test_cases/avm_11/out/Contract.ir/Contract.approval.2.ssa.opt.ir
diff --git a/test_cases/avm_11/out/Contract.ir/Contract.approval.3.approval.destructured.ir b/test_cases/avm_11/out/Contract.ir/Contract.approval.3.destructured.ir
similarity index 100%
rename from test_cases/avm_11/out/Contract.ir/Contract.approval.3.approval.destructured.ir
rename to test_cases/avm_11/out/Contract.ir/Contract.approval.3.destructured.ir
diff --git a/test_cases/avm_11/out/Contract.ir/Contract.clear.0.clear.ssa.ir b/test_cases/avm_11/out/Contract.ir/Contract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/avm_11/out/Contract.ir/Contract.clear.0.clear.ssa.ir
rename to test_cases/avm_11/out/Contract.ir/Contract.clear.0.ssa.ir
diff --git a/test_cases/avm_11/out/Contract.ir/Contract.clear.1.clear.destructured.ir b/test_cases/avm_11/out/Contract.ir/Contract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/avm_11/out/Contract.ir/Contract.clear.1.clear.destructured.ir
rename to test_cases/avm_11/out/Contract.ir/Contract.clear.1.destructured.ir
diff --git a/test_cases/avm_11/out_O2/Contract.ir/Contract.approval.0.approval.destructured.ir b/test_cases/avm_11/out_O2/Contract.ir/Contract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/avm_11/out_O2/Contract.ir/Contract.approval.0.approval.destructured.ir
rename to test_cases/avm_11/out_O2/Contract.ir/Contract.approval.0.destructured.ir
diff --git a/test_cases/avm_11/out_O2/Contract.ir/Contract.clear.0.clear.destructured.ir b/test_cases/avm_11/out_O2/Contract.ir/Contract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/avm_11/out_O2/Contract.ir/Contract.clear.0.clear.destructured.ir
rename to test_cases/avm_11/out_O2/Contract.ir/Contract.clear.0.destructured.ir
diff --git a/test_cases/avm_11/out_unoptimized/Contract.ir/Contract.approval.0.approval.destructured.ir b/test_cases/avm_11/out_unoptimized/Contract.ir/Contract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/avm_11/out_unoptimized/Contract.ir/Contract.approval.0.approval.destructured.ir
rename to test_cases/avm_11/out_unoptimized/Contract.ir/Contract.approval.0.destructured.ir
diff --git a/test_cases/avm_11/out_unoptimized/Contract.ir/Contract.clear.0.clear.destructured.ir b/test_cases/avm_11/out_unoptimized/Contract.ir/Contract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/avm_11/out_unoptimized/Contract.ir/Contract.clear.0.clear.destructured.ir
rename to test_cases/avm_11/out_unoptimized/Contract.ir/Contract.clear.0.destructured.ir
diff --git a/test_cases/avm_11/puya.log b/test_cases/avm_11/puya.log
index 3835dfbb71..8849e6a80b 100644
--- a/test_cases/avm_11/puya.log
+++ b/test_cases/avm_11/puya.log
@@ -475,7 +475,7 @@ debug: Replaced main.ops[4]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[6]: 'l-store-copy tmp%1#0 0'
 debug: Replaced main.ops[8]: 'v-load tmp%1#0' with 'l-load tmp%1#0'
 avm_11/contract.py:4 debug: optimizing TEAL subroutine test_cases.avm_11.contract.avm_11_sig() -> uint64:
-debug: Output IR to avm_11/out/Contract.ir/Contract.approval.0.approval.ssa.ir
+debug: Output IR to avm_11/out/Contract.ir/Contract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.avm_11.contract.Contract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
@@ -607,7 +607,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.avm_11.contract.Contract.__puya_arc4_router__
-debug: Output IR to avm_11/out/Contract.ir/Contract.approval.1.approval.ssa.opt.ir
+debug: Output IR to avm_11/out/Contract.ir/Contract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -666,7 +666,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.avm_11.contract.Contract.__algopy_default_create
-debug: Output IR to avm_11/out/Contract.ir/Contract.approval.2.approval.ssa.opt.ir
+debug: Output IR to avm_11/out/Contract.ir/Contract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -718,8 +718,8 @@ debug: Coalescing local variables in test_cases.avm_11.contract.Contract.test_ne
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.avm_11.contract.Contract.test_new_ops
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to avm_11/out/Contract.ir/Contract.approval.3.approval.destructured.ir
-debug: Output IR to avm_11/out/Contract.ir/Contract.clear.0.clear.ssa.ir
+debug: Output IR to avm_11/out/Contract.ir/Contract.approval.3.destructured.ir
+debug: Output IR to avm_11/out/Contract.ir/Contract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.avm_11.contract.Contract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -745,7 +745,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to avm_11/out/Contract.ir/Contract.clear.1.clear.destructured.ir
+debug: Output IR to avm_11/out/Contract.ir/Contract.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/avm_11/puya_O2.log b/test_cases/avm_11/puya_O2.log
index 4484fc80e9..c715a75c1a 100644
--- a/test_cases/avm_11/puya_O2.log
+++ b/test_cases/avm_11/puya_O2.log
@@ -741,7 +741,7 @@ debug: Coalescing tmp%0#0 with [tmp%0#3]
 debug: Coalescing resulted in 8 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to avm_11/out_O2/Contract.ir/Contract.approval.0.approval.destructured.ir
+debug: Output IR to avm_11/out_O2/Contract.ir/Contract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.avm_11.contract.Contract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -767,7 +767,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to avm_11/out_O2/Contract.ir/Contract.clear.0.clear.destructured.ir
+debug: Output IR to avm_11/out_O2/Contract.ir/Contract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/avm_11/puya_unoptimized.log b/test_cases/avm_11/puya_unoptimized.log
index 33e400e46e..b8973a8006 100644
--- a/test_cases/avm_11/puya_unoptimized.log
+++ b/test_cases/avm_11/puya_unoptimized.log
@@ -593,7 +593,7 @@ debug: Coalescing local variables in test_cases.avm_11.contract.Contract.test_ne
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.avm_11.contract.Contract.test_new_ops
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to avm_11/out_unoptimized/Contract.ir/Contract.approval.0.approval.destructured.ir
+debug: Output IR to avm_11/out_unoptimized/Contract.ir/Contract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.avm_11.contract.Contract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -611,7 +611,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to avm_11/out_unoptimized/Contract.ir/Contract.clear.0.clear.destructured.ir
+debug: Output IR to avm_11/out_unoptimized/Contract.ir/Contract.clear.0.destructured.ir
 debug: Inserted main_block@1.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main_block@1.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_block@1.ops[6]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/avm_types_in_abi/out/TestContract.ir/TestContract.approval.0.approval.ssa.ir b/test_cases/avm_types_in_abi/out/TestContract.ir/TestContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/avm_types_in_abi/out/TestContract.ir/TestContract.approval.0.approval.ssa.ir
rename to test_cases/avm_types_in_abi/out/TestContract.ir/TestContract.approval.0.ssa.ir
diff --git a/test_cases/avm_types_in_abi/out/TestContract.ir/TestContract.approval.1.approval.ssa.opt.ir b/test_cases/avm_types_in_abi/out/TestContract.ir/TestContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/avm_types_in_abi/out/TestContract.ir/TestContract.approval.1.approval.ssa.opt.ir
rename to test_cases/avm_types_in_abi/out/TestContract.ir/TestContract.approval.1.ssa.opt.ir
diff --git a/test_cases/avm_types_in_abi/out/TestContract.ir/TestContract.approval.2.approval.ssa.opt.ir b/test_cases/avm_types_in_abi/out/TestContract.ir/TestContract.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/avm_types_in_abi/out/TestContract.ir/TestContract.approval.2.approval.ssa.opt.ir
rename to test_cases/avm_types_in_abi/out/TestContract.ir/TestContract.approval.2.ssa.opt.ir
diff --git a/test_cases/avm_types_in_abi/out/TestContract.ir/TestContract.approval.3.approval.destructured.ir b/test_cases/avm_types_in_abi/out/TestContract.ir/TestContract.approval.3.destructured.ir
similarity index 100%
rename from test_cases/avm_types_in_abi/out/TestContract.ir/TestContract.approval.3.approval.destructured.ir
rename to test_cases/avm_types_in_abi/out/TestContract.ir/TestContract.approval.3.destructured.ir
diff --git a/test_cases/avm_types_in_abi/out/TestContract.ir/TestContract.clear.0.clear.ssa.ir b/test_cases/avm_types_in_abi/out/TestContract.ir/TestContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/avm_types_in_abi/out/TestContract.ir/TestContract.clear.0.clear.ssa.ir
rename to test_cases/avm_types_in_abi/out/TestContract.ir/TestContract.clear.0.ssa.ir
diff --git a/test_cases/avm_types_in_abi/out/TestContract.ir/TestContract.clear.1.clear.destructured.ir b/test_cases/avm_types_in_abi/out/TestContract.ir/TestContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/avm_types_in_abi/out/TestContract.ir/TestContract.clear.1.clear.destructured.ir
rename to test_cases/avm_types_in_abi/out/TestContract.ir/TestContract.clear.1.destructured.ir
diff --git a/test_cases/avm_types_in_abi/out_O2/TestContract.ir/TestContract.approval.0.approval.destructured.ir b/test_cases/avm_types_in_abi/out_O2/TestContract.ir/TestContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/avm_types_in_abi/out_O2/TestContract.ir/TestContract.approval.0.approval.destructured.ir
rename to test_cases/avm_types_in_abi/out_O2/TestContract.ir/TestContract.approval.0.destructured.ir
diff --git a/test_cases/avm_types_in_abi/out_O2/TestContract.ir/TestContract.clear.0.clear.destructured.ir b/test_cases/avm_types_in_abi/out_O2/TestContract.ir/TestContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/avm_types_in_abi/out_O2/TestContract.ir/TestContract.clear.0.clear.destructured.ir
rename to test_cases/avm_types_in_abi/out_O2/TestContract.ir/TestContract.clear.0.destructured.ir
diff --git a/test_cases/avm_types_in_abi/out_unoptimized/TestContract.ir/TestContract.approval.0.approval.destructured.ir b/test_cases/avm_types_in_abi/out_unoptimized/TestContract.ir/TestContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/avm_types_in_abi/out_unoptimized/TestContract.ir/TestContract.approval.0.approval.destructured.ir
rename to test_cases/avm_types_in_abi/out_unoptimized/TestContract.ir/TestContract.approval.0.destructured.ir
diff --git a/test_cases/avm_types_in_abi/out_unoptimized/TestContract.ir/TestContract.clear.0.clear.destructured.ir b/test_cases/avm_types_in_abi/out_unoptimized/TestContract.ir/TestContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/avm_types_in_abi/out_unoptimized/TestContract.ir/TestContract.clear.0.clear.destructured.ir
rename to test_cases/avm_types_in_abi/out_unoptimized/TestContract.ir/TestContract.clear.0.destructured.ir
diff --git a/test_cases/avm_types_in_abi/puya.log b/test_cases/avm_types_in_abi/puya.log
index acf31e0fc6..301663ee1b 100644
--- a/test_cases/avm_types_in_abi/puya.log
+++ b/test_cases/avm_types_in_abi/puya.log
@@ -429,7 +429,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to avm_types_in_abi/out/TestContract.ir/TestContract.approval.0.approval.ssa.ir
+debug: Output IR to avm_types_in_abi/out/TestContract.ir/TestContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.avm_types_in_abi.contract.TestContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
@@ -563,7 +563,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.avm_types_in_abi.contract.TestContract.__puya_arc4_router__
-debug: Output IR to avm_types_in_abi/out/TestContract.ir/TestContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to avm_types_in_abi/out/TestContract.ir/TestContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -611,7 +611,7 @@ debug: Optimizer: Remove Linear Jump
 debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to avm_types_in_abi/out/TestContract.ir/TestContract.approval.2.approval.ssa.opt.ir
+debug: Output IR to avm_types_in_abi/out/TestContract.ir/TestContract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -682,8 +682,8 @@ debug: Coalescing local variables in test_cases.avm_types_in_abi.contract.TestCo
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.avm_types_in_abi.contract.TestContract.tuple_of_arc4
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to avm_types_in_abi/out/TestContract.ir/TestContract.approval.3.approval.destructured.ir
-debug: Output IR to avm_types_in_abi/out/TestContract.ir/TestContract.clear.0.clear.ssa.ir
+debug: Output IR to avm_types_in_abi/out/TestContract.ir/TestContract.approval.3.destructured.ir
+debug: Output IR to avm_types_in_abi/out/TestContract.ir/TestContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.avm_types_in_abi.contract.TestContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -709,7 +709,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to avm_types_in_abi/out/TestContract.ir/TestContract.clear.1.clear.destructured.ir
+debug: Output IR to avm_types_in_abi/out/TestContract.ir/TestContract.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/avm_types_in_abi/puya_O2.log b/test_cases/avm_types_in_abi/puya_O2.log
index 1766b69ac8..432fe0cef9 100644
--- a/test_cases/avm_types_in_abi/puya_O2.log
+++ b/test_cases/avm_types_in_abi/puya_O2.log
@@ -688,7 +688,7 @@ debug: Coalescing test_cases.avm_types_in_abi.contract.TestContract.__puya_arc4_
 debug: Coalescing resulted in 20 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to avm_types_in_abi/out_O2/TestContract.ir/TestContract.approval.0.approval.destructured.ir
+debug: Output IR to avm_types_in_abi/out_O2/TestContract.ir/TestContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.avm_types_in_abi.contract.TestContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -714,7 +714,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to avm_types_in_abi/out_O2/TestContract.ir/TestContract.clear.0.clear.destructured.ir
+debug: Output IR to avm_types_in_abi/out_O2/TestContract.ir/TestContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/avm_types_in_abi/puya_unoptimized.log b/test_cases/avm_types_in_abi/puya_unoptimized.log
index bc2ffe6c3f..75f6ffc1e7 100644
--- a/test_cases/avm_types_in_abi/puya_unoptimized.log
+++ b/test_cases/avm_types_in_abi/puya_unoptimized.log
@@ -539,7 +539,7 @@ debug: Coalescing local variables in test_cases.avm_types_in_abi.contract.TestCo
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.avm_types_in_abi.contract.TestContract.tuple_of_arc4
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to avm_types_in_abi/out_unoptimized/TestContract.ir/TestContract.approval.0.approval.destructured.ir
+debug: Output IR to avm_types_in_abi/out_unoptimized/TestContract.ir/TestContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.avm_types_in_abi.contract.TestContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -557,7 +557,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to avm_types_in_abi/out_unoptimized/TestContract.ir/TestContract.clear.0.clear.destructured.ir
+debug: Output IR to avm_types_in_abi/out_unoptimized/TestContract.ir/TestContract.clear.0.destructured.ir
 debug: Inserted main_block@1.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main_block@1.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_block@1.ops[6]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/biguint_binary_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.approval.0.approval.ssa.ir b/test_cases/biguint_binary_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.approval.0.ssa.ir
similarity index 100%
rename from test_cases/biguint_binary_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.approval.0.approval.ssa.ir
rename to test_cases/biguint_binary_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.approval.0.ssa.ir
diff --git a/test_cases/biguint_binary_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.approval.1.approval.ssa.opt.ir b/test_cases/biguint_binary_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/biguint_binary_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.approval.1.approval.ssa.opt.ir
rename to test_cases/biguint_binary_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.approval.1.ssa.opt.ir
diff --git a/test_cases/biguint_binary_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.approval.2.approval.ssa.opt.ir b/test_cases/biguint_binary_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/biguint_binary_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.approval.2.approval.ssa.opt.ir
rename to test_cases/biguint_binary_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.approval.2.ssa.opt.ir
diff --git a/test_cases/biguint_binary_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.approval.3.approval.destructured.ir b/test_cases/biguint_binary_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.approval.3.destructured.ir
similarity index 100%
rename from test_cases/biguint_binary_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.approval.3.approval.destructured.ir
rename to test_cases/biguint_binary_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.approval.3.destructured.ir
diff --git a/test_cases/biguint_binary_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.clear.0.clear.ssa.ir b/test_cases/biguint_binary_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.clear.0.ssa.ir
similarity index 100%
rename from test_cases/biguint_binary_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.clear.0.clear.ssa.ir
rename to test_cases/biguint_binary_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.clear.0.ssa.ir
diff --git a/test_cases/biguint_binary_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.clear.1.clear.destructured.ir b/test_cases/biguint_binary_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.clear.1.destructured.ir
similarity index 100%
rename from test_cases/biguint_binary_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.clear.1.clear.destructured.ir
rename to test_cases/biguint_binary_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.clear.1.destructured.ir
diff --git a/test_cases/biguint_binary_ops/out_O2/BiguintBinaryOps.ir/BiguintBinaryOps.approval.0.approval.destructured.ir b/test_cases/biguint_binary_ops/out_O2/BiguintBinaryOps.ir/BiguintBinaryOps.approval.0.destructured.ir
similarity index 100%
rename from test_cases/biguint_binary_ops/out_O2/BiguintBinaryOps.ir/BiguintBinaryOps.approval.0.approval.destructured.ir
rename to test_cases/biguint_binary_ops/out_O2/BiguintBinaryOps.ir/BiguintBinaryOps.approval.0.destructured.ir
diff --git a/test_cases/biguint_binary_ops/out_O2/BiguintBinaryOps.ir/BiguintBinaryOps.clear.0.clear.destructured.ir b/test_cases/biguint_binary_ops/out_O2/BiguintBinaryOps.ir/BiguintBinaryOps.clear.0.destructured.ir
similarity index 100%
rename from test_cases/biguint_binary_ops/out_O2/BiguintBinaryOps.ir/BiguintBinaryOps.clear.0.clear.destructured.ir
rename to test_cases/biguint_binary_ops/out_O2/BiguintBinaryOps.ir/BiguintBinaryOps.clear.0.destructured.ir
diff --git a/test_cases/biguint_binary_ops/out_unoptimized/BiguintBinaryOps.ir/BiguintBinaryOps.approval.0.approval.destructured.ir b/test_cases/biguint_binary_ops/out_unoptimized/BiguintBinaryOps.ir/BiguintBinaryOps.approval.0.destructured.ir
similarity index 100%
rename from test_cases/biguint_binary_ops/out_unoptimized/BiguintBinaryOps.ir/BiguintBinaryOps.approval.0.approval.destructured.ir
rename to test_cases/biguint_binary_ops/out_unoptimized/BiguintBinaryOps.ir/BiguintBinaryOps.approval.0.destructured.ir
diff --git a/test_cases/biguint_binary_ops/out_unoptimized/BiguintBinaryOps.ir/BiguintBinaryOps.clear.0.clear.destructured.ir b/test_cases/biguint_binary_ops/out_unoptimized/BiguintBinaryOps.ir/BiguintBinaryOps.clear.0.destructured.ir
similarity index 100%
rename from test_cases/biguint_binary_ops/out_unoptimized/BiguintBinaryOps.ir/BiguintBinaryOps.clear.0.clear.destructured.ir
rename to test_cases/biguint_binary_ops/out_unoptimized/BiguintBinaryOps.ir/BiguintBinaryOps.clear.0.destructured.ir
diff --git a/test_cases/biguint_binary_ops/puya.log b/test_cases/biguint_binary_ops/puya.log
index 80c266e31b..596e3465bf 100644
--- a/test_cases/biguint_binary_ops/puya.log
+++ b/test_cases/biguint_binary_ops/puya.log
@@ -410,7 +410,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to biguint_binary_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.approval.0.approval.ssa.ir
+debug: Output IR to biguint_binary_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.approval.0.ssa.ir
 info: optimizing approval program of test_cases.biguint_binary_ops.contract.BiguintBinaryOps at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.biguint_binary_ops.contract.BiguintBinaryOps.approval_program
@@ -503,7 +503,7 @@ debug: Optimizer: Remove Linear Jump
 debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to biguint_binary_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.approval.1.approval.ssa.opt.ir
+debug: Output IR to biguint_binary_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking simple function test_cases.biguint_binary_ops.contract.bitwise_ops for inlining (complexity=3 <= threshold=3)
 debug: Optimizing subroutine test_cases.biguint_binary_ops.contract.BiguintBinaryOps.approval_program
@@ -565,7 +565,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.biguint_binary_ops.contract.bitwise_ops
-debug: Output IR to biguint_binary_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.approval.2.approval.ssa.opt.ir
+debug: Output IR to biguint_binary_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.biguint_binary_ops.contract.BiguintBinaryOps.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -590,8 +590,8 @@ debug: Coalescing local variables in test_cases.biguint_binary_ops.contract.Bigu
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.biguint_binary_ops.contract.BiguintBinaryOps.approval_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to biguint_binary_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.approval.3.approval.destructured.ir
-debug: Output IR to biguint_binary_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.clear.0.clear.ssa.ir
+debug: Output IR to biguint_binary_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.approval.3.destructured.ir
+debug: Output IR to biguint_binary_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.clear.0.ssa.ir
 info: optimizing clear program of test_cases.biguint_binary_ops.contract.BiguintBinaryOps at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.biguint_binary_ops.contract.BiguintBinaryOps.clear_state_program
@@ -617,7 +617,7 @@ debug: Coalescing local variables in test_cases.biguint_binary_ops.contract.Bigu
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.biguint_binary_ops.contract.BiguintBinaryOps.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to biguint_binary_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.clear.1.clear.destructured.ir
+debug: Output IR to biguint_binary_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.clear.1.destructured.ir
 biguint_binary_ops/contract.py:5 debug: optimizing TEAL subroutine test_cases.biguint_binary_ops.contract.BiguintBinaryOps.approval_program() -> uint64:
 biguint_binary_ops/contract.py:28 debug: optimizing TEAL subroutine test_cases.biguint_binary_ops.contract.BiguintBinaryOps.clear_state_program() -> uint64:
 info: Writing biguint_binary_ops/out/BiguintBinaryOps.approval.teal
diff --git a/test_cases/biguint_binary_ops/puya_O2.log b/test_cases/biguint_binary_ops/puya_O2.log
index 60ec65143d..b25484b8bb 100644
--- a/test_cases/biguint_binary_ops/puya_O2.log
+++ b/test_cases/biguint_binary_ops/puya_O2.log
@@ -586,7 +586,7 @@ debug: Coalescing local variables in test_cases.biguint_binary_ops.contract.Bigu
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.biguint_binary_ops.contract.BiguintBinaryOps.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to biguint_binary_ops/out_O2/BiguintBinaryOps.ir/BiguintBinaryOps.approval.0.approval.destructured.ir
+debug: Output IR to biguint_binary_ops/out_O2/BiguintBinaryOps.ir/BiguintBinaryOps.approval.0.destructured.ir
 info: optimizing clear program of test_cases.biguint_binary_ops.contract.BiguintBinaryOps at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.biguint_binary_ops.contract.BiguintBinaryOps.clear_state_program
@@ -612,7 +612,7 @@ debug: Coalescing local variables in test_cases.biguint_binary_ops.contract.Bigu
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.biguint_binary_ops.contract.BiguintBinaryOps.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to biguint_binary_ops/out_O2/BiguintBinaryOps.ir/BiguintBinaryOps.clear.0.clear.destructured.ir
+debug: Output IR to biguint_binary_ops/out_O2/BiguintBinaryOps.ir/BiguintBinaryOps.clear.0.destructured.ir
 biguint_binary_ops/contract.py:5 debug: optimizing TEAL subroutine test_cases.biguint_binary_ops.contract.BiguintBinaryOps.approval_program() -> uint64:
 biguint_binary_ops/contract.py:28 debug: optimizing TEAL subroutine test_cases.biguint_binary_ops.contract.BiguintBinaryOps.clear_state_program() -> uint64:
 info: Writing biguint_binary_ops/out_O2/BiguintBinaryOps.approval.teal
diff --git a/test_cases/biguint_binary_ops/puya_unoptimized.log b/test_cases/biguint_binary_ops/puya_unoptimized.log
index 8afcfb8ac5..6c1967a703 100644
--- a/test_cases/biguint_binary_ops/puya_unoptimized.log
+++ b/test_cases/biguint_binary_ops/puya_unoptimized.log
@@ -457,7 +457,7 @@ debug: Coalescing local variables in test_cases.biguint_binary_ops.contract.bitw
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.biguint_binary_ops.contract.bitwise_ops
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to biguint_binary_ops/out_unoptimized/BiguintBinaryOps.ir/BiguintBinaryOps.approval.0.approval.destructured.ir
+debug: Output IR to biguint_binary_ops/out_unoptimized/BiguintBinaryOps.ir/BiguintBinaryOps.approval.0.destructured.ir
 info: optimizing clear program of test_cases.biguint_binary_ops.contract.BiguintBinaryOps at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.biguint_binary_ops.contract.BiguintBinaryOps.clear_state_program
@@ -475,7 +475,7 @@ debug: Coalescing local variables in test_cases.biguint_binary_ops.contract.Bigu
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.biguint_binary_ops.contract.BiguintBinaryOps.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to biguint_binary_ops/out_unoptimized/BiguintBinaryOps.ir/BiguintBinaryOps.clear.0.clear.destructured.ir
+debug: Output IR to biguint_binary_ops/out_unoptimized/BiguintBinaryOps.ir/BiguintBinaryOps.clear.0.destructured.ir
 debug: Inserted main.ops[3]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[5]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[8]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.approval.0.approval.ssa.ir b/test_cases/boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.approval.0.ssa.ir
similarity index 100%
rename from test_cases/boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.approval.0.approval.ssa.ir
rename to test_cases/boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.approval.0.ssa.ir
diff --git a/test_cases/boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.approval.1.approval.ssa.opt.ir b/test_cases/boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.approval.1.approval.ssa.opt.ir
rename to test_cases/boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.approval.1.ssa.opt.ir
diff --git a/test_cases/boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.approval.2.approval.ssa.opt.ir b/test_cases/boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.approval.2.approval.ssa.opt.ir
rename to test_cases/boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.approval.2.ssa.opt.ir
diff --git a/test_cases/boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.approval.3.approval.ssa.opt.ir b/test_cases/boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.approval.3.ssa.opt.ir
similarity index 100%
rename from test_cases/boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.approval.3.approval.ssa.opt.ir
rename to test_cases/boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.approval.3.ssa.opt.ir
diff --git a/test_cases/boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.approval.4.approval.destructured.ir b/test_cases/boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.approval.4.destructured.ir
similarity index 100%
rename from test_cases/boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.approval.4.approval.destructured.ir
rename to test_cases/boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.approval.4.destructured.ir
diff --git a/test_cases/boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.clear.0.clear.ssa.ir b/test_cases/boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.clear.0.ssa.ir
similarity index 100%
rename from test_cases/boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.clear.0.clear.ssa.ir
rename to test_cases/boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.clear.0.ssa.ir
diff --git a/test_cases/boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.clear.1.clear.ssa.opt.ir b/test_cases/boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.clear.1.ssa.opt.ir
similarity index 100%
rename from test_cases/boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.clear.1.clear.ssa.opt.ir
rename to test_cases/boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.clear.1.ssa.opt.ir
diff --git a/test_cases/boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.clear.2.clear.destructured.ir b/test_cases/boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.clear.2.destructured.ir
similarity index 100%
rename from test_cases/boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.clear.2.clear.destructured.ir
rename to test_cases/boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.clear.2.destructured.ir
diff --git a/test_cases/boolean_binary_ops/out_O2/BooleanBinaryOps.ir/BooleanBinaryOps.approval.0.approval.destructured.ir b/test_cases/boolean_binary_ops/out_O2/BooleanBinaryOps.ir/BooleanBinaryOps.approval.0.destructured.ir
similarity index 100%
rename from test_cases/boolean_binary_ops/out_O2/BooleanBinaryOps.ir/BooleanBinaryOps.approval.0.approval.destructured.ir
rename to test_cases/boolean_binary_ops/out_O2/BooleanBinaryOps.ir/BooleanBinaryOps.approval.0.destructured.ir
diff --git a/test_cases/boolean_binary_ops/out_O2/BooleanBinaryOps.ir/BooleanBinaryOps.clear.0.clear.destructured.ir b/test_cases/boolean_binary_ops/out_O2/BooleanBinaryOps.ir/BooleanBinaryOps.clear.0.destructured.ir
similarity index 100%
rename from test_cases/boolean_binary_ops/out_O2/BooleanBinaryOps.ir/BooleanBinaryOps.clear.0.clear.destructured.ir
rename to test_cases/boolean_binary_ops/out_O2/BooleanBinaryOps.ir/BooleanBinaryOps.clear.0.destructured.ir
diff --git a/test_cases/boolean_binary_ops/out_unoptimized/BooleanBinaryOps.ir/BooleanBinaryOps.approval.0.approval.destructured.ir b/test_cases/boolean_binary_ops/out_unoptimized/BooleanBinaryOps.ir/BooleanBinaryOps.approval.0.destructured.ir
similarity index 100%
rename from test_cases/boolean_binary_ops/out_unoptimized/BooleanBinaryOps.ir/BooleanBinaryOps.approval.0.approval.destructured.ir
rename to test_cases/boolean_binary_ops/out_unoptimized/BooleanBinaryOps.ir/BooleanBinaryOps.approval.0.destructured.ir
diff --git a/test_cases/boolean_binary_ops/out_unoptimized/BooleanBinaryOps.ir/BooleanBinaryOps.clear.0.clear.destructured.ir b/test_cases/boolean_binary_ops/out_unoptimized/BooleanBinaryOps.ir/BooleanBinaryOps.clear.0.destructured.ir
similarity index 100%
rename from test_cases/boolean_binary_ops/out_unoptimized/BooleanBinaryOps.ir/BooleanBinaryOps.clear.0.clear.destructured.ir
rename to test_cases/boolean_binary_ops/out_unoptimized/BooleanBinaryOps.ir/BooleanBinaryOps.clear.0.destructured.ir
diff --git a/test_cases/boolean_binary_ops/puya.log b/test_cases/boolean_binary_ops/puya.log
index b317c5d82e..9db1f16433 100644
--- a/test_cases/boolean_binary_ops/puya.log
+++ b/test_cases/boolean_binary_ops/puya.log
@@ -1064,7 +1064,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.approval.0.approval.ssa.ir
+debug: Output IR to boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.approval.0.ssa.ir
 info: optimizing approval program of test_cases.boolean_binary_ops.contract.BooleanBinaryOps at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.boolean_binary_ops.contract.test_boolean_binary_ops for inlining
@@ -2188,7 +2188,7 @@ debug: removing unused subroutine test_cases.boolean_binary_ops.contract.type_co
 debug: removing unused subroutine test_cases.boolean_binary_ops.contract.test_union_boolean_binary_ops
 debug: removing unused subroutine test_cases.boolean_binary_ops.contract.test_literal_boolean_binary_ops
 debug: removing unused subroutine test_cases.boolean_binary_ops.contract.test_literal_conditionals
-debug: Output IR to boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.approval.1.approval.ssa.opt.ir
+debug: Output IR to boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking single-use function _puya_lib.bytes_.is_substring for inlining
 debug: Optimizing subroutine test_cases.boolean_binary_ops.contract.BooleanBinaryOps.approval_program
@@ -2365,7 +2365,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine _puya_lib.bytes_.is_substring
-debug: Output IR to boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.approval.2.approval.ssa.opt.ir
+debug: Output IR to boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: marking simple function test_cases.boolean_binary_ops.contract.bool_to_bytes for inlining (complexity=1 <= threshold=3)
 debug: marking simple function test_cases.boolean_binary_ops.contract.log_and_return for inlining (complexity=1 <= threshold=4)
@@ -2487,7 +2487,7 @@ debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.boolean_binary_ops.contract.bool_to_bytes
 debug: removing unused subroutine test_cases.boolean_binary_ops.contract.log_and_return
-debug: Output IR to boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.approval.3.approval.ssa.opt.ir
+debug: Output IR to boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.approval.3.ssa.opt.ir
 debug: Begin optimization pass 4/100
 debug: Optimizing subroutine test_cases.boolean_binary_ops.contract.BooleanBinaryOps.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -2563,8 +2563,8 @@ debug: to_do: loop_counter%0#0, lhs#0
 debug: * to_do lhs#0
 debug: * to_do loop_counter%0#0
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.approval.4.approval.destructured.ir
-debug: Output IR to boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.clear.0.clear.ssa.ir
+debug: Output IR to boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.approval.4.destructured.ir
+debug: Output IR to boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.clear.0.ssa.ir
 info: optimizing clear program of test_cases.boolean_binary_ops.contract.BooleanBinaryOps at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.boolean_binary_ops.contract.BooleanBinaryOps.clear_state_program
@@ -2584,7 +2584,7 @@ debug: Optimizer: Remove Linear Jump
 debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.clear.1.clear.ssa.opt.ir
+debug: Output IR to boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.clear.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.boolean_binary_ops.contract.BooleanBinaryOps.clear_state_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -2609,7 +2609,7 @@ debug: Coalescing local variables in test_cases.boolean_binary_ops.contract.Bool
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.boolean_binary_ops.contract.BooleanBinaryOps.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.clear.2.clear.destructured.ir
+debug: Output IR to boolean_binary_ops/out/BooleanBinaryOps.ir/BooleanBinaryOps.clear.2.destructured.ir
 debug: Inserted main_for_body@5.ops[8]: 'l-store-copy tmp%1#1 0'
 debug: Replaced main_for_body@5.ops[10]: 'v-load tmp%1#1' with 'l-load tmp%1#1'
 debug: Inserted main_for_body@5.ops[26]: 'l-store-copy msg#0 0'
diff --git a/test_cases/boolean_binary_ops/puya_O2.log b/test_cases/boolean_binary_ops/puya_O2.log
index 2f141e53e1..c753b03068 100644
--- a/test_cases/boolean_binary_ops/puya_O2.log
+++ b/test_cases/boolean_binary_ops/puya_O2.log
@@ -2558,7 +2558,7 @@ debug: to_do: loop_counter%0#0, lhs#0
 debug: * to_do lhs#0
 debug: * to_do loop_counter%0#0
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to boolean_binary_ops/out_O2/BooleanBinaryOps.ir/BooleanBinaryOps.approval.0.approval.destructured.ir
+debug: Output IR to boolean_binary_ops/out_O2/BooleanBinaryOps.ir/BooleanBinaryOps.approval.0.destructured.ir
 info: optimizing clear program of test_cases.boolean_binary_ops.contract.BooleanBinaryOps at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.boolean_binary_ops.contract.BooleanBinaryOps.clear_state_program
@@ -2602,7 +2602,7 @@ debug: Coalescing local variables in test_cases.boolean_binary_ops.contract.Bool
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.boolean_binary_ops.contract.BooleanBinaryOps.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to boolean_binary_ops/out_O2/BooleanBinaryOps.ir/BooleanBinaryOps.clear.0.clear.destructured.ir
+debug: Output IR to boolean_binary_ops/out_O2/BooleanBinaryOps.ir/BooleanBinaryOps.clear.0.destructured.ir
 debug: Inserted main_for_body@5.ops[8]: 'l-store-copy tmp%1#1 0'
 debug: Replaced main_for_body@5.ops[10]: 'v-load tmp%1#1' with 'l-load tmp%1#1'
 debug: Inserted main_for_body@5.ops[26]: 'l-store-copy msg#0 0'
diff --git a/test_cases/boolean_binary_ops/puya_unoptimized.log b/test_cases/boolean_binary_ops/puya_unoptimized.log
index 4c55e7f909..058aa718fd 100644
--- a/test_cases/boolean_binary_ops/puya_unoptimized.log
+++ b/test_cases/boolean_binary_ops/puya_unoptimized.log
@@ -1349,7 +1349,7 @@ debug: Coalescing start#0 with [start#5, start#1, start#2]
 debug: Coalescing resulted in 10 replacement/s
 debug: Sequentializing parallel copies in _puya_lib.bytes_.is_substring
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to boolean_binary_ops/out_unoptimized/BooleanBinaryOps.ir/BooleanBinaryOps.approval.0.approval.destructured.ir
+debug: Output IR to boolean_binary_ops/out_unoptimized/BooleanBinaryOps.ir/BooleanBinaryOps.approval.0.destructured.ir
 info: optimizing clear program of test_cases.boolean_binary_ops.contract.BooleanBinaryOps at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.boolean_binary_ops.contract.BooleanBinaryOps.clear_state_program
@@ -1367,7 +1367,7 @@ debug: Coalescing local variables in test_cases.boolean_binary_ops.contract.Bool
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.boolean_binary_ops.contract.BooleanBinaryOps.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to boolean_binary_ops/out_unoptimized/BooleanBinaryOps.ir/BooleanBinaryOps.clear.0.clear.destructured.ir
+debug: Output IR to boolean_binary_ops/out_unoptimized/BooleanBinaryOps.ir/BooleanBinaryOps.clear.0.destructured.ir
 debug: Inserted test_boolean_binary_ops.ops[3]: 'l-store-copy tmp%0#0 0'
 debug: Replaced test_boolean_binary_ops.ops[5]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted test_boolean_binary_ops.ops[7]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/bug_load_store_load_store/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir b/test_cases/bug_load_store_load_store/out/MyContract.ir/MyContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/bug_load_store_load_store/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir
rename to test_cases/bug_load_store_load_store/out/MyContract.ir/MyContract.approval.0.ssa.ir
diff --git a/test_cases/bug_load_store_load_store/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir b/test_cases/bug_load_store_load_store/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/bug_load_store_load_store/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir
rename to test_cases/bug_load_store_load_store/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
diff --git a/test_cases/bug_load_store_load_store/out/MyContract.ir/MyContract.approval.2.approval.destructured.ir b/test_cases/bug_load_store_load_store/out/MyContract.ir/MyContract.approval.2.destructured.ir
similarity index 100%
rename from test_cases/bug_load_store_load_store/out/MyContract.ir/MyContract.approval.2.approval.destructured.ir
rename to test_cases/bug_load_store_load_store/out/MyContract.ir/MyContract.approval.2.destructured.ir
diff --git a/test_cases/bug_load_store_load_store/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir b/test_cases/bug_load_store_load_store/out/MyContract.ir/MyContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/bug_load_store_load_store/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir
rename to test_cases/bug_load_store_load_store/out/MyContract.ir/MyContract.clear.0.ssa.ir
diff --git a/test_cases/bug_load_store_load_store/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir b/test_cases/bug_load_store_load_store/out/MyContract.ir/MyContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/bug_load_store_load_store/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir
rename to test_cases/bug_load_store_load_store/out/MyContract.ir/MyContract.clear.1.destructured.ir
diff --git a/test_cases/bug_load_store_load_store/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir b/test_cases/bug_load_store_load_store/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/bug_load_store_load_store/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir
rename to test_cases/bug_load_store_load_store/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
diff --git a/test_cases/bug_load_store_load_store/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir b/test_cases/bug_load_store_load_store/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/bug_load_store_load_store/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir
rename to test_cases/bug_load_store_load_store/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
diff --git a/test_cases/bug_load_store_load_store/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir b/test_cases/bug_load_store_load_store/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/bug_load_store_load_store/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir
rename to test_cases/bug_load_store_load_store/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
diff --git a/test_cases/bug_load_store_load_store/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir b/test_cases/bug_load_store_load_store/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/bug_load_store_load_store/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir
rename to test_cases/bug_load_store_load_store/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
diff --git a/test_cases/bug_load_store_load_store/puya.log b/test_cases/bug_load_store_load_store/puya.log
index 226dcf43ef..350a42f10d 100644
--- a/test_cases/bug_load_store_load_store/puya.log
+++ b/test_cases/bug_load_store_load_store/puya.log
@@ -449,7 +449,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to bug_load_store_load_store/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir
+debug: Output IR to bug_load_store_load_store/out/MyContract.ir/MyContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.bug_load_store_load_store.contract.MyContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.bug_load_store_load_store.contract.MyContract.approval_program
@@ -485,7 +485,7 @@ debug: Optimizer: Remove Linear Jump
 debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to bug_load_store_load_store/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to bug_load_store_load_store/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.bug_load_store_load_store.contract.MyContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -556,8 +556,8 @@ debug: Coalescing local variables in test_cases.bug_load_store_load_store.contra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.bug_load_store_load_store.contract.get_bool
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to bug_load_store_load_store/out/MyContract.ir/MyContract.approval.2.approval.destructured.ir
-debug: Output IR to bug_load_store_load_store/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir
+debug: Output IR to bug_load_store_load_store/out/MyContract.ir/MyContract.approval.2.destructured.ir
+debug: Output IR to bug_load_store_load_store/out/MyContract.ir/MyContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.bug_load_store_load_store.contract.MyContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.bug_load_store_load_store.contract.MyContract.clear_state_program
@@ -583,7 +583,7 @@ debug: Coalescing local variables in test_cases.bug_load_store_load_store.contra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.bug_load_store_load_store.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to bug_load_store_load_store/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir
+debug: Output IR to bug_load_store_load_store/out/MyContract.ir/MyContract.clear.1.destructured.ir
 debug: Inserted main_for_header@1.ops[3]: 'l-store-copy continue_looping%0#0 0'
 debug: Replaced main_for_header@1.ops[5]: 'v-load continue_looping%0#0' with 'l-load continue_looping%0#0'
 debug: Inserted main_for_body@2.ops[1]: 'l-store-copy tmp%0#0 0'
diff --git a/test_cases/bug_load_store_load_store/puya_O2.log b/test_cases/bug_load_store_load_store/puya_O2.log
index ddf2c0f958..5875aa0828 100644
--- a/test_cases/bug_load_store_load_store/puya_O2.log
+++ b/test_cases/bug_load_store_load_store/puya_O2.log
@@ -553,7 +553,7 @@ debug: Coalescing local variables in test_cases.bug_load_store_load_store.contra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.bug_load_store_load_store.contract.get_bool
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to bug_load_store_load_store/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir
+debug: Output IR to bug_load_store_load_store/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.bug_load_store_load_store.contract.MyContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.bug_load_store_load_store.contract.MyContract.clear_state_program
@@ -579,7 +579,7 @@ debug: Coalescing local variables in test_cases.bug_load_store_load_store.contra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.bug_load_store_load_store.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to bug_load_store_load_store/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir
+debug: Output IR to bug_load_store_load_store/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
 debug: Inserted main_for_header@1.ops[3]: 'l-store-copy continue_looping%0#0 0'
 debug: Replaced main_for_header@1.ops[5]: 'v-load continue_looping%0#0' with 'l-load continue_looping%0#0'
 debug: Inserted main_for_body@2.ops[1]: 'l-store-copy tmp%0#0 0'
diff --git a/test_cases/bug_load_store_load_store/puya_unoptimized.log b/test_cases/bug_load_store_load_store/puya_unoptimized.log
index 3370996332..397d9702e4 100644
--- a/test_cases/bug_load_store_load_store/puya_unoptimized.log
+++ b/test_cases/bug_load_store_load_store/puya_unoptimized.log
@@ -500,7 +500,7 @@ debug: Coalescing local variables in test_cases.bug_load_store_load_store.contra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.bug_load_store_load_store.contract.get_bool
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to bug_load_store_load_store/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir
+debug: Output IR to bug_load_store_load_store/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.bug_load_store_load_store.contract.MyContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.bug_load_store_load_store.contract.MyContract.clear_state_program
@@ -518,7 +518,7 @@ debug: Coalescing local variables in test_cases.bug_load_store_load_store.contra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.bug_load_store_load_store.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to bug_load_store_load_store/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir
+debug: Output IR to bug_load_store_load_store/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
 debug: Inserted main_for_header@1.ops[3]: 'l-store-copy continue_looping%0#0 0'
 debug: Replaced main_for_header@1.ops[5]: 'v-load continue_looping%0#0' with 'l-load continue_looping%0#0'
 debug: Inserted main_for_body@2.ops[1]: 'l-store-copy tmp%0#0 0'
diff --git a/test_cases/bytes_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.approval.0.approval.ssa.ir b/test_cases/bytes_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.approval.0.ssa.ir
similarity index 100%
rename from test_cases/bytes_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.approval.0.approval.ssa.ir
rename to test_cases/bytes_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.approval.0.ssa.ir
diff --git a/test_cases/bytes_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.approval.1.approval.ssa.opt.ir b/test_cases/bytes_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/bytes_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.approval.1.approval.ssa.opt.ir
rename to test_cases/bytes_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.approval.1.ssa.opt.ir
diff --git a/test_cases/bytes_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.approval.2.approval.destructured.ir b/test_cases/bytes_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.approval.2.destructured.ir
similarity index 100%
rename from test_cases/bytes_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.approval.2.approval.destructured.ir
rename to test_cases/bytes_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.approval.2.destructured.ir
diff --git a/test_cases/bytes_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.clear.0.clear.ssa.ir b/test_cases/bytes_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.clear.0.ssa.ir
similarity index 100%
rename from test_cases/bytes_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.clear.0.clear.ssa.ir
rename to test_cases/bytes_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.clear.0.ssa.ir
diff --git a/test_cases/bytes_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.clear.1.clear.destructured.ir b/test_cases/bytes_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.clear.1.destructured.ir
similarity index 100%
rename from test_cases/bytes_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.clear.1.clear.destructured.ir
rename to test_cases/bytes_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.clear.1.destructured.ir
diff --git a/test_cases/bytes_ops/out_O2/BiguintBinaryOps.ir/BiguintBinaryOps.approval.0.approval.destructured.ir b/test_cases/bytes_ops/out_O2/BiguintBinaryOps.ir/BiguintBinaryOps.approval.0.destructured.ir
similarity index 100%
rename from test_cases/bytes_ops/out_O2/BiguintBinaryOps.ir/BiguintBinaryOps.approval.0.approval.destructured.ir
rename to test_cases/bytes_ops/out_O2/BiguintBinaryOps.ir/BiguintBinaryOps.approval.0.destructured.ir
diff --git a/test_cases/bytes_ops/out_O2/BiguintBinaryOps.ir/BiguintBinaryOps.clear.0.clear.destructured.ir b/test_cases/bytes_ops/out_O2/BiguintBinaryOps.ir/BiguintBinaryOps.clear.0.destructured.ir
similarity index 100%
rename from test_cases/bytes_ops/out_O2/BiguintBinaryOps.ir/BiguintBinaryOps.clear.0.clear.destructured.ir
rename to test_cases/bytes_ops/out_O2/BiguintBinaryOps.ir/BiguintBinaryOps.clear.0.destructured.ir
diff --git a/test_cases/bytes_ops/out_unoptimized/BiguintBinaryOps.ir/BiguintBinaryOps.approval.0.approval.destructured.ir b/test_cases/bytes_ops/out_unoptimized/BiguintBinaryOps.ir/BiguintBinaryOps.approval.0.destructured.ir
similarity index 100%
rename from test_cases/bytes_ops/out_unoptimized/BiguintBinaryOps.ir/BiguintBinaryOps.approval.0.approval.destructured.ir
rename to test_cases/bytes_ops/out_unoptimized/BiguintBinaryOps.ir/BiguintBinaryOps.approval.0.destructured.ir
diff --git a/test_cases/bytes_ops/out_unoptimized/BiguintBinaryOps.ir/BiguintBinaryOps.clear.0.clear.destructured.ir b/test_cases/bytes_ops/out_unoptimized/BiguintBinaryOps.ir/BiguintBinaryOps.clear.0.destructured.ir
similarity index 100%
rename from test_cases/bytes_ops/out_unoptimized/BiguintBinaryOps.ir/BiguintBinaryOps.clear.0.clear.destructured.ir
rename to test_cases/bytes_ops/out_unoptimized/BiguintBinaryOps.ir/BiguintBinaryOps.clear.0.destructured.ir
diff --git a/test_cases/bytes_ops/puya.log b/test_cases/bytes_ops/puya.log
index a257d447e8..e22d7e74f1 100644
--- a/test_cases/bytes_ops/puya.log
+++ b/test_cases/bytes_ops/puya.log
@@ -413,7 +413,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to bytes_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.approval.0.approval.ssa.ir
+debug: Output IR to bytes_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.approval.0.ssa.ir
 info: optimizing approval program of test_cases.bytes_ops.contract.BiguintBinaryOps at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.bytes_ops.contract.do_some_ops for inlining
@@ -521,7 +521,7 @@ debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.bytes_ops.contract.do_some_ops
 debug: removing unused subroutine test_cases.bytes_ops.contract.do_augmented_assignment_ops
-debug: Output IR to bytes_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.approval.1.approval.ssa.opt.ir
+debug: Output IR to bytes_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.bytes_ops.contract.BiguintBinaryOps.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -546,8 +546,8 @@ debug: Coalescing local variables in test_cases.bytes_ops.contract.BiguintBinary
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.bytes_ops.contract.BiguintBinaryOps.approval_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to bytes_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.approval.2.approval.destructured.ir
-debug: Output IR to bytes_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.clear.0.clear.ssa.ir
+debug: Output IR to bytes_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.approval.2.destructured.ir
+debug: Output IR to bytes_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.clear.0.ssa.ir
 info: optimizing clear program of test_cases.bytes_ops.contract.BiguintBinaryOps at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.bytes_ops.contract.BiguintBinaryOps.clear_state_program
@@ -573,7 +573,7 @@ debug: Coalescing local variables in test_cases.bytes_ops.contract.BiguintBinary
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.bytes_ops.contract.BiguintBinaryOps.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to bytes_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.clear.1.clear.destructured.ir
+debug: Output IR to bytes_ops/out/BiguintBinaryOps.ir/BiguintBinaryOps.clear.1.destructured.ir
 bytes_ops/contract.py:5 debug: optimizing TEAL subroutine test_cases.bytes_ops.contract.BiguintBinaryOps.approval_program() -> uint64:
 bytes_ops/contract.py:17 debug: optimizing TEAL subroutine test_cases.bytes_ops.contract.BiguintBinaryOps.clear_state_program() -> uint64:
 info: Writing bytes_ops/out/BiguintBinaryOps.approval.teal
diff --git a/test_cases/bytes_ops/puya_O2.log b/test_cases/bytes_ops/puya_O2.log
index ea4f39671c..1637c2219f 100644
--- a/test_cases/bytes_ops/puya_O2.log
+++ b/test_cases/bytes_ops/puya_O2.log
@@ -543,7 +543,7 @@ debug: Coalescing local variables in test_cases.bytes_ops.contract.BiguintBinary
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.bytes_ops.contract.BiguintBinaryOps.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to bytes_ops/out_O2/BiguintBinaryOps.ir/BiguintBinaryOps.approval.0.approval.destructured.ir
+debug: Output IR to bytes_ops/out_O2/BiguintBinaryOps.ir/BiguintBinaryOps.approval.0.destructured.ir
 info: optimizing clear program of test_cases.bytes_ops.contract.BiguintBinaryOps at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.bytes_ops.contract.BiguintBinaryOps.clear_state_program
@@ -569,7 +569,7 @@ debug: Coalescing local variables in test_cases.bytes_ops.contract.BiguintBinary
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.bytes_ops.contract.BiguintBinaryOps.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to bytes_ops/out_O2/BiguintBinaryOps.ir/BiguintBinaryOps.clear.0.clear.destructured.ir
+debug: Output IR to bytes_ops/out_O2/BiguintBinaryOps.ir/BiguintBinaryOps.clear.0.destructured.ir
 bytes_ops/contract.py:5 debug: optimizing TEAL subroutine test_cases.bytes_ops.contract.BiguintBinaryOps.approval_program() -> uint64:
 bytes_ops/contract.py:17 debug: optimizing TEAL subroutine test_cases.bytes_ops.contract.BiguintBinaryOps.clear_state_program() -> uint64:
 info: Writing bytes_ops/out_O2/BiguintBinaryOps.approval.teal
diff --git a/test_cases/bytes_ops/puya_unoptimized.log b/test_cases/bytes_ops/puya_unoptimized.log
index 40e78b976e..e56f9f6c34 100644
--- a/test_cases/bytes_ops/puya_unoptimized.log
+++ b/test_cases/bytes_ops/puya_unoptimized.log
@@ -483,7 +483,7 @@ debug: Coalescing seed#0 with [seed#1, seed#2, seed#3, seed#4, seed#5]
 debug: Coalescing resulted in 14 replacement/s
 debug: Sequentializing parallel copies in test_cases.bytes_ops.contract.do_augmented_assignment_ops
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to bytes_ops/out_unoptimized/BiguintBinaryOps.ir/BiguintBinaryOps.approval.0.approval.destructured.ir
+debug: Output IR to bytes_ops/out_unoptimized/BiguintBinaryOps.ir/BiguintBinaryOps.approval.0.destructured.ir
 info: optimizing clear program of test_cases.bytes_ops.contract.BiguintBinaryOps at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.bytes_ops.contract.BiguintBinaryOps.clear_state_program
@@ -501,7 +501,7 @@ debug: Coalescing local variables in test_cases.bytes_ops.contract.BiguintBinary
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.bytes_ops.contract.BiguintBinaryOps.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to bytes_ops/out_unoptimized/BiguintBinaryOps.ir/BiguintBinaryOps.clear.0.clear.destructured.ir
+debug: Output IR to bytes_ops/out_unoptimized/BiguintBinaryOps.ir/BiguintBinaryOps.clear.0.destructured.ir
 debug: Inserted do_some_ops.ops[3]: 'l-store-copy result#0 0'
 debug: Replaced do_some_ops.ops[5]: 'v-load result#0' with 'l-load result#0'
 debug: Inserted do_some_ops.ops[8]: 'l-store-copy tmp%0#0 0'
diff --git a/test_cases/callsub/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir b/test_cases/callsub/out/MyContract.ir/MyContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/callsub/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir
rename to test_cases/callsub/out/MyContract.ir/MyContract.approval.0.ssa.ir
diff --git a/test_cases/callsub/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir b/test_cases/callsub/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/callsub/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir
rename to test_cases/callsub/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
diff --git a/test_cases/callsub/out/MyContract.ir/MyContract.approval.2.approval.destructured.ir b/test_cases/callsub/out/MyContract.ir/MyContract.approval.2.destructured.ir
similarity index 100%
rename from test_cases/callsub/out/MyContract.ir/MyContract.approval.2.approval.destructured.ir
rename to test_cases/callsub/out/MyContract.ir/MyContract.approval.2.destructured.ir
diff --git a/test_cases/callsub/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir b/test_cases/callsub/out/MyContract.ir/MyContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/callsub/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir
rename to test_cases/callsub/out/MyContract.ir/MyContract.clear.0.ssa.ir
diff --git a/test_cases/callsub/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir b/test_cases/callsub/out/MyContract.ir/MyContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/callsub/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir
rename to test_cases/callsub/out/MyContract.ir/MyContract.clear.1.destructured.ir
diff --git a/test_cases/callsub/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir b/test_cases/callsub/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/callsub/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir
rename to test_cases/callsub/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
diff --git a/test_cases/callsub/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir b/test_cases/callsub/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/callsub/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir
rename to test_cases/callsub/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
diff --git a/test_cases/callsub/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir b/test_cases/callsub/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/callsub/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir
rename to test_cases/callsub/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
diff --git a/test_cases/callsub/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir b/test_cases/callsub/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/callsub/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir
rename to test_cases/callsub/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
diff --git a/test_cases/callsub/puya.log b/test_cases/callsub/puya.log
index c2c45f5bd9..bcb2cb7662 100644
--- a/test_cases/callsub/puya.log
+++ b/test_cases/callsub/puya.log
@@ -410,7 +410,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to callsub/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir
+debug: Output IR to callsub/out/MyContract.ir/MyContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.callsub.contract.MyContract at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.callsub.contract.MyContract.echo for inlining
@@ -451,7 +451,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.callsub.contract.MyContract.echo
-debug: Output IR to callsub/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to callsub/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.callsub.contract.MyContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -477,8 +477,8 @@ debug: Coalescing tmp%0#0 with [tmp%0#1]
 debug: Coalescing resulted in 2 replacement/s
 debug: Sequentializing parallel copies in test_cases.callsub.contract.MyContract.approval_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to callsub/out/MyContract.ir/MyContract.approval.2.approval.destructured.ir
-debug: Output IR to callsub/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir
+debug: Output IR to callsub/out/MyContract.ir/MyContract.approval.2.destructured.ir
+debug: Output IR to callsub/out/MyContract.ir/MyContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.callsub.contract.MyContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.callsub.contract.MyContract.clear_state_program
@@ -504,7 +504,7 @@ debug: Coalescing local variables in test_cases.callsub.contract.MyContract.clea
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.callsub.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to callsub/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir
+debug: Output IR to callsub/out/MyContract.ir/MyContract.clear.1.destructured.ir
 debug: Inserted main.ops[2]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[4]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[8]: 'l-store-copy tmp%0#0 0'
diff --git a/test_cases/callsub/puya_O2.log b/test_cases/callsub/puya_O2.log
index f3d42622d4..834c51c970 100644
--- a/test_cases/callsub/puya_O2.log
+++ b/test_cases/callsub/puya_O2.log
@@ -474,7 +474,7 @@ debug: Coalescing tmp%0#0 with [tmp%0#1]
 debug: Coalescing resulted in 2 replacement/s
 debug: Sequentializing parallel copies in test_cases.callsub.contract.MyContract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to callsub/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir
+debug: Output IR to callsub/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.callsub.contract.MyContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.callsub.contract.MyContract.clear_state_program
@@ -500,7 +500,7 @@ debug: Coalescing local variables in test_cases.callsub.contract.MyContract.clea
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.callsub.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to callsub/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir
+debug: Output IR to callsub/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
 debug: Inserted main.ops[2]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[4]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[8]: 'l-store-copy tmp%0#0 0'
diff --git a/test_cases/callsub/puya_unoptimized.log b/test_cases/callsub/puya_unoptimized.log
index 90121f79b5..10f7524ec1 100644
--- a/test_cases/callsub/puya_unoptimized.log
+++ b/test_cases/callsub/puya_unoptimized.log
@@ -440,7 +440,7 @@ debug: Coalescing local variables in test_cases.callsub.contract.MyContract.echo
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.callsub.contract.MyContract.echo
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to callsub/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir
+debug: Output IR to callsub/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.callsub.contract.MyContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.callsub.contract.MyContract.clear_state_program
@@ -458,7 +458,7 @@ debug: Coalescing local variables in test_cases.callsub.contract.MyContract.clea
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.callsub.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to callsub/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir
+debug: Output IR to callsub/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
 debug: Inserted main.ops[2]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[4]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted echo.ops[2]: 'l-store-copy tmp%0#0 0'
diff --git a/test_cases/chained_assignment/out/ChainedAssignment.ir/ChainedAssignment.approval.0.approval.ssa.ir b/test_cases/chained_assignment/out/ChainedAssignment.ir/ChainedAssignment.approval.0.ssa.ir
similarity index 100%
rename from test_cases/chained_assignment/out/ChainedAssignment.ir/ChainedAssignment.approval.0.approval.ssa.ir
rename to test_cases/chained_assignment/out/ChainedAssignment.ir/ChainedAssignment.approval.0.ssa.ir
diff --git a/test_cases/chained_assignment/out/ChainedAssignment.ir/ChainedAssignment.approval.1.approval.ssa.opt.ir b/test_cases/chained_assignment/out/ChainedAssignment.ir/ChainedAssignment.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/chained_assignment/out/ChainedAssignment.ir/ChainedAssignment.approval.1.approval.ssa.opt.ir
rename to test_cases/chained_assignment/out/ChainedAssignment.ir/ChainedAssignment.approval.1.ssa.opt.ir
diff --git a/test_cases/chained_assignment/out/ChainedAssignment.ir/ChainedAssignment.approval.2.approval.ssa.opt.ir b/test_cases/chained_assignment/out/ChainedAssignment.ir/ChainedAssignment.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/chained_assignment/out/ChainedAssignment.ir/ChainedAssignment.approval.2.approval.ssa.opt.ir
rename to test_cases/chained_assignment/out/ChainedAssignment.ir/ChainedAssignment.approval.2.ssa.opt.ir
diff --git a/test_cases/chained_assignment/out/ChainedAssignment.ir/ChainedAssignment.approval.3.approval.destructured.ir b/test_cases/chained_assignment/out/ChainedAssignment.ir/ChainedAssignment.approval.3.destructured.ir
similarity index 100%
rename from test_cases/chained_assignment/out/ChainedAssignment.ir/ChainedAssignment.approval.3.approval.destructured.ir
rename to test_cases/chained_assignment/out/ChainedAssignment.ir/ChainedAssignment.approval.3.destructured.ir
diff --git a/test_cases/chained_assignment/out/ChainedAssignment.ir/ChainedAssignment.clear.0.clear.ssa.ir b/test_cases/chained_assignment/out/ChainedAssignment.ir/ChainedAssignment.clear.0.ssa.ir
similarity index 100%
rename from test_cases/chained_assignment/out/ChainedAssignment.ir/ChainedAssignment.clear.0.clear.ssa.ir
rename to test_cases/chained_assignment/out/ChainedAssignment.ir/ChainedAssignment.clear.0.ssa.ir
diff --git a/test_cases/chained_assignment/out/ChainedAssignment.ir/ChainedAssignment.clear.1.clear.destructured.ir b/test_cases/chained_assignment/out/ChainedAssignment.ir/ChainedAssignment.clear.1.destructured.ir
similarity index 100%
rename from test_cases/chained_assignment/out/ChainedAssignment.ir/ChainedAssignment.clear.1.clear.destructured.ir
rename to test_cases/chained_assignment/out/ChainedAssignment.ir/ChainedAssignment.clear.1.destructured.ir
diff --git a/test_cases/chained_assignment/out_O2/ChainedAssignment.ir/ChainedAssignment.approval.0.approval.destructured.ir b/test_cases/chained_assignment/out_O2/ChainedAssignment.ir/ChainedAssignment.approval.0.destructured.ir
similarity index 100%
rename from test_cases/chained_assignment/out_O2/ChainedAssignment.ir/ChainedAssignment.approval.0.approval.destructured.ir
rename to test_cases/chained_assignment/out_O2/ChainedAssignment.ir/ChainedAssignment.approval.0.destructured.ir
diff --git a/test_cases/chained_assignment/out_O2/ChainedAssignment.ir/ChainedAssignment.clear.0.clear.destructured.ir b/test_cases/chained_assignment/out_O2/ChainedAssignment.ir/ChainedAssignment.clear.0.destructured.ir
similarity index 100%
rename from test_cases/chained_assignment/out_O2/ChainedAssignment.ir/ChainedAssignment.clear.0.clear.destructured.ir
rename to test_cases/chained_assignment/out_O2/ChainedAssignment.ir/ChainedAssignment.clear.0.destructured.ir
diff --git a/test_cases/chained_assignment/out_unoptimized/ChainedAssignment.ir/ChainedAssignment.approval.0.approval.destructured.ir b/test_cases/chained_assignment/out_unoptimized/ChainedAssignment.ir/ChainedAssignment.approval.0.destructured.ir
similarity index 100%
rename from test_cases/chained_assignment/out_unoptimized/ChainedAssignment.ir/ChainedAssignment.approval.0.approval.destructured.ir
rename to test_cases/chained_assignment/out_unoptimized/ChainedAssignment.ir/ChainedAssignment.approval.0.destructured.ir
diff --git a/test_cases/chained_assignment/out_unoptimized/ChainedAssignment.ir/ChainedAssignment.clear.0.clear.destructured.ir b/test_cases/chained_assignment/out_unoptimized/ChainedAssignment.ir/ChainedAssignment.clear.0.destructured.ir
similarity index 100%
rename from test_cases/chained_assignment/out_unoptimized/ChainedAssignment.ir/ChainedAssignment.clear.0.clear.destructured.ir
rename to test_cases/chained_assignment/out_unoptimized/ChainedAssignment.ir/ChainedAssignment.clear.0.destructured.ir
diff --git a/test_cases/chained_assignment/puya.log b/test_cases/chained_assignment/puya.log
index e392f38e92..43eee95a61 100644
--- a/test_cases/chained_assignment/puya.log
+++ b/test_cases/chained_assignment/puya.log
@@ -423,7 +423,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to chained_assignment/out/ChainedAssignment.ir/ChainedAssignment.approval.0.approval.ssa.ir
+debug: Output IR to chained_assignment/out/ChainedAssignment.ir/ChainedAssignment.approval.0.ssa.ir
 info: optimizing approval program of test_cases.chained_assignment.contract.ChainedAssignment at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.chained_assignment.contract.ChainedAssignment.__init__ for inlining
@@ -534,7 +534,7 @@ debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.chained_assignment.contract.ChainedAssignment.__init__
 debug: removing unused subroutine test_cases.chained_assignment.contract.join_log_and_return
 debug: removing unused subroutine test_cases.chained_assignment.contract.ChainedAssignment.approval_program
-debug: Output IR to chained_assignment/out/ChainedAssignment.ir/ChainedAssignment.approval.1.approval.ssa.opt.ir
+debug: Output IR to chained_assignment/out/ChainedAssignment.ir/ChainedAssignment.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking single-use function test_cases.chained_assignment.contract.BaseContract.__init__ for inlining
 debug: Optimizing subroutine test_cases.chained_assignment.contract.ChainedAssignment.__algopy_entrypoint_with_init
@@ -573,7 +573,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.chained_assignment.contract.BaseContract.__init__
-debug: Output IR to chained_assignment/out/ChainedAssignment.ir/ChainedAssignment.approval.2.approval.ssa.opt.ir
+debug: Output IR to chained_assignment/out/ChainedAssignment.ir/ChainedAssignment.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.chained_assignment.contract.ChainedAssignment.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -598,8 +598,8 @@ debug: Coalescing local variables in test_cases.chained_assignment.contract.Chai
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.chained_assignment.contract.ChainedAssignment.__algopy_entrypoint_with_init
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to chained_assignment/out/ChainedAssignment.ir/ChainedAssignment.approval.3.approval.destructured.ir
-debug: Output IR to chained_assignment/out/ChainedAssignment.ir/ChainedAssignment.clear.0.clear.ssa.ir
+debug: Output IR to chained_assignment/out/ChainedAssignment.ir/ChainedAssignment.approval.3.destructured.ir
+debug: Output IR to chained_assignment/out/ChainedAssignment.ir/ChainedAssignment.clear.0.ssa.ir
 info: optimizing clear program of test_cases.chained_assignment.contract.ChainedAssignment at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.chained_assignment.contract.ChainedAssignment.clear_state_program
@@ -625,7 +625,7 @@ debug: Coalescing local variables in test_cases.chained_assignment.contract.Chai
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.chained_assignment.contract.ChainedAssignment.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to chained_assignment/out/ChainedAssignment.ir/ChainedAssignment.clear.1.clear.destructured.ir
+debug: Output IR to chained_assignment/out/ChainedAssignment.ir/ChainedAssignment.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Found 1 edge set/s for test_cases.chained_assignment.contract.ChainedAssignment.__algopy_entrypoint_with_init
diff --git a/test_cases/chained_assignment/puya_O2.log b/test_cases/chained_assignment/puya_O2.log
index 8a73c012a3..7ecc62f83e 100644
--- a/test_cases/chained_assignment/puya_O2.log
+++ b/test_cases/chained_assignment/puya_O2.log
@@ -594,7 +594,7 @@ debug: Coalescing local variables in test_cases.chained_assignment.contract.Chai
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.chained_assignment.contract.ChainedAssignment.__algopy_entrypoint_with_init
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to chained_assignment/out_O2/ChainedAssignment.ir/ChainedAssignment.approval.0.approval.destructured.ir
+debug: Output IR to chained_assignment/out_O2/ChainedAssignment.ir/ChainedAssignment.approval.0.destructured.ir
 info: optimizing clear program of test_cases.chained_assignment.contract.ChainedAssignment at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.chained_assignment.contract.ChainedAssignment.clear_state_program
@@ -620,7 +620,7 @@ debug: Coalescing local variables in test_cases.chained_assignment.contract.Chai
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.chained_assignment.contract.ChainedAssignment.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to chained_assignment/out_O2/ChainedAssignment.ir/ChainedAssignment.clear.0.clear.destructured.ir
+debug: Output IR to chained_assignment/out_O2/ChainedAssignment.ir/ChainedAssignment.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Found 1 edge set/s for test_cases.chained_assignment.contract.ChainedAssignment.__algopy_entrypoint_with_init
diff --git a/test_cases/chained_assignment/puya_unoptimized.log b/test_cases/chained_assignment/puya_unoptimized.log
index a44e7dff97..2c950225d5 100644
--- a/test_cases/chained_assignment/puya_unoptimized.log
+++ b/test_cases/chained_assignment/puya_unoptimized.log
@@ -495,7 +495,7 @@ debug: Coalescing local variables in test_cases.chained_assignment.contract.Chai
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.chained_assignment.contract.ChainedAssignment.approval_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to chained_assignment/out_unoptimized/ChainedAssignment.ir/ChainedAssignment.approval.0.approval.destructured.ir
+debug: Output IR to chained_assignment/out_unoptimized/ChainedAssignment.ir/ChainedAssignment.approval.0.destructured.ir
 info: optimizing clear program of test_cases.chained_assignment.contract.ChainedAssignment at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.chained_assignment.contract.ChainedAssignment.clear_state_program
@@ -513,7 +513,7 @@ debug: Coalescing local variables in test_cases.chained_assignment.contract.Chai
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.chained_assignment.contract.ChainedAssignment.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to chained_assignment/out_unoptimized/ChainedAssignment.ir/ChainedAssignment.clear.0.clear.destructured.ir
+debug: Output IR to chained_assignment/out_unoptimized/ChainedAssignment.ir/ChainedAssignment.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/compile/out/Hello.ir/Hello.approval.0.approval.ssa.ir b/test_cases/compile/out/Hello.ir/Hello.approval.0.ssa.ir
similarity index 100%
rename from test_cases/compile/out/Hello.ir/Hello.approval.0.approval.ssa.ir
rename to test_cases/compile/out/Hello.ir/Hello.approval.0.ssa.ir
diff --git a/test_cases/compile/out/Hello.ir/Hello.approval.1.approval.ssa.opt.ir b/test_cases/compile/out/Hello.ir/Hello.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/compile/out/Hello.ir/Hello.approval.1.approval.ssa.opt.ir
rename to test_cases/compile/out/Hello.ir/Hello.approval.1.ssa.opt.ir
diff --git a/test_cases/compile/out/Hello.ir/Hello.approval.2.approval.ssa.opt.ir b/test_cases/compile/out/Hello.ir/Hello.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/compile/out/Hello.ir/Hello.approval.2.approval.ssa.opt.ir
rename to test_cases/compile/out/Hello.ir/Hello.approval.2.ssa.opt.ir
diff --git a/test_cases/compile/out/Hello.ir/Hello.approval.3.approval.destructured.ir b/test_cases/compile/out/Hello.ir/Hello.approval.3.destructured.ir
similarity index 100%
rename from test_cases/compile/out/Hello.ir/Hello.approval.3.approval.destructured.ir
rename to test_cases/compile/out/Hello.ir/Hello.approval.3.destructured.ir
diff --git a/test_cases/compile/out/Hello.ir/Hello.clear.0.clear.ssa.ir b/test_cases/compile/out/Hello.ir/Hello.clear.0.ssa.ir
similarity index 100%
rename from test_cases/compile/out/Hello.ir/Hello.clear.0.clear.ssa.ir
rename to test_cases/compile/out/Hello.ir/Hello.clear.0.ssa.ir
diff --git a/test_cases/compile/out/Hello.ir/Hello.clear.1.clear.destructured.ir b/test_cases/compile/out/Hello.ir/Hello.clear.1.destructured.ir
similarity index 100%
rename from test_cases/compile/out/Hello.ir/Hello.clear.1.clear.destructured.ir
rename to test_cases/compile/out/Hello.ir/Hello.clear.1.destructured.ir
diff --git a/test_cases/compile/out/HelloBase.ir/HelloBase.approval.0.approval.ssa.ir b/test_cases/compile/out/HelloBase.ir/HelloBase.approval.0.ssa.ir
similarity index 100%
rename from test_cases/compile/out/HelloBase.ir/HelloBase.approval.0.approval.ssa.ir
rename to test_cases/compile/out/HelloBase.ir/HelloBase.approval.0.ssa.ir
diff --git a/test_cases/compile/out/HelloBase.ir/HelloBase.approval.1.approval.ssa.opt.ir b/test_cases/compile/out/HelloBase.ir/HelloBase.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/compile/out/HelloBase.ir/HelloBase.approval.1.approval.ssa.opt.ir
rename to test_cases/compile/out/HelloBase.ir/HelloBase.approval.1.ssa.opt.ir
diff --git a/test_cases/compile/out/HelloBase.ir/HelloBase.approval.2.approval.ssa.opt.ir b/test_cases/compile/out/HelloBase.ir/HelloBase.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/compile/out/HelloBase.ir/HelloBase.approval.2.approval.ssa.opt.ir
rename to test_cases/compile/out/HelloBase.ir/HelloBase.approval.2.ssa.opt.ir
diff --git a/test_cases/compile/out/HelloBase.ir/HelloBase.approval.3.approval.destructured.ir b/test_cases/compile/out/HelloBase.ir/HelloBase.approval.3.destructured.ir
similarity index 100%
rename from test_cases/compile/out/HelloBase.ir/HelloBase.approval.3.approval.destructured.ir
rename to test_cases/compile/out/HelloBase.ir/HelloBase.approval.3.destructured.ir
diff --git a/test_cases/compile/out/HelloBase.ir/HelloBase.clear.0.clear.ssa.ir b/test_cases/compile/out/HelloBase.ir/HelloBase.clear.0.ssa.ir
similarity index 100%
rename from test_cases/compile/out/HelloBase.ir/HelloBase.clear.0.clear.ssa.ir
rename to test_cases/compile/out/HelloBase.ir/HelloBase.clear.0.ssa.ir
diff --git a/test_cases/compile/out/HelloBase.ir/HelloBase.clear.1.clear.destructured.ir b/test_cases/compile/out/HelloBase.ir/HelloBase.clear.1.destructured.ir
similarity index 100%
rename from test_cases/compile/out/HelloBase.ir/HelloBase.clear.1.clear.destructured.ir
rename to test_cases/compile/out/HelloBase.ir/HelloBase.clear.1.destructured.ir
diff --git a/test_cases/compile/out/HelloFactory.ir/HelloFactory.approval.0.approval.ssa.ir b/test_cases/compile/out/HelloFactory.ir/HelloFactory.approval.0.ssa.ir
similarity index 100%
rename from test_cases/compile/out/HelloFactory.ir/HelloFactory.approval.0.approval.ssa.ir
rename to test_cases/compile/out/HelloFactory.ir/HelloFactory.approval.0.ssa.ir
diff --git a/test_cases/compile/out/HelloFactory.ir/HelloFactory.approval.1.approval.ssa.opt.ir b/test_cases/compile/out/HelloFactory.ir/HelloFactory.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/compile/out/HelloFactory.ir/HelloFactory.approval.1.approval.ssa.opt.ir
rename to test_cases/compile/out/HelloFactory.ir/HelloFactory.approval.1.ssa.opt.ir
diff --git a/test_cases/compile/out/HelloFactory.ir/HelloFactory.approval.2.approval.ssa.opt.ir b/test_cases/compile/out/HelloFactory.ir/HelloFactory.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/compile/out/HelloFactory.ir/HelloFactory.approval.2.approval.ssa.opt.ir
rename to test_cases/compile/out/HelloFactory.ir/HelloFactory.approval.2.ssa.opt.ir
diff --git a/test_cases/compile/out/HelloFactory.ir/HelloFactory.approval.3.approval.destructured.ir b/test_cases/compile/out/HelloFactory.ir/HelloFactory.approval.3.destructured.ir
similarity index 100%
rename from test_cases/compile/out/HelloFactory.ir/HelloFactory.approval.3.approval.destructured.ir
rename to test_cases/compile/out/HelloFactory.ir/HelloFactory.approval.3.destructured.ir
diff --git a/test_cases/compile/out/HelloFactory.ir/HelloFactory.clear.0.clear.ssa.ir b/test_cases/compile/out/HelloFactory.ir/HelloFactory.clear.0.ssa.ir
similarity index 100%
rename from test_cases/compile/out/HelloFactory.ir/HelloFactory.clear.0.clear.ssa.ir
rename to test_cases/compile/out/HelloFactory.ir/HelloFactory.clear.0.ssa.ir
diff --git a/test_cases/compile/out/HelloFactory.ir/HelloFactory.clear.1.clear.destructured.ir b/test_cases/compile/out/HelloFactory.ir/HelloFactory.clear.1.destructured.ir
similarity index 100%
rename from test_cases/compile/out/HelloFactory.ir/HelloFactory.clear.1.clear.destructured.ir
rename to test_cases/compile/out/HelloFactory.ir/HelloFactory.clear.1.destructured.ir
diff --git a/test_cases/compile/out/HelloOtherConstants.ir/HelloOtherConstants.approval.0.approval.ssa.ir b/test_cases/compile/out/HelloOtherConstants.ir/HelloOtherConstants.approval.0.ssa.ir
similarity index 100%
rename from test_cases/compile/out/HelloOtherConstants.ir/HelloOtherConstants.approval.0.approval.ssa.ir
rename to test_cases/compile/out/HelloOtherConstants.ir/HelloOtherConstants.approval.0.ssa.ir
diff --git a/test_cases/compile/out/HelloOtherConstants.ir/HelloOtherConstants.approval.1.approval.ssa.opt.ir b/test_cases/compile/out/HelloOtherConstants.ir/HelloOtherConstants.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/compile/out/HelloOtherConstants.ir/HelloOtherConstants.approval.1.approval.ssa.opt.ir
rename to test_cases/compile/out/HelloOtherConstants.ir/HelloOtherConstants.approval.1.ssa.opt.ir
diff --git a/test_cases/compile/out/HelloOtherConstants.ir/HelloOtherConstants.approval.2.approval.ssa.opt.ir b/test_cases/compile/out/HelloOtherConstants.ir/HelloOtherConstants.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/compile/out/HelloOtherConstants.ir/HelloOtherConstants.approval.2.approval.ssa.opt.ir
rename to test_cases/compile/out/HelloOtherConstants.ir/HelloOtherConstants.approval.2.ssa.opt.ir
diff --git a/test_cases/compile/out/HelloOtherConstants.ir/HelloOtherConstants.approval.3.approval.destructured.ir b/test_cases/compile/out/HelloOtherConstants.ir/HelloOtherConstants.approval.3.destructured.ir
similarity index 100%
rename from test_cases/compile/out/HelloOtherConstants.ir/HelloOtherConstants.approval.3.approval.destructured.ir
rename to test_cases/compile/out/HelloOtherConstants.ir/HelloOtherConstants.approval.3.destructured.ir
diff --git a/test_cases/compile/out/HelloOtherConstants.ir/HelloOtherConstants.clear.0.clear.ssa.ir b/test_cases/compile/out/HelloOtherConstants.ir/HelloOtherConstants.clear.0.ssa.ir
similarity index 100%
rename from test_cases/compile/out/HelloOtherConstants.ir/HelloOtherConstants.clear.0.clear.ssa.ir
rename to test_cases/compile/out/HelloOtherConstants.ir/HelloOtherConstants.clear.0.ssa.ir
diff --git a/test_cases/compile/out/HelloOtherConstants.ir/HelloOtherConstants.clear.1.clear.destructured.ir b/test_cases/compile/out/HelloOtherConstants.ir/HelloOtherConstants.clear.1.destructured.ir
similarity index 100%
rename from test_cases/compile/out/HelloOtherConstants.ir/HelloOtherConstants.clear.1.clear.destructured.ir
rename to test_cases/compile/out/HelloOtherConstants.ir/HelloOtherConstants.clear.1.destructured.ir
diff --git a/test_cases/compile/out/HelloPrfx.ir/HelloPrfx.approval.0.approval.ssa.ir b/test_cases/compile/out/HelloPrfx.ir/HelloPrfx.approval.0.ssa.ir
similarity index 100%
rename from test_cases/compile/out/HelloPrfx.ir/HelloPrfx.approval.0.approval.ssa.ir
rename to test_cases/compile/out/HelloPrfx.ir/HelloPrfx.approval.0.ssa.ir
diff --git a/test_cases/compile/out/HelloPrfx.ir/HelloPrfx.approval.1.approval.ssa.opt.ir b/test_cases/compile/out/HelloPrfx.ir/HelloPrfx.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/compile/out/HelloPrfx.ir/HelloPrfx.approval.1.approval.ssa.opt.ir
rename to test_cases/compile/out/HelloPrfx.ir/HelloPrfx.approval.1.ssa.opt.ir
diff --git a/test_cases/compile/out/HelloPrfx.ir/HelloPrfx.approval.2.approval.ssa.opt.ir b/test_cases/compile/out/HelloPrfx.ir/HelloPrfx.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/compile/out/HelloPrfx.ir/HelloPrfx.approval.2.approval.ssa.opt.ir
rename to test_cases/compile/out/HelloPrfx.ir/HelloPrfx.approval.2.ssa.opt.ir
diff --git a/test_cases/compile/out/HelloPrfx.ir/HelloPrfx.approval.3.approval.destructured.ir b/test_cases/compile/out/HelloPrfx.ir/HelloPrfx.approval.3.destructured.ir
similarity index 100%
rename from test_cases/compile/out/HelloPrfx.ir/HelloPrfx.approval.3.approval.destructured.ir
rename to test_cases/compile/out/HelloPrfx.ir/HelloPrfx.approval.3.destructured.ir
diff --git a/test_cases/compile/out/HelloPrfx.ir/HelloPrfx.clear.0.clear.ssa.ir b/test_cases/compile/out/HelloPrfx.ir/HelloPrfx.clear.0.ssa.ir
similarity index 100%
rename from test_cases/compile/out/HelloPrfx.ir/HelloPrfx.clear.0.clear.ssa.ir
rename to test_cases/compile/out/HelloPrfx.ir/HelloPrfx.clear.0.ssa.ir
diff --git a/test_cases/compile/out/HelloPrfx.ir/HelloPrfx.clear.1.clear.destructured.ir b/test_cases/compile/out/HelloPrfx.ir/HelloPrfx.clear.1.destructured.ir
similarity index 100%
rename from test_cases/compile/out/HelloPrfx.ir/HelloPrfx.clear.1.clear.destructured.ir
rename to test_cases/compile/out/HelloPrfx.ir/HelloPrfx.clear.1.destructured.ir
diff --git a/test_cases/compile/out/HelloTmpl.ir/HelloTmpl.approval.0.approval.ssa.ir b/test_cases/compile/out/HelloTmpl.ir/HelloTmpl.approval.0.ssa.ir
similarity index 100%
rename from test_cases/compile/out/HelloTmpl.ir/HelloTmpl.approval.0.approval.ssa.ir
rename to test_cases/compile/out/HelloTmpl.ir/HelloTmpl.approval.0.ssa.ir
diff --git a/test_cases/compile/out/HelloTmpl.ir/HelloTmpl.approval.1.approval.ssa.opt.ir b/test_cases/compile/out/HelloTmpl.ir/HelloTmpl.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/compile/out/HelloTmpl.ir/HelloTmpl.approval.1.approval.ssa.opt.ir
rename to test_cases/compile/out/HelloTmpl.ir/HelloTmpl.approval.1.ssa.opt.ir
diff --git a/test_cases/compile/out/HelloTmpl.ir/HelloTmpl.approval.2.approval.ssa.opt.ir b/test_cases/compile/out/HelloTmpl.ir/HelloTmpl.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/compile/out/HelloTmpl.ir/HelloTmpl.approval.2.approval.ssa.opt.ir
rename to test_cases/compile/out/HelloTmpl.ir/HelloTmpl.approval.2.ssa.opt.ir
diff --git a/test_cases/compile/out/HelloTmpl.ir/HelloTmpl.approval.3.approval.destructured.ir b/test_cases/compile/out/HelloTmpl.ir/HelloTmpl.approval.3.destructured.ir
similarity index 100%
rename from test_cases/compile/out/HelloTmpl.ir/HelloTmpl.approval.3.approval.destructured.ir
rename to test_cases/compile/out/HelloTmpl.ir/HelloTmpl.approval.3.destructured.ir
diff --git a/test_cases/compile/out/HelloTmpl.ir/HelloTmpl.clear.0.clear.ssa.ir b/test_cases/compile/out/HelloTmpl.ir/HelloTmpl.clear.0.ssa.ir
similarity index 100%
rename from test_cases/compile/out/HelloTmpl.ir/HelloTmpl.clear.0.clear.ssa.ir
rename to test_cases/compile/out/HelloTmpl.ir/HelloTmpl.clear.0.ssa.ir
diff --git a/test_cases/compile/out/HelloTmpl.ir/HelloTmpl.clear.1.clear.destructured.ir b/test_cases/compile/out/HelloTmpl.ir/HelloTmpl.clear.1.destructured.ir
similarity index 100%
rename from test_cases/compile/out/HelloTmpl.ir/HelloTmpl.clear.1.clear.destructured.ir
rename to test_cases/compile/out/HelloTmpl.ir/HelloTmpl.clear.1.destructured.ir
diff --git a/test_cases/compile/out/LargeProgram.ir/LargeProgram.approval.0.approval.ssa.ir b/test_cases/compile/out/LargeProgram.ir/LargeProgram.approval.0.ssa.ir
similarity index 100%
rename from test_cases/compile/out/LargeProgram.ir/LargeProgram.approval.0.approval.ssa.ir
rename to test_cases/compile/out/LargeProgram.ir/LargeProgram.approval.0.ssa.ir
diff --git a/test_cases/compile/out/LargeProgram.ir/LargeProgram.approval.1.approval.ssa.opt.ir b/test_cases/compile/out/LargeProgram.ir/LargeProgram.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/compile/out/LargeProgram.ir/LargeProgram.approval.1.approval.ssa.opt.ir
rename to test_cases/compile/out/LargeProgram.ir/LargeProgram.approval.1.ssa.opt.ir
diff --git a/test_cases/compile/out/LargeProgram.ir/LargeProgram.approval.2.approval.ssa.opt.ir b/test_cases/compile/out/LargeProgram.ir/LargeProgram.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/compile/out/LargeProgram.ir/LargeProgram.approval.2.approval.ssa.opt.ir
rename to test_cases/compile/out/LargeProgram.ir/LargeProgram.approval.2.ssa.opt.ir
diff --git a/test_cases/compile/out/LargeProgram.ir/LargeProgram.approval.3.approval.destructured.ir b/test_cases/compile/out/LargeProgram.ir/LargeProgram.approval.3.destructured.ir
similarity index 100%
rename from test_cases/compile/out/LargeProgram.ir/LargeProgram.approval.3.approval.destructured.ir
rename to test_cases/compile/out/LargeProgram.ir/LargeProgram.approval.3.destructured.ir
diff --git a/test_cases/compile/out/LargeProgram.ir/LargeProgram.clear.0.clear.ssa.ir b/test_cases/compile/out/LargeProgram.ir/LargeProgram.clear.0.ssa.ir
similarity index 100%
rename from test_cases/compile/out/LargeProgram.ir/LargeProgram.clear.0.clear.ssa.ir
rename to test_cases/compile/out/LargeProgram.ir/LargeProgram.clear.0.ssa.ir
diff --git a/test_cases/compile/out/LargeProgram.ir/LargeProgram.clear.1.clear.destructured.ir b/test_cases/compile/out/LargeProgram.ir/LargeProgram.clear.1.destructured.ir
similarity index 100%
rename from test_cases/compile/out/LargeProgram.ir/LargeProgram.clear.1.clear.destructured.ir
rename to test_cases/compile/out/LargeProgram.ir/LargeProgram.clear.1.destructured.ir
diff --git a/test_cases/compile/out_O2/Hello.ir/Hello.approval.0.approval.destructured.ir b/test_cases/compile/out_O2/Hello.ir/Hello.approval.0.destructured.ir
similarity index 100%
rename from test_cases/compile/out_O2/Hello.ir/Hello.approval.0.approval.destructured.ir
rename to test_cases/compile/out_O2/Hello.ir/Hello.approval.0.destructured.ir
diff --git a/test_cases/compile/out_O2/Hello.ir/Hello.clear.0.clear.destructured.ir b/test_cases/compile/out_O2/Hello.ir/Hello.clear.0.destructured.ir
similarity index 100%
rename from test_cases/compile/out_O2/Hello.ir/Hello.clear.0.clear.destructured.ir
rename to test_cases/compile/out_O2/Hello.ir/Hello.clear.0.destructured.ir
diff --git a/test_cases/compile/out_O2/HelloBase.ir/HelloBase.approval.0.approval.destructured.ir b/test_cases/compile/out_O2/HelloBase.ir/HelloBase.approval.0.destructured.ir
similarity index 100%
rename from test_cases/compile/out_O2/HelloBase.ir/HelloBase.approval.0.approval.destructured.ir
rename to test_cases/compile/out_O2/HelloBase.ir/HelloBase.approval.0.destructured.ir
diff --git a/test_cases/compile/out_O2/HelloBase.ir/HelloBase.clear.0.clear.destructured.ir b/test_cases/compile/out_O2/HelloBase.ir/HelloBase.clear.0.destructured.ir
similarity index 100%
rename from test_cases/compile/out_O2/HelloBase.ir/HelloBase.clear.0.clear.destructured.ir
rename to test_cases/compile/out_O2/HelloBase.ir/HelloBase.clear.0.destructured.ir
diff --git a/test_cases/compile/out_O2/HelloFactory.ir/HelloFactory.approval.0.approval.destructured.ir b/test_cases/compile/out_O2/HelloFactory.ir/HelloFactory.approval.0.destructured.ir
similarity index 100%
rename from test_cases/compile/out_O2/HelloFactory.ir/HelloFactory.approval.0.approval.destructured.ir
rename to test_cases/compile/out_O2/HelloFactory.ir/HelloFactory.approval.0.destructured.ir
diff --git a/test_cases/compile/out_O2/HelloFactory.ir/HelloFactory.clear.0.clear.destructured.ir b/test_cases/compile/out_O2/HelloFactory.ir/HelloFactory.clear.0.destructured.ir
similarity index 100%
rename from test_cases/compile/out_O2/HelloFactory.ir/HelloFactory.clear.0.clear.destructured.ir
rename to test_cases/compile/out_O2/HelloFactory.ir/HelloFactory.clear.0.destructured.ir
diff --git a/test_cases/compile/out_O2/HelloOtherConstants.ir/HelloOtherConstants.approval.0.approval.destructured.ir b/test_cases/compile/out_O2/HelloOtherConstants.ir/HelloOtherConstants.approval.0.destructured.ir
similarity index 100%
rename from test_cases/compile/out_O2/HelloOtherConstants.ir/HelloOtherConstants.approval.0.approval.destructured.ir
rename to test_cases/compile/out_O2/HelloOtherConstants.ir/HelloOtherConstants.approval.0.destructured.ir
diff --git a/test_cases/compile/out_O2/HelloOtherConstants.ir/HelloOtherConstants.clear.0.clear.destructured.ir b/test_cases/compile/out_O2/HelloOtherConstants.ir/HelloOtherConstants.clear.0.destructured.ir
similarity index 100%
rename from test_cases/compile/out_O2/HelloOtherConstants.ir/HelloOtherConstants.clear.0.clear.destructured.ir
rename to test_cases/compile/out_O2/HelloOtherConstants.ir/HelloOtherConstants.clear.0.destructured.ir
diff --git a/test_cases/compile/out_O2/HelloPrfx.ir/HelloPrfx.approval.0.approval.destructured.ir b/test_cases/compile/out_O2/HelloPrfx.ir/HelloPrfx.approval.0.destructured.ir
similarity index 100%
rename from test_cases/compile/out_O2/HelloPrfx.ir/HelloPrfx.approval.0.approval.destructured.ir
rename to test_cases/compile/out_O2/HelloPrfx.ir/HelloPrfx.approval.0.destructured.ir
diff --git a/test_cases/compile/out_O2/HelloPrfx.ir/HelloPrfx.clear.0.clear.destructured.ir b/test_cases/compile/out_O2/HelloPrfx.ir/HelloPrfx.clear.0.destructured.ir
similarity index 100%
rename from test_cases/compile/out_O2/HelloPrfx.ir/HelloPrfx.clear.0.clear.destructured.ir
rename to test_cases/compile/out_O2/HelloPrfx.ir/HelloPrfx.clear.0.destructured.ir
diff --git a/test_cases/compile/out_O2/HelloTmpl.ir/HelloTmpl.approval.0.approval.destructured.ir b/test_cases/compile/out_O2/HelloTmpl.ir/HelloTmpl.approval.0.destructured.ir
similarity index 100%
rename from test_cases/compile/out_O2/HelloTmpl.ir/HelloTmpl.approval.0.approval.destructured.ir
rename to test_cases/compile/out_O2/HelloTmpl.ir/HelloTmpl.approval.0.destructured.ir
diff --git a/test_cases/compile/out_O2/HelloTmpl.ir/HelloTmpl.clear.0.clear.destructured.ir b/test_cases/compile/out_O2/HelloTmpl.ir/HelloTmpl.clear.0.destructured.ir
similarity index 100%
rename from test_cases/compile/out_O2/HelloTmpl.ir/HelloTmpl.clear.0.clear.destructured.ir
rename to test_cases/compile/out_O2/HelloTmpl.ir/HelloTmpl.clear.0.destructured.ir
diff --git a/test_cases/compile/out_O2/LargeProgram.ir/LargeProgram.approval.0.approval.destructured.ir b/test_cases/compile/out_O2/LargeProgram.ir/LargeProgram.approval.0.destructured.ir
similarity index 100%
rename from test_cases/compile/out_O2/LargeProgram.ir/LargeProgram.approval.0.approval.destructured.ir
rename to test_cases/compile/out_O2/LargeProgram.ir/LargeProgram.approval.0.destructured.ir
diff --git a/test_cases/compile/out_O2/LargeProgram.ir/LargeProgram.clear.0.clear.destructured.ir b/test_cases/compile/out_O2/LargeProgram.ir/LargeProgram.clear.0.destructured.ir
similarity index 100%
rename from test_cases/compile/out_O2/LargeProgram.ir/LargeProgram.clear.0.clear.destructured.ir
rename to test_cases/compile/out_O2/LargeProgram.ir/LargeProgram.clear.0.destructured.ir
diff --git a/test_cases/compile/out_unoptimized/Hello.ir/Hello.approval.0.approval.destructured.ir b/test_cases/compile/out_unoptimized/Hello.ir/Hello.approval.0.destructured.ir
similarity index 100%
rename from test_cases/compile/out_unoptimized/Hello.ir/Hello.approval.0.approval.destructured.ir
rename to test_cases/compile/out_unoptimized/Hello.ir/Hello.approval.0.destructured.ir
diff --git a/test_cases/compile/out_unoptimized/Hello.ir/Hello.clear.0.clear.destructured.ir b/test_cases/compile/out_unoptimized/Hello.ir/Hello.clear.0.destructured.ir
similarity index 100%
rename from test_cases/compile/out_unoptimized/Hello.ir/Hello.clear.0.clear.destructured.ir
rename to test_cases/compile/out_unoptimized/Hello.ir/Hello.clear.0.destructured.ir
diff --git a/test_cases/compile/out_unoptimized/HelloBase.ir/HelloBase.approval.0.approval.destructured.ir b/test_cases/compile/out_unoptimized/HelloBase.ir/HelloBase.approval.0.destructured.ir
similarity index 100%
rename from test_cases/compile/out_unoptimized/HelloBase.ir/HelloBase.approval.0.approval.destructured.ir
rename to test_cases/compile/out_unoptimized/HelloBase.ir/HelloBase.approval.0.destructured.ir
diff --git a/test_cases/compile/out_unoptimized/HelloBase.ir/HelloBase.clear.0.clear.destructured.ir b/test_cases/compile/out_unoptimized/HelloBase.ir/HelloBase.clear.0.destructured.ir
similarity index 100%
rename from test_cases/compile/out_unoptimized/HelloBase.ir/HelloBase.clear.0.clear.destructured.ir
rename to test_cases/compile/out_unoptimized/HelloBase.ir/HelloBase.clear.0.destructured.ir
diff --git a/test_cases/compile/out_unoptimized/HelloFactory.ir/HelloFactory.approval.0.approval.destructured.ir b/test_cases/compile/out_unoptimized/HelloFactory.ir/HelloFactory.approval.0.destructured.ir
similarity index 100%
rename from test_cases/compile/out_unoptimized/HelloFactory.ir/HelloFactory.approval.0.approval.destructured.ir
rename to test_cases/compile/out_unoptimized/HelloFactory.ir/HelloFactory.approval.0.destructured.ir
diff --git a/test_cases/compile/out_unoptimized/HelloFactory.ir/HelloFactory.clear.0.clear.destructured.ir b/test_cases/compile/out_unoptimized/HelloFactory.ir/HelloFactory.clear.0.destructured.ir
similarity index 100%
rename from test_cases/compile/out_unoptimized/HelloFactory.ir/HelloFactory.clear.0.clear.destructured.ir
rename to test_cases/compile/out_unoptimized/HelloFactory.ir/HelloFactory.clear.0.destructured.ir
diff --git a/test_cases/compile/out_unoptimized/HelloOtherConstants.ir/HelloOtherConstants.approval.0.approval.destructured.ir b/test_cases/compile/out_unoptimized/HelloOtherConstants.ir/HelloOtherConstants.approval.0.destructured.ir
similarity index 100%
rename from test_cases/compile/out_unoptimized/HelloOtherConstants.ir/HelloOtherConstants.approval.0.approval.destructured.ir
rename to test_cases/compile/out_unoptimized/HelloOtherConstants.ir/HelloOtherConstants.approval.0.destructured.ir
diff --git a/test_cases/compile/out_unoptimized/HelloOtherConstants.ir/HelloOtherConstants.clear.0.clear.destructured.ir b/test_cases/compile/out_unoptimized/HelloOtherConstants.ir/HelloOtherConstants.clear.0.destructured.ir
similarity index 100%
rename from test_cases/compile/out_unoptimized/HelloOtherConstants.ir/HelloOtherConstants.clear.0.clear.destructured.ir
rename to test_cases/compile/out_unoptimized/HelloOtherConstants.ir/HelloOtherConstants.clear.0.destructured.ir
diff --git a/test_cases/compile/out_unoptimized/HelloPrfx.ir/HelloPrfx.approval.0.approval.destructured.ir b/test_cases/compile/out_unoptimized/HelloPrfx.ir/HelloPrfx.approval.0.destructured.ir
similarity index 100%
rename from test_cases/compile/out_unoptimized/HelloPrfx.ir/HelloPrfx.approval.0.approval.destructured.ir
rename to test_cases/compile/out_unoptimized/HelloPrfx.ir/HelloPrfx.approval.0.destructured.ir
diff --git a/test_cases/compile/out_unoptimized/HelloPrfx.ir/HelloPrfx.clear.0.clear.destructured.ir b/test_cases/compile/out_unoptimized/HelloPrfx.ir/HelloPrfx.clear.0.destructured.ir
similarity index 100%
rename from test_cases/compile/out_unoptimized/HelloPrfx.ir/HelloPrfx.clear.0.clear.destructured.ir
rename to test_cases/compile/out_unoptimized/HelloPrfx.ir/HelloPrfx.clear.0.destructured.ir
diff --git a/test_cases/compile/out_unoptimized/HelloTmpl.ir/HelloTmpl.approval.0.approval.destructured.ir b/test_cases/compile/out_unoptimized/HelloTmpl.ir/HelloTmpl.approval.0.destructured.ir
similarity index 100%
rename from test_cases/compile/out_unoptimized/HelloTmpl.ir/HelloTmpl.approval.0.approval.destructured.ir
rename to test_cases/compile/out_unoptimized/HelloTmpl.ir/HelloTmpl.approval.0.destructured.ir
diff --git a/test_cases/compile/out_unoptimized/HelloTmpl.ir/HelloTmpl.clear.0.clear.destructured.ir b/test_cases/compile/out_unoptimized/HelloTmpl.ir/HelloTmpl.clear.0.destructured.ir
similarity index 100%
rename from test_cases/compile/out_unoptimized/HelloTmpl.ir/HelloTmpl.clear.0.clear.destructured.ir
rename to test_cases/compile/out_unoptimized/HelloTmpl.ir/HelloTmpl.clear.0.destructured.ir
diff --git a/test_cases/compile/out_unoptimized/LargeProgram.ir/LargeProgram.approval.0.approval.destructured.ir b/test_cases/compile/out_unoptimized/LargeProgram.ir/LargeProgram.approval.0.destructured.ir
similarity index 100%
rename from test_cases/compile/out_unoptimized/LargeProgram.ir/LargeProgram.approval.0.approval.destructured.ir
rename to test_cases/compile/out_unoptimized/LargeProgram.ir/LargeProgram.approval.0.destructured.ir
diff --git a/test_cases/compile/out_unoptimized/LargeProgram.ir/LargeProgram.clear.0.clear.destructured.ir b/test_cases/compile/out_unoptimized/LargeProgram.ir/LargeProgram.clear.0.destructured.ir
similarity index 100%
rename from test_cases/compile/out_unoptimized/LargeProgram.ir/LargeProgram.clear.0.clear.destructured.ir
rename to test_cases/compile/out_unoptimized/LargeProgram.ir/LargeProgram.clear.0.destructured.ir
diff --git a/test_cases/compile/puya.log b/test_cases/compile/puya.log
index 31a960f340..d52d8d5dfa 100644
--- a/test_cases/compile/puya.log
+++ b/test_cases/compile/puya.log
@@ -1092,7 +1092,7 @@ debug: Sequentializing parallel copies in test_cases.compile.apps.always_approve
 debug: Performing post-SSA optimizations at level 1
 debug: Output IR to compile/out/always_approve_sig.ir/always_approve_sig.1.destructured.ir
 compile/apps.py:15 debug: optimizing TEAL subroutine test_cases.compile.apps.always_approve_sig() -> uint64:
-debug: Output IR to compile/out/HelloBase.ir/HelloBase.approval.0.approval.ssa.ir
+debug: Output IR to compile/out/HelloBase.ir/HelloBase.approval.0.ssa.ir
 info: optimizing approval program of test_cases.compile.apps.HelloBase at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.compile.apps.HelloBase.__init__ for inlining
@@ -1275,7 +1275,7 @@ debug: removing unused subroutine algopy.arc4.ARC4Contract.approval_program
 debug: removing unused subroutine test_cases.compile.apps.HelloBase.delete
 debug: removing unused subroutine test_cases.compile.apps.HelloBase.update
 debug: removing unused subroutine test_cases.compile.apps.HelloBase.__algopy_default_create
-debug: Output IR to compile/out/HelloBase.ir/HelloBase.approval.1.approval.ssa.opt.ir
+debug: Output IR to compile/out/HelloBase.ir/HelloBase.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.compile.apps.HelloBase.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -1327,7 +1327,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.compile.apps.HelloBase.__puya_arc4_router__
-debug: Output IR to compile/out/HelloBase.ir/HelloBase.approval.2.approval.ssa.opt.ir
+debug: Output IR to compile/out/HelloBase.ir/HelloBase.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.compile.apps.HelloBase.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -1376,8 +1376,8 @@ debug: Coalescing local variables in test_cases.compile.apps.HelloBase.greet usi
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.compile.apps.HelloBase.greet
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to compile/out/HelloBase.ir/HelloBase.approval.3.approval.destructured.ir
-debug: Output IR to compile/out/HelloBase.ir/HelloBase.clear.0.clear.ssa.ir
+debug: Output IR to compile/out/HelloBase.ir/HelloBase.approval.3.destructured.ir
+debug: Output IR to compile/out/HelloBase.ir/HelloBase.clear.0.ssa.ir
 info: optimizing clear program of test_cases.compile.apps.HelloBase at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -1403,7 +1403,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to compile/out/HelloBase.ir/HelloBase.clear.1.clear.destructured.ir
+debug: Output IR to compile/out/HelloBase.ir/HelloBase.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%0#2 0'
@@ -1485,7 +1485,7 @@ debug: removing explicit jump to fall-through block main_after_if_else@2
 debug: removing explicit jump to fall-through block main_after_if_else@10
 compile/apps.py:32 debug: optimizing TEAL subroutine test_cases.compile.apps.HelloBase.greet(name: bytes) -> bytes:
 debug: optimizing TEAL subroutine algopy.arc4.ARC4Contract.clear_state_program() -> uint64:
-debug: Output IR to compile/out/LargeProgram.ir/LargeProgram.approval.0.approval.ssa.ir
+debug: Output IR to compile/out/LargeProgram.ir/LargeProgram.approval.0.ssa.ir
 info: optimizing approval program of test_cases.compile.apps.LargeProgram at level 1
 debug: Begin optimization pass 1/100
 debug: marking trivial method test_cases.compile.apps.get_big_bytes as inlineable
@@ -1631,7 +1631,7 @@ debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.compile.apps.LargeProgram.__puya_arc4_router__
 debug: removing unused subroutine test_cases.compile.apps.get_big_bytes
-debug: Output IR to compile/out/LargeProgram.ir/LargeProgram.approval.1.approval.ssa.opt.ir
+debug: Output IR to compile/out/LargeProgram.ir/LargeProgram.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking trivial method test_cases.compile.apps.LargeProgram.get_big_bytes_length as inlineable
 debug: marking trivial method test_cases.compile.apps.LargeProgram.delete as inlineable
@@ -1717,7 +1717,7 @@ debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.compile.apps.LargeProgram.get_big_bytes_length
 debug: removing unused subroutine test_cases.compile.apps.LargeProgram.delete
 debug: removing unused subroutine test_cases.compile.apps.LargeProgram.__algopy_default_create
-debug: Output IR to compile/out/LargeProgram.ir/LargeProgram.approval.2.approval.ssa.opt.ir
+debug: Output IR to compile/out/LargeProgram.ir/LargeProgram.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -1744,8 +1744,8 @@ debug: Coalescing tmp%0#0 with [tmp%0#2]
 debug: Coalescing resulted in 11 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.approval_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to compile/out/LargeProgram.ir/LargeProgram.approval.3.approval.destructured.ir
-debug: Output IR to compile/out/LargeProgram.ir/LargeProgram.clear.0.clear.ssa.ir
+debug: Output IR to compile/out/LargeProgram.ir/LargeProgram.approval.3.destructured.ir
+debug: Output IR to compile/out/LargeProgram.ir/LargeProgram.clear.0.ssa.ir
 info: optimizing clear program of test_cases.compile.apps.LargeProgram at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -1771,7 +1771,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to compile/out/LargeProgram.ir/LargeProgram.clear.1.clear.destructured.ir
+debug: Output IR to compile/out/LargeProgram.ir/LargeProgram.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
@@ -1817,7 +1817,7 @@ debug: inlining single reference block main_after_inlined_test_cases.compile.app
 debug: inlining single reference block main___algopy_default_create@8 into main_bare_routing@7
 debug: removing explicit jump to fall-through block main_after_if_else@11
 debug: optimizing TEAL subroutine algopy.arc4.ARC4Contract.clear_state_program() -> uint64:
-debug: Output IR to compile/out/Hello.ir/Hello.approval.0.approval.ssa.ir
+debug: Output IR to compile/out/Hello.ir/Hello.approval.0.ssa.ir
 info: optimizing approval program of test_cases.compile.apps.Hello at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.compile.apps.HelloBase.__init__ for inlining
@@ -1997,7 +1997,7 @@ debug: removing unused subroutine test_cases.compile.apps.HelloBase.__init__
 debug: removing unused subroutine algopy.arc4.ARC4Contract.approval_program
 debug: removing unused subroutine test_cases.compile.apps.HelloBase.delete
 debug: removing unused subroutine test_cases.compile.apps.HelloBase.update
-debug: Output IR to compile/out/Hello.ir/Hello.approval.1.approval.ssa.opt.ir
+debug: Output IR to compile/out/Hello.ir/Hello.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.compile.apps.Hello.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -2064,7 +2064,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.compile.apps.Hello.__puya_arc4_router__
-debug: Output IR to compile/out/Hello.ir/Hello.approval.2.approval.ssa.opt.ir
+debug: Output IR to compile/out/Hello.ir/Hello.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.compile.apps.Hello.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -2135,8 +2135,8 @@ debug: Coalescing local variables in test_cases.compile.apps.HelloBase.greet usi
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.compile.apps.HelloBase.greet
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to compile/out/Hello.ir/Hello.approval.3.approval.destructured.ir
-debug: Output IR to compile/out/Hello.ir/Hello.clear.0.clear.ssa.ir
+debug: Output IR to compile/out/Hello.ir/Hello.approval.3.destructured.ir
+debug: Output IR to compile/out/Hello.ir/Hello.clear.0.ssa.ir
 info: optimizing clear program of test_cases.compile.apps.Hello at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -2162,7 +2162,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to compile/out/Hello.ir/Hello.clear.1.clear.destructured.ir
+debug: Output IR to compile/out/Hello.ir/Hello.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%0#2 0'
@@ -2253,7 +2253,7 @@ debug: removing explicit jump to fall-through block main_after_if_else@10
 compile/apps.py:53 debug: optimizing TEAL subroutine test_cases.compile.apps.Hello.create(greeting: bytes) -> void:
 compile/apps.py:32 debug: optimizing TEAL subroutine test_cases.compile.apps.HelloBase.greet(name: bytes) -> bytes:
 debug: optimizing TEAL subroutine algopy.arc4.ARC4Contract.clear_state_program() -> uint64:
-debug: Output IR to compile/out/HelloTmpl.ir/HelloTmpl.approval.0.approval.ssa.ir
+debug: Output IR to compile/out/HelloTmpl.ir/HelloTmpl.approval.0.ssa.ir
 info: optimizing approval program of test_cases.compile.apps.HelloTmpl at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.compile.apps.HelloTmpl.__init__ for inlining
@@ -2439,7 +2439,7 @@ debug: removing unused subroutine algopy.arc4.ARC4Contract.approval_program
 debug: removing unused subroutine test_cases.compile.apps.HelloTmpl.create
 debug: removing unused subroutine test_cases.compile.apps.HelloBase.delete
 debug: removing unused subroutine test_cases.compile.apps.HelloBase.update
-debug: Output IR to compile/out/HelloTmpl.ir/HelloTmpl.approval.1.approval.ssa.opt.ir
+debug: Output IR to compile/out/HelloTmpl.ir/HelloTmpl.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.compile.apps.HelloTmpl.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -2491,7 +2491,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.compile.apps.HelloTmpl.__puya_arc4_router__
-debug: Output IR to compile/out/HelloTmpl.ir/HelloTmpl.approval.2.approval.ssa.opt.ir
+debug: Output IR to compile/out/HelloTmpl.ir/HelloTmpl.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.compile.apps.HelloTmpl.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -2540,8 +2540,8 @@ debug: Coalescing local variables in test_cases.compile.apps.HelloBase.greet usi
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.compile.apps.HelloBase.greet
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to compile/out/HelloTmpl.ir/HelloTmpl.approval.3.approval.destructured.ir
-debug: Output IR to compile/out/HelloTmpl.ir/HelloTmpl.clear.0.clear.ssa.ir
+debug: Output IR to compile/out/HelloTmpl.ir/HelloTmpl.approval.3.destructured.ir
+debug: Output IR to compile/out/HelloTmpl.ir/HelloTmpl.clear.0.ssa.ir
 info: optimizing clear program of test_cases.compile.apps.HelloTmpl at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -2567,7 +2567,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to compile/out/HelloTmpl.ir/HelloTmpl.clear.1.clear.destructured.ir
+debug: Output IR to compile/out/HelloTmpl.ir/HelloTmpl.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%0#2 0'
@@ -2653,7 +2653,7 @@ debug: removing explicit jump to fall-through block main_after_if_else@2
 debug: removing explicit jump to fall-through block main_after_if_else@10
 compile/apps.py:32 debug: optimizing TEAL subroutine test_cases.compile.apps.HelloBase.greet(name: bytes) -> bytes:
 debug: optimizing TEAL subroutine algopy.arc4.ARC4Contract.clear_state_program() -> uint64:
-debug: Output IR to compile/out/HelloPrfx.ir/HelloPrfx.approval.0.approval.ssa.ir
+debug: Output IR to compile/out/HelloPrfx.ir/HelloPrfx.approval.0.ssa.ir
 info: optimizing approval program of test_cases.compile.apps.HelloPrfx at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.compile.apps.HelloPrfx.__init__ for inlining
@@ -2839,7 +2839,7 @@ debug: removing unused subroutine algopy.arc4.ARC4Contract.approval_program
 debug: removing unused subroutine test_cases.compile.apps.HelloPrfx.create
 debug: removing unused subroutine test_cases.compile.apps.HelloBase.delete
 debug: removing unused subroutine test_cases.compile.apps.HelloBase.update
-debug: Output IR to compile/out/HelloPrfx.ir/HelloPrfx.approval.1.approval.ssa.opt.ir
+debug: Output IR to compile/out/HelloPrfx.ir/HelloPrfx.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.compile.apps.HelloPrfx.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -2891,7 +2891,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.compile.apps.HelloPrfx.__puya_arc4_router__
-debug: Output IR to compile/out/HelloPrfx.ir/HelloPrfx.approval.2.approval.ssa.opt.ir
+debug: Output IR to compile/out/HelloPrfx.ir/HelloPrfx.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.compile.apps.HelloPrfx.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -2940,8 +2940,8 @@ debug: Coalescing local variables in test_cases.compile.apps.HelloBase.greet usi
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.compile.apps.HelloBase.greet
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to compile/out/HelloPrfx.ir/HelloPrfx.approval.3.approval.destructured.ir
-debug: Output IR to compile/out/HelloPrfx.ir/HelloPrfx.clear.0.clear.ssa.ir
+debug: Output IR to compile/out/HelloPrfx.ir/HelloPrfx.approval.3.destructured.ir
+debug: Output IR to compile/out/HelloPrfx.ir/HelloPrfx.clear.0.ssa.ir
 info: optimizing clear program of test_cases.compile.apps.HelloPrfx at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -2967,7 +2967,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to compile/out/HelloPrfx.ir/HelloPrfx.clear.1.clear.destructured.ir
+debug: Output IR to compile/out/HelloPrfx.ir/HelloPrfx.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%0#2 0'
@@ -3053,7 +3053,7 @@ debug: removing explicit jump to fall-through block main_after_if_else@2
 debug: removing explicit jump to fall-through block main_after_if_else@10
 compile/apps.py:32 debug: optimizing TEAL subroutine test_cases.compile.apps.HelloBase.greet(name: bytes) -> bytes:
 debug: optimizing TEAL subroutine algopy.arc4.ARC4Contract.clear_state_program() -> uint64:
-debug: Output IR to compile/out/HelloOtherConstants.ir/HelloOtherConstants.approval.0.approval.ssa.ir
+debug: Output IR to compile/out/HelloOtherConstants.ir/HelloOtherConstants.approval.0.ssa.ir
 info: optimizing approval program of test_cases.compile.apps.HelloOtherConstants at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.compile.apps.HelloOtherConstants.__init__ for inlining
@@ -3216,7 +3216,7 @@ debug: removing unused subroutine test_cases.compile.apps.HelloOtherConstants.__
 debug: removing unused subroutine algopy.arc4.ARC4Contract.approval_program
 debug: removing unused subroutine test_cases.compile.apps.HelloOtherConstants.create
 debug: removing unused subroutine test_cases.compile.apps.HelloOtherConstants.delete
-debug: Output IR to compile/out/HelloOtherConstants.ir/HelloOtherConstants.approval.1.approval.ssa.opt.ir
+debug: Output IR to compile/out/HelloOtherConstants.ir/HelloOtherConstants.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.compile.apps.HelloOtherConstants.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -3268,7 +3268,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.compile.apps.HelloOtherConstants.__puya_arc4_router__
-debug: Output IR to compile/out/HelloOtherConstants.ir/HelloOtherConstants.approval.2.approval.ssa.opt.ir
+debug: Output IR to compile/out/HelloOtherConstants.ir/HelloOtherConstants.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.compile.apps.HelloOtherConstants.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -3317,8 +3317,8 @@ debug: Coalescing local variables in test_cases.compile.apps.HelloOtherConstants
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.compile.apps.HelloOtherConstants.greet
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to compile/out/HelloOtherConstants.ir/HelloOtherConstants.approval.3.approval.destructured.ir
-debug: Output IR to compile/out/HelloOtherConstants.ir/HelloOtherConstants.clear.0.clear.ssa.ir
+debug: Output IR to compile/out/HelloOtherConstants.ir/HelloOtherConstants.approval.3.destructured.ir
+debug: Output IR to compile/out/HelloOtherConstants.ir/HelloOtherConstants.clear.0.ssa.ir
 info: optimizing clear program of test_cases.compile.apps.HelloOtherConstants at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -3344,7 +3344,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to compile/out/HelloOtherConstants.ir/HelloOtherConstants.clear.1.clear.destructured.ir
+debug: Output IR to compile/out/HelloOtherConstants.ir/HelloOtherConstants.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%0#2 0'
@@ -3450,7 +3450,7 @@ debug: removing explicit jump to fall-through block main_after_if_else@2
 debug: removing explicit jump to fall-through block main_after_if_else@8
 compile/apps.py:91 debug: optimizing TEAL subroutine test_cases.compile.apps.HelloOtherConstants.greet(name: bytes) -> bytes:
 debug: optimizing TEAL subroutine algopy.arc4.ARC4Contract.clear_state_program() -> uint64:
-debug: Output IR to compile/out/HelloFactory.ir/HelloFactory.approval.0.approval.ssa.ir
+debug: Output IR to compile/out/HelloFactory.ir/HelloFactory.approval.0.ssa.ir
 info: optimizing approval program of test_cases.compile.factory.HelloFactory at level 1
 debug: Begin optimization pass 1/100
 debug: marking trivial method test_cases.compile.factory.HelloFactory.test_logicsig as inlineable
@@ -6921,7 +6921,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.compile.factory.HelloFactory.__puya_arc4_router__
-debug: Output IR to compile/out/HelloFactory.ir/HelloFactory.approval.1.approval.ssa.opt.ir
+debug: Output IR to compile/out/HelloFactory.ir/HelloFactory.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking trivial method test_cases.compile.factory.HelloFactory.test_logicsig as inlineable
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
@@ -7254,7 +7254,7 @@ debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.compile.factory.HelloFactory.test_logicsig
 debug: removing unused subroutine test_cases.compile.factory.HelloFactory.__algopy_default_create
-debug: Output IR to compile/out/HelloFactory.ir/HelloFactory.approval.2.approval.ssa.opt.ir
+debug: Output IR to compile/out/HelloFactory.ir/HelloFactory.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -7546,8 +7546,8 @@ debug: Coalescing local variables in test_cases.compile.factory.HelloFactory.tes
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.compile.factory.HelloFactory.test_abi_call_create_params
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to compile/out/HelloFactory.ir/HelloFactory.approval.3.approval.destructured.ir
-debug: Output IR to compile/out/HelloFactory.ir/HelloFactory.clear.0.clear.ssa.ir
+debug: Output IR to compile/out/HelloFactory.ir/HelloFactory.approval.3.destructured.ir
+debug: Output IR to compile/out/HelloFactory.ir/HelloFactory.clear.0.ssa.ir
 info: optimizing clear program of test_cases.compile.factory.HelloFactory at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -7573,7 +7573,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to compile/out/HelloFactory.ir/HelloFactory.clear.1.clear.destructured.ir
+debug: Output IR to compile/out/HelloFactory.ir/HelloFactory.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/compile/puya_O2.log b/test_cases/compile/puya_O2.log
index 7d31c806e5..1d16f140b1 100644
--- a/test_cases/compile/puya_O2.log
+++ b/test_cases/compile/puya_O2.log
@@ -1343,7 +1343,7 @@ debug: Coalescing test_cases.compile.apps.HelloBase.__puya_arc4_router__%0#0 wit
 debug: Coalescing resulted in 16 replacement/s
 debug: Sequentializing parallel copies in test_cases.compile.apps.HelloBase.__algopy_entrypoint_with_init
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to compile/out_O2/HelloBase.ir/HelloBase.approval.0.approval.destructured.ir
+debug: Output IR to compile/out_O2/HelloBase.ir/HelloBase.approval.0.destructured.ir
 info: optimizing clear program of test_cases.compile.apps.HelloBase at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -1369,7 +1369,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to compile/out_O2/HelloBase.ir/HelloBase.clear.0.clear.destructured.ir
+debug: Output IR to compile/out_O2/HelloBase.ir/HelloBase.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%0#2 0'
@@ -1711,7 +1711,7 @@ debug: Coalescing tmp%0#0 with [tmp%0#2]
 debug: Coalescing resulted in 11 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to compile/out_O2/LargeProgram.ir/LargeProgram.approval.0.approval.destructured.ir
+debug: Output IR to compile/out_O2/LargeProgram.ir/LargeProgram.approval.0.destructured.ir
 info: optimizing clear program of test_cases.compile.apps.LargeProgram at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -1737,7 +1737,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to compile/out_O2/LargeProgram.ir/LargeProgram.clear.0.clear.destructured.ir
+debug: Output IR to compile/out_O2/LargeProgram.ir/LargeProgram.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
@@ -2040,7 +2040,7 @@ debug: Coalescing test_cases.compile.apps.Hello.__puya_arc4_router__%0#0 with [t
 debug: Coalescing resulted in 16 replacement/s
 debug: Sequentializing parallel copies in test_cases.compile.apps.Hello.__algopy_entrypoint_with_init
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to compile/out_O2/Hello.ir/Hello.approval.0.approval.destructured.ir
+debug: Output IR to compile/out_O2/Hello.ir/Hello.approval.0.destructured.ir
 info: optimizing clear program of test_cases.compile.apps.Hello at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -2066,7 +2066,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to compile/out_O2/Hello.ir/Hello.clear.0.clear.destructured.ir
+debug: Output IR to compile/out_O2/Hello.ir/Hello.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%0#2 0'
@@ -2409,7 +2409,7 @@ debug: Coalescing test_cases.compile.apps.HelloTmpl.__puya_arc4_router__%0#0 wit
 debug: Coalescing resulted in 16 replacement/s
 debug: Sequentializing parallel copies in test_cases.compile.apps.HelloTmpl.__algopy_entrypoint_with_init
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to compile/out_O2/HelloTmpl.ir/HelloTmpl.approval.0.approval.destructured.ir
+debug: Output IR to compile/out_O2/HelloTmpl.ir/HelloTmpl.approval.0.destructured.ir
 info: optimizing clear program of test_cases.compile.apps.HelloTmpl at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -2435,7 +2435,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to compile/out_O2/HelloTmpl.ir/HelloTmpl.clear.0.clear.destructured.ir
+debug: Output IR to compile/out_O2/HelloTmpl.ir/HelloTmpl.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%0#2 0'
@@ -2774,7 +2774,7 @@ debug: Coalescing test_cases.compile.apps.HelloPrfx.__puya_arc4_router__%0#0 wit
 debug: Coalescing resulted in 16 replacement/s
 debug: Sequentializing parallel copies in test_cases.compile.apps.HelloPrfx.__algopy_entrypoint_with_init
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to compile/out_O2/HelloPrfx.ir/HelloPrfx.approval.0.approval.destructured.ir
+debug: Output IR to compile/out_O2/HelloPrfx.ir/HelloPrfx.approval.0.destructured.ir
 info: optimizing clear program of test_cases.compile.apps.HelloPrfx at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -2800,7 +2800,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to compile/out_O2/HelloPrfx.ir/HelloPrfx.clear.0.clear.destructured.ir
+debug: Output IR to compile/out_O2/HelloPrfx.ir/HelloPrfx.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%0#2 0'
@@ -3118,7 +3118,7 @@ debug: Coalescing test_cases.compile.apps.HelloOtherConstants.__puya_arc4_router
 debug: Coalescing resulted in 17 replacement/s
 debug: Sequentializing parallel copies in test_cases.compile.apps.HelloOtherConstants.__algopy_entrypoint_with_init
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to compile/out_O2/HelloOtherConstants.ir/HelloOtherConstants.approval.0.approval.destructured.ir
+debug: Output IR to compile/out_O2/HelloOtherConstants.ir/HelloOtherConstants.approval.0.destructured.ir
 info: optimizing clear program of test_cases.compile.apps.HelloOtherConstants at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -3144,7 +3144,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to compile/out_O2/HelloOtherConstants.ir/HelloOtherConstants.clear.0.clear.destructured.ir
+debug: Output IR to compile/out_O2/HelloOtherConstants.ir/HelloOtherConstants.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%0#2 0'
@@ -10460,7 +10460,7 @@ debug: Coalescing tmp%7#1 with [tmp%7#2]
 debug: Coalescing resulted in 212 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to compile/out_O2/HelloFactory.ir/HelloFactory.approval.0.approval.destructured.ir
+debug: Output IR to compile/out_O2/HelloFactory.ir/HelloFactory.approval.0.destructured.ir
 info: optimizing clear program of test_cases.compile.factory.HelloFactory at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -10486,7 +10486,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to compile/out_O2/HelloFactory.ir/HelloFactory.clear.0.clear.destructured.ir
+debug: Output IR to compile/out_O2/HelloFactory.ir/HelloFactory.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/compile/puya_unoptimized.log b/test_cases/compile/puya_unoptimized.log
index 28b5196356..76949e9e66 100644
--- a/test_cases/compile/puya_unoptimized.log
+++ b/test_cases/compile/puya_unoptimized.log
@@ -1283,7 +1283,7 @@ debug: Coalescing local variables in test_cases.compile.apps.HelloBase.update us
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.compile.apps.HelloBase.update
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to compile/out_unoptimized/HelloBase.ir/HelloBase.approval.0.approval.destructured.ir
+debug: Output IR to compile/out_unoptimized/HelloBase.ir/HelloBase.approval.0.destructured.ir
 info: optimizing clear program of test_cases.compile.apps.HelloBase at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -1301,7 +1301,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to compile/out_unoptimized/HelloBase.ir/HelloBase.clear.0.clear.destructured.ir
+debug: Output IR to compile/out_unoptimized/HelloBase.ir/HelloBase.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%1#0 0'
@@ -1546,7 +1546,7 @@ debug: Coalescing local variables in test_cases.compile.apps.LargeProgram.delete
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.compile.apps.LargeProgram.delete
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to compile/out_unoptimized/LargeProgram.ir/LargeProgram.approval.0.approval.destructured.ir
+debug: Output IR to compile/out_unoptimized/LargeProgram.ir/LargeProgram.approval.0.destructured.ir
 info: optimizing clear program of test_cases.compile.apps.LargeProgram at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -1564,7 +1564,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to compile/out_unoptimized/LargeProgram.ir/LargeProgram.clear.0.clear.destructured.ir
+debug: Output IR to compile/out_unoptimized/LargeProgram.ir/LargeProgram.clear.0.destructured.ir
 debug: Inserted main_block@1.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main_block@1.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_block@1.ops[6]: 'l-store-copy tmp%1#0 0'
@@ -1794,7 +1794,7 @@ debug: Coalescing local variables in test_cases.compile.apps.HelloBase.update us
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.compile.apps.HelloBase.update
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to compile/out_unoptimized/Hello.ir/Hello.approval.0.approval.destructured.ir
+debug: Output IR to compile/out_unoptimized/Hello.ir/Hello.approval.0.destructured.ir
 info: optimizing clear program of test_cases.compile.apps.Hello at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -1812,7 +1812,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to compile/out_unoptimized/Hello.ir/Hello.clear.0.clear.destructured.ir
+debug: Output IR to compile/out_unoptimized/Hello.ir/Hello.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%1#0 0'
@@ -2081,7 +2081,7 @@ debug: Coalescing local variables in test_cases.compile.apps.HelloBase.update us
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.compile.apps.HelloBase.update
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to compile/out_unoptimized/HelloTmpl.ir/HelloTmpl.approval.0.approval.destructured.ir
+debug: Output IR to compile/out_unoptimized/HelloTmpl.ir/HelloTmpl.approval.0.destructured.ir
 info: optimizing clear program of test_cases.compile.apps.HelloTmpl at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -2099,7 +2099,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to compile/out_unoptimized/HelloTmpl.ir/HelloTmpl.clear.0.clear.destructured.ir
+debug: Output IR to compile/out_unoptimized/HelloTmpl.ir/HelloTmpl.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%1#0 0'
@@ -2364,7 +2364,7 @@ debug: Coalescing local variables in test_cases.compile.apps.HelloBase.update us
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.compile.apps.HelloBase.update
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to compile/out_unoptimized/HelloPrfx.ir/HelloPrfx.approval.0.approval.destructured.ir
+debug: Output IR to compile/out_unoptimized/HelloPrfx.ir/HelloPrfx.approval.0.destructured.ir
 info: optimizing clear program of test_cases.compile.apps.HelloPrfx at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -2382,7 +2382,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to compile/out_unoptimized/HelloPrfx.ir/HelloPrfx.clear.0.clear.destructured.ir
+debug: Output IR to compile/out_unoptimized/HelloPrfx.ir/HelloPrfx.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%1#0 0'
@@ -2626,7 +2626,7 @@ debug: Coalescing local variables in test_cases.compile.apps.HelloOtherConstants
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.compile.apps.HelloOtherConstants.greet
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to compile/out_unoptimized/HelloOtherConstants.ir/HelloOtherConstants.approval.0.approval.destructured.ir
+debug: Output IR to compile/out_unoptimized/HelloOtherConstants.ir/HelloOtherConstants.approval.0.destructured.ir
 info: optimizing clear program of test_cases.compile.apps.HelloOtherConstants at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -2644,7 +2644,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to compile/out_unoptimized/HelloOtherConstants.ir/HelloOtherConstants.clear.0.clear.destructured.ir
+debug: Output IR to compile/out_unoptimized/HelloOtherConstants.ir/HelloOtherConstants.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%1#0 0'
@@ -6306,7 +6306,7 @@ debug: Coalescing local variables in test_cases.compile.factory.HelloFactory.tes
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.compile.factory.HelloFactory.test_abi_call_create_params
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to compile/out_unoptimized/HelloFactory.ir/HelloFactory.approval.0.approval.destructured.ir
+debug: Output IR to compile/out_unoptimized/HelloFactory.ir/HelloFactory.approval.0.destructured.ir
 info: optimizing clear program of test_cases.compile.factory.HelloFactory at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -6324,7 +6324,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to compile/out_unoptimized/HelloFactory.ir/HelloFactory.clear.0.clear.destructured.ir
+debug: Output IR to compile/out_unoptimized/HelloFactory.ir/HelloFactory.clear.0.destructured.ir
 debug: Inserted main_block@1.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main_block@1.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_block@1.ops[6]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.0.approval.ssa.ir b/test_cases/conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.0.approval.ssa.ir
rename to test_cases/conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.0.ssa.ir
diff --git a/test_cases/conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.1.approval.ssa.opt.ir b/test_cases/conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.1.approval.ssa.opt.ir
rename to test_cases/conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.1.ssa.opt.ir
diff --git a/test_cases/conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.2.approval.ssa.opt.ir b/test_cases/conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.2.approval.ssa.opt.ir
rename to test_cases/conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.2.ssa.opt.ir
diff --git a/test_cases/conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.3.approval.ssa.opt.ir b/test_cases/conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.3.ssa.opt.ir
similarity index 100%
rename from test_cases/conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.3.approval.ssa.opt.ir
rename to test_cases/conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.3.ssa.opt.ir
diff --git a/test_cases/conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.4.approval.ssa.opt.ir b/test_cases/conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.4.ssa.opt.ir
similarity index 100%
rename from test_cases/conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.4.approval.ssa.opt.ir
rename to test_cases/conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.4.ssa.opt.ir
diff --git a/test_cases/conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.5.approval.destructured.ir b/test_cases/conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.5.destructured.ir
similarity index 100%
rename from test_cases/conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.5.approval.destructured.ir
rename to test_cases/conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.5.destructured.ir
diff --git a/test_cases/conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.clear.0.clear.ssa.ir b/test_cases/conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.clear.0.clear.ssa.ir
rename to test_cases/conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.clear.0.ssa.ir
diff --git a/test_cases/conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.clear.1.clear.destructured.ir b/test_cases/conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.clear.1.clear.destructured.ir
rename to test_cases/conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.clear.1.destructured.ir
diff --git a/test_cases/conditional_execution/out_O2/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.0.approval.destructured.ir b/test_cases/conditional_execution/out_O2/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/conditional_execution/out_O2/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.0.approval.destructured.ir
rename to test_cases/conditional_execution/out_O2/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.0.destructured.ir
diff --git a/test_cases/conditional_execution/out_O2/ConditionalExecutionContract.ir/ConditionalExecutionContract.clear.0.clear.destructured.ir b/test_cases/conditional_execution/out_O2/ConditionalExecutionContract.ir/ConditionalExecutionContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/conditional_execution/out_O2/ConditionalExecutionContract.ir/ConditionalExecutionContract.clear.0.clear.destructured.ir
rename to test_cases/conditional_execution/out_O2/ConditionalExecutionContract.ir/ConditionalExecutionContract.clear.0.destructured.ir
diff --git a/test_cases/conditional_execution/out_unoptimized/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.0.approval.destructured.ir b/test_cases/conditional_execution/out_unoptimized/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/conditional_execution/out_unoptimized/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.0.approval.destructured.ir
rename to test_cases/conditional_execution/out_unoptimized/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.0.destructured.ir
diff --git a/test_cases/conditional_execution/out_unoptimized/ConditionalExecutionContract.ir/ConditionalExecutionContract.clear.0.clear.destructured.ir b/test_cases/conditional_execution/out_unoptimized/ConditionalExecutionContract.ir/ConditionalExecutionContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/conditional_execution/out_unoptimized/ConditionalExecutionContract.ir/ConditionalExecutionContract.clear.0.clear.destructured.ir
rename to test_cases/conditional_execution/out_unoptimized/ConditionalExecutionContract.ir/ConditionalExecutionContract.clear.0.destructured.ir
diff --git a/test_cases/conditional_execution/puya.log b/test_cases/conditional_execution/puya.log
index c84d1ba348..a7ad4e7b3c 100644
--- a/test_cases/conditional_execution/puya.log
+++ b/test_cases/conditional_execution/puya.log
@@ -575,7 +575,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.0.approval.ssa.ir
+debug: Output IR to conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.conditional_execution.contract.ConditionalExecutionContract at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.conditional_execution.contract.ConditionalExecutionContract.__init__ for inlining
@@ -740,7 +740,7 @@ debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.conditional_execution.contract.ConditionalExecutionContract.__init__
 debug: removing unused subroutine test_cases.conditional_execution.contract.ConditionalExecutionContract.approval_program
-debug: Output IR to conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking trivial method test_cases.conditional_execution.contract.ConditionalExecutionContract.func_c as inlineable
 debug: Optimizing subroutine test_cases.conditional_execution.contract.ConditionalExecutionContract.__algopy_entrypoint_with_init
@@ -870,7 +870,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.conditional_execution.contract.ConditionalExecutionContract.func_c
-debug: Output IR to conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.2.approval.ssa.opt.ir
+debug: Output IR to conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: marking simple function test_cases.conditional_execution.contract.ConditionalExecutionContract.func_a for inlining (complexity=1 <= threshold=3)
 debug: marking simple function test_cases.conditional_execution.contract.ConditionalExecutionContract.func_b for inlining (complexity=1 <= threshold=3)
@@ -1092,7 +1092,7 @@ debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.conditional_execution.contract.ConditionalExecutionContract.func_a
 debug: removing unused subroutine test_cases.conditional_execution.contract.ConditionalExecutionContract.func_b
 debug: removing unused subroutine test_cases.conditional_execution.contract.ConditionalExecutionContract.assert_and_reset
-debug: Output IR to conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.3.approval.ssa.opt.ir
+debug: Output IR to conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.3.ssa.opt.ir
 debug: Begin optimization pass 4/100
 debug: Optimizing subroutine test_cases.conditional_execution.contract.ConditionalExecutionContract.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -1115,7 +1115,7 @@ debug: Merged linear block@23 into block@19
 debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.4.approval.ssa.opt.ir
+debug: Output IR to conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.4.ssa.opt.ir
 debug: Begin optimization pass 5/100
 debug: Optimizing subroutine test_cases.conditional_execution.contract.ConditionalExecutionContract.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -1148,8 +1148,8 @@ debug: Coalescing and_result%8#0 with [and_result%8#1]
 debug: Coalescing resulted in 47 replacement/s
 debug: Sequentializing parallel copies in test_cases.conditional_execution.contract.ConditionalExecutionContract.__algopy_entrypoint_with_init
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.5.approval.destructured.ir
-debug: Output IR to conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.clear.0.clear.ssa.ir
+debug: Output IR to conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.5.destructured.ir
+debug: Output IR to conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.conditional_execution.contract.ConditionalExecutionContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.conditional_execution.contract.ConditionalExecutionContract.clear_state_program
@@ -1175,7 +1175,7 @@ debug: Coalescing local variables in test_cases.conditional_execution.contract.C
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.conditional_execution.contract.ConditionalExecutionContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.clear.1.clear.destructured.ir
+debug: Output IR to conditional_execution/out/ConditionalExecutionContract.ir/ConditionalExecutionContract.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[6]: 'l-store-copy maybe_exists%0#0 1'
diff --git a/test_cases/conditional_execution/puya_O2.log b/test_cases/conditional_execution/puya_O2.log
index d2aef3cbfb..145bb0fcde 100644
--- a/test_cases/conditional_execution/puya_O2.log
+++ b/test_cases/conditional_execution/puya_O2.log
@@ -1142,7 +1142,7 @@ debug: Coalescing and_result%8#0 with [and_result%8#1]
 debug: Coalescing resulted in 47 replacement/s
 debug: Sequentializing parallel copies in test_cases.conditional_execution.contract.ConditionalExecutionContract.__algopy_entrypoint_with_init
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to conditional_execution/out_O2/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.0.approval.destructured.ir
+debug: Output IR to conditional_execution/out_O2/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.conditional_execution.contract.ConditionalExecutionContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.conditional_execution.contract.ConditionalExecutionContract.clear_state_program
@@ -1168,7 +1168,7 @@ debug: Coalescing local variables in test_cases.conditional_execution.contract.C
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.conditional_execution.contract.ConditionalExecutionContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to conditional_execution/out_O2/ConditionalExecutionContract.ir/ConditionalExecutionContract.clear.0.clear.destructured.ir
+debug: Output IR to conditional_execution/out_O2/ConditionalExecutionContract.ir/ConditionalExecutionContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[6]: 'l-store-copy maybe_exists%0#0 1'
diff --git a/test_cases/conditional_execution/puya_unoptimized.log b/test_cases/conditional_execution/puya_unoptimized.log
index c213576e5a..c6f5c528db 100644
--- a/test_cases/conditional_execution/puya_unoptimized.log
+++ b/test_cases/conditional_execution/puya_unoptimized.log
@@ -812,7 +812,7 @@ debug: Coalescing local variables in test_cases.conditional_execution.contract.C
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.conditional_execution.contract.ConditionalExecutionContract.func_c
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to conditional_execution/out_unoptimized/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.0.approval.destructured.ir
+debug: Output IR to conditional_execution/out_unoptimized/ConditionalExecutionContract.ir/ConditionalExecutionContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.conditional_execution.contract.ConditionalExecutionContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.conditional_execution.contract.ConditionalExecutionContract.clear_state_program
@@ -830,7 +830,7 @@ debug: Coalescing local variables in test_cases.conditional_execution.contract.C
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.conditional_execution.contract.ConditionalExecutionContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to conditional_execution/out_unoptimized/ConditionalExecutionContract.ir/ConditionalExecutionContract.clear.0.clear.destructured.ir
+debug: Output IR to conditional_execution/out_unoptimized/ConditionalExecutionContract.ir/ConditionalExecutionContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/conditional_expressions/out/Literals.ir/Literals.approval.0.approval.ssa.ir b/test_cases/conditional_expressions/out/Literals.ir/Literals.approval.0.ssa.ir
similarity index 100%
rename from test_cases/conditional_expressions/out/Literals.ir/Literals.approval.0.approval.ssa.ir
rename to test_cases/conditional_expressions/out/Literals.ir/Literals.approval.0.ssa.ir
diff --git a/test_cases/conditional_expressions/out/Literals.ir/Literals.approval.1.approval.ssa.opt.ir b/test_cases/conditional_expressions/out/Literals.ir/Literals.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/conditional_expressions/out/Literals.ir/Literals.approval.1.approval.ssa.opt.ir
rename to test_cases/conditional_expressions/out/Literals.ir/Literals.approval.1.ssa.opt.ir
diff --git a/test_cases/conditional_expressions/out/Literals.ir/Literals.approval.2.approval.destructured.ir b/test_cases/conditional_expressions/out/Literals.ir/Literals.approval.2.destructured.ir
similarity index 100%
rename from test_cases/conditional_expressions/out/Literals.ir/Literals.approval.2.approval.destructured.ir
rename to test_cases/conditional_expressions/out/Literals.ir/Literals.approval.2.destructured.ir
diff --git a/test_cases/conditional_expressions/out/Literals.ir/Literals.clear.0.clear.ssa.ir b/test_cases/conditional_expressions/out/Literals.ir/Literals.clear.0.ssa.ir
similarity index 100%
rename from test_cases/conditional_expressions/out/Literals.ir/Literals.clear.0.clear.ssa.ir
rename to test_cases/conditional_expressions/out/Literals.ir/Literals.clear.0.ssa.ir
diff --git a/test_cases/conditional_expressions/out/Literals.ir/Literals.clear.1.clear.destructured.ir b/test_cases/conditional_expressions/out/Literals.ir/Literals.clear.1.destructured.ir
similarity index 100%
rename from test_cases/conditional_expressions/out/Literals.ir/Literals.clear.1.clear.destructured.ir
rename to test_cases/conditional_expressions/out/Literals.ir/Literals.clear.1.destructured.ir
diff --git a/test_cases/conditional_expressions/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir b/test_cases/conditional_expressions/out/MyContract.ir/MyContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/conditional_expressions/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir
rename to test_cases/conditional_expressions/out/MyContract.ir/MyContract.approval.0.ssa.ir
diff --git a/test_cases/conditional_expressions/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir b/test_cases/conditional_expressions/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/conditional_expressions/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir
rename to test_cases/conditional_expressions/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
diff --git a/test_cases/conditional_expressions/out/MyContract.ir/MyContract.approval.2.approval.ssa.opt.ir b/test_cases/conditional_expressions/out/MyContract.ir/MyContract.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/conditional_expressions/out/MyContract.ir/MyContract.approval.2.approval.ssa.opt.ir
rename to test_cases/conditional_expressions/out/MyContract.ir/MyContract.approval.2.ssa.opt.ir
diff --git a/test_cases/conditional_expressions/out/MyContract.ir/MyContract.approval.3.approval.destructured.ir b/test_cases/conditional_expressions/out/MyContract.ir/MyContract.approval.3.destructured.ir
similarity index 100%
rename from test_cases/conditional_expressions/out/MyContract.ir/MyContract.approval.3.approval.destructured.ir
rename to test_cases/conditional_expressions/out/MyContract.ir/MyContract.approval.3.destructured.ir
diff --git a/test_cases/conditional_expressions/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir b/test_cases/conditional_expressions/out/MyContract.ir/MyContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/conditional_expressions/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir
rename to test_cases/conditional_expressions/out/MyContract.ir/MyContract.clear.0.ssa.ir
diff --git a/test_cases/conditional_expressions/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir b/test_cases/conditional_expressions/out/MyContract.ir/MyContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/conditional_expressions/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir
rename to test_cases/conditional_expressions/out/MyContract.ir/MyContract.clear.1.destructured.ir
diff --git a/test_cases/conditional_expressions/out_O2/Literals.ir/Literals.approval.0.approval.destructured.ir b/test_cases/conditional_expressions/out_O2/Literals.ir/Literals.approval.0.destructured.ir
similarity index 100%
rename from test_cases/conditional_expressions/out_O2/Literals.ir/Literals.approval.0.approval.destructured.ir
rename to test_cases/conditional_expressions/out_O2/Literals.ir/Literals.approval.0.destructured.ir
diff --git a/test_cases/conditional_expressions/out_O2/Literals.ir/Literals.clear.0.clear.destructured.ir b/test_cases/conditional_expressions/out_O2/Literals.ir/Literals.clear.0.destructured.ir
similarity index 100%
rename from test_cases/conditional_expressions/out_O2/Literals.ir/Literals.clear.0.clear.destructured.ir
rename to test_cases/conditional_expressions/out_O2/Literals.ir/Literals.clear.0.destructured.ir
diff --git a/test_cases/conditional_expressions/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir b/test_cases/conditional_expressions/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/conditional_expressions/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir
rename to test_cases/conditional_expressions/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
diff --git a/test_cases/conditional_expressions/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir b/test_cases/conditional_expressions/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/conditional_expressions/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir
rename to test_cases/conditional_expressions/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
diff --git a/test_cases/conditional_expressions/out_unoptimized/Literals.ir/Literals.approval.0.approval.destructured.ir b/test_cases/conditional_expressions/out_unoptimized/Literals.ir/Literals.approval.0.destructured.ir
similarity index 100%
rename from test_cases/conditional_expressions/out_unoptimized/Literals.ir/Literals.approval.0.approval.destructured.ir
rename to test_cases/conditional_expressions/out_unoptimized/Literals.ir/Literals.approval.0.destructured.ir
diff --git a/test_cases/conditional_expressions/out_unoptimized/Literals.ir/Literals.clear.0.clear.destructured.ir b/test_cases/conditional_expressions/out_unoptimized/Literals.ir/Literals.clear.0.destructured.ir
similarity index 100%
rename from test_cases/conditional_expressions/out_unoptimized/Literals.ir/Literals.clear.0.clear.destructured.ir
rename to test_cases/conditional_expressions/out_unoptimized/Literals.ir/Literals.clear.0.destructured.ir
diff --git a/test_cases/conditional_expressions/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir b/test_cases/conditional_expressions/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/conditional_expressions/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir
rename to test_cases/conditional_expressions/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
diff --git a/test_cases/conditional_expressions/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir b/test_cases/conditional_expressions/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/conditional_expressions/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir
rename to test_cases/conditional_expressions/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
diff --git a/test_cases/conditional_expressions/puya.log b/test_cases/conditional_expressions/puya.log
index 5db422096d..b88ad7b443 100644
--- a/test_cases/conditional_expressions/puya.log
+++ b/test_cases/conditional_expressions/puya.log
@@ -686,7 +686,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to conditional_expressions/out/Literals.ir/Literals.approval.0.approval.ssa.ir
+debug: Output IR to conditional_expressions/out/Literals.ir/Literals.approval.0.ssa.ir
 info: optimizing approval program of test_cases.conditional_expressions.literals.Literals at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.conditional_expressions.literals.Literals.approval_program
@@ -739,7 +739,7 @@ debug: Replacing redundant declaration let tmp%5#0: uint64 = (! condition#0) wit
 debug: Replacing redundant declaration let tmp%9#0: bool = (! condition#0) with copy of existing registers (Register(source_location=conditional_expressions/literals.py:19:17-44, ir_type=uint64, name='tmp%4', version=0),)
 debug: Found equivalence set: tmp%4#0, tmp%5#0, tmp%9#0
 debug: Copy propagation made 2 modifications
-debug: Output IR to conditional_expressions/out/Literals.ir/Literals.approval.1.approval.ssa.opt.ir
+debug: Output IR to conditional_expressions/out/Literals.ir/Literals.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.conditional_expressions.literals.Literals.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -786,8 +786,8 @@ debug: Coalescing local variables in test_cases.conditional_expressions.literals
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.conditional_expressions.literals.Literals.with_variable_condition
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to conditional_expressions/out/Literals.ir/Literals.approval.2.approval.destructured.ir
-debug: Output IR to conditional_expressions/out/Literals.ir/Literals.clear.0.clear.ssa.ir
+debug: Output IR to conditional_expressions/out/Literals.ir/Literals.approval.2.destructured.ir
+debug: Output IR to conditional_expressions/out/Literals.ir/Literals.clear.0.ssa.ir
 info: optimizing clear program of test_cases.conditional_expressions.literals.Literals at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.conditional_expressions.literals.Literals.clear_state_program
@@ -813,7 +813,7 @@ debug: Coalescing local variables in test_cases.conditional_expressions.literals
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.conditional_expressions.literals.Literals.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to conditional_expressions/out/Literals.ir/Literals.clear.1.clear.destructured.ir
+debug: Output IR to conditional_expressions/out/Literals.ir/Literals.clear.1.destructured.ir
 debug: Inserted with_variable_condition.ops[14]: 'l-store-copy tmp%6#0 0'
 debug: Replaced with_variable_condition.ops[16]: 'v-load tmp%6#0' with 'l-load tmp%6#0'
 debug: Inserted with_variable_condition.ops[21]: 'l-store-copy tmp%7#0 0'
@@ -837,7 +837,7 @@ debug: Replaced with_variable_condition.ops[37]: 'v-load tmp%4#0' with 'l-load t
 conditional_expressions/literals.py:5 debug: optimizing TEAL subroutine test_cases.conditional_expressions.literals.Literals.approval_program() -> uint64:
 conditional_expressions/literals.py:14 debug: optimizing TEAL subroutine test_cases.conditional_expressions.literals.Literals.with_variable_condition(condition: uint64) -> void:
 conditional_expressions/literals.py:11 debug: optimizing TEAL subroutine test_cases.conditional_expressions.literals.Literals.clear_state_program() -> uint64:
-debug: Output IR to conditional_expressions/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir
+debug: Output IR to conditional_expressions/out/MyContract.ir/MyContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.conditional_expressions.contract.MyContract at level 1
 debug: Begin optimization pass 1/100
 debug: marking simple function test_cases.conditional_expressions.contract.MyContract.expensive_op for inlining (complexity=3 <= threshold=3)
@@ -1030,7 +1030,7 @@ debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.conditional_expressions.contract.MyContract.expensive_op
 debug: removing unused subroutine test_cases.conditional_expressions.contract.MyContract.side_effecting_op
-debug: Output IR to conditional_expressions/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to conditional_expressions/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.conditional_expressions.contract.MyContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -1072,7 +1072,7 @@ debug: Merged linear block@15 into block@0
 debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to conditional_expressions/out/MyContract.ir/MyContract.approval.2.approval.ssa.opt.ir
+debug: Output IR to conditional_expressions/out/MyContract.ir/MyContract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.conditional_expressions.contract.MyContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -1097,8 +1097,8 @@ debug: Coalescing local variables in test_cases.conditional_expressions.contract
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.conditional_expressions.contract.MyContract.approval_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to conditional_expressions/out/MyContract.ir/MyContract.approval.3.approval.destructured.ir
-debug: Output IR to conditional_expressions/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir
+debug: Output IR to conditional_expressions/out/MyContract.ir/MyContract.approval.3.destructured.ir
+debug: Output IR to conditional_expressions/out/MyContract.ir/MyContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.conditional_expressions.contract.MyContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.conditional_expressions.contract.MyContract.clear_state_program
@@ -1124,7 +1124,7 @@ debug: Coalescing local variables in test_cases.conditional_expressions.contract
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.conditional_expressions.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to conditional_expressions/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir
+debug: Output IR to conditional_expressions/out/MyContract.ir/MyContract.clear.1.destructured.ir
 debug: Inserted main.ops[14]: 'l-store-copy tmp%14#0 0'
 debug: Replaced main.ops[16]: 'v-load tmp%14#0' with 'l-load tmp%14#0'
 conditional_expressions/contract.py:7 debug: optimizing TEAL subroutine test_cases.conditional_expressions.contract.MyContract.approval_program() -> uint64:
diff --git a/test_cases/conditional_expressions/puya_O2.log b/test_cases/conditional_expressions/puya_O2.log
index 3835c810f3..ce6246b493 100644
--- a/test_cases/conditional_expressions/puya_O2.log
+++ b/test_cases/conditional_expressions/puya_O2.log
@@ -837,7 +837,7 @@ debug: Coalescing local variables in test_cases.conditional_expressions.literals
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.conditional_expressions.literals.Literals.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to conditional_expressions/out_O2/Literals.ir/Literals.approval.0.approval.destructured.ir
+debug: Output IR to conditional_expressions/out_O2/Literals.ir/Literals.approval.0.destructured.ir
 info: optimizing clear program of test_cases.conditional_expressions.literals.Literals at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.conditional_expressions.literals.Literals.clear_state_program
@@ -863,7 +863,7 @@ debug: Coalescing local variables in test_cases.conditional_expressions.literals
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.conditional_expressions.literals.Literals.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to conditional_expressions/out_O2/Literals.ir/Literals.clear.0.clear.destructured.ir
+debug: Output IR to conditional_expressions/out_O2/Literals.ir/Literals.clear.0.destructured.ir
 conditional_expressions/literals.py:5 debug: optimizing TEAL subroutine test_cases.conditional_expressions.literals.Literals.approval_program() -> uint64:
 conditional_expressions/literals.py:11 debug: optimizing TEAL subroutine test_cases.conditional_expressions.literals.Literals.clear_state_program() -> uint64:
 info: optimizing approval program of test_cases.conditional_expressions.contract.MyContract at level 2
@@ -1123,7 +1123,7 @@ debug: Coalescing local variables in test_cases.conditional_expressions.contract
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.conditional_expressions.contract.MyContract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to conditional_expressions/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir
+debug: Output IR to conditional_expressions/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.conditional_expressions.contract.MyContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.conditional_expressions.contract.MyContract.clear_state_program
@@ -1149,7 +1149,7 @@ debug: Coalescing local variables in test_cases.conditional_expressions.contract
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.conditional_expressions.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to conditional_expressions/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir
+debug: Output IR to conditional_expressions/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
 debug: Inserted main.ops[14]: 'l-store-copy tmp%14#0 0'
 debug: Replaced main.ops[16]: 'v-load tmp%14#0' with 'l-load tmp%14#0'
 conditional_expressions/contract.py:7 debug: optimizing TEAL subroutine test_cases.conditional_expressions.contract.MyContract.approval_program() -> uint64:
diff --git a/test_cases/conditional_expressions/puya_unoptimized.log b/test_cases/conditional_expressions/puya_unoptimized.log
index e7c1bc67e0..1531d8fd40 100644
--- a/test_cases/conditional_expressions/puya_unoptimized.log
+++ b/test_cases/conditional_expressions/puya_unoptimized.log
@@ -716,7 +716,7 @@ debug: Coalescing local variables in test_cases.conditional_expressions.literals
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.conditional_expressions.literals.Literals.with_variable_condition
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to conditional_expressions/out_unoptimized/Literals.ir/Literals.approval.0.approval.destructured.ir
+debug: Output IR to conditional_expressions/out_unoptimized/Literals.ir/Literals.approval.0.destructured.ir
 info: optimizing clear program of test_cases.conditional_expressions.literals.Literals at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.conditional_expressions.literals.Literals.clear_state_program
@@ -734,7 +734,7 @@ debug: Coalescing local variables in test_cases.conditional_expressions.literals
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.conditional_expressions.literals.Literals.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to conditional_expressions/out_unoptimized/Literals.ir/Literals.clear.0.clear.destructured.ir
+debug: Output IR to conditional_expressions/out_unoptimized/Literals.ir/Literals.clear.0.destructured.ir
 debug: Inserted with_variable_condition.ops[4]: 'l-store-copy x#0 0'
 debug: Replaced with_variable_condition.ops[6]: 'v-load x#0' with 'l-load x#0'
 debug: Inserted with_variable_condition.ops[9]: 'l-store-copy tmp%0#0 0'
@@ -852,7 +852,7 @@ debug: Coalescing local variables in test_cases.conditional_expressions.contract
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.conditional_expressions.contract.MyContract.side_effecting_op
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to conditional_expressions/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir
+debug: Output IR to conditional_expressions/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.conditional_expressions.contract.MyContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.conditional_expressions.contract.MyContract.clear_state_program
@@ -870,7 +870,7 @@ debug: Coalescing local variables in test_cases.conditional_expressions.contract
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.conditional_expressions.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to conditional_expressions/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir
+debug: Output IR to conditional_expressions/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
 debug: Inserted main.ops[20]: 'l-store-copy awst_tmp%0#0 0'
 debug: Replaced main.ops[22]: 'v-load awst_tmp%0#0' with 'l-load awst_tmp%0#0'
 debug: Inserted main.ops[25]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/constants/out/AddressConstantContract.ir/AddressConstantContract.approval.0.approval.ssa.ir b/test_cases/constants/out/AddressConstantContract.ir/AddressConstantContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/constants/out/AddressConstantContract.ir/AddressConstantContract.approval.0.approval.ssa.ir
rename to test_cases/constants/out/AddressConstantContract.ir/AddressConstantContract.approval.0.ssa.ir
diff --git a/test_cases/constants/out/AddressConstantContract.ir/AddressConstantContract.approval.1.approval.ssa.opt.ir b/test_cases/constants/out/AddressConstantContract.ir/AddressConstantContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/constants/out/AddressConstantContract.ir/AddressConstantContract.approval.1.approval.ssa.opt.ir
rename to test_cases/constants/out/AddressConstantContract.ir/AddressConstantContract.approval.1.ssa.opt.ir
diff --git a/test_cases/constants/out/AddressConstantContract.ir/AddressConstantContract.approval.2.approval.destructured.ir b/test_cases/constants/out/AddressConstantContract.ir/AddressConstantContract.approval.2.destructured.ir
similarity index 100%
rename from test_cases/constants/out/AddressConstantContract.ir/AddressConstantContract.approval.2.approval.destructured.ir
rename to test_cases/constants/out/AddressConstantContract.ir/AddressConstantContract.approval.2.destructured.ir
diff --git a/test_cases/constants/out/AddressConstantContract.ir/AddressConstantContract.clear.0.clear.ssa.ir b/test_cases/constants/out/AddressConstantContract.ir/AddressConstantContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/constants/out/AddressConstantContract.ir/AddressConstantContract.clear.0.clear.ssa.ir
rename to test_cases/constants/out/AddressConstantContract.ir/AddressConstantContract.clear.0.ssa.ir
diff --git a/test_cases/constants/out/AddressConstantContract.ir/AddressConstantContract.clear.1.clear.destructured.ir b/test_cases/constants/out/AddressConstantContract.ir/AddressConstantContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/constants/out/AddressConstantContract.ir/AddressConstantContract.clear.1.clear.destructured.ir
rename to test_cases/constants/out/AddressConstantContract.ir/AddressConstantContract.clear.1.destructured.ir
diff --git a/test_cases/constants/out/ByteConstantsContract.ir/ByteConstantsContract.approval.0.approval.ssa.ir b/test_cases/constants/out/ByteConstantsContract.ir/ByteConstantsContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/constants/out/ByteConstantsContract.ir/ByteConstantsContract.approval.0.approval.ssa.ir
rename to test_cases/constants/out/ByteConstantsContract.ir/ByteConstantsContract.approval.0.ssa.ir
diff --git a/test_cases/constants/out/ByteConstantsContract.ir/ByteConstantsContract.approval.1.approval.ssa.opt.ir b/test_cases/constants/out/ByteConstantsContract.ir/ByteConstantsContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/constants/out/ByteConstantsContract.ir/ByteConstantsContract.approval.1.approval.ssa.opt.ir
rename to test_cases/constants/out/ByteConstantsContract.ir/ByteConstantsContract.approval.1.ssa.opt.ir
diff --git a/test_cases/constants/out/ByteConstantsContract.ir/ByteConstantsContract.approval.2.approval.destructured.ir b/test_cases/constants/out/ByteConstantsContract.ir/ByteConstantsContract.approval.2.destructured.ir
similarity index 100%
rename from test_cases/constants/out/ByteConstantsContract.ir/ByteConstantsContract.approval.2.approval.destructured.ir
rename to test_cases/constants/out/ByteConstantsContract.ir/ByteConstantsContract.approval.2.destructured.ir
diff --git a/test_cases/constants/out/ByteConstantsContract.ir/ByteConstantsContract.clear.0.clear.ssa.ir b/test_cases/constants/out/ByteConstantsContract.ir/ByteConstantsContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/constants/out/ByteConstantsContract.ir/ByteConstantsContract.clear.0.clear.ssa.ir
rename to test_cases/constants/out/ByteConstantsContract.ir/ByteConstantsContract.clear.0.ssa.ir
diff --git a/test_cases/constants/out/ByteConstantsContract.ir/ByteConstantsContract.clear.1.clear.destructured.ir b/test_cases/constants/out/ByteConstantsContract.ir/ByteConstantsContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/constants/out/ByteConstantsContract.ir/ByteConstantsContract.clear.1.clear.destructured.ir
rename to test_cases/constants/out/ByteConstantsContract.ir/ByteConstantsContract.clear.1.destructured.ir
diff --git a/test_cases/constants/out_O2/AddressConstantContract.ir/AddressConstantContract.approval.0.approval.destructured.ir b/test_cases/constants/out_O2/AddressConstantContract.ir/AddressConstantContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/constants/out_O2/AddressConstantContract.ir/AddressConstantContract.approval.0.approval.destructured.ir
rename to test_cases/constants/out_O2/AddressConstantContract.ir/AddressConstantContract.approval.0.destructured.ir
diff --git a/test_cases/constants/out_O2/AddressConstantContract.ir/AddressConstantContract.clear.0.clear.destructured.ir b/test_cases/constants/out_O2/AddressConstantContract.ir/AddressConstantContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/constants/out_O2/AddressConstantContract.ir/AddressConstantContract.clear.0.clear.destructured.ir
rename to test_cases/constants/out_O2/AddressConstantContract.ir/AddressConstantContract.clear.0.destructured.ir
diff --git a/test_cases/constants/out_O2/ByteConstantsContract.ir/ByteConstantsContract.approval.0.approval.destructured.ir b/test_cases/constants/out_O2/ByteConstantsContract.ir/ByteConstantsContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/constants/out_O2/ByteConstantsContract.ir/ByteConstantsContract.approval.0.approval.destructured.ir
rename to test_cases/constants/out_O2/ByteConstantsContract.ir/ByteConstantsContract.approval.0.destructured.ir
diff --git a/test_cases/constants/out_O2/ByteConstantsContract.ir/ByteConstantsContract.clear.0.clear.destructured.ir b/test_cases/constants/out_O2/ByteConstantsContract.ir/ByteConstantsContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/constants/out_O2/ByteConstantsContract.ir/ByteConstantsContract.clear.0.clear.destructured.ir
rename to test_cases/constants/out_O2/ByteConstantsContract.ir/ByteConstantsContract.clear.0.destructured.ir
diff --git a/test_cases/constants/out_unoptimized/AddressConstantContract.ir/AddressConstantContract.approval.0.approval.destructured.ir b/test_cases/constants/out_unoptimized/AddressConstantContract.ir/AddressConstantContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/constants/out_unoptimized/AddressConstantContract.ir/AddressConstantContract.approval.0.approval.destructured.ir
rename to test_cases/constants/out_unoptimized/AddressConstantContract.ir/AddressConstantContract.approval.0.destructured.ir
diff --git a/test_cases/constants/out_unoptimized/AddressConstantContract.ir/AddressConstantContract.clear.0.clear.destructured.ir b/test_cases/constants/out_unoptimized/AddressConstantContract.ir/AddressConstantContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/constants/out_unoptimized/AddressConstantContract.ir/AddressConstantContract.clear.0.clear.destructured.ir
rename to test_cases/constants/out_unoptimized/AddressConstantContract.ir/AddressConstantContract.clear.0.destructured.ir
diff --git a/test_cases/constants/out_unoptimized/ByteConstantsContract.ir/ByteConstantsContract.approval.0.approval.destructured.ir b/test_cases/constants/out_unoptimized/ByteConstantsContract.ir/ByteConstantsContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/constants/out_unoptimized/ByteConstantsContract.ir/ByteConstantsContract.approval.0.approval.destructured.ir
rename to test_cases/constants/out_unoptimized/ByteConstantsContract.ir/ByteConstantsContract.approval.0.destructured.ir
diff --git a/test_cases/constants/out_unoptimized/ByteConstantsContract.ir/ByteConstantsContract.clear.0.clear.destructured.ir b/test_cases/constants/out_unoptimized/ByteConstantsContract.ir/ByteConstantsContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/constants/out_unoptimized/ByteConstantsContract.ir/ByteConstantsContract.clear.0.clear.destructured.ir
rename to test_cases/constants/out_unoptimized/ByteConstantsContract.ir/ByteConstantsContract.clear.0.destructured.ir
diff --git a/test_cases/constants/puya.log b/test_cases/constants/puya.log
index 49553585a8..cbd00862e1 100644
--- a/test_cases/constants/puya.log
+++ b/test_cases/constants/puya.log
@@ -451,7 +451,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to constants/out/ByteConstantsContract.ir/ByteConstantsContract.approval.0.approval.ssa.ir
+debug: Output IR to constants/out/ByteConstantsContract.ir/ByteConstantsContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.constants.byte_constants.ByteConstantsContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.constants.byte_constants.ByteConstantsContract.approval_program
@@ -487,7 +487,7 @@ debug: Optimizer: Remove Linear Jump
 debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to constants/out/ByteConstantsContract.ir/ByteConstantsContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to constants/out/ByteConstantsContract.ir/ByteConstantsContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.constants.byte_constants.ByteConstantsContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -512,8 +512,8 @@ debug: Coalescing local variables in test_cases.constants.byte_constants.ByteCon
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.constants.byte_constants.ByteConstantsContract.approval_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to constants/out/ByteConstantsContract.ir/ByteConstantsContract.approval.2.approval.destructured.ir
-debug: Output IR to constants/out/ByteConstantsContract.ir/ByteConstantsContract.clear.0.clear.ssa.ir
+debug: Output IR to constants/out/ByteConstantsContract.ir/ByteConstantsContract.approval.2.destructured.ir
+debug: Output IR to constants/out/ByteConstantsContract.ir/ByteConstantsContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.constants.byte_constants.ByteConstantsContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.constants.byte_constants.ByteConstantsContract.clear_state_program
@@ -539,12 +539,12 @@ debug: Coalescing local variables in test_cases.constants.byte_constants.ByteCon
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.constants.byte_constants.ByteConstantsContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to constants/out/ByteConstantsContract.ir/ByteConstantsContract.clear.1.clear.destructured.ir
+debug: Output IR to constants/out/ByteConstantsContract.ir/ByteConstantsContract.clear.1.destructured.ir
 debug: Inserted main.ops[4]: 'l-store-copy tmp%6#0 0'
 debug: Replaced main.ops[6]: 'v-load tmp%6#0' with 'l-load tmp%6#0'
 constants/byte_constants.py:5 debug: optimizing TEAL subroutine test_cases.constants.byte_constants.ByteConstantsContract.approval_program() -> uint64:
 constants/byte_constants.py:16 debug: optimizing TEAL subroutine test_cases.constants.byte_constants.ByteConstantsContract.clear_state_program() -> uint64:
-debug: Output IR to constants/out/AddressConstantContract.ir/AddressConstantContract.approval.0.approval.ssa.ir
+debug: Output IR to constants/out/AddressConstantContract.ir/AddressConstantContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.constants.address_constant.AddressConstantContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.constants.address_constant.AddressConstantContract.approval_program
@@ -578,7 +578,7 @@ debug: Optimizer: Remove Linear Jump
 debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to constants/out/AddressConstantContract.ir/AddressConstantContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to constants/out/AddressConstantContract.ir/AddressConstantContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.constants.address_constant.AddressConstantContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -603,8 +603,8 @@ debug: Coalescing local variables in test_cases.constants.address_constant.Addre
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.constants.address_constant.AddressConstantContract.approval_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to constants/out/AddressConstantContract.ir/AddressConstantContract.approval.2.approval.destructured.ir
-debug: Output IR to constants/out/AddressConstantContract.ir/AddressConstantContract.clear.0.clear.ssa.ir
+debug: Output IR to constants/out/AddressConstantContract.ir/AddressConstantContract.approval.2.destructured.ir
+debug: Output IR to constants/out/AddressConstantContract.ir/AddressConstantContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.constants.address_constant.AddressConstantContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.constants.address_constant.AddressConstantContract.clear_state_program
@@ -630,7 +630,7 @@ debug: Coalescing local variables in test_cases.constants.address_constant.Addre
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.constants.address_constant.AddressConstantContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to constants/out/AddressConstantContract.ir/AddressConstantContract.clear.1.clear.destructured.ir
+debug: Output IR to constants/out/AddressConstantContract.ir/AddressConstantContract.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy sender#0 0'
 debug: Replaced main.ops[3]: 'v-load sender#0' with 'l-load sender#0'
 debug: Inserted main.ops[6]: 'l-store-copy tmp%6#0 0'
diff --git a/test_cases/constants/puya_O2.log b/test_cases/constants/puya_O2.log
index da7089fc59..037d40132e 100644
--- a/test_cases/constants/puya_O2.log
+++ b/test_cases/constants/puya_O2.log
@@ -509,7 +509,7 @@ debug: Coalescing local variables in test_cases.constants.byte_constants.ByteCon
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.constants.byte_constants.ByteConstantsContract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to constants/out_O2/ByteConstantsContract.ir/ByteConstantsContract.approval.0.approval.destructured.ir
+debug: Output IR to constants/out_O2/ByteConstantsContract.ir/ByteConstantsContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.constants.byte_constants.ByteConstantsContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.constants.byte_constants.ByteConstantsContract.clear_state_program
@@ -535,7 +535,7 @@ debug: Coalescing local variables in test_cases.constants.byte_constants.ByteCon
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.constants.byte_constants.ByteConstantsContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to constants/out_O2/ByteConstantsContract.ir/ByteConstantsContract.clear.0.clear.destructured.ir
+debug: Output IR to constants/out_O2/ByteConstantsContract.ir/ByteConstantsContract.clear.0.destructured.ir
 debug: Inserted main.ops[4]: 'l-store-copy tmp%6#0 0'
 debug: Replaced main.ops[6]: 'v-load tmp%6#0' with 'l-load tmp%6#0'
 constants/byte_constants.py:5 debug: optimizing TEAL subroutine test_cases.constants.byte_constants.ByteConstantsContract.approval_program() -> uint64:
@@ -597,7 +597,7 @@ debug: Coalescing local variables in test_cases.constants.address_constant.Addre
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.constants.address_constant.AddressConstantContract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to constants/out_O2/AddressConstantContract.ir/AddressConstantContract.approval.0.approval.destructured.ir
+debug: Output IR to constants/out_O2/AddressConstantContract.ir/AddressConstantContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.constants.address_constant.AddressConstantContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.constants.address_constant.AddressConstantContract.clear_state_program
@@ -623,7 +623,7 @@ debug: Coalescing local variables in test_cases.constants.address_constant.Addre
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.constants.address_constant.AddressConstantContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to constants/out_O2/AddressConstantContract.ir/AddressConstantContract.clear.0.clear.destructured.ir
+debug: Output IR to constants/out_O2/AddressConstantContract.ir/AddressConstantContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy sender#0 0'
 debug: Replaced main.ops[3]: 'v-load sender#0' with 'l-load sender#0'
 debug: Inserted main.ops[6]: 'l-store-copy tmp%6#0 0'
diff --git a/test_cases/constants/puya_unoptimized.log b/test_cases/constants/puya_unoptimized.log
index b93c510055..13fc6786d6 100644
--- a/test_cases/constants/puya_unoptimized.log
+++ b/test_cases/constants/puya_unoptimized.log
@@ -479,7 +479,7 @@ debug: Coalescing local variables in test_cases.constants.byte_constants.ByteCon
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.constants.byte_constants.ByteConstantsContract.approval_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to constants/out_unoptimized/ByteConstantsContract.ir/ByteConstantsContract.approval.0.approval.destructured.ir
+debug: Output IR to constants/out_unoptimized/ByteConstantsContract.ir/ByteConstantsContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.constants.byte_constants.ByteConstantsContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.constants.byte_constants.ByteConstantsContract.clear_state_program
@@ -497,7 +497,7 @@ debug: Coalescing local variables in test_cases.constants.byte_constants.ByteCon
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.constants.byte_constants.ByteConstantsContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to constants/out_unoptimized/ByteConstantsContract.ir/ByteConstantsContract.clear.0.clear.destructured.ir
+debug: Output IR to constants/out_unoptimized/ByteConstantsContract.ir/ByteConstantsContract.clear.0.destructured.ir
 debug: Inserted main.ops[3]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[5]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[8]: 'l-store-copy tmp%1#0 0'
@@ -546,7 +546,7 @@ debug: Coalescing local variables in test_cases.constants.address_constant.Addre
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.constants.address_constant.AddressConstantContract.approval_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to constants/out_unoptimized/AddressConstantContract.ir/AddressConstantContract.approval.0.approval.destructured.ir
+debug: Output IR to constants/out_unoptimized/AddressConstantContract.ir/AddressConstantContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.constants.address_constant.AddressConstantContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.constants.address_constant.AddressConstantContract.clear_state_program
@@ -564,7 +564,7 @@ debug: Coalescing local variables in test_cases.constants.address_constant.Addre
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.constants.address_constant.AddressConstantContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to constants/out_unoptimized/AddressConstantContract.ir/AddressConstantContract.clear.0.clear.destructured.ir
+debug: Output IR to constants/out_unoptimized/AddressConstantContract.ir/AddressConstantContract.clear.0.destructured.ir
 debug: Inserted main.ops[7]: 'l-store-copy tmp%1#0 0'
 debug: Replaced main.ops[9]: 'v-load tmp%1#0' with 'l-load tmp%1#0'
 debug: Inserted main.ops[16]: 'l-store-copy tmp%3#0 0'
diff --git a/test_cases/contains/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir b/test_cases/contains/out/MyContract.ir/MyContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/contains/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir
rename to test_cases/contains/out/MyContract.ir/MyContract.approval.0.ssa.ir
diff --git a/test_cases/contains/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir b/test_cases/contains/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/contains/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir
rename to test_cases/contains/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
diff --git a/test_cases/contains/out/MyContract.ir/MyContract.approval.2.approval.ssa.opt.ir b/test_cases/contains/out/MyContract.ir/MyContract.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/contains/out/MyContract.ir/MyContract.approval.2.approval.ssa.opt.ir
rename to test_cases/contains/out/MyContract.ir/MyContract.approval.2.ssa.opt.ir
diff --git a/test_cases/contains/out/MyContract.ir/MyContract.approval.3.approval.ssa.opt.ir b/test_cases/contains/out/MyContract.ir/MyContract.approval.3.ssa.opt.ir
similarity index 100%
rename from test_cases/contains/out/MyContract.ir/MyContract.approval.3.approval.ssa.opt.ir
rename to test_cases/contains/out/MyContract.ir/MyContract.approval.3.ssa.opt.ir
diff --git a/test_cases/contains/out/MyContract.ir/MyContract.approval.4.approval.destructured.ir b/test_cases/contains/out/MyContract.ir/MyContract.approval.4.destructured.ir
similarity index 100%
rename from test_cases/contains/out/MyContract.ir/MyContract.approval.4.approval.destructured.ir
rename to test_cases/contains/out/MyContract.ir/MyContract.approval.4.destructured.ir
diff --git a/test_cases/contains/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir b/test_cases/contains/out/MyContract.ir/MyContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/contains/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir
rename to test_cases/contains/out/MyContract.ir/MyContract.clear.0.ssa.ir
diff --git a/test_cases/contains/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir b/test_cases/contains/out/MyContract.ir/MyContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/contains/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir
rename to test_cases/contains/out/MyContract.ir/MyContract.clear.1.destructured.ir
diff --git a/test_cases/contains/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir b/test_cases/contains/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/contains/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir
rename to test_cases/contains/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
diff --git a/test_cases/contains/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir b/test_cases/contains/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/contains/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir
rename to test_cases/contains/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
diff --git a/test_cases/contains/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir b/test_cases/contains/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/contains/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir
rename to test_cases/contains/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
diff --git a/test_cases/contains/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir b/test_cases/contains/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/contains/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir
rename to test_cases/contains/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
diff --git a/test_cases/contains/puya.log b/test_cases/contains/puya.log
index 9e5da5d518..41410c2886 100644
--- a/test_cases/contains/puya.log
+++ b/test_cases/contains/puya.log
@@ -904,7 +904,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to contains/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir
+debug: Output IR to contains/out/MyContract.ir/MyContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.contains.contract.MyContract at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.contains.contract.MyContract.test_string_types for inlining
@@ -2690,7 +2690,7 @@ debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.contains.contract.MyContract.test_string_types
 debug: removing unused subroutine test_cases.contains.contract.MyContract.test_numeric_types
-debug: Output IR to contains/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to contains/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking trivial method test_cases.contains.contract.foo_string as inlineable
 debug: marking trivial method test_cases.contains.contract.baz_string as inlineable
@@ -4198,7 +4198,7 @@ debug: removing unused subroutine test_cases.contains.contract.two_u8
 debug: removing unused subroutine test_cases.contains.contract.one_arc4u64
 debug: removing unused subroutine test_cases.contains.contract.three_u512
 debug: removing unused subroutine test_cases.contains.contract.four_biguint
-debug: Output IR to contains/out/MyContract.ir/MyContract.approval.2.approval.ssa.opt.ir
+debug: Output IR to contains/out/MyContract.ir/MyContract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.contains.contract.MyContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -4391,7 +4391,7 @@ debug: Optimizer: Remove Linear Jump
 debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to contains/out/MyContract.ir/MyContract.approval.3.approval.ssa.opt.ir
+debug: Output IR to contains/out/MyContract.ir/MyContract.approval.3.ssa.opt.ir
 debug: Begin optimization pass 4/100
 debug: Optimizing subroutine test_cases.contains.contract.MyContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -4485,8 +4485,8 @@ debug: Coalescing or_result%0#0 with [or_result%0#5, or_result%0#1, or_result%0#
 debug: Coalescing resulted in 7 replacement/s
 debug: Sequentializing parallel copies in test_cases.contains.contract.MyContract.is_in_tuple_3
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to contains/out/MyContract.ir/MyContract.approval.4.approval.destructured.ir
-debug: Output IR to contains/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir
+debug: Output IR to contains/out/MyContract.ir/MyContract.approval.4.destructured.ir
+debug: Output IR to contains/out/MyContract.ir/MyContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.contains.contract.MyContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.contains.contract.MyContract.clear_state_program
@@ -4512,7 +4512,7 @@ debug: Coalescing local variables in test_cases.contains.contract.MyContract.cle
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.contains.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to contains/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir
+debug: Output IR to contains/out/MyContract.ir/MyContract.clear.1.destructured.ir
 debug: Inserted main.ops[16]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[18]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[36]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/contains/puya_O2.log b/test_cases/contains/puya_O2.log
index 8d7f8dd6ca..c451f86fb7 100644
--- a/test_cases/contains/puya_O2.log
+++ b/test_cases/contains/puya_O2.log
@@ -4534,7 +4534,7 @@ debug: Coalescing local variables in test_cases.contains.contract.MyContract.app
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.contains.contract.MyContract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to contains/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir
+debug: Output IR to contains/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.contains.contract.MyContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.contains.contract.MyContract.clear_state_program
@@ -4560,7 +4560,7 @@ debug: Coalescing local variables in test_cases.contains.contract.MyContract.cle
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.contains.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to contains/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir
+debug: Output IR to contains/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
 contains/contract.py:7 debug: optimizing TEAL subroutine test_cases.contains.contract.MyContract.approval_program() -> uint64:
 contains/contract.py:39 debug: optimizing TEAL subroutine test_cases.contains.contract.MyContract.clear_state_program() -> uint64:
 info: Writing contains/out_O2/MyContract.approval.teal
diff --git a/test_cases/contains/puya_unoptimized.log b/test_cases/contains/puya_unoptimized.log
index 037783cc64..8a89618fec 100644
--- a/test_cases/contains/puya_unoptimized.log
+++ b/test_cases/contains/puya_unoptimized.log
@@ -1341,7 +1341,7 @@ debug: Coalescing local variables in test_cases.contains.contract.four_biguint u
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.contains.contract.four_biguint
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to contains/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir
+debug: Output IR to contains/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.contains.contract.MyContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.contains.contract.MyContract.clear_state_program
@@ -1359,7 +1359,7 @@ debug: Coalescing local variables in test_cases.contains.contract.MyContract.cle
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.contains.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to contains/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir
+debug: Output IR to contains/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
 debug: Inserted main.ops[16]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[18]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[36]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/control_op_simplification/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir b/test_cases/control_op_simplification/out/MyContract.ir/MyContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/control_op_simplification/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir
rename to test_cases/control_op_simplification/out/MyContract.ir/MyContract.approval.0.ssa.ir
diff --git a/test_cases/control_op_simplification/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir b/test_cases/control_op_simplification/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/control_op_simplification/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir
rename to test_cases/control_op_simplification/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
diff --git a/test_cases/control_op_simplification/out/MyContract.ir/MyContract.approval.2.approval.destructured.ir b/test_cases/control_op_simplification/out/MyContract.ir/MyContract.approval.2.destructured.ir
similarity index 100%
rename from test_cases/control_op_simplification/out/MyContract.ir/MyContract.approval.2.approval.destructured.ir
rename to test_cases/control_op_simplification/out/MyContract.ir/MyContract.approval.2.destructured.ir
diff --git a/test_cases/control_op_simplification/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir b/test_cases/control_op_simplification/out/MyContract.ir/MyContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/control_op_simplification/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir
rename to test_cases/control_op_simplification/out/MyContract.ir/MyContract.clear.0.ssa.ir
diff --git a/test_cases/control_op_simplification/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir b/test_cases/control_op_simplification/out/MyContract.ir/MyContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/control_op_simplification/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir
rename to test_cases/control_op_simplification/out/MyContract.ir/MyContract.clear.1.destructured.ir
diff --git a/test_cases/control_op_simplification/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir b/test_cases/control_op_simplification/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/control_op_simplification/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir
rename to test_cases/control_op_simplification/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
diff --git a/test_cases/control_op_simplification/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir b/test_cases/control_op_simplification/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/control_op_simplification/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir
rename to test_cases/control_op_simplification/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
diff --git a/test_cases/control_op_simplification/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir b/test_cases/control_op_simplification/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/control_op_simplification/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir
rename to test_cases/control_op_simplification/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
diff --git a/test_cases/control_op_simplification/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir b/test_cases/control_op_simplification/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/control_op_simplification/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir
rename to test_cases/control_op_simplification/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
diff --git a/test_cases/control_op_simplification/puya.log b/test_cases/control_op_simplification/puya.log
index acfc7dcb16..4fcf6ee2b1 100644
--- a/test_cases/control_op_simplification/puya.log
+++ b/test_cases/control_op_simplification/puya.log
@@ -423,7 +423,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to control_op_simplification/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir
+debug: Output IR to control_op_simplification/out/MyContract.ir/MyContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.control_op_simplification.contract.MyContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.control_op_simplification.contract.MyContract.approval_program
@@ -444,7 +444,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Not removing empty block block@3 because it's used by phi nodes
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to control_op_simplification/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to control_op_simplification/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.control_op_simplification.contract.MyContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -473,8 +473,8 @@ debug: Sequentializing parallel copies in test_cases.control_op_simplification.c
 debug: Performing post-SSA optimizations at level 1
 debug: Removing jump block block@3
 debug: branching to block@3 will be replaced with block@4
-debug: Output IR to control_op_simplification/out/MyContract.ir/MyContract.approval.2.approval.destructured.ir
-debug: Output IR to control_op_simplification/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir
+debug: Output IR to control_op_simplification/out/MyContract.ir/MyContract.approval.2.destructured.ir
+debug: Output IR to control_op_simplification/out/MyContract.ir/MyContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.control_op_simplification.contract.MyContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.control_op_simplification.contract.MyContract.clear_state_program
@@ -500,7 +500,7 @@ debug: Coalescing local variables in test_cases.control_op_simplification.contra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.control_op_simplification.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to control_op_simplification/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir
+debug: Output IR to control_op_simplification/out/MyContract.ir/MyContract.clear.1.destructured.ir
 debug: Inserted main.ops[3]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[5]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_if_body@5.ops[1]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/control_op_simplification/puya_O2.log b/test_cases/control_op_simplification/puya_O2.log
index 63ef4e07a5..6c7bdcd60c 100644
--- a/test_cases/control_op_simplification/puya_O2.log
+++ b/test_cases/control_op_simplification/puya_O2.log
@@ -472,7 +472,7 @@ debug: Removing jump block block@3
 debug: branching to block@3 will be replaced with block@4
 debug: Removing duplicated block block@2 and updating references to block@1
 debug: Replaced predecessor block@2 with block@1 in block@4
-debug: Output IR to control_op_simplification/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir
+debug: Output IR to control_op_simplification/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.control_op_simplification.contract.MyContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.control_op_simplification.contract.MyContract.clear_state_program
@@ -498,7 +498,7 @@ debug: Coalescing local variables in test_cases.control_op_simplification.contra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.control_op_simplification.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to control_op_simplification/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir
+debug: Output IR to control_op_simplification/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
 debug: Inserted main.ops[3]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[5]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_if_body@5.ops[1]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/control_op_simplification/puya_unoptimized.log b/test_cases/control_op_simplification/puya_unoptimized.log
index cb848658c1..debe78a3cf 100644
--- a/test_cases/control_op_simplification/puya_unoptimized.log
+++ b/test_cases/control_op_simplification/puya_unoptimized.log
@@ -440,7 +440,7 @@ debug: Coalescing do_log#0 with [do_log#1, do_log#7, do_log#2, do_log#3]
 debug: Coalescing resulted in 10 replacement/s
 debug: Sequentializing parallel copies in test_cases.control_op_simplification.contract.MyContract.approval_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to control_op_simplification/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir
+debug: Output IR to control_op_simplification/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.control_op_simplification.contract.MyContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.control_op_simplification.contract.MyContract.clear_state_program
@@ -458,7 +458,7 @@ debug: Coalescing local variables in test_cases.control_op_simplification.contra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.control_op_simplification.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to control_op_simplification/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir
+debug: Output IR to control_op_simplification/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
 debug: Inserted main.ops[3]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[7]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_if_body@5.ops[1]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/debug/out/DebugContract.ir/DebugContract.approval.0.approval.ssa.ir b/test_cases/debug/out/DebugContract.ir/DebugContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/debug/out/DebugContract.ir/DebugContract.approval.0.approval.ssa.ir
rename to test_cases/debug/out/DebugContract.ir/DebugContract.approval.0.ssa.ir
diff --git a/test_cases/debug/out/DebugContract.ir/DebugContract.approval.1.approval.ssa.opt.ir b/test_cases/debug/out/DebugContract.ir/DebugContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/debug/out/DebugContract.ir/DebugContract.approval.1.approval.ssa.opt.ir
rename to test_cases/debug/out/DebugContract.ir/DebugContract.approval.1.ssa.opt.ir
diff --git a/test_cases/debug/out/DebugContract.ir/DebugContract.approval.2.approval.ssa.opt.ir b/test_cases/debug/out/DebugContract.ir/DebugContract.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/debug/out/DebugContract.ir/DebugContract.approval.2.approval.ssa.opt.ir
rename to test_cases/debug/out/DebugContract.ir/DebugContract.approval.2.ssa.opt.ir
diff --git a/test_cases/debug/out/DebugContract.ir/DebugContract.approval.3.approval.destructured.ir b/test_cases/debug/out/DebugContract.ir/DebugContract.approval.3.destructured.ir
similarity index 100%
rename from test_cases/debug/out/DebugContract.ir/DebugContract.approval.3.approval.destructured.ir
rename to test_cases/debug/out/DebugContract.ir/DebugContract.approval.3.destructured.ir
diff --git a/test_cases/debug/out/DebugContract.ir/DebugContract.clear.0.clear.ssa.ir b/test_cases/debug/out/DebugContract.ir/DebugContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/debug/out/DebugContract.ir/DebugContract.clear.0.clear.ssa.ir
rename to test_cases/debug/out/DebugContract.ir/DebugContract.clear.0.ssa.ir
diff --git a/test_cases/debug/out/DebugContract.ir/DebugContract.clear.1.clear.destructured.ir b/test_cases/debug/out/DebugContract.ir/DebugContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/debug/out/DebugContract.ir/DebugContract.clear.1.clear.destructured.ir
rename to test_cases/debug/out/DebugContract.ir/DebugContract.clear.1.destructured.ir
diff --git a/test_cases/debug/out_O2/DebugContract.ir/DebugContract.approval.0.approval.destructured.ir b/test_cases/debug/out_O2/DebugContract.ir/DebugContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/debug/out_O2/DebugContract.ir/DebugContract.approval.0.approval.destructured.ir
rename to test_cases/debug/out_O2/DebugContract.ir/DebugContract.approval.0.destructured.ir
diff --git a/test_cases/debug/out_O2/DebugContract.ir/DebugContract.clear.0.clear.destructured.ir b/test_cases/debug/out_O2/DebugContract.ir/DebugContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/debug/out_O2/DebugContract.ir/DebugContract.clear.0.clear.destructured.ir
rename to test_cases/debug/out_O2/DebugContract.ir/DebugContract.clear.0.destructured.ir
diff --git a/test_cases/debug/out_unoptimized/DebugContract.ir/DebugContract.approval.0.approval.destructured.ir b/test_cases/debug/out_unoptimized/DebugContract.ir/DebugContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/debug/out_unoptimized/DebugContract.ir/DebugContract.approval.0.approval.destructured.ir
rename to test_cases/debug/out_unoptimized/DebugContract.ir/DebugContract.approval.0.destructured.ir
diff --git a/test_cases/debug/out_unoptimized/DebugContract.ir/DebugContract.clear.0.clear.destructured.ir b/test_cases/debug/out_unoptimized/DebugContract.ir/DebugContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/debug/out_unoptimized/DebugContract.ir/DebugContract.clear.0.clear.destructured.ir
rename to test_cases/debug/out_unoptimized/DebugContract.ir/DebugContract.clear.0.destructured.ir
diff --git a/test_cases/debug/puya.log b/test_cases/debug/puya.log
index e0c98e85be..a750dbc22c 100644
--- a/test_cases/debug/puya.log
+++ b/test_cases/debug/puya.log
@@ -668,7 +668,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to debug/out/DebugContract.ir/DebugContract.approval.0.approval.ssa.ir
+debug: Output IR to debug/out/DebugContract.ir/DebugContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.debug.contract.DebugContract at level 1
 debug: Begin optimization pass 1/100
 debug/contract.py:52 debug: function is auto-recursive: test_cases.debug.contract.itoa
@@ -802,7 +802,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.debug.contract.DebugContract.__puya_arc4_router__
-debug: Output IR to debug/out/DebugContract.ir/DebugContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to debug/out/DebugContract.ir/DebugContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -885,7 +885,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.debug.contract.DebugContract.__algopy_default_create
-debug: Output IR to debug/out/DebugContract.ir/DebugContract.approval.2.approval.ssa.opt.ir
+debug: Output IR to debug/out/DebugContract.ir/DebugContract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -1060,8 +1060,8 @@ debug: Coalescing local variables in test_cases.debug.contract.itoa using strate
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.debug.contract.itoa
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to debug/out/DebugContract.ir/DebugContract.approval.3.approval.destructured.ir
-debug: Output IR to debug/out/DebugContract.ir/DebugContract.clear.0.clear.ssa.ir
+debug: Output IR to debug/out/DebugContract.ir/DebugContract.approval.3.destructured.ir
+debug: Output IR to debug/out/DebugContract.ir/DebugContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.debug.contract.DebugContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -1087,7 +1087,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to debug/out/DebugContract.ir/DebugContract.clear.1.clear.destructured.ir
+debug: Output IR to debug/out/DebugContract.ir/DebugContract.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/debug/puya_O2.log b/test_cases/debug/puya_O2.log
index 1d2950e360..99a8877dc8 100644
--- a/test_cases/debug/puya_O2.log
+++ b/test_cases/debug/puya_O2.log
@@ -1059,7 +1059,7 @@ debug: Coalescing local variables in test_cases.debug.contract.itoa using strate
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.debug.contract.itoa
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to debug/out_O2/DebugContract.ir/DebugContract.approval.0.approval.destructured.ir
+debug: Output IR to debug/out_O2/DebugContract.ir/DebugContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.debug.contract.DebugContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -1085,7 +1085,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to debug/out_O2/DebugContract.ir/DebugContract.clear.0.clear.destructured.ir
+debug: Output IR to debug/out_O2/DebugContract.ir/DebugContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/debug/puya_unoptimized.log b/test_cases/debug/puya_unoptimized.log
index 6ae91870e4..9cafb21555 100644
--- a/test_cases/debug/puya_unoptimized.log
+++ b/test_cases/debug/puya_unoptimized.log
@@ -892,7 +892,7 @@ debug: Coalescing local variables in test_cases.debug.contract.itoa using strate
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.debug.contract.itoa
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to debug/out_unoptimized/DebugContract.ir/DebugContract.approval.0.approval.destructured.ir
+debug: Output IR to debug/out_unoptimized/DebugContract.ir/DebugContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.debug.contract.DebugContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -910,7 +910,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to debug/out_unoptimized/DebugContract.ir/DebugContract.clear.0.clear.destructured.ir
+debug: Output IR to debug/out_unoptimized/DebugContract.ir/DebugContract.clear.0.destructured.ir
 debug: Inserted main_block@1.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main_block@1.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_block@1.ops[6]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/diamond_mro/out/Base1.ir/Base1.approval.0.approval.ssa.ir b/test_cases/diamond_mro/out/Base1.ir/Base1.approval.0.ssa.ir
similarity index 100%
rename from test_cases/diamond_mro/out/Base1.ir/Base1.approval.0.approval.ssa.ir
rename to test_cases/diamond_mro/out/Base1.ir/Base1.approval.0.ssa.ir
diff --git a/test_cases/diamond_mro/out/Base1.ir/Base1.approval.1.approval.ssa.opt.ir b/test_cases/diamond_mro/out/Base1.ir/Base1.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/diamond_mro/out/Base1.ir/Base1.approval.1.approval.ssa.opt.ir
rename to test_cases/diamond_mro/out/Base1.ir/Base1.approval.1.ssa.opt.ir
diff --git a/test_cases/diamond_mro/out/Base1.ir/Base1.approval.2.approval.ssa.opt.ir b/test_cases/diamond_mro/out/Base1.ir/Base1.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/diamond_mro/out/Base1.ir/Base1.approval.2.approval.ssa.opt.ir
rename to test_cases/diamond_mro/out/Base1.ir/Base1.approval.2.ssa.opt.ir
diff --git a/test_cases/diamond_mro/out/Base1.ir/Base1.approval.3.approval.destructured.ir b/test_cases/diamond_mro/out/Base1.ir/Base1.approval.3.destructured.ir
similarity index 100%
rename from test_cases/diamond_mro/out/Base1.ir/Base1.approval.3.approval.destructured.ir
rename to test_cases/diamond_mro/out/Base1.ir/Base1.approval.3.destructured.ir
diff --git a/test_cases/diamond_mro/out/Base1.ir/Base1.clear.0.clear.ssa.ir b/test_cases/diamond_mro/out/Base1.ir/Base1.clear.0.ssa.ir
similarity index 100%
rename from test_cases/diamond_mro/out/Base1.ir/Base1.clear.0.clear.ssa.ir
rename to test_cases/diamond_mro/out/Base1.ir/Base1.clear.0.ssa.ir
diff --git a/test_cases/diamond_mro/out/Base1.ir/Base1.clear.1.clear.destructured.ir b/test_cases/diamond_mro/out/Base1.ir/Base1.clear.1.destructured.ir
similarity index 100%
rename from test_cases/diamond_mro/out/Base1.ir/Base1.clear.1.clear.destructured.ir
rename to test_cases/diamond_mro/out/Base1.ir/Base1.clear.1.destructured.ir
diff --git a/test_cases/diamond_mro/out/Base2.ir/Base2.approval.0.approval.ssa.ir b/test_cases/diamond_mro/out/Base2.ir/Base2.approval.0.ssa.ir
similarity index 100%
rename from test_cases/diamond_mro/out/Base2.ir/Base2.approval.0.approval.ssa.ir
rename to test_cases/diamond_mro/out/Base2.ir/Base2.approval.0.ssa.ir
diff --git a/test_cases/diamond_mro/out/Base2.ir/Base2.approval.1.approval.ssa.opt.ir b/test_cases/diamond_mro/out/Base2.ir/Base2.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/diamond_mro/out/Base2.ir/Base2.approval.1.approval.ssa.opt.ir
rename to test_cases/diamond_mro/out/Base2.ir/Base2.approval.1.ssa.opt.ir
diff --git a/test_cases/diamond_mro/out/Base2.ir/Base2.approval.2.approval.ssa.opt.ir b/test_cases/diamond_mro/out/Base2.ir/Base2.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/diamond_mro/out/Base2.ir/Base2.approval.2.approval.ssa.opt.ir
rename to test_cases/diamond_mro/out/Base2.ir/Base2.approval.2.ssa.opt.ir
diff --git a/test_cases/diamond_mro/out/Base2.ir/Base2.approval.3.approval.destructured.ir b/test_cases/diamond_mro/out/Base2.ir/Base2.approval.3.destructured.ir
similarity index 100%
rename from test_cases/diamond_mro/out/Base2.ir/Base2.approval.3.approval.destructured.ir
rename to test_cases/diamond_mro/out/Base2.ir/Base2.approval.3.destructured.ir
diff --git a/test_cases/diamond_mro/out/Base2.ir/Base2.clear.0.clear.ssa.ir b/test_cases/diamond_mro/out/Base2.ir/Base2.clear.0.ssa.ir
similarity index 100%
rename from test_cases/diamond_mro/out/Base2.ir/Base2.clear.0.clear.ssa.ir
rename to test_cases/diamond_mro/out/Base2.ir/Base2.clear.0.ssa.ir
diff --git a/test_cases/diamond_mro/out/Base2.ir/Base2.clear.1.clear.destructured.ir b/test_cases/diamond_mro/out/Base2.ir/Base2.clear.1.destructured.ir
similarity index 100%
rename from test_cases/diamond_mro/out/Base2.ir/Base2.clear.1.clear.destructured.ir
rename to test_cases/diamond_mro/out/Base2.ir/Base2.clear.1.destructured.ir
diff --git a/test_cases/diamond_mro/out/Derived.ir/Derived.approval.0.approval.ssa.ir b/test_cases/diamond_mro/out/Derived.ir/Derived.approval.0.ssa.ir
similarity index 100%
rename from test_cases/diamond_mro/out/Derived.ir/Derived.approval.0.approval.ssa.ir
rename to test_cases/diamond_mro/out/Derived.ir/Derived.approval.0.ssa.ir
diff --git a/test_cases/diamond_mro/out/Derived.ir/Derived.approval.1.approval.ssa.opt.ir b/test_cases/diamond_mro/out/Derived.ir/Derived.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/diamond_mro/out/Derived.ir/Derived.approval.1.approval.ssa.opt.ir
rename to test_cases/diamond_mro/out/Derived.ir/Derived.approval.1.ssa.opt.ir
diff --git a/test_cases/diamond_mro/out/Derived.ir/Derived.approval.2.approval.ssa.opt.ir b/test_cases/diamond_mro/out/Derived.ir/Derived.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/diamond_mro/out/Derived.ir/Derived.approval.2.approval.ssa.opt.ir
rename to test_cases/diamond_mro/out/Derived.ir/Derived.approval.2.ssa.opt.ir
diff --git a/test_cases/diamond_mro/out/Derived.ir/Derived.approval.3.approval.ssa.opt.ir b/test_cases/diamond_mro/out/Derived.ir/Derived.approval.3.ssa.opt.ir
similarity index 100%
rename from test_cases/diamond_mro/out/Derived.ir/Derived.approval.3.approval.ssa.opt.ir
rename to test_cases/diamond_mro/out/Derived.ir/Derived.approval.3.ssa.opt.ir
diff --git a/test_cases/diamond_mro/out/Derived.ir/Derived.approval.4.approval.destructured.ir b/test_cases/diamond_mro/out/Derived.ir/Derived.approval.4.destructured.ir
similarity index 100%
rename from test_cases/diamond_mro/out/Derived.ir/Derived.approval.4.approval.destructured.ir
rename to test_cases/diamond_mro/out/Derived.ir/Derived.approval.4.destructured.ir
diff --git a/test_cases/diamond_mro/out/Derived.ir/Derived.clear.0.clear.ssa.ir b/test_cases/diamond_mro/out/Derived.ir/Derived.clear.0.ssa.ir
similarity index 100%
rename from test_cases/diamond_mro/out/Derived.ir/Derived.clear.0.clear.ssa.ir
rename to test_cases/diamond_mro/out/Derived.ir/Derived.clear.0.ssa.ir
diff --git a/test_cases/diamond_mro/out/Derived.ir/Derived.clear.1.clear.destructured.ir b/test_cases/diamond_mro/out/Derived.ir/Derived.clear.1.destructured.ir
similarity index 100%
rename from test_cases/diamond_mro/out/Derived.ir/Derived.clear.1.clear.destructured.ir
rename to test_cases/diamond_mro/out/Derived.ir/Derived.clear.1.destructured.ir
diff --git a/test_cases/diamond_mro/out/GP.ir/GP.approval.0.approval.ssa.ir b/test_cases/diamond_mro/out/GP.ir/GP.approval.0.ssa.ir
similarity index 100%
rename from test_cases/diamond_mro/out/GP.ir/GP.approval.0.approval.ssa.ir
rename to test_cases/diamond_mro/out/GP.ir/GP.approval.0.ssa.ir
diff --git a/test_cases/diamond_mro/out/GP.ir/GP.approval.1.approval.ssa.opt.ir b/test_cases/diamond_mro/out/GP.ir/GP.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/diamond_mro/out/GP.ir/GP.approval.1.approval.ssa.opt.ir
rename to test_cases/diamond_mro/out/GP.ir/GP.approval.1.ssa.opt.ir
diff --git a/test_cases/diamond_mro/out/GP.ir/GP.approval.2.approval.ssa.opt.ir b/test_cases/diamond_mro/out/GP.ir/GP.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/diamond_mro/out/GP.ir/GP.approval.2.approval.ssa.opt.ir
rename to test_cases/diamond_mro/out/GP.ir/GP.approval.2.ssa.opt.ir
diff --git a/test_cases/diamond_mro/out/GP.ir/GP.approval.3.approval.destructured.ir b/test_cases/diamond_mro/out/GP.ir/GP.approval.3.destructured.ir
similarity index 100%
rename from test_cases/diamond_mro/out/GP.ir/GP.approval.3.approval.destructured.ir
rename to test_cases/diamond_mro/out/GP.ir/GP.approval.3.destructured.ir
diff --git a/test_cases/diamond_mro/out/GP.ir/GP.clear.0.clear.ssa.ir b/test_cases/diamond_mro/out/GP.ir/GP.clear.0.ssa.ir
similarity index 100%
rename from test_cases/diamond_mro/out/GP.ir/GP.clear.0.clear.ssa.ir
rename to test_cases/diamond_mro/out/GP.ir/GP.clear.0.ssa.ir
diff --git a/test_cases/diamond_mro/out/GP.ir/GP.clear.1.clear.destructured.ir b/test_cases/diamond_mro/out/GP.ir/GP.clear.1.destructured.ir
similarity index 100%
rename from test_cases/diamond_mro/out/GP.ir/GP.clear.1.clear.destructured.ir
rename to test_cases/diamond_mro/out/GP.ir/GP.clear.1.destructured.ir
diff --git a/test_cases/diamond_mro/out_O2/Base1.ir/Base1.approval.0.approval.destructured.ir b/test_cases/diamond_mro/out_O2/Base1.ir/Base1.approval.0.destructured.ir
similarity index 100%
rename from test_cases/diamond_mro/out_O2/Base1.ir/Base1.approval.0.approval.destructured.ir
rename to test_cases/diamond_mro/out_O2/Base1.ir/Base1.approval.0.destructured.ir
diff --git a/test_cases/diamond_mro/out_O2/Base1.ir/Base1.clear.0.clear.destructured.ir b/test_cases/diamond_mro/out_O2/Base1.ir/Base1.clear.0.destructured.ir
similarity index 100%
rename from test_cases/diamond_mro/out_O2/Base1.ir/Base1.clear.0.clear.destructured.ir
rename to test_cases/diamond_mro/out_O2/Base1.ir/Base1.clear.0.destructured.ir
diff --git a/test_cases/diamond_mro/out_O2/Base2.ir/Base2.approval.0.approval.destructured.ir b/test_cases/diamond_mro/out_O2/Base2.ir/Base2.approval.0.destructured.ir
similarity index 100%
rename from test_cases/diamond_mro/out_O2/Base2.ir/Base2.approval.0.approval.destructured.ir
rename to test_cases/diamond_mro/out_O2/Base2.ir/Base2.approval.0.destructured.ir
diff --git a/test_cases/diamond_mro/out_O2/Base2.ir/Base2.clear.0.clear.destructured.ir b/test_cases/diamond_mro/out_O2/Base2.ir/Base2.clear.0.destructured.ir
similarity index 100%
rename from test_cases/diamond_mro/out_O2/Base2.ir/Base2.clear.0.clear.destructured.ir
rename to test_cases/diamond_mro/out_O2/Base2.ir/Base2.clear.0.destructured.ir
diff --git a/test_cases/diamond_mro/out_O2/Derived.ir/Derived.approval.0.approval.destructured.ir b/test_cases/diamond_mro/out_O2/Derived.ir/Derived.approval.0.destructured.ir
similarity index 100%
rename from test_cases/diamond_mro/out_O2/Derived.ir/Derived.approval.0.approval.destructured.ir
rename to test_cases/diamond_mro/out_O2/Derived.ir/Derived.approval.0.destructured.ir
diff --git a/test_cases/diamond_mro/out_O2/Derived.ir/Derived.clear.0.clear.destructured.ir b/test_cases/diamond_mro/out_O2/Derived.ir/Derived.clear.0.destructured.ir
similarity index 100%
rename from test_cases/diamond_mro/out_O2/Derived.ir/Derived.clear.0.clear.destructured.ir
rename to test_cases/diamond_mro/out_O2/Derived.ir/Derived.clear.0.destructured.ir
diff --git a/test_cases/diamond_mro/out_O2/GP.ir/GP.approval.0.approval.destructured.ir b/test_cases/diamond_mro/out_O2/GP.ir/GP.approval.0.destructured.ir
similarity index 100%
rename from test_cases/diamond_mro/out_O2/GP.ir/GP.approval.0.approval.destructured.ir
rename to test_cases/diamond_mro/out_O2/GP.ir/GP.approval.0.destructured.ir
diff --git a/test_cases/diamond_mro/out_O2/GP.ir/GP.clear.0.clear.destructured.ir b/test_cases/diamond_mro/out_O2/GP.ir/GP.clear.0.destructured.ir
similarity index 100%
rename from test_cases/diamond_mro/out_O2/GP.ir/GP.clear.0.clear.destructured.ir
rename to test_cases/diamond_mro/out_O2/GP.ir/GP.clear.0.destructured.ir
diff --git a/test_cases/diamond_mro/out_unoptimized/Base1.ir/Base1.approval.0.approval.destructured.ir b/test_cases/diamond_mro/out_unoptimized/Base1.ir/Base1.approval.0.destructured.ir
similarity index 100%
rename from test_cases/diamond_mro/out_unoptimized/Base1.ir/Base1.approval.0.approval.destructured.ir
rename to test_cases/diamond_mro/out_unoptimized/Base1.ir/Base1.approval.0.destructured.ir
diff --git a/test_cases/diamond_mro/out_unoptimized/Base1.ir/Base1.clear.0.clear.destructured.ir b/test_cases/diamond_mro/out_unoptimized/Base1.ir/Base1.clear.0.destructured.ir
similarity index 100%
rename from test_cases/diamond_mro/out_unoptimized/Base1.ir/Base1.clear.0.clear.destructured.ir
rename to test_cases/diamond_mro/out_unoptimized/Base1.ir/Base1.clear.0.destructured.ir
diff --git a/test_cases/diamond_mro/out_unoptimized/Base2.ir/Base2.approval.0.approval.destructured.ir b/test_cases/diamond_mro/out_unoptimized/Base2.ir/Base2.approval.0.destructured.ir
similarity index 100%
rename from test_cases/diamond_mro/out_unoptimized/Base2.ir/Base2.approval.0.approval.destructured.ir
rename to test_cases/diamond_mro/out_unoptimized/Base2.ir/Base2.approval.0.destructured.ir
diff --git a/test_cases/diamond_mro/out_unoptimized/Base2.ir/Base2.clear.0.clear.destructured.ir b/test_cases/diamond_mro/out_unoptimized/Base2.ir/Base2.clear.0.destructured.ir
similarity index 100%
rename from test_cases/diamond_mro/out_unoptimized/Base2.ir/Base2.clear.0.clear.destructured.ir
rename to test_cases/diamond_mro/out_unoptimized/Base2.ir/Base2.clear.0.destructured.ir
diff --git a/test_cases/diamond_mro/out_unoptimized/Derived.ir/Derived.approval.0.approval.destructured.ir b/test_cases/diamond_mro/out_unoptimized/Derived.ir/Derived.approval.0.destructured.ir
similarity index 100%
rename from test_cases/diamond_mro/out_unoptimized/Derived.ir/Derived.approval.0.approval.destructured.ir
rename to test_cases/diamond_mro/out_unoptimized/Derived.ir/Derived.approval.0.destructured.ir
diff --git a/test_cases/diamond_mro/out_unoptimized/Derived.ir/Derived.clear.0.clear.destructured.ir b/test_cases/diamond_mro/out_unoptimized/Derived.ir/Derived.clear.0.destructured.ir
similarity index 100%
rename from test_cases/diamond_mro/out_unoptimized/Derived.ir/Derived.clear.0.clear.destructured.ir
rename to test_cases/diamond_mro/out_unoptimized/Derived.ir/Derived.clear.0.destructured.ir
diff --git a/test_cases/diamond_mro/out_unoptimized/GP.ir/GP.approval.0.approval.destructured.ir b/test_cases/diamond_mro/out_unoptimized/GP.ir/GP.approval.0.destructured.ir
similarity index 100%
rename from test_cases/diamond_mro/out_unoptimized/GP.ir/GP.approval.0.approval.destructured.ir
rename to test_cases/diamond_mro/out_unoptimized/GP.ir/GP.approval.0.destructured.ir
diff --git a/test_cases/diamond_mro/out_unoptimized/GP.ir/GP.clear.0.clear.destructured.ir b/test_cases/diamond_mro/out_unoptimized/GP.ir/GP.clear.0.destructured.ir
similarity index 100%
rename from test_cases/diamond_mro/out_unoptimized/GP.ir/GP.clear.0.clear.destructured.ir
rename to test_cases/diamond_mro/out_unoptimized/GP.ir/GP.clear.0.destructured.ir
diff --git a/test_cases/diamond_mro/puya.log b/test_cases/diamond_mro/puya.log
index fa9985fa58..dcba506644 100644
--- a/test_cases/diamond_mro/puya.log
+++ b/test_cases/diamond_mro/puya.log
@@ -662,7 +662,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to diamond_mro/out/GP.ir/GP.approval.0.approval.ssa.ir
+debug: Output IR to diamond_mro/out/GP.ir/GP.approval.0.ssa.ir
 info: optimizing approval program of test_cases.diamond_mro.gp.GP at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.diamond_mro.gp.GP.__init__ for inlining
@@ -798,7 +798,7 @@ debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.diamond_mro.gp.GP.__init__
 debug: removing unused subroutine algopy.arc4.ARC4Contract.approval_program
 debug: removing unused subroutine test_cases.diamond_mro.gp.GP.create
-debug: Output IR to diamond_mro/out/GP.ir/GP.approval.1.approval.ssa.opt.ir
+debug: Output IR to diamond_mro/out/GP.ir/GP.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.diamond_mro.gp.GP.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -850,7 +850,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.diamond_mro.gp.GP.__puya_arc4_router__
-debug: Output IR to diamond_mro/out/GP.ir/GP.approval.2.approval.ssa.opt.ir
+debug: Output IR to diamond_mro/out/GP.ir/GP.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.diamond_mro.gp.GP.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -899,8 +899,8 @@ debug: Coalescing local variables in test_cases.diamond_mro.gp.GP.method using s
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.diamond_mro.gp.GP.method
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to diamond_mro/out/GP.ir/GP.approval.3.approval.destructured.ir
-debug: Output IR to diamond_mro/out/GP.ir/GP.clear.0.clear.ssa.ir
+debug: Output IR to diamond_mro/out/GP.ir/GP.approval.3.destructured.ir
+debug: Output IR to diamond_mro/out/GP.ir/GP.clear.0.ssa.ir
 info: optimizing clear program of test_cases.diamond_mro.gp.GP at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -926,7 +926,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to diamond_mro/out/GP.ir/GP.clear.1.clear.destructured.ir
+debug: Output IR to diamond_mro/out/GP.ir/GP.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%0#2 0'
@@ -968,7 +968,7 @@ debug: removing explicit jump to fall-through block main_after_if_else@2
 debug: removing explicit jump to fall-through block main_after_if_else@7
 diamond_mro/gp.py:15 debug: optimizing TEAL subroutine test_cases.diamond_mro.gp.GP.method() -> void:
 debug: optimizing TEAL subroutine algopy.arc4.ARC4Contract.clear_state_program() -> uint64:
-debug: Output IR to diamond_mro/out/Base2.ir/Base2.approval.0.approval.ssa.ir
+debug: Output IR to diamond_mro/out/Base2.ir/Base2.approval.0.ssa.ir
 info: optimizing approval program of test_cases.diamond_mro.base2.Base2 at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.diamond_mro.base2.Base2.__init__ for inlining
@@ -1145,7 +1145,7 @@ debug: removing unused subroutine test_cases.diamond_mro.base2.Base2.__init__
 debug: removing unused subroutine algopy.arc4.ARC4Contract.approval_program
 debug: removing unused subroutine test_cases.diamond_mro.gp.GP.method
 debug: removing unused subroutine test_cases.diamond_mro.gp.GP.create
-debug: Output IR to diamond_mro/out/Base2.ir/Base2.approval.1.approval.ssa.opt.ir
+debug: Output IR to diamond_mro/out/Base2.ir/Base2.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking single-use function test_cases.diamond_mro.gp.GP.__init__ for inlining
 debug: Optimizing subroutine test_cases.diamond_mro.base2.Base2.__algopy_entrypoint_with_init
@@ -1219,7 +1219,7 @@ debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.diamond_mro.gp.GP.__init__
 debug: removing unused subroutine test_cases.diamond_mro.base2.Base2.__puya_arc4_router__
-debug: Output IR to diamond_mro/out/Base2.ir/Base2.approval.2.approval.ssa.opt.ir
+debug: Output IR to diamond_mro/out/Base2.ir/Base2.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.diamond_mro.base2.Base2.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -1268,8 +1268,8 @@ debug: Coalescing local variables in test_cases.diamond_mro.base2.Base2.method u
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.diamond_mro.base2.Base2.method
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to diamond_mro/out/Base2.ir/Base2.approval.3.approval.destructured.ir
-debug: Output IR to diamond_mro/out/Base2.ir/Base2.clear.0.clear.ssa.ir
+debug: Output IR to diamond_mro/out/Base2.ir/Base2.approval.3.destructured.ir
+debug: Output IR to diamond_mro/out/Base2.ir/Base2.clear.0.ssa.ir
 info: optimizing clear program of test_cases.diamond_mro.base2.Base2 at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -1295,7 +1295,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to diamond_mro/out/Base2.ir/Base2.clear.1.clear.destructured.ir
+debug: Output IR to diamond_mro/out/Base2.ir/Base2.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%0#2 0'
@@ -1337,7 +1337,7 @@ debug: removing explicit jump to fall-through block main_after_if_else@2
 debug: removing explicit jump to fall-through block main_after_if_else@7
 diamond_mro/base2.py:11 debug: optimizing TEAL subroutine test_cases.diamond_mro.base2.Base2.method() -> void:
 debug: optimizing TEAL subroutine algopy.arc4.ARC4Contract.clear_state_program() -> uint64:
-debug: Output IR to diamond_mro/out/Base1.ir/Base1.approval.0.approval.ssa.ir
+debug: Output IR to diamond_mro/out/Base1.ir/Base1.approval.0.ssa.ir
 info: optimizing approval program of test_cases.diamond_mro.base1.Base1 at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.diamond_mro.base1.Base1.__init__ for inlining
@@ -1514,7 +1514,7 @@ debug: removing unused subroutine test_cases.diamond_mro.base1.Base1.__init__
 debug: removing unused subroutine algopy.arc4.ARC4Contract.approval_program
 debug: removing unused subroutine test_cases.diamond_mro.gp.GP.method
 debug: removing unused subroutine test_cases.diamond_mro.gp.GP.create
-debug: Output IR to diamond_mro/out/Base1.ir/Base1.approval.1.approval.ssa.opt.ir
+debug: Output IR to diamond_mro/out/Base1.ir/Base1.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking single-use function test_cases.diamond_mro.gp.GP.__init__ for inlining
 debug: Optimizing subroutine test_cases.diamond_mro.base1.Base1.__algopy_entrypoint_with_init
@@ -1588,7 +1588,7 @@ debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.diamond_mro.gp.GP.__init__
 debug: removing unused subroutine test_cases.diamond_mro.base1.Base1.__puya_arc4_router__
-debug: Output IR to diamond_mro/out/Base1.ir/Base1.approval.2.approval.ssa.opt.ir
+debug: Output IR to diamond_mro/out/Base1.ir/Base1.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.diamond_mro.base1.Base1.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -1637,8 +1637,8 @@ debug: Coalescing local variables in test_cases.diamond_mro.base1.Base1.method u
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.diamond_mro.base1.Base1.method
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to diamond_mro/out/Base1.ir/Base1.approval.3.approval.destructured.ir
-debug: Output IR to diamond_mro/out/Base1.ir/Base1.clear.0.clear.ssa.ir
+debug: Output IR to diamond_mro/out/Base1.ir/Base1.approval.3.destructured.ir
+debug: Output IR to diamond_mro/out/Base1.ir/Base1.clear.0.ssa.ir
 info: optimizing clear program of test_cases.diamond_mro.base1.Base1 at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -1664,7 +1664,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to diamond_mro/out/Base1.ir/Base1.clear.1.clear.destructured.ir
+debug: Output IR to diamond_mro/out/Base1.ir/Base1.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%0#2 0'
@@ -1706,7 +1706,7 @@ debug: removing explicit jump to fall-through block main_after_if_else@2
 debug: removing explicit jump to fall-through block main_after_if_else@7
 diamond_mro/base1.py:11 debug: optimizing TEAL subroutine test_cases.diamond_mro.base1.Base1.method() -> void:
 debug: optimizing TEAL subroutine algopy.arc4.ARC4Contract.clear_state_program() -> uint64:
-debug: Output IR to diamond_mro/out/Derived.ir/Derived.approval.0.approval.ssa.ir
+debug: Output IR to diamond_mro/out/Derived.ir/Derived.approval.0.ssa.ir
 info: optimizing approval program of test_cases.diamond_mro.derived.Derived at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.diamond_mro.derived.Derived.__init__ for inlining
@@ -1965,7 +1965,7 @@ debug: removing unused subroutine algopy.arc4.ARC4Contract.approval_program
 debug: removing unused subroutine test_cases.diamond_mro.base1.Base1.method
 debug: removing unused subroutine test_cases.diamond_mro.gp.GP.method
 debug: removing unused subroutine test_cases.diamond_mro.gp.GP.create
-debug: Output IR to diamond_mro/out/Derived.ir/Derived.approval.1.approval.ssa.opt.ir
+debug: Output IR to diamond_mro/out/Derived.ir/Derived.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking single-use function test_cases.diamond_mro.base1.Base1.__init__ for inlining
 debug: marking single-use function test_cases.diamond_mro.gp.GP.__init__ for inlining
@@ -2080,7 +2080,7 @@ debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.diamond_mro.base1.Base1.__init__
 debug: removing unused subroutine test_cases.diamond_mro.derived.Derived.__puya_arc4_router__
 debug: removing unused subroutine test_cases.diamond_mro.base2.Base2.method
-debug: Output IR to diamond_mro/out/Derived.ir/Derived.approval.2.approval.ssa.opt.ir
+debug: Output IR to diamond_mro/out/Derived.ir/Derived.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: marking single-use function test_cases.diamond_mro.gp.GP.__init__ for inlining
 debug: Optimizing subroutine test_cases.diamond_mro.derived.Derived.__algopy_entrypoint_with_init
@@ -2134,7 +2134,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.diamond_mro.gp.GP.__init__
-debug: Output IR to diamond_mro/out/Derived.ir/Derived.approval.3.approval.ssa.opt.ir
+debug: Output IR to diamond_mro/out/Derived.ir/Derived.approval.3.ssa.opt.ir
 debug: Begin optimization pass 4/100
 debug: Optimizing subroutine test_cases.diamond_mro.derived.Derived.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -2183,8 +2183,8 @@ debug: Coalescing local variables in test_cases.diamond_mro.derived.Derived.meth
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.diamond_mro.derived.Derived.method
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to diamond_mro/out/Derived.ir/Derived.approval.4.approval.destructured.ir
-debug: Output IR to diamond_mro/out/Derived.ir/Derived.clear.0.clear.ssa.ir
+debug: Output IR to diamond_mro/out/Derived.ir/Derived.approval.4.destructured.ir
+debug: Output IR to diamond_mro/out/Derived.ir/Derived.clear.0.ssa.ir
 info: optimizing clear program of test_cases.diamond_mro.derived.Derived at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -2210,7 +2210,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to diamond_mro/out/Derived.ir/Derived.clear.1.clear.destructured.ir
+debug: Output IR to diamond_mro/out/Derived.ir/Derived.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%0#2 0'
diff --git a/test_cases/diamond_mro/puya_O2.log b/test_cases/diamond_mro/puya_O2.log
index d0432c40a4..6a498a2363 100644
--- a/test_cases/diamond_mro/puya_O2.log
+++ b/test_cases/diamond_mro/puya_O2.log
@@ -864,7 +864,7 @@ debug: Coalescing test_cases.diamond_mro.gp.GP.__puya_arc4_router__%0#0 with [te
 debug: Coalescing resulted in 10 replacement/s
 debug: Sequentializing parallel copies in test_cases.diamond_mro.gp.GP.__algopy_entrypoint_with_init
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to diamond_mro/out_O2/GP.ir/GP.approval.0.approval.destructured.ir
+debug: Output IR to diamond_mro/out_O2/GP.ir/GP.approval.0.destructured.ir
 info: optimizing clear program of test_cases.diamond_mro.gp.GP at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -890,7 +890,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to diamond_mro/out_O2/GP.ir/GP.clear.0.clear.destructured.ir
+debug: Output IR to diamond_mro/out_O2/GP.ir/GP.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%0#2 0'
@@ -1254,7 +1254,7 @@ debug: Coalescing test_cases.diamond_mro.base2.Base2.__puya_arc4_router__%0#0 wi
 debug: Coalescing resulted in 10 replacement/s
 debug: Sequentializing parallel copies in test_cases.diamond_mro.base2.Base2.__algopy_entrypoint_with_init
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to diamond_mro/out_O2/Base2.ir/Base2.approval.0.approval.destructured.ir
+debug: Output IR to diamond_mro/out_O2/Base2.ir/Base2.approval.0.destructured.ir
 info: optimizing clear program of test_cases.diamond_mro.base2.Base2 at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -1280,7 +1280,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to diamond_mro/out_O2/Base2.ir/Base2.clear.0.clear.destructured.ir
+debug: Output IR to diamond_mro/out_O2/Base2.ir/Base2.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%0#2 0'
@@ -1644,7 +1644,7 @@ debug: Coalescing test_cases.diamond_mro.base1.Base1.__puya_arc4_router__%0#0 wi
 debug: Coalescing resulted in 10 replacement/s
 debug: Sequentializing parallel copies in test_cases.diamond_mro.base1.Base1.__algopy_entrypoint_with_init
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to diamond_mro/out_O2/Base1.ir/Base1.approval.0.approval.destructured.ir
+debug: Output IR to diamond_mro/out_O2/Base1.ir/Base1.approval.0.destructured.ir
 info: optimizing clear program of test_cases.diamond_mro.base1.Base1 at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -1670,7 +1670,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to diamond_mro/out_O2/Base1.ir/Base1.clear.0.clear.destructured.ir
+debug: Output IR to diamond_mro/out_O2/Base1.ir/Base1.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%0#2 0'
@@ -2179,7 +2179,7 @@ debug: Coalescing test_cases.diamond_mro.derived.Derived.__puya_arc4_router__%0#
 debug: Coalescing resulted in 10 replacement/s
 debug: Sequentializing parallel copies in test_cases.diamond_mro.derived.Derived.__algopy_entrypoint_with_init
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to diamond_mro/out_O2/Derived.ir/Derived.approval.0.approval.destructured.ir
+debug: Output IR to diamond_mro/out_O2/Derived.ir/Derived.approval.0.destructured.ir
 info: optimizing clear program of test_cases.diamond_mro.derived.Derived at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -2205,7 +2205,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to diamond_mro/out_O2/Derived.ir/Derived.clear.0.clear.destructured.ir
+debug: Output IR to diamond_mro/out_O2/Derived.ir/Derived.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%0#2 0'
diff --git a/test_cases/diamond_mro/puya_unoptimized.log b/test_cases/diamond_mro/puya_unoptimized.log
index 15b8f2a34a..c75d06c8be 100644
--- a/test_cases/diamond_mro/puya_unoptimized.log
+++ b/test_cases/diamond_mro/puya_unoptimized.log
@@ -781,7 +781,7 @@ debug: Coalescing local variables in test_cases.diamond_mro.gp.GP.method using s
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.diamond_mro.gp.GP.method
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to diamond_mro/out_unoptimized/GP.ir/GP.approval.0.approval.destructured.ir
+debug: Output IR to diamond_mro/out_unoptimized/GP.ir/GP.approval.0.destructured.ir
 info: optimizing clear program of test_cases.diamond_mro.gp.GP at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -799,7 +799,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to diamond_mro/out_unoptimized/GP.ir/GP.clear.0.clear.destructured.ir
+debug: Output IR to diamond_mro/out_unoptimized/GP.ir/GP.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%1#0 0'
@@ -1014,7 +1014,7 @@ debug: Coalescing local variables in test_cases.diamond_mro.gp.GP.create using s
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.diamond_mro.gp.GP.create
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to diamond_mro/out_unoptimized/Base2.ir/Base2.approval.0.approval.destructured.ir
+debug: Output IR to diamond_mro/out_unoptimized/Base2.ir/Base2.approval.0.destructured.ir
 info: optimizing clear program of test_cases.diamond_mro.base2.Base2 at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -1032,7 +1032,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to diamond_mro/out_unoptimized/Base2.ir/Base2.clear.0.clear.destructured.ir
+debug: Output IR to diamond_mro/out_unoptimized/Base2.ir/Base2.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%1#0 0'
@@ -1249,7 +1249,7 @@ debug: Coalescing local variables in test_cases.diamond_mro.gp.GP.create using s
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.diamond_mro.gp.GP.create
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to diamond_mro/out_unoptimized/Base1.ir/Base1.approval.0.approval.destructured.ir
+debug: Output IR to diamond_mro/out_unoptimized/Base1.ir/Base1.approval.0.destructured.ir
 info: optimizing clear program of test_cases.diamond_mro.base1.Base1 at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -1267,7 +1267,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to diamond_mro/out_unoptimized/Base1.ir/Base1.clear.0.clear.destructured.ir
+debug: Output IR to diamond_mro/out_unoptimized/Base1.ir/Base1.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%1#0 0'
@@ -1568,7 +1568,7 @@ debug: Coalescing local variables in test_cases.diamond_mro.gp.GP.create using s
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.diamond_mro.gp.GP.create
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to diamond_mro/out_unoptimized/Derived.ir/Derived.approval.0.approval.destructured.ir
+debug: Output IR to diamond_mro/out_unoptimized/Derived.ir/Derived.approval.0.destructured.ir
 info: optimizing clear program of test_cases.diamond_mro.derived.Derived at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -1586,7 +1586,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to diamond_mro/out_unoptimized/Derived.ir/Derived.clear.0.clear.destructured.ir
+debug: Output IR to diamond_mro/out_unoptimized/Derived.ir/Derived.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/dup2_optimization_bug/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir b/test_cases/dup2_optimization_bug/out/MyContract.ir/MyContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/dup2_optimization_bug/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir
rename to test_cases/dup2_optimization_bug/out/MyContract.ir/MyContract.approval.0.ssa.ir
diff --git a/test_cases/dup2_optimization_bug/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir b/test_cases/dup2_optimization_bug/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/dup2_optimization_bug/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir
rename to test_cases/dup2_optimization_bug/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
diff --git a/test_cases/dup2_optimization_bug/out/MyContract.ir/MyContract.approval.2.approval.destructured.ir b/test_cases/dup2_optimization_bug/out/MyContract.ir/MyContract.approval.2.destructured.ir
similarity index 100%
rename from test_cases/dup2_optimization_bug/out/MyContract.ir/MyContract.approval.2.approval.destructured.ir
rename to test_cases/dup2_optimization_bug/out/MyContract.ir/MyContract.approval.2.destructured.ir
diff --git a/test_cases/dup2_optimization_bug/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir b/test_cases/dup2_optimization_bug/out/MyContract.ir/MyContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/dup2_optimization_bug/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir
rename to test_cases/dup2_optimization_bug/out/MyContract.ir/MyContract.clear.0.ssa.ir
diff --git a/test_cases/dup2_optimization_bug/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir b/test_cases/dup2_optimization_bug/out/MyContract.ir/MyContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/dup2_optimization_bug/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir
rename to test_cases/dup2_optimization_bug/out/MyContract.ir/MyContract.clear.1.destructured.ir
diff --git a/test_cases/dup2_optimization_bug/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir b/test_cases/dup2_optimization_bug/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/dup2_optimization_bug/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir
rename to test_cases/dup2_optimization_bug/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
diff --git a/test_cases/dup2_optimization_bug/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir b/test_cases/dup2_optimization_bug/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/dup2_optimization_bug/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir
rename to test_cases/dup2_optimization_bug/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
diff --git a/test_cases/dup2_optimization_bug/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir b/test_cases/dup2_optimization_bug/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/dup2_optimization_bug/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir
rename to test_cases/dup2_optimization_bug/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
diff --git a/test_cases/dup2_optimization_bug/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir b/test_cases/dup2_optimization_bug/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/dup2_optimization_bug/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir
rename to test_cases/dup2_optimization_bug/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
diff --git a/test_cases/dup2_optimization_bug/puya.log b/test_cases/dup2_optimization_bug/puya.log
index 576328c060..3ea26f6bcc 100644
--- a/test_cases/dup2_optimization_bug/puya.log
+++ b/test_cases/dup2_optimization_bug/puya.log
@@ -407,7 +407,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to dup2_optimization_bug/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir
+debug: Output IR to dup2_optimization_bug/out/MyContract.ir/MyContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.dup2_optimization_bug.crash.MyContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.dup2_optimization_bug.crash.MyContract.approval_program
@@ -426,7 +426,7 @@ debug: Optimizer: Remove Linear Jump
 debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to dup2_optimization_bug/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to dup2_optimization_bug/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.dup2_optimization_bug.crash.MyContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -451,8 +451,8 @@ debug: Coalescing local variables in test_cases.dup2_optimization_bug.crash.MyCo
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.dup2_optimization_bug.crash.MyContract.approval_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to dup2_optimization_bug/out/MyContract.ir/MyContract.approval.2.approval.destructured.ir
-debug: Output IR to dup2_optimization_bug/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir
+debug: Output IR to dup2_optimization_bug/out/MyContract.ir/MyContract.approval.2.destructured.ir
+debug: Output IR to dup2_optimization_bug/out/MyContract.ir/MyContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.dup2_optimization_bug.crash.MyContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.dup2_optimization_bug.crash.MyContract.clear_state_program
@@ -478,7 +478,7 @@ debug: Coalescing local variables in test_cases.dup2_optimization_bug.crash.MyCo
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.dup2_optimization_bug.crash.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to dup2_optimization_bug/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir
+debug: Output IR to dup2_optimization_bug/out/MyContract.ir/MyContract.clear.1.destructured.ir
 debug: Inserted main.ops[7]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[9]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[11]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/dup2_optimization_bug/puya_O2.log b/test_cases/dup2_optimization_bug/puya_O2.log
index 61dde3fad6..a647888829 100644
--- a/test_cases/dup2_optimization_bug/puya_O2.log
+++ b/test_cases/dup2_optimization_bug/puya_O2.log
@@ -448,7 +448,7 @@ debug: Coalescing local variables in test_cases.dup2_optimization_bug.crash.MyCo
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.dup2_optimization_bug.crash.MyContract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to dup2_optimization_bug/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir
+debug: Output IR to dup2_optimization_bug/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.dup2_optimization_bug.crash.MyContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.dup2_optimization_bug.crash.MyContract.clear_state_program
@@ -474,7 +474,7 @@ debug: Coalescing local variables in test_cases.dup2_optimization_bug.crash.MyCo
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.dup2_optimization_bug.crash.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to dup2_optimization_bug/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir
+debug: Output IR to dup2_optimization_bug/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
 debug: Inserted main.ops[7]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[9]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[11]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/dup2_optimization_bug/puya_unoptimized.log b/test_cases/dup2_optimization_bug/puya_unoptimized.log
index fb29ba660e..a6069b5fd4 100644
--- a/test_cases/dup2_optimization_bug/puya_unoptimized.log
+++ b/test_cases/dup2_optimization_bug/puya_unoptimized.log
@@ -423,7 +423,7 @@ debug: Coalescing local variables in test_cases.dup2_optimization_bug.crash.MyCo
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.dup2_optimization_bug.crash.MyContract.approval_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to dup2_optimization_bug/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir
+debug: Output IR to dup2_optimization_bug/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.dup2_optimization_bug.crash.MyContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.dup2_optimization_bug.crash.MyContract.clear_state_program
@@ -441,7 +441,7 @@ debug: Coalescing local variables in test_cases.dup2_optimization_bug.crash.MyCo
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.dup2_optimization_bug.crash.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to dup2_optimization_bug/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir
+debug: Output IR to dup2_optimization_bug/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
 debug: Inserted main.ops[7]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[9]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[11]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/edverify/out/VerifyContract.ir/VerifyContract.approval.0.approval.ssa.ir b/test_cases/edverify/out/VerifyContract.ir/VerifyContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/edverify/out/VerifyContract.ir/VerifyContract.approval.0.approval.ssa.ir
rename to test_cases/edverify/out/VerifyContract.ir/VerifyContract.approval.0.ssa.ir
diff --git a/test_cases/edverify/out/VerifyContract.ir/VerifyContract.approval.1.approval.ssa.opt.ir b/test_cases/edverify/out/VerifyContract.ir/VerifyContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/edverify/out/VerifyContract.ir/VerifyContract.approval.1.approval.ssa.opt.ir
rename to test_cases/edverify/out/VerifyContract.ir/VerifyContract.approval.1.ssa.opt.ir
diff --git a/test_cases/edverify/out/VerifyContract.ir/VerifyContract.approval.2.approval.destructured.ir b/test_cases/edverify/out/VerifyContract.ir/VerifyContract.approval.2.destructured.ir
similarity index 100%
rename from test_cases/edverify/out/VerifyContract.ir/VerifyContract.approval.2.approval.destructured.ir
rename to test_cases/edverify/out/VerifyContract.ir/VerifyContract.approval.2.destructured.ir
diff --git a/test_cases/edverify/out/VerifyContract.ir/VerifyContract.clear.0.clear.ssa.ir b/test_cases/edverify/out/VerifyContract.ir/VerifyContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/edverify/out/VerifyContract.ir/VerifyContract.clear.0.clear.ssa.ir
rename to test_cases/edverify/out/VerifyContract.ir/VerifyContract.clear.0.ssa.ir
diff --git a/test_cases/edverify/out/VerifyContract.ir/VerifyContract.clear.1.clear.destructured.ir b/test_cases/edverify/out/VerifyContract.ir/VerifyContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/edverify/out/VerifyContract.ir/VerifyContract.clear.1.clear.destructured.ir
rename to test_cases/edverify/out/VerifyContract.ir/VerifyContract.clear.1.destructured.ir
diff --git a/test_cases/edverify/out_O2/VerifyContract.ir/VerifyContract.approval.0.approval.destructured.ir b/test_cases/edverify/out_O2/VerifyContract.ir/VerifyContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/edverify/out_O2/VerifyContract.ir/VerifyContract.approval.0.approval.destructured.ir
rename to test_cases/edverify/out_O2/VerifyContract.ir/VerifyContract.approval.0.destructured.ir
diff --git a/test_cases/edverify/out_O2/VerifyContract.ir/VerifyContract.clear.0.clear.destructured.ir b/test_cases/edverify/out_O2/VerifyContract.ir/VerifyContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/edverify/out_O2/VerifyContract.ir/VerifyContract.clear.0.clear.destructured.ir
rename to test_cases/edverify/out_O2/VerifyContract.ir/VerifyContract.clear.0.destructured.ir
diff --git a/test_cases/edverify/out_unoptimized/VerifyContract.ir/VerifyContract.approval.0.approval.destructured.ir b/test_cases/edverify/out_unoptimized/VerifyContract.ir/VerifyContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/edverify/out_unoptimized/VerifyContract.ir/VerifyContract.approval.0.approval.destructured.ir
rename to test_cases/edverify/out_unoptimized/VerifyContract.ir/VerifyContract.approval.0.destructured.ir
diff --git a/test_cases/edverify/out_unoptimized/VerifyContract.ir/VerifyContract.clear.0.clear.destructured.ir b/test_cases/edverify/out_unoptimized/VerifyContract.ir/VerifyContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/edverify/out_unoptimized/VerifyContract.ir/VerifyContract.clear.0.clear.destructured.ir
rename to test_cases/edverify/out_unoptimized/VerifyContract.ir/VerifyContract.clear.0.destructured.ir
diff --git a/test_cases/edverify/puya.log b/test_cases/edverify/puya.log
index 183f309af8..87adfb98a1 100644
--- a/test_cases/edverify/puya.log
+++ b/test_cases/edverify/puya.log
@@ -407,7 +407,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to edverify/out/VerifyContract.ir/VerifyContract.approval.0.approval.ssa.ir
+debug: Output IR to edverify/out/VerifyContract.ir/VerifyContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.edverify.contract.VerifyContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.edverify.contract.VerifyContract.approval_program
@@ -427,7 +427,7 @@ debug: Optimizer: Remove Linear Jump
 debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to edverify/out/VerifyContract.ir/VerifyContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to edverify/out/VerifyContract.ir/VerifyContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.edverify.contract.VerifyContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -452,8 +452,8 @@ debug: Coalescing local variables in test_cases.edverify.contract.VerifyContract
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.edverify.contract.VerifyContract.approval_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to edverify/out/VerifyContract.ir/VerifyContract.approval.2.approval.destructured.ir
-debug: Output IR to edverify/out/VerifyContract.ir/VerifyContract.clear.0.clear.ssa.ir
+debug: Output IR to edverify/out/VerifyContract.ir/VerifyContract.approval.2.destructured.ir
+debug: Output IR to edverify/out/VerifyContract.ir/VerifyContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.edverify.contract.VerifyContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.edverify.contract.VerifyContract.clear_state_program
@@ -479,7 +479,7 @@ debug: Coalescing local variables in test_cases.edverify.contract.VerifyContract
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.edverify.contract.VerifyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to edverify/out/VerifyContract.ir/VerifyContract.clear.1.clear.destructured.ir
+debug: Output IR to edverify/out/VerifyContract.ir/VerifyContract.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[6]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/edverify/puya_O2.log b/test_cases/edverify/puya_O2.log
index d940df4fd2..b07942040e 100644
--- a/test_cases/edverify/puya_O2.log
+++ b/test_cases/edverify/puya_O2.log
@@ -449,7 +449,7 @@ debug: Coalescing local variables in test_cases.edverify.contract.VerifyContract
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.edverify.contract.VerifyContract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to edverify/out_O2/VerifyContract.ir/VerifyContract.approval.0.approval.destructured.ir
+debug: Output IR to edverify/out_O2/VerifyContract.ir/VerifyContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.edverify.contract.VerifyContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.edverify.contract.VerifyContract.clear_state_program
@@ -475,7 +475,7 @@ debug: Coalescing local variables in test_cases.edverify.contract.VerifyContract
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.edverify.contract.VerifyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to edverify/out_O2/VerifyContract.ir/VerifyContract.clear.0.clear.destructured.ir
+debug: Output IR to edverify/out_O2/VerifyContract.ir/VerifyContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[6]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/edverify/puya_unoptimized.log b/test_cases/edverify/puya_unoptimized.log
index 05a5396505..8177247ef2 100644
--- a/test_cases/edverify/puya_unoptimized.log
+++ b/test_cases/edverify/puya_unoptimized.log
@@ -423,7 +423,7 @@ debug: Coalescing local variables in test_cases.edverify.contract.VerifyContract
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.edverify.contract.VerifyContract.approval_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to edverify/out_unoptimized/VerifyContract.ir/VerifyContract.approval.0.approval.destructured.ir
+debug: Output IR to edverify/out_unoptimized/VerifyContract.ir/VerifyContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.edverify.contract.VerifyContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.edverify.contract.VerifyContract.clear_state_program
@@ -441,7 +441,7 @@ debug: Coalescing local variables in test_cases.edverify.contract.VerifyContract
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.edverify.contract.VerifyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to edverify/out_unoptimized/VerifyContract.ir/VerifyContract.clear.0.clear.destructured.ir
+debug: Output IR to edverify/out_unoptimized/VerifyContract.ir/VerifyContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[6]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/enumeration/out/EnumerationContract.ir/EnumerationContract.approval.0.approval.ssa.ir b/test_cases/enumeration/out/EnumerationContract.ir/EnumerationContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/enumeration/out/EnumerationContract.ir/EnumerationContract.approval.0.approval.ssa.ir
rename to test_cases/enumeration/out/EnumerationContract.ir/EnumerationContract.approval.0.ssa.ir
diff --git a/test_cases/enumeration/out/EnumerationContract.ir/EnumerationContract.approval.1.approval.ssa.opt.ir b/test_cases/enumeration/out/EnumerationContract.ir/EnumerationContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/enumeration/out/EnumerationContract.ir/EnumerationContract.approval.1.approval.ssa.opt.ir
rename to test_cases/enumeration/out/EnumerationContract.ir/EnumerationContract.approval.1.ssa.opt.ir
diff --git a/test_cases/enumeration/out/EnumerationContract.ir/EnumerationContract.approval.2.approval.destructured.ir b/test_cases/enumeration/out/EnumerationContract.ir/EnumerationContract.approval.2.destructured.ir
similarity index 100%
rename from test_cases/enumeration/out/EnumerationContract.ir/EnumerationContract.approval.2.approval.destructured.ir
rename to test_cases/enumeration/out/EnumerationContract.ir/EnumerationContract.approval.2.destructured.ir
diff --git a/test_cases/enumeration/out/EnumerationContract.ir/EnumerationContract.clear.0.clear.ssa.ir b/test_cases/enumeration/out/EnumerationContract.ir/EnumerationContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/enumeration/out/EnumerationContract.ir/EnumerationContract.clear.0.clear.ssa.ir
rename to test_cases/enumeration/out/EnumerationContract.ir/EnumerationContract.clear.0.ssa.ir
diff --git a/test_cases/enumeration/out/EnumerationContract.ir/EnumerationContract.clear.1.clear.destructured.ir b/test_cases/enumeration/out/EnumerationContract.ir/EnumerationContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/enumeration/out/EnumerationContract.ir/EnumerationContract.clear.1.clear.destructured.ir
rename to test_cases/enumeration/out/EnumerationContract.ir/EnumerationContract.clear.1.destructured.ir
diff --git a/test_cases/enumeration/out_O2/EnumerationContract.ir/EnumerationContract.approval.0.approval.destructured.ir b/test_cases/enumeration/out_O2/EnumerationContract.ir/EnumerationContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/enumeration/out_O2/EnumerationContract.ir/EnumerationContract.approval.0.approval.destructured.ir
rename to test_cases/enumeration/out_O2/EnumerationContract.ir/EnumerationContract.approval.0.destructured.ir
diff --git a/test_cases/enumeration/out_O2/EnumerationContract.ir/EnumerationContract.clear.0.clear.destructured.ir b/test_cases/enumeration/out_O2/EnumerationContract.ir/EnumerationContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/enumeration/out_O2/EnumerationContract.ir/EnumerationContract.clear.0.clear.destructured.ir
rename to test_cases/enumeration/out_O2/EnumerationContract.ir/EnumerationContract.clear.0.destructured.ir
diff --git a/test_cases/enumeration/out_unoptimized/EnumerationContract.ir/EnumerationContract.approval.0.approval.destructured.ir b/test_cases/enumeration/out_unoptimized/EnumerationContract.ir/EnumerationContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/enumeration/out_unoptimized/EnumerationContract.ir/EnumerationContract.approval.0.approval.destructured.ir
rename to test_cases/enumeration/out_unoptimized/EnumerationContract.ir/EnumerationContract.approval.0.destructured.ir
diff --git a/test_cases/enumeration/out_unoptimized/EnumerationContract.ir/EnumerationContract.clear.0.clear.destructured.ir b/test_cases/enumeration/out_unoptimized/EnumerationContract.ir/EnumerationContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/enumeration/out_unoptimized/EnumerationContract.ir/EnumerationContract.clear.0.clear.destructured.ir
rename to test_cases/enumeration/out_unoptimized/EnumerationContract.ir/EnumerationContract.clear.0.destructured.ir
diff --git a/test_cases/enumeration/puya.log b/test_cases/enumeration/puya.log
index 75dc89ab0c..21638c7e3a 100644
--- a/test_cases/enumeration/puya.log
+++ b/test_cases/enumeration/puya.log
@@ -662,7 +662,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to enumeration/out/EnumerationContract.ir/EnumerationContract.approval.0.approval.ssa.ir
+debug: Output IR to enumeration/out/EnumerationContract.ir/EnumerationContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.enumeration.contract.EnumerationContract at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.enumeration.contract.enumerate_urange for inlining
@@ -829,7 +829,7 @@ debug: Copy propagation made 1 modifications
 debug: removing unused subroutine test_cases.enumeration.contract.enumerate_urange
 debug: removing unused subroutine test_cases.enumeration.contract.enumerate_tuple
 debug: removing unused subroutine test_cases.enumeration.contract.enumerate_bytes
-debug: Output IR to enumeration/out/EnumerationContract.ir/EnumerationContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to enumeration/out/EnumerationContract.ir/EnumerationContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.enumeration.contract.EnumerationContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -1048,8 +1048,8 @@ debug: * to_do item_concat#2
 debug: * to_do iteration_count#3
 debug: * to_do index#0
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to enumeration/out/EnumerationContract.ir/EnumerationContract.approval.2.approval.destructured.ir
-debug: Output IR to enumeration/out/EnumerationContract.ir/EnumerationContract.clear.0.clear.ssa.ir
+debug: Output IR to enumeration/out/EnumerationContract.ir/EnumerationContract.approval.2.destructured.ir
+debug: Output IR to enumeration/out/EnumerationContract.ir/EnumerationContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.enumeration.contract.EnumerationContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.enumeration.contract.EnumerationContract.clear_state_program
@@ -1075,7 +1075,7 @@ debug: Coalescing local variables in test_cases.enumeration.contract.Enumeration
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.enumeration.contract.EnumerationContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to enumeration/out/EnumerationContract.ir/EnumerationContract.clear.1.clear.destructured.ir
+debug: Output IR to enumeration/out/EnumerationContract.ir/EnumerationContract.clear.1.destructured.ir
 debug: Inserted main_for_header@2.ops[3]: 'l-store-copy continue_looping%0#0 0'
 debug: Replaced main_for_header@2.ops[5]: 'v-load continue_looping%0#0' with 'l-load continue_looping%0#0'
 debug: Inserted main_for_body@3.ops[6]: 'l-store-copy item#0 1'
diff --git a/test_cases/enumeration/puya_O2.log b/test_cases/enumeration/puya_O2.log
index 232d077d9e..a58d9f364f 100644
--- a/test_cases/enumeration/puya_O2.log
+++ b/test_cases/enumeration/puya_O2.log
@@ -1045,7 +1045,7 @@ debug: * to_do item_concat#2
 debug: * to_do iteration_count#3
 debug: * to_do index#0
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to enumeration/out_O2/EnumerationContract.ir/EnumerationContract.approval.0.approval.destructured.ir
+debug: Output IR to enumeration/out_O2/EnumerationContract.ir/EnumerationContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.enumeration.contract.EnumerationContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.enumeration.contract.EnumerationContract.clear_state_program
@@ -1071,7 +1071,7 @@ debug: Coalescing local variables in test_cases.enumeration.contract.Enumeration
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.enumeration.contract.EnumerationContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to enumeration/out_O2/EnumerationContract.ir/EnumerationContract.clear.0.clear.destructured.ir
+debug: Output IR to enumeration/out_O2/EnumerationContract.ir/EnumerationContract.clear.0.destructured.ir
 debug: Inserted main_for_header@2.ops[3]: 'l-store-copy continue_looping%0#0 0'
 debug: Replaced main_for_header@2.ops[5]: 'v-load continue_looping%0#0' with 'l-load continue_looping%0#0'
 debug: Inserted main_for_body@3.ops[6]: 'l-store-copy item#0 1'
diff --git a/test_cases/enumeration/puya_unoptimized.log b/test_cases/enumeration/puya_unoptimized.log
index c9bc0fa597..a74d919f28 100644
--- a/test_cases/enumeration/puya_unoptimized.log
+++ b/test_cases/enumeration/puya_unoptimized.log
@@ -953,7 +953,7 @@ debug: * to_do item_concat#0
 debug: * to_do iteration_count#0
 debug: * to_do item_index_internal%1#0
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to enumeration/out_unoptimized/EnumerationContract.ir/EnumerationContract.approval.0.approval.destructured.ir
+debug: Output IR to enumeration/out_unoptimized/EnumerationContract.ir/EnumerationContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.enumeration.contract.EnumerationContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.enumeration.contract.EnumerationContract.clear_state_program
@@ -971,7 +971,7 @@ debug: Coalescing local variables in test_cases.enumeration.contract.Enumeration
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.enumeration.contract.EnumerationContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to enumeration/out_unoptimized/EnumerationContract.ir/EnumerationContract.clear.0.clear.destructured.ir
+debug: Output IR to enumeration/out_unoptimized/EnumerationContract.ir/EnumerationContract.clear.0.destructured.ir
 debug: Inserted main.ops[6]: 'l-store-copy tuple_assignment%0#0 0'
 debug: Replaced main.ops[8]: 'v-load tuple_assignment%0#0' with 'l-load tuple_assignment%0#0'
 debug: Inserted main.ops[17]: 'l-store-copy tmp%0#0 0'
diff --git a/test_cases/everything/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir b/test_cases/everything/out/MyContract.ir/MyContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/everything/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir
rename to test_cases/everything/out/MyContract.ir/MyContract.approval.0.ssa.ir
diff --git a/test_cases/everything/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir b/test_cases/everything/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/everything/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir
rename to test_cases/everything/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
diff --git a/test_cases/everything/out/MyContract.ir/MyContract.approval.2.approval.ssa.opt.ir b/test_cases/everything/out/MyContract.ir/MyContract.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/everything/out/MyContract.ir/MyContract.approval.2.approval.ssa.opt.ir
rename to test_cases/everything/out/MyContract.ir/MyContract.approval.2.ssa.opt.ir
diff --git a/test_cases/everything/out/MyContract.ir/MyContract.approval.3.approval.ssa.opt.ir b/test_cases/everything/out/MyContract.ir/MyContract.approval.3.ssa.opt.ir
similarity index 100%
rename from test_cases/everything/out/MyContract.ir/MyContract.approval.3.approval.ssa.opt.ir
rename to test_cases/everything/out/MyContract.ir/MyContract.approval.3.ssa.opt.ir
diff --git a/test_cases/everything/out/MyContract.ir/MyContract.approval.4.approval.destructured.ir b/test_cases/everything/out/MyContract.ir/MyContract.approval.4.destructured.ir
similarity index 100%
rename from test_cases/everything/out/MyContract.ir/MyContract.approval.4.approval.destructured.ir
rename to test_cases/everything/out/MyContract.ir/MyContract.approval.4.destructured.ir
diff --git a/test_cases/everything/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir b/test_cases/everything/out/MyContract.ir/MyContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/everything/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir
rename to test_cases/everything/out/MyContract.ir/MyContract.clear.0.ssa.ir
diff --git a/test_cases/everything/out/MyContract.ir/MyContract.clear.1.clear.ssa.opt.ir b/test_cases/everything/out/MyContract.ir/MyContract.clear.1.ssa.opt.ir
similarity index 100%
rename from test_cases/everything/out/MyContract.ir/MyContract.clear.1.clear.ssa.opt.ir
rename to test_cases/everything/out/MyContract.ir/MyContract.clear.1.ssa.opt.ir
diff --git a/test_cases/everything/out/MyContract.ir/MyContract.clear.2.clear.ssa.opt.ir b/test_cases/everything/out/MyContract.ir/MyContract.clear.2.ssa.opt.ir
similarity index 100%
rename from test_cases/everything/out/MyContract.ir/MyContract.clear.2.clear.ssa.opt.ir
rename to test_cases/everything/out/MyContract.ir/MyContract.clear.2.ssa.opt.ir
diff --git a/test_cases/everything/out/MyContract.ir/MyContract.clear.3.clear.destructured.ir b/test_cases/everything/out/MyContract.ir/MyContract.clear.3.destructured.ir
similarity index 100%
rename from test_cases/everything/out/MyContract.ir/MyContract.clear.3.clear.destructured.ir
rename to test_cases/everything/out/MyContract.ir/MyContract.clear.3.destructured.ir
diff --git a/test_cases/everything/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir b/test_cases/everything/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/everything/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir
rename to test_cases/everything/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
diff --git a/test_cases/everything/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir b/test_cases/everything/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/everything/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir
rename to test_cases/everything/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
diff --git a/test_cases/everything/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir b/test_cases/everything/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/everything/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir
rename to test_cases/everything/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
diff --git a/test_cases/everything/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir b/test_cases/everything/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/everything/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir
rename to test_cases/everything/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
diff --git a/test_cases/everything/puya.log b/test_cases/everything/puya.log
index 21bc83c6f3..3e25e97e2d 100644
--- a/test_cases/everything/puya.log
+++ b/test_cases/everything/puya.log
@@ -493,7 +493,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to everything/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir
+debug: Output IR to everything/out/MyContract.ir/MyContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.everything.contract.Everything at level 1
 debug: Begin optimization pass 1/100
 debug: marking trivial method test_cases.everything.contract.Everything.__init__ as inlineable
@@ -842,7 +842,7 @@ debug: removing unused subroutine test_cases.everything.my_base.MyBase.remember_
 debug: removing unused subroutine test_cases.everything.my_base.multiplicative_identity
 debug: removing unused subroutine test_cases.everything.my_base.MyMiddleBase.calculate
 debug: removing unused subroutine test_cases.everything.contract.Everything._remove_sender
-debug: Output IR to everything/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to everything/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking trivial method test_cases.everything.contract.positive_one as inlineable
 debug: Optimizing subroutine test_cases.everything.contract.Everything.__algopy_entrypoint_with_init
@@ -994,7 +994,7 @@ debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.everything.contract.Everything.__puya_arc4_router__
 debug: removing unused subroutine test_cases.everything.contract.positive_one
-debug: Output IR to everything/out/MyContract.ir/MyContract.approval.2.approval.ssa.opt.ir
+debug: Output IR to everything/out/MyContract.ir/MyContract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: marking simple function test_cases.everything.contract.Everything._check_ban_list for inlining (complexity=3 <= threshold=3)
 debug: Optimizing subroutine test_cases.everything.contract.Everything.__algopy_entrypoint_with_init
@@ -1119,7 +1119,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.everything.contract.Everything._check_ban_list
-debug: Output IR to everything/out/MyContract.ir/MyContract.approval.3.approval.ssa.opt.ir
+debug: Output IR to everything/out/MyContract.ir/MyContract.approval.3.ssa.opt.ir
 debug: Begin optimization pass 4/100
 debug: Optimizing subroutine test_cases.everything.contract.Everything.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -1258,8 +1258,8 @@ debug: Coalescing local variables in test_cases.everything.contract.Everything.c
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.everything.contract.Everything.close_out
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to everything/out/MyContract.ir/MyContract.approval.4.approval.destructured.ir
-debug: Output IR to everything/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir
+debug: Output IR to everything/out/MyContract.ir/MyContract.approval.4.destructured.ir
+debug: Output IR to everything/out/MyContract.ir/MyContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.everything.contract.Everything at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.everything.contract.Everything._remove_sender for inlining
@@ -1319,7 +1319,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.everything.contract.Everything._remove_sender
-debug: Output IR to everything/out/MyContract.ir/MyContract.clear.1.clear.ssa.opt.ir
+debug: Output IR to everything/out/MyContract.ir/MyContract.clear.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking trivial method test_cases.everything.contract.positive_one as inlineable
 debug: Optimizing subroutine test_cases.everything.contract.Everything.clear_state_program
@@ -1358,7 +1358,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.everything.contract.positive_one
-debug: Output IR to everything/out/MyContract.ir/MyContract.clear.2.clear.ssa.opt.ir
+debug: Output IR to everything/out/MyContract.ir/MyContract.clear.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.everything.contract.Everything.clear_state_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -1383,7 +1383,7 @@ debug: Coalescing local variables in test_cases.everything.contract.Everything.c
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.everything.contract.Everything.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to everything/out/MyContract.ir/MyContract.clear.3.clear.destructured.ir
+debug: Output IR to everything/out/MyContract.ir/MyContract.clear.3.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#2 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#2' with 'l-load tmp%0#2'
 debug: Inserted main_abi_routing@4.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/everything/puya_O2.log b/test_cases/everything/puya_O2.log
index c05d4cde38..fd08ab3156 100644
--- a/test_cases/everything/puya_O2.log
+++ b/test_cases/everything/puya_O2.log
@@ -1235,7 +1235,7 @@ debug: Coalescing to_encode%0#0 with [to_encode%0#1]
 debug: Coalescing resulted in 40 replacement/s
 debug: Sequentializing parallel copies in test_cases.everything.contract.Everything.__algopy_entrypoint_with_init
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to everything/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir
+debug: Output IR to everything/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.everything.contract.Everything at level 2
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.everything.contract.Everything._remove_sender for inlining
@@ -1357,7 +1357,7 @@ debug: Coalescing local variables in test_cases.everything.contract.Everything.c
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.everything.contract.Everything.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to everything/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir
+debug: Output IR to everything/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#2 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#2' with 'l-load tmp%0#2'
 debug: Inserted main_abi_routing@4.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/everything/puya_unoptimized.log b/test_cases/everything/puya_unoptimized.log
index 9e27d2c30b..7f55aa7048 100644
--- a/test_cases/everything/puya_unoptimized.log
+++ b/test_cases/everything/puya_unoptimized.log
@@ -824,7 +824,7 @@ debug: Coalescing local variables in test_cases.everything.contract.positive_one
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.everything.contract.positive_one
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to everything/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir
+debug: Output IR to everything/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.everything.contract.Everything at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.everything.contract.Everything.clear_state_program
@@ -870,7 +870,7 @@ debug: Coalescing local variables in test_cases.everything.contract.positive_one
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.everything.contract.positive_one
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to everything/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir
+debug: Output IR to everything/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/group_side_effects/out/AppCall.ir/AppCall.approval.0.approval.ssa.ir b/test_cases/group_side_effects/out/AppCall.ir/AppCall.approval.0.ssa.ir
similarity index 100%
rename from test_cases/group_side_effects/out/AppCall.ir/AppCall.approval.0.approval.ssa.ir
rename to test_cases/group_side_effects/out/AppCall.ir/AppCall.approval.0.ssa.ir
diff --git a/test_cases/group_side_effects/out/AppCall.ir/AppCall.approval.1.approval.ssa.opt.ir b/test_cases/group_side_effects/out/AppCall.ir/AppCall.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/group_side_effects/out/AppCall.ir/AppCall.approval.1.approval.ssa.opt.ir
rename to test_cases/group_side_effects/out/AppCall.ir/AppCall.approval.1.ssa.opt.ir
diff --git a/test_cases/group_side_effects/out/AppCall.ir/AppCall.approval.2.approval.ssa.opt.ir b/test_cases/group_side_effects/out/AppCall.ir/AppCall.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/group_side_effects/out/AppCall.ir/AppCall.approval.2.approval.ssa.opt.ir
rename to test_cases/group_side_effects/out/AppCall.ir/AppCall.approval.2.ssa.opt.ir
diff --git a/test_cases/group_side_effects/out/AppCall.ir/AppCall.approval.3.approval.destructured.ir b/test_cases/group_side_effects/out/AppCall.ir/AppCall.approval.3.destructured.ir
similarity index 100%
rename from test_cases/group_side_effects/out/AppCall.ir/AppCall.approval.3.approval.destructured.ir
rename to test_cases/group_side_effects/out/AppCall.ir/AppCall.approval.3.destructured.ir
diff --git a/test_cases/group_side_effects/out/AppCall.ir/AppCall.clear.0.clear.ssa.ir b/test_cases/group_side_effects/out/AppCall.ir/AppCall.clear.0.ssa.ir
similarity index 100%
rename from test_cases/group_side_effects/out/AppCall.ir/AppCall.clear.0.clear.ssa.ir
rename to test_cases/group_side_effects/out/AppCall.ir/AppCall.clear.0.ssa.ir
diff --git a/test_cases/group_side_effects/out/AppCall.ir/AppCall.clear.1.clear.destructured.ir b/test_cases/group_side_effects/out/AppCall.ir/AppCall.clear.1.destructured.ir
similarity index 100%
rename from test_cases/group_side_effects/out/AppCall.ir/AppCall.clear.1.clear.destructured.ir
rename to test_cases/group_side_effects/out/AppCall.ir/AppCall.clear.1.destructured.ir
diff --git a/test_cases/group_side_effects/out/AppExpectingEffects.ir/AppExpectingEffects.approval.0.approval.ssa.ir b/test_cases/group_side_effects/out/AppExpectingEffects.ir/AppExpectingEffects.approval.0.ssa.ir
similarity index 100%
rename from test_cases/group_side_effects/out/AppExpectingEffects.ir/AppExpectingEffects.approval.0.approval.ssa.ir
rename to test_cases/group_side_effects/out/AppExpectingEffects.ir/AppExpectingEffects.approval.0.ssa.ir
diff --git a/test_cases/group_side_effects/out/AppExpectingEffects.ir/AppExpectingEffects.approval.1.approval.ssa.opt.ir b/test_cases/group_side_effects/out/AppExpectingEffects.ir/AppExpectingEffects.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/group_side_effects/out/AppExpectingEffects.ir/AppExpectingEffects.approval.1.approval.ssa.opt.ir
rename to test_cases/group_side_effects/out/AppExpectingEffects.ir/AppExpectingEffects.approval.1.ssa.opt.ir
diff --git a/test_cases/group_side_effects/out/AppExpectingEffects.ir/AppExpectingEffects.approval.2.approval.ssa.opt.ir b/test_cases/group_side_effects/out/AppExpectingEffects.ir/AppExpectingEffects.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/group_side_effects/out/AppExpectingEffects.ir/AppExpectingEffects.approval.2.approval.ssa.opt.ir
rename to test_cases/group_side_effects/out/AppExpectingEffects.ir/AppExpectingEffects.approval.2.ssa.opt.ir
diff --git a/test_cases/group_side_effects/out/AppExpectingEffects.ir/AppExpectingEffects.approval.3.approval.destructured.ir b/test_cases/group_side_effects/out/AppExpectingEffects.ir/AppExpectingEffects.approval.3.destructured.ir
similarity index 100%
rename from test_cases/group_side_effects/out/AppExpectingEffects.ir/AppExpectingEffects.approval.3.approval.destructured.ir
rename to test_cases/group_side_effects/out/AppExpectingEffects.ir/AppExpectingEffects.approval.3.destructured.ir
diff --git a/test_cases/group_side_effects/out/AppExpectingEffects.ir/AppExpectingEffects.clear.0.clear.ssa.ir b/test_cases/group_side_effects/out/AppExpectingEffects.ir/AppExpectingEffects.clear.0.ssa.ir
similarity index 100%
rename from test_cases/group_side_effects/out/AppExpectingEffects.ir/AppExpectingEffects.clear.0.clear.ssa.ir
rename to test_cases/group_side_effects/out/AppExpectingEffects.ir/AppExpectingEffects.clear.0.ssa.ir
diff --git a/test_cases/group_side_effects/out/AppExpectingEffects.ir/AppExpectingEffects.clear.1.clear.destructured.ir b/test_cases/group_side_effects/out/AppExpectingEffects.ir/AppExpectingEffects.clear.1.destructured.ir
similarity index 100%
rename from test_cases/group_side_effects/out/AppExpectingEffects.ir/AppExpectingEffects.clear.1.clear.destructured.ir
rename to test_cases/group_side_effects/out/AppExpectingEffects.ir/AppExpectingEffects.clear.1.destructured.ir
diff --git a/test_cases/group_side_effects/out_O2/AppCall.ir/AppCall.approval.0.approval.destructured.ir b/test_cases/group_side_effects/out_O2/AppCall.ir/AppCall.approval.0.destructured.ir
similarity index 100%
rename from test_cases/group_side_effects/out_O2/AppCall.ir/AppCall.approval.0.approval.destructured.ir
rename to test_cases/group_side_effects/out_O2/AppCall.ir/AppCall.approval.0.destructured.ir
diff --git a/test_cases/group_side_effects/out_O2/AppCall.ir/AppCall.clear.0.clear.destructured.ir b/test_cases/group_side_effects/out_O2/AppCall.ir/AppCall.clear.0.destructured.ir
similarity index 100%
rename from test_cases/group_side_effects/out_O2/AppCall.ir/AppCall.clear.0.clear.destructured.ir
rename to test_cases/group_side_effects/out_O2/AppCall.ir/AppCall.clear.0.destructured.ir
diff --git a/test_cases/group_side_effects/out_O2/AppExpectingEffects.ir/AppExpectingEffects.approval.0.approval.destructured.ir b/test_cases/group_side_effects/out_O2/AppExpectingEffects.ir/AppExpectingEffects.approval.0.destructured.ir
similarity index 100%
rename from test_cases/group_side_effects/out_O2/AppExpectingEffects.ir/AppExpectingEffects.approval.0.approval.destructured.ir
rename to test_cases/group_side_effects/out_O2/AppExpectingEffects.ir/AppExpectingEffects.approval.0.destructured.ir
diff --git a/test_cases/group_side_effects/out_O2/AppExpectingEffects.ir/AppExpectingEffects.clear.0.clear.destructured.ir b/test_cases/group_side_effects/out_O2/AppExpectingEffects.ir/AppExpectingEffects.clear.0.destructured.ir
similarity index 100%
rename from test_cases/group_side_effects/out_O2/AppExpectingEffects.ir/AppExpectingEffects.clear.0.clear.destructured.ir
rename to test_cases/group_side_effects/out_O2/AppExpectingEffects.ir/AppExpectingEffects.clear.0.destructured.ir
diff --git a/test_cases/group_side_effects/out_unoptimized/AppCall.ir/AppCall.approval.0.approval.destructured.ir b/test_cases/group_side_effects/out_unoptimized/AppCall.ir/AppCall.approval.0.destructured.ir
similarity index 100%
rename from test_cases/group_side_effects/out_unoptimized/AppCall.ir/AppCall.approval.0.approval.destructured.ir
rename to test_cases/group_side_effects/out_unoptimized/AppCall.ir/AppCall.approval.0.destructured.ir
diff --git a/test_cases/group_side_effects/out_unoptimized/AppCall.ir/AppCall.clear.0.clear.destructured.ir b/test_cases/group_side_effects/out_unoptimized/AppCall.ir/AppCall.clear.0.destructured.ir
similarity index 100%
rename from test_cases/group_side_effects/out_unoptimized/AppCall.ir/AppCall.clear.0.clear.destructured.ir
rename to test_cases/group_side_effects/out_unoptimized/AppCall.ir/AppCall.clear.0.destructured.ir
diff --git a/test_cases/group_side_effects/out_unoptimized/AppExpectingEffects.ir/AppExpectingEffects.approval.0.approval.destructured.ir b/test_cases/group_side_effects/out_unoptimized/AppExpectingEffects.ir/AppExpectingEffects.approval.0.destructured.ir
similarity index 100%
rename from test_cases/group_side_effects/out_unoptimized/AppExpectingEffects.ir/AppExpectingEffects.approval.0.approval.destructured.ir
rename to test_cases/group_side_effects/out_unoptimized/AppExpectingEffects.ir/AppExpectingEffects.approval.0.destructured.ir
diff --git a/test_cases/group_side_effects/out_unoptimized/AppExpectingEffects.ir/AppExpectingEffects.clear.0.clear.destructured.ir b/test_cases/group_side_effects/out_unoptimized/AppExpectingEffects.ir/AppExpectingEffects.clear.0.destructured.ir
similarity index 100%
rename from test_cases/group_side_effects/out_unoptimized/AppExpectingEffects.ir/AppExpectingEffects.clear.0.clear.destructured.ir
rename to test_cases/group_side_effects/out_unoptimized/AppExpectingEffects.ir/AppExpectingEffects.clear.0.destructured.ir
diff --git a/test_cases/group_side_effects/puya.log b/test_cases/group_side_effects/puya.log
index d7df0b74a2..0385a955df 100644
--- a/test_cases/group_side_effects/puya.log
+++ b/test_cases/group_side_effects/puya.log
@@ -491,7 +491,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to group_side_effects/out/AppCall.ir/AppCall.approval.0.approval.ssa.ir
+debug: Output IR to group_side_effects/out/AppCall.ir/AppCall.approval.0.ssa.ir
 info: optimizing approval program of test_cases.group_side_effects.other.AppCall at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
@@ -591,7 +591,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.group_side_effects.other.AppCall.__puya_arc4_router__
-debug: Output IR to group_side_effects/out/AppCall.ir/AppCall.approval.1.approval.ssa.opt.ir
+debug: Output IR to group_side_effects/out/AppCall.ir/AppCall.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -644,7 +644,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.group_side_effects.other.AppCall.__algopy_default_create
-debug: Output IR to group_side_effects/out/AppCall.ir/AppCall.approval.2.approval.ssa.opt.ir
+debug: Output IR to group_side_effects/out/AppCall.ir/AppCall.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -693,8 +693,8 @@ debug: Coalescing local variables in test_cases.group_side_effects.other.AppCall
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.group_side_effects.other.AppCall.some_value
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to group_side_effects/out/AppCall.ir/AppCall.approval.3.approval.destructured.ir
-debug: Output IR to group_side_effects/out/AppCall.ir/AppCall.clear.0.clear.ssa.ir
+debug: Output IR to group_side_effects/out/AppCall.ir/AppCall.approval.3.destructured.ir
+debug: Output IR to group_side_effects/out/AppCall.ir/AppCall.clear.0.ssa.ir
 info: optimizing clear program of test_cases.group_side_effects.other.AppCall at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -720,7 +720,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to group_side_effects/out/AppCall.ir/AppCall.clear.1.clear.destructured.ir
+debug: Output IR to group_side_effects/out/AppCall.ir/AppCall.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
@@ -771,7 +771,7 @@ debug: inlining single reference block main___algopy_default_create@7 into main_
 debug: removing explicit jump to fall-through block main_after_if_else@10
 group_side_effects/other.py:5 debug: optimizing TEAL subroutine test_cases.group_side_effects.other.AppCall.some_value() -> uint64:
 debug: optimizing TEAL subroutine algopy.arc4.ARC4Contract.clear_state_program() -> uint64:
-debug: Output IR to group_side_effects/out/AppExpectingEffects.ir/AppExpectingEffects.approval.0.approval.ssa.ir
+debug: Output IR to group_side_effects/out/AppExpectingEffects.ir/AppExpectingEffects.approval.0.ssa.ir
 info: optimizing approval program of test_cases.group_side_effects.contract.AppExpectingEffects at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
@@ -909,7 +909,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.group_side_effects.contract.AppExpectingEffects.__puya_arc4_router__
-debug: Output IR to group_side_effects/out/AppExpectingEffects.ir/AppExpectingEffects.approval.1.approval.ssa.opt.ir
+debug: Output IR to group_side_effects/out/AppExpectingEffects.ir/AppExpectingEffects.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -977,7 +977,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.group_side_effects.contract.AppExpectingEffects.__algopy_default_create
-debug: Output IR to group_side_effects/out/AppExpectingEffects.ir/AppExpectingEffects.approval.2.approval.ssa.opt.ir
+debug: Output IR to group_side_effects/out/AppExpectingEffects.ir/AppExpectingEffects.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -1048,8 +1048,8 @@ debug: Coalescing local variables in test_cases.group_side_effects.contract.AppE
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.group_side_effects.contract.AppExpectingEffects.log_group
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to group_side_effects/out/AppExpectingEffects.ir/AppExpectingEffects.approval.3.approval.destructured.ir
-debug: Output IR to group_side_effects/out/AppExpectingEffects.ir/AppExpectingEffects.clear.0.clear.ssa.ir
+debug: Output IR to group_side_effects/out/AppExpectingEffects.ir/AppExpectingEffects.approval.3.destructured.ir
+debug: Output IR to group_side_effects/out/AppExpectingEffects.ir/AppExpectingEffects.clear.0.ssa.ir
 info: optimizing clear program of test_cases.group_side_effects.contract.AppExpectingEffects at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -1075,7 +1075,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to group_side_effects/out/AppExpectingEffects.ir/AppExpectingEffects.clear.1.clear.destructured.ir
+debug: Output IR to group_side_effects/out/AppExpectingEffects.ir/AppExpectingEffects.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/group_side_effects/puya_O2.log b/test_cases/group_side_effects/puya_O2.log
index bd81461ea6..b93f9abe9b 100644
--- a/test_cases/group_side_effects/puya_O2.log
+++ b/test_cases/group_side_effects/puya_O2.log
@@ -685,7 +685,7 @@ debug: Coalescing tmp%0#0 with [tmp%0#3]
 debug: Coalescing resulted in 12 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to group_side_effects/out_O2/AppCall.ir/AppCall.approval.0.approval.destructured.ir
+debug: Output IR to group_side_effects/out_O2/AppCall.ir/AppCall.approval.0.destructured.ir
 info: optimizing clear program of test_cases.group_side_effects.other.AppCall at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -711,7 +711,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to group_side_effects/out_O2/AppCall.ir/AppCall.clear.0.clear.destructured.ir
+debug: Output IR to group_side_effects/out_O2/AppCall.ir/AppCall.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
@@ -1043,7 +1043,7 @@ debug: Coalescing tmp%10#0 with [tmp%10#1]
 debug: Coalescing resulted in 31 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to group_side_effects/out_O2/AppExpectingEffects.ir/AppExpectingEffects.approval.0.approval.destructured.ir
+debug: Output IR to group_side_effects/out_O2/AppExpectingEffects.ir/AppExpectingEffects.approval.0.destructured.ir
 info: optimizing clear program of test_cases.group_side_effects.contract.AppExpectingEffects at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -1069,7 +1069,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to group_side_effects/out_O2/AppExpectingEffects.ir/AppExpectingEffects.clear.0.clear.destructured.ir
+debug: Output IR to group_side_effects/out_O2/AppExpectingEffects.ir/AppExpectingEffects.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/group_side_effects/puya_unoptimized.log b/test_cases/group_side_effects/puya_unoptimized.log
index 4ca3ab631d..ab420268d1 100644
--- a/test_cases/group_side_effects/puya_unoptimized.log
+++ b/test_cases/group_side_effects/puya_unoptimized.log
@@ -579,7 +579,7 @@ debug: Coalescing local variables in test_cases.group_side_effects.other.AppCall
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.group_side_effects.other.AppCall.some_value
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to group_side_effects/out_unoptimized/AppCall.ir/AppCall.approval.0.approval.destructured.ir
+debug: Output IR to group_side_effects/out_unoptimized/AppCall.ir/AppCall.approval.0.destructured.ir
 info: optimizing clear program of test_cases.group_side_effects.other.AppCall at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -597,7 +597,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to group_side_effects/out_unoptimized/AppCall.ir/AppCall.clear.0.clear.destructured.ir
+debug: Output IR to group_side_effects/out_unoptimized/AppCall.ir/AppCall.clear.0.destructured.ir
 debug: Inserted main_block@1.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main_block@1.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_block@1.ops[6]: 'l-store-copy tmp%1#0 0'
@@ -777,7 +777,7 @@ debug: Coalescing local variables in test_cases.group_side_effects.contract.AppE
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.group_side_effects.contract.AppExpectingEffects.log_group
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to group_side_effects/out_unoptimized/AppExpectingEffects.ir/AppExpectingEffects.approval.0.approval.destructured.ir
+debug: Output IR to group_side_effects/out_unoptimized/AppExpectingEffects.ir/AppExpectingEffects.approval.0.destructured.ir
 info: optimizing clear program of test_cases.group_side_effects.contract.AppExpectingEffects at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -795,7 +795,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to group_side_effects/out_unoptimized/AppExpectingEffects.ir/AppExpectingEffects.clear.0.clear.destructured.ir
+debug: Output IR to group_side_effects/out_unoptimized/AppExpectingEffects.ir/AppExpectingEffects.clear.0.destructured.ir
 debug: Inserted main_block@1.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main_block@1.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_block@1.ops[6]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/inheritance/out/ChildContract.ir/ChildContract.approval.0.approval.ssa.ir b/test_cases/inheritance/out/ChildContract.ir/ChildContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/inheritance/out/ChildContract.ir/ChildContract.approval.0.approval.ssa.ir
rename to test_cases/inheritance/out/ChildContract.ir/ChildContract.approval.0.ssa.ir
diff --git a/test_cases/inheritance/out/ChildContract.ir/ChildContract.approval.1.approval.ssa.opt.ir b/test_cases/inheritance/out/ChildContract.ir/ChildContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/inheritance/out/ChildContract.ir/ChildContract.approval.1.approval.ssa.opt.ir
rename to test_cases/inheritance/out/ChildContract.ir/ChildContract.approval.1.ssa.opt.ir
diff --git a/test_cases/inheritance/out/ChildContract.ir/ChildContract.approval.2.approval.ssa.opt.ir b/test_cases/inheritance/out/ChildContract.ir/ChildContract.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/inheritance/out/ChildContract.ir/ChildContract.approval.2.approval.ssa.opt.ir
rename to test_cases/inheritance/out/ChildContract.ir/ChildContract.approval.2.ssa.opt.ir
diff --git a/test_cases/inheritance/out/ChildContract.ir/ChildContract.approval.3.approval.destructured.ir b/test_cases/inheritance/out/ChildContract.ir/ChildContract.approval.3.destructured.ir
similarity index 100%
rename from test_cases/inheritance/out/ChildContract.ir/ChildContract.approval.3.approval.destructured.ir
rename to test_cases/inheritance/out/ChildContract.ir/ChildContract.approval.3.destructured.ir
diff --git a/test_cases/inheritance/out/ChildContract.ir/ChildContract.clear.0.clear.ssa.ir b/test_cases/inheritance/out/ChildContract.ir/ChildContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/inheritance/out/ChildContract.ir/ChildContract.clear.0.clear.ssa.ir
rename to test_cases/inheritance/out/ChildContract.ir/ChildContract.clear.0.ssa.ir
diff --git a/test_cases/inheritance/out/ChildContract.ir/ChildContract.clear.1.clear.destructured.ir b/test_cases/inheritance/out/ChildContract.ir/ChildContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/inheritance/out/ChildContract.ir/ChildContract.clear.1.clear.destructured.ir
rename to test_cases/inheritance/out/ChildContract.ir/ChildContract.clear.1.destructured.ir
diff --git a/test_cases/inheritance/out/GrandParentContract.ir/GrandParentContract.approval.0.approval.ssa.ir b/test_cases/inheritance/out/GrandParentContract.ir/GrandParentContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/inheritance/out/GrandParentContract.ir/GrandParentContract.approval.0.approval.ssa.ir
rename to test_cases/inheritance/out/GrandParentContract.ir/GrandParentContract.approval.0.ssa.ir
diff --git a/test_cases/inheritance/out/GrandParentContract.ir/GrandParentContract.approval.1.approval.ssa.opt.ir b/test_cases/inheritance/out/GrandParentContract.ir/GrandParentContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/inheritance/out/GrandParentContract.ir/GrandParentContract.approval.1.approval.ssa.opt.ir
rename to test_cases/inheritance/out/GrandParentContract.ir/GrandParentContract.approval.1.ssa.opt.ir
diff --git a/test_cases/inheritance/out/GrandParentContract.ir/GrandParentContract.approval.2.approval.destructured.ir b/test_cases/inheritance/out/GrandParentContract.ir/GrandParentContract.approval.2.destructured.ir
similarity index 100%
rename from test_cases/inheritance/out/GrandParentContract.ir/GrandParentContract.approval.2.approval.destructured.ir
rename to test_cases/inheritance/out/GrandParentContract.ir/GrandParentContract.approval.2.destructured.ir
diff --git a/test_cases/inheritance/out/GrandParentContract.ir/GrandParentContract.clear.0.clear.ssa.ir b/test_cases/inheritance/out/GrandParentContract.ir/GrandParentContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/inheritance/out/GrandParentContract.ir/GrandParentContract.clear.0.clear.ssa.ir
rename to test_cases/inheritance/out/GrandParentContract.ir/GrandParentContract.clear.0.ssa.ir
diff --git a/test_cases/inheritance/out/GrandParentContract.ir/GrandParentContract.clear.1.clear.destructured.ir b/test_cases/inheritance/out/GrandParentContract.ir/GrandParentContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/inheritance/out/GrandParentContract.ir/GrandParentContract.clear.1.clear.destructured.ir
rename to test_cases/inheritance/out/GrandParentContract.ir/GrandParentContract.clear.1.destructured.ir
diff --git a/test_cases/inheritance/out/GreatGrandParentContract.ir/GreatGrandParentContract.approval.0.approval.ssa.ir b/test_cases/inheritance/out/GreatGrandParentContract.ir/GreatGrandParentContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/inheritance/out/GreatGrandParentContract.ir/GreatGrandParentContract.approval.0.approval.ssa.ir
rename to test_cases/inheritance/out/GreatGrandParentContract.ir/GreatGrandParentContract.approval.0.ssa.ir
diff --git a/test_cases/inheritance/out/GreatGrandParentContract.ir/GreatGrandParentContract.approval.1.approval.ssa.opt.ir b/test_cases/inheritance/out/GreatGrandParentContract.ir/GreatGrandParentContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/inheritance/out/GreatGrandParentContract.ir/GreatGrandParentContract.approval.1.approval.ssa.opt.ir
rename to test_cases/inheritance/out/GreatGrandParentContract.ir/GreatGrandParentContract.approval.1.ssa.opt.ir
diff --git a/test_cases/inheritance/out/GreatGrandParentContract.ir/GreatGrandParentContract.approval.2.approval.destructured.ir b/test_cases/inheritance/out/GreatGrandParentContract.ir/GreatGrandParentContract.approval.2.destructured.ir
similarity index 100%
rename from test_cases/inheritance/out/GreatGrandParentContract.ir/GreatGrandParentContract.approval.2.approval.destructured.ir
rename to test_cases/inheritance/out/GreatGrandParentContract.ir/GreatGrandParentContract.approval.2.destructured.ir
diff --git a/test_cases/inheritance/out/GreatGrandParentContract.ir/GreatGrandParentContract.clear.0.clear.ssa.ir b/test_cases/inheritance/out/GreatGrandParentContract.ir/GreatGrandParentContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/inheritance/out/GreatGrandParentContract.ir/GreatGrandParentContract.clear.0.clear.ssa.ir
rename to test_cases/inheritance/out/GreatGrandParentContract.ir/GreatGrandParentContract.clear.0.ssa.ir
diff --git a/test_cases/inheritance/out/GreatGrandParentContract.ir/GreatGrandParentContract.clear.1.clear.destructured.ir b/test_cases/inheritance/out/GreatGrandParentContract.ir/GreatGrandParentContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/inheritance/out/GreatGrandParentContract.ir/GreatGrandParentContract.clear.1.clear.destructured.ir
rename to test_cases/inheritance/out/GreatGrandParentContract.ir/GreatGrandParentContract.clear.1.destructured.ir
diff --git a/test_cases/inheritance/out/ParentContract.ir/ParentContract.approval.0.approval.ssa.ir b/test_cases/inheritance/out/ParentContract.ir/ParentContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/inheritance/out/ParentContract.ir/ParentContract.approval.0.approval.ssa.ir
rename to test_cases/inheritance/out/ParentContract.ir/ParentContract.approval.0.ssa.ir
diff --git a/test_cases/inheritance/out/ParentContract.ir/ParentContract.approval.1.approval.ssa.opt.ir b/test_cases/inheritance/out/ParentContract.ir/ParentContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/inheritance/out/ParentContract.ir/ParentContract.approval.1.approval.ssa.opt.ir
rename to test_cases/inheritance/out/ParentContract.ir/ParentContract.approval.1.ssa.opt.ir
diff --git a/test_cases/inheritance/out/ParentContract.ir/ParentContract.approval.2.approval.ssa.opt.ir b/test_cases/inheritance/out/ParentContract.ir/ParentContract.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/inheritance/out/ParentContract.ir/ParentContract.approval.2.approval.ssa.opt.ir
rename to test_cases/inheritance/out/ParentContract.ir/ParentContract.approval.2.ssa.opt.ir
diff --git a/test_cases/inheritance/out/ParentContract.ir/ParentContract.approval.3.approval.destructured.ir b/test_cases/inheritance/out/ParentContract.ir/ParentContract.approval.3.destructured.ir
similarity index 100%
rename from test_cases/inheritance/out/ParentContract.ir/ParentContract.approval.3.approval.destructured.ir
rename to test_cases/inheritance/out/ParentContract.ir/ParentContract.approval.3.destructured.ir
diff --git a/test_cases/inheritance/out/ParentContract.ir/ParentContract.clear.0.clear.ssa.ir b/test_cases/inheritance/out/ParentContract.ir/ParentContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/inheritance/out/ParentContract.ir/ParentContract.clear.0.clear.ssa.ir
rename to test_cases/inheritance/out/ParentContract.ir/ParentContract.clear.0.ssa.ir
diff --git a/test_cases/inheritance/out/ParentContract.ir/ParentContract.clear.1.clear.destructured.ir b/test_cases/inheritance/out/ParentContract.ir/ParentContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/inheritance/out/ParentContract.ir/ParentContract.clear.1.clear.destructured.ir
rename to test_cases/inheritance/out/ParentContract.ir/ParentContract.clear.1.destructured.ir
diff --git a/test_cases/inheritance/out_O2/ChildContract.ir/ChildContract.approval.0.approval.destructured.ir b/test_cases/inheritance/out_O2/ChildContract.ir/ChildContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/inheritance/out_O2/ChildContract.ir/ChildContract.approval.0.approval.destructured.ir
rename to test_cases/inheritance/out_O2/ChildContract.ir/ChildContract.approval.0.destructured.ir
diff --git a/test_cases/inheritance/out_O2/ChildContract.ir/ChildContract.clear.0.clear.destructured.ir b/test_cases/inheritance/out_O2/ChildContract.ir/ChildContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/inheritance/out_O2/ChildContract.ir/ChildContract.clear.0.clear.destructured.ir
rename to test_cases/inheritance/out_O2/ChildContract.ir/ChildContract.clear.0.destructured.ir
diff --git a/test_cases/inheritance/out_O2/GrandParentContract.ir/GrandParentContract.approval.0.approval.destructured.ir b/test_cases/inheritance/out_O2/GrandParentContract.ir/GrandParentContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/inheritance/out_O2/GrandParentContract.ir/GrandParentContract.approval.0.approval.destructured.ir
rename to test_cases/inheritance/out_O2/GrandParentContract.ir/GrandParentContract.approval.0.destructured.ir
diff --git a/test_cases/inheritance/out_O2/GrandParentContract.ir/GrandParentContract.clear.0.clear.destructured.ir b/test_cases/inheritance/out_O2/GrandParentContract.ir/GrandParentContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/inheritance/out_O2/GrandParentContract.ir/GrandParentContract.clear.0.clear.destructured.ir
rename to test_cases/inheritance/out_O2/GrandParentContract.ir/GrandParentContract.clear.0.destructured.ir
diff --git a/test_cases/inheritance/out_O2/GreatGrandParentContract.ir/GreatGrandParentContract.approval.0.approval.destructured.ir b/test_cases/inheritance/out_O2/GreatGrandParentContract.ir/GreatGrandParentContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/inheritance/out_O2/GreatGrandParentContract.ir/GreatGrandParentContract.approval.0.approval.destructured.ir
rename to test_cases/inheritance/out_O2/GreatGrandParentContract.ir/GreatGrandParentContract.approval.0.destructured.ir
diff --git a/test_cases/inheritance/out_O2/GreatGrandParentContract.ir/GreatGrandParentContract.clear.0.clear.destructured.ir b/test_cases/inheritance/out_O2/GreatGrandParentContract.ir/GreatGrandParentContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/inheritance/out_O2/GreatGrandParentContract.ir/GreatGrandParentContract.clear.0.clear.destructured.ir
rename to test_cases/inheritance/out_O2/GreatGrandParentContract.ir/GreatGrandParentContract.clear.0.destructured.ir
diff --git a/test_cases/inheritance/out_O2/ParentContract.ir/ParentContract.approval.0.approval.destructured.ir b/test_cases/inheritance/out_O2/ParentContract.ir/ParentContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/inheritance/out_O2/ParentContract.ir/ParentContract.approval.0.approval.destructured.ir
rename to test_cases/inheritance/out_O2/ParentContract.ir/ParentContract.approval.0.destructured.ir
diff --git a/test_cases/inheritance/out_O2/ParentContract.ir/ParentContract.clear.0.clear.destructured.ir b/test_cases/inheritance/out_O2/ParentContract.ir/ParentContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/inheritance/out_O2/ParentContract.ir/ParentContract.clear.0.clear.destructured.ir
rename to test_cases/inheritance/out_O2/ParentContract.ir/ParentContract.clear.0.destructured.ir
diff --git a/test_cases/inheritance/out_unoptimized/ChildContract.ir/ChildContract.approval.0.approval.destructured.ir b/test_cases/inheritance/out_unoptimized/ChildContract.ir/ChildContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/inheritance/out_unoptimized/ChildContract.ir/ChildContract.approval.0.approval.destructured.ir
rename to test_cases/inheritance/out_unoptimized/ChildContract.ir/ChildContract.approval.0.destructured.ir
diff --git a/test_cases/inheritance/out_unoptimized/ChildContract.ir/ChildContract.clear.0.clear.destructured.ir b/test_cases/inheritance/out_unoptimized/ChildContract.ir/ChildContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/inheritance/out_unoptimized/ChildContract.ir/ChildContract.clear.0.clear.destructured.ir
rename to test_cases/inheritance/out_unoptimized/ChildContract.ir/ChildContract.clear.0.destructured.ir
diff --git a/test_cases/inheritance/out_unoptimized/GrandParentContract.ir/GrandParentContract.approval.0.approval.destructured.ir b/test_cases/inheritance/out_unoptimized/GrandParentContract.ir/GrandParentContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/inheritance/out_unoptimized/GrandParentContract.ir/GrandParentContract.approval.0.approval.destructured.ir
rename to test_cases/inheritance/out_unoptimized/GrandParentContract.ir/GrandParentContract.approval.0.destructured.ir
diff --git a/test_cases/inheritance/out_unoptimized/GrandParentContract.ir/GrandParentContract.clear.0.clear.destructured.ir b/test_cases/inheritance/out_unoptimized/GrandParentContract.ir/GrandParentContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/inheritance/out_unoptimized/GrandParentContract.ir/GrandParentContract.clear.0.clear.destructured.ir
rename to test_cases/inheritance/out_unoptimized/GrandParentContract.ir/GrandParentContract.clear.0.destructured.ir
diff --git a/test_cases/inheritance/out_unoptimized/GreatGrandParentContract.ir/GreatGrandParentContract.approval.0.approval.destructured.ir b/test_cases/inheritance/out_unoptimized/GreatGrandParentContract.ir/GreatGrandParentContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/inheritance/out_unoptimized/GreatGrandParentContract.ir/GreatGrandParentContract.approval.0.approval.destructured.ir
rename to test_cases/inheritance/out_unoptimized/GreatGrandParentContract.ir/GreatGrandParentContract.approval.0.destructured.ir
diff --git a/test_cases/inheritance/out_unoptimized/GreatGrandParentContract.ir/GreatGrandParentContract.clear.0.clear.destructured.ir b/test_cases/inheritance/out_unoptimized/GreatGrandParentContract.ir/GreatGrandParentContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/inheritance/out_unoptimized/GreatGrandParentContract.ir/GreatGrandParentContract.clear.0.clear.destructured.ir
rename to test_cases/inheritance/out_unoptimized/GreatGrandParentContract.ir/GreatGrandParentContract.clear.0.destructured.ir
diff --git a/test_cases/inheritance/out_unoptimized/ParentContract.ir/ParentContract.approval.0.approval.destructured.ir b/test_cases/inheritance/out_unoptimized/ParentContract.ir/ParentContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/inheritance/out_unoptimized/ParentContract.ir/ParentContract.approval.0.approval.destructured.ir
rename to test_cases/inheritance/out_unoptimized/ParentContract.ir/ParentContract.approval.0.destructured.ir
diff --git a/test_cases/inheritance/out_unoptimized/ParentContract.ir/ParentContract.clear.0.clear.destructured.ir b/test_cases/inheritance/out_unoptimized/ParentContract.ir/ParentContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/inheritance/out_unoptimized/ParentContract.ir/ParentContract.clear.0.clear.destructured.ir
rename to test_cases/inheritance/out_unoptimized/ParentContract.ir/ParentContract.clear.0.destructured.ir
diff --git a/test_cases/inheritance/puya.log b/test_cases/inheritance/puya.log
index ed82a1ffe1..ff6783311e 100644
--- a/test_cases/inheritance/puya.log
+++ b/test_cases/inheritance/puya.log
@@ -554,7 +554,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to inheritance/out/GreatGrandParentContract.ir/GreatGrandParentContract.approval.0.approval.ssa.ir
+debug: Output IR to inheritance/out/GreatGrandParentContract.ir/GreatGrandParentContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.inheritance.grandparent.GreatGrandParentContract at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.inheritance.grandparent.GreatGrandParentContract.method for inlining
@@ -594,7 +594,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.inheritance.grandparent.GreatGrandParentContract.method
-debug: Output IR to inheritance/out/GreatGrandParentContract.ir/GreatGrandParentContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to inheritance/out/GreatGrandParentContract.ir/GreatGrandParentContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.inheritance.grandparent.GreatGrandParentContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -619,8 +619,8 @@ debug: Coalescing local variables in test_cases.inheritance.grandparent.GreatGra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inheritance.grandparent.GreatGrandParentContract.approval_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to inheritance/out/GreatGrandParentContract.ir/GreatGrandParentContract.approval.2.approval.destructured.ir
-debug: Output IR to inheritance/out/GreatGrandParentContract.ir/GreatGrandParentContract.clear.0.clear.ssa.ir
+debug: Output IR to inheritance/out/GreatGrandParentContract.ir/GreatGrandParentContract.approval.2.destructured.ir
+debug: Output IR to inheritance/out/GreatGrandParentContract.ir/GreatGrandParentContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.inheritance.grandparent.GreatGrandParentContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.inheritance.grandparent.GreatGrandParentContract.clear_state_program
@@ -646,10 +646,10 @@ debug: Coalescing local variables in test_cases.inheritance.grandparent.GreatGra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inheritance.grandparent.GreatGrandParentContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to inheritance/out/GreatGrandParentContract.ir/GreatGrandParentContract.clear.1.clear.destructured.ir
+debug: Output IR to inheritance/out/GreatGrandParentContract.ir/GreatGrandParentContract.clear.1.destructured.ir
 inheritance/grandparent.py:5 debug: optimizing TEAL subroutine test_cases.inheritance.grandparent.GreatGrandParentContract.approval_program() -> uint64:
 inheritance/grandparent.py:8 debug: optimizing TEAL subroutine test_cases.inheritance.grandparent.GreatGrandParentContract.clear_state_program() -> uint64:
-debug: Output IR to inheritance/out/GrandParentContract.ir/GrandParentContract.approval.0.approval.ssa.ir
+debug: Output IR to inheritance/out/GrandParentContract.ir/GrandParentContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.inheritance.grandparent.GrandParentContract at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.inheritance.grandparent.GreatGrandParentContract.method for inlining
@@ -689,7 +689,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.inheritance.grandparent.GreatGrandParentContract.method
-debug: Output IR to inheritance/out/GrandParentContract.ir/GrandParentContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to inheritance/out/GrandParentContract.ir/GrandParentContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.inheritance.grandparent.GreatGrandParentContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -714,8 +714,8 @@ debug: Coalescing local variables in test_cases.inheritance.grandparent.GreatGra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inheritance.grandparent.GreatGrandParentContract.approval_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to inheritance/out/GrandParentContract.ir/GrandParentContract.approval.2.approval.destructured.ir
-debug: Output IR to inheritance/out/GrandParentContract.ir/GrandParentContract.clear.0.clear.ssa.ir
+debug: Output IR to inheritance/out/GrandParentContract.ir/GrandParentContract.approval.2.destructured.ir
+debug: Output IR to inheritance/out/GrandParentContract.ir/GrandParentContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.inheritance.grandparent.GrandParentContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.inheritance.grandparent.GreatGrandParentContract.clear_state_program
@@ -741,10 +741,10 @@ debug: Coalescing local variables in test_cases.inheritance.grandparent.GreatGra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inheritance.grandparent.GreatGrandParentContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to inheritance/out/GrandParentContract.ir/GrandParentContract.clear.1.clear.destructured.ir
+debug: Output IR to inheritance/out/GrandParentContract.ir/GrandParentContract.clear.1.destructured.ir
 inheritance/grandparent.py:5 debug: optimizing TEAL subroutine test_cases.inheritance.grandparent.GreatGrandParentContract.approval_program() -> uint64:
 inheritance/grandparent.py:8 debug: optimizing TEAL subroutine test_cases.inheritance.grandparent.GreatGrandParentContract.clear_state_program() -> uint64:
-debug: Output IR to inheritance/out/ParentContract.ir/ParentContract.approval.0.approval.ssa.ir
+debug: Output IR to inheritance/out/ParentContract.ir/ParentContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.inheritance.parent.ParentContract at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.inheritance.parent.ParentContract.method for inlining
@@ -806,7 +806,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.inheritance.parent.ParentContract.method
-debug: Output IR to inheritance/out/ParentContract.ir/ParentContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to inheritance/out/ParentContract.ir/ParentContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking single-use function test_cases.inheritance.grandparent.GreatGrandParentContract.method for inlining
 debug: Optimizing subroutine test_cases.inheritance.grandparent.GreatGrandParentContract.approval_program
@@ -845,7 +845,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.inheritance.grandparent.GreatGrandParentContract.method
-debug: Output IR to inheritance/out/ParentContract.ir/ParentContract.approval.2.approval.ssa.opt.ir
+debug: Output IR to inheritance/out/ParentContract.ir/ParentContract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.inheritance.grandparent.GreatGrandParentContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -870,8 +870,8 @@ debug: Coalescing local variables in test_cases.inheritance.grandparent.GreatGra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inheritance.grandparent.GreatGrandParentContract.approval_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to inheritance/out/ParentContract.ir/ParentContract.approval.3.approval.destructured.ir
-debug: Output IR to inheritance/out/ParentContract.ir/ParentContract.clear.0.clear.ssa.ir
+debug: Output IR to inheritance/out/ParentContract.ir/ParentContract.approval.3.destructured.ir
+debug: Output IR to inheritance/out/ParentContract.ir/ParentContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.inheritance.parent.ParentContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.inheritance.grandparent.GreatGrandParentContract.clear_state_program
@@ -897,10 +897,10 @@ debug: Coalescing local variables in test_cases.inheritance.grandparent.GreatGra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inheritance.grandparent.GreatGrandParentContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to inheritance/out/ParentContract.ir/ParentContract.clear.1.clear.destructured.ir
+debug: Output IR to inheritance/out/ParentContract.ir/ParentContract.clear.1.destructured.ir
 inheritance/grandparent.py:5 debug: optimizing TEAL subroutine test_cases.inheritance.grandparent.GreatGrandParentContract.approval_program() -> uint64:
 inheritance/grandparent.py:8 debug: optimizing TEAL subroutine test_cases.inheritance.grandparent.GreatGrandParentContract.clear_state_program() -> uint64:
-debug: Output IR to inheritance/out/ChildContract.ir/ChildContract.approval.0.approval.ssa.ir
+debug: Output IR to inheritance/out/ChildContract.ir/ChildContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.inheritance.child.ChildContract at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.inheritance.child.ChildContract.method for inlining
@@ -962,7 +962,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.inheritance.child.ChildContract.method
-debug: Output IR to inheritance/out/ChildContract.ir/ChildContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to inheritance/out/ChildContract.ir/ChildContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking single-use function test_cases.inheritance.grandparent.GreatGrandParentContract.method for inlining
 debug: Optimizing subroutine test_cases.inheritance.grandparent.GreatGrandParentContract.approval_program
@@ -1001,7 +1001,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.inheritance.grandparent.GreatGrandParentContract.method
-debug: Output IR to inheritance/out/ChildContract.ir/ChildContract.approval.2.approval.ssa.opt.ir
+debug: Output IR to inheritance/out/ChildContract.ir/ChildContract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.inheritance.grandparent.GreatGrandParentContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -1026,8 +1026,8 @@ debug: Coalescing local variables in test_cases.inheritance.grandparent.GreatGra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inheritance.grandparent.GreatGrandParentContract.approval_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to inheritance/out/ChildContract.ir/ChildContract.approval.3.approval.destructured.ir
-debug: Output IR to inheritance/out/ChildContract.ir/ChildContract.clear.0.clear.ssa.ir
+debug: Output IR to inheritance/out/ChildContract.ir/ChildContract.approval.3.destructured.ir
+debug: Output IR to inheritance/out/ChildContract.ir/ChildContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.inheritance.child.ChildContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.inheritance.grandparent.GreatGrandParentContract.clear_state_program
@@ -1053,7 +1053,7 @@ debug: Coalescing local variables in test_cases.inheritance.grandparent.GreatGra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inheritance.grandparent.GreatGrandParentContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to inheritance/out/ChildContract.ir/ChildContract.clear.1.clear.destructured.ir
+debug: Output IR to inheritance/out/ChildContract.ir/ChildContract.clear.1.destructured.ir
 inheritance/grandparent.py:5 debug: optimizing TEAL subroutine test_cases.inheritance.grandparent.GreatGrandParentContract.approval_program() -> uint64:
 inheritance/grandparent.py:8 debug: optimizing TEAL subroutine test_cases.inheritance.grandparent.GreatGrandParentContract.clear_state_program() -> uint64:
 info: Writing inheritance/out/GreatGrandParentContract.approval.teal
diff --git a/test_cases/inheritance/puya_O2.log b/test_cases/inheritance/puya_O2.log
index 251b11358e..61dd15075a 100644
--- a/test_cases/inheritance/puya_O2.log
+++ b/test_cases/inheritance/puya_O2.log
@@ -616,7 +616,7 @@ debug: Coalescing local variables in test_cases.inheritance.grandparent.GreatGra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inheritance.grandparent.GreatGrandParentContract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to inheritance/out_O2/GreatGrandParentContract.ir/GreatGrandParentContract.approval.0.approval.destructured.ir
+debug: Output IR to inheritance/out_O2/GreatGrandParentContract.ir/GreatGrandParentContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.inheritance.grandparent.GreatGrandParentContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.inheritance.grandparent.GreatGrandParentContract.clear_state_program
@@ -642,7 +642,7 @@ debug: Coalescing local variables in test_cases.inheritance.grandparent.GreatGra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inheritance.grandparent.GreatGrandParentContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to inheritance/out_O2/GreatGrandParentContract.ir/GreatGrandParentContract.clear.0.clear.destructured.ir
+debug: Output IR to inheritance/out_O2/GreatGrandParentContract.ir/GreatGrandParentContract.clear.0.destructured.ir
 inheritance/grandparent.py:5 debug: optimizing TEAL subroutine test_cases.inheritance.grandparent.GreatGrandParentContract.approval_program() -> uint64:
 inheritance/grandparent.py:8 debug: optimizing TEAL subroutine test_cases.inheritance.grandparent.GreatGrandParentContract.clear_state_program() -> uint64:
 info: optimizing approval program of test_cases.inheritance.grandparent.GrandParentContract at level 2
@@ -708,7 +708,7 @@ debug: Coalescing local variables in test_cases.inheritance.grandparent.GreatGra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inheritance.grandparent.GreatGrandParentContract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to inheritance/out_O2/GrandParentContract.ir/GrandParentContract.approval.0.approval.destructured.ir
+debug: Output IR to inheritance/out_O2/GrandParentContract.ir/GrandParentContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.inheritance.grandparent.GrandParentContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.inheritance.grandparent.GreatGrandParentContract.clear_state_program
@@ -734,7 +734,7 @@ debug: Coalescing local variables in test_cases.inheritance.grandparent.GreatGra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inheritance.grandparent.GreatGrandParentContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to inheritance/out_O2/GrandParentContract.ir/GrandParentContract.clear.0.clear.destructured.ir
+debug: Output IR to inheritance/out_O2/GrandParentContract.ir/GrandParentContract.clear.0.destructured.ir
 inheritance/grandparent.py:5 debug: optimizing TEAL subroutine test_cases.inheritance.grandparent.GreatGrandParentContract.approval_program() -> uint64:
 inheritance/grandparent.py:8 debug: optimizing TEAL subroutine test_cases.inheritance.grandparent.GreatGrandParentContract.clear_state_program() -> uint64:
 info: optimizing approval program of test_cases.inheritance.parent.ParentContract at level 2
@@ -860,7 +860,7 @@ debug: Coalescing local variables in test_cases.inheritance.grandparent.GreatGra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inheritance.grandparent.GreatGrandParentContract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to inheritance/out_O2/ParentContract.ir/ParentContract.approval.0.approval.destructured.ir
+debug: Output IR to inheritance/out_O2/ParentContract.ir/ParentContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.inheritance.parent.ParentContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.inheritance.grandparent.GreatGrandParentContract.clear_state_program
@@ -886,7 +886,7 @@ debug: Coalescing local variables in test_cases.inheritance.grandparent.GreatGra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inheritance.grandparent.GreatGrandParentContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to inheritance/out_O2/ParentContract.ir/ParentContract.clear.0.clear.destructured.ir
+debug: Output IR to inheritance/out_O2/ParentContract.ir/ParentContract.clear.0.destructured.ir
 inheritance/grandparent.py:5 debug: optimizing TEAL subroutine test_cases.inheritance.grandparent.GreatGrandParentContract.approval_program() -> uint64:
 inheritance/grandparent.py:8 debug: optimizing TEAL subroutine test_cases.inheritance.grandparent.GreatGrandParentContract.clear_state_program() -> uint64:
 info: optimizing approval program of test_cases.inheritance.child.ChildContract at level 2
@@ -1012,7 +1012,7 @@ debug: Coalescing local variables in test_cases.inheritance.grandparent.GreatGra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inheritance.grandparent.GreatGrandParentContract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to inheritance/out_O2/ChildContract.ir/ChildContract.approval.0.approval.destructured.ir
+debug: Output IR to inheritance/out_O2/ChildContract.ir/ChildContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.inheritance.child.ChildContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.inheritance.grandparent.GreatGrandParentContract.clear_state_program
@@ -1038,7 +1038,7 @@ debug: Coalescing local variables in test_cases.inheritance.grandparent.GreatGra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inheritance.grandparent.GreatGrandParentContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to inheritance/out_O2/ChildContract.ir/ChildContract.clear.0.clear.destructured.ir
+debug: Output IR to inheritance/out_O2/ChildContract.ir/ChildContract.clear.0.destructured.ir
 inheritance/grandparent.py:5 debug: optimizing TEAL subroutine test_cases.inheritance.grandparent.GreatGrandParentContract.approval_program() -> uint64:
 inheritance/grandparent.py:8 debug: optimizing TEAL subroutine test_cases.inheritance.grandparent.GreatGrandParentContract.clear_state_program() -> uint64:
 info: Writing inheritance/out_O2/GreatGrandParentContract.approval.teal
diff --git a/test_cases/inheritance/puya_unoptimized.log b/test_cases/inheritance/puya_unoptimized.log
index ff89db4f4e..6fba4c351e 100644
--- a/test_cases/inheritance/puya_unoptimized.log
+++ b/test_cases/inheritance/puya_unoptimized.log
@@ -584,7 +584,7 @@ debug: Coalescing local variables in test_cases.inheritance.grandparent.GreatGra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inheritance.grandparent.GreatGrandParentContract.method
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to inheritance/out_unoptimized/GreatGrandParentContract.ir/GreatGrandParentContract.approval.0.approval.destructured.ir
+debug: Output IR to inheritance/out_unoptimized/GreatGrandParentContract.ir/GreatGrandParentContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.inheritance.grandparent.GreatGrandParentContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.inheritance.grandparent.GreatGrandParentContract.clear_state_program
@@ -602,7 +602,7 @@ debug: Coalescing local variables in test_cases.inheritance.grandparent.GreatGra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inheritance.grandparent.GreatGrandParentContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to inheritance/out_unoptimized/GreatGrandParentContract.ir/GreatGrandParentContract.clear.0.clear.destructured.ir
+debug: Output IR to inheritance/out_unoptimized/GreatGrandParentContract.ir/GreatGrandParentContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 inheritance/grandparent.py:5 debug: optimizing TEAL subroutine test_cases.inheritance.grandparent.GreatGrandParentContract.approval_program() -> uint64:
@@ -639,7 +639,7 @@ debug: Coalescing local variables in test_cases.inheritance.grandparent.GreatGra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inheritance.grandparent.GreatGrandParentContract.method
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to inheritance/out_unoptimized/GrandParentContract.ir/GrandParentContract.approval.0.approval.destructured.ir
+debug: Output IR to inheritance/out_unoptimized/GrandParentContract.ir/GrandParentContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.inheritance.grandparent.GrandParentContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.inheritance.grandparent.GreatGrandParentContract.clear_state_program
@@ -657,7 +657,7 @@ debug: Coalescing local variables in test_cases.inheritance.grandparent.GreatGra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inheritance.grandparent.GreatGrandParentContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to inheritance/out_unoptimized/GrandParentContract.ir/GrandParentContract.clear.0.clear.destructured.ir
+debug: Output IR to inheritance/out_unoptimized/GrandParentContract.ir/GrandParentContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 inheritance/grandparent.py:5 debug: optimizing TEAL subroutine test_cases.inheritance.grandparent.GreatGrandParentContract.approval_program() -> uint64:
@@ -708,7 +708,7 @@ debug: Coalescing local variables in test_cases.inheritance.grandparent.GreatGra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inheritance.grandparent.GreatGrandParentContract.method
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to inheritance/out_unoptimized/ParentContract.ir/ParentContract.approval.0.approval.destructured.ir
+debug: Output IR to inheritance/out_unoptimized/ParentContract.ir/ParentContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.inheritance.parent.ParentContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.inheritance.grandparent.GreatGrandParentContract.clear_state_program
@@ -726,7 +726,7 @@ debug: Coalescing local variables in test_cases.inheritance.grandparent.GreatGra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inheritance.grandparent.GreatGrandParentContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to inheritance/out_unoptimized/ParentContract.ir/ParentContract.clear.0.clear.destructured.ir
+debug: Output IR to inheritance/out_unoptimized/ParentContract.ir/ParentContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted method.ops[3]: 'l-store-copy tmp%0#0 0'
@@ -780,7 +780,7 @@ debug: Coalescing local variables in test_cases.inheritance.grandparent.GreatGra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inheritance.grandparent.GreatGrandParentContract.method
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to inheritance/out_unoptimized/ChildContract.ir/ChildContract.approval.0.approval.destructured.ir
+debug: Output IR to inheritance/out_unoptimized/ChildContract.ir/ChildContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.inheritance.child.ChildContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.inheritance.grandparent.GreatGrandParentContract.clear_state_program
@@ -798,7 +798,7 @@ debug: Coalescing local variables in test_cases.inheritance.grandparent.GreatGra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inheritance.grandparent.GreatGrandParentContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to inheritance/out_unoptimized/ChildContract.ir/ChildContract.clear.0.clear.destructured.ir
+debug: Output IR to inheritance/out_unoptimized/ChildContract.ir/ChildContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted method.ops[3]: 'l-store-copy tmp%0#0 0'
diff --git a/test_cases/inlining/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir b/test_cases/inlining/out/MyContract.ir/MyContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/inlining/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir
rename to test_cases/inlining/out/MyContract.ir/MyContract.approval.0.ssa.ir
diff --git a/test_cases/inlining/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir b/test_cases/inlining/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/inlining/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir
rename to test_cases/inlining/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
diff --git a/test_cases/inlining/out/MyContract.ir/MyContract.approval.2.approval.ssa.opt.ir b/test_cases/inlining/out/MyContract.ir/MyContract.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/inlining/out/MyContract.ir/MyContract.approval.2.approval.ssa.opt.ir
rename to test_cases/inlining/out/MyContract.ir/MyContract.approval.2.ssa.opt.ir
diff --git a/test_cases/inlining/out/MyContract.ir/MyContract.approval.3.approval.destructured.ir b/test_cases/inlining/out/MyContract.ir/MyContract.approval.3.destructured.ir
similarity index 100%
rename from test_cases/inlining/out/MyContract.ir/MyContract.approval.3.approval.destructured.ir
rename to test_cases/inlining/out/MyContract.ir/MyContract.approval.3.destructured.ir
diff --git a/test_cases/inlining/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir b/test_cases/inlining/out/MyContract.ir/MyContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/inlining/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir
rename to test_cases/inlining/out/MyContract.ir/MyContract.clear.0.ssa.ir
diff --git a/test_cases/inlining/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir b/test_cases/inlining/out/MyContract.ir/MyContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/inlining/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir
rename to test_cases/inlining/out/MyContract.ir/MyContract.clear.1.destructured.ir
diff --git a/test_cases/inlining/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir b/test_cases/inlining/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/inlining/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir
rename to test_cases/inlining/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
diff --git a/test_cases/inlining/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir b/test_cases/inlining/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/inlining/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir
rename to test_cases/inlining/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
diff --git a/test_cases/inlining/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir b/test_cases/inlining/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/inlining/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir
rename to test_cases/inlining/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
diff --git a/test_cases/inlining/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir b/test_cases/inlining/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/inlining/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir
rename to test_cases/inlining/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
diff --git a/test_cases/inlining/puya.log b/test_cases/inlining/puya.log
index 25301c480e..eb0b73da35 100644
--- a/test_cases/inlining/puya.log
+++ b/test_cases/inlining/puya.log
@@ -416,7 +416,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to inlining/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir
+debug: Output IR to inlining/out/MyContract.ir/MyContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.inlining.contract.MyContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.inlining.contract.MyContract.approval_program
@@ -511,7 +511,7 @@ debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.inlining.contract.one
 debug: removing unused subroutine test_cases.inlining.contract.never_returns
-debug: Output IR to inlining/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to inlining/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.inlining.contract.MyContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -563,7 +563,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.inlining.contract.zero
-debug: Output IR to inlining/out/MyContract.ir/MyContract.approval.2.approval.ssa.opt.ir
+debug: Output IR to inlining/out/MyContract.ir/MyContract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.inlining.contract.MyContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -588,8 +588,8 @@ debug: Coalescing local variables in test_cases.inlining.contract.MyContract.app
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inlining.contract.MyContract.approval_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to inlining/out/MyContract.ir/MyContract.approval.3.approval.destructured.ir
-debug: Output IR to inlining/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir
+debug: Output IR to inlining/out/MyContract.ir/MyContract.approval.3.destructured.ir
+debug: Output IR to inlining/out/MyContract.ir/MyContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.inlining.contract.MyContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.inlining.contract.MyContract.clear_state_program
@@ -615,7 +615,7 @@ debug: Coalescing local variables in test_cases.inlining.contract.MyContract.cle
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inlining.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to inlining/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir
+debug: Output IR to inlining/out/MyContract.ir/MyContract.clear.1.destructured.ir
 inlining/contract.py:7 debug: optimizing TEAL subroutine test_cases.inlining.contract.MyContract.approval_program() -> uint64:
 inlining/contract.py:15 debug: optimizing TEAL subroutine test_cases.inlining.contract.MyContract.clear_state_program() -> uint64:
 info: Writing inlining/out/MyContract.approval.teal
diff --git a/test_cases/inlining/puya_O2.log b/test_cases/inlining/puya_O2.log
index 47a66f9dc3..44c5aae997 100644
--- a/test_cases/inlining/puya_O2.log
+++ b/test_cases/inlining/puya_O2.log
@@ -584,7 +584,7 @@ debug: Coalescing local variables in test_cases.inlining.contract.MyContract.app
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inlining.contract.MyContract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to inlining/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir
+debug: Output IR to inlining/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.inlining.contract.MyContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.inlining.contract.MyContract.clear_state_program
@@ -610,7 +610,7 @@ debug: Coalescing local variables in test_cases.inlining.contract.MyContract.cle
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inlining.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to inlining/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir
+debug: Output IR to inlining/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
 inlining/contract.py:7 debug: optimizing TEAL subroutine test_cases.inlining.contract.MyContract.approval_program() -> uint64:
 inlining/contract.py:15 debug: optimizing TEAL subroutine test_cases.inlining.contract.MyContract.clear_state_program() -> uint64:
 info: Writing inlining/out_O2/MyContract.approval.teal
diff --git a/test_cases/inlining/puya_unoptimized.log b/test_cases/inlining/puya_unoptimized.log
index 15f01c92bb..37d86f8a9f 100644
--- a/test_cases/inlining/puya_unoptimized.log
+++ b/test_cases/inlining/puya_unoptimized.log
@@ -491,7 +491,7 @@ debug: Coalescing tmp%1#0 with [tmp%1#1, tmp%1#2]
 debug: Coalescing resulted in 4 replacement/s
 debug: Sequentializing parallel copies in test_cases.inlining.contract.MyContract.approval_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to inlining/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir
+debug: Output IR to inlining/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.inlining.contract.MyContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.inlining.contract.MyContract.clear_state_program
@@ -509,7 +509,7 @@ debug: Coalescing local variables in test_cases.inlining.contract.MyContract.cle
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inlining.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to inlining/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir
+debug: Output IR to inlining/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
 debug: Inserted main_after_inlined_test_cases.inlining.contract.zero@11.ops[3]: 'l-store-copy tmp%1#0 0'
 debug: Replaced main_after_inlined_test_cases.inlining.contract.zero@11.ops[5]: 'v-load tmp%1#0' with 'l-load tmp%1#0'
 debug: Inserted main_after_inlined_test_cases.inlining.contract.zero@9.ops[3]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/inner_transactions/out/ArrayAccessContract.ir/ArrayAccessContract.approval.0.approval.ssa.ir b/test_cases/inner_transactions/out/ArrayAccessContract.ir/ArrayAccessContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/inner_transactions/out/ArrayAccessContract.ir/ArrayAccessContract.approval.0.approval.ssa.ir
rename to test_cases/inner_transactions/out/ArrayAccessContract.ir/ArrayAccessContract.approval.0.ssa.ir
diff --git a/test_cases/inner_transactions/out/ArrayAccessContract.ir/ArrayAccessContract.approval.1.approval.ssa.opt.ir b/test_cases/inner_transactions/out/ArrayAccessContract.ir/ArrayAccessContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/inner_transactions/out/ArrayAccessContract.ir/ArrayAccessContract.approval.1.approval.ssa.opt.ir
rename to test_cases/inner_transactions/out/ArrayAccessContract.ir/ArrayAccessContract.approval.1.ssa.opt.ir
diff --git a/test_cases/inner_transactions/out/ArrayAccessContract.ir/ArrayAccessContract.approval.2.approval.ssa.opt.ir b/test_cases/inner_transactions/out/ArrayAccessContract.ir/ArrayAccessContract.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/inner_transactions/out/ArrayAccessContract.ir/ArrayAccessContract.approval.2.approval.ssa.opt.ir
rename to test_cases/inner_transactions/out/ArrayAccessContract.ir/ArrayAccessContract.approval.2.ssa.opt.ir
diff --git a/test_cases/inner_transactions/out/ArrayAccessContract.ir/ArrayAccessContract.approval.3.approval.destructured.ir b/test_cases/inner_transactions/out/ArrayAccessContract.ir/ArrayAccessContract.approval.3.destructured.ir
similarity index 100%
rename from test_cases/inner_transactions/out/ArrayAccessContract.ir/ArrayAccessContract.approval.3.approval.destructured.ir
rename to test_cases/inner_transactions/out/ArrayAccessContract.ir/ArrayAccessContract.approval.3.destructured.ir
diff --git a/test_cases/inner_transactions/out/ArrayAccessContract.ir/ArrayAccessContract.clear.0.clear.ssa.ir b/test_cases/inner_transactions/out/ArrayAccessContract.ir/ArrayAccessContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/inner_transactions/out/ArrayAccessContract.ir/ArrayAccessContract.clear.0.clear.ssa.ir
rename to test_cases/inner_transactions/out/ArrayAccessContract.ir/ArrayAccessContract.clear.0.ssa.ir
diff --git a/test_cases/inner_transactions/out/ArrayAccessContract.ir/ArrayAccessContract.clear.1.clear.destructured.ir b/test_cases/inner_transactions/out/ArrayAccessContract.ir/ArrayAccessContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/inner_transactions/out/ArrayAccessContract.ir/ArrayAccessContract.clear.1.clear.destructured.ir
rename to test_cases/inner_transactions/out/ArrayAccessContract.ir/ArrayAccessContract.clear.1.destructured.ir
diff --git a/test_cases/inner_transactions/out/CreateAndTransferContract.ir/CreateAndTransferContract.approval.0.approval.ssa.ir b/test_cases/inner_transactions/out/CreateAndTransferContract.ir/CreateAndTransferContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/inner_transactions/out/CreateAndTransferContract.ir/CreateAndTransferContract.approval.0.approval.ssa.ir
rename to test_cases/inner_transactions/out/CreateAndTransferContract.ir/CreateAndTransferContract.approval.0.ssa.ir
diff --git a/test_cases/inner_transactions/out/CreateAndTransferContract.ir/CreateAndTransferContract.approval.1.approval.ssa.opt.ir b/test_cases/inner_transactions/out/CreateAndTransferContract.ir/CreateAndTransferContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/inner_transactions/out/CreateAndTransferContract.ir/CreateAndTransferContract.approval.1.approval.ssa.opt.ir
rename to test_cases/inner_transactions/out/CreateAndTransferContract.ir/CreateAndTransferContract.approval.1.ssa.opt.ir
diff --git a/test_cases/inner_transactions/out/CreateAndTransferContract.ir/CreateAndTransferContract.approval.2.approval.ssa.opt.ir b/test_cases/inner_transactions/out/CreateAndTransferContract.ir/CreateAndTransferContract.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/inner_transactions/out/CreateAndTransferContract.ir/CreateAndTransferContract.approval.2.approval.ssa.opt.ir
rename to test_cases/inner_transactions/out/CreateAndTransferContract.ir/CreateAndTransferContract.approval.2.ssa.opt.ir
diff --git a/test_cases/inner_transactions/out/CreateAndTransferContract.ir/CreateAndTransferContract.approval.3.approval.destructured.ir b/test_cases/inner_transactions/out/CreateAndTransferContract.ir/CreateAndTransferContract.approval.3.destructured.ir
similarity index 100%
rename from test_cases/inner_transactions/out/CreateAndTransferContract.ir/CreateAndTransferContract.approval.3.approval.destructured.ir
rename to test_cases/inner_transactions/out/CreateAndTransferContract.ir/CreateAndTransferContract.approval.3.destructured.ir
diff --git a/test_cases/inner_transactions/out/CreateAndTransferContract.ir/CreateAndTransferContract.clear.0.clear.ssa.ir b/test_cases/inner_transactions/out/CreateAndTransferContract.ir/CreateAndTransferContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/inner_transactions/out/CreateAndTransferContract.ir/CreateAndTransferContract.clear.0.clear.ssa.ir
rename to test_cases/inner_transactions/out/CreateAndTransferContract.ir/CreateAndTransferContract.clear.0.ssa.ir
diff --git a/test_cases/inner_transactions/out/CreateAndTransferContract.ir/CreateAndTransferContract.clear.1.clear.destructured.ir b/test_cases/inner_transactions/out/CreateAndTransferContract.ir/CreateAndTransferContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/inner_transactions/out/CreateAndTransferContract.ir/CreateAndTransferContract.clear.1.clear.destructured.ir
rename to test_cases/inner_transactions/out/CreateAndTransferContract.ir/CreateAndTransferContract.clear.1.destructured.ir
diff --git a/test_cases/inner_transactions/out/FieldTupleContract.ir/FieldTupleContract.approval.0.approval.ssa.ir b/test_cases/inner_transactions/out/FieldTupleContract.ir/FieldTupleContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/inner_transactions/out/FieldTupleContract.ir/FieldTupleContract.approval.0.approval.ssa.ir
rename to test_cases/inner_transactions/out/FieldTupleContract.ir/FieldTupleContract.approval.0.ssa.ir
diff --git a/test_cases/inner_transactions/out/FieldTupleContract.ir/FieldTupleContract.approval.1.approval.ssa.opt.ir b/test_cases/inner_transactions/out/FieldTupleContract.ir/FieldTupleContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/inner_transactions/out/FieldTupleContract.ir/FieldTupleContract.approval.1.approval.ssa.opt.ir
rename to test_cases/inner_transactions/out/FieldTupleContract.ir/FieldTupleContract.approval.1.ssa.opt.ir
diff --git a/test_cases/inner_transactions/out/FieldTupleContract.ir/FieldTupleContract.approval.2.approval.ssa.opt.ir b/test_cases/inner_transactions/out/FieldTupleContract.ir/FieldTupleContract.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/inner_transactions/out/FieldTupleContract.ir/FieldTupleContract.approval.2.approval.ssa.opt.ir
rename to test_cases/inner_transactions/out/FieldTupleContract.ir/FieldTupleContract.approval.2.ssa.opt.ir
diff --git a/test_cases/inner_transactions/out/FieldTupleContract.ir/FieldTupleContract.approval.3.approval.destructured.ir b/test_cases/inner_transactions/out/FieldTupleContract.ir/FieldTupleContract.approval.3.destructured.ir
similarity index 100%
rename from test_cases/inner_transactions/out/FieldTupleContract.ir/FieldTupleContract.approval.3.approval.destructured.ir
rename to test_cases/inner_transactions/out/FieldTupleContract.ir/FieldTupleContract.approval.3.destructured.ir
diff --git a/test_cases/inner_transactions/out/FieldTupleContract.ir/FieldTupleContract.clear.0.clear.ssa.ir b/test_cases/inner_transactions/out/FieldTupleContract.ir/FieldTupleContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/inner_transactions/out/FieldTupleContract.ir/FieldTupleContract.clear.0.clear.ssa.ir
rename to test_cases/inner_transactions/out/FieldTupleContract.ir/FieldTupleContract.clear.0.ssa.ir
diff --git a/test_cases/inner_transactions/out/FieldTupleContract.ir/FieldTupleContract.clear.1.clear.destructured.ir b/test_cases/inner_transactions/out/FieldTupleContract.ir/FieldTupleContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/inner_transactions/out/FieldTupleContract.ir/FieldTupleContract.clear.1.clear.destructured.ir
rename to test_cases/inner_transactions/out/FieldTupleContract.ir/FieldTupleContract.clear.1.destructured.ir
diff --git a/test_cases/inner_transactions/out/Greeter.ir/Greeter.approval.0.approval.ssa.ir b/test_cases/inner_transactions/out/Greeter.ir/Greeter.approval.0.ssa.ir
similarity index 100%
rename from test_cases/inner_transactions/out/Greeter.ir/Greeter.approval.0.approval.ssa.ir
rename to test_cases/inner_transactions/out/Greeter.ir/Greeter.approval.0.ssa.ir
diff --git a/test_cases/inner_transactions/out/Greeter.ir/Greeter.approval.1.approval.ssa.opt.ir b/test_cases/inner_transactions/out/Greeter.ir/Greeter.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/inner_transactions/out/Greeter.ir/Greeter.approval.1.approval.ssa.opt.ir
rename to test_cases/inner_transactions/out/Greeter.ir/Greeter.approval.1.ssa.opt.ir
diff --git a/test_cases/inner_transactions/out/Greeter.ir/Greeter.approval.2.approval.ssa.opt.ir b/test_cases/inner_transactions/out/Greeter.ir/Greeter.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/inner_transactions/out/Greeter.ir/Greeter.approval.2.approval.ssa.opt.ir
rename to test_cases/inner_transactions/out/Greeter.ir/Greeter.approval.2.ssa.opt.ir
diff --git a/test_cases/inner_transactions/out/Greeter.ir/Greeter.approval.3.approval.destructured.ir b/test_cases/inner_transactions/out/Greeter.ir/Greeter.approval.3.destructured.ir
similarity index 100%
rename from test_cases/inner_transactions/out/Greeter.ir/Greeter.approval.3.approval.destructured.ir
rename to test_cases/inner_transactions/out/Greeter.ir/Greeter.approval.3.destructured.ir
diff --git a/test_cases/inner_transactions/out/Greeter.ir/Greeter.clear.0.clear.ssa.ir b/test_cases/inner_transactions/out/Greeter.ir/Greeter.clear.0.ssa.ir
similarity index 100%
rename from test_cases/inner_transactions/out/Greeter.ir/Greeter.clear.0.clear.ssa.ir
rename to test_cases/inner_transactions/out/Greeter.ir/Greeter.clear.0.ssa.ir
diff --git a/test_cases/inner_transactions/out/Greeter.ir/Greeter.clear.1.clear.destructured.ir b/test_cases/inner_transactions/out/Greeter.ir/Greeter.clear.1.destructured.ir
similarity index 100%
rename from test_cases/inner_transactions/out/Greeter.ir/Greeter.clear.1.clear.destructured.ir
rename to test_cases/inner_transactions/out/Greeter.ir/Greeter.clear.1.destructured.ir
diff --git a/test_cases/inner_transactions/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir b/test_cases/inner_transactions/out/MyContract.ir/MyContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/inner_transactions/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir
rename to test_cases/inner_transactions/out/MyContract.ir/MyContract.approval.0.ssa.ir
diff --git a/test_cases/inner_transactions/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir b/test_cases/inner_transactions/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/inner_transactions/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir
rename to test_cases/inner_transactions/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
diff --git a/test_cases/inner_transactions/out/MyContract.ir/MyContract.approval.2.approval.ssa.opt.ir b/test_cases/inner_transactions/out/MyContract.ir/MyContract.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/inner_transactions/out/MyContract.ir/MyContract.approval.2.approval.ssa.opt.ir
rename to test_cases/inner_transactions/out/MyContract.ir/MyContract.approval.2.ssa.opt.ir
diff --git a/test_cases/inner_transactions/out/MyContract.ir/MyContract.approval.3.approval.destructured.ir b/test_cases/inner_transactions/out/MyContract.ir/MyContract.approval.3.destructured.ir
similarity index 100%
rename from test_cases/inner_transactions/out/MyContract.ir/MyContract.approval.3.approval.destructured.ir
rename to test_cases/inner_transactions/out/MyContract.ir/MyContract.approval.3.destructured.ir
diff --git a/test_cases/inner_transactions/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir b/test_cases/inner_transactions/out/MyContract.ir/MyContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/inner_transactions/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir
rename to test_cases/inner_transactions/out/MyContract.ir/MyContract.clear.0.ssa.ir
diff --git a/test_cases/inner_transactions/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir b/test_cases/inner_transactions/out/MyContract.ir/MyContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/inner_transactions/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir
rename to test_cases/inner_transactions/out/MyContract.ir/MyContract.clear.1.destructured.ir
diff --git a/test_cases/inner_transactions/out/itxn_loop.ir/itxn_loop.approval.0.approval.ssa.ir b/test_cases/inner_transactions/out/itxn_loop.ir/itxn_loop.approval.0.ssa.ir
similarity index 100%
rename from test_cases/inner_transactions/out/itxn_loop.ir/itxn_loop.approval.0.approval.ssa.ir
rename to test_cases/inner_transactions/out/itxn_loop.ir/itxn_loop.approval.0.ssa.ir
diff --git a/test_cases/inner_transactions/out/itxn_loop.ir/itxn_loop.approval.1.approval.ssa.opt.ir b/test_cases/inner_transactions/out/itxn_loop.ir/itxn_loop.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/inner_transactions/out/itxn_loop.ir/itxn_loop.approval.1.approval.ssa.opt.ir
rename to test_cases/inner_transactions/out/itxn_loop.ir/itxn_loop.approval.1.ssa.opt.ir
diff --git a/test_cases/inner_transactions/out/itxn_loop.ir/itxn_loop.approval.2.approval.destructured.ir b/test_cases/inner_transactions/out/itxn_loop.ir/itxn_loop.approval.2.destructured.ir
similarity index 100%
rename from test_cases/inner_transactions/out/itxn_loop.ir/itxn_loop.approval.2.approval.destructured.ir
rename to test_cases/inner_transactions/out/itxn_loop.ir/itxn_loop.approval.2.destructured.ir
diff --git a/test_cases/inner_transactions/out/itxn_loop.ir/itxn_loop.clear.0.clear.ssa.ir b/test_cases/inner_transactions/out/itxn_loop.ir/itxn_loop.clear.0.ssa.ir
similarity index 100%
rename from test_cases/inner_transactions/out/itxn_loop.ir/itxn_loop.clear.0.clear.ssa.ir
rename to test_cases/inner_transactions/out/itxn_loop.ir/itxn_loop.clear.0.ssa.ir
diff --git a/test_cases/inner_transactions/out/itxn_loop.ir/itxn_loop.clear.1.clear.destructured.ir b/test_cases/inner_transactions/out/itxn_loop.ir/itxn_loop.clear.1.destructured.ir
similarity index 100%
rename from test_cases/inner_transactions/out/itxn_loop.ir/itxn_loop.clear.1.clear.destructured.ir
rename to test_cases/inner_transactions/out/itxn_loop.ir/itxn_loop.clear.1.destructured.ir
diff --git a/test_cases/inner_transactions/out_O2/ArrayAccessContract.ir/ArrayAccessContract.approval.0.approval.destructured.ir b/test_cases/inner_transactions/out_O2/ArrayAccessContract.ir/ArrayAccessContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/inner_transactions/out_O2/ArrayAccessContract.ir/ArrayAccessContract.approval.0.approval.destructured.ir
rename to test_cases/inner_transactions/out_O2/ArrayAccessContract.ir/ArrayAccessContract.approval.0.destructured.ir
diff --git a/test_cases/inner_transactions/out_O2/ArrayAccessContract.ir/ArrayAccessContract.clear.0.clear.destructured.ir b/test_cases/inner_transactions/out_O2/ArrayAccessContract.ir/ArrayAccessContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/inner_transactions/out_O2/ArrayAccessContract.ir/ArrayAccessContract.clear.0.clear.destructured.ir
rename to test_cases/inner_transactions/out_O2/ArrayAccessContract.ir/ArrayAccessContract.clear.0.destructured.ir
diff --git a/test_cases/inner_transactions/out_O2/CreateAndTransferContract.ir/CreateAndTransferContract.approval.0.approval.destructured.ir b/test_cases/inner_transactions/out_O2/CreateAndTransferContract.ir/CreateAndTransferContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/inner_transactions/out_O2/CreateAndTransferContract.ir/CreateAndTransferContract.approval.0.approval.destructured.ir
rename to test_cases/inner_transactions/out_O2/CreateAndTransferContract.ir/CreateAndTransferContract.approval.0.destructured.ir
diff --git a/test_cases/inner_transactions/out_O2/CreateAndTransferContract.ir/CreateAndTransferContract.clear.0.clear.destructured.ir b/test_cases/inner_transactions/out_O2/CreateAndTransferContract.ir/CreateAndTransferContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/inner_transactions/out_O2/CreateAndTransferContract.ir/CreateAndTransferContract.clear.0.clear.destructured.ir
rename to test_cases/inner_transactions/out_O2/CreateAndTransferContract.ir/CreateAndTransferContract.clear.0.destructured.ir
diff --git a/test_cases/inner_transactions/out_O2/FieldTupleContract.ir/FieldTupleContract.approval.0.approval.destructured.ir b/test_cases/inner_transactions/out_O2/FieldTupleContract.ir/FieldTupleContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/inner_transactions/out_O2/FieldTupleContract.ir/FieldTupleContract.approval.0.approval.destructured.ir
rename to test_cases/inner_transactions/out_O2/FieldTupleContract.ir/FieldTupleContract.approval.0.destructured.ir
diff --git a/test_cases/inner_transactions/out_O2/FieldTupleContract.ir/FieldTupleContract.clear.0.clear.destructured.ir b/test_cases/inner_transactions/out_O2/FieldTupleContract.ir/FieldTupleContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/inner_transactions/out_O2/FieldTupleContract.ir/FieldTupleContract.clear.0.clear.destructured.ir
rename to test_cases/inner_transactions/out_O2/FieldTupleContract.ir/FieldTupleContract.clear.0.destructured.ir
diff --git a/test_cases/inner_transactions/out_O2/Greeter.ir/Greeter.approval.0.approval.destructured.ir b/test_cases/inner_transactions/out_O2/Greeter.ir/Greeter.approval.0.destructured.ir
similarity index 100%
rename from test_cases/inner_transactions/out_O2/Greeter.ir/Greeter.approval.0.approval.destructured.ir
rename to test_cases/inner_transactions/out_O2/Greeter.ir/Greeter.approval.0.destructured.ir
diff --git a/test_cases/inner_transactions/out_O2/Greeter.ir/Greeter.clear.0.clear.destructured.ir b/test_cases/inner_transactions/out_O2/Greeter.ir/Greeter.clear.0.destructured.ir
similarity index 100%
rename from test_cases/inner_transactions/out_O2/Greeter.ir/Greeter.clear.0.clear.destructured.ir
rename to test_cases/inner_transactions/out_O2/Greeter.ir/Greeter.clear.0.destructured.ir
diff --git a/test_cases/inner_transactions/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir b/test_cases/inner_transactions/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/inner_transactions/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir
rename to test_cases/inner_transactions/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
diff --git a/test_cases/inner_transactions/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir b/test_cases/inner_transactions/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/inner_transactions/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir
rename to test_cases/inner_transactions/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
diff --git a/test_cases/inner_transactions/out_O2/itxn_loop.ir/itxn_loop.approval.0.approval.destructured.ir b/test_cases/inner_transactions/out_O2/itxn_loop.ir/itxn_loop.approval.0.destructured.ir
similarity index 100%
rename from test_cases/inner_transactions/out_O2/itxn_loop.ir/itxn_loop.approval.0.approval.destructured.ir
rename to test_cases/inner_transactions/out_O2/itxn_loop.ir/itxn_loop.approval.0.destructured.ir
diff --git a/test_cases/inner_transactions/out_O2/itxn_loop.ir/itxn_loop.clear.0.clear.destructured.ir b/test_cases/inner_transactions/out_O2/itxn_loop.ir/itxn_loop.clear.0.destructured.ir
similarity index 100%
rename from test_cases/inner_transactions/out_O2/itxn_loop.ir/itxn_loop.clear.0.clear.destructured.ir
rename to test_cases/inner_transactions/out_O2/itxn_loop.ir/itxn_loop.clear.0.destructured.ir
diff --git a/test_cases/inner_transactions/out_unoptimized/ArrayAccessContract.ir/ArrayAccessContract.approval.0.approval.destructured.ir b/test_cases/inner_transactions/out_unoptimized/ArrayAccessContract.ir/ArrayAccessContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/inner_transactions/out_unoptimized/ArrayAccessContract.ir/ArrayAccessContract.approval.0.approval.destructured.ir
rename to test_cases/inner_transactions/out_unoptimized/ArrayAccessContract.ir/ArrayAccessContract.approval.0.destructured.ir
diff --git a/test_cases/inner_transactions/out_unoptimized/ArrayAccessContract.ir/ArrayAccessContract.clear.0.clear.destructured.ir b/test_cases/inner_transactions/out_unoptimized/ArrayAccessContract.ir/ArrayAccessContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/inner_transactions/out_unoptimized/ArrayAccessContract.ir/ArrayAccessContract.clear.0.clear.destructured.ir
rename to test_cases/inner_transactions/out_unoptimized/ArrayAccessContract.ir/ArrayAccessContract.clear.0.destructured.ir
diff --git a/test_cases/inner_transactions/out_unoptimized/CreateAndTransferContract.ir/CreateAndTransferContract.approval.0.approval.destructured.ir b/test_cases/inner_transactions/out_unoptimized/CreateAndTransferContract.ir/CreateAndTransferContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/inner_transactions/out_unoptimized/CreateAndTransferContract.ir/CreateAndTransferContract.approval.0.approval.destructured.ir
rename to test_cases/inner_transactions/out_unoptimized/CreateAndTransferContract.ir/CreateAndTransferContract.approval.0.destructured.ir
diff --git a/test_cases/inner_transactions/out_unoptimized/CreateAndTransferContract.ir/CreateAndTransferContract.clear.0.clear.destructured.ir b/test_cases/inner_transactions/out_unoptimized/CreateAndTransferContract.ir/CreateAndTransferContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/inner_transactions/out_unoptimized/CreateAndTransferContract.ir/CreateAndTransferContract.clear.0.clear.destructured.ir
rename to test_cases/inner_transactions/out_unoptimized/CreateAndTransferContract.ir/CreateAndTransferContract.clear.0.destructured.ir
diff --git a/test_cases/inner_transactions/out_unoptimized/FieldTupleContract.ir/FieldTupleContract.approval.0.approval.destructured.ir b/test_cases/inner_transactions/out_unoptimized/FieldTupleContract.ir/FieldTupleContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/inner_transactions/out_unoptimized/FieldTupleContract.ir/FieldTupleContract.approval.0.approval.destructured.ir
rename to test_cases/inner_transactions/out_unoptimized/FieldTupleContract.ir/FieldTupleContract.approval.0.destructured.ir
diff --git a/test_cases/inner_transactions/out_unoptimized/FieldTupleContract.ir/FieldTupleContract.clear.0.clear.destructured.ir b/test_cases/inner_transactions/out_unoptimized/FieldTupleContract.ir/FieldTupleContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/inner_transactions/out_unoptimized/FieldTupleContract.ir/FieldTupleContract.clear.0.clear.destructured.ir
rename to test_cases/inner_transactions/out_unoptimized/FieldTupleContract.ir/FieldTupleContract.clear.0.destructured.ir
diff --git a/test_cases/inner_transactions/out_unoptimized/Greeter.ir/Greeter.approval.0.approval.destructured.ir b/test_cases/inner_transactions/out_unoptimized/Greeter.ir/Greeter.approval.0.destructured.ir
similarity index 100%
rename from test_cases/inner_transactions/out_unoptimized/Greeter.ir/Greeter.approval.0.approval.destructured.ir
rename to test_cases/inner_transactions/out_unoptimized/Greeter.ir/Greeter.approval.0.destructured.ir
diff --git a/test_cases/inner_transactions/out_unoptimized/Greeter.ir/Greeter.clear.0.clear.destructured.ir b/test_cases/inner_transactions/out_unoptimized/Greeter.ir/Greeter.clear.0.destructured.ir
similarity index 100%
rename from test_cases/inner_transactions/out_unoptimized/Greeter.ir/Greeter.clear.0.clear.destructured.ir
rename to test_cases/inner_transactions/out_unoptimized/Greeter.ir/Greeter.clear.0.destructured.ir
diff --git a/test_cases/inner_transactions/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir b/test_cases/inner_transactions/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/inner_transactions/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir
rename to test_cases/inner_transactions/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
diff --git a/test_cases/inner_transactions/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir b/test_cases/inner_transactions/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/inner_transactions/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir
rename to test_cases/inner_transactions/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
diff --git a/test_cases/inner_transactions/out_unoptimized/itxn_loop.ir/itxn_loop.approval.0.approval.destructured.ir b/test_cases/inner_transactions/out_unoptimized/itxn_loop.ir/itxn_loop.approval.0.destructured.ir
similarity index 100%
rename from test_cases/inner_transactions/out_unoptimized/itxn_loop.ir/itxn_loop.approval.0.approval.destructured.ir
rename to test_cases/inner_transactions/out_unoptimized/itxn_loop.ir/itxn_loop.approval.0.destructured.ir
diff --git a/test_cases/inner_transactions/out_unoptimized/itxn_loop.ir/itxn_loop.clear.0.clear.destructured.ir b/test_cases/inner_transactions/out_unoptimized/itxn_loop.ir/itxn_loop.clear.0.destructured.ir
similarity index 100%
rename from test_cases/inner_transactions/out_unoptimized/itxn_loop.ir/itxn_loop.clear.0.clear.destructured.ir
rename to test_cases/inner_transactions/out_unoptimized/itxn_loop.ir/itxn_loop.clear.0.destructured.ir
diff --git a/test_cases/inner_transactions/puya.log b/test_cases/inner_transactions/puya.log
index 885cc1dbee..51144b3590 100644
--- a/test_cases/inner_transactions/puya.log
+++ b/test_cases/inner_transactions/puya.log
@@ -1569,7 +1569,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to inner_transactions/out/itxn_loop.ir/itxn_loop.approval.0.approval.ssa.ir
+debug: Output IR to inner_transactions/out/itxn_loop.ir/itxn_loop.approval.0.ssa.ir
 info: optimizing approval program of test_cases.inner_transactions.itxn_loop.MyContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.inner_transactions.itxn_loop.MyContract.approval_program
@@ -1721,7 +1721,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Not removing empty block block@6 because it's used by phi nodes
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to inner_transactions/out/itxn_loop.ir/itxn_loop.approval.1.approval.ssa.opt.ir
+debug: Output IR to inner_transactions/out/itxn_loop.ir/itxn_loop.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.inner_transactions.itxn_loop.MyContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -1836,8 +1836,8 @@ debug: * to_do i#0
 debug: Performing post-SSA optimizations at level 1
 debug: Removing jump block block@6
 debug: branching to block@6 will be replaced with block@7
-debug: Output IR to inner_transactions/out/itxn_loop.ir/itxn_loop.approval.2.approval.destructured.ir
-debug: Output IR to inner_transactions/out/itxn_loop.ir/itxn_loop.clear.0.clear.ssa.ir
+debug: Output IR to inner_transactions/out/itxn_loop.ir/itxn_loop.approval.2.destructured.ir
+debug: Output IR to inner_transactions/out/itxn_loop.ir/itxn_loop.clear.0.ssa.ir
 info: optimizing clear program of test_cases.inner_transactions.itxn_loop.MyContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.inner_transactions.itxn_loop.MyContract.clear_state_program
@@ -1863,7 +1863,7 @@ debug: Coalescing local variables in test_cases.inner_transactions.itxn_loop.MyC
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inner_transactions.itxn_loop.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to inner_transactions/out/itxn_loop.ir/itxn_loop.clear.1.clear.destructured.ir
+debug: Output IR to inner_transactions/out/itxn_loop.ir/itxn_loop.clear.1.destructured.ir
 debug: Inserted main_for_header@1.ops[3]: 'l-store-copy continue_looping%0#0 0'
 debug: Replaced main_for_header@1.ops[5]: 'v-load continue_looping%0#0' with 'l-load continue_looping%0#0'
 debug: Inserted main_for_body@2.ops[3]: 'l-store-copy i#0 2'
@@ -1890,7 +1890,7 @@ debug: removing explicit jump to fall-through block main_for_header@1
 debug: removing explicit jump to fall-through block main_switch_case_next@7
 debug: removing explicit jump to fall-through block main_next_field@11
 inner_transactions/itxn_loop.py:16 debug: optimizing TEAL subroutine test_cases.inner_transactions.itxn_loop.MyContract.clear_state_program() -> uint64:
-debug: Output IR to inner_transactions/out/FieldTupleContract.ir/FieldTupleContract.approval.0.approval.ssa.ir
+debug: Output IR to inner_transactions/out/FieldTupleContract.ir/FieldTupleContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.inner_transactions.field_tuple_assignment.FieldTupleContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
@@ -2683,7 +2683,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.inner_transactions.field_tuple_assignment.FieldTupleContract.__puya_arc4_router__
-debug: Output IR to inner_transactions/out/FieldTupleContract.ir/FieldTupleContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to inner_transactions/out/FieldTupleContract.ir/FieldTupleContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -2776,7 +2776,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.inner_transactions.field_tuple_assignment.FieldTupleContract.__algopy_default_create
-debug: Output IR to inner_transactions/out/FieldTupleContract.ir/FieldTupleContract.approval.2.approval.ssa.opt.ir
+debug: Output IR to inner_transactions/out/FieldTupleContract.ir/FieldTupleContract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -2847,8 +2847,8 @@ debug: Coalescing local variables in test_cases.inner_transactions.field_tuple_a
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inner_transactions.field_tuple_assignment.FieldTupleContract.test_assign_tuple_mixed
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to inner_transactions/out/FieldTupleContract.ir/FieldTupleContract.approval.3.approval.destructured.ir
-debug: Output IR to inner_transactions/out/FieldTupleContract.ir/FieldTupleContract.clear.0.clear.ssa.ir
+debug: Output IR to inner_transactions/out/FieldTupleContract.ir/FieldTupleContract.approval.3.destructured.ir
+debug: Output IR to inner_transactions/out/FieldTupleContract.ir/FieldTupleContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.inner_transactions.field_tuple_assignment.FieldTupleContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -2874,7 +2874,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to inner_transactions/out/FieldTupleContract.ir/FieldTupleContract.clear.1.clear.destructured.ir
+debug: Output IR to inner_transactions/out/FieldTupleContract.ir/FieldTupleContract.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
@@ -3018,7 +3018,7 @@ debug: removing explicit jump to fall-through block main_after_if_else@11
 inner_transactions/field_tuple_assignment.py:25 debug: optimizing TEAL subroutine test_cases.inner_transactions.field_tuple_assignment.FieldTupleContract.test_assign_tuple() -> void:
 inner_transactions/field_tuple_assignment.py:85 debug: optimizing TEAL subroutine test_cases.inner_transactions.field_tuple_assignment.FieldTupleContract.test_assign_tuple_mixed() -> void:
 debug: optimizing TEAL subroutine algopy.arc4.ARC4Contract.clear_state_program() -> uint64:
-debug: Output IR to inner_transactions/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir
+debug: Output IR to inner_transactions/out/MyContract.ir/MyContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.inner_transactions.contract.MyContract at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.inner_transactions.contract.MyContract.__init__ for inlining
@@ -8833,7 +8833,7 @@ debug: Found equivalence set: bounded_index%0#0, bounded_index%1#0
 debug: Copy propagation made 1 modifications
 debug: removing unused subroutine test_cases.inner_transactions.contract.MyContract.__init__
 debug: removing unused subroutine test_cases.inner_transactions.contract.MyContract.approval_program
-debug: Output IR to inner_transactions/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to inner_transactions/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking single-use function test_cases.inner_transactions.contract.MyContract.test1 for inlining
 debug: marking single-use function test_cases.inner_transactions.contract.MyContract.test2 for inlining
@@ -9000,7 +9000,7 @@ debug: removing unused subroutine test_cases.inner_transactions.contract.MyContr
 debug: removing unused subroutine test_cases.inner_transactions.contract.MyContract.test2
 debug: removing unused subroutine test_cases.inner_transactions.contract.MyContract.test3
 debug: removing unused subroutine test_cases.inner_transactions.contract.MyContract.test4
-debug: Output IR to inner_transactions/out/MyContract.ir/MyContract.approval.2.approval.ssa.opt.ir
+debug: Output IR to inner_transactions/out/MyContract.ir/MyContract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.inner_transactions.contract.MyContract.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -9080,8 +9080,8 @@ debug: * to_do create_app_params%%param_OnCompletion_idx_0#0
 debug: * to_do create_app_params%%OnCompletion_length#0
 debug: * to_do create_app_params%%param_Note_idx_0#0
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to inner_transactions/out/MyContract.ir/MyContract.approval.3.approval.destructured.ir
-debug: Output IR to inner_transactions/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir
+debug: Output IR to inner_transactions/out/MyContract.ir/MyContract.approval.3.destructured.ir
+debug: Output IR to inner_transactions/out/MyContract.ir/MyContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.inner_transactions.contract.MyContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.inner_transactions.contract.MyContract.clear_state_program
@@ -9107,7 +9107,7 @@ debug: Coalescing local variables in test_cases.inner_transactions.contract.MyCo
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inner_transactions.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to inner_transactions/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir
+debug: Output IR to inner_transactions/out/MyContract.ir/MyContract.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%0#1 0'
@@ -9343,7 +9343,7 @@ debug: removing explicit jump to fall-through block main_after_if_else@19
 debug: removing explicit jump to fall-through block main_next_field@21
 debug: removing explicit jump to fall-through block main_next_field@23
 inner_transactions/contract.py:39 debug: optimizing TEAL subroutine test_cases.inner_transactions.contract.MyContract.clear_state_program() -> uint64:
-debug: Output IR to inner_transactions/out/Greeter.ir/Greeter.approval.0.approval.ssa.ir
+debug: Output IR to inner_transactions/out/Greeter.ir/Greeter.approval.0.ssa.ir
 info: optimizing approval program of test_cases.inner_transactions.c2c.Greeter at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.inner_transactions.c2c.Greeter.__init__ for inlining
@@ -9690,7 +9690,7 @@ debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.inner_transactions.c2c.Greeter.__init__
 debug: removing unused subroutine algopy.arc4.ARC4Contract.approval_program
 debug: removing unused subroutine test_cases.inner_transactions.c2c.Greeter.__algopy_default_create
-debug: Output IR to inner_transactions/out/Greeter.ir/Greeter.approval.1.approval.ssa.opt.ir
+debug: Output IR to inner_transactions/out/Greeter.ir/Greeter.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.inner_transactions.c2c.Greeter.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -9757,7 +9757,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.inner_transactions.c2c.Greeter.__puya_arc4_router__
-debug: Output IR to inner_transactions/out/Greeter.ir/Greeter.approval.2.approval.ssa.opt.ir
+debug: Output IR to inner_transactions/out/Greeter.ir/Greeter.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.inner_transactions.c2c.Greeter.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -9828,8 +9828,8 @@ debug: Coalescing local variables in test_cases.inner_transactions.c2c.Greeter.l
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inner_transactions.c2c.Greeter.log_greetings
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to inner_transactions/out/Greeter.ir/Greeter.approval.3.approval.destructured.ir
-debug: Output IR to inner_transactions/out/Greeter.ir/Greeter.clear.0.clear.ssa.ir
+debug: Output IR to inner_transactions/out/Greeter.ir/Greeter.approval.3.destructured.ir
+debug: Output IR to inner_transactions/out/Greeter.ir/Greeter.clear.0.ssa.ir
 info: optimizing clear program of test_cases.inner_transactions.c2c.Greeter at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -9855,7 +9855,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to inner_transactions/out/Greeter.ir/Greeter.clear.1.clear.destructured.ir
+debug: Output IR to inner_transactions/out/Greeter.ir/Greeter.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%0#2 0'
@@ -9945,7 +9945,7 @@ debug: removing explicit jump to fall-through block main_after_if_else@9
 inner_transactions/c2c.py:10 debug: optimizing TEAL subroutine test_cases.inner_transactions.c2c.Greeter.bootstrap() -> uint64:
 inner_transactions/c2c.py:23 debug: optimizing TEAL subroutine test_cases.inner_transactions.c2c.Greeter.log_greetings(name: bytes) -> void:
 debug: optimizing TEAL subroutine algopy.arc4.ARC4Contract.clear_state_program() -> uint64:
-debug: Output IR to inner_transactions/out/CreateAndTransferContract.ir/CreateAndTransferContract.approval.0.approval.ssa.ir
+debug: Output IR to inner_transactions/out/CreateAndTransferContract.ir/CreateAndTransferContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.inner_transactions.asset_transfer.CreateAndTransferContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
@@ -10164,7 +10164,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.inner_transactions.asset_transfer.CreateAndTransferContract.__puya_arc4_router__
-debug: Output IR to inner_transactions/out/CreateAndTransferContract.ir/CreateAndTransferContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to inner_transactions/out/CreateAndTransferContract.ir/CreateAndTransferContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -10217,7 +10217,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.inner_transactions.asset_transfer.CreateAndTransferContract.__algopy_default_create
-debug: Output IR to inner_transactions/out/CreateAndTransferContract.ir/CreateAndTransferContract.approval.2.approval.ssa.opt.ir
+debug: Output IR to inner_transactions/out/CreateAndTransferContract.ir/CreateAndTransferContract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -10266,8 +10266,8 @@ debug: Coalescing local variables in test_cases.inner_transactions.asset_transfe
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inner_transactions.asset_transfer.CreateAndTransferContract.create_and_transfer
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to inner_transactions/out/CreateAndTransferContract.ir/CreateAndTransferContract.approval.3.approval.destructured.ir
-debug: Output IR to inner_transactions/out/CreateAndTransferContract.ir/CreateAndTransferContract.clear.0.clear.ssa.ir
+debug: Output IR to inner_transactions/out/CreateAndTransferContract.ir/CreateAndTransferContract.approval.3.destructured.ir
+debug: Output IR to inner_transactions/out/CreateAndTransferContract.ir/CreateAndTransferContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.inner_transactions.asset_transfer.CreateAndTransferContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -10293,7 +10293,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to inner_transactions/out/CreateAndTransferContract.ir/CreateAndTransferContract.clear.1.clear.destructured.ir
+debug: Output IR to inner_transactions/out/CreateAndTransferContract.ir/CreateAndTransferContract.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
@@ -10344,7 +10344,7 @@ debug: inlining single reference block main___algopy_default_create@7 into main_
 debug: removing explicit jump to fall-through block main_after_if_else@10
 inner_transactions/asset_transfer.py:11 debug: optimizing TEAL subroutine test_cases.inner_transactions.asset_transfer.CreateAndTransferContract.create_and_transfer() -> void:
 debug: optimizing TEAL subroutine algopy.arc4.ARC4Contract.clear_state_program() -> uint64:
-debug: Output IR to inner_transactions/out/ArrayAccessContract.ir/ArrayAccessContract.approval.0.approval.ssa.ir
+debug: Output IR to inner_transactions/out/ArrayAccessContract.ir/ArrayAccessContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.inner_transactions.array_access.ArrayAccessContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
@@ -10693,7 +10693,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.inner_transactions.array_access.ArrayAccessContract.__puya_arc4_router__
-debug: Output IR to inner_transactions/out/ArrayAccessContract.ir/ArrayAccessContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to inner_transactions/out/ArrayAccessContract.ir/ArrayAccessContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -10755,7 +10755,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.inner_transactions.array_access.ArrayAccessContract.__algopy_default_create
-debug: Output IR to inner_transactions/out/ArrayAccessContract.ir/ArrayAccessContract.approval.2.approval.ssa.opt.ir
+debug: Output IR to inner_transactions/out/ArrayAccessContract.ir/ArrayAccessContract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -10804,8 +10804,8 @@ debug: Coalescing local variables in test_cases.inner_transactions.array_access.
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inner_transactions.array_access.ArrayAccessContract.test_branching_array_call
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to inner_transactions/out/ArrayAccessContract.ir/ArrayAccessContract.approval.3.approval.destructured.ir
-debug: Output IR to inner_transactions/out/ArrayAccessContract.ir/ArrayAccessContract.clear.0.clear.ssa.ir
+debug: Output IR to inner_transactions/out/ArrayAccessContract.ir/ArrayAccessContract.approval.3.destructured.ir
+debug: Output IR to inner_transactions/out/ArrayAccessContract.ir/ArrayAccessContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.inner_transactions.array_access.ArrayAccessContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -10831,7 +10831,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to inner_transactions/out/ArrayAccessContract.ir/ArrayAccessContract.clear.1.clear.destructured.ir
+debug: Output IR to inner_transactions/out/ArrayAccessContract.ir/ArrayAccessContract.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/inner_transactions/puya_O2.log b/test_cases/inner_transactions/puya_O2.log
index 84f4c79964..d1b043c67b 100644
--- a/test_cases/inner_transactions/puya_O2.log
+++ b/test_cases/inner_transactions/puya_O2.log
@@ -1833,7 +1833,7 @@ debug: * to_do i#0
 debug: Performing post-SSA optimizations at level 2
 debug: Removing jump block block@6
 debug: branching to block@6 will be replaced with block@7
-debug: Output IR to inner_transactions/out_O2/itxn_loop.ir/itxn_loop.approval.0.approval.destructured.ir
+debug: Output IR to inner_transactions/out_O2/itxn_loop.ir/itxn_loop.approval.0.destructured.ir
 info: optimizing clear program of test_cases.inner_transactions.itxn_loop.MyContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.inner_transactions.itxn_loop.MyContract.clear_state_program
@@ -1859,7 +1859,7 @@ debug: Coalescing local variables in test_cases.inner_transactions.itxn_loop.MyC
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inner_transactions.itxn_loop.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to inner_transactions/out_O2/itxn_loop.ir/itxn_loop.clear.0.clear.destructured.ir
+debug: Output IR to inner_transactions/out_O2/itxn_loop.ir/itxn_loop.clear.0.destructured.ir
 debug: Inserted main_for_header@1.ops[3]: 'l-store-copy continue_looping%0#0 0'
 debug: Replaced main_for_header@1.ops[5]: 'v-load continue_looping%0#0' with 'l-load continue_looping%0#0'
 debug: Inserted main_for_body@2.ops[3]: 'l-store-copy i#0 2'
@@ -3525,7 +3525,7 @@ debug: Coalescing tmp%0#0 with [tmp%0#4]
 debug: Coalescing resulted in 20 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to inner_transactions/out_O2/FieldTupleContract.ir/FieldTupleContract.approval.0.approval.destructured.ir
+debug: Output IR to inner_transactions/out_O2/FieldTupleContract.ir/FieldTupleContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.inner_transactions.field_tuple_assignment.FieldTupleContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -3551,7 +3551,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to inner_transactions/out_O2/FieldTupleContract.ir/FieldTupleContract.clear.0.clear.destructured.ir
+debug: Output IR to inner_transactions/out_O2/FieldTupleContract.ir/FieldTupleContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
@@ -9752,7 +9752,7 @@ debug: * to_do create_app_params%%param_OnCompletion_idx_0#0
 debug: * to_do create_app_params%%OnCompletion_length#0
 debug: * to_do create_app_params%%param_Note_idx_0#0
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to inner_transactions/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir
+debug: Output IR to inner_transactions/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.inner_transactions.contract.MyContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.inner_transactions.contract.MyContract.clear_state_program
@@ -9778,7 +9778,7 @@ debug: Coalescing local variables in test_cases.inner_transactions.contract.MyCo
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inner_transactions.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to inner_transactions/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir
+debug: Output IR to inner_transactions/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%0#1 0'
@@ -10621,7 +10621,7 @@ debug: Coalescing test_cases.inner_transactions.c2c.Greeter.__puya_arc4_router__
 debug: Coalescing resulted in 19 replacement/s
 debug: Sequentializing parallel copies in test_cases.inner_transactions.c2c.Greeter.__algopy_entrypoint_with_init
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to inner_transactions/out_O2/Greeter.ir/Greeter.approval.0.approval.destructured.ir
+debug: Output IR to inner_transactions/out_O2/Greeter.ir/Greeter.approval.0.destructured.ir
 info: optimizing clear program of test_cases.inner_transactions.c2c.Greeter at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -10647,7 +10647,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to inner_transactions/out_O2/Greeter.ir/Greeter.clear.0.clear.destructured.ir
+debug: Output IR to inner_transactions/out_O2/Greeter.ir/Greeter.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%0#2 0'
@@ -11161,7 +11161,7 @@ debug: Coalescing tmp%0#0 with [tmp%0#2]
 debug: Coalescing resulted in 8 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to inner_transactions/out_O2/CreateAndTransferContract.ir/CreateAndTransferContract.approval.0.approval.destructured.ir
+debug: Output IR to inner_transactions/out_O2/CreateAndTransferContract.ir/CreateAndTransferContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.inner_transactions.asset_transfer.CreateAndTransferContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -11187,7 +11187,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to inner_transactions/out_O2/CreateAndTransferContract.ir/CreateAndTransferContract.clear.0.clear.destructured.ir
+debug: Output IR to inner_transactions/out_O2/CreateAndTransferContract.ir/CreateAndTransferContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
@@ -11949,7 +11949,7 @@ debug: Coalescing test_cases.inner_transactions.array_access.ArrayAccessContract
 debug: Coalescing resulted in 13 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to inner_transactions/out_O2/ArrayAccessContract.ir/ArrayAccessContract.approval.0.approval.destructured.ir
+debug: Output IR to inner_transactions/out_O2/ArrayAccessContract.ir/ArrayAccessContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.inner_transactions.array_access.ArrayAccessContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -11975,7 +11975,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to inner_transactions/out_O2/ArrayAccessContract.ir/ArrayAccessContract.clear.0.clear.destructured.ir
+debug: Output IR to inner_transactions/out_O2/ArrayAccessContract.ir/ArrayAccessContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/inner_transactions/puya_unoptimized.log b/test_cases/inner_transactions/puya_unoptimized.log
index 6f14b7f804..6610b4bb21 100644
--- a/test_cases/inner_transactions/puya_unoptimized.log
+++ b/test_cases/inner_transactions/puya_unoptimized.log
@@ -1798,7 +1798,7 @@ debug: * to_do app_params%%param_ApplicationArgs_idx_0#0
 debug: * to_do app_params%%ApplicationArgs_length#0
 debug: * to_do i#0
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to inner_transactions/out_unoptimized/itxn_loop.ir/itxn_loop.approval.0.approval.destructured.ir
+debug: Output IR to inner_transactions/out_unoptimized/itxn_loop.ir/itxn_loop.approval.0.destructured.ir
 info: optimizing clear program of test_cases.inner_transactions.itxn_loop.MyContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.inner_transactions.itxn_loop.MyContract.clear_state_program
@@ -1816,7 +1816,7 @@ debug: Coalescing local variables in test_cases.inner_transactions.itxn_loop.MyC
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inner_transactions.itxn_loop.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to inner_transactions/out_unoptimized/itxn_loop.ir/itxn_loop.clear.0.clear.destructured.ir
+debug: Output IR to inner_transactions/out_unoptimized/itxn_loop.ir/itxn_loop.clear.0.destructured.ir
 debug: Inserted main_for_header@1.ops[3]: 'l-store-copy continue_looping%0#0 0'
 debug: Replaced main_for_header@1.ops[5]: 'v-load continue_looping%0#0' with 'l-load continue_looping%0#0'
 debug: Inserted main_for_body@2.ops[3]: 'l-store-copy i#0 2'
@@ -2608,7 +2608,7 @@ debug: Coalescing local variables in test_cases.inner_transactions.field_tuple_a
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inner_transactions.field_tuple_assignment.FieldTupleContract.test_assign_tuple_mixed
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to inner_transactions/out_unoptimized/FieldTupleContract.ir/FieldTupleContract.approval.0.approval.destructured.ir
+debug: Output IR to inner_transactions/out_unoptimized/FieldTupleContract.ir/FieldTupleContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.inner_transactions.field_tuple_assignment.FieldTupleContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -2626,7 +2626,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to inner_transactions/out_unoptimized/FieldTupleContract.ir/FieldTupleContract.clear.0.clear.destructured.ir
+debug: Output IR to inner_transactions/out_unoptimized/FieldTupleContract.ir/FieldTupleContract.clear.0.destructured.ir
 debug: Inserted main_block@1.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main_block@1.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_block@1.ops[6]: 'l-store-copy tmp%1#0 0'
@@ -5799,7 +5799,7 @@ debug: Coalescing local variables in test_cases.inner_transactions.contract.MyCo
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inner_transactions.contract.MyContract.test4
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to inner_transactions/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir
+debug: Output IR to inner_transactions/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.inner_transactions.contract.MyContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.inner_transactions.contract.MyContract.clear_state_program
@@ -5817,7 +5817,7 @@ debug: Coalescing local variables in test_cases.inner_transactions.contract.MyCo
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inner_transactions.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to inner_transactions/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir
+debug: Output IR to inner_transactions/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%1#0 0'
@@ -6466,7 +6466,7 @@ debug: Coalescing local variables in test_cases.inner_transactions.c2c.Greeter.l
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inner_transactions.c2c.Greeter.log_greetings
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to inner_transactions/out_unoptimized/Greeter.ir/Greeter.approval.0.approval.destructured.ir
+debug: Output IR to inner_transactions/out_unoptimized/Greeter.ir/Greeter.approval.0.destructured.ir
 info: optimizing clear program of test_cases.inner_transactions.c2c.Greeter at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -6484,7 +6484,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to inner_transactions/out_unoptimized/Greeter.ir/Greeter.clear.0.clear.destructured.ir
+debug: Output IR to inner_transactions/out_unoptimized/Greeter.ir/Greeter.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%1#0 0'
@@ -6804,7 +6804,7 @@ debug: Coalescing local variables in test_cases.inner_transactions.asset_transfe
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inner_transactions.asset_transfer.CreateAndTransferContract.create_and_transfer
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to inner_transactions/out_unoptimized/CreateAndTransferContract.ir/CreateAndTransferContract.approval.0.approval.destructured.ir
+debug: Output IR to inner_transactions/out_unoptimized/CreateAndTransferContract.ir/CreateAndTransferContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.inner_transactions.asset_transfer.CreateAndTransferContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -6822,7 +6822,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to inner_transactions/out_unoptimized/CreateAndTransferContract.ir/CreateAndTransferContract.clear.0.clear.destructured.ir
+debug: Output IR to inner_transactions/out_unoptimized/CreateAndTransferContract.ir/CreateAndTransferContract.clear.0.destructured.ir
 debug: Inserted main_block@1.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main_block@1.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_block@1.ops[6]: 'l-store-copy tmp%1#0 0'
@@ -7223,7 +7223,7 @@ debug: Coalescing local variables in test_cases.inner_transactions.array_access.
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inner_transactions.array_access.ArrayAccessContract.test_branching_array_call
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to inner_transactions/out_unoptimized/ArrayAccessContract.ir/ArrayAccessContract.approval.0.approval.destructured.ir
+debug: Output IR to inner_transactions/out_unoptimized/ArrayAccessContract.ir/ArrayAccessContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.inner_transactions.array_access.ArrayAccessContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -7241,7 +7241,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to inner_transactions/out_unoptimized/ArrayAccessContract.ir/ArrayAccessContract.clear.0.clear.destructured.ir
+debug: Output IR to inner_transactions/out_unoptimized/ArrayAccessContract.ir/ArrayAccessContract.clear.0.destructured.ir
 debug: Inserted main_block@1.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main_block@1.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_block@1.ops[6]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/inner_transactions_assignment/out/Contract.ir/Contract.approval.0.approval.ssa.ir b/test_cases/inner_transactions_assignment/out/Contract.ir/Contract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/inner_transactions_assignment/out/Contract.ir/Contract.approval.0.approval.ssa.ir
rename to test_cases/inner_transactions_assignment/out/Contract.ir/Contract.approval.0.ssa.ir
diff --git a/test_cases/inner_transactions_assignment/out/Contract.ir/Contract.approval.1.approval.ssa.opt.ir b/test_cases/inner_transactions_assignment/out/Contract.ir/Contract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/inner_transactions_assignment/out/Contract.ir/Contract.approval.1.approval.ssa.opt.ir
rename to test_cases/inner_transactions_assignment/out/Contract.ir/Contract.approval.1.ssa.opt.ir
diff --git a/test_cases/inner_transactions_assignment/out/Contract.ir/Contract.approval.2.approval.ssa.opt.ir b/test_cases/inner_transactions_assignment/out/Contract.ir/Contract.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/inner_transactions_assignment/out/Contract.ir/Contract.approval.2.approval.ssa.opt.ir
rename to test_cases/inner_transactions_assignment/out/Contract.ir/Contract.approval.2.ssa.opt.ir
diff --git a/test_cases/inner_transactions_assignment/out/Contract.ir/Contract.approval.3.approval.destructured.ir b/test_cases/inner_transactions_assignment/out/Contract.ir/Contract.approval.3.destructured.ir
similarity index 100%
rename from test_cases/inner_transactions_assignment/out/Contract.ir/Contract.approval.3.approval.destructured.ir
rename to test_cases/inner_transactions_assignment/out/Contract.ir/Contract.approval.3.destructured.ir
diff --git a/test_cases/inner_transactions_assignment/out/Contract.ir/Contract.clear.0.clear.ssa.ir b/test_cases/inner_transactions_assignment/out/Contract.ir/Contract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/inner_transactions_assignment/out/Contract.ir/Contract.clear.0.clear.ssa.ir
rename to test_cases/inner_transactions_assignment/out/Contract.ir/Contract.clear.0.ssa.ir
diff --git a/test_cases/inner_transactions_assignment/out/Contract.ir/Contract.clear.1.clear.destructured.ir b/test_cases/inner_transactions_assignment/out/Contract.ir/Contract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/inner_transactions_assignment/out/Contract.ir/Contract.clear.1.clear.destructured.ir
rename to test_cases/inner_transactions_assignment/out/Contract.ir/Contract.clear.1.destructured.ir
diff --git a/test_cases/inner_transactions_assignment/out_O2/Contract.ir/Contract.approval.0.approval.destructured.ir b/test_cases/inner_transactions_assignment/out_O2/Contract.ir/Contract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/inner_transactions_assignment/out_O2/Contract.ir/Contract.approval.0.approval.destructured.ir
rename to test_cases/inner_transactions_assignment/out_O2/Contract.ir/Contract.approval.0.destructured.ir
diff --git a/test_cases/inner_transactions_assignment/out_O2/Contract.ir/Contract.clear.0.clear.destructured.ir b/test_cases/inner_transactions_assignment/out_O2/Contract.ir/Contract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/inner_transactions_assignment/out_O2/Contract.ir/Contract.clear.0.clear.destructured.ir
rename to test_cases/inner_transactions_assignment/out_O2/Contract.ir/Contract.clear.0.destructured.ir
diff --git a/test_cases/inner_transactions_assignment/out_unoptimized/Contract.ir/Contract.approval.0.approval.destructured.ir b/test_cases/inner_transactions_assignment/out_unoptimized/Contract.ir/Contract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/inner_transactions_assignment/out_unoptimized/Contract.ir/Contract.approval.0.approval.destructured.ir
rename to test_cases/inner_transactions_assignment/out_unoptimized/Contract.ir/Contract.approval.0.destructured.ir
diff --git a/test_cases/inner_transactions_assignment/out_unoptimized/Contract.ir/Contract.clear.0.clear.destructured.ir b/test_cases/inner_transactions_assignment/out_unoptimized/Contract.ir/Contract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/inner_transactions_assignment/out_unoptimized/Contract.ir/Contract.clear.0.clear.destructured.ir
rename to test_cases/inner_transactions_assignment/out_unoptimized/Contract.ir/Contract.clear.0.destructured.ir
diff --git a/test_cases/inner_transactions_assignment/puya.log b/test_cases/inner_transactions_assignment/puya.log
index 174ca0179e..e7714a3971 100644
--- a/test_cases/inner_transactions_assignment/puya.log
+++ b/test_cases/inner_transactions_assignment/puya.log
@@ -1593,7 +1593,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to inner_transactions_assignment/out/Contract.ir/Contract.approval.0.approval.ssa.ir
+debug: Output IR to inner_transactions_assignment/out/Contract.ir/Contract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.inner_transactions_assignment.contract.Contract at level 1
 debug: Begin optimization pass 1/100
 debug: marking trivial method test_cases.inner_transactions_assignment.contract.echo as inlineable
@@ -2792,7 +2792,7 @@ debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.inner_transactions_assignment.contract.Contract.__puya_arc4_router__
 debug: removing unused subroutine test_cases.inner_transactions_assignment.contract.echo
-debug: Output IR to inner_transactions_assignment/out/Contract.ir/Contract.approval.1.approval.ssa.opt.ir
+debug: Output IR to inner_transactions_assignment/out/Contract.ir/Contract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -3112,7 +3112,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.inner_transactions_assignment.contract.Contract.__algopy_default_create
-debug: Output IR to inner_transactions_assignment/out/Contract.ir/Contract.approval.2.approval.ssa.opt.ir
+debug: Output IR to inner_transactions_assignment/out/Contract.ir/Contract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -3185,8 +3185,8 @@ debug: Coalescing nested_tuple.1.1.Note#0 with [nested_tuple.1.1.Note#1]
 debug: Coalescing resulted in 4 replacement/s
 debug: Sequentializing parallel copies in test_cases.inner_transactions_assignment.contract.Contract.test_itxn_nested
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to inner_transactions_assignment/out/Contract.ir/Contract.approval.3.approval.destructured.ir
-debug: Output IR to inner_transactions_assignment/out/Contract.ir/Contract.clear.0.clear.ssa.ir
+debug: Output IR to inner_transactions_assignment/out/Contract.ir/Contract.approval.3.destructured.ir
+debug: Output IR to inner_transactions_assignment/out/Contract.ir/Contract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.inner_transactions_assignment.contract.Contract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -3212,7 +3212,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to inner_transactions_assignment/out/Contract.ir/Contract.clear.1.clear.destructured.ir
+debug: Output IR to inner_transactions_assignment/out/Contract.ir/Contract.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/inner_transactions_assignment/puya_O2.log b/test_cases/inner_transactions_assignment/puya_O2.log
index 03219c7202..3c9720b1d9 100644
--- a/test_cases/inner_transactions_assignment/puya_O2.log
+++ b/test_cases/inner_transactions_assignment/puya_O2.log
@@ -4427,7 +4427,7 @@ debug: Coalescing nested_tuple.1.1.Note#0 with [nested_tuple.1.1.Note#1]
 debug: Coalescing resulted in 23 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to inner_transactions_assignment/out_O2/Contract.ir/Contract.approval.0.approval.destructured.ir
+debug: Output IR to inner_transactions_assignment/out_O2/Contract.ir/Contract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.inner_transactions_assignment.contract.Contract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -4453,7 +4453,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to inner_transactions_assignment/out_O2/Contract.ir/Contract.clear.0.clear.destructured.ir
+debug: Output IR to inner_transactions_assignment/out_O2/Contract.ir/Contract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/inner_transactions_assignment/puya_unoptimized.log b/test_cases/inner_transactions_assignment/puya_unoptimized.log
index 0b883d78a3..bf51a2eba8 100644
--- a/test_cases/inner_transactions_assignment/puya_unoptimized.log
+++ b/test_cases/inner_transactions_assignment/puya_unoptimized.log
@@ -3125,7 +3125,7 @@ debug: Coalescing local variables in test_cases.inner_transactions_assignment.co
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.inner_transactions_assignment.contract.echo
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to inner_transactions_assignment/out_unoptimized/Contract.ir/Contract.approval.0.approval.destructured.ir
+debug: Output IR to inner_transactions_assignment/out_unoptimized/Contract.ir/Contract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.inner_transactions_assignment.contract.Contract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -3143,7 +3143,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to inner_transactions_assignment/out_unoptimized/Contract.ir/Contract.clear.0.clear.destructured.ir
+debug: Output IR to inner_transactions_assignment/out_unoptimized/Contract.ir/Contract.clear.0.destructured.ir
 debug: Inserted main_block@1.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main_block@1.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_block@1.ops[6]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/intrinsics/out/ImmediateVariants.ir/ImmediateVariants.approval.0.approval.ssa.ir b/test_cases/intrinsics/out/ImmediateVariants.ir/ImmediateVariants.approval.0.ssa.ir
similarity index 100%
rename from test_cases/intrinsics/out/ImmediateVariants.ir/ImmediateVariants.approval.0.approval.ssa.ir
rename to test_cases/intrinsics/out/ImmediateVariants.ir/ImmediateVariants.approval.0.ssa.ir
diff --git a/test_cases/intrinsics/out/ImmediateVariants.ir/ImmediateVariants.approval.1.approval.ssa.opt.ir b/test_cases/intrinsics/out/ImmediateVariants.ir/ImmediateVariants.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/intrinsics/out/ImmediateVariants.ir/ImmediateVariants.approval.1.approval.ssa.opt.ir
rename to test_cases/intrinsics/out/ImmediateVariants.ir/ImmediateVariants.approval.1.ssa.opt.ir
diff --git a/test_cases/intrinsics/out/ImmediateVariants.ir/ImmediateVariants.approval.2.approval.destructured.ir b/test_cases/intrinsics/out/ImmediateVariants.ir/ImmediateVariants.approval.2.destructured.ir
similarity index 100%
rename from test_cases/intrinsics/out/ImmediateVariants.ir/ImmediateVariants.approval.2.approval.destructured.ir
rename to test_cases/intrinsics/out/ImmediateVariants.ir/ImmediateVariants.approval.2.destructured.ir
diff --git a/test_cases/intrinsics/out/ImmediateVariants.ir/ImmediateVariants.clear.0.clear.ssa.ir b/test_cases/intrinsics/out/ImmediateVariants.ir/ImmediateVariants.clear.0.ssa.ir
similarity index 100%
rename from test_cases/intrinsics/out/ImmediateVariants.ir/ImmediateVariants.clear.0.clear.ssa.ir
rename to test_cases/intrinsics/out/ImmediateVariants.ir/ImmediateVariants.clear.0.ssa.ir
diff --git a/test_cases/intrinsics/out/ImmediateVariants.ir/ImmediateVariants.clear.1.clear.destructured.ir b/test_cases/intrinsics/out/ImmediateVariants.ir/ImmediateVariants.clear.1.destructured.ir
similarity index 100%
rename from test_cases/intrinsics/out/ImmediateVariants.ir/ImmediateVariants.clear.1.clear.destructured.ir
rename to test_cases/intrinsics/out/ImmediateVariants.ir/ImmediateVariants.clear.1.destructured.ir
diff --git a/test_cases/intrinsics/out/Overloaded.ir/Overloaded.approval.0.approval.ssa.ir b/test_cases/intrinsics/out/Overloaded.ir/Overloaded.approval.0.ssa.ir
similarity index 100%
rename from test_cases/intrinsics/out/Overloaded.ir/Overloaded.approval.0.approval.ssa.ir
rename to test_cases/intrinsics/out/Overloaded.ir/Overloaded.approval.0.ssa.ir
diff --git a/test_cases/intrinsics/out/Overloaded.ir/Overloaded.approval.1.approval.ssa.opt.ir b/test_cases/intrinsics/out/Overloaded.ir/Overloaded.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/intrinsics/out/Overloaded.ir/Overloaded.approval.1.approval.ssa.opt.ir
rename to test_cases/intrinsics/out/Overloaded.ir/Overloaded.approval.1.ssa.opt.ir
diff --git a/test_cases/intrinsics/out/Overloaded.ir/Overloaded.approval.2.approval.destructured.ir b/test_cases/intrinsics/out/Overloaded.ir/Overloaded.approval.2.destructured.ir
similarity index 100%
rename from test_cases/intrinsics/out/Overloaded.ir/Overloaded.approval.2.approval.destructured.ir
rename to test_cases/intrinsics/out/Overloaded.ir/Overloaded.approval.2.destructured.ir
diff --git a/test_cases/intrinsics/out/Overloaded.ir/Overloaded.clear.0.clear.ssa.ir b/test_cases/intrinsics/out/Overloaded.ir/Overloaded.clear.0.ssa.ir
similarity index 100%
rename from test_cases/intrinsics/out/Overloaded.ir/Overloaded.clear.0.clear.ssa.ir
rename to test_cases/intrinsics/out/Overloaded.ir/Overloaded.clear.0.ssa.ir
diff --git a/test_cases/intrinsics/out/Overloaded.ir/Overloaded.clear.1.clear.destructured.ir b/test_cases/intrinsics/out/Overloaded.ir/Overloaded.clear.1.destructured.ir
similarity index 100%
rename from test_cases/intrinsics/out/Overloaded.ir/Overloaded.clear.1.clear.destructured.ir
rename to test_cases/intrinsics/out/Overloaded.ir/Overloaded.clear.1.destructured.ir
diff --git a/test_cases/intrinsics/out_O2/ImmediateVariants.ir/ImmediateVariants.approval.0.approval.destructured.ir b/test_cases/intrinsics/out_O2/ImmediateVariants.ir/ImmediateVariants.approval.0.destructured.ir
similarity index 100%
rename from test_cases/intrinsics/out_O2/ImmediateVariants.ir/ImmediateVariants.approval.0.approval.destructured.ir
rename to test_cases/intrinsics/out_O2/ImmediateVariants.ir/ImmediateVariants.approval.0.destructured.ir
diff --git a/test_cases/intrinsics/out_O2/ImmediateVariants.ir/ImmediateVariants.clear.0.clear.destructured.ir b/test_cases/intrinsics/out_O2/ImmediateVariants.ir/ImmediateVariants.clear.0.destructured.ir
similarity index 100%
rename from test_cases/intrinsics/out_O2/ImmediateVariants.ir/ImmediateVariants.clear.0.clear.destructured.ir
rename to test_cases/intrinsics/out_O2/ImmediateVariants.ir/ImmediateVariants.clear.0.destructured.ir
diff --git a/test_cases/intrinsics/out_O2/Overloaded.ir/Overloaded.approval.0.approval.destructured.ir b/test_cases/intrinsics/out_O2/Overloaded.ir/Overloaded.approval.0.destructured.ir
similarity index 100%
rename from test_cases/intrinsics/out_O2/Overloaded.ir/Overloaded.approval.0.approval.destructured.ir
rename to test_cases/intrinsics/out_O2/Overloaded.ir/Overloaded.approval.0.destructured.ir
diff --git a/test_cases/intrinsics/out_O2/Overloaded.ir/Overloaded.clear.0.clear.destructured.ir b/test_cases/intrinsics/out_O2/Overloaded.ir/Overloaded.clear.0.destructured.ir
similarity index 100%
rename from test_cases/intrinsics/out_O2/Overloaded.ir/Overloaded.clear.0.clear.destructured.ir
rename to test_cases/intrinsics/out_O2/Overloaded.ir/Overloaded.clear.0.destructured.ir
diff --git a/test_cases/intrinsics/out_unoptimized/ImmediateVariants.ir/ImmediateVariants.approval.0.approval.destructured.ir b/test_cases/intrinsics/out_unoptimized/ImmediateVariants.ir/ImmediateVariants.approval.0.destructured.ir
similarity index 100%
rename from test_cases/intrinsics/out_unoptimized/ImmediateVariants.ir/ImmediateVariants.approval.0.approval.destructured.ir
rename to test_cases/intrinsics/out_unoptimized/ImmediateVariants.ir/ImmediateVariants.approval.0.destructured.ir
diff --git a/test_cases/intrinsics/out_unoptimized/ImmediateVariants.ir/ImmediateVariants.clear.0.clear.destructured.ir b/test_cases/intrinsics/out_unoptimized/ImmediateVariants.ir/ImmediateVariants.clear.0.destructured.ir
similarity index 100%
rename from test_cases/intrinsics/out_unoptimized/ImmediateVariants.ir/ImmediateVariants.clear.0.clear.destructured.ir
rename to test_cases/intrinsics/out_unoptimized/ImmediateVariants.ir/ImmediateVariants.clear.0.destructured.ir
diff --git a/test_cases/intrinsics/out_unoptimized/Overloaded.ir/Overloaded.approval.0.approval.destructured.ir b/test_cases/intrinsics/out_unoptimized/Overloaded.ir/Overloaded.approval.0.destructured.ir
similarity index 100%
rename from test_cases/intrinsics/out_unoptimized/Overloaded.ir/Overloaded.approval.0.approval.destructured.ir
rename to test_cases/intrinsics/out_unoptimized/Overloaded.ir/Overloaded.approval.0.destructured.ir
diff --git a/test_cases/intrinsics/out_unoptimized/Overloaded.ir/Overloaded.clear.0.clear.destructured.ir b/test_cases/intrinsics/out_unoptimized/Overloaded.ir/Overloaded.clear.0.destructured.ir
similarity index 100%
rename from test_cases/intrinsics/out_unoptimized/Overloaded.ir/Overloaded.clear.0.clear.destructured.ir
rename to test_cases/intrinsics/out_unoptimized/Overloaded.ir/Overloaded.clear.0.destructured.ir
diff --git a/test_cases/intrinsics/puya.log b/test_cases/intrinsics/puya.log
index 86e3b4eb65..3658344522 100644
--- a/test_cases/intrinsics/puya.log
+++ b/test_cases/intrinsics/puya.log
@@ -460,7 +460,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to intrinsics/out/Overloaded.ir/Overloaded.approval.0.approval.ssa.ir
+debug: Output IR to intrinsics/out/Overloaded.ir/Overloaded.approval.0.ssa.ir
 info: optimizing approval program of test_cases.intrinsics.overloaded.Overloaded at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.intrinsics.overloaded.Overloaded.__init__ for inlining
@@ -570,7 +570,7 @@ debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.intrinsics.overloaded.Overloaded.__init__
 debug: removing unused subroutine test_cases.intrinsics.overloaded.Overloaded.approval_program
-debug: Output IR to intrinsics/out/Overloaded.ir/Overloaded.approval.1.approval.ssa.opt.ir
+debug: Output IR to intrinsics/out/Overloaded.ir/Overloaded.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.intrinsics.overloaded.Overloaded.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -595,8 +595,8 @@ debug: Coalescing local variables in test_cases.intrinsics.overloaded.Overloaded
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.intrinsics.overloaded.Overloaded.__algopy_entrypoint_with_init
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to intrinsics/out/Overloaded.ir/Overloaded.approval.2.approval.destructured.ir
-debug: Output IR to intrinsics/out/Overloaded.ir/Overloaded.clear.0.clear.ssa.ir
+debug: Output IR to intrinsics/out/Overloaded.ir/Overloaded.approval.2.destructured.ir
+debug: Output IR to intrinsics/out/Overloaded.ir/Overloaded.clear.0.ssa.ir
 info: optimizing clear program of test_cases.intrinsics.overloaded.Overloaded at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.intrinsics.overloaded.Overloaded.clear_state_program
@@ -622,7 +622,7 @@ debug: Coalescing local variables in test_cases.intrinsics.overloaded.Overloaded
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.intrinsics.overloaded.Overloaded.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to intrinsics/out/Overloaded.ir/Overloaded.clear.1.clear.destructured.ir
+debug: Output IR to intrinsics/out/Overloaded.ir/Overloaded.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[9]: 'l-store-copy tmp%2#0 0'
@@ -642,7 +642,7 @@ debug: optimizing TEAL subroutine test_cases.intrinsics.overloaded.Overloaded.__
 debug: inlining single reference block main_call___init__@1 into main
 debug: removing explicit jump to fall-through block main_after_if_else@2
 intrinsics/overloaded.py:17 debug: optimizing TEAL subroutine test_cases.intrinsics.overloaded.Overloaded.clear_state_program() -> uint64:
-debug: Output IR to intrinsics/out/ImmediateVariants.ir/ImmediateVariants.approval.0.approval.ssa.ir
+debug: Output IR to intrinsics/out/ImmediateVariants.ir/ImmediateVariants.approval.0.ssa.ir
 info: optimizing approval program of test_cases.intrinsics.immediate_variants.ImmediateVariants at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.intrinsics.immediate_variants.ImmediateVariants.approval_program
@@ -663,7 +663,7 @@ debug: Optimizer: Remove Linear Jump
 debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to intrinsics/out/ImmediateVariants.ir/ImmediateVariants.approval.1.approval.ssa.opt.ir
+debug: Output IR to intrinsics/out/ImmediateVariants.ir/ImmediateVariants.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.intrinsics.immediate_variants.ImmediateVariants.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -688,8 +688,8 @@ debug: Coalescing local variables in test_cases.intrinsics.immediate_variants.Im
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.intrinsics.immediate_variants.ImmediateVariants.approval_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to intrinsics/out/ImmediateVariants.ir/ImmediateVariants.approval.2.approval.destructured.ir
-debug: Output IR to intrinsics/out/ImmediateVariants.ir/ImmediateVariants.clear.0.clear.ssa.ir
+debug: Output IR to intrinsics/out/ImmediateVariants.ir/ImmediateVariants.approval.2.destructured.ir
+debug: Output IR to intrinsics/out/ImmediateVariants.ir/ImmediateVariants.clear.0.ssa.ir
 info: optimizing clear program of test_cases.intrinsics.immediate_variants.ImmediateVariants at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.intrinsics.immediate_variants.ImmediateVariants.clear_state_program
@@ -715,7 +715,7 @@ debug: Coalescing local variables in test_cases.intrinsics.immediate_variants.Im
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.intrinsics.immediate_variants.ImmediateVariants.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to intrinsics/out/ImmediateVariants.ir/ImmediateVariants.clear.1.clear.destructured.ir
+debug: Output IR to intrinsics/out/ImmediateVariants.ir/ImmediateVariants.clear.1.destructured.ir
 debug: Inserted main.ops[3]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[5]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[8]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/intrinsics/puya_O2.log b/test_cases/intrinsics/puya_O2.log
index 46dbe4a9c9..1a7aa59096 100644
--- a/test_cases/intrinsics/puya_O2.log
+++ b/test_cases/intrinsics/puya_O2.log
@@ -592,7 +592,7 @@ debug: Coalescing local variables in test_cases.intrinsics.overloaded.Overloaded
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.intrinsics.overloaded.Overloaded.__algopy_entrypoint_with_init
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to intrinsics/out_O2/Overloaded.ir/Overloaded.approval.0.approval.destructured.ir
+debug: Output IR to intrinsics/out_O2/Overloaded.ir/Overloaded.approval.0.destructured.ir
 info: optimizing clear program of test_cases.intrinsics.overloaded.Overloaded at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.intrinsics.overloaded.Overloaded.clear_state_program
@@ -618,7 +618,7 @@ debug: Coalescing local variables in test_cases.intrinsics.overloaded.Overloaded
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.intrinsics.overloaded.Overloaded.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to intrinsics/out_O2/Overloaded.ir/Overloaded.clear.0.clear.destructured.ir
+debug: Output IR to intrinsics/out_O2/Overloaded.ir/Overloaded.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[9]: 'l-store-copy tmp%2#0 0'
@@ -682,7 +682,7 @@ debug: Coalescing local variables in test_cases.intrinsics.immediate_variants.Im
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.intrinsics.immediate_variants.ImmediateVariants.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to intrinsics/out_O2/ImmediateVariants.ir/ImmediateVariants.approval.0.approval.destructured.ir
+debug: Output IR to intrinsics/out_O2/ImmediateVariants.ir/ImmediateVariants.approval.0.destructured.ir
 info: optimizing clear program of test_cases.intrinsics.immediate_variants.ImmediateVariants at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.intrinsics.immediate_variants.ImmediateVariants.clear_state_program
@@ -708,7 +708,7 @@ debug: Coalescing local variables in test_cases.intrinsics.immediate_variants.Im
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.intrinsics.immediate_variants.ImmediateVariants.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to intrinsics/out_O2/ImmediateVariants.ir/ImmediateVariants.clear.0.clear.destructured.ir
+debug: Output IR to intrinsics/out_O2/ImmediateVariants.ir/ImmediateVariants.clear.0.destructured.ir
 debug: Inserted main.ops[3]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[5]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[8]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/intrinsics/puya_unoptimized.log b/test_cases/intrinsics/puya_unoptimized.log
index 220cff7641..4ca4f44634 100644
--- a/test_cases/intrinsics/puya_unoptimized.log
+++ b/test_cases/intrinsics/puya_unoptimized.log
@@ -504,7 +504,7 @@ debug: Coalescing local variables in test_cases.intrinsics.overloaded.Overloaded
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.intrinsics.overloaded.Overloaded.approval_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to intrinsics/out_unoptimized/Overloaded.ir/Overloaded.approval.0.approval.destructured.ir
+debug: Output IR to intrinsics/out_unoptimized/Overloaded.ir/Overloaded.approval.0.destructured.ir
 info: optimizing clear program of test_cases.intrinsics.overloaded.Overloaded at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.intrinsics.overloaded.Overloaded.clear_state_program
@@ -522,7 +522,7 @@ debug: Coalescing local variables in test_cases.intrinsics.overloaded.Overloaded
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.intrinsics.overloaded.Overloaded.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to intrinsics/out_unoptimized/Overloaded.ir/Overloaded.clear.0.clear.destructured.ir
+debug: Output IR to intrinsics/out_unoptimized/Overloaded.ir/Overloaded.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%1#0 0'
@@ -587,7 +587,7 @@ debug: Coalescing local variables in test_cases.intrinsics.immediate_variants.Im
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.intrinsics.immediate_variants.ImmediateVariants.approval_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to intrinsics/out_unoptimized/ImmediateVariants.ir/ImmediateVariants.approval.0.approval.destructured.ir
+debug: Output IR to intrinsics/out_unoptimized/ImmediateVariants.ir/ImmediateVariants.approval.0.destructured.ir
 info: optimizing clear program of test_cases.intrinsics.immediate_variants.ImmediateVariants at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.intrinsics.immediate_variants.ImmediateVariants.clear_state_program
@@ -605,7 +605,7 @@ debug: Coalescing local variables in test_cases.intrinsics.immediate_variants.Im
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.intrinsics.immediate_variants.ImmediateVariants.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to intrinsics/out_unoptimized/ImmediateVariants.ir/ImmediateVariants.clear.0.clear.destructured.ir
+debug: Output IR to intrinsics/out_unoptimized/ImmediateVariants.ir/ImmediateVariants.clear.0.destructured.ir
 debug: Inserted main.ops[3]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[5]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[8]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/iteration/out/IndexableIterationTest.ir/IndexableIterationTest.approval.0.approval.ssa.ir b/test_cases/iteration/out/IndexableIterationTest.ir/IndexableIterationTest.approval.0.ssa.ir
similarity index 100%
rename from test_cases/iteration/out/IndexableIterationTest.ir/IndexableIterationTest.approval.0.approval.ssa.ir
rename to test_cases/iteration/out/IndexableIterationTest.ir/IndexableIterationTest.approval.0.ssa.ir
diff --git a/test_cases/iteration/out/IndexableIterationTest.ir/IndexableIterationTest.approval.1.approval.ssa.opt.ir b/test_cases/iteration/out/IndexableIterationTest.ir/IndexableIterationTest.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/iteration/out/IndexableIterationTest.ir/IndexableIterationTest.approval.1.approval.ssa.opt.ir
rename to test_cases/iteration/out/IndexableIterationTest.ir/IndexableIterationTest.approval.1.ssa.opt.ir
diff --git a/test_cases/iteration/out/IndexableIterationTest.ir/IndexableIterationTest.approval.2.approval.destructured.ir b/test_cases/iteration/out/IndexableIterationTest.ir/IndexableIterationTest.approval.2.destructured.ir
similarity index 100%
rename from test_cases/iteration/out/IndexableIterationTest.ir/IndexableIterationTest.approval.2.approval.destructured.ir
rename to test_cases/iteration/out/IndexableIterationTest.ir/IndexableIterationTest.approval.2.destructured.ir
diff --git a/test_cases/iteration/out/IndexableIterationTest.ir/IndexableIterationTest.clear.0.clear.ssa.ir b/test_cases/iteration/out/IndexableIterationTest.ir/IndexableIterationTest.clear.0.ssa.ir
similarity index 100%
rename from test_cases/iteration/out/IndexableIterationTest.ir/IndexableIterationTest.clear.0.clear.ssa.ir
rename to test_cases/iteration/out/IndexableIterationTest.ir/IndexableIterationTest.clear.0.ssa.ir
diff --git a/test_cases/iteration/out/IndexableIterationTest.ir/IndexableIterationTest.clear.1.clear.destructured.ir b/test_cases/iteration/out/IndexableIterationTest.ir/IndexableIterationTest.clear.1.destructured.ir
similarity index 100%
rename from test_cases/iteration/out/IndexableIterationTest.ir/IndexableIterationTest.clear.1.clear.destructured.ir
rename to test_cases/iteration/out/IndexableIterationTest.ir/IndexableIterationTest.clear.1.destructured.ir
diff --git a/test_cases/iteration/out/TupleIterationTest.ir/TupleIterationTest.approval.0.approval.ssa.ir b/test_cases/iteration/out/TupleIterationTest.ir/TupleIterationTest.approval.0.ssa.ir
similarity index 100%
rename from test_cases/iteration/out/TupleIterationTest.ir/TupleIterationTest.approval.0.approval.ssa.ir
rename to test_cases/iteration/out/TupleIterationTest.ir/TupleIterationTest.approval.0.ssa.ir
diff --git a/test_cases/iteration/out/TupleIterationTest.ir/TupleIterationTest.approval.1.approval.ssa.opt.ir b/test_cases/iteration/out/TupleIterationTest.ir/TupleIterationTest.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/iteration/out/TupleIterationTest.ir/TupleIterationTest.approval.1.approval.ssa.opt.ir
rename to test_cases/iteration/out/TupleIterationTest.ir/TupleIterationTest.approval.1.ssa.opt.ir
diff --git a/test_cases/iteration/out/TupleIterationTest.ir/TupleIterationTest.approval.2.approval.destructured.ir b/test_cases/iteration/out/TupleIterationTest.ir/TupleIterationTest.approval.2.destructured.ir
similarity index 100%
rename from test_cases/iteration/out/TupleIterationTest.ir/TupleIterationTest.approval.2.approval.destructured.ir
rename to test_cases/iteration/out/TupleIterationTest.ir/TupleIterationTest.approval.2.destructured.ir
diff --git a/test_cases/iteration/out/TupleIterationTest.ir/TupleIterationTest.clear.0.clear.ssa.ir b/test_cases/iteration/out/TupleIterationTest.ir/TupleIterationTest.clear.0.ssa.ir
similarity index 100%
rename from test_cases/iteration/out/TupleIterationTest.ir/TupleIterationTest.clear.0.clear.ssa.ir
rename to test_cases/iteration/out/TupleIterationTest.ir/TupleIterationTest.clear.0.ssa.ir
diff --git a/test_cases/iteration/out/TupleIterationTest.ir/TupleIterationTest.clear.1.clear.destructured.ir b/test_cases/iteration/out/TupleIterationTest.ir/TupleIterationTest.clear.1.destructured.ir
similarity index 100%
rename from test_cases/iteration/out/TupleIterationTest.ir/TupleIterationTest.clear.1.clear.destructured.ir
rename to test_cases/iteration/out/TupleIterationTest.ir/TupleIterationTest.clear.1.destructured.ir
diff --git a/test_cases/iteration/out/URangeIterationTest.ir/URangeIterationTest.approval.0.approval.ssa.ir b/test_cases/iteration/out/URangeIterationTest.ir/URangeIterationTest.approval.0.ssa.ir
similarity index 100%
rename from test_cases/iteration/out/URangeIterationTest.ir/URangeIterationTest.approval.0.approval.ssa.ir
rename to test_cases/iteration/out/URangeIterationTest.ir/URangeIterationTest.approval.0.ssa.ir
diff --git a/test_cases/iteration/out/URangeIterationTest.ir/URangeIterationTest.approval.1.approval.ssa.opt.ir b/test_cases/iteration/out/URangeIterationTest.ir/URangeIterationTest.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/iteration/out/URangeIterationTest.ir/URangeIterationTest.approval.1.approval.ssa.opt.ir
rename to test_cases/iteration/out/URangeIterationTest.ir/URangeIterationTest.approval.1.ssa.opt.ir
diff --git a/test_cases/iteration/out/URangeIterationTest.ir/URangeIterationTest.approval.2.approval.destructured.ir b/test_cases/iteration/out/URangeIterationTest.ir/URangeIterationTest.approval.2.destructured.ir
similarity index 100%
rename from test_cases/iteration/out/URangeIterationTest.ir/URangeIterationTest.approval.2.approval.destructured.ir
rename to test_cases/iteration/out/URangeIterationTest.ir/URangeIterationTest.approval.2.destructured.ir
diff --git a/test_cases/iteration/out/URangeIterationTest.ir/URangeIterationTest.clear.0.clear.ssa.ir b/test_cases/iteration/out/URangeIterationTest.ir/URangeIterationTest.clear.0.ssa.ir
similarity index 100%
rename from test_cases/iteration/out/URangeIterationTest.ir/URangeIterationTest.clear.0.clear.ssa.ir
rename to test_cases/iteration/out/URangeIterationTest.ir/URangeIterationTest.clear.0.ssa.ir
diff --git a/test_cases/iteration/out/URangeIterationTest.ir/URangeIterationTest.clear.1.clear.destructured.ir b/test_cases/iteration/out/URangeIterationTest.ir/URangeIterationTest.clear.1.destructured.ir
similarity index 100%
rename from test_cases/iteration/out/URangeIterationTest.ir/URangeIterationTest.clear.1.clear.destructured.ir
rename to test_cases/iteration/out/URangeIterationTest.ir/URangeIterationTest.clear.1.destructured.ir
diff --git a/test_cases/iteration/out_O2/IndexableIterationTest.ir/IndexableIterationTest.approval.0.approval.destructured.ir b/test_cases/iteration/out_O2/IndexableIterationTest.ir/IndexableIterationTest.approval.0.destructured.ir
similarity index 100%
rename from test_cases/iteration/out_O2/IndexableIterationTest.ir/IndexableIterationTest.approval.0.approval.destructured.ir
rename to test_cases/iteration/out_O2/IndexableIterationTest.ir/IndexableIterationTest.approval.0.destructured.ir
diff --git a/test_cases/iteration/out_O2/IndexableIterationTest.ir/IndexableIterationTest.clear.0.clear.destructured.ir b/test_cases/iteration/out_O2/IndexableIterationTest.ir/IndexableIterationTest.clear.0.destructured.ir
similarity index 100%
rename from test_cases/iteration/out_O2/IndexableIterationTest.ir/IndexableIterationTest.clear.0.clear.destructured.ir
rename to test_cases/iteration/out_O2/IndexableIterationTest.ir/IndexableIterationTest.clear.0.destructured.ir
diff --git a/test_cases/iteration/out_O2/TupleIterationTest.ir/TupleIterationTest.approval.0.approval.destructured.ir b/test_cases/iteration/out_O2/TupleIterationTest.ir/TupleIterationTest.approval.0.destructured.ir
similarity index 100%
rename from test_cases/iteration/out_O2/TupleIterationTest.ir/TupleIterationTest.approval.0.approval.destructured.ir
rename to test_cases/iteration/out_O2/TupleIterationTest.ir/TupleIterationTest.approval.0.destructured.ir
diff --git a/test_cases/iteration/out_O2/TupleIterationTest.ir/TupleIterationTest.clear.0.clear.destructured.ir b/test_cases/iteration/out_O2/TupleIterationTest.ir/TupleIterationTest.clear.0.destructured.ir
similarity index 100%
rename from test_cases/iteration/out_O2/TupleIterationTest.ir/TupleIterationTest.clear.0.clear.destructured.ir
rename to test_cases/iteration/out_O2/TupleIterationTest.ir/TupleIterationTest.clear.0.destructured.ir
diff --git a/test_cases/iteration/out_O2/URangeIterationTest.ir/URangeIterationTest.approval.0.approval.destructured.ir b/test_cases/iteration/out_O2/URangeIterationTest.ir/URangeIterationTest.approval.0.destructured.ir
similarity index 100%
rename from test_cases/iteration/out_O2/URangeIterationTest.ir/URangeIterationTest.approval.0.approval.destructured.ir
rename to test_cases/iteration/out_O2/URangeIterationTest.ir/URangeIterationTest.approval.0.destructured.ir
diff --git a/test_cases/iteration/out_O2/URangeIterationTest.ir/URangeIterationTest.clear.0.clear.destructured.ir b/test_cases/iteration/out_O2/URangeIterationTest.ir/URangeIterationTest.clear.0.destructured.ir
similarity index 100%
rename from test_cases/iteration/out_O2/URangeIterationTest.ir/URangeIterationTest.clear.0.clear.destructured.ir
rename to test_cases/iteration/out_O2/URangeIterationTest.ir/URangeIterationTest.clear.0.destructured.ir
diff --git a/test_cases/iteration/out_unoptimized/IndexableIterationTest.ir/IndexableIterationTest.approval.0.approval.destructured.ir b/test_cases/iteration/out_unoptimized/IndexableIterationTest.ir/IndexableIterationTest.approval.0.destructured.ir
similarity index 100%
rename from test_cases/iteration/out_unoptimized/IndexableIterationTest.ir/IndexableIterationTest.approval.0.approval.destructured.ir
rename to test_cases/iteration/out_unoptimized/IndexableIterationTest.ir/IndexableIterationTest.approval.0.destructured.ir
diff --git a/test_cases/iteration/out_unoptimized/IndexableIterationTest.ir/IndexableIterationTest.clear.0.clear.destructured.ir b/test_cases/iteration/out_unoptimized/IndexableIterationTest.ir/IndexableIterationTest.clear.0.destructured.ir
similarity index 100%
rename from test_cases/iteration/out_unoptimized/IndexableIterationTest.ir/IndexableIterationTest.clear.0.clear.destructured.ir
rename to test_cases/iteration/out_unoptimized/IndexableIterationTest.ir/IndexableIterationTest.clear.0.destructured.ir
diff --git a/test_cases/iteration/out_unoptimized/TupleIterationTest.ir/TupleIterationTest.approval.0.approval.destructured.ir b/test_cases/iteration/out_unoptimized/TupleIterationTest.ir/TupleIterationTest.approval.0.destructured.ir
similarity index 100%
rename from test_cases/iteration/out_unoptimized/TupleIterationTest.ir/TupleIterationTest.approval.0.approval.destructured.ir
rename to test_cases/iteration/out_unoptimized/TupleIterationTest.ir/TupleIterationTest.approval.0.destructured.ir
diff --git a/test_cases/iteration/out_unoptimized/TupleIterationTest.ir/TupleIterationTest.clear.0.clear.destructured.ir b/test_cases/iteration/out_unoptimized/TupleIterationTest.ir/TupleIterationTest.clear.0.destructured.ir
similarity index 100%
rename from test_cases/iteration/out_unoptimized/TupleIterationTest.ir/TupleIterationTest.clear.0.clear.destructured.ir
rename to test_cases/iteration/out_unoptimized/TupleIterationTest.ir/TupleIterationTest.clear.0.destructured.ir
diff --git a/test_cases/iteration/out_unoptimized/URangeIterationTest.ir/URangeIterationTest.approval.0.approval.destructured.ir b/test_cases/iteration/out_unoptimized/URangeIterationTest.ir/URangeIterationTest.approval.0.destructured.ir
similarity index 100%
rename from test_cases/iteration/out_unoptimized/URangeIterationTest.ir/URangeIterationTest.approval.0.approval.destructured.ir
rename to test_cases/iteration/out_unoptimized/URangeIterationTest.ir/URangeIterationTest.approval.0.destructured.ir
diff --git a/test_cases/iteration/out_unoptimized/URangeIterationTest.ir/URangeIterationTest.clear.0.clear.destructured.ir b/test_cases/iteration/out_unoptimized/URangeIterationTest.ir/URangeIterationTest.clear.0.destructured.ir
similarity index 100%
rename from test_cases/iteration/out_unoptimized/URangeIterationTest.ir/URangeIterationTest.clear.0.clear.destructured.ir
rename to test_cases/iteration/out_unoptimized/URangeIterationTest.ir/URangeIterationTest.clear.0.destructured.ir
diff --git a/test_cases/iteration/puya.log b/test_cases/iteration/puya.log
index 4f09930e54..e232198bb3 100644
--- a/test_cases/iteration/puya.log
+++ b/test_cases/iteration/puya.log
@@ -1243,7 +1243,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to iteration/out/URangeIterationTest.ir/URangeIterationTest.approval.0.approval.ssa.ir
+debug: Output IR to iteration/out/URangeIterationTest.ir/URangeIterationTest.approval.0.ssa.ir
 info: optimizing approval program of test_cases.iteration.iterate_urange.URangeIterationTest at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.iteration.iterate_urange.URangeIterationTest.test_forwards for inlining
@@ -1857,7 +1857,7 @@ debug: removing unused subroutine test_cases.iteration.iterate_urange.URangeIter
 debug: removing unused subroutine test_cases.iteration.iterate_urange.URangeIterationTest.test_empty
 debug: removing unused subroutine test_cases.iteration.iterate_urange.URangeIterationTest.test_break
 debug: removing unused subroutine test_cases.iteration.iterate_urange.URangeIterationTest.test_tuple_target
-debug: Output IR to iteration/out/URangeIterationTest.ir/URangeIterationTest.approval.1.approval.ssa.opt.ir
+debug: Output IR to iteration/out/URangeIterationTest.ir/URangeIterationTest.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.iteration.base.IterationTestBase.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -2018,8 +2018,8 @@ debug: Coalescing local variables in test_cases.iteration.base.IterationTestBase
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.iteration.base.IterationTestBase._log_with_index
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to iteration/out/URangeIterationTest.ir/URangeIterationTest.approval.2.approval.destructured.ir
-debug: Output IR to iteration/out/URangeIterationTest.ir/URangeIterationTest.clear.0.clear.ssa.ir
+debug: Output IR to iteration/out/URangeIterationTest.ir/URangeIterationTest.approval.2.destructured.ir
+debug: Output IR to iteration/out/URangeIterationTest.ir/URangeIterationTest.clear.0.ssa.ir
 info: optimizing clear program of test_cases.iteration.iterate_urange.URangeIterationTest at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.iteration.base.IterationTestBase.clear_state_program
@@ -2045,7 +2045,7 @@ debug: Coalescing local variables in test_cases.iteration.base.IterationTestBase
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.iteration.base.IterationTestBase.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to iteration/out/URangeIterationTest.ir/URangeIterationTest.clear.1.clear.destructured.ir
+debug: Output IR to iteration/out/URangeIterationTest.ir/URangeIterationTest.clear.1.destructured.ir
 debug: Inserted main_for_header@2.ops[3]: 'l-store-copy continue_looping%0#0 0'
 debug: Replaced main_for_header@2.ops[5]: 'v-load continue_looping%0#0' with 'l-load continue_looping%0#0'
 debug: Inserted main_for_body@3.ops[4]: 'l-store-copy tmp%0#0 0'
@@ -2140,7 +2140,7 @@ debug: removing explicit jump to fall-through block main_for_header@51
 debug: removing explicit jump to fall-through block main_for_header@77
 iteration/base.py:31 debug: optimizing TEAL subroutine test_cases.iteration.base.IterationTestBase._log_with_index(idx: uint64, value: bytes) -> void:
 iteration/base.py:28 debug: optimizing TEAL subroutine test_cases.iteration.base.IterationTestBase.clear_state_program() -> uint64:
-debug: Output IR to iteration/out/TupleIterationTest.ir/TupleIterationTest.approval.0.approval.ssa.ir
+debug: Output IR to iteration/out/TupleIterationTest.ir/TupleIterationTest.approval.0.ssa.ir
 info: optimizing approval program of test_cases.iteration.iterate_tuple.TupleIterationTest at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.iteration.iterate_tuple.TupleIterationTest.test_forwards for inlining
@@ -2471,7 +2471,7 @@ debug: removing unused subroutine test_cases.iteration.iterate_tuple.TupleIterat
 debug: removing unused subroutine test_cases.iteration.iterate_tuple.TupleIterationTest.test_empty
 debug: removing unused subroutine test_cases.iteration.iterate_tuple.TupleIterationTest.test_break
 debug: removing unused subroutine test_cases.iteration.iterate_tuple.TupleIterationTest.test_tuple_target
-debug: Output IR to iteration/out/TupleIterationTest.ir/TupleIterationTest.approval.1.approval.ssa.opt.ir
+debug: Output IR to iteration/out/TupleIterationTest.ir/TupleIterationTest.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.iteration.base.IterationTestBase.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -2673,8 +2673,8 @@ debug: Coalescing local variables in test_cases.iteration.base.IterationTestBase
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.iteration.base.IterationTestBase._log_with_index
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to iteration/out/TupleIterationTest.ir/TupleIterationTest.approval.2.approval.destructured.ir
-debug: Output IR to iteration/out/TupleIterationTest.ir/TupleIterationTest.clear.0.clear.ssa.ir
+debug: Output IR to iteration/out/TupleIterationTest.ir/TupleIterationTest.approval.2.destructured.ir
+debug: Output IR to iteration/out/TupleIterationTest.ir/TupleIterationTest.clear.0.ssa.ir
 info: optimizing clear program of test_cases.iteration.iterate_tuple.TupleIterationTest at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.iteration.base.IterationTestBase.clear_state_program
@@ -2700,7 +2700,7 @@ debug: Coalescing local variables in test_cases.iteration.base.IterationTestBase
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.iteration.base.IterationTestBase.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to iteration/out/TupleIterationTest.ir/TupleIterationTest.clear.1.clear.destructured.ir
+debug: Output IR to iteration/out/TupleIterationTest.ir/TupleIterationTest.clear.1.destructured.ir
 debug: Inserted main_for_body@16.ops[1]: 'l-store-copy idx#0 0'
 debug: Replaced main_for_body@16.ops[4]: 'v-load idx#0' with 'l-load idx#0'
 debug: Inserted main_for_body@30.ops[1]: 'l-store-copy idx#0 0'
@@ -2746,7 +2746,7 @@ debug: removing explicit jump to fall-through block main_for_body@30
 debug: removing explicit jump to fall-through block main_for_body@37
 iteration/base.py:31 debug: optimizing TEAL subroutine test_cases.iteration.base.IterationTestBase._log_with_index(idx: uint64, value: bytes) -> void:
 iteration/base.py:28 debug: optimizing TEAL subroutine test_cases.iteration.base.IterationTestBase.clear_state_program() -> uint64:
-debug: Output IR to iteration/out/IndexableIterationTest.ir/IndexableIterationTest.approval.0.approval.ssa.ir
+debug: Output IR to iteration/out/IndexableIterationTest.ir/IndexableIterationTest.approval.0.ssa.ir
 info: optimizing approval program of test_cases.iteration.iterate_indexable.IndexableIterationTest at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.iteration.iterate_indexable.IndexableIterationTest.test_forwards for inlining
@@ -3180,7 +3180,7 @@ debug: removing unused subroutine test_cases.iteration.iterate_indexable.Indexab
 debug: removing unused subroutine test_cases.iteration.iterate_indexable.IndexableIterationTest.test_empty
 debug: removing unused subroutine test_cases.iteration.iterate_indexable.IndexableIterationTest.test_break
 debug: removing unused subroutine test_cases.iteration.iterate_indexable.IndexableIterationTest.test_tuple_target
-debug: Output IR to iteration/out/IndexableIterationTest.ir/IndexableIterationTest.approval.1.approval.ssa.opt.ir
+debug: Output IR to iteration/out/IndexableIterationTest.ir/IndexableIterationTest.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.iteration.base.IterationTestBase.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -3333,8 +3333,8 @@ debug: Coalescing local variables in test_cases.iteration.base.IterationTestBase
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.iteration.base.IterationTestBase._log_with_index
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to iteration/out/IndexableIterationTest.ir/IndexableIterationTest.approval.2.approval.destructured.ir
-debug: Output IR to iteration/out/IndexableIterationTest.ir/IndexableIterationTest.clear.0.clear.ssa.ir
+debug: Output IR to iteration/out/IndexableIterationTest.ir/IndexableIterationTest.approval.2.destructured.ir
+debug: Output IR to iteration/out/IndexableIterationTest.ir/IndexableIterationTest.clear.0.ssa.ir
 info: optimizing clear program of test_cases.iteration.iterate_indexable.IndexableIterationTest at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.iteration.base.IterationTestBase.clear_state_program
@@ -3360,7 +3360,7 @@ debug: Coalescing local variables in test_cases.iteration.base.IterationTestBase
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.iteration.base.IterationTestBase.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to iteration/out/IndexableIterationTest.ir/IndexableIterationTest.clear.1.clear.destructured.ir
+debug: Output IR to iteration/out/IndexableIterationTest.ir/IndexableIterationTest.clear.1.destructured.ir
 debug: Inserted main_for_header@2.ops[3]: 'l-store-copy continue_looping%0#0 0'
 debug: Replaced main_for_header@2.ops[5]: 'v-load continue_looping%0#0' with 'l-load continue_looping%0#0'
 debug: Inserted main_for_body@3.ops[4]: 'l-store-copy i#0 0'
diff --git a/test_cases/iteration/puya_O2.log b/test_cases/iteration/puya_O2.log
index 4e51b14466..4cc7d500b6 100644
--- a/test_cases/iteration/puya_O2.log
+++ b/test_cases/iteration/puya_O2.log
@@ -2015,7 +2015,7 @@ debug: Coalescing local variables in test_cases.iteration.base.IterationTestBase
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.iteration.base.IterationTestBase._log_with_index
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to iteration/out_O2/URangeIterationTest.ir/URangeIterationTest.approval.0.approval.destructured.ir
+debug: Output IR to iteration/out_O2/URangeIterationTest.ir/URangeIterationTest.approval.0.destructured.ir
 info: optimizing clear program of test_cases.iteration.iterate_urange.URangeIterationTest at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.iteration.base.IterationTestBase.clear_state_program
@@ -2041,7 +2041,7 @@ debug: Coalescing local variables in test_cases.iteration.base.IterationTestBase
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.iteration.base.IterationTestBase.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to iteration/out_O2/URangeIterationTest.ir/URangeIterationTest.clear.0.clear.destructured.ir
+debug: Output IR to iteration/out_O2/URangeIterationTest.ir/URangeIterationTest.clear.0.destructured.ir
 debug: Inserted main_for_header@2.ops[3]: 'l-store-copy continue_looping%0#0 0'
 debug: Replaced main_for_header@2.ops[5]: 'v-load continue_looping%0#0' with 'l-load continue_looping%0#0'
 debug: Inserted main_for_body@3.ops[4]: 'l-store-copy tmp%0#0 0'
@@ -2667,7 +2667,7 @@ debug: Coalescing local variables in test_cases.iteration.base.IterationTestBase
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.iteration.base.IterationTestBase._log_with_index
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to iteration/out_O2/TupleIterationTest.ir/TupleIterationTest.approval.0.approval.destructured.ir
+debug: Output IR to iteration/out_O2/TupleIterationTest.ir/TupleIterationTest.approval.0.destructured.ir
 info: optimizing clear program of test_cases.iteration.iterate_tuple.TupleIterationTest at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.iteration.base.IterationTestBase.clear_state_program
@@ -2693,7 +2693,7 @@ debug: Coalescing local variables in test_cases.iteration.base.IterationTestBase
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.iteration.base.IterationTestBase.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to iteration/out_O2/TupleIterationTest.ir/TupleIterationTest.clear.0.clear.destructured.ir
+debug: Output IR to iteration/out_O2/TupleIterationTest.ir/TupleIterationTest.clear.0.destructured.ir
 debug: Inserted main_for_body@16.ops[1]: 'l-store-copy idx#0 0'
 debug: Replaced main_for_body@16.ops[4]: 'v-load idx#0' with 'l-load idx#0'
 debug: Inserted main_for_body@30.ops[1]: 'l-store-copy idx#0 0'
@@ -3324,7 +3324,7 @@ debug: Coalescing local variables in test_cases.iteration.base.IterationTestBase
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.iteration.base.IterationTestBase._log_with_index
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to iteration/out_O2/IndexableIterationTest.ir/IndexableIterationTest.approval.0.approval.destructured.ir
+debug: Output IR to iteration/out_O2/IndexableIterationTest.ir/IndexableIterationTest.approval.0.destructured.ir
 info: optimizing clear program of test_cases.iteration.iterate_indexable.IndexableIterationTest at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.iteration.base.IterationTestBase.clear_state_program
@@ -3350,7 +3350,7 @@ debug: Coalescing local variables in test_cases.iteration.base.IterationTestBase
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.iteration.base.IterationTestBase.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to iteration/out_O2/IndexableIterationTest.ir/IndexableIterationTest.clear.0.clear.destructured.ir
+debug: Output IR to iteration/out_O2/IndexableIterationTest.ir/IndexableIterationTest.clear.0.destructured.ir
 debug: Inserted main_for_header@2.ops[3]: 'l-store-copy continue_looping%0#0 0'
 debug: Replaced main_for_header@2.ops[5]: 'v-load continue_looping%0#0' with 'l-load continue_looping%0#0'
 debug: Inserted main_for_body@3.ops[4]: 'l-store-copy i#0 0'
diff --git a/test_cases/iteration/puya_unoptimized.log b/test_cases/iteration/puya_unoptimized.log
index f1868568c6..45459803eb 100644
--- a/test_cases/iteration/puya_unoptimized.log
+++ b/test_cases/iteration/puya_unoptimized.log
@@ -1673,7 +1673,7 @@ debug: to_do: tup.1#0, tup.0#0
 debug: * to_do tup.0#0
 debug: * to_do tup.1#0
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to iteration/out_unoptimized/URangeIterationTest.ir/URangeIterationTest.approval.0.approval.destructured.ir
+debug: Output IR to iteration/out_unoptimized/URangeIterationTest.ir/URangeIterationTest.approval.0.destructured.ir
 info: optimizing clear program of test_cases.iteration.iterate_urange.URangeIterationTest at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.iteration.base.IterationTestBase.clear_state_program
@@ -1691,7 +1691,7 @@ debug: Coalescing local variables in test_cases.iteration.base.IterationTestBase
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.iteration.base.IterationTestBase.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to iteration/out_unoptimized/URangeIterationTest.ir/URangeIterationTest.clear.0.clear.destructured.ir
+debug: Output IR to iteration/out_unoptimized/URangeIterationTest.ir/URangeIterationTest.clear.0.destructured.ir
 debug: Inserted test_forwards_for_header@1.ops[3]: 'l-store-copy continue_looping%0#0 0'
 debug: Replaced test_forwards_for_header@1.ops[5]: 'v-load continue_looping%0#0' with 'l-load continue_looping%0#0'
 debug: Inserted test_forwards_for_body@2.ops[4]: 'l-store-copy tmp%0#0 0'
@@ -2382,7 +2382,7 @@ debug: Coalescing local variables in test_cases.iteration.iterate_tuple.TupleIte
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.iteration.iterate_tuple.TupleIterationTest.test_tuple_target
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to iteration/out_unoptimized/TupleIterationTest.ir/TupleIterationTest.approval.0.approval.destructured.ir
+debug: Output IR to iteration/out_unoptimized/TupleIterationTest.ir/TupleIterationTest.approval.0.destructured.ir
 info: optimizing clear program of test_cases.iteration.iterate_tuple.TupleIterationTest at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.iteration.base.IterationTestBase.clear_state_program
@@ -2400,7 +2400,7 @@ debug: Coalescing local variables in test_cases.iteration.base.IterationTestBase
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.iteration.base.IterationTestBase.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to iteration/out_unoptimized/TupleIterationTest.ir/TupleIterationTest.clear.0.clear.destructured.ir
+debug: Output IR to iteration/out_unoptimized/TupleIterationTest.ir/TupleIterationTest.clear.0.destructured.ir
 debug: Inserted _log_with_index.ops[4]: 'l-store-copy tmp%0#0 0'
 debug: Replaced _log_with_index.ops[6]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted _log_with_index.ops[9]: 'l-store-copy tmp%1#0 0'
@@ -2828,7 +2828,7 @@ debug: Coalescing item_index_internal%0#0 with [item_index_internal%0#5, item_in
 debug: Coalescing resulted in 10 replacement/s
 debug: Sequentializing parallel copies in test_cases.iteration.iterate_indexable.IndexableIterationTest.test_tuple_target
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to iteration/out_unoptimized/IndexableIterationTest.ir/IndexableIterationTest.approval.0.approval.destructured.ir
+debug: Output IR to iteration/out_unoptimized/IndexableIterationTest.ir/IndexableIterationTest.approval.0.destructured.ir
 info: optimizing clear program of test_cases.iteration.iterate_indexable.IndexableIterationTest at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.iteration.base.IterationTestBase.clear_state_program
@@ -2846,7 +2846,7 @@ debug: Coalescing local variables in test_cases.iteration.base.IterationTestBase
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.iteration.base.IterationTestBase.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to iteration/out_unoptimized/IndexableIterationTest.ir/IndexableIterationTest.clear.0.clear.destructured.ir
+debug: Output IR to iteration/out_unoptimized/IndexableIterationTest.ir/IndexableIterationTest.clear.0.destructured.ir
 debug: Inserted test_forwards_for_header@1.ops[3]: 'l-store-copy continue_looping%0#0 0'
 debug: Replaced test_forwards_for_header@1.ops[5]: 'v-load continue_looping%0#0' with 'l-load continue_looping%0#0'
 debug: Inserted test_forwards_for_body@2.ops[4]: 'l-store-copy i#0 0'
diff --git a/test_cases/koopman/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir b/test_cases/koopman/out/MyContract.ir/MyContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/koopman/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir
rename to test_cases/koopman/out/MyContract.ir/MyContract.approval.0.ssa.ir
diff --git a/test_cases/koopman/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir b/test_cases/koopman/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/koopman/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir
rename to test_cases/koopman/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
diff --git a/test_cases/koopman/out/MyContract.ir/MyContract.approval.2.approval.destructured.ir b/test_cases/koopman/out/MyContract.ir/MyContract.approval.2.destructured.ir
similarity index 100%
rename from test_cases/koopman/out/MyContract.ir/MyContract.approval.2.approval.destructured.ir
rename to test_cases/koopman/out/MyContract.ir/MyContract.approval.2.destructured.ir
diff --git a/test_cases/koopman/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir b/test_cases/koopman/out/MyContract.ir/MyContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/koopman/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir
rename to test_cases/koopman/out/MyContract.ir/MyContract.clear.0.ssa.ir
diff --git a/test_cases/koopman/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir b/test_cases/koopman/out/MyContract.ir/MyContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/koopman/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir
rename to test_cases/koopman/out/MyContract.ir/MyContract.clear.1.destructured.ir
diff --git a/test_cases/koopman/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir b/test_cases/koopman/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/koopman/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir
rename to test_cases/koopman/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
diff --git a/test_cases/koopman/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir b/test_cases/koopman/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/koopman/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir
rename to test_cases/koopman/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
diff --git a/test_cases/koopman/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir b/test_cases/koopman/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/koopman/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir
rename to test_cases/koopman/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
diff --git a/test_cases/koopman/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir b/test_cases/koopman/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/koopman/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir
rename to test_cases/koopman/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
diff --git a/test_cases/koopman/puya.log b/test_cases/koopman/puya.log
index c9f3251826..b326b6a9f4 100644
--- a/test_cases/koopman/puya.log
+++ b/test_cases/koopman/puya.log
@@ -407,7 +407,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to koopman/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir
+debug: Output IR to koopman/out/MyContract.ir/MyContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.koopman.contract.MyContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.koopman.contract.MyContract.approval_program
@@ -433,7 +433,7 @@ debug: Optimizer: Remove Linear Jump
 debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to koopman/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to koopman/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.koopman.contract.MyContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -458,8 +458,8 @@ debug: Coalescing local variables in test_cases.koopman.contract.MyContract.appr
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.koopman.contract.MyContract.approval_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to koopman/out/MyContract.ir/MyContract.approval.2.approval.destructured.ir
-debug: Output IR to koopman/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir
+debug: Output IR to koopman/out/MyContract.ir/MyContract.approval.2.destructured.ir
+debug: Output IR to koopman/out/MyContract.ir/MyContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.koopman.contract.MyContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.koopman.contract.MyContract.clear_state_program
@@ -485,7 +485,7 @@ debug: Coalescing local variables in test_cases.koopman.contract.MyContract.clea
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.koopman.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to koopman/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir
+debug: Output IR to koopman/out/MyContract.ir/MyContract.clear.1.destructured.ir
 koopman/contract.py:7 debug: optimizing TEAL subroutine test_cases.koopman.contract.MyContract.approval_program() -> uint64:
 koopman/contract.py:16 debug: optimizing TEAL subroutine test_cases.koopman.contract.MyContract.clear_state_program() -> uint64:
 info: Writing koopman/out/MyContract.approval.teal
diff --git a/test_cases/koopman/puya_O2.log b/test_cases/koopman/puya_O2.log
index f8694c3ce3..f279424b93 100644
--- a/test_cases/koopman/puya_O2.log
+++ b/test_cases/koopman/puya_O2.log
@@ -455,7 +455,7 @@ debug: Coalescing local variables in test_cases.koopman.contract.MyContract.appr
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.koopman.contract.MyContract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to koopman/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir
+debug: Output IR to koopman/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.koopman.contract.MyContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.koopman.contract.MyContract.clear_state_program
@@ -481,7 +481,7 @@ debug: Coalescing local variables in test_cases.koopman.contract.MyContract.clea
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.koopman.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to koopman/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir
+debug: Output IR to koopman/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
 koopman/contract.py:7 debug: optimizing TEAL subroutine test_cases.koopman.contract.MyContract.approval_program() -> uint64:
 koopman/contract.py:16 debug: optimizing TEAL subroutine test_cases.koopman.contract.MyContract.clear_state_program() -> uint64:
 info: Writing koopman/out_O2/MyContract.approval.teal
diff --git a/test_cases/koopman/puya_unoptimized.log b/test_cases/koopman/puya_unoptimized.log
index 65e8db685b..9536d8c537 100644
--- a/test_cases/koopman/puya_unoptimized.log
+++ b/test_cases/koopman/puya_unoptimized.log
@@ -433,7 +433,7 @@ debug: Coalescing local variables in test_cases.koopman.contract.MyContract.appr
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.koopman.contract.MyContract.approval_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to koopman/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir
+debug: Output IR to koopman/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.koopman.contract.MyContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.koopman.contract.MyContract.clear_state_program
@@ -451,7 +451,7 @@ debug: Coalescing local variables in test_cases.koopman.contract.MyContract.clea
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.koopman.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to koopman/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir
+debug: Output IR to koopman/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
 debug: Inserted main.ops[3]: 'l-store-copy b#0 0'
 debug: Replaced main.ops[5]: 'v-load b#0' with 'l-load b#0'
 debug: Inserted main.ops[12]: 'l-store-copy c#1 0'
diff --git a/test_cases/less_simple/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir b/test_cases/less_simple/out/MyContract.ir/MyContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/less_simple/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir
rename to test_cases/less_simple/out/MyContract.ir/MyContract.approval.0.ssa.ir
diff --git a/test_cases/less_simple/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir b/test_cases/less_simple/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/less_simple/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir
rename to test_cases/less_simple/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
diff --git a/test_cases/less_simple/out/MyContract.ir/MyContract.approval.2.approval.ssa.opt.ir b/test_cases/less_simple/out/MyContract.ir/MyContract.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/less_simple/out/MyContract.ir/MyContract.approval.2.approval.ssa.opt.ir
rename to test_cases/less_simple/out/MyContract.ir/MyContract.approval.2.ssa.opt.ir
diff --git a/test_cases/less_simple/out/MyContract.ir/MyContract.approval.3.approval.destructured.ir b/test_cases/less_simple/out/MyContract.ir/MyContract.approval.3.destructured.ir
similarity index 100%
rename from test_cases/less_simple/out/MyContract.ir/MyContract.approval.3.approval.destructured.ir
rename to test_cases/less_simple/out/MyContract.ir/MyContract.approval.3.destructured.ir
diff --git a/test_cases/less_simple/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir b/test_cases/less_simple/out/MyContract.ir/MyContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/less_simple/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir
rename to test_cases/less_simple/out/MyContract.ir/MyContract.clear.0.ssa.ir
diff --git a/test_cases/less_simple/out/MyContract.ir/MyContract.clear.1.clear.ssa.opt.ir b/test_cases/less_simple/out/MyContract.ir/MyContract.clear.1.ssa.opt.ir
similarity index 100%
rename from test_cases/less_simple/out/MyContract.ir/MyContract.clear.1.clear.ssa.opt.ir
rename to test_cases/less_simple/out/MyContract.ir/MyContract.clear.1.ssa.opt.ir
diff --git a/test_cases/less_simple/out/MyContract.ir/MyContract.clear.2.clear.destructured.ir b/test_cases/less_simple/out/MyContract.ir/MyContract.clear.2.destructured.ir
similarity index 100%
rename from test_cases/less_simple/out/MyContract.ir/MyContract.clear.2.clear.destructured.ir
rename to test_cases/less_simple/out/MyContract.ir/MyContract.clear.2.destructured.ir
diff --git a/test_cases/less_simple/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir b/test_cases/less_simple/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/less_simple/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir
rename to test_cases/less_simple/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
diff --git a/test_cases/less_simple/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir b/test_cases/less_simple/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/less_simple/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir
rename to test_cases/less_simple/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
diff --git a/test_cases/less_simple/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir b/test_cases/less_simple/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/less_simple/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir
rename to test_cases/less_simple/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
diff --git a/test_cases/less_simple/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir b/test_cases/less_simple/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/less_simple/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir
rename to test_cases/less_simple/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
diff --git a/test_cases/less_simple/puya.log b/test_cases/less_simple/puya.log
index 589f172393..4634e54bce 100644
--- a/test_cases/less_simple/puya.log
+++ b/test_cases/less_simple/puya.log
@@ -517,7 +517,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to less_simple/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir
+debug: Output IR to less_simple/out/MyContract.ir/MyContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.less_simple.contract.MyContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.less_simple.contract.MyContract.approval_program
@@ -552,7 +552,7 @@ debug: Removed empty block: block@5
 debug: Not removing empty block block@9 because it's used by phi nodes
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to less_simple/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to less_simple/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.less_simple.contract.MyContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -575,7 +575,7 @@ debug: Not removing empty block block@3 because it's used by phi nodes
 debug: Not removing empty block block@9 because it's used by phi nodes
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to less_simple/out/MyContract.ir/MyContract.approval.2.approval.ssa.opt.ir
+debug: Output IR to less_simple/out/MyContract.ir/MyContract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.less_simple.contract.MyContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -655,8 +655,8 @@ debug: Removing jump block block@3
 debug: Removing jump block block@11
 debug: branching to block@3 will be replaced with block@1
 debug: branching to block@11 will be replaced with block@12
-debug: Output IR to less_simple/out/MyContract.ir/MyContract.approval.3.approval.destructured.ir
-debug: Output IR to less_simple/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir
+debug: Output IR to less_simple/out/MyContract.ir/MyContract.approval.3.destructured.ir
+debug: Output IR to less_simple/out/MyContract.ir/MyContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.less_simple.contract.MyContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.less_simple.contract.MyContract.clear_state_program
@@ -677,7 +677,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Not removing empty block block@5 because it's used by phi nodes
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to less_simple/out/MyContract.ir/MyContract.clear.1.clear.ssa.opt.ir
+debug: Output IR to less_simple/out/MyContract.ir/MyContract.clear.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.less_simple.contract.MyContract.clear_state_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -724,7 +724,7 @@ debug: to_do: i#0, sum_of_squares#0
 debug: * to_do sum_of_squares#0
 debug: * to_do i#0
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to less_simple/out/MyContract.ir/MyContract.clear.2.clear.destructured.ir
+debug: Output IR to less_simple/out/MyContract.ir/MyContract.clear.2.destructured.ir
 debug: Inserted main_while_top@1.ops[3]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main_while_top@1.ops[5]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_while_body@2.ops[3]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/less_simple/puya_O2.log b/test_cases/less_simple/puya_O2.log
index 7ed2ade38d..cd14a64616 100644
--- a/test_cases/less_simple/puya_O2.log
+++ b/test_cases/less_simple/puya_O2.log
@@ -651,7 +651,7 @@ debug: Removing jump block block@3
 debug: Removing jump block block@11
 debug: branching to block@3 will be replaced with block@1
 debug: branching to block@11 will be replaced with block@12
-debug: Output IR to less_simple/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir
+debug: Output IR to less_simple/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.less_simple.contract.MyContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.less_simple.contract.MyContract.clear_state_program
@@ -718,7 +718,7 @@ debug: to_do: i#0, sum_of_squares#0
 debug: * to_do sum_of_squares#0
 debug: * to_do i#0
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to less_simple/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir
+debug: Output IR to less_simple/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
 debug: Inserted main_while_top@1.ops[3]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main_while_top@1.ops[5]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_while_body@2.ops[3]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/less_simple/puya_unoptimized.log b/test_cases/less_simple/puya_unoptimized.log
index 43cbb5893b..ccd17a6b26 100644
--- a/test_cases/less_simple/puya_unoptimized.log
+++ b/test_cases/less_simple/puya_unoptimized.log
@@ -582,7 +582,7 @@ debug: * to_do product_of_odds#0
 debug: * to_do sum_of_evens#0
 debug: * to_do a#0
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to less_simple/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir
+debug: Output IR to less_simple/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.less_simple.contract.MyContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.less_simple.contract.MyContract.clear_state_program
@@ -621,7 +621,7 @@ debug: to_do: i#0, sum_of_squares#0
 debug: * to_do sum_of_squares#0
 debug: * to_do i#0
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to less_simple/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir
+debug: Output IR to less_simple/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
 debug: Inserted main_while_top@1.ops[3]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main_while_top@1.ops[5]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_while_body@2.ops[3]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/literals/out/LiteralFolding.ir/LiteralFolding.approval.0.approval.ssa.ir b/test_cases/literals/out/LiteralFolding.ir/LiteralFolding.approval.0.ssa.ir
similarity index 100%
rename from test_cases/literals/out/LiteralFolding.ir/LiteralFolding.approval.0.approval.ssa.ir
rename to test_cases/literals/out/LiteralFolding.ir/LiteralFolding.approval.0.ssa.ir
diff --git a/test_cases/literals/out/LiteralFolding.ir/LiteralFolding.approval.1.approval.ssa.opt.ir b/test_cases/literals/out/LiteralFolding.ir/LiteralFolding.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/literals/out/LiteralFolding.ir/LiteralFolding.approval.1.approval.ssa.opt.ir
rename to test_cases/literals/out/LiteralFolding.ir/LiteralFolding.approval.1.ssa.opt.ir
diff --git a/test_cases/literals/out/LiteralFolding.ir/LiteralFolding.approval.2.approval.destructured.ir b/test_cases/literals/out/LiteralFolding.ir/LiteralFolding.approval.2.destructured.ir
similarity index 100%
rename from test_cases/literals/out/LiteralFolding.ir/LiteralFolding.approval.2.approval.destructured.ir
rename to test_cases/literals/out/LiteralFolding.ir/LiteralFolding.approval.2.destructured.ir
diff --git a/test_cases/literals/out/LiteralFolding.ir/LiteralFolding.clear.0.clear.ssa.ir b/test_cases/literals/out/LiteralFolding.ir/LiteralFolding.clear.0.ssa.ir
similarity index 100%
rename from test_cases/literals/out/LiteralFolding.ir/LiteralFolding.clear.0.clear.ssa.ir
rename to test_cases/literals/out/LiteralFolding.ir/LiteralFolding.clear.0.ssa.ir
diff --git a/test_cases/literals/out/LiteralFolding.ir/LiteralFolding.clear.1.clear.destructured.ir b/test_cases/literals/out/LiteralFolding.ir/LiteralFolding.clear.1.destructured.ir
similarity index 100%
rename from test_cases/literals/out/LiteralFolding.ir/LiteralFolding.clear.1.clear.destructured.ir
rename to test_cases/literals/out/LiteralFolding.ir/LiteralFolding.clear.1.destructured.ir
diff --git a/test_cases/literals/out_O2/LiteralFolding.ir/LiteralFolding.approval.0.approval.destructured.ir b/test_cases/literals/out_O2/LiteralFolding.ir/LiteralFolding.approval.0.destructured.ir
similarity index 100%
rename from test_cases/literals/out_O2/LiteralFolding.ir/LiteralFolding.approval.0.approval.destructured.ir
rename to test_cases/literals/out_O2/LiteralFolding.ir/LiteralFolding.approval.0.destructured.ir
diff --git a/test_cases/literals/out_O2/LiteralFolding.ir/LiteralFolding.clear.0.clear.destructured.ir b/test_cases/literals/out_O2/LiteralFolding.ir/LiteralFolding.clear.0.destructured.ir
similarity index 100%
rename from test_cases/literals/out_O2/LiteralFolding.ir/LiteralFolding.clear.0.clear.destructured.ir
rename to test_cases/literals/out_O2/LiteralFolding.ir/LiteralFolding.clear.0.destructured.ir
diff --git a/test_cases/literals/out_unoptimized/LiteralFolding.ir/LiteralFolding.approval.0.approval.destructured.ir b/test_cases/literals/out_unoptimized/LiteralFolding.ir/LiteralFolding.approval.0.destructured.ir
similarity index 100%
rename from test_cases/literals/out_unoptimized/LiteralFolding.ir/LiteralFolding.approval.0.approval.destructured.ir
rename to test_cases/literals/out_unoptimized/LiteralFolding.ir/LiteralFolding.approval.0.destructured.ir
diff --git a/test_cases/literals/out_unoptimized/LiteralFolding.ir/LiteralFolding.clear.0.clear.destructured.ir b/test_cases/literals/out_unoptimized/LiteralFolding.ir/LiteralFolding.clear.0.destructured.ir
similarity index 100%
rename from test_cases/literals/out_unoptimized/LiteralFolding.ir/LiteralFolding.clear.0.clear.destructured.ir
rename to test_cases/literals/out_unoptimized/LiteralFolding.ir/LiteralFolding.clear.0.destructured.ir
diff --git a/test_cases/literals/puya.log b/test_cases/literals/puya.log
index d920922f6a..8dba1ec14f 100644
--- a/test_cases/literals/puya.log
+++ b/test_cases/literals/puya.log
@@ -472,7 +472,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to literals/out/LiteralFolding.ir/LiteralFolding.approval.0.approval.ssa.ir
+debug: Output IR to literals/out/LiteralFolding.ir/LiteralFolding.approval.0.ssa.ir
 info: optimizing approval program of test_cases.literals.folding.LiteralFolding at level 1
 debug: Begin optimization pass 1/100
 debug: marking trivial method test_cases.literals.folding.unary_str as inlineable
@@ -860,7 +860,7 @@ debug: removing unused subroutine test_cases.literals.folding.unary_int
 debug: removing unused subroutine test_cases.literals.folding.compare_int
 debug: removing unused subroutine test_cases.literals.folding.unary_bool
 debug: removing unused subroutine test_cases.literals.folding.tuples
-debug: Output IR to literals/out/LiteralFolding.ir/LiteralFolding.approval.1.approval.ssa.opt.ir
+debug: Output IR to literals/out/LiteralFolding.ir/LiteralFolding.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.literals.folding.LiteralFolding.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -908,8 +908,8 @@ debug: Coalescing start#0 with [start#5, start#1, start#2]
 debug: Coalescing resulted in 9 replacement/s
 debug: Sequentializing parallel copies in _puya_lib.bytes_.is_substring
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to literals/out/LiteralFolding.ir/LiteralFolding.approval.2.approval.destructured.ir
-debug: Output IR to literals/out/LiteralFolding.ir/LiteralFolding.clear.0.clear.ssa.ir
+debug: Output IR to literals/out/LiteralFolding.ir/LiteralFolding.approval.2.destructured.ir
+debug: Output IR to literals/out/LiteralFolding.ir/LiteralFolding.clear.0.ssa.ir
 info: optimizing clear program of test_cases.literals.folding.LiteralFolding at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.literals.folding.LiteralFolding.clear_state_program
@@ -935,7 +935,7 @@ debug: Coalescing local variables in test_cases.literals.folding.LiteralFolding.
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.literals.folding.LiteralFolding.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to literals/out/LiteralFolding.ir/LiteralFolding.clear.1.clear.destructured.ir
+debug: Output IR to literals/out/LiteralFolding.ir/LiteralFolding.clear.1.destructured.ir
 debug: Inserted main.ops[3]: 'l-store-copy tmp%7#0 0'
 debug: Replaced main.ops[5]: 'v-load tmp%7#0' with 'l-load tmp%7#0'
 debug: Inserted main.ops[7]: 'l-store-copy tmp%8#0 0'
diff --git a/test_cases/literals/puya_O2.log b/test_cases/literals/puya_O2.log
index c44f509daa..b2c985c21a 100644
--- a/test_cases/literals/puya_O2.log
+++ b/test_cases/literals/puya_O2.log
@@ -905,7 +905,7 @@ debug: Coalescing start#0 with [start#5, start#1, start#2]
 debug: Coalescing resulted in 9 replacement/s
 debug: Sequentializing parallel copies in _puya_lib.bytes_.is_substring
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to literals/out_O2/LiteralFolding.ir/LiteralFolding.approval.0.approval.destructured.ir
+debug: Output IR to literals/out_O2/LiteralFolding.ir/LiteralFolding.approval.0.destructured.ir
 info: optimizing clear program of test_cases.literals.folding.LiteralFolding at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.literals.folding.LiteralFolding.clear_state_program
@@ -931,7 +931,7 @@ debug: Coalescing local variables in test_cases.literals.folding.LiteralFolding.
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.literals.folding.LiteralFolding.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to literals/out_O2/LiteralFolding.ir/LiteralFolding.clear.0.clear.destructured.ir
+debug: Output IR to literals/out_O2/LiteralFolding.ir/LiteralFolding.clear.0.destructured.ir
 debug: Inserted main.ops[3]: 'l-store-copy tmp%7#0 0'
 debug: Replaced main.ops[5]: 'v-load tmp%7#0' with 'l-load tmp%7#0'
 debug: Inserted main.ops[7]: 'l-store-copy tmp%8#0 0'
diff --git a/test_cases/literals/puya_unoptimized.log b/test_cases/literals/puya_unoptimized.log
index f9a5551b97..697549d360 100644
--- a/test_cases/literals/puya_unoptimized.log
+++ b/test_cases/literals/puya_unoptimized.log
@@ -690,7 +690,7 @@ debug: Coalescing start#0 with [start#5, start#1, start#2]
 debug: Coalescing resulted in 10 replacement/s
 debug: Sequentializing parallel copies in _puya_lib.bytes_.is_substring
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to literals/out_unoptimized/LiteralFolding.ir/LiteralFolding.approval.0.approval.destructured.ir
+debug: Output IR to literals/out_unoptimized/LiteralFolding.ir/LiteralFolding.approval.0.destructured.ir
 info: optimizing clear program of test_cases.literals.folding.LiteralFolding at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.literals.folding.LiteralFolding.clear_state_program
@@ -708,7 +708,7 @@ debug: Coalescing local variables in test_cases.literals.folding.LiteralFolding.
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.literals.folding.LiteralFolding.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to literals/out_unoptimized/LiteralFolding.ir/LiteralFolding.clear.0.clear.destructured.ir
+debug: Output IR to literals/out_unoptimized/LiteralFolding.ir/LiteralFolding.clear.0.destructured.ir
 debug: Inserted compare_str.ops[2]: 'l-store-copy tmp%0#0 0'
 debug: Replaced compare_str.ops[4]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted compare_str.ops[8]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/log/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir b/test_cases/log/out/MyContract.ir/MyContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/log/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir
rename to test_cases/log/out/MyContract.ir/MyContract.approval.0.ssa.ir
diff --git a/test_cases/log/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir b/test_cases/log/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/log/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir
rename to test_cases/log/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
diff --git a/test_cases/log/out/MyContract.ir/MyContract.approval.2.approval.destructured.ir b/test_cases/log/out/MyContract.ir/MyContract.approval.2.destructured.ir
similarity index 100%
rename from test_cases/log/out/MyContract.ir/MyContract.approval.2.approval.destructured.ir
rename to test_cases/log/out/MyContract.ir/MyContract.approval.2.destructured.ir
diff --git a/test_cases/log/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir b/test_cases/log/out/MyContract.ir/MyContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/log/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir
rename to test_cases/log/out/MyContract.ir/MyContract.clear.0.ssa.ir
diff --git a/test_cases/log/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir b/test_cases/log/out/MyContract.ir/MyContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/log/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir
rename to test_cases/log/out/MyContract.ir/MyContract.clear.1.destructured.ir
diff --git a/test_cases/log/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir b/test_cases/log/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/log/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir
rename to test_cases/log/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
diff --git a/test_cases/log/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir b/test_cases/log/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/log/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir
rename to test_cases/log/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
diff --git a/test_cases/log/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir b/test_cases/log/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/log/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir
rename to test_cases/log/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
diff --git a/test_cases/log/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir b/test_cases/log/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/log/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir
rename to test_cases/log/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
diff --git a/test_cases/log/puya.log b/test_cases/log/puya.log
index fbab3b7e4e..e3695d8191 100644
--- a/test_cases/log/puya.log
+++ b/test_cases/log/puya.log
@@ -416,7 +416,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to log/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir
+debug: Output IR to log/out/MyContract.ir/MyContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.log.contract.MyContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.log.contract.MyContract.approval_program
@@ -470,7 +470,7 @@ debug: Optimizer: Remove Linear Jump
 debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to log/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to log/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.log.contract.MyContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -495,8 +495,8 @@ debug: Coalescing local variables in test_cases.log.contract.MyContract.approval
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.log.contract.MyContract.approval_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to log/out/MyContract.ir/MyContract.approval.2.approval.destructured.ir
-debug: Output IR to log/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir
+debug: Output IR to log/out/MyContract.ir/MyContract.approval.2.destructured.ir
+debug: Output IR to log/out/MyContract.ir/MyContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.log.contract.MyContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.log.contract.MyContract.clear_state_program
@@ -522,7 +522,7 @@ debug: Coalescing local variables in test_cases.log.contract.MyContract.clear_st
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.log.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to log/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir
+debug: Output IR to log/out/MyContract.ir/MyContract.clear.1.destructured.ir
 debug: Inserted main.ops[2]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[4]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[11]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/log/puya_O2.log b/test_cases/log/puya_O2.log
index 1b24a134f1..67bf8abcde 100644
--- a/test_cases/log/puya_O2.log
+++ b/test_cases/log/puya_O2.log
@@ -492,7 +492,7 @@ debug: Coalescing local variables in test_cases.log.contract.MyContract.approval
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.log.contract.MyContract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to log/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir
+debug: Output IR to log/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.log.contract.MyContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.log.contract.MyContract.clear_state_program
@@ -518,7 +518,7 @@ debug: Coalescing local variables in test_cases.log.contract.MyContract.clear_st
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.log.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to log/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir
+debug: Output IR to log/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
 debug: Inserted main.ops[2]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[4]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[11]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/log/puya_unoptimized.log b/test_cases/log/puya_unoptimized.log
index dcd1c21125..ed62e1c3d0 100644
--- a/test_cases/log/puya_unoptimized.log
+++ b/test_cases/log/puya_unoptimized.log
@@ -443,7 +443,7 @@ debug: Coalescing local variables in test_cases.log.contract.MyContract.approval
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.log.contract.MyContract.approval_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to log/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir
+debug: Output IR to log/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.log.contract.MyContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.log.contract.MyContract.clear_state_program
@@ -461,7 +461,7 @@ debug: Coalescing local variables in test_cases.log.contract.MyContract.clear_st
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.log.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to log/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir
+debug: Output IR to log/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
 debug: Inserted main.ops[2]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[4]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[11]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/loop_else/out/LoopElseContract.ir/LoopElseContract.approval.0.approval.ssa.ir b/test_cases/loop_else/out/LoopElseContract.ir/LoopElseContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/loop_else/out/LoopElseContract.ir/LoopElseContract.approval.0.approval.ssa.ir
rename to test_cases/loop_else/out/LoopElseContract.ir/LoopElseContract.approval.0.ssa.ir
diff --git a/test_cases/loop_else/out/LoopElseContract.ir/LoopElseContract.approval.1.approval.ssa.opt.ir b/test_cases/loop_else/out/LoopElseContract.ir/LoopElseContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/loop_else/out/LoopElseContract.ir/LoopElseContract.approval.1.approval.ssa.opt.ir
rename to test_cases/loop_else/out/LoopElseContract.ir/LoopElseContract.approval.1.ssa.opt.ir
diff --git a/test_cases/loop_else/out/LoopElseContract.ir/LoopElseContract.approval.2.approval.ssa.opt.ir b/test_cases/loop_else/out/LoopElseContract.ir/LoopElseContract.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/loop_else/out/LoopElseContract.ir/LoopElseContract.approval.2.approval.ssa.opt.ir
rename to test_cases/loop_else/out/LoopElseContract.ir/LoopElseContract.approval.2.ssa.opt.ir
diff --git a/test_cases/loop_else/out/LoopElseContract.ir/LoopElseContract.approval.3.approval.destructured.ir b/test_cases/loop_else/out/LoopElseContract.ir/LoopElseContract.approval.3.destructured.ir
similarity index 100%
rename from test_cases/loop_else/out/LoopElseContract.ir/LoopElseContract.approval.3.approval.destructured.ir
rename to test_cases/loop_else/out/LoopElseContract.ir/LoopElseContract.approval.3.destructured.ir
diff --git a/test_cases/loop_else/out/LoopElseContract.ir/LoopElseContract.clear.0.clear.ssa.ir b/test_cases/loop_else/out/LoopElseContract.ir/LoopElseContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/loop_else/out/LoopElseContract.ir/LoopElseContract.clear.0.clear.ssa.ir
rename to test_cases/loop_else/out/LoopElseContract.ir/LoopElseContract.clear.0.ssa.ir
diff --git a/test_cases/loop_else/out/LoopElseContract.ir/LoopElseContract.clear.1.clear.destructured.ir b/test_cases/loop_else/out/LoopElseContract.ir/LoopElseContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/loop_else/out/LoopElseContract.ir/LoopElseContract.clear.1.clear.destructured.ir
rename to test_cases/loop_else/out/LoopElseContract.ir/LoopElseContract.clear.1.destructured.ir
diff --git a/test_cases/loop_else/out_O2/LoopElseContract.ir/LoopElseContract.approval.0.approval.destructured.ir b/test_cases/loop_else/out_O2/LoopElseContract.ir/LoopElseContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/loop_else/out_O2/LoopElseContract.ir/LoopElseContract.approval.0.approval.destructured.ir
rename to test_cases/loop_else/out_O2/LoopElseContract.ir/LoopElseContract.approval.0.destructured.ir
diff --git a/test_cases/loop_else/out_O2/LoopElseContract.ir/LoopElseContract.clear.0.clear.destructured.ir b/test_cases/loop_else/out_O2/LoopElseContract.ir/LoopElseContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/loop_else/out_O2/LoopElseContract.ir/LoopElseContract.clear.0.clear.destructured.ir
rename to test_cases/loop_else/out_O2/LoopElseContract.ir/LoopElseContract.clear.0.destructured.ir
diff --git a/test_cases/loop_else/out_unoptimized/LoopElseContract.ir/LoopElseContract.approval.0.approval.destructured.ir b/test_cases/loop_else/out_unoptimized/LoopElseContract.ir/LoopElseContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/loop_else/out_unoptimized/LoopElseContract.ir/LoopElseContract.approval.0.approval.destructured.ir
rename to test_cases/loop_else/out_unoptimized/LoopElseContract.ir/LoopElseContract.approval.0.destructured.ir
diff --git a/test_cases/loop_else/out_unoptimized/LoopElseContract.ir/LoopElseContract.clear.0.clear.destructured.ir b/test_cases/loop_else/out_unoptimized/LoopElseContract.ir/LoopElseContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/loop_else/out_unoptimized/LoopElseContract.ir/LoopElseContract.clear.0.clear.destructured.ir
rename to test_cases/loop_else/out_unoptimized/LoopElseContract.ir/LoopElseContract.clear.0.destructured.ir
diff --git a/test_cases/loop_else/puya.log b/test_cases/loop_else/puya.log
index b8525ea456..bb2760bd23 100644
--- a/test_cases/loop_else/puya.log
+++ b/test_cases/loop_else/puya.log
@@ -524,7 +524,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to loop_else/out/LoopElseContract.ir/LoopElseContract.approval.0.approval.ssa.ir
+debug: Output IR to loop_else/out/LoopElseContract.ir/LoopElseContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.loop_else.loop_else.LoopElseContract at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.loop_else.loop_else.test_empty_loop for inlining
@@ -650,7 +650,7 @@ debug: Not removing empty block block@3 because it's used by phi nodes
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.loop_else.loop_else.test_empty_loop
-debug: Output IR to loop_else/out/LoopElseContract.ir/LoopElseContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to loop_else/out/LoopElseContract.ir/LoopElseContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.loop_else.loop_else.LoopElseContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -675,7 +675,7 @@ debug: Merged linear block@27 into block@0
 debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to loop_else/out/LoopElseContract.ir/LoopElseContract.approval.2.approval.ssa.opt.ir
+debug: Output IR to loop_else/out/LoopElseContract.ir/LoopElseContract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.loop_else.loop_else.LoopElseContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -702,8 +702,8 @@ debug: Coalescing account_index#0 with [account_index#5, account_index#1, accoun
 debug: Coalescing resulted in 20 replacement/s
 debug: Sequentializing parallel copies in test_cases.loop_else.loop_else.LoopElseContract.approval_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to loop_else/out/LoopElseContract.ir/LoopElseContract.approval.3.approval.destructured.ir
-debug: Output IR to loop_else/out/LoopElseContract.ir/LoopElseContract.clear.0.clear.ssa.ir
+debug: Output IR to loop_else/out/LoopElseContract.ir/LoopElseContract.approval.3.destructured.ir
+debug: Output IR to loop_else/out/LoopElseContract.ir/LoopElseContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.loop_else.loop_else.LoopElseContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.loop_else.loop_else.LoopElseContract.clear_state_program
@@ -729,7 +729,7 @@ debug: Coalescing local variables in test_cases.loop_else.loop_else.LoopElseCont
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.loop_else.loop_else.LoopElseContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to loop_else/out/LoopElseContract.ir/LoopElseContract.clear.1.clear.destructured.ir
+debug: Output IR to loop_else/out/LoopElseContract.ir/LoopElseContract.clear.1.destructured.ir
 debug: Inserted main_while_top@1.ops[5]: 'l-store-copy tmp%1#0 0'
 debug: Replaced main_while_top@1.ops[7]: 'v-load tmp%1#0' with 'l-load tmp%1#0'
 debug: Inserted main_while_top@1.ops[11]: 'l-store-copy tmp%3#0 0'
diff --git a/test_cases/loop_else/puya_O2.log b/test_cases/loop_else/puya_O2.log
index a0b2529052..67d25451f5 100644
--- a/test_cases/loop_else/puya_O2.log
+++ b/test_cases/loop_else/puya_O2.log
@@ -698,7 +698,7 @@ debug: Coalescing account_index#0 with [account_index#5, account_index#1, accoun
 debug: Coalescing resulted in 20 replacement/s
 debug: Sequentializing parallel copies in test_cases.loop_else.loop_else.LoopElseContract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to loop_else/out_O2/LoopElseContract.ir/LoopElseContract.approval.0.approval.destructured.ir
+debug: Output IR to loop_else/out_O2/LoopElseContract.ir/LoopElseContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.loop_else.loop_else.LoopElseContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.loop_else.loop_else.LoopElseContract.clear_state_program
@@ -724,7 +724,7 @@ debug: Coalescing local variables in test_cases.loop_else.loop_else.LoopElseCont
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.loop_else.loop_else.LoopElseContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to loop_else/out_O2/LoopElseContract.ir/LoopElseContract.clear.0.clear.destructured.ir
+debug: Output IR to loop_else/out_O2/LoopElseContract.ir/LoopElseContract.clear.0.destructured.ir
 debug: Inserted main_while_top@1.ops[5]: 'l-store-copy tmp%1#0 0'
 debug: Replaced main_while_top@1.ops[7]: 'v-load tmp%1#0' with 'l-load tmp%1#0'
 debug: Inserted main_while_top@1.ops[11]: 'l-store-copy tmp%3#0 0'
diff --git a/test_cases/loop_else/puya_unoptimized.log b/test_cases/loop_else/puya_unoptimized.log
index b6ddb28fa2..e17a1ed6fa 100644
--- a/test_cases/loop_else/puya_unoptimized.log
+++ b/test_cases/loop_else/puya_unoptimized.log
@@ -574,7 +574,7 @@ debug: Coalescing i#0 with [i#5, i#1, i#2]
 debug: Coalescing resulted in 16 replacement/s
 debug: Sequentializing parallel copies in test_cases.loop_else.loop_else.test_empty_loop
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to loop_else/out_unoptimized/LoopElseContract.ir/LoopElseContract.approval.0.approval.destructured.ir
+debug: Output IR to loop_else/out_unoptimized/LoopElseContract.ir/LoopElseContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.loop_else.loop_else.LoopElseContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.loop_else.loop_else.LoopElseContract.clear_state_program
@@ -592,7 +592,7 @@ debug: Coalescing local variables in test_cases.loop_else.loop_else.LoopElseCont
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.loop_else.loop_else.LoopElseContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to loop_else/out_unoptimized/LoopElseContract.ir/LoopElseContract.clear.0.clear.destructured.ir
+debug: Output IR to loop_else/out_unoptimized/LoopElseContract.ir/LoopElseContract.clear.0.destructured.ir
 debug: Inserted main_while_top@1.ops[5]: 'l-store-copy tmp%1#0 0'
 debug: Replaced main_while_top@1.ops[7]: 'v-load tmp%1#0' with 'l-load tmp%1#0'
 debug: Inserted main_while_top@1.ops[1]: 'l-store-copy tmp%0#0 0'
diff --git a/test_cases/match/out/Counter.ir/Counter.approval.0.approval.ssa.ir b/test_cases/match/out/Counter.ir/Counter.approval.0.ssa.ir
similarity index 100%
rename from test_cases/match/out/Counter.ir/Counter.approval.0.approval.ssa.ir
rename to test_cases/match/out/Counter.ir/Counter.approval.0.ssa.ir
diff --git a/test_cases/match/out/Counter.ir/Counter.approval.1.approval.ssa.opt.ir b/test_cases/match/out/Counter.ir/Counter.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/match/out/Counter.ir/Counter.approval.1.approval.ssa.opt.ir
rename to test_cases/match/out/Counter.ir/Counter.approval.1.ssa.opt.ir
diff --git a/test_cases/match/out/Counter.ir/Counter.approval.2.approval.ssa.opt.ir b/test_cases/match/out/Counter.ir/Counter.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/match/out/Counter.ir/Counter.approval.2.approval.ssa.opt.ir
rename to test_cases/match/out/Counter.ir/Counter.approval.2.ssa.opt.ir
diff --git a/test_cases/match/out/Counter.ir/Counter.approval.3.approval.destructured.ir b/test_cases/match/out/Counter.ir/Counter.approval.3.destructured.ir
similarity index 100%
rename from test_cases/match/out/Counter.ir/Counter.approval.3.approval.destructured.ir
rename to test_cases/match/out/Counter.ir/Counter.approval.3.destructured.ir
diff --git a/test_cases/match/out/Counter.ir/Counter.clear.0.clear.ssa.ir b/test_cases/match/out/Counter.ir/Counter.clear.0.ssa.ir
similarity index 100%
rename from test_cases/match/out/Counter.ir/Counter.clear.0.clear.ssa.ir
rename to test_cases/match/out/Counter.ir/Counter.clear.0.ssa.ir
diff --git a/test_cases/match/out/Counter.ir/Counter.clear.1.clear.destructured.ir b/test_cases/match/out/Counter.ir/Counter.clear.1.destructured.ir
similarity index 100%
rename from test_cases/match/out/Counter.ir/Counter.clear.1.clear.destructured.ir
rename to test_cases/match/out/Counter.ir/Counter.clear.1.destructured.ir
diff --git a/test_cases/match/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir b/test_cases/match/out/MyContract.ir/MyContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/match/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir
rename to test_cases/match/out/MyContract.ir/MyContract.approval.0.ssa.ir
diff --git a/test_cases/match/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir b/test_cases/match/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/match/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir
rename to test_cases/match/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
diff --git a/test_cases/match/out/MyContract.ir/MyContract.approval.2.approval.destructured.ir b/test_cases/match/out/MyContract.ir/MyContract.approval.2.destructured.ir
similarity index 100%
rename from test_cases/match/out/MyContract.ir/MyContract.approval.2.approval.destructured.ir
rename to test_cases/match/out/MyContract.ir/MyContract.approval.2.destructured.ir
diff --git a/test_cases/match/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir b/test_cases/match/out/MyContract.ir/MyContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/match/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir
rename to test_cases/match/out/MyContract.ir/MyContract.clear.0.ssa.ir
diff --git a/test_cases/match/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir b/test_cases/match/out/MyContract.ir/MyContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/match/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir
rename to test_cases/match/out/MyContract.ir/MyContract.clear.1.destructured.ir
diff --git a/test_cases/match/out_O2/Counter.ir/Counter.approval.0.approval.destructured.ir b/test_cases/match/out_O2/Counter.ir/Counter.approval.0.destructured.ir
similarity index 100%
rename from test_cases/match/out_O2/Counter.ir/Counter.approval.0.approval.destructured.ir
rename to test_cases/match/out_O2/Counter.ir/Counter.approval.0.destructured.ir
diff --git a/test_cases/match/out_O2/Counter.ir/Counter.clear.0.clear.destructured.ir b/test_cases/match/out_O2/Counter.ir/Counter.clear.0.destructured.ir
similarity index 100%
rename from test_cases/match/out_O2/Counter.ir/Counter.clear.0.clear.destructured.ir
rename to test_cases/match/out_O2/Counter.ir/Counter.clear.0.destructured.ir
diff --git a/test_cases/match/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir b/test_cases/match/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/match/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir
rename to test_cases/match/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
diff --git a/test_cases/match/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir b/test_cases/match/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/match/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir
rename to test_cases/match/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
diff --git a/test_cases/match/out_unoptimized/Counter.ir/Counter.approval.0.approval.destructured.ir b/test_cases/match/out_unoptimized/Counter.ir/Counter.approval.0.destructured.ir
similarity index 100%
rename from test_cases/match/out_unoptimized/Counter.ir/Counter.approval.0.approval.destructured.ir
rename to test_cases/match/out_unoptimized/Counter.ir/Counter.approval.0.destructured.ir
diff --git a/test_cases/match/out_unoptimized/Counter.ir/Counter.clear.0.clear.destructured.ir b/test_cases/match/out_unoptimized/Counter.ir/Counter.clear.0.destructured.ir
similarity index 100%
rename from test_cases/match/out_unoptimized/Counter.ir/Counter.clear.0.clear.destructured.ir
rename to test_cases/match/out_unoptimized/Counter.ir/Counter.clear.0.destructured.ir
diff --git a/test_cases/match/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir b/test_cases/match/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/match/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir
rename to test_cases/match/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
diff --git a/test_cases/match/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir b/test_cases/match/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/match/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir
rename to test_cases/match/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
diff --git a/test_cases/match/puya.log b/test_cases/match/puya.log
index febd881336..2ebed21d1e 100644
--- a/test_cases/match/puya.log
+++ b/test_cases/match/puya.log
@@ -534,7 +534,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to match/out/Counter.ir/Counter.approval.0.approval.ssa.ir
+debug: Output IR to match/out/Counter.ir/Counter.approval.0.ssa.ir
 info: optimizing approval program of test_cases.match.counter.Counter at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.match.counter.Counter.__init__ for inlining
@@ -623,7 +623,7 @@ debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.match.counter.Counter.__init__
 debug: removing unused subroutine test_cases.match.counter.Counter.approval_program
-debug: Output IR to match/out/Counter.ir/Counter.approval.1.approval.ssa.opt.ir
+debug: Output IR to match/out/Counter.ir/Counter.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking single-use function test_cases.match.counter.Counter.increment_counter for inlining
 debug: Optimizing subroutine test_cases.match.counter.Counter.__algopy_entrypoint_with_init
@@ -662,7 +662,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.match.counter.Counter.increment_counter
-debug: Output IR to match/out/Counter.ir/Counter.approval.2.approval.ssa.opt.ir
+debug: Output IR to match/out/Counter.ir/Counter.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.match.counter.Counter.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -689,8 +689,8 @@ debug: Coalescing tmp%1#0 with [tmp%1#1]
 debug: Coalescing resulted in 5 replacement/s
 debug: Sequentializing parallel copies in test_cases.match.counter.Counter.__algopy_entrypoint_with_init
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to match/out/Counter.ir/Counter.approval.3.approval.destructured.ir
-debug: Output IR to match/out/Counter.ir/Counter.clear.0.clear.ssa.ir
+debug: Output IR to match/out/Counter.ir/Counter.approval.3.destructured.ir
+debug: Output IR to match/out/Counter.ir/Counter.clear.0.ssa.ir
 info: optimizing clear program of test_cases.match.counter.Counter at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.match.counter.Counter.clear_state_program
@@ -716,7 +716,7 @@ debug: Coalescing local variables in test_cases.match.counter.Counter.clear_stat
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.match.counter.Counter.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to match/out/Counter.ir/Counter.clear.1.clear.destructured.ir
+debug: Output IR to match/out/Counter.ir/Counter.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%0#1 0'
@@ -742,7 +742,7 @@ debug: inlining single reference block main_switch_case_0@4 into main_after_if_e
 debug: inlining single reference block main_after_inlined_test_cases.match.counter.Counter.approval_program@6 into main_after_if_else@2
 debug: removing explicit jump to fall-through block main_after_if_else@2
 match/counter.py:17 debug: optimizing TEAL subroutine test_cases.match.counter.Counter.clear_state_program() -> uint64:
-debug: Output IR to match/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir
+debug: Output IR to match/out/MyContract.ir/MyContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.match.contract.MyContract at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.match.contract.MyContract.match_uint64 for inlining
@@ -943,7 +943,7 @@ debug: removing unused subroutine test_cases.match.contract.MyContract.match_byt
 debug: removing unused subroutine test_cases.match.contract.MyContract.match_address
 debug: removing unused subroutine test_cases.match.contract.MyContract.match_attributes
 debug: removing unused subroutine test_cases.match.contract.MyContract.match_bools
-debug: Output IR to match/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to match/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.match.contract.MyContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -971,8 +971,8 @@ debug: Coalescing n#2 with [n#3]
 debug: Coalescing resulted in 6 replacement/s
 debug: Sequentializing parallel copies in test_cases.match.contract.MyContract.approval_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to match/out/MyContract.ir/MyContract.approval.2.approval.destructured.ir
-debug: Output IR to match/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir
+debug: Output IR to match/out/MyContract.ir/MyContract.approval.2.destructured.ir
+debug: Output IR to match/out/MyContract.ir/MyContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.match.contract.MyContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.match.contract.MyContract.clear_state_program
@@ -998,7 +998,7 @@ debug: Coalescing local variables in test_cases.match.contract.MyContract.clear_
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.match.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to match/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir
+debug: Output IR to match/out/MyContract.ir/MyContract.clear.1.destructured.ir
 debug: Inserted main.ops[7]: 'l-store-copy n#0 0'
 debug: Replaced main.ops[11]: 'v-load n#0' with 'l-load n#0'
 debug: Inserted main_switch_case_next@5.ops[1]: 'l-store-copy tmp%0#0 0'
diff --git a/test_cases/match/puya_O2.log b/test_cases/match/puya_O2.log
index 42acd921ee..96cb0704af 100644
--- a/test_cases/match/puya_O2.log
+++ b/test_cases/match/puya_O2.log
@@ -685,7 +685,7 @@ debug: Coalescing tmp%1#0 with [tmp%1#1]
 debug: Coalescing resulted in 5 replacement/s
 debug: Sequentializing parallel copies in test_cases.match.counter.Counter.__algopy_entrypoint_with_init
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to match/out_O2/Counter.ir/Counter.approval.0.approval.destructured.ir
+debug: Output IR to match/out_O2/Counter.ir/Counter.approval.0.destructured.ir
 info: optimizing clear program of test_cases.match.counter.Counter at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.match.counter.Counter.clear_state_program
@@ -711,7 +711,7 @@ debug: Coalescing local variables in test_cases.match.counter.Counter.clear_stat
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.match.counter.Counter.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to match/out_O2/Counter.ir/Counter.clear.0.clear.destructured.ir
+debug: Output IR to match/out_O2/Counter.ir/Counter.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%0#1 0'
@@ -964,7 +964,7 @@ debug: Coalescing n#2 with [n#3]
 debug: Coalescing resulted in 6 replacement/s
 debug: Sequentializing parallel copies in test_cases.match.contract.MyContract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to match/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir
+debug: Output IR to match/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.match.contract.MyContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.match.contract.MyContract.clear_state_program
@@ -990,7 +990,7 @@ debug: Coalescing local variables in test_cases.match.contract.MyContract.clear_
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.match.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to match/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir
+debug: Output IR to match/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
 debug: Inserted main.ops[7]: 'l-store-copy n#0 0'
 debug: Replaced main.ops[11]: 'v-load n#0' with 'l-load n#0'
 debug: Inserted main_switch_case_next@5.ops[1]: 'l-store-copy tmp%0#0 0'
diff --git a/test_cases/match/puya_unoptimized.log b/test_cases/match/puya_unoptimized.log
index 7b2d056f34..57f723e065 100644
--- a/test_cases/match/puya_unoptimized.log
+++ b/test_cases/match/puya_unoptimized.log
@@ -592,7 +592,7 @@ debug: Coalescing local variables in test_cases.match.counter.Counter.increment_
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.match.counter.Counter.increment_counter
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to match/out_unoptimized/Counter.ir/Counter.approval.0.approval.destructured.ir
+debug: Output IR to match/out_unoptimized/Counter.ir/Counter.approval.0.destructured.ir
 info: optimizing clear program of test_cases.match.counter.Counter at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.match.counter.Counter.clear_state_program
@@ -610,7 +610,7 @@ debug: Coalescing local variables in test_cases.match.counter.Counter.clear_stat
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.match.counter.Counter.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to match/out_unoptimized/Counter.ir/Counter.clear.0.clear.destructured.ir
+debug: Output IR to match/out_unoptimized/Counter.ir/Counter.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%1#0 0'
@@ -797,7 +797,7 @@ debug: Coalescing local variables in test_cases.match.contract.MyContract.match_
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.match.contract.MyContract.match_bools
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to match/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir
+debug: Output IR to match/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.match.contract.MyContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.match.contract.MyContract.clear_state_program
@@ -815,7 +815,7 @@ debug: Coalescing local variables in test_cases.match.contract.MyContract.clear_
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.match.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to match/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir
+debug: Output IR to match/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
 debug: Inserted match_uint64.ops[1]: 'l-store-copy n#0 0'
 debug: Replaced match_uint64.ops[5]: 'v-load n#0' with 'l-load n#0'
 debug: Inserted match_biguint.ops[1]: 'l-store-copy tmp%0#0 0'
diff --git a/test_cases/module_consts/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir b/test_cases/module_consts/out/MyContract.ir/MyContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/module_consts/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir
rename to test_cases/module_consts/out/MyContract.ir/MyContract.approval.0.ssa.ir
diff --git a/test_cases/module_consts/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir b/test_cases/module_consts/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/module_consts/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir
rename to test_cases/module_consts/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
diff --git a/test_cases/module_consts/out/MyContract.ir/MyContract.approval.2.approval.destructured.ir b/test_cases/module_consts/out/MyContract.ir/MyContract.approval.2.destructured.ir
similarity index 100%
rename from test_cases/module_consts/out/MyContract.ir/MyContract.approval.2.approval.destructured.ir
rename to test_cases/module_consts/out/MyContract.ir/MyContract.approval.2.destructured.ir
diff --git a/test_cases/module_consts/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir b/test_cases/module_consts/out/MyContract.ir/MyContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/module_consts/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir
rename to test_cases/module_consts/out/MyContract.ir/MyContract.clear.0.ssa.ir
diff --git a/test_cases/module_consts/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir b/test_cases/module_consts/out/MyContract.ir/MyContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/module_consts/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir
rename to test_cases/module_consts/out/MyContract.ir/MyContract.clear.1.destructured.ir
diff --git a/test_cases/module_consts/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir b/test_cases/module_consts/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/module_consts/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir
rename to test_cases/module_consts/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
diff --git a/test_cases/module_consts/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir b/test_cases/module_consts/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/module_consts/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir
rename to test_cases/module_consts/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
diff --git a/test_cases/module_consts/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir b/test_cases/module_consts/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/module_consts/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir
rename to test_cases/module_consts/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
diff --git a/test_cases/module_consts/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir b/test_cases/module_consts/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/module_consts/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir
rename to test_cases/module_consts/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
diff --git a/test_cases/module_consts/puya.log b/test_cases/module_consts/puya.log
index 31d2f0289e..46cca58a0c 100644
--- a/test_cases/module_consts/puya.log
+++ b/test_cases/module_consts/puya.log
@@ -407,7 +407,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to module_consts/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir
+debug: Output IR to module_consts/out/MyContract.ir/MyContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.module_consts.contract.MyContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.module_consts.contract.MyContract.approval_program
@@ -426,7 +426,7 @@ debug: Optimizer: Remove Linear Jump
 debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to module_consts/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to module_consts/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.module_consts.contract.MyContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -451,8 +451,8 @@ debug: Coalescing local variables in test_cases.module_consts.contract.MyContrac
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.module_consts.contract.MyContract.approval_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to module_consts/out/MyContract.ir/MyContract.approval.2.approval.destructured.ir
-debug: Output IR to module_consts/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir
+debug: Output IR to module_consts/out/MyContract.ir/MyContract.approval.2.destructured.ir
+debug: Output IR to module_consts/out/MyContract.ir/MyContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.module_consts.contract.MyContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.module_consts.contract.MyContract.clear_state_program
@@ -478,7 +478,7 @@ debug: Coalescing local variables in test_cases.module_consts.contract.MyContrac
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.module_consts.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to module_consts/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir
+debug: Output IR to module_consts/out/MyContract.ir/MyContract.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[5]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/module_consts/puya_O2.log b/test_cases/module_consts/puya_O2.log
index 6505380b0e..92f8cde867 100644
--- a/test_cases/module_consts/puya_O2.log
+++ b/test_cases/module_consts/puya_O2.log
@@ -448,7 +448,7 @@ debug: Coalescing local variables in test_cases.module_consts.contract.MyContrac
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.module_consts.contract.MyContract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to module_consts/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir
+debug: Output IR to module_consts/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.module_consts.contract.MyContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.module_consts.contract.MyContract.clear_state_program
@@ -474,7 +474,7 @@ debug: Coalescing local variables in test_cases.module_consts.contract.MyContrac
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.module_consts.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to module_consts/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir
+debug: Output IR to module_consts/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[5]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/module_consts/puya_unoptimized.log b/test_cases/module_consts/puya_unoptimized.log
index 0c0bd2a9d3..b98182580b 100644
--- a/test_cases/module_consts/puya_unoptimized.log
+++ b/test_cases/module_consts/puya_unoptimized.log
@@ -423,7 +423,7 @@ debug: Coalescing local variables in test_cases.module_consts.contract.MyContrac
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.module_consts.contract.MyContract.approval_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to module_consts/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir
+debug: Output IR to module_consts/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.module_consts.contract.MyContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.module_consts.contract.MyContract.clear_state_program
@@ -441,7 +441,7 @@ debug: Coalescing local variables in test_cases.module_consts.contract.MyContrac
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.module_consts.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to module_consts/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir
+debug: Output IR to module_consts/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[6]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/named_tuples/out/NamedTuplesContract.ir/NamedTuplesContract.approval.0.approval.ssa.ir b/test_cases/named_tuples/out/NamedTuplesContract.ir/NamedTuplesContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/named_tuples/out/NamedTuplesContract.ir/NamedTuplesContract.approval.0.approval.ssa.ir
rename to test_cases/named_tuples/out/NamedTuplesContract.ir/NamedTuplesContract.approval.0.ssa.ir
diff --git a/test_cases/named_tuples/out/NamedTuplesContract.ir/NamedTuplesContract.approval.1.approval.ssa.opt.ir b/test_cases/named_tuples/out/NamedTuplesContract.ir/NamedTuplesContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/named_tuples/out/NamedTuplesContract.ir/NamedTuplesContract.approval.1.approval.ssa.opt.ir
rename to test_cases/named_tuples/out/NamedTuplesContract.ir/NamedTuplesContract.approval.1.ssa.opt.ir
diff --git a/test_cases/named_tuples/out/NamedTuplesContract.ir/NamedTuplesContract.approval.2.approval.ssa.opt.ir b/test_cases/named_tuples/out/NamedTuplesContract.ir/NamedTuplesContract.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/named_tuples/out/NamedTuplesContract.ir/NamedTuplesContract.approval.2.approval.ssa.opt.ir
rename to test_cases/named_tuples/out/NamedTuplesContract.ir/NamedTuplesContract.approval.2.ssa.opt.ir
diff --git a/test_cases/named_tuples/out/NamedTuplesContract.ir/NamedTuplesContract.approval.3.approval.destructured.ir b/test_cases/named_tuples/out/NamedTuplesContract.ir/NamedTuplesContract.approval.3.destructured.ir
similarity index 100%
rename from test_cases/named_tuples/out/NamedTuplesContract.ir/NamedTuplesContract.approval.3.approval.destructured.ir
rename to test_cases/named_tuples/out/NamedTuplesContract.ir/NamedTuplesContract.approval.3.destructured.ir
diff --git a/test_cases/named_tuples/out/NamedTuplesContract.ir/NamedTuplesContract.clear.0.clear.ssa.ir b/test_cases/named_tuples/out/NamedTuplesContract.ir/NamedTuplesContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/named_tuples/out/NamedTuplesContract.ir/NamedTuplesContract.clear.0.clear.ssa.ir
rename to test_cases/named_tuples/out/NamedTuplesContract.ir/NamedTuplesContract.clear.0.ssa.ir
diff --git a/test_cases/named_tuples/out/NamedTuplesContract.ir/NamedTuplesContract.clear.1.clear.destructured.ir b/test_cases/named_tuples/out/NamedTuplesContract.ir/NamedTuplesContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/named_tuples/out/NamedTuplesContract.ir/NamedTuplesContract.clear.1.clear.destructured.ir
rename to test_cases/named_tuples/out/NamedTuplesContract.ir/NamedTuplesContract.clear.1.destructured.ir
diff --git a/test_cases/named_tuples/out_O2/NamedTuplesContract.ir/NamedTuplesContract.approval.0.approval.destructured.ir b/test_cases/named_tuples/out_O2/NamedTuplesContract.ir/NamedTuplesContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/named_tuples/out_O2/NamedTuplesContract.ir/NamedTuplesContract.approval.0.approval.destructured.ir
rename to test_cases/named_tuples/out_O2/NamedTuplesContract.ir/NamedTuplesContract.approval.0.destructured.ir
diff --git a/test_cases/named_tuples/out_O2/NamedTuplesContract.ir/NamedTuplesContract.clear.0.clear.destructured.ir b/test_cases/named_tuples/out_O2/NamedTuplesContract.ir/NamedTuplesContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/named_tuples/out_O2/NamedTuplesContract.ir/NamedTuplesContract.clear.0.clear.destructured.ir
rename to test_cases/named_tuples/out_O2/NamedTuplesContract.ir/NamedTuplesContract.clear.0.destructured.ir
diff --git a/test_cases/named_tuples/out_unoptimized/NamedTuplesContract.ir/NamedTuplesContract.approval.0.approval.destructured.ir b/test_cases/named_tuples/out_unoptimized/NamedTuplesContract.ir/NamedTuplesContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/named_tuples/out_unoptimized/NamedTuplesContract.ir/NamedTuplesContract.approval.0.approval.destructured.ir
rename to test_cases/named_tuples/out_unoptimized/NamedTuplesContract.ir/NamedTuplesContract.approval.0.destructured.ir
diff --git a/test_cases/named_tuples/out_unoptimized/NamedTuplesContract.ir/NamedTuplesContract.clear.0.clear.destructured.ir b/test_cases/named_tuples/out_unoptimized/NamedTuplesContract.ir/NamedTuplesContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/named_tuples/out_unoptimized/NamedTuplesContract.ir/NamedTuplesContract.clear.0.clear.destructured.ir
rename to test_cases/named_tuples/out_unoptimized/NamedTuplesContract.ir/NamedTuplesContract.clear.0.destructured.ir
diff --git a/test_cases/named_tuples/puya.log b/test_cases/named_tuples/puya.log
index 67eaa89b8c..bda5377db6 100644
--- a/test_cases/named_tuples/puya.log
+++ b/test_cases/named_tuples/puya.log
@@ -442,7 +442,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to named_tuples/out/NamedTuplesContract.ir/NamedTuplesContract.approval.0.approval.ssa.ir
+debug: Output IR to named_tuples/out/NamedTuplesContract.ir/NamedTuplesContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.named_tuples.contract.NamedTuplesContract at level 1
 debug: Begin optimization pass 1/100
 debug: marking trivial method test_cases.named_tuples.contract.NamedTuplesContract.build_tuple_by_name as inlineable
@@ -649,7 +649,7 @@ debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.named_tuples.contract.NamedTuplesContract.__puya_arc4_router__
 debug: removing unused subroutine test_cases.named_tuples.contract.NamedTuplesContract.build_tuple_by_name
 debug: removing unused subroutine test_cases.named_tuples.contract.NamedTuplesContract.build_tuple_by_position
-debug: Output IR to named_tuples/out/NamedTuplesContract.ir/NamedTuplesContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to named_tuples/out/NamedTuplesContract.ir/NamedTuplesContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking trivial method test_cases.named_tuples.contract.NamedTuplesContract.build_tuple as inlineable
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
@@ -730,7 +730,7 @@ debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.named_tuples.contract.NamedTuplesContract.build_tuple
 debug: removing unused subroutine test_cases.named_tuples.contract.NamedTuplesContract.__algopy_default_create
-debug: Output IR to named_tuples/out/NamedTuplesContract.ir/NamedTuplesContract.approval.2.approval.ssa.opt.ir
+debug: Output IR to named_tuples/out/NamedTuplesContract.ir/NamedTuplesContract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -779,8 +779,8 @@ debug: Coalescing local variables in test_cases.named_tuples.contract.NamedTuple
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.named_tuples.contract.NamedTuplesContract.test_tuple
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to named_tuples/out/NamedTuplesContract.ir/NamedTuplesContract.approval.3.approval.destructured.ir
-debug: Output IR to named_tuples/out/NamedTuplesContract.ir/NamedTuplesContract.clear.0.clear.ssa.ir
+debug: Output IR to named_tuples/out/NamedTuplesContract.ir/NamedTuplesContract.approval.3.destructured.ir
+debug: Output IR to named_tuples/out/NamedTuplesContract.ir/NamedTuplesContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.named_tuples.contract.NamedTuplesContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -806,7 +806,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to named_tuples/out/NamedTuplesContract.ir/NamedTuplesContract.clear.1.clear.destructured.ir
+debug: Output IR to named_tuples/out/NamedTuplesContract.ir/NamedTuplesContract.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/named_tuples/puya_O2.log b/test_cases/named_tuples/puya_O2.log
index 2814cfb8e6..e00f1f0914 100644
--- a/test_cases/named_tuples/puya_O2.log
+++ b/test_cases/named_tuples/puya_O2.log
@@ -787,7 +787,7 @@ debug: Coalescing tmp%0#0 with [tmp%0#3, tmp%0#2]
 debug: Coalescing resulted in 13 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to named_tuples/out_O2/NamedTuplesContract.ir/NamedTuplesContract.approval.0.approval.destructured.ir
+debug: Output IR to named_tuples/out_O2/NamedTuplesContract.ir/NamedTuplesContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.named_tuples.contract.NamedTuplesContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -813,7 +813,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to named_tuples/out_O2/NamedTuplesContract.ir/NamedTuplesContract.clear.0.clear.destructured.ir
+debug: Output IR to named_tuples/out_O2/NamedTuplesContract.ir/NamedTuplesContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/named_tuples/puya_unoptimized.log b/test_cases/named_tuples/puya_unoptimized.log
index 5ddf2f46ee..5edb5d4bbc 100644
--- a/test_cases/named_tuples/puya_unoptimized.log
+++ b/test_cases/named_tuples/puya_unoptimized.log
@@ -621,7 +621,7 @@ debug: Coalescing local variables in test_cases.named_tuples.contract.NamedTuple
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.named_tuples.contract.NamedTuplesContract.test_tuple
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to named_tuples/out_unoptimized/NamedTuplesContract.ir/NamedTuplesContract.approval.0.approval.destructured.ir
+debug: Output IR to named_tuples/out_unoptimized/NamedTuplesContract.ir/NamedTuplesContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.named_tuples.contract.NamedTuplesContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -639,7 +639,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to named_tuples/out_unoptimized/NamedTuplesContract.ir/NamedTuplesContract.clear.0.clear.destructured.ir
+debug: Output IR to named_tuples/out_unoptimized/NamedTuplesContract.ir/NamedTuplesContract.clear.0.destructured.ir
 debug: Inserted main_block@1.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main_block@1.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_block@1.ops[6]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/nested_loops/out/Nested.ir/Nested.approval.0.approval.ssa.ir b/test_cases/nested_loops/out/Nested.ir/Nested.approval.0.ssa.ir
similarity index 100%
rename from test_cases/nested_loops/out/Nested.ir/Nested.approval.0.approval.ssa.ir
rename to test_cases/nested_loops/out/Nested.ir/Nested.approval.0.ssa.ir
diff --git a/test_cases/nested_loops/out/Nested.ir/Nested.approval.1.approval.ssa.opt.ir b/test_cases/nested_loops/out/Nested.ir/Nested.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/nested_loops/out/Nested.ir/Nested.approval.1.approval.ssa.opt.ir
rename to test_cases/nested_loops/out/Nested.ir/Nested.approval.1.ssa.opt.ir
diff --git a/test_cases/nested_loops/out/Nested.ir/Nested.approval.2.approval.destructured.ir b/test_cases/nested_loops/out/Nested.ir/Nested.approval.2.destructured.ir
similarity index 100%
rename from test_cases/nested_loops/out/Nested.ir/Nested.approval.2.approval.destructured.ir
rename to test_cases/nested_loops/out/Nested.ir/Nested.approval.2.destructured.ir
diff --git a/test_cases/nested_loops/out/Nested.ir/Nested.clear.0.clear.ssa.ir b/test_cases/nested_loops/out/Nested.ir/Nested.clear.0.ssa.ir
similarity index 100%
rename from test_cases/nested_loops/out/Nested.ir/Nested.clear.0.clear.ssa.ir
rename to test_cases/nested_loops/out/Nested.ir/Nested.clear.0.ssa.ir
diff --git a/test_cases/nested_loops/out/Nested.ir/Nested.clear.1.clear.destructured.ir b/test_cases/nested_loops/out/Nested.ir/Nested.clear.1.destructured.ir
similarity index 100%
rename from test_cases/nested_loops/out/Nested.ir/Nested.clear.1.clear.destructured.ir
rename to test_cases/nested_loops/out/Nested.ir/Nested.clear.1.destructured.ir
diff --git a/test_cases/nested_loops/out_O2/Nested.ir/Nested.approval.0.approval.destructured.ir b/test_cases/nested_loops/out_O2/Nested.ir/Nested.approval.0.destructured.ir
similarity index 100%
rename from test_cases/nested_loops/out_O2/Nested.ir/Nested.approval.0.approval.destructured.ir
rename to test_cases/nested_loops/out_O2/Nested.ir/Nested.approval.0.destructured.ir
diff --git a/test_cases/nested_loops/out_O2/Nested.ir/Nested.clear.0.clear.destructured.ir b/test_cases/nested_loops/out_O2/Nested.ir/Nested.clear.0.destructured.ir
similarity index 100%
rename from test_cases/nested_loops/out_O2/Nested.ir/Nested.clear.0.clear.destructured.ir
rename to test_cases/nested_loops/out_O2/Nested.ir/Nested.clear.0.destructured.ir
diff --git a/test_cases/nested_loops/out_unoptimized/Nested.ir/Nested.approval.0.approval.destructured.ir b/test_cases/nested_loops/out_unoptimized/Nested.ir/Nested.approval.0.destructured.ir
similarity index 100%
rename from test_cases/nested_loops/out_unoptimized/Nested.ir/Nested.approval.0.approval.destructured.ir
rename to test_cases/nested_loops/out_unoptimized/Nested.ir/Nested.approval.0.destructured.ir
diff --git a/test_cases/nested_loops/out_unoptimized/Nested.ir/Nested.clear.0.clear.destructured.ir b/test_cases/nested_loops/out_unoptimized/Nested.ir/Nested.clear.0.destructured.ir
similarity index 100%
rename from test_cases/nested_loops/out_unoptimized/Nested.ir/Nested.clear.0.clear.destructured.ir
rename to test_cases/nested_loops/out_unoptimized/Nested.ir/Nested.clear.0.destructured.ir
diff --git a/test_cases/nested_loops/puya.log b/test_cases/nested_loops/puya.log
index b23e00260d..8cc873a6a0 100644
--- a/test_cases/nested_loops/puya.log
+++ b/test_cases/nested_loops/puya.log
@@ -675,7 +675,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to nested_loops/out/Nested.ir/Nested.approval.0.approval.ssa.ir
+debug: Output IR to nested_loops/out/Nested.ir/Nested.approval.0.ssa.ir
 info: optimizing approval program of test_cases.nested_loops.contract.Nested at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.nested_loops.contract.Nested.approval_program
@@ -709,7 +709,7 @@ debug: Merged linear block@27 into block@26
 debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to nested_loops/out/Nested.ir/Nested.approval.1.approval.ssa.opt.ir
+debug: Output IR to nested_loops/out/Nested.ir/Nested.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.nested_loops.contract.Nested.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -873,8 +873,8 @@ debug: * to_do y#0
 debug: * to_do index#0
 debug: * to_do item#0
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to nested_loops/out/Nested.ir/Nested.approval.2.approval.destructured.ir
-debug: Output IR to nested_loops/out/Nested.ir/Nested.clear.0.clear.ssa.ir
+debug: Output IR to nested_loops/out/Nested.ir/Nested.approval.2.destructured.ir
+debug: Output IR to nested_loops/out/Nested.ir/Nested.clear.0.ssa.ir
 info: optimizing clear program of test_cases.nested_loops.contract.Nested at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.nested_loops.contract.Nested.clear_state_program
@@ -900,7 +900,7 @@ debug: Coalescing local variables in test_cases.nested_loops.contract.Nested.cle
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.nested_loops.contract.Nested.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to nested_loops/out/Nested.ir/Nested.clear.1.clear.destructured.ir
+debug: Output IR to nested_loops/out/Nested.ir/Nested.clear.1.destructured.ir
 debug: Inserted main_for_header@1.ops[3]: 'l-store-copy continue_looping%0#0 0'
 debug: Replaced main_for_header@1.ops[5]: 'v-load continue_looping%0#0' with 'l-load continue_looping%0#0'
 debug: Inserted main_for_header@3.ops[3]: 'l-store-copy continue_looping%1#0 0'
diff --git a/test_cases/nested_loops/puya_O2.log b/test_cases/nested_loops/puya_O2.log
index c8d62cf572..8212fedb20 100644
--- a/test_cases/nested_loops/puya_O2.log
+++ b/test_cases/nested_loops/puya_O2.log
@@ -870,7 +870,7 @@ debug: * to_do y#0
 debug: * to_do index#0
 debug: * to_do item#0
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to nested_loops/out_O2/Nested.ir/Nested.approval.0.approval.destructured.ir
+debug: Output IR to nested_loops/out_O2/Nested.ir/Nested.approval.0.destructured.ir
 info: optimizing clear program of test_cases.nested_loops.contract.Nested at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.nested_loops.contract.Nested.clear_state_program
@@ -896,7 +896,7 @@ debug: Coalescing local variables in test_cases.nested_loops.contract.Nested.cle
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.nested_loops.contract.Nested.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to nested_loops/out_O2/Nested.ir/Nested.clear.0.clear.destructured.ir
+debug: Output IR to nested_loops/out_O2/Nested.ir/Nested.clear.0.destructured.ir
 debug: Inserted main_for_header@1.ops[3]: 'l-store-copy continue_looping%0#0 0'
 debug: Replaced main_for_header@1.ops[5]: 'v-load continue_looping%0#0' with 'l-load continue_looping%0#0'
 debug: Inserted main_for_header@3.ops[3]: 'l-store-copy continue_looping%1#0 0'
diff --git a/test_cases/nested_loops/puya_unoptimized.log b/test_cases/nested_loops/puya_unoptimized.log
index ba9731c1ce..5305c94bc5 100644
--- a/test_cases/nested_loops/puya_unoptimized.log
+++ b/test_cases/nested_loops/puya_unoptimized.log
@@ -840,7 +840,7 @@ debug: * to_do y#0
 debug: * to_do index#0
 debug: * to_do item#0
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to nested_loops/out_unoptimized/Nested.ir/Nested.approval.0.approval.destructured.ir
+debug: Output IR to nested_loops/out_unoptimized/Nested.ir/Nested.approval.0.destructured.ir
 info: optimizing clear program of test_cases.nested_loops.contract.Nested at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.nested_loops.contract.Nested.clear_state_program
@@ -858,7 +858,7 @@ debug: Coalescing local variables in test_cases.nested_loops.contract.Nested.cle
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.nested_loops.contract.Nested.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to nested_loops/out_unoptimized/Nested.ir/Nested.clear.0.clear.destructured.ir
+debug: Output IR to nested_loops/out_unoptimized/Nested.ir/Nested.clear.0.destructured.ir
 debug: Inserted main_for_header@1.ops[3]: 'l-store-copy continue_looping%0#0 0'
 debug: Replaced main_for_header@1.ops[5]: 'v-load continue_looping%0#0' with 'l-load continue_looping%0#0'
 debug: Inserted main_for_header@3.ops[3]: 'l-store-copy continue_looping%1#0 0'
diff --git a/test_cases/regression_tests/out/Issue118.ir/Issue118.approval.0.approval.ssa.ir b/test_cases/regression_tests/out/Issue118.ir/Issue118.approval.0.ssa.ir
similarity index 100%
rename from test_cases/regression_tests/out/Issue118.ir/Issue118.approval.0.approval.ssa.ir
rename to test_cases/regression_tests/out/Issue118.ir/Issue118.approval.0.ssa.ir
diff --git a/test_cases/regression_tests/out/Issue118.ir/Issue118.approval.1.approval.ssa.opt.ir b/test_cases/regression_tests/out/Issue118.ir/Issue118.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/regression_tests/out/Issue118.ir/Issue118.approval.1.approval.ssa.opt.ir
rename to test_cases/regression_tests/out/Issue118.ir/Issue118.approval.1.ssa.opt.ir
diff --git a/test_cases/regression_tests/out/Issue118.ir/Issue118.approval.2.approval.ssa.opt.ir b/test_cases/regression_tests/out/Issue118.ir/Issue118.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/regression_tests/out/Issue118.ir/Issue118.approval.2.approval.ssa.opt.ir
rename to test_cases/regression_tests/out/Issue118.ir/Issue118.approval.2.ssa.opt.ir
diff --git a/test_cases/regression_tests/out/Issue118.ir/Issue118.approval.3.approval.destructured.ir b/test_cases/regression_tests/out/Issue118.ir/Issue118.approval.3.destructured.ir
similarity index 100%
rename from test_cases/regression_tests/out/Issue118.ir/Issue118.approval.3.approval.destructured.ir
rename to test_cases/regression_tests/out/Issue118.ir/Issue118.approval.3.destructured.ir
diff --git a/test_cases/regression_tests/out/Issue118.ir/Issue118.clear.0.clear.ssa.ir b/test_cases/regression_tests/out/Issue118.ir/Issue118.clear.0.ssa.ir
similarity index 100%
rename from test_cases/regression_tests/out/Issue118.ir/Issue118.clear.0.clear.ssa.ir
rename to test_cases/regression_tests/out/Issue118.ir/Issue118.clear.0.ssa.ir
diff --git a/test_cases/regression_tests/out/Issue118.ir/Issue118.clear.1.clear.destructured.ir b/test_cases/regression_tests/out/Issue118.ir/Issue118.clear.1.destructured.ir
similarity index 100%
rename from test_cases/regression_tests/out/Issue118.ir/Issue118.clear.1.clear.destructured.ir
rename to test_cases/regression_tests/out/Issue118.ir/Issue118.clear.1.destructured.ir
diff --git a/test_cases/regression_tests/out/Issue194.ir/Issue194.approval.0.approval.ssa.ir b/test_cases/regression_tests/out/Issue194.ir/Issue194.approval.0.ssa.ir
similarity index 100%
rename from test_cases/regression_tests/out/Issue194.ir/Issue194.approval.0.approval.ssa.ir
rename to test_cases/regression_tests/out/Issue194.ir/Issue194.approval.0.ssa.ir
diff --git a/test_cases/regression_tests/out/Issue194.ir/Issue194.approval.1.approval.ssa.opt.ir b/test_cases/regression_tests/out/Issue194.ir/Issue194.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/regression_tests/out/Issue194.ir/Issue194.approval.1.approval.ssa.opt.ir
rename to test_cases/regression_tests/out/Issue194.ir/Issue194.approval.1.ssa.opt.ir
diff --git a/test_cases/regression_tests/out/Issue194.ir/Issue194.approval.2.approval.destructured.ir b/test_cases/regression_tests/out/Issue194.ir/Issue194.approval.2.destructured.ir
similarity index 100%
rename from test_cases/regression_tests/out/Issue194.ir/Issue194.approval.2.approval.destructured.ir
rename to test_cases/regression_tests/out/Issue194.ir/Issue194.approval.2.destructured.ir
diff --git a/test_cases/regression_tests/out/Issue194.ir/Issue194.clear.0.clear.ssa.ir b/test_cases/regression_tests/out/Issue194.ir/Issue194.clear.0.ssa.ir
similarity index 100%
rename from test_cases/regression_tests/out/Issue194.ir/Issue194.clear.0.clear.ssa.ir
rename to test_cases/regression_tests/out/Issue194.ir/Issue194.clear.0.ssa.ir
diff --git a/test_cases/regression_tests/out/Issue194.ir/Issue194.clear.1.clear.destructured.ir b/test_cases/regression_tests/out/Issue194.ir/Issue194.clear.1.destructured.ir
similarity index 100%
rename from test_cases/regression_tests/out/Issue194.ir/Issue194.clear.1.clear.destructured.ir
rename to test_cases/regression_tests/out/Issue194.ir/Issue194.clear.1.destructured.ir
diff --git a/test_cases/regression_tests/out_O2/Issue118.ir/Issue118.approval.0.approval.destructured.ir b/test_cases/regression_tests/out_O2/Issue118.ir/Issue118.approval.0.destructured.ir
similarity index 100%
rename from test_cases/regression_tests/out_O2/Issue118.ir/Issue118.approval.0.approval.destructured.ir
rename to test_cases/regression_tests/out_O2/Issue118.ir/Issue118.approval.0.destructured.ir
diff --git a/test_cases/regression_tests/out_O2/Issue118.ir/Issue118.clear.0.clear.destructured.ir b/test_cases/regression_tests/out_O2/Issue118.ir/Issue118.clear.0.destructured.ir
similarity index 100%
rename from test_cases/regression_tests/out_O2/Issue118.ir/Issue118.clear.0.clear.destructured.ir
rename to test_cases/regression_tests/out_O2/Issue118.ir/Issue118.clear.0.destructured.ir
diff --git a/test_cases/regression_tests/out_O2/Issue194.ir/Issue194.approval.0.approval.destructured.ir b/test_cases/regression_tests/out_O2/Issue194.ir/Issue194.approval.0.destructured.ir
similarity index 100%
rename from test_cases/regression_tests/out_O2/Issue194.ir/Issue194.approval.0.approval.destructured.ir
rename to test_cases/regression_tests/out_O2/Issue194.ir/Issue194.approval.0.destructured.ir
diff --git a/test_cases/regression_tests/out_O2/Issue194.ir/Issue194.clear.0.clear.destructured.ir b/test_cases/regression_tests/out_O2/Issue194.ir/Issue194.clear.0.destructured.ir
similarity index 100%
rename from test_cases/regression_tests/out_O2/Issue194.ir/Issue194.clear.0.clear.destructured.ir
rename to test_cases/regression_tests/out_O2/Issue194.ir/Issue194.clear.0.destructured.ir
diff --git a/test_cases/regression_tests/out_unoptimized/Issue118.ir/Issue118.approval.0.approval.destructured.ir b/test_cases/regression_tests/out_unoptimized/Issue118.ir/Issue118.approval.0.destructured.ir
similarity index 100%
rename from test_cases/regression_tests/out_unoptimized/Issue118.ir/Issue118.approval.0.approval.destructured.ir
rename to test_cases/regression_tests/out_unoptimized/Issue118.ir/Issue118.approval.0.destructured.ir
diff --git a/test_cases/regression_tests/out_unoptimized/Issue118.ir/Issue118.clear.0.clear.destructured.ir b/test_cases/regression_tests/out_unoptimized/Issue118.ir/Issue118.clear.0.destructured.ir
similarity index 100%
rename from test_cases/regression_tests/out_unoptimized/Issue118.ir/Issue118.clear.0.clear.destructured.ir
rename to test_cases/regression_tests/out_unoptimized/Issue118.ir/Issue118.clear.0.destructured.ir
diff --git a/test_cases/regression_tests/out_unoptimized/Issue194.ir/Issue194.approval.0.approval.destructured.ir b/test_cases/regression_tests/out_unoptimized/Issue194.ir/Issue194.approval.0.destructured.ir
similarity index 100%
rename from test_cases/regression_tests/out_unoptimized/Issue194.ir/Issue194.approval.0.approval.destructured.ir
rename to test_cases/regression_tests/out_unoptimized/Issue194.ir/Issue194.approval.0.destructured.ir
diff --git a/test_cases/regression_tests/out_unoptimized/Issue194.ir/Issue194.clear.0.clear.destructured.ir b/test_cases/regression_tests/out_unoptimized/Issue194.ir/Issue194.clear.0.destructured.ir
similarity index 100%
rename from test_cases/regression_tests/out_unoptimized/Issue194.ir/Issue194.clear.0.clear.destructured.ir
rename to test_cases/regression_tests/out_unoptimized/Issue194.ir/Issue194.clear.0.destructured.ir
diff --git a/test_cases/regression_tests/puya.log b/test_cases/regression_tests/puya.log
index 859a7ce521..e41e70a697 100644
--- a/test_cases/regression_tests/puya.log
+++ b/test_cases/regression_tests/puya.log
@@ -476,7 +476,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to regression_tests/out/Issue194.ir/Issue194.approval.0.approval.ssa.ir
+debug: Output IR to regression_tests/out/Issue194.ir/Issue194.approval.0.ssa.ir
 info: optimizing approval program of test_cases.regression_tests.issue_194.Issue194 at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.regression_tests.issue_194.Issue194.approval_program
@@ -509,7 +509,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Removing unreachable blocks: block@2
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to regression_tests/out/Issue194.ir/Issue194.approval.1.approval.ssa.opt.ir
+debug: Output IR to regression_tests/out/Issue194.ir/Issue194.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.regression_tests.issue_194.Issue194.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -534,8 +534,8 @@ debug: Coalescing local variables in test_cases.regression_tests.issue_194.Issue
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.regression_tests.issue_194.Issue194.approval_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to regression_tests/out/Issue194.ir/Issue194.approval.2.approval.destructured.ir
-debug: Output IR to regression_tests/out/Issue194.ir/Issue194.clear.0.clear.ssa.ir
+debug: Output IR to regression_tests/out/Issue194.ir/Issue194.approval.2.destructured.ir
+debug: Output IR to regression_tests/out/Issue194.ir/Issue194.clear.0.ssa.ir
 info: optimizing clear program of test_cases.regression_tests.issue_194.Issue194 at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.regression_tests.issue_194.Issue194.clear_state_program
@@ -561,10 +561,10 @@ debug: Coalescing local variables in test_cases.regression_tests.issue_194.Issue
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.regression_tests.issue_194.Issue194.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to regression_tests/out/Issue194.ir/Issue194.clear.1.clear.destructured.ir
+debug: Output IR to regression_tests/out/Issue194.ir/Issue194.clear.1.destructured.ir
 regression_tests/issue_194.py:6 debug: optimizing TEAL subroutine test_cases.regression_tests.issue_194.Issue194.approval_program() -> uint64:
 regression_tests/issue_194.py:15 debug: optimizing TEAL subroutine test_cases.regression_tests.issue_194.Issue194.clear_state_program() -> uint64:
-debug: Output IR to regression_tests/out/Issue118.ir/Issue118.approval.0.approval.ssa.ir
+debug: Output IR to regression_tests/out/Issue118.ir/Issue118.approval.0.ssa.ir
 info: optimizing approval program of test_cases.regression_tests.issue_118.Issue118 at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
@@ -690,7 +690,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.regression_tests.issue_118.Issue118.__puya_arc4_router__
-debug: Output IR to regression_tests/out/Issue118.ir/Issue118.approval.1.approval.ssa.opt.ir
+debug: Output IR to regression_tests/out/Issue118.ir/Issue118.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -743,7 +743,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.regression_tests.issue_118.Issue118.__algopy_default_create
-debug: Output IR to regression_tests/out/Issue118.ir/Issue118.approval.2.approval.ssa.opt.ir
+debug: Output IR to regression_tests/out/Issue118.ir/Issue118.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -792,8 +792,8 @@ debug: Coalescing local variables in test_cases.regression_tests.issue_118.Issue
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.regression_tests.issue_118.Issue118.verify
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to regression_tests/out/Issue118.ir/Issue118.approval.3.approval.destructured.ir
-debug: Output IR to regression_tests/out/Issue118.ir/Issue118.clear.0.clear.ssa.ir
+debug: Output IR to regression_tests/out/Issue118.ir/Issue118.approval.3.destructured.ir
+debug: Output IR to regression_tests/out/Issue118.ir/Issue118.clear.0.ssa.ir
 info: optimizing clear program of test_cases.regression_tests.issue_118.Issue118 at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -819,7 +819,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to regression_tests/out/Issue118.ir/Issue118.clear.1.clear.destructured.ir
+debug: Output IR to regression_tests/out/Issue118.ir/Issue118.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/regression_tests/puya_O2.log b/test_cases/regression_tests/puya_O2.log
index b0c73559cd..7bc06be0d0 100644
--- a/test_cases/regression_tests/puya_O2.log
+++ b/test_cases/regression_tests/puya_O2.log
@@ -531,7 +531,7 @@ debug: Coalescing local variables in test_cases.regression_tests.issue_194.Issue
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.regression_tests.issue_194.Issue194.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to regression_tests/out_O2/Issue194.ir/Issue194.approval.0.approval.destructured.ir
+debug: Output IR to regression_tests/out_O2/Issue194.ir/Issue194.approval.0.destructured.ir
 info: optimizing clear program of test_cases.regression_tests.issue_194.Issue194 at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.regression_tests.issue_194.Issue194.clear_state_program
@@ -557,7 +557,7 @@ debug: Coalescing local variables in test_cases.regression_tests.issue_194.Issue
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.regression_tests.issue_194.Issue194.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to regression_tests/out_O2/Issue194.ir/Issue194.clear.0.clear.destructured.ir
+debug: Output IR to regression_tests/out_O2/Issue194.ir/Issue194.clear.0.destructured.ir
 regression_tests/issue_194.py:6 debug: optimizing TEAL subroutine test_cases.regression_tests.issue_194.Issue194.approval_program() -> uint64:
 regression_tests/issue_194.py:15 debug: optimizing TEAL subroutine test_cases.regression_tests.issue_194.Issue194.clear_state_program() -> uint64:
 info: optimizing approval program of test_cases.regression_tests.issue_118.Issue118 at level 2
@@ -805,7 +805,7 @@ debug: Coalescing tmp%0#0 with [tmp%0#3]
 debug: Coalescing resulted in 13 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to regression_tests/out_O2/Issue118.ir/Issue118.approval.0.approval.destructured.ir
+debug: Output IR to regression_tests/out_O2/Issue118.ir/Issue118.approval.0.destructured.ir
 info: optimizing clear program of test_cases.regression_tests.issue_118.Issue118 at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -831,7 +831,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to regression_tests/out_O2/Issue118.ir/Issue118.clear.0.clear.destructured.ir
+debug: Output IR to regression_tests/out_O2/Issue118.ir/Issue118.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/regression_tests/puya_unoptimized.log b/test_cases/regression_tests/puya_unoptimized.log
index 9242b93354..688d51dd9f 100644
--- a/test_cases/regression_tests/puya_unoptimized.log
+++ b/test_cases/regression_tests/puya_unoptimized.log
@@ -501,7 +501,7 @@ debug: Coalescing local variables in test_cases.regression_tests.issue_194.Issue
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.regression_tests.issue_194.Issue194.approval_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to regression_tests/out_unoptimized/Issue194.ir/Issue194.approval.0.approval.destructured.ir
+debug: Output IR to regression_tests/out_unoptimized/Issue194.ir/Issue194.approval.0.destructured.ir
 info: optimizing clear program of test_cases.regression_tests.issue_194.Issue194 at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.regression_tests.issue_194.Issue194.clear_state_program
@@ -519,7 +519,7 @@ debug: Coalescing local variables in test_cases.regression_tests.issue_194.Issue
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.regression_tests.issue_194.Issue194.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to regression_tests/out_unoptimized/Issue194.ir/Issue194.clear.0.clear.destructured.ir
+debug: Output IR to regression_tests/out_unoptimized/Issue194.ir/Issue194.clear.0.destructured.ir
 debug: Inserted main.ops[11]: 'l-store-copy tmp%2#0 0'
 debug: Replaced main.ops[13]: 'v-load tmp%2#0' with 'l-load tmp%2#0'
 debug: Inserted main.ops[7]: 'l-store-copy tmp%1#0 0'
@@ -629,7 +629,7 @@ debug: Coalescing local variables in test_cases.regression_tests.issue_118.Issue
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.regression_tests.issue_118.Issue118.verify
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to regression_tests/out_unoptimized/Issue118.ir/Issue118.approval.0.approval.destructured.ir
+debug: Output IR to regression_tests/out_unoptimized/Issue118.ir/Issue118.approval.0.destructured.ir
 info: optimizing clear program of test_cases.regression_tests.issue_118.Issue118 at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -647,7 +647,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to regression_tests/out_unoptimized/Issue118.ir/Issue118.clear.0.clear.destructured.ir
+debug: Output IR to regression_tests/out_unoptimized/Issue118.ir/Issue118.clear.0.destructured.ir
 debug: Inserted main_block@1.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main_block@1.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_block@1.ops[6]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/reinterpret_cast/out/Contract.ir/Contract.approval.0.approval.ssa.ir b/test_cases/reinterpret_cast/out/Contract.ir/Contract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/reinterpret_cast/out/Contract.ir/Contract.approval.0.approval.ssa.ir
rename to test_cases/reinterpret_cast/out/Contract.ir/Contract.approval.0.ssa.ir
diff --git a/test_cases/reinterpret_cast/out/Contract.ir/Contract.approval.1.approval.ssa.opt.ir b/test_cases/reinterpret_cast/out/Contract.ir/Contract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/reinterpret_cast/out/Contract.ir/Contract.approval.1.approval.ssa.opt.ir
rename to test_cases/reinterpret_cast/out/Contract.ir/Contract.approval.1.ssa.opt.ir
diff --git a/test_cases/reinterpret_cast/out/Contract.ir/Contract.approval.2.approval.ssa.opt.ir b/test_cases/reinterpret_cast/out/Contract.ir/Contract.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/reinterpret_cast/out/Contract.ir/Contract.approval.2.approval.ssa.opt.ir
rename to test_cases/reinterpret_cast/out/Contract.ir/Contract.approval.2.ssa.opt.ir
diff --git a/test_cases/reinterpret_cast/out/Contract.ir/Contract.approval.3.approval.destructured.ir b/test_cases/reinterpret_cast/out/Contract.ir/Contract.approval.3.destructured.ir
similarity index 100%
rename from test_cases/reinterpret_cast/out/Contract.ir/Contract.approval.3.approval.destructured.ir
rename to test_cases/reinterpret_cast/out/Contract.ir/Contract.approval.3.destructured.ir
diff --git a/test_cases/reinterpret_cast/out/Contract.ir/Contract.clear.0.clear.ssa.ir b/test_cases/reinterpret_cast/out/Contract.ir/Contract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/reinterpret_cast/out/Contract.ir/Contract.clear.0.clear.ssa.ir
rename to test_cases/reinterpret_cast/out/Contract.ir/Contract.clear.0.ssa.ir
diff --git a/test_cases/reinterpret_cast/out/Contract.ir/Contract.clear.1.clear.destructured.ir b/test_cases/reinterpret_cast/out/Contract.ir/Contract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/reinterpret_cast/out/Contract.ir/Contract.clear.1.clear.destructured.ir
rename to test_cases/reinterpret_cast/out/Contract.ir/Contract.clear.1.destructured.ir
diff --git a/test_cases/reinterpret_cast/out_O2/Contract.ir/Contract.approval.0.approval.destructured.ir b/test_cases/reinterpret_cast/out_O2/Contract.ir/Contract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/reinterpret_cast/out_O2/Contract.ir/Contract.approval.0.approval.destructured.ir
rename to test_cases/reinterpret_cast/out_O2/Contract.ir/Contract.approval.0.destructured.ir
diff --git a/test_cases/reinterpret_cast/out_O2/Contract.ir/Contract.clear.0.clear.destructured.ir b/test_cases/reinterpret_cast/out_O2/Contract.ir/Contract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/reinterpret_cast/out_O2/Contract.ir/Contract.clear.0.clear.destructured.ir
rename to test_cases/reinterpret_cast/out_O2/Contract.ir/Contract.clear.0.destructured.ir
diff --git a/test_cases/reinterpret_cast/out_unoptimized/Contract.ir/Contract.approval.0.approval.destructured.ir b/test_cases/reinterpret_cast/out_unoptimized/Contract.ir/Contract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/reinterpret_cast/out_unoptimized/Contract.ir/Contract.approval.0.approval.destructured.ir
rename to test_cases/reinterpret_cast/out_unoptimized/Contract.ir/Contract.approval.0.destructured.ir
diff --git a/test_cases/reinterpret_cast/out_unoptimized/Contract.ir/Contract.clear.0.clear.destructured.ir b/test_cases/reinterpret_cast/out_unoptimized/Contract.ir/Contract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/reinterpret_cast/out_unoptimized/Contract.ir/Contract.clear.0.clear.destructured.ir
rename to test_cases/reinterpret_cast/out_unoptimized/Contract.ir/Contract.clear.0.destructured.ir
diff --git a/test_cases/reinterpret_cast/puya.log b/test_cases/reinterpret_cast/puya.log
index 3937142d90..5a474b7b8a 100644
--- a/test_cases/reinterpret_cast/puya.log
+++ b/test_cases/reinterpret_cast/puya.log
@@ -433,7 +433,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to reinterpret_cast/out/Contract.ir/Contract.approval.0.approval.ssa.ir
+debug: Output IR to reinterpret_cast/out/Contract.ir/Contract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.reinterpret_cast.contract.Contract at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.reinterpret_cast.contract.bytes_to_biguint for inlining
@@ -582,7 +582,7 @@ debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.reinterpret_cast.contract.Contract.__puya_arc4_router__
 debug: removing unused subroutine test_cases.reinterpret_cast.contract.bytes_to_biguint
-debug: Output IR to reinterpret_cast/out/Contract.ir/Contract.approval.1.approval.ssa.opt.ir
+debug: Output IR to reinterpret_cast/out/Contract.ir/Contract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking trivial method test_cases.reinterpret_cast.contract.Contract.bytes_to_bool as inlineable
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
@@ -662,7 +662,7 @@ debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.reinterpret_cast.contract.Contract.bytes_to_bool
 debug: removing unused subroutine test_cases.reinterpret_cast.contract.Contract.__algopy_default_create
-debug: Output IR to reinterpret_cast/out/Contract.ir/Contract.approval.2.approval.ssa.opt.ir
+debug: Output IR to reinterpret_cast/out/Contract.ir/Contract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -711,8 +711,8 @@ debug: Coalescing local variables in test_cases.reinterpret_cast.contract.Contra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.reinterpret_cast.contract.Contract.test_bytes_to_biguint
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to reinterpret_cast/out/Contract.ir/Contract.approval.3.approval.destructured.ir
-debug: Output IR to reinterpret_cast/out/Contract.ir/Contract.clear.0.clear.ssa.ir
+debug: Output IR to reinterpret_cast/out/Contract.ir/Contract.approval.3.destructured.ir
+debug: Output IR to reinterpret_cast/out/Contract.ir/Contract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.reinterpret_cast.contract.Contract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -738,7 +738,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to reinterpret_cast/out/Contract.ir/Contract.clear.1.clear.destructured.ir
+debug: Output IR to reinterpret_cast/out/Contract.ir/Contract.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/reinterpret_cast/puya_O2.log b/test_cases/reinterpret_cast/puya_O2.log
index 571007dafc..0bcb4a4a66 100644
--- a/test_cases/reinterpret_cast/puya_O2.log
+++ b/test_cases/reinterpret_cast/puya_O2.log
@@ -712,7 +712,7 @@ debug: Coalescing tmp%0#0 with [tmp%0#2]
 debug: Coalescing resulted in 11 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to reinterpret_cast/out_O2/Contract.ir/Contract.approval.0.approval.destructured.ir
+debug: Output IR to reinterpret_cast/out_O2/Contract.ir/Contract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.reinterpret_cast.contract.Contract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -738,7 +738,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to reinterpret_cast/out_O2/Contract.ir/Contract.clear.0.clear.destructured.ir
+debug: Output IR to reinterpret_cast/out_O2/Contract.ir/Contract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/reinterpret_cast/puya_unoptimized.log b/test_cases/reinterpret_cast/puya_unoptimized.log
index 0ec1a6a611..dc7c23b231 100644
--- a/test_cases/reinterpret_cast/puya_unoptimized.log
+++ b/test_cases/reinterpret_cast/puya_unoptimized.log
@@ -578,7 +578,7 @@ debug: Coalescing local variables in test_cases.reinterpret_cast.contract.bytes_
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.reinterpret_cast.contract.bytes_to_biguint
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to reinterpret_cast/out_unoptimized/Contract.ir/Contract.approval.0.approval.destructured.ir
+debug: Output IR to reinterpret_cast/out_unoptimized/Contract.ir/Contract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.reinterpret_cast.contract.Contract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -596,7 +596,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to reinterpret_cast/out_unoptimized/Contract.ir/Contract.clear.0.clear.destructured.ir
+debug: Output IR to reinterpret_cast/out_unoptimized/Contract.ir/Contract.clear.0.destructured.ir
 debug: Inserted main_block@1.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main_block@1.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_block@1.ops[6]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/scratch_slots/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir b/test_cases/scratch_slots/out/MyContract.ir/MyContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/scratch_slots/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir
rename to test_cases/scratch_slots/out/MyContract.ir/MyContract.approval.0.ssa.ir
diff --git a/test_cases/scratch_slots/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir b/test_cases/scratch_slots/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/scratch_slots/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir
rename to test_cases/scratch_slots/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
diff --git a/test_cases/scratch_slots/out/MyContract.ir/MyContract.approval.2.approval.destructured.ir b/test_cases/scratch_slots/out/MyContract.ir/MyContract.approval.2.destructured.ir
similarity index 100%
rename from test_cases/scratch_slots/out/MyContract.ir/MyContract.approval.2.approval.destructured.ir
rename to test_cases/scratch_slots/out/MyContract.ir/MyContract.approval.2.destructured.ir
diff --git a/test_cases/scratch_slots/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir b/test_cases/scratch_slots/out/MyContract.ir/MyContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/scratch_slots/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir
rename to test_cases/scratch_slots/out/MyContract.ir/MyContract.clear.0.ssa.ir
diff --git a/test_cases/scratch_slots/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir b/test_cases/scratch_slots/out/MyContract.ir/MyContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/scratch_slots/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir
rename to test_cases/scratch_slots/out/MyContract.ir/MyContract.clear.1.destructured.ir
diff --git a/test_cases/scratch_slots/out/MyContract2.ir/MyContract2.approval.0.approval.ssa.ir b/test_cases/scratch_slots/out/MyContract2.ir/MyContract2.approval.0.ssa.ir
similarity index 100%
rename from test_cases/scratch_slots/out/MyContract2.ir/MyContract2.approval.0.approval.ssa.ir
rename to test_cases/scratch_slots/out/MyContract2.ir/MyContract2.approval.0.ssa.ir
diff --git a/test_cases/scratch_slots/out/MyContract2.ir/MyContract2.approval.1.approval.ssa.opt.ir b/test_cases/scratch_slots/out/MyContract2.ir/MyContract2.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/scratch_slots/out/MyContract2.ir/MyContract2.approval.1.approval.ssa.opt.ir
rename to test_cases/scratch_slots/out/MyContract2.ir/MyContract2.approval.1.ssa.opt.ir
diff --git a/test_cases/scratch_slots/out/MyContract2.ir/MyContract2.approval.2.approval.destructured.ir b/test_cases/scratch_slots/out/MyContract2.ir/MyContract2.approval.2.destructured.ir
similarity index 100%
rename from test_cases/scratch_slots/out/MyContract2.ir/MyContract2.approval.2.approval.destructured.ir
rename to test_cases/scratch_slots/out/MyContract2.ir/MyContract2.approval.2.destructured.ir
diff --git a/test_cases/scratch_slots/out/MyContract2.ir/MyContract2.clear.0.clear.ssa.ir b/test_cases/scratch_slots/out/MyContract2.ir/MyContract2.clear.0.ssa.ir
similarity index 100%
rename from test_cases/scratch_slots/out/MyContract2.ir/MyContract2.clear.0.clear.ssa.ir
rename to test_cases/scratch_slots/out/MyContract2.ir/MyContract2.clear.0.ssa.ir
diff --git a/test_cases/scratch_slots/out/MyContract2.ir/MyContract2.clear.1.clear.destructured.ir b/test_cases/scratch_slots/out/MyContract2.ir/MyContract2.clear.1.destructured.ir
similarity index 100%
rename from test_cases/scratch_slots/out/MyContract2.ir/MyContract2.clear.1.clear.destructured.ir
rename to test_cases/scratch_slots/out/MyContract2.ir/MyContract2.clear.1.destructured.ir
diff --git a/test_cases/scratch_slots/out/MyOtherContract.ir/MyOtherContract.approval.0.approval.ssa.ir b/test_cases/scratch_slots/out/MyOtherContract.ir/MyOtherContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/scratch_slots/out/MyOtherContract.ir/MyOtherContract.approval.0.approval.ssa.ir
rename to test_cases/scratch_slots/out/MyOtherContract.ir/MyOtherContract.approval.0.ssa.ir
diff --git a/test_cases/scratch_slots/out/MyOtherContract.ir/MyOtherContract.approval.1.approval.destructured.ir b/test_cases/scratch_slots/out/MyOtherContract.ir/MyOtherContract.approval.1.destructured.ir
similarity index 100%
rename from test_cases/scratch_slots/out/MyOtherContract.ir/MyOtherContract.approval.1.approval.destructured.ir
rename to test_cases/scratch_slots/out/MyOtherContract.ir/MyOtherContract.approval.1.destructured.ir
diff --git a/test_cases/scratch_slots/out/MyOtherContract.ir/MyOtherContract.clear.0.clear.ssa.ir b/test_cases/scratch_slots/out/MyOtherContract.ir/MyOtherContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/scratch_slots/out/MyOtherContract.ir/MyOtherContract.clear.0.clear.ssa.ir
rename to test_cases/scratch_slots/out/MyOtherContract.ir/MyOtherContract.clear.0.ssa.ir
diff --git a/test_cases/scratch_slots/out/MyOtherContract.ir/MyOtherContract.clear.1.clear.destructured.ir b/test_cases/scratch_slots/out/MyOtherContract.ir/MyOtherContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/scratch_slots/out/MyOtherContract.ir/MyOtherContract.clear.1.clear.destructured.ir
rename to test_cases/scratch_slots/out/MyOtherContract.ir/MyOtherContract.clear.1.destructured.ir
diff --git a/test_cases/scratch_slots/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir b/test_cases/scratch_slots/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/scratch_slots/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir
rename to test_cases/scratch_slots/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
diff --git a/test_cases/scratch_slots/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir b/test_cases/scratch_slots/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/scratch_slots/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir
rename to test_cases/scratch_slots/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
diff --git a/test_cases/scratch_slots/out_O2/MyContract2.ir/MyContract2.approval.0.approval.destructured.ir b/test_cases/scratch_slots/out_O2/MyContract2.ir/MyContract2.approval.0.destructured.ir
similarity index 100%
rename from test_cases/scratch_slots/out_O2/MyContract2.ir/MyContract2.approval.0.approval.destructured.ir
rename to test_cases/scratch_slots/out_O2/MyContract2.ir/MyContract2.approval.0.destructured.ir
diff --git a/test_cases/scratch_slots/out_O2/MyContract2.ir/MyContract2.clear.0.clear.destructured.ir b/test_cases/scratch_slots/out_O2/MyContract2.ir/MyContract2.clear.0.destructured.ir
similarity index 100%
rename from test_cases/scratch_slots/out_O2/MyContract2.ir/MyContract2.clear.0.clear.destructured.ir
rename to test_cases/scratch_slots/out_O2/MyContract2.ir/MyContract2.clear.0.destructured.ir
diff --git a/test_cases/scratch_slots/out_O2/MyOtherContract.ir/MyOtherContract.approval.0.approval.destructured.ir b/test_cases/scratch_slots/out_O2/MyOtherContract.ir/MyOtherContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/scratch_slots/out_O2/MyOtherContract.ir/MyOtherContract.approval.0.approval.destructured.ir
rename to test_cases/scratch_slots/out_O2/MyOtherContract.ir/MyOtherContract.approval.0.destructured.ir
diff --git a/test_cases/scratch_slots/out_O2/MyOtherContract.ir/MyOtherContract.clear.0.clear.destructured.ir b/test_cases/scratch_slots/out_O2/MyOtherContract.ir/MyOtherContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/scratch_slots/out_O2/MyOtherContract.ir/MyOtherContract.clear.0.clear.destructured.ir
rename to test_cases/scratch_slots/out_O2/MyOtherContract.ir/MyOtherContract.clear.0.destructured.ir
diff --git a/test_cases/scratch_slots/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir b/test_cases/scratch_slots/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/scratch_slots/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir
rename to test_cases/scratch_slots/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
diff --git a/test_cases/scratch_slots/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir b/test_cases/scratch_slots/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/scratch_slots/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir
rename to test_cases/scratch_slots/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
diff --git a/test_cases/scratch_slots/out_unoptimized/MyContract2.ir/MyContract2.approval.0.approval.destructured.ir b/test_cases/scratch_slots/out_unoptimized/MyContract2.ir/MyContract2.approval.0.destructured.ir
similarity index 100%
rename from test_cases/scratch_slots/out_unoptimized/MyContract2.ir/MyContract2.approval.0.approval.destructured.ir
rename to test_cases/scratch_slots/out_unoptimized/MyContract2.ir/MyContract2.approval.0.destructured.ir
diff --git a/test_cases/scratch_slots/out_unoptimized/MyContract2.ir/MyContract2.clear.0.clear.destructured.ir b/test_cases/scratch_slots/out_unoptimized/MyContract2.ir/MyContract2.clear.0.destructured.ir
similarity index 100%
rename from test_cases/scratch_slots/out_unoptimized/MyContract2.ir/MyContract2.clear.0.clear.destructured.ir
rename to test_cases/scratch_slots/out_unoptimized/MyContract2.ir/MyContract2.clear.0.destructured.ir
diff --git a/test_cases/scratch_slots/out_unoptimized/MyOtherContract.ir/MyOtherContract.approval.0.approval.destructured.ir b/test_cases/scratch_slots/out_unoptimized/MyOtherContract.ir/MyOtherContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/scratch_slots/out_unoptimized/MyOtherContract.ir/MyOtherContract.approval.0.approval.destructured.ir
rename to test_cases/scratch_slots/out_unoptimized/MyOtherContract.ir/MyOtherContract.approval.0.destructured.ir
diff --git a/test_cases/scratch_slots/out_unoptimized/MyOtherContract.ir/MyOtherContract.clear.0.clear.destructured.ir b/test_cases/scratch_slots/out_unoptimized/MyOtherContract.ir/MyOtherContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/scratch_slots/out_unoptimized/MyOtherContract.ir/MyOtherContract.clear.0.clear.destructured.ir
rename to test_cases/scratch_slots/out_unoptimized/MyOtherContract.ir/MyOtherContract.clear.0.destructured.ir
diff --git a/test_cases/scratch_slots/puya.log b/test_cases/scratch_slots/puya.log
index 30de8a70fa..a01cd45c2b 100644
--- a/test_cases/scratch_slots/puya.log
+++ b/test_cases/scratch_slots/puya.log
@@ -517,7 +517,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to scratch_slots/out/MyOtherContract.ir/MyOtherContract.approval.0.approval.ssa.ir
+debug: Output IR to scratch_slots/out/MyOtherContract.ir/MyOtherContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.scratch_slots.contract3.MyOtherContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.scratch_slots.contract3.MyOtherContract.approval_program
@@ -543,8 +543,8 @@ debug: Coalescing local variables in test_cases.scratch_slots.contract3.MyOtherC
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.scratch_slots.contract3.MyOtherContract.approval_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to scratch_slots/out/MyOtherContract.ir/MyOtherContract.approval.1.approval.destructured.ir
-debug: Output IR to scratch_slots/out/MyOtherContract.ir/MyOtherContract.clear.0.clear.ssa.ir
+debug: Output IR to scratch_slots/out/MyOtherContract.ir/MyOtherContract.approval.1.destructured.ir
+debug: Output IR to scratch_slots/out/MyOtherContract.ir/MyOtherContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.scratch_slots.contract3.MyOtherContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.scratch_slots.contract3.MyOtherContract.clear_state_program
@@ -570,10 +570,10 @@ debug: Coalescing local variables in test_cases.scratch_slots.contract3.MyOtherC
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.scratch_slots.contract3.MyOtherContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to scratch_slots/out/MyOtherContract.ir/MyOtherContract.clear.1.clear.destructured.ir
+debug: Output IR to scratch_slots/out/MyOtherContract.ir/MyOtherContract.clear.1.destructured.ir
 scratch_slots/contract3.py:5 debug: optimizing TEAL subroutine test_cases.scratch_slots.contract3.MyOtherContract.approval_program() -> uint64:
 scratch_slots/contract3.py:8 debug: optimizing TEAL subroutine test_cases.scratch_slots.contract3.MyOtherContract.clear_state_program() -> uint64:
-debug: Output IR to scratch_slots/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir
+debug: Output IR to scratch_slots/out/MyContract.ir/MyContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.scratch_slots.contract.MyContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.scratch_slots.contract.MyContract.approval_program
@@ -600,7 +600,7 @@ debug: Merged linear block@3 into block@2
 debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to scratch_slots/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to scratch_slots/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.scratch_slots.contract.MyContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -626,8 +626,8 @@ debug: Coalescing i#0 with [i#5, i#1, i#2]
 debug: Coalescing resulted in 10 replacement/s
 debug: Sequentializing parallel copies in test_cases.scratch_slots.contract.MyContract.approval_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to scratch_slots/out/MyContract.ir/MyContract.approval.2.approval.destructured.ir
-debug: Output IR to scratch_slots/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir
+debug: Output IR to scratch_slots/out/MyContract.ir/MyContract.approval.2.destructured.ir
+debug: Output IR to scratch_slots/out/MyContract.ir/MyContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.scratch_slots.contract.MyContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.scratch_slots.contract.MyContract.clear_state_program
@@ -653,7 +653,7 @@ debug: Coalescing local variables in test_cases.scratch_slots.contract.MyContrac
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.scratch_slots.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to scratch_slots/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir
+debug: Output IR to scratch_slots/out/MyContract.ir/MyContract.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[5]: 'l-store-copy tmp%1#0 0'
@@ -689,7 +689,7 @@ scratch_slots/contract.py:8 debug: optimizing TEAL subroutine test_cases.scratch
 debug: inlining single reference block main_for_body@2 into main_for_header@1
 debug: removing explicit jump to fall-through block main_for_header@1
 scratch_slots/contract.py:27 debug: optimizing TEAL subroutine test_cases.scratch_slots.contract.MyContract.clear_state_program() -> uint64:
-debug: Output IR to scratch_slots/out/MyContract2.ir/MyContract2.approval.0.approval.ssa.ir
+debug: Output IR to scratch_slots/out/MyContract2.ir/MyContract2.approval.0.ssa.ir
 info: optimizing approval program of test_cases.scratch_slots.contract2.MyContract2 at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.scratch_slots.contract.MyContract.approval_program
@@ -716,7 +716,7 @@ debug: Merged linear block@3 into block@2
 debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to scratch_slots/out/MyContract2.ir/MyContract2.approval.1.approval.ssa.opt.ir
+debug: Output IR to scratch_slots/out/MyContract2.ir/MyContract2.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.scratch_slots.contract.MyContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -742,8 +742,8 @@ debug: Coalescing i#0 with [i#5, i#1, i#2]
 debug: Coalescing resulted in 10 replacement/s
 debug: Sequentializing parallel copies in test_cases.scratch_slots.contract.MyContract.approval_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to scratch_slots/out/MyContract2.ir/MyContract2.approval.2.approval.destructured.ir
-debug: Output IR to scratch_slots/out/MyContract2.ir/MyContract2.clear.0.clear.ssa.ir
+debug: Output IR to scratch_slots/out/MyContract2.ir/MyContract2.approval.2.destructured.ir
+debug: Output IR to scratch_slots/out/MyContract2.ir/MyContract2.clear.0.ssa.ir
 info: optimizing clear program of test_cases.scratch_slots.contract2.MyContract2 at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.scratch_slots.contract.MyContract.clear_state_program
@@ -769,7 +769,7 @@ debug: Coalescing local variables in test_cases.scratch_slots.contract.MyContrac
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.scratch_slots.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to scratch_slots/out/MyContract2.ir/MyContract2.clear.1.clear.destructured.ir
+debug: Output IR to scratch_slots/out/MyContract2.ir/MyContract2.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[5]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/scratch_slots/puya_O2.log b/test_cases/scratch_slots/puya_O2.log
index e528859873..4c87a9d284 100644
--- a/test_cases/scratch_slots/puya_O2.log
+++ b/test_cases/scratch_slots/puya_O2.log
@@ -541,7 +541,7 @@ debug: Coalescing local variables in test_cases.scratch_slots.contract3.MyOtherC
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.scratch_slots.contract3.MyOtherContract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to scratch_slots/out_O2/MyOtherContract.ir/MyOtherContract.approval.0.approval.destructured.ir
+debug: Output IR to scratch_slots/out_O2/MyOtherContract.ir/MyOtherContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.scratch_slots.contract3.MyOtherContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.scratch_slots.contract3.MyOtherContract.clear_state_program
@@ -567,7 +567,7 @@ debug: Coalescing local variables in test_cases.scratch_slots.contract3.MyOtherC
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.scratch_slots.contract3.MyOtherContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to scratch_slots/out_O2/MyOtherContract.ir/MyOtherContract.clear.0.clear.destructured.ir
+debug: Output IR to scratch_slots/out_O2/MyOtherContract.ir/MyOtherContract.clear.0.destructured.ir
 scratch_slots/contract3.py:5 debug: optimizing TEAL subroutine test_cases.scratch_slots.contract3.MyOtherContract.approval_program() -> uint64:
 scratch_slots/contract3.py:8 debug: optimizing TEAL subroutine test_cases.scratch_slots.contract3.MyOtherContract.clear_state_program() -> uint64:
 info: optimizing approval program of test_cases.scratch_slots.contract.MyContract at level 2
@@ -621,7 +621,7 @@ debug: Coalescing i#0 with [i#5, i#1, i#2]
 debug: Coalescing resulted in 10 replacement/s
 debug: Sequentializing parallel copies in test_cases.scratch_slots.contract.MyContract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to scratch_slots/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir
+debug: Output IR to scratch_slots/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.scratch_slots.contract.MyContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.scratch_slots.contract.MyContract.clear_state_program
@@ -647,7 +647,7 @@ debug: Coalescing local variables in test_cases.scratch_slots.contract.MyContrac
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.scratch_slots.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to scratch_slots/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir
+debug: Output IR to scratch_slots/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[5]: 'l-store-copy tmp%1#0 0'
@@ -734,7 +734,7 @@ debug: Coalescing i#0 with [i#5, i#1, i#2]
 debug: Coalescing resulted in 10 replacement/s
 debug: Sequentializing parallel copies in test_cases.scratch_slots.contract.MyContract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to scratch_slots/out_O2/MyContract2.ir/MyContract2.approval.0.approval.destructured.ir
+debug: Output IR to scratch_slots/out_O2/MyContract2.ir/MyContract2.approval.0.destructured.ir
 info: optimizing clear program of test_cases.scratch_slots.contract2.MyContract2 at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.scratch_slots.contract.MyContract.clear_state_program
@@ -760,7 +760,7 @@ debug: Coalescing local variables in test_cases.scratch_slots.contract.MyContrac
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.scratch_slots.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to scratch_slots/out_O2/MyContract2.ir/MyContract2.clear.0.clear.destructured.ir
+debug: Output IR to scratch_slots/out_O2/MyContract2.ir/MyContract2.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[5]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/scratch_slots/puya_unoptimized.log b/test_cases/scratch_slots/puya_unoptimized.log
index 3215d323d2..db2fd0b354 100644
--- a/test_cases/scratch_slots/puya_unoptimized.log
+++ b/test_cases/scratch_slots/puya_unoptimized.log
@@ -533,7 +533,7 @@ debug: Coalescing local variables in test_cases.scratch_slots.contract3.MyOtherC
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.scratch_slots.contract3.MyOtherContract.approval_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to scratch_slots/out_unoptimized/MyOtherContract.ir/MyOtherContract.approval.0.approval.destructured.ir
+debug: Output IR to scratch_slots/out_unoptimized/MyOtherContract.ir/MyOtherContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.scratch_slots.contract3.MyOtherContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.scratch_slots.contract3.MyOtherContract.clear_state_program
@@ -551,7 +551,7 @@ debug: Coalescing local variables in test_cases.scratch_slots.contract3.MyOtherC
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.scratch_slots.contract3.MyOtherContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to scratch_slots/out_unoptimized/MyOtherContract.ir/MyOtherContract.clear.0.clear.destructured.ir
+debug: Output IR to scratch_slots/out_unoptimized/MyOtherContract.ir/MyOtherContract.clear.0.destructured.ir
 scratch_slots/contract3.py:5 debug: optimizing TEAL subroutine test_cases.scratch_slots.contract3.MyOtherContract.approval_program() -> uint64:
 scratch_slots/contract3.py:8 debug: optimizing TEAL subroutine test_cases.scratch_slots.contract3.MyOtherContract.clear_state_program() -> uint64:
 info: optimizing approval program of test_cases.scratch_slots.contract.MyContract at level 0
@@ -581,7 +581,7 @@ debug: Coalescing i#0 with [i#5, i#1, i#2]
 debug: Coalescing resulted in 10 replacement/s
 debug: Sequentializing parallel copies in test_cases.scratch_slots.contract.MyContract.approval_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to scratch_slots/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir
+debug: Output IR to scratch_slots/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.scratch_slots.contract.MyContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.scratch_slots.contract.MyContract.clear_state_program
@@ -599,7 +599,7 @@ debug: Coalescing local variables in test_cases.scratch_slots.contract.MyContrac
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.scratch_slots.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to scratch_slots/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir
+debug: Output IR to scratch_slots/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[11]: 'l-store-copy tmp%2#0 0'
@@ -661,7 +661,7 @@ debug: Coalescing i#0 with [i#5, i#1, i#2]
 debug: Coalescing resulted in 10 replacement/s
 debug: Sequentializing parallel copies in test_cases.scratch_slots.contract.MyContract.approval_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to scratch_slots/out_unoptimized/MyContract2.ir/MyContract2.approval.0.approval.destructured.ir
+debug: Output IR to scratch_slots/out_unoptimized/MyContract2.ir/MyContract2.approval.0.destructured.ir
 info: optimizing clear program of test_cases.scratch_slots.contract2.MyContract2 at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.scratch_slots.contract.MyContract.clear_state_program
@@ -679,7 +679,7 @@ debug: Coalescing local variables in test_cases.scratch_slots.contract.MyContrac
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.scratch_slots.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to scratch_slots/out_unoptimized/MyContract2.ir/MyContract2.clear.0.clear.destructured.ir
+debug: Output IR to scratch_slots/out_unoptimized/MyContract2.ir/MyContract2.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[11]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/simple/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir b/test_cases/simple/out/MyContract.ir/MyContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/simple/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir
rename to test_cases/simple/out/MyContract.ir/MyContract.approval.0.ssa.ir
diff --git a/test_cases/simple/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir b/test_cases/simple/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/simple/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir
rename to test_cases/simple/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
diff --git a/test_cases/simple/out/MyContract.ir/MyContract.approval.2.approval.destructured.ir b/test_cases/simple/out/MyContract.ir/MyContract.approval.2.destructured.ir
similarity index 100%
rename from test_cases/simple/out/MyContract.ir/MyContract.approval.2.approval.destructured.ir
rename to test_cases/simple/out/MyContract.ir/MyContract.approval.2.destructured.ir
diff --git a/test_cases/simple/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir b/test_cases/simple/out/MyContract.ir/MyContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/simple/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir
rename to test_cases/simple/out/MyContract.ir/MyContract.clear.0.ssa.ir
diff --git a/test_cases/simple/out/MyContract.ir/MyContract.clear.1.clear.ssa.opt.ir b/test_cases/simple/out/MyContract.ir/MyContract.clear.1.ssa.opt.ir
similarity index 100%
rename from test_cases/simple/out/MyContract.ir/MyContract.clear.1.clear.ssa.opt.ir
rename to test_cases/simple/out/MyContract.ir/MyContract.clear.1.ssa.opt.ir
diff --git a/test_cases/simple/out/MyContract.ir/MyContract.clear.2.clear.destructured.ir b/test_cases/simple/out/MyContract.ir/MyContract.clear.2.destructured.ir
similarity index 100%
rename from test_cases/simple/out/MyContract.ir/MyContract.clear.2.clear.destructured.ir
rename to test_cases/simple/out/MyContract.ir/MyContract.clear.2.destructured.ir
diff --git a/test_cases/simple/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir b/test_cases/simple/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/simple/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir
rename to test_cases/simple/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
diff --git a/test_cases/simple/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir b/test_cases/simple/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/simple/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir
rename to test_cases/simple/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
diff --git a/test_cases/simple/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir b/test_cases/simple/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/simple/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir
rename to test_cases/simple/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
diff --git a/test_cases/simple/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir b/test_cases/simple/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/simple/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir
rename to test_cases/simple/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
diff --git a/test_cases/simple/puya.log b/test_cases/simple/puya.log
index cf63d6c74e..a6cdfaf6de 100644
--- a/test_cases/simple/puya.log
+++ b/test_cases/simple/puya.log
@@ -425,7 +425,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to simple/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir
+debug: Output IR to simple/out/MyContract.ir/MyContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.simple.contract.MyContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.simple.contract.MyContract.approval_program
@@ -473,7 +473,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Removing unreachable blocks: block@2, block@5, block@6
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to simple/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to simple/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.simple.contract.MyContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -498,8 +498,8 @@ debug: Coalescing local variables in test_cases.simple.contract.MyContract.appro
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.simple.contract.MyContract.approval_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to simple/out/MyContract.ir/MyContract.approval.2.approval.destructured.ir
-debug: Output IR to simple/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir
+debug: Output IR to simple/out/MyContract.ir/MyContract.approval.2.destructured.ir
+debug: Output IR to simple/out/MyContract.ir/MyContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.simple.contract.MyContract at level 1
 debug: Begin optimization pass 1/100
 debug: marking trivial method test_cases.simple.subs.zero as inlineable
@@ -565,7 +565,7 @@ debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.simple.subs.zero
 debug: removing unused subroutine test_cases.simple.pkg_a.pkg_1.subs.one
-debug: Output IR to simple/out/MyContract.ir/MyContract.clear.1.clear.ssa.opt.ir
+debug: Output IR to simple/out/MyContract.ir/MyContract.clear.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.simple.contract.MyContract.clear_state_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -590,7 +590,7 @@ debug: Coalescing local variables in test_cases.simple.contract.MyContract.clear
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.simple.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to simple/out/MyContract.ir/MyContract.clear.2.clear.destructured.ir
+debug: Output IR to simple/out/MyContract.ir/MyContract.clear.2.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[5]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/simple/puya_O2.log b/test_cases/simple/puya_O2.log
index 4a23b1ca5a..9398ed75a3 100644
--- a/test_cases/simple/puya_O2.log
+++ b/test_cases/simple/puya_O2.log
@@ -495,7 +495,7 @@ debug: Coalescing local variables in test_cases.simple.contract.MyContract.appro
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.simple.contract.MyContract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to simple/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir
+debug: Output IR to simple/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.simple.contract.MyContract at level 2
 debug: Begin optimization pass 1/100
 debug: marking trivial method test_cases.simple.subs.zero as inlineable
@@ -585,7 +585,7 @@ debug: Coalescing local variables in test_cases.simple.contract.MyContract.clear
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.simple.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to simple/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir
+debug: Output IR to simple/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[5]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/simple/puya_unoptimized.log b/test_cases/simple/puya_unoptimized.log
index 8125ff581d..df1b9c64a9 100644
--- a/test_cases/simple/puya_unoptimized.log
+++ b/test_cases/simple/puya_unoptimized.log
@@ -442,7 +442,7 @@ debug: Coalescing b#0 with [b#1, b#2]
 debug: Coalescing resulted in 4 replacement/s
 debug: Sequentializing parallel copies in test_cases.simple.contract.MyContract.approval_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to simple/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir
+debug: Output IR to simple/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.simple.contract.MyContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.simple.contract.MyContract.clear_state_program
@@ -488,7 +488,7 @@ debug: Coalescing local variables in test_cases.simple.pkg_a.pkg_1.subs.one usin
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.simple.pkg_a.pkg_1.subs.one
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to simple/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir
+debug: Output IR to simple/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
 debug: Inserted main.ops[11]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[13]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[3]: 'l-store-copy a#0 0'
diff --git a/test_cases/simplish/out/Simplish.ir/Simplish.approval.0.approval.ssa.ir b/test_cases/simplish/out/Simplish.ir/Simplish.approval.0.ssa.ir
similarity index 100%
rename from test_cases/simplish/out/Simplish.ir/Simplish.approval.0.approval.ssa.ir
rename to test_cases/simplish/out/Simplish.ir/Simplish.approval.0.ssa.ir
diff --git a/test_cases/simplish/out/Simplish.ir/Simplish.approval.1.approval.ssa.opt.ir b/test_cases/simplish/out/Simplish.ir/Simplish.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/simplish/out/Simplish.ir/Simplish.approval.1.approval.ssa.opt.ir
rename to test_cases/simplish/out/Simplish.ir/Simplish.approval.1.ssa.opt.ir
diff --git a/test_cases/simplish/out/Simplish.ir/Simplish.approval.2.approval.ssa.opt.ir b/test_cases/simplish/out/Simplish.ir/Simplish.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/simplish/out/Simplish.ir/Simplish.approval.2.approval.ssa.opt.ir
rename to test_cases/simplish/out/Simplish.ir/Simplish.approval.2.ssa.opt.ir
diff --git a/test_cases/simplish/out/Simplish.ir/Simplish.approval.3.approval.ssa.opt.ir b/test_cases/simplish/out/Simplish.ir/Simplish.approval.3.ssa.opt.ir
similarity index 100%
rename from test_cases/simplish/out/Simplish.ir/Simplish.approval.3.approval.ssa.opt.ir
rename to test_cases/simplish/out/Simplish.ir/Simplish.approval.3.ssa.opt.ir
diff --git a/test_cases/simplish/out/Simplish.ir/Simplish.approval.4.approval.destructured.ir b/test_cases/simplish/out/Simplish.ir/Simplish.approval.4.destructured.ir
similarity index 100%
rename from test_cases/simplish/out/Simplish.ir/Simplish.approval.4.approval.destructured.ir
rename to test_cases/simplish/out/Simplish.ir/Simplish.approval.4.destructured.ir
diff --git a/test_cases/simplish/out/Simplish.ir/Simplish.clear.0.clear.ssa.ir b/test_cases/simplish/out/Simplish.ir/Simplish.clear.0.ssa.ir
similarity index 100%
rename from test_cases/simplish/out/Simplish.ir/Simplish.clear.0.clear.ssa.ir
rename to test_cases/simplish/out/Simplish.ir/Simplish.clear.0.ssa.ir
diff --git a/test_cases/simplish/out/Simplish.ir/Simplish.clear.1.clear.destructured.ir b/test_cases/simplish/out/Simplish.ir/Simplish.clear.1.destructured.ir
similarity index 100%
rename from test_cases/simplish/out/Simplish.ir/Simplish.clear.1.clear.destructured.ir
rename to test_cases/simplish/out/Simplish.ir/Simplish.clear.1.destructured.ir
diff --git a/test_cases/simplish/out_O2/Simplish.ir/Simplish.approval.0.approval.destructured.ir b/test_cases/simplish/out_O2/Simplish.ir/Simplish.approval.0.destructured.ir
similarity index 100%
rename from test_cases/simplish/out_O2/Simplish.ir/Simplish.approval.0.approval.destructured.ir
rename to test_cases/simplish/out_O2/Simplish.ir/Simplish.approval.0.destructured.ir
diff --git a/test_cases/simplish/out_O2/Simplish.ir/Simplish.clear.0.clear.destructured.ir b/test_cases/simplish/out_O2/Simplish.ir/Simplish.clear.0.destructured.ir
similarity index 100%
rename from test_cases/simplish/out_O2/Simplish.ir/Simplish.clear.0.clear.destructured.ir
rename to test_cases/simplish/out_O2/Simplish.ir/Simplish.clear.0.destructured.ir
diff --git a/test_cases/simplish/out_unoptimized/Simplish.ir/Simplish.approval.0.approval.destructured.ir b/test_cases/simplish/out_unoptimized/Simplish.ir/Simplish.approval.0.destructured.ir
similarity index 100%
rename from test_cases/simplish/out_unoptimized/Simplish.ir/Simplish.approval.0.approval.destructured.ir
rename to test_cases/simplish/out_unoptimized/Simplish.ir/Simplish.approval.0.destructured.ir
diff --git a/test_cases/simplish/out_unoptimized/Simplish.ir/Simplish.clear.0.clear.destructured.ir b/test_cases/simplish/out_unoptimized/Simplish.ir/Simplish.clear.0.destructured.ir
similarity index 100%
rename from test_cases/simplish/out_unoptimized/Simplish.ir/Simplish.clear.0.clear.destructured.ir
rename to test_cases/simplish/out_unoptimized/Simplish.ir/Simplish.clear.0.destructured.ir
diff --git a/test_cases/simplish/puya.log b/test_cases/simplish/puya.log
index 2cdc9ab695..8a753896f5 100644
--- a/test_cases/simplish/puya.log
+++ b/test_cases/simplish/puya.log
@@ -557,7 +557,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to simplish/out/Simplish.ir/Simplish.approval.0.approval.ssa.ir
+debug: Output IR to simplish/out/Simplish.ir/Simplish.approval.0.ssa.ir
 info: optimizing approval program of test_cases.simplish.contract.Simplish at level 1
 debug: Begin optimization pass 1/100
 simplish/contract.py:117 debug: function is auto-recursive: test_cases.simplish.contract.itoa
@@ -783,7 +783,7 @@ debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.simplish.base_class.CallCounter.__init__
 debug: removing unused subroutine test_cases.simplish.contract.Simplish.approval_program
 debug: removing unused subroutine test_cases.simplish.base_class.CallCounter.increment_counter
-debug: Output IR to simplish/out/Simplish.ir/Simplish.approval.1.approval.ssa.opt.ir
+debug: Output IR to simplish/out/Simplish.ir/Simplish.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking single-use function test_cases.simplish.base_class.CallCounter.set_sender_nickname for inlining
 debug: marking single-use function test_cases.simplish.contract.Simplish.call for inlining
@@ -919,7 +919,7 @@ debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.simplish.base_class.CallCounter.set_sender_nickname
 debug: removing unused subroutine test_cases.simplish.contract.Simplish.call
 debug: removing unused subroutine test_cases.simplish.contract.Simplish.increment_counter
-debug: Output IR to simplish/out/Simplish.ir/Simplish.approval.2.approval.ssa.opt.ir
+debug: Output IR to simplish/out/Simplish.ir/Simplish.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: marking simple function test_cases.simplish.contract.circle_area for inlining (complexity=3 <= threshold=3)
 debug: marking simple function test_cases.simplish.contract.circle_circumference for inlining (complexity=2 <= threshold=3)
@@ -1011,7 +1011,7 @@ debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.simplish.contract.circle_area
 debug: removing unused subroutine test_cases.simplish.contract.circle_circumference
-debug: Output IR to simplish/out/Simplish.ir/Simplish.approval.3.approval.ssa.opt.ir
+debug: Output IR to simplish/out/Simplish.ir/Simplish.approval.3.ssa.opt.ir
 debug: Begin optimization pass 4/100
 debug: Optimizing subroutine test_cases.simplish.contract.Simplish.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -1176,8 +1176,8 @@ debug: Coalescing local variables in test_cases.simplish.contract.itoa using str
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.simplish.contract.itoa
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to simplish/out/Simplish.ir/Simplish.approval.4.approval.destructured.ir
-debug: Output IR to simplish/out/Simplish.ir/Simplish.clear.0.clear.ssa.ir
+debug: Output IR to simplish/out/Simplish.ir/Simplish.approval.4.destructured.ir
+debug: Output IR to simplish/out/Simplish.ir/Simplish.clear.0.ssa.ir
 info: optimizing clear program of test_cases.simplish.contract.Simplish at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.simplish.contract.Simplish.clear_state_program
@@ -1203,7 +1203,7 @@ debug: Coalescing local variables in test_cases.simplish.contract.Simplish.clear
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.simplish.contract.Simplish.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to simplish/out/Simplish.ir/Simplish.clear.1.clear.destructured.ir
+debug: Output IR to simplish/out/Simplish.ir/Simplish.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%0#1 0'
diff --git a/test_cases/simplish/puya_O2.log b/test_cases/simplish/puya_O2.log
index 82fa4822d9..dde46ba4ac 100644
--- a/test_cases/simplish/puya_O2.log
+++ b/test_cases/simplish/puya_O2.log
@@ -1173,7 +1173,7 @@ debug: Coalescing local variables in test_cases.simplish.contract.itoa using str
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.simplish.contract.itoa
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to simplish/out_O2/Simplish.ir/Simplish.approval.0.approval.destructured.ir
+debug: Output IR to simplish/out_O2/Simplish.ir/Simplish.approval.0.destructured.ir
 info: optimizing clear program of test_cases.simplish.contract.Simplish at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.simplish.contract.Simplish.clear_state_program
@@ -1199,7 +1199,7 @@ debug: Coalescing local variables in test_cases.simplish.contract.Simplish.clear
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.simplish.contract.Simplish.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to simplish/out_O2/Simplish.ir/Simplish.clear.0.clear.destructured.ir
+debug: Output IR to simplish/out_O2/Simplish.ir/Simplish.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%0#1 0'
diff --git a/test_cases/simplish/puya_unoptimized.log b/test_cases/simplish/puya_unoptimized.log
index 6869d24285..dbcbffd7fe 100644
--- a/test_cases/simplish/puya_unoptimized.log
+++ b/test_cases/simplish/puya_unoptimized.log
@@ -868,7 +868,7 @@ debug: Coalescing local variables in test_cases.simplish.base_class.CallCounter.
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.simplish.base_class.CallCounter.increment_counter
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to simplish/out_unoptimized/Simplish.ir/Simplish.approval.0.approval.destructured.ir
+debug: Output IR to simplish/out_unoptimized/Simplish.ir/Simplish.approval.0.destructured.ir
 info: optimizing clear program of test_cases.simplish.contract.Simplish at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.simplish.contract.Simplish.clear_state_program
@@ -886,7 +886,7 @@ debug: Coalescing local variables in test_cases.simplish.contract.Simplish.clear
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.simplish.contract.Simplish.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to simplish/out_unoptimized/Simplish.ir/Simplish.clear.0.clear.destructured.ir
+debug: Output IR to simplish/out_unoptimized/Simplish.ir/Simplish.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/ssa/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir b/test_cases/ssa/out/MyContract.ir/MyContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/ssa/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir
rename to test_cases/ssa/out/MyContract.ir/MyContract.approval.0.ssa.ir
diff --git a/test_cases/ssa/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir b/test_cases/ssa/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/ssa/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir
rename to test_cases/ssa/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
diff --git a/test_cases/ssa/out/MyContract.ir/MyContract.approval.2.approval.ssa.opt.ir b/test_cases/ssa/out/MyContract.ir/MyContract.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/ssa/out/MyContract.ir/MyContract.approval.2.approval.ssa.opt.ir
rename to test_cases/ssa/out/MyContract.ir/MyContract.approval.2.ssa.opt.ir
diff --git a/test_cases/ssa/out/MyContract.ir/MyContract.approval.3.approval.destructured.ir b/test_cases/ssa/out/MyContract.ir/MyContract.approval.3.destructured.ir
similarity index 100%
rename from test_cases/ssa/out/MyContract.ir/MyContract.approval.3.approval.destructured.ir
rename to test_cases/ssa/out/MyContract.ir/MyContract.approval.3.destructured.ir
diff --git a/test_cases/ssa/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir b/test_cases/ssa/out/MyContract.ir/MyContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/ssa/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir
rename to test_cases/ssa/out/MyContract.ir/MyContract.clear.0.ssa.ir
diff --git a/test_cases/ssa/out/MyContract.ir/MyContract.clear.1.clear.ssa.opt.ir b/test_cases/ssa/out/MyContract.ir/MyContract.clear.1.ssa.opt.ir
similarity index 100%
rename from test_cases/ssa/out/MyContract.ir/MyContract.clear.1.clear.ssa.opt.ir
rename to test_cases/ssa/out/MyContract.ir/MyContract.clear.1.ssa.opt.ir
diff --git a/test_cases/ssa/out/MyContract.ir/MyContract.clear.2.clear.ssa.opt.ir b/test_cases/ssa/out/MyContract.ir/MyContract.clear.2.ssa.opt.ir
similarity index 100%
rename from test_cases/ssa/out/MyContract.ir/MyContract.clear.2.clear.ssa.opt.ir
rename to test_cases/ssa/out/MyContract.ir/MyContract.clear.2.ssa.opt.ir
diff --git a/test_cases/ssa/out/MyContract.ir/MyContract.clear.3.clear.destructured.ir b/test_cases/ssa/out/MyContract.ir/MyContract.clear.3.destructured.ir
similarity index 100%
rename from test_cases/ssa/out/MyContract.ir/MyContract.clear.3.clear.destructured.ir
rename to test_cases/ssa/out/MyContract.ir/MyContract.clear.3.destructured.ir
diff --git a/test_cases/ssa/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir b/test_cases/ssa/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/ssa/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir
rename to test_cases/ssa/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
diff --git a/test_cases/ssa/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir b/test_cases/ssa/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/ssa/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir
rename to test_cases/ssa/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
diff --git a/test_cases/ssa/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir b/test_cases/ssa/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/ssa/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir
rename to test_cases/ssa/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
diff --git a/test_cases/ssa/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir b/test_cases/ssa/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/ssa/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir
rename to test_cases/ssa/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
diff --git a/test_cases/ssa/puya.log b/test_cases/ssa/puya.log
index 42bab7ca86..529d733ca6 100644
--- a/test_cases/ssa/puya.log
+++ b/test_cases/ssa/puya.log
@@ -499,7 +499,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to ssa/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir
+debug: Output IR to ssa/out/MyContract.ir/MyContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.ssa.contract.MyContract at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.ssa.contract.one_hundred for inlining
@@ -575,7 +575,7 @@ debug: Removed empty block: block@2
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.ssa.contract.one_hundred
-debug: Output IR to ssa/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to ssa/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking simple function test_cases.ssa.contract.phi_in_equiv_class for inlining (complexity=2 <= threshold=4)
 debug: Optimizing subroutine test_cases.ssa.contract.MyContract.approval_program
@@ -638,7 +638,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.ssa.contract.phi_in_equiv_class
-debug: Output IR to ssa/out/MyContract.ir/MyContract.approval.2.approval.ssa.opt.ir
+debug: Output IR to ssa/out/MyContract.ir/MyContract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.ssa.contract.MyContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -729,8 +729,8 @@ debug: Removing jump block block@14
 debug: Removing jump block block@18
 debug: branching to block@14 will be replaced with block@19
 debug: branching to block@18 will be replaced with block@19
-debug: Output IR to ssa/out/MyContract.ir/MyContract.approval.3.approval.destructured.ir
-debug: Output IR to ssa/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir
+debug: Output IR to ssa/out/MyContract.ir/MyContract.approval.3.destructured.ir
+debug: Output IR to ssa/out/MyContract.ir/MyContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.ssa.contract.MyContract at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.ssa.contract.one_hundred for inlining
@@ -784,7 +784,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.ssa.contract.one_hundred
-debug: Output IR to ssa/out/MyContract.ir/MyContract.clear.1.clear.ssa.opt.ir
+debug: Output IR to ssa/out/MyContract.ir/MyContract.clear.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.ssa.contract.MyContract.clear_state_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -809,7 +809,7 @@ debug: Optimizer: Remove Linear Jump
 debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to ssa/out/MyContract.ir/MyContract.clear.2.clear.ssa.opt.ir
+debug: Output IR to ssa/out/MyContract.ir/MyContract.clear.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.ssa.contract.MyContract.clear_state_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -834,7 +834,7 @@ debug: Coalescing local variables in test_cases.ssa.contract.MyContract.clear_st
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.ssa.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to ssa/out/MyContract.ir/MyContract.clear.3.clear.destructured.ir
+debug: Output IR to ssa/out/MyContract.ir/MyContract.clear.3.destructured.ir
 debug: Inserted main_while_top@1.ops[3]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main_while_top@1.ops[5]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_while_body@2.ops[2]: 'l-store-copy a#1 1'
diff --git a/test_cases/ssa/puya_O2.log b/test_cases/ssa/puya_O2.log
index 58426cd3e6..0d0731a06a 100644
--- a/test_cases/ssa/puya_O2.log
+++ b/test_cases/ssa/puya_O2.log
@@ -726,7 +726,7 @@ debug: Removing jump block block@14
 debug: Removing jump block block@18
 debug: branching to block@14 will be replaced with block@19
 debug: branching to block@18 will be replaced with block@19
-debug: Output IR to ssa/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir
+debug: Output IR to ssa/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.ssa.contract.MyContract at level 2
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.ssa.contract.one_hundred for inlining
@@ -828,7 +828,7 @@ debug: Coalescing local variables in test_cases.ssa.contract.MyContract.clear_st
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.ssa.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to ssa/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir
+debug: Output IR to ssa/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
 debug: Inserted main_while_top@1.ops[3]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main_while_top@1.ops[5]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_while_body@2.ops[2]: 'l-store-copy a#1 1'
diff --git a/test_cases/ssa/puya_unoptimized.log b/test_cases/ssa/puya_unoptimized.log
index 9fd814e7f6..25efe2e709 100644
--- a/test_cases/ssa/puya_unoptimized.log
+++ b/test_cases/ssa/puya_unoptimized.log
@@ -629,7 +629,7 @@ debug: Coalescing x#0 with [x#6, x#1, x#2, x#3]
 debug: Coalescing resulted in 9 replacement/s
 debug: Sequentializing parallel copies in test_cases.ssa.contract.phi_in_equiv_class
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to ssa/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir
+debug: Output IR to ssa/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.ssa.contract.MyContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.ssa.contract.MyContract.clear_state_program
@@ -696,7 +696,7 @@ debug: to_do: b#0, a#0
 debug: * to_do a#0
 debug: * to_do b#0
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to ssa/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir
+debug: Output IR to ssa/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
 debug: Inserted main.ops[11]: 'l-store-copy a#0 0'
 debug: Replaced main.ops[13]: 'v-load a#0' with 'l-load a#0'
 debug: Inserted main.ops[7]: 'l-store-copy b#0 0'
diff --git a/test_cases/ssa2/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir b/test_cases/ssa2/out/MyContract.ir/MyContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/ssa2/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir
rename to test_cases/ssa2/out/MyContract.ir/MyContract.approval.0.ssa.ir
diff --git a/test_cases/ssa2/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir b/test_cases/ssa2/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/ssa2/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir
rename to test_cases/ssa2/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
diff --git a/test_cases/ssa2/out/MyContract.ir/MyContract.approval.2.approval.destructured.ir b/test_cases/ssa2/out/MyContract.ir/MyContract.approval.2.destructured.ir
similarity index 100%
rename from test_cases/ssa2/out/MyContract.ir/MyContract.approval.2.approval.destructured.ir
rename to test_cases/ssa2/out/MyContract.ir/MyContract.approval.2.destructured.ir
diff --git a/test_cases/ssa2/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir b/test_cases/ssa2/out/MyContract.ir/MyContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/ssa2/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir
rename to test_cases/ssa2/out/MyContract.ir/MyContract.clear.0.ssa.ir
diff --git a/test_cases/ssa2/out/MyContract.ir/MyContract.clear.1.clear.ssa.opt.ir b/test_cases/ssa2/out/MyContract.ir/MyContract.clear.1.ssa.opt.ir
similarity index 100%
rename from test_cases/ssa2/out/MyContract.ir/MyContract.clear.1.clear.ssa.opt.ir
rename to test_cases/ssa2/out/MyContract.ir/MyContract.clear.1.ssa.opt.ir
diff --git a/test_cases/ssa2/out/MyContract.ir/MyContract.clear.2.clear.ssa.opt.ir b/test_cases/ssa2/out/MyContract.ir/MyContract.clear.2.ssa.opt.ir
similarity index 100%
rename from test_cases/ssa2/out/MyContract.ir/MyContract.clear.2.clear.ssa.opt.ir
rename to test_cases/ssa2/out/MyContract.ir/MyContract.clear.2.ssa.opt.ir
diff --git a/test_cases/ssa2/out/MyContract.ir/MyContract.clear.3.clear.destructured.ir b/test_cases/ssa2/out/MyContract.ir/MyContract.clear.3.destructured.ir
similarity index 100%
rename from test_cases/ssa2/out/MyContract.ir/MyContract.clear.3.clear.destructured.ir
rename to test_cases/ssa2/out/MyContract.ir/MyContract.clear.3.destructured.ir
diff --git a/test_cases/ssa2/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir b/test_cases/ssa2/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/ssa2/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir
rename to test_cases/ssa2/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
diff --git a/test_cases/ssa2/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir b/test_cases/ssa2/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/ssa2/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir
rename to test_cases/ssa2/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
diff --git a/test_cases/ssa2/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir b/test_cases/ssa2/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/ssa2/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir
rename to test_cases/ssa2/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
diff --git a/test_cases/ssa2/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir b/test_cases/ssa2/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/ssa2/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir
rename to test_cases/ssa2/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
diff --git a/test_cases/ssa2/puya.log b/test_cases/ssa2/puya.log
index 9210a93ed1..b648a193b6 100644
--- a/test_cases/ssa2/puya.log
+++ b/test_cases/ssa2/puya.log
@@ -440,7 +440,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to ssa2/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir
+debug: Output IR to ssa2/out/MyContract.ir/MyContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.ssa2.contract.MyContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.ssa2.contract.MyContract.approval_program
@@ -462,7 +462,7 @@ debug: Merged linear block@3 into block@2
 debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to ssa2/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to ssa2/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.ssa2.contract.MyContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -511,8 +511,8 @@ debug: * to_do a#0
 debug: * to_do b#0
 debug: * to_do i#0
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to ssa2/out/MyContract.ir/MyContract.approval.2.approval.destructured.ir
-debug: Output IR to ssa2/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir
+debug: Output IR to ssa2/out/MyContract.ir/MyContract.approval.2.destructured.ir
+debug: Output IR to ssa2/out/MyContract.ir/MyContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.ssa2.contract.MyContract at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.ssa2.contract.one_hundred for inlining
@@ -566,7 +566,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.ssa2.contract.one_hundred
-debug: Output IR to ssa2/out/MyContract.ir/MyContract.clear.1.clear.ssa.opt.ir
+debug: Output IR to ssa2/out/MyContract.ir/MyContract.clear.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.ssa2.contract.MyContract.clear_state_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -591,7 +591,7 @@ debug: Optimizer: Remove Linear Jump
 debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to ssa2/out/MyContract.ir/MyContract.clear.2.clear.ssa.opt.ir
+debug: Output IR to ssa2/out/MyContract.ir/MyContract.clear.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.ssa2.contract.MyContract.clear_state_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -616,7 +616,7 @@ debug: Coalescing local variables in test_cases.ssa2.contract.MyContract.clear_s
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.ssa2.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to ssa2/out/MyContract.ir/MyContract.clear.3.clear.destructured.ir
+debug: Output IR to ssa2/out/MyContract.ir/MyContract.clear.3.destructured.ir
 debug: Inserted main_for_header@1.ops[3]: 'l-store-copy continue_looping%0#0 0'
 debug: Replaced main_for_header@1.ops[5]: 'v-load continue_looping%0#0' with 'l-load continue_looping%0#0'
 debug: Inserted main_for_body@2.ops[2]: 'l-store-copy a#0 1'
diff --git a/test_cases/ssa2/puya_O2.log b/test_cases/ssa2/puya_O2.log
index ddd441ed53..2fc6fa9647 100644
--- a/test_cases/ssa2/puya_O2.log
+++ b/test_cases/ssa2/puya_O2.log
@@ -508,7 +508,7 @@ debug: * to_do a#0
 debug: * to_do b#0
 debug: * to_do i#0
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to ssa2/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir
+debug: Output IR to ssa2/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.ssa2.contract.MyContract at level 2
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.ssa2.contract.one_hundred for inlining
@@ -610,7 +610,7 @@ debug: Coalescing local variables in test_cases.ssa2.contract.MyContract.clear_s
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.ssa2.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to ssa2/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir
+debug: Output IR to ssa2/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
 debug: Inserted main_for_header@1.ops[3]: 'l-store-copy continue_looping%0#0 0'
 debug: Replaced main_for_header@1.ops[5]: 'v-load continue_looping%0#0' with 'l-load continue_looping%0#0'
 debug: Inserted main_for_body@2.ops[2]: 'l-store-copy a#0 1'
diff --git a/test_cases/ssa2/puya_unoptimized.log b/test_cases/ssa2/puya_unoptimized.log
index 08f97971e3..6643393963 100644
--- a/test_cases/ssa2/puya_unoptimized.log
+++ b/test_cases/ssa2/puya_unoptimized.log
@@ -480,7 +480,7 @@ debug: * to_do a#0
 debug: * to_do b#0
 debug: * to_do i#0
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to ssa2/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir
+debug: Output IR to ssa2/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.ssa2.contract.MyContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.ssa2.contract.MyContract.clear_state_program
@@ -547,7 +547,7 @@ debug: to_do: b#0, a#0
 debug: * to_do a#0
 debug: * to_do b#0
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to ssa2/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir
+debug: Output IR to ssa2/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
 debug: Inserted main_for_header@1.ops[3]: 'l-store-copy continue_looping%0#0 0'
 debug: Replaced main_for_header@1.ops[5]: 'v-load continue_looping%0#0' with 'l-load continue_looping%0#0'
 debug: Inserted main_for_body@2.ops[2]: 'l-store-copy a#0 1'
diff --git a/test_cases/state_mutations/out/Contract.ir/Contract.approval.0.approval.ssa.ir b/test_cases/state_mutations/out/Contract.ir/Contract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/state_mutations/out/Contract.ir/Contract.approval.0.approval.ssa.ir
rename to test_cases/state_mutations/out/Contract.ir/Contract.approval.0.ssa.ir
diff --git a/test_cases/state_mutations/out/Contract.ir/Contract.approval.1.approval.ssa.opt.ir b/test_cases/state_mutations/out/Contract.ir/Contract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/state_mutations/out/Contract.ir/Contract.approval.1.approval.ssa.opt.ir
rename to test_cases/state_mutations/out/Contract.ir/Contract.approval.1.ssa.opt.ir
diff --git a/test_cases/state_mutations/out/Contract.ir/Contract.approval.2.approval.ssa.opt.ir b/test_cases/state_mutations/out/Contract.ir/Contract.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/state_mutations/out/Contract.ir/Contract.approval.2.approval.ssa.opt.ir
rename to test_cases/state_mutations/out/Contract.ir/Contract.approval.2.ssa.opt.ir
diff --git a/test_cases/state_mutations/out/Contract.ir/Contract.approval.3.approval.destructured.ir b/test_cases/state_mutations/out/Contract.ir/Contract.approval.3.destructured.ir
similarity index 100%
rename from test_cases/state_mutations/out/Contract.ir/Contract.approval.3.approval.destructured.ir
rename to test_cases/state_mutations/out/Contract.ir/Contract.approval.3.destructured.ir
diff --git a/test_cases/state_mutations/out/Contract.ir/Contract.clear.0.clear.ssa.ir b/test_cases/state_mutations/out/Contract.ir/Contract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/state_mutations/out/Contract.ir/Contract.clear.0.clear.ssa.ir
rename to test_cases/state_mutations/out/Contract.ir/Contract.clear.0.ssa.ir
diff --git a/test_cases/state_mutations/out/Contract.ir/Contract.clear.1.clear.destructured.ir b/test_cases/state_mutations/out/Contract.ir/Contract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/state_mutations/out/Contract.ir/Contract.clear.1.clear.destructured.ir
rename to test_cases/state_mutations/out/Contract.ir/Contract.clear.1.destructured.ir
diff --git a/test_cases/state_mutations/out_O2/Contract.ir/Contract.approval.0.approval.destructured.ir b/test_cases/state_mutations/out_O2/Contract.ir/Contract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/state_mutations/out_O2/Contract.ir/Contract.approval.0.approval.destructured.ir
rename to test_cases/state_mutations/out_O2/Contract.ir/Contract.approval.0.destructured.ir
diff --git a/test_cases/state_mutations/out_O2/Contract.ir/Contract.clear.0.clear.destructured.ir b/test_cases/state_mutations/out_O2/Contract.ir/Contract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/state_mutations/out_O2/Contract.ir/Contract.clear.0.clear.destructured.ir
rename to test_cases/state_mutations/out_O2/Contract.ir/Contract.clear.0.destructured.ir
diff --git a/test_cases/state_mutations/out_unoptimized/Contract.ir/Contract.approval.0.approval.destructured.ir b/test_cases/state_mutations/out_unoptimized/Contract.ir/Contract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/state_mutations/out_unoptimized/Contract.ir/Contract.approval.0.approval.destructured.ir
rename to test_cases/state_mutations/out_unoptimized/Contract.ir/Contract.approval.0.destructured.ir
diff --git a/test_cases/state_mutations/out_unoptimized/Contract.ir/Contract.clear.0.clear.destructured.ir b/test_cases/state_mutations/out_unoptimized/Contract.ir/Contract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/state_mutations/out_unoptimized/Contract.ir/Contract.clear.0.clear.destructured.ir
rename to test_cases/state_mutations/out_unoptimized/Contract.ir/Contract.clear.0.destructured.ir
diff --git a/test_cases/state_mutations/puya.log b/test_cases/state_mutations/puya.log
index 244e3d7d15..29591b6b82 100644
--- a/test_cases/state_mutations/puya.log
+++ b/test_cases/state_mutations/puya.log
@@ -468,7 +468,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to state_mutations/out/Contract.ir/Contract.approval.0.approval.ssa.ir
+debug: Output IR to state_mutations/out/Contract.ir/Contract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.state_mutations.contract.Contract at level 1
 debug: Begin optimization pass 1/100
 debug: marking trivial method test_cases.state_mutations.contract.Contract.__init__ as inlineable
@@ -905,7 +905,7 @@ debug: removing unused subroutine algopy.arc4.ARC4Contract.approval_program
 debug: removing unused subroutine test_cases.state_mutations.contract.get_struct
 debug: removing unused subroutine test_cases.state_mutations.contract.Contract.__algopy_default_create
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
-debug: Output IR to state_mutations/out/Contract.ir/Contract.approval.1.approval.ssa.opt.ir
+debug: Output IR to state_mutations/out/Contract.ir/Contract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.state_mutations.contract.Contract.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -1035,7 +1035,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.state_mutations.contract.Contract.__puya_arc4_router__
-debug: Output IR to state_mutations/out/Contract.ir/Contract.approval.2.approval.ssa.opt.ir
+debug: Output IR to state_mutations/out/Contract.ir/Contract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.state_mutations.contract.Contract.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -1254,8 +1254,8 @@ debug: to_do: head_offset#0, new_head_and_tail#0
 debug: * to_do new_head_and_tail#0
 debug: * to_do head_offset#0
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to state_mutations/out/Contract.ir/Contract.approval.3.approval.destructured.ir
-debug: Output IR to state_mutations/out/Contract.ir/Contract.clear.0.clear.ssa.ir
+debug: Output IR to state_mutations/out/Contract.ir/Contract.approval.3.destructured.ir
+debug: Output IR to state_mutations/out/Contract.ir/Contract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.state_mutations.contract.Contract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -1281,7 +1281,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to state_mutations/out/Contract.ir/Contract.clear.1.clear.destructured.ir
+debug: Output IR to state_mutations/out/Contract.ir/Contract.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#2 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#2' with 'l-load tmp%0#2'
 debug: Inserted main_abi_routing@4.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/state_mutations/puya_O2.log b/test_cases/state_mutations/puya_O2.log
index ce27fb7b17..8ec21a76a1 100644
--- a/test_cases/state_mutations/puya_O2.log
+++ b/test_cases/state_mutations/puya_O2.log
@@ -1321,7 +1321,7 @@ debug: to_do: head_offset#0, new_head_and_tail#0
 debug: * to_do new_head_and_tail#0
 debug: * to_do head_offset#0
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to state_mutations/out_O2/Contract.ir/Contract.approval.0.approval.destructured.ir
+debug: Output IR to state_mutations/out_O2/Contract.ir/Contract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.state_mutations.contract.Contract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -1347,7 +1347,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to state_mutations/out_O2/Contract.ir/Contract.clear.0.clear.destructured.ir
+debug: Output IR to state_mutations/out_O2/Contract.ir/Contract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#2 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#2' with 'l-load tmp%0#2'
 debug: Inserted main_abi_routing@4.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/state_mutations/puya_unoptimized.log b/test_cases/state_mutations/puya_unoptimized.log
index 217368dbec..1b7438a319 100644
--- a/test_cases/state_mutations/puya_unoptimized.log
+++ b/test_cases/state_mutations/puya_unoptimized.log
@@ -889,7 +889,7 @@ debug: to_do: head_offset#0, new_head_and_tail#0
 debug: * to_do new_head_and_tail#0
 debug: * to_do head_offset#0
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to state_mutations/out_unoptimized/Contract.ir/Contract.approval.0.approval.destructured.ir
+debug: Output IR to state_mutations/out_unoptimized/Contract.ir/Contract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.state_mutations.contract.Contract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -907,7 +907,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to state_mutations/out_unoptimized/Contract.ir/Contract.clear.0.clear.destructured.ir
+debug: Output IR to state_mutations/out_unoptimized/Contract.ir/Contract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/state_proxies/out/StateProxyContract.ir/StateProxyContract.approval.0.approval.ssa.ir b/test_cases/state_proxies/out/StateProxyContract.ir/StateProxyContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/state_proxies/out/StateProxyContract.ir/StateProxyContract.approval.0.approval.ssa.ir
rename to test_cases/state_proxies/out/StateProxyContract.ir/StateProxyContract.approval.0.ssa.ir
diff --git a/test_cases/state_proxies/out/StateProxyContract.ir/StateProxyContract.approval.1.approval.ssa.opt.ir b/test_cases/state_proxies/out/StateProxyContract.ir/StateProxyContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/state_proxies/out/StateProxyContract.ir/StateProxyContract.approval.1.approval.ssa.opt.ir
rename to test_cases/state_proxies/out/StateProxyContract.ir/StateProxyContract.approval.1.ssa.opt.ir
diff --git a/test_cases/state_proxies/out/StateProxyContract.ir/StateProxyContract.approval.2.approval.ssa.opt.ir b/test_cases/state_proxies/out/StateProxyContract.ir/StateProxyContract.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/state_proxies/out/StateProxyContract.ir/StateProxyContract.approval.2.approval.ssa.opt.ir
rename to test_cases/state_proxies/out/StateProxyContract.ir/StateProxyContract.approval.2.ssa.opt.ir
diff --git a/test_cases/state_proxies/out/StateProxyContract.ir/StateProxyContract.approval.3.approval.destructured.ir b/test_cases/state_proxies/out/StateProxyContract.ir/StateProxyContract.approval.3.destructured.ir
similarity index 100%
rename from test_cases/state_proxies/out/StateProxyContract.ir/StateProxyContract.approval.3.approval.destructured.ir
rename to test_cases/state_proxies/out/StateProxyContract.ir/StateProxyContract.approval.3.destructured.ir
diff --git a/test_cases/state_proxies/out/StateProxyContract.ir/StateProxyContract.clear.0.clear.ssa.ir b/test_cases/state_proxies/out/StateProxyContract.ir/StateProxyContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/state_proxies/out/StateProxyContract.ir/StateProxyContract.clear.0.clear.ssa.ir
rename to test_cases/state_proxies/out/StateProxyContract.ir/StateProxyContract.clear.0.ssa.ir
diff --git a/test_cases/state_proxies/out/StateProxyContract.ir/StateProxyContract.clear.1.clear.destructured.ir b/test_cases/state_proxies/out/StateProxyContract.ir/StateProxyContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/state_proxies/out/StateProxyContract.ir/StateProxyContract.clear.1.clear.destructured.ir
rename to test_cases/state_proxies/out/StateProxyContract.ir/StateProxyContract.clear.1.destructured.ir
diff --git a/test_cases/state_proxies/out_O2/StateProxyContract.ir/StateProxyContract.approval.0.approval.destructured.ir b/test_cases/state_proxies/out_O2/StateProxyContract.ir/StateProxyContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/state_proxies/out_O2/StateProxyContract.ir/StateProxyContract.approval.0.approval.destructured.ir
rename to test_cases/state_proxies/out_O2/StateProxyContract.ir/StateProxyContract.approval.0.destructured.ir
diff --git a/test_cases/state_proxies/out_O2/StateProxyContract.ir/StateProxyContract.clear.0.clear.destructured.ir b/test_cases/state_proxies/out_O2/StateProxyContract.ir/StateProxyContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/state_proxies/out_O2/StateProxyContract.ir/StateProxyContract.clear.0.clear.destructured.ir
rename to test_cases/state_proxies/out_O2/StateProxyContract.ir/StateProxyContract.clear.0.destructured.ir
diff --git a/test_cases/state_proxies/out_unoptimized/StateProxyContract.ir/StateProxyContract.approval.0.approval.destructured.ir b/test_cases/state_proxies/out_unoptimized/StateProxyContract.ir/StateProxyContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/state_proxies/out_unoptimized/StateProxyContract.ir/StateProxyContract.approval.0.approval.destructured.ir
rename to test_cases/state_proxies/out_unoptimized/StateProxyContract.ir/StateProxyContract.approval.0.destructured.ir
diff --git a/test_cases/state_proxies/out_unoptimized/StateProxyContract.ir/StateProxyContract.clear.0.clear.destructured.ir b/test_cases/state_proxies/out_unoptimized/StateProxyContract.ir/StateProxyContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/state_proxies/out_unoptimized/StateProxyContract.ir/StateProxyContract.clear.0.clear.destructured.ir
rename to test_cases/state_proxies/out_unoptimized/StateProxyContract.ir/StateProxyContract.clear.0.destructured.ir
diff --git a/test_cases/state_proxies/puya.log b/test_cases/state_proxies/puya.log
index 01515468fd..b06244617d 100644
--- a/test_cases/state_proxies/puya.log
+++ b/test_cases/state_proxies/puya.log
@@ -426,7 +426,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to state_proxies/out/StateProxyContract.ir/StateProxyContract.approval.0.approval.ssa.ir
+debug: Output IR to state_proxies/out/StateProxyContract.ir/StateProxyContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.state_proxies.contract.StateProxyContract at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.state_proxies.contract.StateProxyContract.__init__ for inlining
@@ -539,7 +539,7 @@ debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.state_proxies.contract.StateProxyContract.__init__
 debug: removing unused subroutine algopy.arc4.ARC4Contract.approval_program
-debug: Output IR to state_proxies/out/StateProxyContract.ir/StateProxyContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to state_proxies/out/StateProxyContract.ir/StateProxyContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.state_proxies.contract.StateProxyContract.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -591,7 +591,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.state_proxies.contract.StateProxyContract.__puya_arc4_router__
-debug: Output IR to state_proxies/out/StateProxyContract.ir/StateProxyContract.approval.2.approval.ssa.opt.ir
+debug: Output IR to state_proxies/out/StateProxyContract.ir/StateProxyContract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.state_proxies.contract.StateProxyContract.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -641,8 +641,8 @@ debug: Coalescing local variables in test_cases.state_proxies.contract.StateProx
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.state_proxies.contract.StateProxyContract.create
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to state_proxies/out/StateProxyContract.ir/StateProxyContract.approval.3.approval.destructured.ir
-debug: Output IR to state_proxies/out/StateProxyContract.ir/StateProxyContract.clear.0.clear.ssa.ir
+debug: Output IR to state_proxies/out/StateProxyContract.ir/StateProxyContract.approval.3.destructured.ir
+debug: Output IR to state_proxies/out/StateProxyContract.ir/StateProxyContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.state_proxies.contract.StateProxyContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -668,7 +668,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to state_proxies/out/StateProxyContract.ir/StateProxyContract.clear.1.clear.destructured.ir
+debug: Output IR to state_proxies/out/StateProxyContract.ir/StateProxyContract.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_call___init__@1.ops[9]: 'l-store-copy funky_town#0 0'
diff --git a/test_cases/state_proxies/puya_O2.log b/test_cases/state_proxies/puya_O2.log
index 811708fb68..c5aa5a2fe8 100644
--- a/test_cases/state_proxies/puya_O2.log
+++ b/test_cases/state_proxies/puya_O2.log
@@ -606,7 +606,7 @@ debug: Coalescing test_cases.state_proxies.contract.StateProxyContract.__puya_ar
 debug: Coalescing resulted in 9 replacement/s
 debug: Sequentializing parallel copies in test_cases.state_proxies.contract.StateProxyContract.__algopy_entrypoint_with_init
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to state_proxies/out_O2/StateProxyContract.ir/StateProxyContract.approval.0.approval.destructured.ir
+debug: Output IR to state_proxies/out_O2/StateProxyContract.ir/StateProxyContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.state_proxies.contract.StateProxyContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -632,7 +632,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to state_proxies/out_O2/StateProxyContract.ir/StateProxyContract.clear.0.clear.destructured.ir
+debug: Output IR to state_proxies/out_O2/StateProxyContract.ir/StateProxyContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_call___init__@1.ops[9]: 'l-store-copy funky_town#0 0'
diff --git a/test_cases/state_proxies/puya_unoptimized.log b/test_cases/state_proxies/puya_unoptimized.log
index 51e2e95fc1..483b093f64 100644
--- a/test_cases/state_proxies/puya_unoptimized.log
+++ b/test_cases/state_proxies/puya_unoptimized.log
@@ -524,7 +524,7 @@ debug: Coalescing local variables in test_cases.state_proxies.contract.StateProx
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.state_proxies.contract.StateProxyContract.create
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to state_proxies/out_unoptimized/StateProxyContract.ir/StateProxyContract.approval.0.approval.destructured.ir
+debug: Output IR to state_proxies/out_unoptimized/StateProxyContract.ir/StateProxyContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.state_proxies.contract.StateProxyContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -542,7 +542,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to state_proxies/out_unoptimized/StateProxyContract.ir/StateProxyContract.clear.0.clear.destructured.ir
+debug: Output IR to state_proxies/out_unoptimized/StateProxyContract.ir/StateProxyContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/state_totals/out/Contract.ir/Contract.approval.0.approval.ssa.ir b/test_cases/state_totals/out/Contract.ir/Contract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/state_totals/out/Contract.ir/Contract.approval.0.approval.ssa.ir
rename to test_cases/state_totals/out/Contract.ir/Contract.approval.0.ssa.ir
diff --git a/test_cases/state_totals/out/Contract.ir/Contract.approval.1.approval.ssa.opt.ir b/test_cases/state_totals/out/Contract.ir/Contract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/state_totals/out/Contract.ir/Contract.approval.1.approval.ssa.opt.ir
rename to test_cases/state_totals/out/Contract.ir/Contract.approval.1.ssa.opt.ir
diff --git a/test_cases/state_totals/out/Contract.ir/Contract.approval.2.approval.ssa.opt.ir b/test_cases/state_totals/out/Contract.ir/Contract.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/state_totals/out/Contract.ir/Contract.approval.2.approval.ssa.opt.ir
rename to test_cases/state_totals/out/Contract.ir/Contract.approval.2.ssa.opt.ir
diff --git a/test_cases/state_totals/out/Contract.ir/Contract.approval.3.approval.destructured.ir b/test_cases/state_totals/out/Contract.ir/Contract.approval.3.destructured.ir
similarity index 100%
rename from test_cases/state_totals/out/Contract.ir/Contract.approval.3.approval.destructured.ir
rename to test_cases/state_totals/out/Contract.ir/Contract.approval.3.destructured.ir
diff --git a/test_cases/state_totals/out/Contract.ir/Contract.clear.0.clear.ssa.ir b/test_cases/state_totals/out/Contract.ir/Contract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/state_totals/out/Contract.ir/Contract.clear.0.clear.ssa.ir
rename to test_cases/state_totals/out/Contract.ir/Contract.clear.0.ssa.ir
diff --git a/test_cases/state_totals/out/Contract.ir/Contract.clear.1.clear.destructured.ir b/test_cases/state_totals/out/Contract.ir/Contract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/state_totals/out/Contract.ir/Contract.clear.1.clear.destructured.ir
rename to test_cases/state_totals/out/Contract.ir/Contract.clear.1.destructured.ir
diff --git a/test_cases/state_totals/out_O2/Contract.ir/Contract.approval.0.approval.destructured.ir b/test_cases/state_totals/out_O2/Contract.ir/Contract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/state_totals/out_O2/Contract.ir/Contract.approval.0.approval.destructured.ir
rename to test_cases/state_totals/out_O2/Contract.ir/Contract.approval.0.destructured.ir
diff --git a/test_cases/state_totals/out_O2/Contract.ir/Contract.clear.0.clear.destructured.ir b/test_cases/state_totals/out_O2/Contract.ir/Contract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/state_totals/out_O2/Contract.ir/Contract.clear.0.clear.destructured.ir
rename to test_cases/state_totals/out_O2/Contract.ir/Contract.clear.0.destructured.ir
diff --git a/test_cases/state_totals/out_unoptimized/Contract.ir/Contract.approval.0.approval.destructured.ir b/test_cases/state_totals/out_unoptimized/Contract.ir/Contract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/state_totals/out_unoptimized/Contract.ir/Contract.approval.0.approval.destructured.ir
rename to test_cases/state_totals/out_unoptimized/Contract.ir/Contract.approval.0.destructured.ir
diff --git a/test_cases/state_totals/out_unoptimized/Contract.ir/Contract.clear.0.clear.destructured.ir b/test_cases/state_totals/out_unoptimized/Contract.ir/Contract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/state_totals/out_unoptimized/Contract.ir/Contract.clear.0.clear.destructured.ir
rename to test_cases/state_totals/out_unoptimized/Contract.ir/Contract.clear.0.destructured.ir
diff --git a/test_cases/state_totals/puya.log b/test_cases/state_totals/puya.log
index 82622c748e..d0593ffe2a 100644
--- a/test_cases/state_totals/puya.log
+++ b/test_cases/state_totals/puya.log
@@ -426,7 +426,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to state_totals/out/Contract.ir/Contract.approval.0.approval.ssa.ir
+debug: Output IR to state_totals/out/Contract.ir/Contract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.state_totals.contract.Contract at level 1
 debug: Begin optimization pass 1/100
 debug: marking trivial method test_cases.state_totals.contract.Contract.__init__ as inlineable
@@ -551,7 +551,7 @@ debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.state_totals.contract.Contract.__init__
 debug: removing unused subroutine algopy.arc4.ARC4Contract.approval_program
 debug: removing unused subroutine test_cases.state_totals.contract.Contract.create
-debug: Output IR to state_totals/out/Contract.ir/Contract.approval.1.approval.ssa.opt.ir
+debug: Output IR to state_totals/out/Contract.ir/Contract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.state_totals.contract.Contract.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -591,7 +591,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.state_totals.contract.Contract.__puya_arc4_router__
-debug: Output IR to state_totals/out/Contract.ir/Contract.approval.2.approval.ssa.opt.ir
+debug: Output IR to state_totals/out/Contract.ir/Contract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.state_totals.contract.Contract.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -618,8 +618,8 @@ debug: Coalescing tmp%0#1 with [tmp%0#3]
 debug: Coalescing resulted in 5 replacement/s
 debug: Sequentializing parallel copies in test_cases.state_totals.contract.Contract.__algopy_entrypoint_with_init
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to state_totals/out/Contract.ir/Contract.approval.3.approval.destructured.ir
-debug: Output IR to state_totals/out/Contract.ir/Contract.clear.0.clear.ssa.ir
+debug: Output IR to state_totals/out/Contract.ir/Contract.approval.3.destructured.ir
+debug: Output IR to state_totals/out/Contract.ir/Contract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.state_totals.contract.Contract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -645,7 +645,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to state_totals/out/Contract.ir/Contract.clear.1.clear.destructured.ir
+debug: Output IR to state_totals/out/Contract.ir/Contract.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#2 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#2' with 'l-load tmp%0#2'
 debug: Inserted main_bare_routing@4.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/state_totals/puya_O2.log b/test_cases/state_totals/puya_O2.log
index 46425d38e1..4814396e03 100644
--- a/test_cases/state_totals/puya_O2.log
+++ b/test_cases/state_totals/puya_O2.log
@@ -614,7 +614,7 @@ debug: Coalescing tmp%0#1 with [tmp%0#3]
 debug: Coalescing resulted in 5 replacement/s
 debug: Sequentializing parallel copies in test_cases.state_totals.contract.Contract.__algopy_entrypoint_with_init
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to state_totals/out_O2/Contract.ir/Contract.approval.0.approval.destructured.ir
+debug: Output IR to state_totals/out_O2/Contract.ir/Contract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.state_totals.contract.Contract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -640,7 +640,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to state_totals/out_O2/Contract.ir/Contract.clear.0.clear.destructured.ir
+debug: Output IR to state_totals/out_O2/Contract.ir/Contract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#2 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#2' with 'l-load tmp%0#2'
 debug: Inserted main_bare_routing@4.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/state_totals/puya_unoptimized.log b/test_cases/state_totals/puya_unoptimized.log
index 45b26b5ffd..f97dce429c 100644
--- a/test_cases/state_totals/puya_unoptimized.log
+++ b/test_cases/state_totals/puya_unoptimized.log
@@ -524,7 +524,7 @@ debug: Coalescing local variables in test_cases.state_totals.contract.Contract.c
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.state_totals.contract.Contract.create
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to state_totals/out_unoptimized/Contract.ir/Contract.approval.0.approval.destructured.ir
+debug: Output IR to state_totals/out_unoptimized/Contract.ir/Contract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.state_totals.contract.Contract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -542,7 +542,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to state_totals/out_unoptimized/Contract.ir/Contract.clear.0.clear.destructured.ir
+debug: Output IR to state_totals/out_unoptimized/Contract.ir/Contract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/stress_tests/out/BruteForceRotationSearch.ir/BruteForceRotationSearch.approval.0.approval.ssa.ir b/test_cases/stress_tests/out/BruteForceRotationSearch.ir/BruteForceRotationSearch.approval.0.ssa.ir
similarity index 100%
rename from test_cases/stress_tests/out/BruteForceRotationSearch.ir/BruteForceRotationSearch.approval.0.approval.ssa.ir
rename to test_cases/stress_tests/out/BruteForceRotationSearch.ir/BruteForceRotationSearch.approval.0.ssa.ir
diff --git a/test_cases/stress_tests/out/BruteForceRotationSearch.ir/BruteForceRotationSearch.approval.1.approval.ssa.opt.ir b/test_cases/stress_tests/out/BruteForceRotationSearch.ir/BruteForceRotationSearch.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/stress_tests/out/BruteForceRotationSearch.ir/BruteForceRotationSearch.approval.1.approval.ssa.opt.ir
rename to test_cases/stress_tests/out/BruteForceRotationSearch.ir/BruteForceRotationSearch.approval.1.ssa.opt.ir
diff --git a/test_cases/stress_tests/out/BruteForceRotationSearch.ir/BruteForceRotationSearch.approval.2.approval.destructured.ir b/test_cases/stress_tests/out/BruteForceRotationSearch.ir/BruteForceRotationSearch.approval.2.destructured.ir
similarity index 100%
rename from test_cases/stress_tests/out/BruteForceRotationSearch.ir/BruteForceRotationSearch.approval.2.approval.destructured.ir
rename to test_cases/stress_tests/out/BruteForceRotationSearch.ir/BruteForceRotationSearch.approval.2.destructured.ir
diff --git a/test_cases/stress_tests/out/BruteForceRotationSearch.ir/BruteForceRotationSearch.clear.0.clear.ssa.ir b/test_cases/stress_tests/out/BruteForceRotationSearch.ir/BruteForceRotationSearch.clear.0.ssa.ir
similarity index 100%
rename from test_cases/stress_tests/out/BruteForceRotationSearch.ir/BruteForceRotationSearch.clear.0.clear.ssa.ir
rename to test_cases/stress_tests/out/BruteForceRotationSearch.ir/BruteForceRotationSearch.clear.0.ssa.ir
diff --git a/test_cases/stress_tests/out/BruteForceRotationSearch.ir/BruteForceRotationSearch.clear.1.clear.destructured.ir b/test_cases/stress_tests/out/BruteForceRotationSearch.ir/BruteForceRotationSearch.clear.1.destructured.ir
similarity index 100%
rename from test_cases/stress_tests/out/BruteForceRotationSearch.ir/BruteForceRotationSearch.clear.1.clear.destructured.ir
rename to test_cases/stress_tests/out/BruteForceRotationSearch.ir/BruteForceRotationSearch.clear.1.destructured.ir
diff --git a/test_cases/stress_tests/out_O2/BruteForceRotationSearch.ir/BruteForceRotationSearch.approval.0.approval.destructured.ir b/test_cases/stress_tests/out_O2/BruteForceRotationSearch.ir/BruteForceRotationSearch.approval.0.destructured.ir
similarity index 100%
rename from test_cases/stress_tests/out_O2/BruteForceRotationSearch.ir/BruteForceRotationSearch.approval.0.approval.destructured.ir
rename to test_cases/stress_tests/out_O2/BruteForceRotationSearch.ir/BruteForceRotationSearch.approval.0.destructured.ir
diff --git a/test_cases/stress_tests/out_O2/BruteForceRotationSearch.ir/BruteForceRotationSearch.clear.0.clear.destructured.ir b/test_cases/stress_tests/out_O2/BruteForceRotationSearch.ir/BruteForceRotationSearch.clear.0.destructured.ir
similarity index 100%
rename from test_cases/stress_tests/out_O2/BruteForceRotationSearch.ir/BruteForceRotationSearch.clear.0.clear.destructured.ir
rename to test_cases/stress_tests/out_O2/BruteForceRotationSearch.ir/BruteForceRotationSearch.clear.0.destructured.ir
diff --git a/test_cases/stress_tests/out_unoptimized/BruteForceRotationSearch.ir/BruteForceRotationSearch.approval.0.approval.destructured.ir b/test_cases/stress_tests/out_unoptimized/BruteForceRotationSearch.ir/BruteForceRotationSearch.approval.0.destructured.ir
similarity index 100%
rename from test_cases/stress_tests/out_unoptimized/BruteForceRotationSearch.ir/BruteForceRotationSearch.approval.0.approval.destructured.ir
rename to test_cases/stress_tests/out_unoptimized/BruteForceRotationSearch.ir/BruteForceRotationSearch.approval.0.destructured.ir
diff --git a/test_cases/stress_tests/out_unoptimized/BruteForceRotationSearch.ir/BruteForceRotationSearch.clear.0.clear.destructured.ir b/test_cases/stress_tests/out_unoptimized/BruteForceRotationSearch.ir/BruteForceRotationSearch.clear.0.destructured.ir
similarity index 100%
rename from test_cases/stress_tests/out_unoptimized/BruteForceRotationSearch.ir/BruteForceRotationSearch.clear.0.clear.destructured.ir
rename to test_cases/stress_tests/out_unoptimized/BruteForceRotationSearch.ir/BruteForceRotationSearch.clear.0.destructured.ir
diff --git a/test_cases/stress_tests/puya.log b/test_cases/stress_tests/puya.log
index db42e9dc75..f3e69e859e 100644
--- a/test_cases/stress_tests/puya.log
+++ b/test_cases/stress_tests/puya.log
@@ -410,7 +410,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to stress_tests/out/BruteForceRotationSearch.ir/BruteForceRotationSearch.approval.0.approval.ssa.ir
+debug: Output IR to stress_tests/out/BruteForceRotationSearch.ir/BruteForceRotationSearch.approval.0.ssa.ir
 info: optimizing approval program of test_cases.stress_tests.brute_force_rotation_search.BruteForceRotationSearch at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.stress_tests.brute_force_rotation_search.do_some_ops for inlining
@@ -522,7 +522,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.stress_tests.brute_force_rotation_search.do_some_ops
-debug: Output IR to stress_tests/out/BruteForceRotationSearch.ir/BruteForceRotationSearch.approval.1.approval.ssa.opt.ir
+debug: Output IR to stress_tests/out/BruteForceRotationSearch.ir/BruteForceRotationSearch.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.stress_tests.brute_force_rotation_search.BruteForceRotationSearch.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -547,8 +547,8 @@ debug: Coalescing local variables in test_cases.stress_tests.brute_force_rotatio
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.stress_tests.brute_force_rotation_search.BruteForceRotationSearch.approval_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to stress_tests/out/BruteForceRotationSearch.ir/BruteForceRotationSearch.approval.2.approval.destructured.ir
-debug: Output IR to stress_tests/out/BruteForceRotationSearch.ir/BruteForceRotationSearch.clear.0.clear.ssa.ir
+debug: Output IR to stress_tests/out/BruteForceRotationSearch.ir/BruteForceRotationSearch.approval.2.destructured.ir
+debug: Output IR to stress_tests/out/BruteForceRotationSearch.ir/BruteForceRotationSearch.clear.0.ssa.ir
 info: optimizing clear program of test_cases.stress_tests.brute_force_rotation_search.BruteForceRotationSearch at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.stress_tests.brute_force_rotation_search.BruteForceRotationSearch.clear_state_program
@@ -574,7 +574,7 @@ debug: Coalescing local variables in test_cases.stress_tests.brute_force_rotatio
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.stress_tests.brute_force_rotation_search.BruteForceRotationSearch.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to stress_tests/out/BruteForceRotationSearch.ir/BruteForceRotationSearch.clear.1.clear.destructured.ir
+debug: Output IR to stress_tests/out/BruteForceRotationSearch.ir/BruteForceRotationSearch.clear.1.destructured.ir
 stress_tests/brute_force_rotation_search.py:5 debug: optimizing TEAL subroutine test_cases.stress_tests.brute_force_rotation_search.BruteForceRotationSearch.approval_program() -> uint64:
 stress_tests/brute_force_rotation_search.py:39 debug: optimizing TEAL subroutine test_cases.stress_tests.brute_force_rotation_search.BruteForceRotationSearch.clear_state_program() -> uint64:
 info: Writing stress_tests/out/BruteForceRotationSearch.approval.teal
diff --git a/test_cases/stress_tests/puya_O2.log b/test_cases/stress_tests/puya_O2.log
index cba573f643..b151a7e5ad 100644
--- a/test_cases/stress_tests/puya_O2.log
+++ b/test_cases/stress_tests/puya_O2.log
@@ -544,7 +544,7 @@ debug: Coalescing local variables in test_cases.stress_tests.brute_force_rotatio
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.stress_tests.brute_force_rotation_search.BruteForceRotationSearch.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to stress_tests/out_O2/BruteForceRotationSearch.ir/BruteForceRotationSearch.approval.0.approval.destructured.ir
+debug: Output IR to stress_tests/out_O2/BruteForceRotationSearch.ir/BruteForceRotationSearch.approval.0.destructured.ir
 info: optimizing clear program of test_cases.stress_tests.brute_force_rotation_search.BruteForceRotationSearch at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.stress_tests.brute_force_rotation_search.BruteForceRotationSearch.clear_state_program
@@ -570,7 +570,7 @@ debug: Coalescing local variables in test_cases.stress_tests.brute_force_rotatio
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.stress_tests.brute_force_rotation_search.BruteForceRotationSearch.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to stress_tests/out_O2/BruteForceRotationSearch.ir/BruteForceRotationSearch.clear.0.clear.destructured.ir
+debug: Output IR to stress_tests/out_O2/BruteForceRotationSearch.ir/BruteForceRotationSearch.clear.0.destructured.ir
 stress_tests/brute_force_rotation_search.py:5 debug: optimizing TEAL subroutine test_cases.stress_tests.brute_force_rotation_search.BruteForceRotationSearch.approval_program() -> uint64:
 stress_tests/brute_force_rotation_search.py:39 debug: optimizing TEAL subroutine test_cases.stress_tests.brute_force_rotation_search.BruteForceRotationSearch.clear_state_program() -> uint64:
 info: Writing stress_tests/out_O2/BruteForceRotationSearch.approval.teal
diff --git a/test_cases/stress_tests/puya_unoptimized.log b/test_cases/stress_tests/puya_unoptimized.log
index 1779239e8f..c3646487f4 100644
--- a/test_cases/stress_tests/puya_unoptimized.log
+++ b/test_cases/stress_tests/puya_unoptimized.log
@@ -440,7 +440,7 @@ debug: Coalescing local variables in test_cases.stress_tests.brute_force_rotatio
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.stress_tests.brute_force_rotation_search.do_some_ops
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to stress_tests/out_unoptimized/BruteForceRotationSearch.ir/BruteForceRotationSearch.approval.0.approval.destructured.ir
+debug: Output IR to stress_tests/out_unoptimized/BruteForceRotationSearch.ir/BruteForceRotationSearch.approval.0.destructured.ir
 info: optimizing clear program of test_cases.stress_tests.brute_force_rotation_search.BruteForceRotationSearch at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.stress_tests.brute_force_rotation_search.BruteForceRotationSearch.clear_state_program
@@ -458,7 +458,7 @@ debug: Coalescing local variables in test_cases.stress_tests.brute_force_rotatio
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.stress_tests.brute_force_rotation_search.BruteForceRotationSearch.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to stress_tests/out_unoptimized/BruteForceRotationSearch.ir/BruteForceRotationSearch.clear.0.clear.destructured.ir
+debug: Output IR to stress_tests/out_unoptimized/BruteForceRotationSearch.ir/BruteForceRotationSearch.clear.0.destructured.ir
 debug: Inserted main.ops[16]: 'l-store-copy tuple_assignment%0#0 0'
 debug: Replaced main.ops[18]: 'v-load tuple_assignment%0#0' with 'l-load tuple_assignment%0#0'
 debug: Inserted main.ops[49]: 'l-store-copy tmp%0#0 0'
diff --git a/test_cases/string_ops/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir b/test_cases/string_ops/out/MyContract.ir/MyContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/string_ops/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir
rename to test_cases/string_ops/out/MyContract.ir/MyContract.approval.0.ssa.ir
diff --git a/test_cases/string_ops/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir b/test_cases/string_ops/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/string_ops/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir
rename to test_cases/string_ops/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
diff --git a/test_cases/string_ops/out/MyContract.ir/MyContract.approval.2.approval.destructured.ir b/test_cases/string_ops/out/MyContract.ir/MyContract.approval.2.destructured.ir
similarity index 100%
rename from test_cases/string_ops/out/MyContract.ir/MyContract.approval.2.approval.destructured.ir
rename to test_cases/string_ops/out/MyContract.ir/MyContract.approval.2.destructured.ir
diff --git a/test_cases/string_ops/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir b/test_cases/string_ops/out/MyContract.ir/MyContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/string_ops/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir
rename to test_cases/string_ops/out/MyContract.ir/MyContract.clear.0.ssa.ir
diff --git a/test_cases/string_ops/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir b/test_cases/string_ops/out/MyContract.ir/MyContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/string_ops/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir
rename to test_cases/string_ops/out/MyContract.ir/MyContract.clear.1.destructured.ir
diff --git a/test_cases/string_ops/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir b/test_cases/string_ops/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/string_ops/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir
rename to test_cases/string_ops/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
diff --git a/test_cases/string_ops/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir b/test_cases/string_ops/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/string_ops/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir
rename to test_cases/string_ops/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
diff --git a/test_cases/string_ops/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir b/test_cases/string_ops/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/string_ops/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir
rename to test_cases/string_ops/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
diff --git a/test_cases/string_ops/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir b/test_cases/string_ops/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/string_ops/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir
rename to test_cases/string_ops/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
diff --git a/test_cases/string_ops/puya.log b/test_cases/string_ops/puya.log
index 24d968f01e..5142e65d7d 100644
--- a/test_cases/string_ops/puya.log
+++ b/test_cases/string_ops/puya.log
@@ -406,7 +406,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to string_ops/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir
+debug: Output IR to string_ops/out/MyContract.ir/MyContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.string_ops.contract.MyContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.string_ops.contract.MyContract.approval_program
@@ -445,7 +445,7 @@ debug: Copy propagation made 1 modifications
 debug: Replacing redundant declaration let tmp%5#0: uint64 = (+ start#1 tmp%0#0) with copy of existing registers (Register(source_location=INTERNAL:11:10-29, ir_type=uint64, name='tmp%1', version=0),)
 debug: Found equivalence set: tmp%1#0, tmp%5#0
 debug: Copy propagation made 1 modifications
-debug: Output IR to string_ops/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to string_ops/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.string_ops.contract.MyContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -493,8 +493,8 @@ debug: Coalescing start#0 with [start#5, start#1, start#2]
 debug: Coalescing resulted in 9 replacement/s
 debug: Sequentializing parallel copies in _puya_lib.bytes_.is_substring
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to string_ops/out/MyContract.ir/MyContract.approval.2.approval.destructured.ir
-debug: Output IR to string_ops/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir
+debug: Output IR to string_ops/out/MyContract.ir/MyContract.approval.2.destructured.ir
+debug: Output IR to string_ops/out/MyContract.ir/MyContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.string_ops.contract.MyContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.string_ops.contract.MyContract.clear_state_program
@@ -520,7 +520,7 @@ debug: Coalescing local variables in test_cases.string_ops.contract.MyContract.c
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.string_ops.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to string_ops/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir
+debug: Output IR to string_ops/out/MyContract.ir/MyContract.clear.1.destructured.ir
 debug: Inserted main.ops[3]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[5]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[10]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/string_ops/puya_O2.log b/test_cases/string_ops/puya_O2.log
index 410731438c..fc6759c62f 100644
--- a/test_cases/string_ops/puya_O2.log
+++ b/test_cases/string_ops/puya_O2.log
@@ -490,7 +490,7 @@ debug: Coalescing start#0 with [start#5, start#1, start#2]
 debug: Coalescing resulted in 9 replacement/s
 debug: Sequentializing parallel copies in _puya_lib.bytes_.is_substring
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to string_ops/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir
+debug: Output IR to string_ops/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.string_ops.contract.MyContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.string_ops.contract.MyContract.clear_state_program
@@ -516,7 +516,7 @@ debug: Coalescing local variables in test_cases.string_ops.contract.MyContract.c
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.string_ops.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to string_ops/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir
+debug: Output IR to string_ops/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
 debug: Inserted main.ops[3]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[5]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[10]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/string_ops/puya_unoptimized.log b/test_cases/string_ops/puya_unoptimized.log
index d1117f9564..044553340e 100644
--- a/test_cases/string_ops/puya_unoptimized.log
+++ b/test_cases/string_ops/puya_unoptimized.log
@@ -437,7 +437,7 @@ debug: Coalescing start#0 with [start#5, start#1, start#2]
 debug: Coalescing resulted in 10 replacement/s
 debug: Sequentializing parallel copies in _puya_lib.bytes_.is_substring
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to string_ops/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir
+debug: Output IR to string_ops/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.string_ops.contract.MyContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.string_ops.contract.MyContract.clear_state_program
@@ -455,7 +455,7 @@ debug: Coalescing local variables in test_cases.string_ops.contract.MyContract.c
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.string_ops.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to string_ops/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir
+debug: Output IR to string_ops/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
 debug: Inserted main.ops[3]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[5]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[10]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/struct_by_name/out/DemoContract.ir/DemoContract.approval.0.approval.ssa.ir b/test_cases/struct_by_name/out/DemoContract.ir/DemoContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/struct_by_name/out/DemoContract.ir/DemoContract.approval.0.approval.ssa.ir
rename to test_cases/struct_by_name/out/DemoContract.ir/DemoContract.approval.0.ssa.ir
diff --git a/test_cases/struct_by_name/out/DemoContract.ir/DemoContract.approval.1.approval.ssa.opt.ir b/test_cases/struct_by_name/out/DemoContract.ir/DemoContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/struct_by_name/out/DemoContract.ir/DemoContract.approval.1.approval.ssa.opt.ir
rename to test_cases/struct_by_name/out/DemoContract.ir/DemoContract.approval.1.ssa.opt.ir
diff --git a/test_cases/struct_by_name/out/DemoContract.ir/DemoContract.approval.2.approval.ssa.opt.ir b/test_cases/struct_by_name/out/DemoContract.ir/DemoContract.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/struct_by_name/out/DemoContract.ir/DemoContract.approval.2.approval.ssa.opt.ir
rename to test_cases/struct_by_name/out/DemoContract.ir/DemoContract.approval.2.ssa.opt.ir
diff --git a/test_cases/struct_by_name/out/DemoContract.ir/DemoContract.approval.3.approval.ssa.opt.ir b/test_cases/struct_by_name/out/DemoContract.ir/DemoContract.approval.3.ssa.opt.ir
similarity index 100%
rename from test_cases/struct_by_name/out/DemoContract.ir/DemoContract.approval.3.approval.ssa.opt.ir
rename to test_cases/struct_by_name/out/DemoContract.ir/DemoContract.approval.3.ssa.opt.ir
diff --git a/test_cases/struct_by_name/out/DemoContract.ir/DemoContract.approval.4.approval.destructured.ir b/test_cases/struct_by_name/out/DemoContract.ir/DemoContract.approval.4.destructured.ir
similarity index 100%
rename from test_cases/struct_by_name/out/DemoContract.ir/DemoContract.approval.4.approval.destructured.ir
rename to test_cases/struct_by_name/out/DemoContract.ir/DemoContract.approval.4.destructured.ir
diff --git a/test_cases/struct_by_name/out/DemoContract.ir/DemoContract.clear.0.clear.ssa.ir b/test_cases/struct_by_name/out/DemoContract.ir/DemoContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/struct_by_name/out/DemoContract.ir/DemoContract.clear.0.clear.ssa.ir
rename to test_cases/struct_by_name/out/DemoContract.ir/DemoContract.clear.0.ssa.ir
diff --git a/test_cases/struct_by_name/out/DemoContract.ir/DemoContract.clear.1.clear.destructured.ir b/test_cases/struct_by_name/out/DemoContract.ir/DemoContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/struct_by_name/out/DemoContract.ir/DemoContract.clear.1.clear.destructured.ir
rename to test_cases/struct_by_name/out/DemoContract.ir/DemoContract.clear.1.destructured.ir
diff --git a/test_cases/struct_by_name/out_O2/DemoContract.ir/DemoContract.approval.0.approval.destructured.ir b/test_cases/struct_by_name/out_O2/DemoContract.ir/DemoContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/struct_by_name/out_O2/DemoContract.ir/DemoContract.approval.0.approval.destructured.ir
rename to test_cases/struct_by_name/out_O2/DemoContract.ir/DemoContract.approval.0.destructured.ir
diff --git a/test_cases/struct_by_name/out_O2/DemoContract.ir/DemoContract.clear.0.clear.destructured.ir b/test_cases/struct_by_name/out_O2/DemoContract.ir/DemoContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/struct_by_name/out_O2/DemoContract.ir/DemoContract.clear.0.clear.destructured.ir
rename to test_cases/struct_by_name/out_O2/DemoContract.ir/DemoContract.clear.0.destructured.ir
diff --git a/test_cases/struct_by_name/out_unoptimized/DemoContract.ir/DemoContract.approval.0.approval.destructured.ir b/test_cases/struct_by_name/out_unoptimized/DemoContract.ir/DemoContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/struct_by_name/out_unoptimized/DemoContract.ir/DemoContract.approval.0.approval.destructured.ir
rename to test_cases/struct_by_name/out_unoptimized/DemoContract.ir/DemoContract.approval.0.destructured.ir
diff --git a/test_cases/struct_by_name/out_unoptimized/DemoContract.ir/DemoContract.clear.0.clear.destructured.ir b/test_cases/struct_by_name/out_unoptimized/DemoContract.ir/DemoContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/struct_by_name/out_unoptimized/DemoContract.ir/DemoContract.clear.0.clear.destructured.ir
rename to test_cases/struct_by_name/out_unoptimized/DemoContract.ir/DemoContract.clear.0.destructured.ir
diff --git a/test_cases/struct_by_name/puya.log b/test_cases/struct_by_name/puya.log
index d1fc241822..a75dfc9f1f 100644
--- a/test_cases/struct_by_name/puya.log
+++ b/test_cases/struct_by_name/puya.log
@@ -451,7 +451,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to struct_by_name/out/DemoContract.ir/DemoContract.approval.0.approval.ssa.ir
+debug: Output IR to struct_by_name/out/DemoContract.ir/DemoContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.struct_by_name.contract.DemoContract at level 1
 debug: Begin optimization pass 1/100
 debug: marking trivial method test_cases.struct_by_name.contract.DemoContract.get_one as inlineable
@@ -726,7 +726,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.struct_by_name.contract.DemoContract.__puya_arc4_router__
-debug: Output IR to struct_by_name/out/DemoContract.ir/DemoContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to struct_by_name/out/DemoContract.ir/DemoContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking trivial method test_cases.struct_by_name.contract.DemoContract.get_one as inlineable
 debug: marking trivial method test_cases.struct_by_name.contract.DemoContract.get_two as inlineable
@@ -865,7 +865,7 @@ debug: removing unused subroutine test_cases.struct_by_name.contract.DemoContrac
 debug: removing unused subroutine test_cases.struct_by_name.contract.DemoContract.get_two
 debug: removing unused subroutine test_cases.struct_by_name.contract.DemoContract.get_three
 debug: removing unused subroutine test_cases.struct_by_name.contract.DemoContract.__algopy_default_create
-debug: Output IR to struct_by_name/out/DemoContract.ir/DemoContract.approval.2.approval.ssa.opt.ir
+debug: Output IR to struct_by_name/out/DemoContract.ir/DemoContract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: marking trivial method test_cases.struct_by_name.contract.DemoContract.compare as inlineable
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
@@ -909,7 +909,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.struct_by_name.contract.DemoContract.compare
-debug: Output IR to struct_by_name/out/DemoContract.ir/DemoContract.approval.3.approval.ssa.opt.ir
+debug: Output IR to struct_by_name/out/DemoContract.ir/DemoContract.approval.3.ssa.opt.ir
 debug: Begin optimization pass 4/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -936,8 +936,8 @@ debug: Coalescing tmp%0#0 with [tmp%0#2]
 debug: Coalescing resulted in 17 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.approval_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to struct_by_name/out/DemoContract.ir/DemoContract.approval.4.approval.destructured.ir
-debug: Output IR to struct_by_name/out/DemoContract.ir/DemoContract.clear.0.clear.ssa.ir
+debug: Output IR to struct_by_name/out/DemoContract.ir/DemoContract.approval.4.destructured.ir
+debug: Output IR to struct_by_name/out/DemoContract.ir/DemoContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.struct_by_name.contract.DemoContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -963,7 +963,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to struct_by_name/out/DemoContract.ir/DemoContract.clear.1.clear.destructured.ir
+debug: Output IR to struct_by_name/out/DemoContract.ir/DemoContract.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/struct_by_name/puya_O2.log b/test_cases/struct_by_name/puya_O2.log
index 350ed20027..bc0677424a 100644
--- a/test_cases/struct_by_name/puya_O2.log
+++ b/test_cases/struct_by_name/puya_O2.log
@@ -919,7 +919,7 @@ debug: Coalescing tmp%0#0 with [tmp%0#2]
 debug: Coalescing resulted in 17 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to struct_by_name/out_O2/DemoContract.ir/DemoContract.approval.0.approval.destructured.ir
+debug: Output IR to struct_by_name/out_O2/DemoContract.ir/DemoContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.struct_by_name.contract.DemoContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -945,7 +945,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to struct_by_name/out_O2/DemoContract.ir/DemoContract.clear.0.clear.destructured.ir
+debug: Output IR to struct_by_name/out_O2/DemoContract.ir/DemoContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/struct_by_name/puya_unoptimized.log b/test_cases/struct_by_name/puya_unoptimized.log
index 9cc286e31b..00be05a9ae 100644
--- a/test_cases/struct_by_name/puya_unoptimized.log
+++ b/test_cases/struct_by_name/puya_unoptimized.log
@@ -636,7 +636,7 @@ debug: Coalescing and_result%0#0 with [and_result%0#5, and_result%0#1, and_resul
 debug: Coalescing resulted in 7 replacement/s
 debug: Sequentializing parallel copies in test_cases.struct_by_name.contract.DemoContract.compare
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to struct_by_name/out_unoptimized/DemoContract.ir/DemoContract.approval.0.approval.destructured.ir
+debug: Output IR to struct_by_name/out_unoptimized/DemoContract.ir/DemoContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.struct_by_name.contract.DemoContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -654,7 +654,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to struct_by_name/out_unoptimized/DemoContract.ir/DemoContract.clear.0.clear.destructured.ir
+debug: Output IR to struct_by_name/out_unoptimized/DemoContract.ir/DemoContract.clear.0.destructured.ir
 debug: Inserted main_block@1.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main_block@1.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_block@1.ops[6]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/stubs/out/BigUIntContract.ir/BigUIntContract.approval.0.approval.ssa.ir b/test_cases/stubs/out/BigUIntContract.ir/BigUIntContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/stubs/out/BigUIntContract.ir/BigUIntContract.approval.0.approval.ssa.ir
rename to test_cases/stubs/out/BigUIntContract.ir/BigUIntContract.approval.0.ssa.ir
diff --git a/test_cases/stubs/out/BigUIntContract.ir/BigUIntContract.approval.1.approval.ssa.opt.ir b/test_cases/stubs/out/BigUIntContract.ir/BigUIntContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/stubs/out/BigUIntContract.ir/BigUIntContract.approval.1.approval.ssa.opt.ir
rename to test_cases/stubs/out/BigUIntContract.ir/BigUIntContract.approval.1.ssa.opt.ir
diff --git a/test_cases/stubs/out/BigUIntContract.ir/BigUIntContract.approval.2.approval.destructured.ir b/test_cases/stubs/out/BigUIntContract.ir/BigUIntContract.approval.2.destructured.ir
similarity index 100%
rename from test_cases/stubs/out/BigUIntContract.ir/BigUIntContract.approval.2.approval.destructured.ir
rename to test_cases/stubs/out/BigUIntContract.ir/BigUIntContract.approval.2.destructured.ir
diff --git a/test_cases/stubs/out/BigUIntContract.ir/BigUIntContract.clear.0.clear.ssa.ir b/test_cases/stubs/out/BigUIntContract.ir/BigUIntContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/stubs/out/BigUIntContract.ir/BigUIntContract.clear.0.clear.ssa.ir
rename to test_cases/stubs/out/BigUIntContract.ir/BigUIntContract.clear.0.ssa.ir
diff --git a/test_cases/stubs/out/BigUIntContract.ir/BigUIntContract.clear.1.clear.ssa.opt.ir b/test_cases/stubs/out/BigUIntContract.ir/BigUIntContract.clear.1.ssa.opt.ir
similarity index 100%
rename from test_cases/stubs/out/BigUIntContract.ir/BigUIntContract.clear.1.clear.ssa.opt.ir
rename to test_cases/stubs/out/BigUIntContract.ir/BigUIntContract.clear.1.ssa.opt.ir
diff --git a/test_cases/stubs/out/BigUIntContract.ir/BigUIntContract.clear.2.clear.destructured.ir b/test_cases/stubs/out/BigUIntContract.ir/BigUIntContract.clear.2.destructured.ir
similarity index 100%
rename from test_cases/stubs/out/BigUIntContract.ir/BigUIntContract.clear.2.clear.destructured.ir
rename to test_cases/stubs/out/BigUIntContract.ir/BigUIntContract.clear.2.destructured.ir
diff --git a/test_cases/stubs/out/BytesContract.ir/BytesContract.approval.0.approval.ssa.ir b/test_cases/stubs/out/BytesContract.ir/BytesContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/stubs/out/BytesContract.ir/BytesContract.approval.0.approval.ssa.ir
rename to test_cases/stubs/out/BytesContract.ir/BytesContract.approval.0.ssa.ir
diff --git a/test_cases/stubs/out/BytesContract.ir/BytesContract.approval.1.approval.ssa.opt.ir b/test_cases/stubs/out/BytesContract.ir/BytesContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/stubs/out/BytesContract.ir/BytesContract.approval.1.approval.ssa.opt.ir
rename to test_cases/stubs/out/BytesContract.ir/BytesContract.approval.1.ssa.opt.ir
diff --git a/test_cases/stubs/out/BytesContract.ir/BytesContract.approval.2.approval.ssa.opt.ir b/test_cases/stubs/out/BytesContract.ir/BytesContract.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/stubs/out/BytesContract.ir/BytesContract.approval.2.approval.ssa.opt.ir
rename to test_cases/stubs/out/BytesContract.ir/BytesContract.approval.2.ssa.opt.ir
diff --git a/test_cases/stubs/out/BytesContract.ir/BytesContract.approval.3.approval.destructured.ir b/test_cases/stubs/out/BytesContract.ir/BytesContract.approval.3.destructured.ir
similarity index 100%
rename from test_cases/stubs/out/BytesContract.ir/BytesContract.approval.3.approval.destructured.ir
rename to test_cases/stubs/out/BytesContract.ir/BytesContract.approval.3.destructured.ir
diff --git a/test_cases/stubs/out/BytesContract.ir/BytesContract.clear.0.clear.ssa.ir b/test_cases/stubs/out/BytesContract.ir/BytesContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/stubs/out/BytesContract.ir/BytesContract.clear.0.clear.ssa.ir
rename to test_cases/stubs/out/BytesContract.ir/BytesContract.clear.0.ssa.ir
diff --git a/test_cases/stubs/out/BytesContract.ir/BytesContract.clear.1.clear.destructured.ir b/test_cases/stubs/out/BytesContract.ir/BytesContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/stubs/out/BytesContract.ir/BytesContract.clear.1.clear.destructured.ir
rename to test_cases/stubs/out/BytesContract.ir/BytesContract.clear.1.destructured.ir
diff --git a/test_cases/stubs/out/StringContract.ir/StringContract.approval.0.approval.ssa.ir b/test_cases/stubs/out/StringContract.ir/StringContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/stubs/out/StringContract.ir/StringContract.approval.0.approval.ssa.ir
rename to test_cases/stubs/out/StringContract.ir/StringContract.approval.0.ssa.ir
diff --git a/test_cases/stubs/out/StringContract.ir/StringContract.approval.1.approval.ssa.opt.ir b/test_cases/stubs/out/StringContract.ir/StringContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/stubs/out/StringContract.ir/StringContract.approval.1.approval.ssa.opt.ir
rename to test_cases/stubs/out/StringContract.ir/StringContract.approval.1.ssa.opt.ir
diff --git a/test_cases/stubs/out/StringContract.ir/StringContract.approval.2.approval.ssa.opt.ir b/test_cases/stubs/out/StringContract.ir/StringContract.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/stubs/out/StringContract.ir/StringContract.approval.2.approval.ssa.opt.ir
rename to test_cases/stubs/out/StringContract.ir/StringContract.approval.2.ssa.opt.ir
diff --git a/test_cases/stubs/out/StringContract.ir/StringContract.approval.3.approval.destructured.ir b/test_cases/stubs/out/StringContract.ir/StringContract.approval.3.destructured.ir
similarity index 100%
rename from test_cases/stubs/out/StringContract.ir/StringContract.approval.3.approval.destructured.ir
rename to test_cases/stubs/out/StringContract.ir/StringContract.approval.3.destructured.ir
diff --git a/test_cases/stubs/out/StringContract.ir/StringContract.clear.0.clear.ssa.ir b/test_cases/stubs/out/StringContract.ir/StringContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/stubs/out/StringContract.ir/StringContract.clear.0.clear.ssa.ir
rename to test_cases/stubs/out/StringContract.ir/StringContract.clear.0.ssa.ir
diff --git a/test_cases/stubs/out/StringContract.ir/StringContract.clear.1.clear.destructured.ir b/test_cases/stubs/out/StringContract.ir/StringContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/stubs/out/StringContract.ir/StringContract.clear.1.clear.destructured.ir
rename to test_cases/stubs/out/StringContract.ir/StringContract.clear.1.destructured.ir
diff --git a/test_cases/stubs/out/Uint64Contract.ir/Uint64Contract.approval.0.approval.ssa.ir b/test_cases/stubs/out/Uint64Contract.ir/Uint64Contract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/stubs/out/Uint64Contract.ir/Uint64Contract.approval.0.approval.ssa.ir
rename to test_cases/stubs/out/Uint64Contract.ir/Uint64Contract.approval.0.ssa.ir
diff --git a/test_cases/stubs/out/Uint64Contract.ir/Uint64Contract.approval.1.approval.ssa.opt.ir b/test_cases/stubs/out/Uint64Contract.ir/Uint64Contract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/stubs/out/Uint64Contract.ir/Uint64Contract.approval.1.approval.ssa.opt.ir
rename to test_cases/stubs/out/Uint64Contract.ir/Uint64Contract.approval.1.ssa.opt.ir
diff --git a/test_cases/stubs/out/Uint64Contract.ir/Uint64Contract.approval.2.approval.destructured.ir b/test_cases/stubs/out/Uint64Contract.ir/Uint64Contract.approval.2.destructured.ir
similarity index 100%
rename from test_cases/stubs/out/Uint64Contract.ir/Uint64Contract.approval.2.approval.destructured.ir
rename to test_cases/stubs/out/Uint64Contract.ir/Uint64Contract.approval.2.destructured.ir
diff --git a/test_cases/stubs/out/Uint64Contract.ir/Uint64Contract.clear.0.clear.ssa.ir b/test_cases/stubs/out/Uint64Contract.ir/Uint64Contract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/stubs/out/Uint64Contract.ir/Uint64Contract.clear.0.clear.ssa.ir
rename to test_cases/stubs/out/Uint64Contract.ir/Uint64Contract.clear.0.ssa.ir
diff --git a/test_cases/stubs/out/Uint64Contract.ir/Uint64Contract.clear.1.clear.ssa.opt.ir b/test_cases/stubs/out/Uint64Contract.ir/Uint64Contract.clear.1.ssa.opt.ir
similarity index 100%
rename from test_cases/stubs/out/Uint64Contract.ir/Uint64Contract.clear.1.clear.ssa.opt.ir
rename to test_cases/stubs/out/Uint64Contract.ir/Uint64Contract.clear.1.ssa.opt.ir
diff --git a/test_cases/stubs/out/Uint64Contract.ir/Uint64Contract.clear.2.clear.destructured.ir b/test_cases/stubs/out/Uint64Contract.ir/Uint64Contract.clear.2.destructured.ir
similarity index 100%
rename from test_cases/stubs/out/Uint64Contract.ir/Uint64Contract.clear.2.clear.destructured.ir
rename to test_cases/stubs/out/Uint64Contract.ir/Uint64Contract.clear.2.destructured.ir
diff --git a/test_cases/stubs/out_O2/BigUIntContract.ir/BigUIntContract.approval.0.approval.destructured.ir b/test_cases/stubs/out_O2/BigUIntContract.ir/BigUIntContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/stubs/out_O2/BigUIntContract.ir/BigUIntContract.approval.0.approval.destructured.ir
rename to test_cases/stubs/out_O2/BigUIntContract.ir/BigUIntContract.approval.0.destructured.ir
diff --git a/test_cases/stubs/out_O2/BigUIntContract.ir/BigUIntContract.clear.0.clear.destructured.ir b/test_cases/stubs/out_O2/BigUIntContract.ir/BigUIntContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/stubs/out_O2/BigUIntContract.ir/BigUIntContract.clear.0.clear.destructured.ir
rename to test_cases/stubs/out_O2/BigUIntContract.ir/BigUIntContract.clear.0.destructured.ir
diff --git a/test_cases/stubs/out_O2/BytesContract.ir/BytesContract.approval.0.approval.destructured.ir b/test_cases/stubs/out_O2/BytesContract.ir/BytesContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/stubs/out_O2/BytesContract.ir/BytesContract.approval.0.approval.destructured.ir
rename to test_cases/stubs/out_O2/BytesContract.ir/BytesContract.approval.0.destructured.ir
diff --git a/test_cases/stubs/out_O2/BytesContract.ir/BytesContract.clear.0.clear.destructured.ir b/test_cases/stubs/out_O2/BytesContract.ir/BytesContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/stubs/out_O2/BytesContract.ir/BytesContract.clear.0.clear.destructured.ir
rename to test_cases/stubs/out_O2/BytesContract.ir/BytesContract.clear.0.destructured.ir
diff --git a/test_cases/stubs/out_O2/StringContract.ir/StringContract.approval.0.approval.destructured.ir b/test_cases/stubs/out_O2/StringContract.ir/StringContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/stubs/out_O2/StringContract.ir/StringContract.approval.0.approval.destructured.ir
rename to test_cases/stubs/out_O2/StringContract.ir/StringContract.approval.0.destructured.ir
diff --git a/test_cases/stubs/out_O2/StringContract.ir/StringContract.clear.0.clear.destructured.ir b/test_cases/stubs/out_O2/StringContract.ir/StringContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/stubs/out_O2/StringContract.ir/StringContract.clear.0.clear.destructured.ir
rename to test_cases/stubs/out_O2/StringContract.ir/StringContract.clear.0.destructured.ir
diff --git a/test_cases/stubs/out_O2/Uint64Contract.ir/Uint64Contract.approval.0.approval.destructured.ir b/test_cases/stubs/out_O2/Uint64Contract.ir/Uint64Contract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/stubs/out_O2/Uint64Contract.ir/Uint64Contract.approval.0.approval.destructured.ir
rename to test_cases/stubs/out_O2/Uint64Contract.ir/Uint64Contract.approval.0.destructured.ir
diff --git a/test_cases/stubs/out_O2/Uint64Contract.ir/Uint64Contract.clear.0.clear.destructured.ir b/test_cases/stubs/out_O2/Uint64Contract.ir/Uint64Contract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/stubs/out_O2/Uint64Contract.ir/Uint64Contract.clear.0.clear.destructured.ir
rename to test_cases/stubs/out_O2/Uint64Contract.ir/Uint64Contract.clear.0.destructured.ir
diff --git a/test_cases/stubs/out_unoptimized/BigUIntContract.ir/BigUIntContract.approval.0.approval.destructured.ir b/test_cases/stubs/out_unoptimized/BigUIntContract.ir/BigUIntContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/stubs/out_unoptimized/BigUIntContract.ir/BigUIntContract.approval.0.approval.destructured.ir
rename to test_cases/stubs/out_unoptimized/BigUIntContract.ir/BigUIntContract.approval.0.destructured.ir
diff --git a/test_cases/stubs/out_unoptimized/BigUIntContract.ir/BigUIntContract.clear.0.clear.destructured.ir b/test_cases/stubs/out_unoptimized/BigUIntContract.ir/BigUIntContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/stubs/out_unoptimized/BigUIntContract.ir/BigUIntContract.clear.0.clear.destructured.ir
rename to test_cases/stubs/out_unoptimized/BigUIntContract.ir/BigUIntContract.clear.0.destructured.ir
diff --git a/test_cases/stubs/out_unoptimized/BytesContract.ir/BytesContract.approval.0.approval.destructured.ir b/test_cases/stubs/out_unoptimized/BytesContract.ir/BytesContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/stubs/out_unoptimized/BytesContract.ir/BytesContract.approval.0.approval.destructured.ir
rename to test_cases/stubs/out_unoptimized/BytesContract.ir/BytesContract.approval.0.destructured.ir
diff --git a/test_cases/stubs/out_unoptimized/BytesContract.ir/BytesContract.clear.0.clear.destructured.ir b/test_cases/stubs/out_unoptimized/BytesContract.ir/BytesContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/stubs/out_unoptimized/BytesContract.ir/BytesContract.clear.0.clear.destructured.ir
rename to test_cases/stubs/out_unoptimized/BytesContract.ir/BytesContract.clear.0.destructured.ir
diff --git a/test_cases/stubs/out_unoptimized/StringContract.ir/StringContract.approval.0.approval.destructured.ir b/test_cases/stubs/out_unoptimized/StringContract.ir/StringContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/stubs/out_unoptimized/StringContract.ir/StringContract.approval.0.approval.destructured.ir
rename to test_cases/stubs/out_unoptimized/StringContract.ir/StringContract.approval.0.destructured.ir
diff --git a/test_cases/stubs/out_unoptimized/StringContract.ir/StringContract.clear.0.clear.destructured.ir b/test_cases/stubs/out_unoptimized/StringContract.ir/StringContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/stubs/out_unoptimized/StringContract.ir/StringContract.clear.0.clear.destructured.ir
rename to test_cases/stubs/out_unoptimized/StringContract.ir/StringContract.clear.0.destructured.ir
diff --git a/test_cases/stubs/out_unoptimized/Uint64Contract.ir/Uint64Contract.approval.0.approval.destructured.ir b/test_cases/stubs/out_unoptimized/Uint64Contract.ir/Uint64Contract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/stubs/out_unoptimized/Uint64Contract.ir/Uint64Contract.approval.0.approval.destructured.ir
rename to test_cases/stubs/out_unoptimized/Uint64Contract.ir/Uint64Contract.approval.0.destructured.ir
diff --git a/test_cases/stubs/out_unoptimized/Uint64Contract.ir/Uint64Contract.clear.0.clear.destructured.ir b/test_cases/stubs/out_unoptimized/Uint64Contract.ir/Uint64Contract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/stubs/out_unoptimized/Uint64Contract.ir/Uint64Contract.clear.0.clear.destructured.ir
rename to test_cases/stubs/out_unoptimized/Uint64Contract.ir/Uint64Contract.clear.0.destructured.ir
diff --git a/test_cases/stubs/puya.log b/test_cases/stubs/puya.log
index 31f2e19e9e..8416be432b 100644
--- a/test_cases/stubs/puya.log
+++ b/test_cases/stubs/puya.log
@@ -791,7 +791,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to stubs/out/Uint64Contract.ir/Uint64Contract.approval.0.approval.ssa.ir
+debug: Output IR to stubs/out/Uint64Contract.ir/Uint64Contract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.stubs.uint64.Uint64Contract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.stubs.uint64.Uint64Contract.approval_program
@@ -969,7 +969,7 @@ debug: Optimizer: Remove Linear Jump
 debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to stubs/out/Uint64Contract.ir/Uint64Contract.approval.1.approval.ssa.opt.ir
+debug: Output IR to stubs/out/Uint64Contract.ir/Uint64Contract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.stubs.uint64.Uint64Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -994,8 +994,8 @@ debug: Coalescing local variables in test_cases.stubs.uint64.Uint64Contract.appr
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.stubs.uint64.Uint64Contract.approval_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to stubs/out/Uint64Contract.ir/Uint64Contract.approval.2.approval.destructured.ir
-debug: Output IR to stubs/out/Uint64Contract.ir/Uint64Contract.clear.0.clear.ssa.ir
+debug: Output IR to stubs/out/Uint64Contract.ir/Uint64Contract.approval.2.destructured.ir
+debug: Output IR to stubs/out/Uint64Contract.ir/Uint64Contract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.stubs.uint64.Uint64Contract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.stubs.uint64.Uint64Contract.clear_state_program
@@ -1018,7 +1018,7 @@ debug: Optimizer: Remove Linear Jump
 debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to stubs/out/Uint64Contract.ir/Uint64Contract.clear.1.clear.ssa.opt.ir
+debug: Output IR to stubs/out/Uint64Contract.ir/Uint64Contract.clear.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.stubs.uint64.Uint64Contract.clear_state_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -1043,7 +1043,7 @@ debug: Coalescing local variables in test_cases.stubs.uint64.Uint64Contract.clea
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.stubs.uint64.Uint64Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to stubs/out/Uint64Contract.ir/Uint64Contract.clear.2.clear.destructured.ir
+debug: Output IR to stubs/out/Uint64Contract.ir/Uint64Contract.clear.2.destructured.ir
 debug: Inserted main.ops[6]: 'l-store-copy tmp%67#0 0'
 debug: Replaced main.ops[8]: 'v-load tmp%67#0' with 'l-load tmp%67#0'
 debug: Inserted main.ops[11]: 'l-store-copy tmp%68#0 0'
@@ -1052,7 +1052,7 @@ debug: Inserted main.ops[1]: 'l-store-copy tmp%65#0 0'
 debug: Replaced main.ops[5]: 'v-load tmp%65#0' with 'l-load tmp%65#0'
 stubs/uint64.py:5 debug: optimizing TEAL subroutine test_cases.stubs.uint64.Uint64Contract.approval_program() -> uint64:
 stubs/uint64.py:84 debug: optimizing TEAL subroutine test_cases.stubs.uint64.Uint64Contract.clear_state_program() -> uint64:
-debug: Output IR to stubs/out/StringContract.ir/StringContract.approval.0.approval.ssa.ir
+debug: Output IR to stubs/out/StringContract.ir/StringContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.stubs.string.StringContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.stubs.string.StringContract.approval_program
@@ -1397,7 +1397,7 @@ debug: Copy propagation made 1 modifications
 debug: Replacing redundant declaration let tmp%5#0: uint64 = (+ start#1 tmp%0#0) with copy of existing registers (Register(source_location=INTERNAL:11:10-29, ir_type=uint64, name='tmp%1', version=0),)
 debug: Found equivalence set: tmp%1#0, tmp%5#0
 debug: Copy propagation made 1 modifications
-debug: Output IR to stubs/out/StringContract.ir/StringContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to stubs/out/StringContract.ir/StringContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.stubs.string.StringContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -1474,7 +1474,7 @@ debug: Optimizer: Remove Linear Jump
 debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to stubs/out/StringContract.ir/StringContract.approval.2.approval.ssa.opt.ir
+debug: Output IR to stubs/out/StringContract.ir/StringContract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.stubs.string.StringContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -1523,8 +1523,8 @@ debug: Coalescing start#0 with [start#5, start#1, start#2]
 debug: Coalescing resulted in 9 replacement/s
 debug: Sequentializing parallel copies in _puya_lib.bytes_.is_substring
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to stubs/out/StringContract.ir/StringContract.approval.3.approval.destructured.ir
-debug: Output IR to stubs/out/StringContract.ir/StringContract.clear.0.clear.ssa.ir
+debug: Output IR to stubs/out/StringContract.ir/StringContract.approval.3.destructured.ir
+debug: Output IR to stubs/out/StringContract.ir/StringContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.stubs.string.StringContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.stubs.string.StringContract.clear_state_program
@@ -1550,7 +1550,7 @@ debug: Coalescing local variables in test_cases.stubs.string.StringContract.clea
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.stubs.string.StringContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to stubs/out/StringContract.ir/StringContract.clear.1.clear.destructured.ir
+debug: Output IR to stubs/out/StringContract.ir/StringContract.clear.1.destructured.ir
 debug: Inserted main.ops[3]: 'l-store-copy tmp%12#0 0'
 debug: Replaced main.ops[5]: 'v-load tmp%12#0' with 'l-load tmp%12#0'
 debug: Inserted main.ops[10]: 'l-store-copy tmp%13#0 0'
@@ -1588,7 +1588,7 @@ debug: inlining single reference block is_substring_while_body@2 into is_substri
 debug: inlining single reference block is_substring_if_body@3 into is_substring_while_top@1
 debug: removing explicit jump to fall-through block is_substring_while_top@1
 stubs/string.py:54 debug: optimizing TEAL subroutine test_cases.stubs.string.StringContract.clear_state_program() -> uint64:
-debug: Output IR to stubs/out/BytesContract.ir/BytesContract.approval.0.approval.ssa.ir
+debug: Output IR to stubs/out/BytesContract.ir/BytesContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.stubs.bytes.BytesContract at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.stubs.bytes.check_slicing_with_uint64 for inlining
@@ -2115,7 +2115,7 @@ debug: Copy propagation made 1 modifications
 debug: Removing redundant assert of tmp%1#0
 debug: removing unused subroutine test_cases.stubs.bytes.check_slicing_with_uint64
 debug: removing unused subroutine test_cases.stubs.bytes.check_end_before_start_slicing
-debug: Output IR to stubs/out/BytesContract.ir/BytesContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to stubs/out/BytesContract.ir/BytesContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking single-use function test_cases.stubs.bytes.one_to_seven for inlining
 debug: Optimizing subroutine test_cases.stubs.bytes.BytesContract.approval_program
@@ -2170,7 +2170,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.stubs.bytes.one_to_seven
-debug: Output IR to stubs/out/BytesContract.ir/BytesContract.approval.2.approval.ssa.opt.ir
+debug: Output IR to stubs/out/BytesContract.ir/BytesContract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.stubs.bytes.BytesContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -2195,8 +2195,8 @@ debug: Coalescing local variables in test_cases.stubs.bytes.BytesContract.approv
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.stubs.bytes.BytesContract.approval_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to stubs/out/BytesContract.ir/BytesContract.approval.3.approval.destructured.ir
-debug: Output IR to stubs/out/BytesContract.ir/BytesContract.clear.0.clear.ssa.ir
+debug: Output IR to stubs/out/BytesContract.ir/BytesContract.approval.3.destructured.ir
+debug: Output IR to stubs/out/BytesContract.ir/BytesContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.stubs.bytes.BytesContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.stubs.bytes.BytesContract.clear_state_program
@@ -2222,7 +2222,7 @@ debug: Coalescing local variables in test_cases.stubs.bytes.BytesContract.clear_
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.stubs.bytes.BytesContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to stubs/out/BytesContract.ir/BytesContract.clear.1.clear.destructured.ir
+debug: Output IR to stubs/out/BytesContract.ir/BytesContract.clear.1.destructured.ir
 debug: Inserted main.ops[8]: 'l-store-copy tmp%74#0 0'
 debug: Replaced main.ops[10]: 'v-load tmp%74#0' with 'l-load tmp%74#0'
 debug: Inserted main.ops[13]: 'l-store-copy tmp%75#0 0'
@@ -2231,7 +2231,7 @@ debug: Inserted main.ops[3]: 'l-store-copy tmp%72#0 0'
 debug: Replaced main.ops[7]: 'v-load tmp%72#0' with 'l-load tmp%72#0'
 stubs/bytes.py:5 debug: optimizing TEAL subroutine test_cases.stubs.bytes.BytesContract.approval_program() -> uint64:
 stubs/bytes.py:77 debug: optimizing TEAL subroutine test_cases.stubs.bytes.BytesContract.clear_state_program() -> uint64:
-debug: Output IR to stubs/out/BigUIntContract.ir/BigUIntContract.approval.0.approval.ssa.ir
+debug: Output IR to stubs/out/BigUIntContract.ir/BigUIntContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.stubs.biguint.BigUIntContract at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.stubs.biguint.compare_biguints for inlining
@@ -2409,7 +2409,7 @@ debug: Removing redundant assert of tmp%3#0
 debug: removing unused subroutine test_cases.stubs.biguint.compare_biguints
 debug: removing unused subroutine test_cases.stubs.biguint.compare_biguint_vs_uint64
 debug: removing unused subroutine test_cases.stubs.biguint.compare_uint64_vs_biguint
-debug: Output IR to stubs/out/BigUIntContract.ir/BigUIntContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to stubs/out/BigUIntContract.ir/BigUIntContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.stubs.biguint.BigUIntContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -2434,8 +2434,8 @@ debug: Coalescing local variables in test_cases.stubs.biguint.BigUIntContract.ap
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.stubs.biguint.BigUIntContract.approval_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to stubs/out/BigUIntContract.ir/BigUIntContract.approval.2.approval.destructured.ir
-debug: Output IR to stubs/out/BigUIntContract.ir/BigUIntContract.clear.0.clear.ssa.ir
+debug: Output IR to stubs/out/BigUIntContract.ir/BigUIntContract.approval.2.destructured.ir
+debug: Output IR to stubs/out/BigUIntContract.ir/BigUIntContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.stubs.biguint.BigUIntContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.stubs.biguint.BigUIntContract.clear_state_program
@@ -2455,7 +2455,7 @@ debug: Optimizer: Remove Linear Jump
 debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to stubs/out/BigUIntContract.ir/BigUIntContract.clear.1.clear.ssa.opt.ir
+debug: Output IR to stubs/out/BigUIntContract.ir/BigUIntContract.clear.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.stubs.biguint.BigUIntContract.clear_state_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -2480,7 +2480,7 @@ debug: Coalescing local variables in test_cases.stubs.biguint.BigUIntContract.cl
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.stubs.biguint.BigUIntContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to stubs/out/BigUIntContract.ir/BigUIntContract.clear.2.clear.destructured.ir
+debug: Output IR to stubs/out/BigUIntContract.ir/BigUIntContract.clear.2.destructured.ir
 debug: Inserted main.ops[6]: 'l-store-copy tmp%2#0 0'
 debug: Replaced main.ops[8]: 'v-load tmp%2#0' with 'l-load tmp%2#0'
 debug: Inserted main.ops[11]: 'l-store-copy tmp%3#0 0'
diff --git a/test_cases/stubs/puya_O2.log b/test_cases/stubs/puya_O2.log
index c4d392dd09..5bd3c587e1 100644
--- a/test_cases/stubs/puya_O2.log
+++ b/test_cases/stubs/puya_O2.log
@@ -991,7 +991,7 @@ debug: Coalescing local variables in test_cases.stubs.uint64.Uint64Contract.appr
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.stubs.uint64.Uint64Contract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to stubs/out_O2/Uint64Contract.ir/Uint64Contract.approval.0.approval.destructured.ir
+debug: Output IR to stubs/out_O2/Uint64Contract.ir/Uint64Contract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.stubs.uint64.Uint64Contract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.stubs.uint64.Uint64Contract.clear_state_program
@@ -1038,7 +1038,7 @@ debug: Coalescing local variables in test_cases.stubs.uint64.Uint64Contract.clea
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.stubs.uint64.Uint64Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to stubs/out_O2/Uint64Contract.ir/Uint64Contract.clear.0.clear.destructured.ir
+debug: Output IR to stubs/out_O2/Uint64Contract.ir/Uint64Contract.clear.0.destructured.ir
 debug: Inserted main.ops[6]: 'l-store-copy tmp%67#0 0'
 debug: Replaced main.ops[8]: 'v-load tmp%67#0' with 'l-load tmp%67#0'
 debug: Inserted main.ops[11]: 'l-store-copy tmp%68#0 0'
@@ -1515,7 +1515,7 @@ debug: Coalescing start#0 with [start#5, start#1, start#2]
 debug: Coalescing resulted in 9 replacement/s
 debug: Sequentializing parallel copies in _puya_lib.bytes_.is_substring
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to stubs/out_O2/StringContract.ir/StringContract.approval.0.approval.destructured.ir
+debug: Output IR to stubs/out_O2/StringContract.ir/StringContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.stubs.string.StringContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.stubs.string.StringContract.clear_state_program
@@ -1541,7 +1541,7 @@ debug: Coalescing local variables in test_cases.stubs.string.StringContract.clea
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.stubs.string.StringContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to stubs/out_O2/StringContract.ir/StringContract.clear.0.clear.destructured.ir
+debug: Output IR to stubs/out_O2/StringContract.ir/StringContract.clear.0.destructured.ir
 debug: Inserted main.ops[3]: 'l-store-copy tmp%12#0 0'
 debug: Replaced main.ops[5]: 'v-load tmp%12#0' with 'l-load tmp%12#0'
 debug: Inserted main.ops[10]: 'l-store-copy tmp%13#0 0'
@@ -2183,7 +2183,7 @@ debug: Coalescing local variables in test_cases.stubs.bytes.BytesContract.approv
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.stubs.bytes.BytesContract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to stubs/out_O2/BytesContract.ir/BytesContract.approval.0.approval.destructured.ir
+debug: Output IR to stubs/out_O2/BytesContract.ir/BytesContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.stubs.bytes.BytesContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.stubs.bytes.BytesContract.clear_state_program
@@ -2209,7 +2209,7 @@ debug: Coalescing local variables in test_cases.stubs.bytes.BytesContract.clear_
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.stubs.bytes.BytesContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to stubs/out_O2/BytesContract.ir/BytesContract.clear.0.clear.destructured.ir
+debug: Output IR to stubs/out_O2/BytesContract.ir/BytesContract.clear.0.destructured.ir
 debug: Inserted main.ops[8]: 'l-store-copy tmp%74#0 0'
 debug: Replaced main.ops[10]: 'v-load tmp%74#0' with 'l-load tmp%74#0'
 debug: Inserted main.ops[13]: 'l-store-copy tmp%75#0 0'
@@ -2419,7 +2419,7 @@ debug: Coalescing local variables in test_cases.stubs.biguint.BigUIntContract.ap
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.stubs.biguint.BigUIntContract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to stubs/out_O2/BigUIntContract.ir/BigUIntContract.approval.0.approval.destructured.ir
+debug: Output IR to stubs/out_O2/BigUIntContract.ir/BigUIntContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.stubs.biguint.BigUIntContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.stubs.biguint.BigUIntContract.clear_state_program
@@ -2463,7 +2463,7 @@ debug: Coalescing local variables in test_cases.stubs.biguint.BigUIntContract.cl
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.stubs.biguint.BigUIntContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to stubs/out_O2/BigUIntContract.ir/BigUIntContract.clear.0.clear.destructured.ir
+debug: Output IR to stubs/out_O2/BigUIntContract.ir/BigUIntContract.clear.0.destructured.ir
 debug: Inserted main.ops[6]: 'l-store-copy tmp%2#0 0'
 debug: Replaced main.ops[8]: 'v-load tmp%2#0' with 'l-load tmp%2#0'
 debug: Inserted main.ops[11]: 'l-store-copy tmp%3#0 0'
diff --git a/test_cases/stubs/puya_unoptimized.log b/test_cases/stubs/puya_unoptimized.log
index 64f2522c0c..825b892e15 100644
--- a/test_cases/stubs/puya_unoptimized.log
+++ b/test_cases/stubs/puya_unoptimized.log
@@ -827,7 +827,7 @@ debug: Coalescing y#1 with [y#2, y#3]
 debug: Coalescing resulted in 19 replacement/s
 debug: Sequentializing parallel copies in test_cases.stubs.uint64.Uint64Contract.approval_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to stubs/out_unoptimized/Uint64Contract.ir/Uint64Contract.approval.0.approval.destructured.ir
+debug: Output IR to stubs/out_unoptimized/Uint64Contract.ir/Uint64Contract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.stubs.uint64.Uint64Contract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.stubs.uint64.Uint64Contract.clear_state_program
@@ -854,7 +854,7 @@ debug: Coalescing local variables in test_cases.stubs.uint64.Uint64Contract.clea
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.stubs.uint64.Uint64Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to stubs/out_unoptimized/Uint64Contract.ir/Uint64Contract.clear.0.clear.destructured.ir
+debug: Output IR to stubs/out_unoptimized/Uint64Contract.ir/Uint64Contract.clear.0.destructured.ir
 debug: Inserted main.ops[3]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[5]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[10]: 'l-store-copy tmp%1#0 0'
@@ -1099,7 +1099,7 @@ debug: Coalescing start#0 with [start#5, start#1, start#2]
 debug: Coalescing resulted in 10 replacement/s
 debug: Sequentializing parallel copies in _puya_lib.bytes_.is_substring
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to stubs/out_unoptimized/StringContract.ir/StringContract.approval.0.approval.destructured.ir
+debug: Output IR to stubs/out_unoptimized/StringContract.ir/StringContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.stubs.string.StringContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.stubs.string.StringContract.clear_state_program
@@ -1117,7 +1117,7 @@ debug: Coalescing local variables in test_cases.stubs.string.StringContract.clea
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.stubs.string.StringContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to stubs/out_unoptimized/StringContract.ir/StringContract.clear.0.clear.destructured.ir
+debug: Output IR to stubs/out_unoptimized/StringContract.ir/StringContract.clear.0.destructured.ir
 debug: Inserted main.ops[2]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[4]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[7]: 'l-store-copy tmp%1#0 0'
@@ -1533,7 +1533,7 @@ debug: Coalescing local variables in test_cases.stubs.bytes.check_end_before_sta
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.stubs.bytes.check_end_before_start_slicing
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to stubs/out_unoptimized/BytesContract.ir/BytesContract.approval.0.approval.destructured.ir
+debug: Output IR to stubs/out_unoptimized/BytesContract.ir/BytesContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.stubs.bytes.BytesContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.stubs.bytes.BytesContract.clear_state_program
@@ -1551,7 +1551,7 @@ debug: Coalescing local variables in test_cases.stubs.bytes.BytesContract.clear_
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.stubs.bytes.BytesContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to stubs/out_unoptimized/BytesContract.ir/BytesContract.clear.0.clear.destructured.ir
+debug: Output IR to stubs/out_unoptimized/BytesContract.ir/BytesContract.clear.0.destructured.ir
 debug: Inserted main.ops[3]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[5]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[10]: 'l-store-copy tmp%1#0 0'
@@ -2168,7 +2168,7 @@ debug: Coalescing local variables in test_cases.stubs.biguint.compare_uint64_vs_
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.stubs.biguint.compare_uint64_vs_biguint
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to stubs/out_unoptimized/BigUIntContract.ir/BigUIntContract.approval.0.approval.destructured.ir
+debug: Output IR to stubs/out_unoptimized/BigUIntContract.ir/BigUIntContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.stubs.biguint.BigUIntContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.stubs.biguint.BigUIntContract.clear_state_program
@@ -2186,7 +2186,7 @@ debug: Coalescing local variables in test_cases.stubs.biguint.BigUIntContract.cl
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.stubs.biguint.BigUIntContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to stubs/out_unoptimized/BigUIntContract.ir/BigUIntContract.clear.0.clear.destructured.ir
+debug: Output IR to stubs/out_unoptimized/BigUIntContract.ir/BigUIntContract.clear.0.destructured.ir
 debug: Inserted main.ops[10]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[12]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[20]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/template_variables/out/TemplateVariablesContract.ir/TemplateVariablesContract.approval.0.approval.ssa.ir b/test_cases/template_variables/out/TemplateVariablesContract.ir/TemplateVariablesContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/template_variables/out/TemplateVariablesContract.ir/TemplateVariablesContract.approval.0.approval.ssa.ir
rename to test_cases/template_variables/out/TemplateVariablesContract.ir/TemplateVariablesContract.approval.0.ssa.ir
diff --git a/test_cases/template_variables/out/TemplateVariablesContract.ir/TemplateVariablesContract.approval.1.approval.ssa.opt.ir b/test_cases/template_variables/out/TemplateVariablesContract.ir/TemplateVariablesContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/template_variables/out/TemplateVariablesContract.ir/TemplateVariablesContract.approval.1.approval.ssa.opt.ir
rename to test_cases/template_variables/out/TemplateVariablesContract.ir/TemplateVariablesContract.approval.1.ssa.opt.ir
diff --git a/test_cases/template_variables/out/TemplateVariablesContract.ir/TemplateVariablesContract.approval.2.approval.ssa.opt.ir b/test_cases/template_variables/out/TemplateVariablesContract.ir/TemplateVariablesContract.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/template_variables/out/TemplateVariablesContract.ir/TemplateVariablesContract.approval.2.approval.ssa.opt.ir
rename to test_cases/template_variables/out/TemplateVariablesContract.ir/TemplateVariablesContract.approval.2.ssa.opt.ir
diff --git a/test_cases/template_variables/out/TemplateVariablesContract.ir/TemplateVariablesContract.approval.3.approval.destructured.ir b/test_cases/template_variables/out/TemplateVariablesContract.ir/TemplateVariablesContract.approval.3.destructured.ir
similarity index 100%
rename from test_cases/template_variables/out/TemplateVariablesContract.ir/TemplateVariablesContract.approval.3.approval.destructured.ir
rename to test_cases/template_variables/out/TemplateVariablesContract.ir/TemplateVariablesContract.approval.3.destructured.ir
diff --git a/test_cases/template_variables/out/TemplateVariablesContract.ir/TemplateVariablesContract.clear.0.clear.ssa.ir b/test_cases/template_variables/out/TemplateVariablesContract.ir/TemplateVariablesContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/template_variables/out/TemplateVariablesContract.ir/TemplateVariablesContract.clear.0.clear.ssa.ir
rename to test_cases/template_variables/out/TemplateVariablesContract.ir/TemplateVariablesContract.clear.0.ssa.ir
diff --git a/test_cases/template_variables/out/TemplateVariablesContract.ir/TemplateVariablesContract.clear.1.clear.destructured.ir b/test_cases/template_variables/out/TemplateVariablesContract.ir/TemplateVariablesContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/template_variables/out/TemplateVariablesContract.ir/TemplateVariablesContract.clear.1.clear.destructured.ir
rename to test_cases/template_variables/out/TemplateVariablesContract.ir/TemplateVariablesContract.clear.1.destructured.ir
diff --git a/test_cases/template_variables/out_O2/TemplateVariablesContract.ir/TemplateVariablesContract.approval.0.approval.destructured.ir b/test_cases/template_variables/out_O2/TemplateVariablesContract.ir/TemplateVariablesContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/template_variables/out_O2/TemplateVariablesContract.ir/TemplateVariablesContract.approval.0.approval.destructured.ir
rename to test_cases/template_variables/out_O2/TemplateVariablesContract.ir/TemplateVariablesContract.approval.0.destructured.ir
diff --git a/test_cases/template_variables/out_O2/TemplateVariablesContract.ir/TemplateVariablesContract.clear.0.clear.destructured.ir b/test_cases/template_variables/out_O2/TemplateVariablesContract.ir/TemplateVariablesContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/template_variables/out_O2/TemplateVariablesContract.ir/TemplateVariablesContract.clear.0.clear.destructured.ir
rename to test_cases/template_variables/out_O2/TemplateVariablesContract.ir/TemplateVariablesContract.clear.0.destructured.ir
diff --git a/test_cases/template_variables/out_unoptimized/TemplateVariablesContract.ir/TemplateVariablesContract.approval.0.approval.destructured.ir b/test_cases/template_variables/out_unoptimized/TemplateVariablesContract.ir/TemplateVariablesContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/template_variables/out_unoptimized/TemplateVariablesContract.ir/TemplateVariablesContract.approval.0.approval.destructured.ir
rename to test_cases/template_variables/out_unoptimized/TemplateVariablesContract.ir/TemplateVariablesContract.approval.0.destructured.ir
diff --git a/test_cases/template_variables/out_unoptimized/TemplateVariablesContract.ir/TemplateVariablesContract.clear.0.clear.destructured.ir b/test_cases/template_variables/out_unoptimized/TemplateVariablesContract.ir/TemplateVariablesContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/template_variables/out_unoptimized/TemplateVariablesContract.ir/TemplateVariablesContract.clear.0.clear.destructured.ir
rename to test_cases/template_variables/out_unoptimized/TemplateVariablesContract.ir/TemplateVariablesContract.clear.0.destructured.ir
diff --git a/test_cases/template_variables/puya.log b/test_cases/template_variables/puya.log
index fe5a1d63ea..0475742ef6 100644
--- a/test_cases/template_variables/puya.log
+++ b/test_cases/template_variables/puya.log
@@ -440,7 +440,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to template_variables/out/TemplateVariablesContract.ir/TemplateVariablesContract.approval.0.approval.ssa.ir
+debug: Output IR to template_variables/out/TemplateVariablesContract.ir/TemplateVariablesContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.template_variables.contract.TemplateVariablesContract at level 1
 debug: Begin optimization pass 1/100
 debug: marking trivial method test_cases.template_variables.contract.TemplateVariablesContract.get_bytes as inlineable
@@ -595,7 +595,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.template_variables.contract.TemplateVariablesContract.__puya_arc4_router__
-debug: Output IR to template_variables/out/TemplateVariablesContract.ir/TemplateVariablesContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to template_variables/out/TemplateVariablesContract.ir/TemplateVariablesContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking trivial method test_cases.template_variables.contract.TemplateVariablesContract.get_bytes as inlineable
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
@@ -700,7 +700,7 @@ debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.template_variables.contract.TemplateVariablesContract.get_bytes
 debug: removing unused subroutine test_cases.template_variables.contract.TemplateVariablesContract.__algopy_default_create
-debug: Output IR to template_variables/out/TemplateVariablesContract.ir/TemplateVariablesContract.approval.2.approval.ssa.opt.ir
+debug: Output IR to template_variables/out/TemplateVariablesContract.ir/TemplateVariablesContract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -793,8 +793,8 @@ debug: Coalescing local variables in test_cases.template_variables.contract.Temp
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.template_variables.contract.TemplateVariablesContract.on_delete
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to template_variables/out/TemplateVariablesContract.ir/TemplateVariablesContract.approval.3.approval.destructured.ir
-debug: Output IR to template_variables/out/TemplateVariablesContract.ir/TemplateVariablesContract.clear.0.clear.ssa.ir
+debug: Output IR to template_variables/out/TemplateVariablesContract.ir/TemplateVariablesContract.approval.3.destructured.ir
+debug: Output IR to template_variables/out/TemplateVariablesContract.ir/TemplateVariablesContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.template_variables.contract.TemplateVariablesContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -820,7 +820,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to template_variables/out/TemplateVariablesContract.ir/TemplateVariablesContract.clear.1.clear.destructured.ir
+debug: Output IR to template_variables/out/TemplateVariablesContract.ir/TemplateVariablesContract.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/template_variables/puya_O2.log b/test_cases/template_variables/puya_O2.log
index 84126e6d83..63d0ebe9c2 100644
--- a/test_cases/template_variables/puya_O2.log
+++ b/test_cases/template_variables/puya_O2.log
@@ -764,7 +764,7 @@ debug: Coalescing tmp%0#0 with [tmp%0#3]
 debug: Coalescing resulted in 17 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to template_variables/out_O2/TemplateVariablesContract.ir/TemplateVariablesContract.approval.0.approval.destructured.ir
+debug: Output IR to template_variables/out_O2/TemplateVariablesContract.ir/TemplateVariablesContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.template_variables.contract.TemplateVariablesContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -790,7 +790,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to template_variables/out_O2/TemplateVariablesContract.ir/TemplateVariablesContract.clear.0.clear.destructured.ir
+debug: Output IR to template_variables/out_O2/TemplateVariablesContract.ir/TemplateVariablesContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/template_variables/puya_unoptimized.log b/test_cases/template_variables/puya_unoptimized.log
index ef872c04a4..9506555856 100644
--- a/test_cases/template_variables/puya_unoptimized.log
+++ b/test_cases/template_variables/puya_unoptimized.log
@@ -612,7 +612,7 @@ debug: Coalescing local variables in test_cases.template_variables.contract.Temp
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.template_variables.contract.TemplateVariablesContract.on_delete
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to template_variables/out_unoptimized/TemplateVariablesContract.ir/TemplateVariablesContract.approval.0.approval.destructured.ir
+debug: Output IR to template_variables/out_unoptimized/TemplateVariablesContract.ir/TemplateVariablesContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.template_variables.contract.TemplateVariablesContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -630,7 +630,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to template_variables/out_unoptimized/TemplateVariablesContract.ir/TemplateVariablesContract.clear.0.clear.destructured.ir
+debug: Output IR to template_variables/out_unoptimized/TemplateVariablesContract.ir/TemplateVariablesContract.clear.0.destructured.ir
 debug: Inserted main_block@1.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main_block@1.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_block@1.ops[6]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/too_many_permutations/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir b/test_cases/too_many_permutations/out/MyContract.ir/MyContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/too_many_permutations/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir
rename to test_cases/too_many_permutations/out/MyContract.ir/MyContract.approval.0.ssa.ir
diff --git a/test_cases/too_many_permutations/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir b/test_cases/too_many_permutations/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/too_many_permutations/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir
rename to test_cases/too_many_permutations/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
diff --git a/test_cases/too_many_permutations/out/MyContract.ir/MyContract.approval.2.approval.ssa.opt.ir b/test_cases/too_many_permutations/out/MyContract.ir/MyContract.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/too_many_permutations/out/MyContract.ir/MyContract.approval.2.approval.ssa.opt.ir
rename to test_cases/too_many_permutations/out/MyContract.ir/MyContract.approval.2.ssa.opt.ir
diff --git a/test_cases/too_many_permutations/out/MyContract.ir/MyContract.approval.3.approval.destructured.ir b/test_cases/too_many_permutations/out/MyContract.ir/MyContract.approval.3.destructured.ir
similarity index 100%
rename from test_cases/too_many_permutations/out/MyContract.ir/MyContract.approval.3.approval.destructured.ir
rename to test_cases/too_many_permutations/out/MyContract.ir/MyContract.approval.3.destructured.ir
diff --git a/test_cases/too_many_permutations/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir b/test_cases/too_many_permutations/out/MyContract.ir/MyContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/too_many_permutations/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir
rename to test_cases/too_many_permutations/out/MyContract.ir/MyContract.clear.0.ssa.ir
diff --git a/test_cases/too_many_permutations/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir b/test_cases/too_many_permutations/out/MyContract.ir/MyContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/too_many_permutations/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir
rename to test_cases/too_many_permutations/out/MyContract.ir/MyContract.clear.1.destructured.ir
diff --git a/test_cases/too_many_permutations/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir b/test_cases/too_many_permutations/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/too_many_permutations/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir
rename to test_cases/too_many_permutations/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
diff --git a/test_cases/too_many_permutations/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir b/test_cases/too_many_permutations/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/too_many_permutations/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir
rename to test_cases/too_many_permutations/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
diff --git a/test_cases/too_many_permutations/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir b/test_cases/too_many_permutations/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/too_many_permutations/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir
rename to test_cases/too_many_permutations/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
diff --git a/test_cases/too_many_permutations/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir b/test_cases/too_many_permutations/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/too_many_permutations/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir
rename to test_cases/too_many_permutations/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
diff --git a/test_cases/too_many_permutations/puya.log b/test_cases/too_many_permutations/puya.log
index 1e872c3586..b93c7aca61 100644
--- a/test_cases/too_many_permutations/puya.log
+++ b/test_cases/too_many_permutations/puya.log
@@ -472,7 +472,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to too_many_permutations/out/MyContract.ir/MyContract.approval.0.approval.ssa.ir
+debug: Output IR to too_many_permutations/out/MyContract.ir/MyContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.too_many_permutations.contract.MyContract at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.too_many_permutations.contract.four_args for inlining
@@ -534,7 +534,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.too_many_permutations.contract.four_args
-debug: Output IR to too_many_permutations/out/MyContract.ir/MyContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to too_many_permutations/out/MyContract.ir/MyContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking simple function test_cases.too_many_permutations.contract.two_args for inlining (complexity=3 <= threshold=3)
 debug: Optimizing subroutine test_cases.too_many_permutations.contract.MyContract.approval_program
@@ -585,7 +585,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.too_many_permutations.contract.two_args
-debug: Output IR to too_many_permutations/out/MyContract.ir/MyContract.approval.2.approval.ssa.opt.ir
+debug: Output IR to too_many_permutations/out/MyContract.ir/MyContract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.too_many_permutations.contract.MyContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -613,8 +613,8 @@ debug: Coalescing tmp%1#2 with [tmp%1#3]
 debug: Coalescing resulted in 11 replacement/s
 debug: Sequentializing parallel copies in test_cases.too_many_permutations.contract.MyContract.approval_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to too_many_permutations/out/MyContract.ir/MyContract.approval.3.approval.destructured.ir
-debug: Output IR to too_many_permutations/out/MyContract.ir/MyContract.clear.0.clear.ssa.ir
+debug: Output IR to too_many_permutations/out/MyContract.ir/MyContract.approval.3.destructured.ir
+debug: Output IR to too_many_permutations/out/MyContract.ir/MyContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.too_many_permutations.contract.MyContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.too_many_permutations.contract.MyContract.clear_state_program
@@ -640,7 +640,7 @@ debug: Coalescing local variables in test_cases.too_many_permutations.contract.M
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.too_many_permutations.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to too_many_permutations/out/MyContract.ir/MyContract.clear.1.clear.destructured.ir
+debug: Output IR to too_many_permutations/out/MyContract.ir/MyContract.clear.1.destructured.ir
 debug: Inserted main.ops[11]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[13]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[5]: 'l-store-copy c#0 0'
diff --git a/test_cases/too_many_permutations/puya_O2.log b/test_cases/too_many_permutations/puya_O2.log
index b4290128ed..f7fe056f14 100644
--- a/test_cases/too_many_permutations/puya_O2.log
+++ b/test_cases/too_many_permutations/puya_O2.log
@@ -609,7 +609,7 @@ debug: Coalescing tmp%1#2 with [tmp%1#3]
 debug: Coalescing resulted in 11 replacement/s
 debug: Sequentializing parallel copies in test_cases.too_many_permutations.contract.MyContract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to too_many_permutations/out_O2/MyContract.ir/MyContract.approval.0.approval.destructured.ir
+debug: Output IR to too_many_permutations/out_O2/MyContract.ir/MyContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.too_many_permutations.contract.MyContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.too_many_permutations.contract.MyContract.clear_state_program
@@ -635,7 +635,7 @@ debug: Coalescing local variables in test_cases.too_many_permutations.contract.M
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.too_many_permutations.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to too_many_permutations/out_O2/MyContract.ir/MyContract.clear.0.clear.destructured.ir
+debug: Output IR to too_many_permutations/out_O2/MyContract.ir/MyContract.clear.0.destructured.ir
 debug: Inserted main.ops[11]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[13]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[5]: 'l-store-copy c#0 0'
diff --git a/test_cases/too_many_permutations/puya_unoptimized.log b/test_cases/too_many_permutations/puya_unoptimized.log
index 37e43b142b..1937674da2 100644
--- a/test_cases/too_many_permutations/puya_unoptimized.log
+++ b/test_cases/too_many_permutations/puya_unoptimized.log
@@ -517,7 +517,7 @@ debug: Coalescing local variables in test_cases.too_many_permutations.contract.t
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.too_many_permutations.contract.two_args
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to too_many_permutations/out_unoptimized/MyContract.ir/MyContract.approval.0.approval.destructured.ir
+debug: Output IR to too_many_permutations/out_unoptimized/MyContract.ir/MyContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.too_many_permutations.contract.MyContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.too_many_permutations.contract.MyContract.clear_state_program
@@ -535,7 +535,7 @@ debug: Coalescing local variables in test_cases.too_many_permutations.contract.M
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.too_many_permutations.contract.MyContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to too_many_permutations/out_unoptimized/MyContract.ir/MyContract.clear.0.clear.destructured.ir
+debug: Output IR to too_many_permutations/out_unoptimized/MyContract.ir/MyContract.clear.0.destructured.ir
 debug: Inserted main.ops[11]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[13]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[5]: 'l-store-copy c#0 0'
diff --git a/test_cases/transaction/out/TransactionContract.ir/TransactionContract.approval.0.approval.ssa.ir b/test_cases/transaction/out/TransactionContract.ir/TransactionContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/transaction/out/TransactionContract.ir/TransactionContract.approval.0.approval.ssa.ir
rename to test_cases/transaction/out/TransactionContract.ir/TransactionContract.approval.0.ssa.ir
diff --git a/test_cases/transaction/out/TransactionContract.ir/TransactionContract.approval.1.approval.ssa.opt.ir b/test_cases/transaction/out/TransactionContract.ir/TransactionContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/transaction/out/TransactionContract.ir/TransactionContract.approval.1.approval.ssa.opt.ir
rename to test_cases/transaction/out/TransactionContract.ir/TransactionContract.approval.1.ssa.opt.ir
diff --git a/test_cases/transaction/out/TransactionContract.ir/TransactionContract.approval.2.approval.ssa.opt.ir b/test_cases/transaction/out/TransactionContract.ir/TransactionContract.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/transaction/out/TransactionContract.ir/TransactionContract.approval.2.approval.ssa.opt.ir
rename to test_cases/transaction/out/TransactionContract.ir/TransactionContract.approval.2.ssa.opt.ir
diff --git a/test_cases/transaction/out/TransactionContract.ir/TransactionContract.approval.3.approval.destructured.ir b/test_cases/transaction/out/TransactionContract.ir/TransactionContract.approval.3.destructured.ir
similarity index 100%
rename from test_cases/transaction/out/TransactionContract.ir/TransactionContract.approval.3.approval.destructured.ir
rename to test_cases/transaction/out/TransactionContract.ir/TransactionContract.approval.3.destructured.ir
diff --git a/test_cases/transaction/out/TransactionContract.ir/TransactionContract.clear.0.clear.ssa.ir b/test_cases/transaction/out/TransactionContract.ir/TransactionContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/transaction/out/TransactionContract.ir/TransactionContract.clear.0.clear.ssa.ir
rename to test_cases/transaction/out/TransactionContract.ir/TransactionContract.clear.0.ssa.ir
diff --git a/test_cases/transaction/out/TransactionContract.ir/TransactionContract.clear.1.clear.destructured.ir b/test_cases/transaction/out/TransactionContract.ir/TransactionContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/transaction/out/TransactionContract.ir/TransactionContract.clear.1.clear.destructured.ir
rename to test_cases/transaction/out/TransactionContract.ir/TransactionContract.clear.1.destructured.ir
diff --git a/test_cases/transaction/out_O2/TransactionContract.ir/TransactionContract.approval.0.approval.destructured.ir b/test_cases/transaction/out_O2/TransactionContract.ir/TransactionContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/transaction/out_O2/TransactionContract.ir/TransactionContract.approval.0.approval.destructured.ir
rename to test_cases/transaction/out_O2/TransactionContract.ir/TransactionContract.approval.0.destructured.ir
diff --git a/test_cases/transaction/out_O2/TransactionContract.ir/TransactionContract.clear.0.clear.destructured.ir b/test_cases/transaction/out_O2/TransactionContract.ir/TransactionContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/transaction/out_O2/TransactionContract.ir/TransactionContract.clear.0.clear.destructured.ir
rename to test_cases/transaction/out_O2/TransactionContract.ir/TransactionContract.clear.0.destructured.ir
diff --git a/test_cases/transaction/out_unoptimized/TransactionContract.ir/TransactionContract.approval.0.approval.destructured.ir b/test_cases/transaction/out_unoptimized/TransactionContract.ir/TransactionContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/transaction/out_unoptimized/TransactionContract.ir/TransactionContract.approval.0.approval.destructured.ir
rename to test_cases/transaction/out_unoptimized/TransactionContract.ir/TransactionContract.approval.0.destructured.ir
diff --git a/test_cases/transaction/out_unoptimized/TransactionContract.ir/TransactionContract.clear.0.clear.destructured.ir b/test_cases/transaction/out_unoptimized/TransactionContract.ir/TransactionContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/transaction/out_unoptimized/TransactionContract.ir/TransactionContract.clear.0.clear.destructured.ir
rename to test_cases/transaction/out_unoptimized/TransactionContract.ir/TransactionContract.clear.0.destructured.ir
diff --git a/test_cases/transaction/puya.log b/test_cases/transaction/puya.log
index 4bddd55114..5327d6544e 100644
--- a/test_cases/transaction/puya.log
+++ b/test_cases/transaction/puya.log
@@ -531,7 +531,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to transaction/out/TransactionContract.ir/TransactionContract.approval.0.approval.ssa.ir
+debug: Output IR to transaction/out/TransactionContract.ir/TransactionContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.transaction.contract.TransactionContract at level 1
 debug: Begin optimization pass 1/100
 debug: marking trivial method test_cases.transaction.contract.TransactionContract.create as inlineable
@@ -859,7 +859,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.transaction.contract.TransactionContract.__puya_arc4_router__
-debug: Output IR to transaction/out/TransactionContract.ir/TransactionContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to transaction/out/TransactionContract.ir/TransactionContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking trivial method test_cases.transaction.contract.TransactionContract.create as inlineable
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
@@ -1048,7 +1048,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.transaction.contract.TransactionContract.create
-debug: Output IR to transaction/out/TransactionContract.ir/TransactionContract.approval.2.approval.ssa.opt.ir
+debug: Output IR to transaction/out/TransactionContract.ir/TransactionContract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -1391,8 +1391,8 @@ debug: * avail txn3#0
 debug: * to_do txn#1
 debug: * to_do loop_counter%0#0
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to transaction/out/TransactionContract.ir/TransactionContract.approval.3.approval.destructured.ir
-debug: Output IR to transaction/out/TransactionContract.ir/TransactionContract.clear.0.clear.ssa.ir
+debug: Output IR to transaction/out/TransactionContract.ir/TransactionContract.approval.3.destructured.ir
+debug: Output IR to transaction/out/TransactionContract.ir/TransactionContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.transaction.contract.TransactionContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -1418,7 +1418,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to transaction/out/TransactionContract.ir/TransactionContract.clear.1.clear.destructured.ir
+debug: Output IR to transaction/out/TransactionContract.ir/TransactionContract.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/transaction/puya_O2.log b/test_cases/transaction/puya_O2.log
index b55b6ca933..6680ff48e7 100644
--- a/test_cases/transaction/puya_O2.log
+++ b/test_cases/transaction/puya_O2.log
@@ -1416,7 +1416,7 @@ debug: Coalescing local variables in test_cases.transaction.contract.Transaction
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.transaction.contract.TransactionContract._common_checks
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to transaction/out_O2/TransactionContract.ir/TransactionContract.approval.0.approval.destructured.ir
+debug: Output IR to transaction/out_O2/TransactionContract.ir/TransactionContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.transaction.contract.TransactionContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -1442,7 +1442,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to transaction/out_O2/TransactionContract.ir/TransactionContract.clear.0.clear.destructured.ir
+debug: Output IR to transaction/out_O2/TransactionContract.ir/TransactionContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/transaction/puya_unoptimized.log b/test_cases/transaction/puya_unoptimized.log
index 13c8bf994a..9ac811a1a2 100644
--- a/test_cases/transaction/puya_unoptimized.log
+++ b/test_cases/transaction/puya_unoptimized.log
@@ -881,7 +881,7 @@ debug: to_do: loop_counter%0#0, txn#0
 debug: * to_do txn#0
 debug: * to_do loop_counter%0#0
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to transaction/out_unoptimized/TransactionContract.ir/TransactionContract.approval.0.approval.destructured.ir
+debug: Output IR to transaction/out_unoptimized/TransactionContract.ir/TransactionContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.transaction.contract.TransactionContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -899,7 +899,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to transaction/out_unoptimized/TransactionContract.ir/TransactionContract.clear.0.clear.destructured.ir
+debug: Output IR to transaction/out_unoptimized/TransactionContract.ir/TransactionContract.clear.0.destructured.ir
 debug: Inserted main_block@1.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main_block@1.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_block@1.ops[6]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/tuple_support/out/NestedTuples.ir/NestedTuples.approval.0.approval.ssa.ir b/test_cases/tuple_support/out/NestedTuples.ir/NestedTuples.approval.0.ssa.ir
similarity index 100%
rename from test_cases/tuple_support/out/NestedTuples.ir/NestedTuples.approval.0.approval.ssa.ir
rename to test_cases/tuple_support/out/NestedTuples.ir/NestedTuples.approval.0.ssa.ir
diff --git a/test_cases/tuple_support/out/NestedTuples.ir/NestedTuples.approval.1.approval.ssa.opt.ir b/test_cases/tuple_support/out/NestedTuples.ir/NestedTuples.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/tuple_support/out/NestedTuples.ir/NestedTuples.approval.1.approval.ssa.opt.ir
rename to test_cases/tuple_support/out/NestedTuples.ir/NestedTuples.approval.1.ssa.opt.ir
diff --git a/test_cases/tuple_support/out/NestedTuples.ir/NestedTuples.approval.2.approval.ssa.opt.ir b/test_cases/tuple_support/out/NestedTuples.ir/NestedTuples.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/tuple_support/out/NestedTuples.ir/NestedTuples.approval.2.approval.ssa.opt.ir
rename to test_cases/tuple_support/out/NestedTuples.ir/NestedTuples.approval.2.ssa.opt.ir
diff --git a/test_cases/tuple_support/out/NestedTuples.ir/NestedTuples.approval.3.approval.ssa.opt.ir b/test_cases/tuple_support/out/NestedTuples.ir/NestedTuples.approval.3.ssa.opt.ir
similarity index 100%
rename from test_cases/tuple_support/out/NestedTuples.ir/NestedTuples.approval.3.approval.ssa.opt.ir
rename to test_cases/tuple_support/out/NestedTuples.ir/NestedTuples.approval.3.ssa.opt.ir
diff --git a/test_cases/tuple_support/out/NestedTuples.ir/NestedTuples.approval.4.approval.destructured.ir b/test_cases/tuple_support/out/NestedTuples.ir/NestedTuples.approval.4.destructured.ir
similarity index 100%
rename from test_cases/tuple_support/out/NestedTuples.ir/NestedTuples.approval.4.approval.destructured.ir
rename to test_cases/tuple_support/out/NestedTuples.ir/NestedTuples.approval.4.destructured.ir
diff --git a/test_cases/tuple_support/out/NestedTuples.ir/NestedTuples.clear.0.clear.ssa.ir b/test_cases/tuple_support/out/NestedTuples.ir/NestedTuples.clear.0.ssa.ir
similarity index 100%
rename from test_cases/tuple_support/out/NestedTuples.ir/NestedTuples.clear.0.clear.ssa.ir
rename to test_cases/tuple_support/out/NestedTuples.ir/NestedTuples.clear.0.ssa.ir
diff --git a/test_cases/tuple_support/out/NestedTuples.ir/NestedTuples.clear.1.clear.destructured.ir b/test_cases/tuple_support/out/NestedTuples.ir/NestedTuples.clear.1.destructured.ir
similarity index 100%
rename from test_cases/tuple_support/out/NestedTuples.ir/NestedTuples.clear.1.clear.destructured.ir
rename to test_cases/tuple_support/out/NestedTuples.ir/NestedTuples.clear.1.destructured.ir
diff --git a/test_cases/tuple_support/out/TupleComparisons.ir/TupleComparisons.approval.0.approval.ssa.ir b/test_cases/tuple_support/out/TupleComparisons.ir/TupleComparisons.approval.0.ssa.ir
similarity index 100%
rename from test_cases/tuple_support/out/TupleComparisons.ir/TupleComparisons.approval.0.approval.ssa.ir
rename to test_cases/tuple_support/out/TupleComparisons.ir/TupleComparisons.approval.0.ssa.ir
diff --git a/test_cases/tuple_support/out/TupleComparisons.ir/TupleComparisons.approval.1.approval.ssa.opt.ir b/test_cases/tuple_support/out/TupleComparisons.ir/TupleComparisons.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/tuple_support/out/TupleComparisons.ir/TupleComparisons.approval.1.approval.ssa.opt.ir
rename to test_cases/tuple_support/out/TupleComparisons.ir/TupleComparisons.approval.1.ssa.opt.ir
diff --git a/test_cases/tuple_support/out/TupleComparisons.ir/TupleComparisons.approval.2.approval.ssa.opt.ir b/test_cases/tuple_support/out/TupleComparisons.ir/TupleComparisons.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/tuple_support/out/TupleComparisons.ir/TupleComparisons.approval.2.approval.ssa.opt.ir
rename to test_cases/tuple_support/out/TupleComparisons.ir/TupleComparisons.approval.2.ssa.opt.ir
diff --git a/test_cases/tuple_support/out/TupleComparisons.ir/TupleComparisons.approval.3.approval.destructured.ir b/test_cases/tuple_support/out/TupleComparisons.ir/TupleComparisons.approval.3.destructured.ir
similarity index 100%
rename from test_cases/tuple_support/out/TupleComparisons.ir/TupleComparisons.approval.3.approval.destructured.ir
rename to test_cases/tuple_support/out/TupleComparisons.ir/TupleComparisons.approval.3.destructured.ir
diff --git a/test_cases/tuple_support/out/TupleComparisons.ir/TupleComparisons.clear.0.clear.ssa.ir b/test_cases/tuple_support/out/TupleComparisons.ir/TupleComparisons.clear.0.ssa.ir
similarity index 100%
rename from test_cases/tuple_support/out/TupleComparisons.ir/TupleComparisons.clear.0.clear.ssa.ir
rename to test_cases/tuple_support/out/TupleComparisons.ir/TupleComparisons.clear.0.ssa.ir
diff --git a/test_cases/tuple_support/out/TupleComparisons.ir/TupleComparisons.clear.1.clear.destructured.ir b/test_cases/tuple_support/out/TupleComparisons.ir/TupleComparisons.clear.1.destructured.ir
similarity index 100%
rename from test_cases/tuple_support/out/TupleComparisons.ir/TupleComparisons.clear.1.clear.destructured.ir
rename to test_cases/tuple_support/out/TupleComparisons.ir/TupleComparisons.clear.1.destructured.ir
diff --git a/test_cases/tuple_support/out/TupleSupport.ir/TupleSupport.approval.0.approval.ssa.ir b/test_cases/tuple_support/out/TupleSupport.ir/TupleSupport.approval.0.ssa.ir
similarity index 100%
rename from test_cases/tuple_support/out/TupleSupport.ir/TupleSupport.approval.0.approval.ssa.ir
rename to test_cases/tuple_support/out/TupleSupport.ir/TupleSupport.approval.0.ssa.ir
diff --git a/test_cases/tuple_support/out/TupleSupport.ir/TupleSupport.approval.1.approval.ssa.opt.ir b/test_cases/tuple_support/out/TupleSupport.ir/TupleSupport.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/tuple_support/out/TupleSupport.ir/TupleSupport.approval.1.approval.ssa.opt.ir
rename to test_cases/tuple_support/out/TupleSupport.ir/TupleSupport.approval.1.ssa.opt.ir
diff --git a/test_cases/tuple_support/out/TupleSupport.ir/TupleSupport.approval.2.approval.ssa.opt.ir b/test_cases/tuple_support/out/TupleSupport.ir/TupleSupport.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/tuple_support/out/TupleSupport.ir/TupleSupport.approval.2.approval.ssa.opt.ir
rename to test_cases/tuple_support/out/TupleSupport.ir/TupleSupport.approval.2.ssa.opt.ir
diff --git a/test_cases/tuple_support/out/TupleSupport.ir/TupleSupport.approval.3.approval.destructured.ir b/test_cases/tuple_support/out/TupleSupport.ir/TupleSupport.approval.3.destructured.ir
similarity index 100%
rename from test_cases/tuple_support/out/TupleSupport.ir/TupleSupport.approval.3.approval.destructured.ir
rename to test_cases/tuple_support/out/TupleSupport.ir/TupleSupport.approval.3.destructured.ir
diff --git a/test_cases/tuple_support/out/TupleSupport.ir/TupleSupport.clear.0.clear.ssa.ir b/test_cases/tuple_support/out/TupleSupport.ir/TupleSupport.clear.0.ssa.ir
similarity index 100%
rename from test_cases/tuple_support/out/TupleSupport.ir/TupleSupport.clear.0.clear.ssa.ir
rename to test_cases/tuple_support/out/TupleSupport.ir/TupleSupport.clear.0.ssa.ir
diff --git a/test_cases/tuple_support/out/TupleSupport.ir/TupleSupport.clear.1.clear.destructured.ir b/test_cases/tuple_support/out/TupleSupport.ir/TupleSupport.clear.1.destructured.ir
similarity index 100%
rename from test_cases/tuple_support/out/TupleSupport.ir/TupleSupport.clear.1.clear.destructured.ir
rename to test_cases/tuple_support/out/TupleSupport.ir/TupleSupport.clear.1.destructured.ir
diff --git a/test_cases/tuple_support/out_O2/NestedTuples.ir/NestedTuples.approval.0.approval.destructured.ir b/test_cases/tuple_support/out_O2/NestedTuples.ir/NestedTuples.approval.0.destructured.ir
similarity index 100%
rename from test_cases/tuple_support/out_O2/NestedTuples.ir/NestedTuples.approval.0.approval.destructured.ir
rename to test_cases/tuple_support/out_O2/NestedTuples.ir/NestedTuples.approval.0.destructured.ir
diff --git a/test_cases/tuple_support/out_O2/NestedTuples.ir/NestedTuples.clear.0.clear.destructured.ir b/test_cases/tuple_support/out_O2/NestedTuples.ir/NestedTuples.clear.0.destructured.ir
similarity index 100%
rename from test_cases/tuple_support/out_O2/NestedTuples.ir/NestedTuples.clear.0.clear.destructured.ir
rename to test_cases/tuple_support/out_O2/NestedTuples.ir/NestedTuples.clear.0.destructured.ir
diff --git a/test_cases/tuple_support/out_O2/TupleComparisons.ir/TupleComparisons.approval.0.approval.destructured.ir b/test_cases/tuple_support/out_O2/TupleComparisons.ir/TupleComparisons.approval.0.destructured.ir
similarity index 100%
rename from test_cases/tuple_support/out_O2/TupleComparisons.ir/TupleComparisons.approval.0.approval.destructured.ir
rename to test_cases/tuple_support/out_O2/TupleComparisons.ir/TupleComparisons.approval.0.destructured.ir
diff --git a/test_cases/tuple_support/out_O2/TupleComparisons.ir/TupleComparisons.clear.0.clear.destructured.ir b/test_cases/tuple_support/out_O2/TupleComparisons.ir/TupleComparisons.clear.0.destructured.ir
similarity index 100%
rename from test_cases/tuple_support/out_O2/TupleComparisons.ir/TupleComparisons.clear.0.clear.destructured.ir
rename to test_cases/tuple_support/out_O2/TupleComparisons.ir/TupleComparisons.clear.0.destructured.ir
diff --git a/test_cases/tuple_support/out_O2/TupleSupport.ir/TupleSupport.approval.0.approval.destructured.ir b/test_cases/tuple_support/out_O2/TupleSupport.ir/TupleSupport.approval.0.destructured.ir
similarity index 100%
rename from test_cases/tuple_support/out_O2/TupleSupport.ir/TupleSupport.approval.0.approval.destructured.ir
rename to test_cases/tuple_support/out_O2/TupleSupport.ir/TupleSupport.approval.0.destructured.ir
diff --git a/test_cases/tuple_support/out_O2/TupleSupport.ir/TupleSupport.clear.0.clear.destructured.ir b/test_cases/tuple_support/out_O2/TupleSupport.ir/TupleSupport.clear.0.destructured.ir
similarity index 100%
rename from test_cases/tuple_support/out_O2/TupleSupport.ir/TupleSupport.clear.0.clear.destructured.ir
rename to test_cases/tuple_support/out_O2/TupleSupport.ir/TupleSupport.clear.0.destructured.ir
diff --git a/test_cases/tuple_support/out_unoptimized/NestedTuples.ir/NestedTuples.approval.0.approval.destructured.ir b/test_cases/tuple_support/out_unoptimized/NestedTuples.ir/NestedTuples.approval.0.destructured.ir
similarity index 100%
rename from test_cases/tuple_support/out_unoptimized/NestedTuples.ir/NestedTuples.approval.0.approval.destructured.ir
rename to test_cases/tuple_support/out_unoptimized/NestedTuples.ir/NestedTuples.approval.0.destructured.ir
diff --git a/test_cases/tuple_support/out_unoptimized/NestedTuples.ir/NestedTuples.clear.0.clear.destructured.ir b/test_cases/tuple_support/out_unoptimized/NestedTuples.ir/NestedTuples.clear.0.destructured.ir
similarity index 100%
rename from test_cases/tuple_support/out_unoptimized/NestedTuples.ir/NestedTuples.clear.0.clear.destructured.ir
rename to test_cases/tuple_support/out_unoptimized/NestedTuples.ir/NestedTuples.clear.0.destructured.ir
diff --git a/test_cases/tuple_support/out_unoptimized/TupleComparisons.ir/TupleComparisons.approval.0.approval.destructured.ir b/test_cases/tuple_support/out_unoptimized/TupleComparisons.ir/TupleComparisons.approval.0.destructured.ir
similarity index 100%
rename from test_cases/tuple_support/out_unoptimized/TupleComparisons.ir/TupleComparisons.approval.0.approval.destructured.ir
rename to test_cases/tuple_support/out_unoptimized/TupleComparisons.ir/TupleComparisons.approval.0.destructured.ir
diff --git a/test_cases/tuple_support/out_unoptimized/TupleComparisons.ir/TupleComparisons.clear.0.clear.destructured.ir b/test_cases/tuple_support/out_unoptimized/TupleComparisons.ir/TupleComparisons.clear.0.destructured.ir
similarity index 100%
rename from test_cases/tuple_support/out_unoptimized/TupleComparisons.ir/TupleComparisons.clear.0.clear.destructured.ir
rename to test_cases/tuple_support/out_unoptimized/TupleComparisons.ir/TupleComparisons.clear.0.destructured.ir
diff --git a/test_cases/tuple_support/out_unoptimized/TupleSupport.ir/TupleSupport.approval.0.approval.destructured.ir b/test_cases/tuple_support/out_unoptimized/TupleSupport.ir/TupleSupport.approval.0.destructured.ir
similarity index 100%
rename from test_cases/tuple_support/out_unoptimized/TupleSupport.ir/TupleSupport.approval.0.approval.destructured.ir
rename to test_cases/tuple_support/out_unoptimized/TupleSupport.ir/TupleSupport.approval.0.destructured.ir
diff --git a/test_cases/tuple_support/out_unoptimized/TupleSupport.ir/TupleSupport.clear.0.clear.destructured.ir b/test_cases/tuple_support/out_unoptimized/TupleSupport.ir/TupleSupport.clear.0.destructured.ir
similarity index 100%
rename from test_cases/tuple_support/out_unoptimized/TupleSupport.ir/TupleSupport.clear.0.clear.destructured.ir
rename to test_cases/tuple_support/out_unoptimized/TupleSupport.ir/TupleSupport.clear.0.destructured.ir
diff --git a/test_cases/tuple_support/puya.log b/test_cases/tuple_support/puya.log
index 41f621ca9e..2da6498bd2 100644
--- a/test_cases/tuple_support/puya.log
+++ b/test_cases/tuple_support/puya.log
@@ -922,7 +922,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to tuple_support/out/TupleSupport.ir/TupleSupport.approval.0.approval.ssa.ir
+debug: Output IR to tuple_support/out/TupleSupport.ir/TupleSupport.approval.0.ssa.ir
 info: optimizing approval program of test_cases.tuple_support.tuple_support.TupleSupport at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.tuple_support.tuple_support.TupleSupport.__init__ for inlining
@@ -1664,7 +1664,7 @@ debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.tuple_support.tuple_support.TupleSupport.__init__
 debug: removing unused subroutine test_cases.tuple_support.tuple_support.TupleSupport.approval_program
-debug: Output IR to tuple_support/out/TupleSupport.ir/TupleSupport.approval.1.approval.ssa.opt.ir
+debug: Output IR to tuple_support/out/TupleSupport.ir/TupleSupport.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking trivial method test_cases.tuple_support.tuple_support.get_tuple as inlineable
 debug: marking single-use function test_cases.tuple_support.tuple_support.bytes_combine for inlining
@@ -1999,7 +1999,7 @@ debug: removing unused subroutine test_cases.tuple_support.tuple_support.non_emp
 debug: removing unused subroutine test_cases.tuple_support.tuple_support.get_uint_with_side_effect
 debug: removing unused subroutine test_cases.tuple_support.tuple_support.single_tuple
 debug: removing unused subroutine test_cases.tuple_support.tuple_support.test_empty
-debug: Output IR to tuple_support/out/TupleSupport.ir/TupleSupport.approval.2.approval.ssa.opt.ir
+debug: Output IR to tuple_support/out/TupleSupport.ir/TupleSupport.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.tuple_support.tuple_support.TupleSupport.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -2108,8 +2108,8 @@ debug: * to_do value#1
 debug: * to_do total#0
 debug: * to_do loop_counter%0#0
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to tuple_support/out/TupleSupport.ir/TupleSupport.approval.3.approval.destructured.ir
-debug: Output IR to tuple_support/out/TupleSupport.ir/TupleSupport.clear.0.clear.ssa.ir
+debug: Output IR to tuple_support/out/TupleSupport.ir/TupleSupport.approval.3.destructured.ir
+debug: Output IR to tuple_support/out/TupleSupport.ir/TupleSupport.clear.0.ssa.ir
 info: optimizing clear program of test_cases.tuple_support.tuple_support.TupleSupport at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.tuple_support.tuple_support.TupleSupport.clear_state_program
@@ -2135,7 +2135,7 @@ debug: Coalescing local variables in test_cases.tuple_support.tuple_support.Tupl
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.tuple_support.tuple_support.TupleSupport.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to tuple_support/out/TupleSupport.ir/TupleSupport.clear.1.clear.destructured.ir
+debug: Output IR to tuple_support/out/TupleSupport.ir/TupleSupport.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[4]: 'l-store-copy total#0 0'
@@ -2205,7 +2205,7 @@ tuple_support/tuple_support.py:138 debug: optimizing TEAL subroutine test_cases.
 debug: inlining single reference block add_three_values_after_for@5 into add_three_values_for_body@1
 debug: removing explicit jump to fall-through block add_three_values_for_body@1
 tuple_support/tuple_support.py:67 debug: optimizing TEAL subroutine test_cases.tuple_support.tuple_support.TupleSupport.clear_state_program() -> uint64:
-debug: Output IR to tuple_support/out/TupleComparisons.ir/TupleComparisons.approval.0.approval.ssa.ir
+debug: Output IR to tuple_support/out/TupleComparisons.ir/TupleComparisons.approval.0.ssa.ir
 info: optimizing approval program of test_cases.tuple_support.tuple_comparisons.TupleComparisons at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.tuple_support.tuple_comparisons.test_tuple_cmp_eval for inlining
@@ -2375,7 +2375,7 @@ debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.tuple_support.tuple_comparisons.test_tuple_cmp_eval
 debug: removing unused subroutine test_cases.tuple_support.tuple_comparisons.test_tuple_cmp_empty
-debug: Output IR to tuple_support/out/TupleComparisons.ir/TupleComparisons.approval.1.approval.ssa.opt.ir
+debug: Output IR to tuple_support/out/TupleComparisons.ir/TupleComparisons.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking simple function test_cases.tuple_support.tuple_comparisons.log_and_return for inlining (complexity=2 <= threshold=3)
 debug: Optimizing subroutine test_cases.tuple_support.tuple_comparisons.TupleComparisons.approval_program
@@ -2454,7 +2454,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.tuple_support.tuple_comparisons.log_and_return
-debug: Output IR to tuple_support/out/TupleComparisons.ir/TupleComparisons.approval.2.approval.ssa.opt.ir
+debug: Output IR to tuple_support/out/TupleComparisons.ir/TupleComparisons.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.tuple_support.tuple_comparisons.TupleComparisons.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -2480,8 +2480,8 @@ debug: Coalescing tmp%0#0 with [tmp%0#1, tmp%0#2, tmp%0#3, tmp%0#4, tmp%0#5]
 debug: Coalescing resulted in 10 replacement/s
 debug: Sequentializing parallel copies in test_cases.tuple_support.tuple_comparisons.TupleComparisons.approval_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to tuple_support/out/TupleComparisons.ir/TupleComparisons.approval.3.approval.destructured.ir
-debug: Output IR to tuple_support/out/TupleComparisons.ir/TupleComparisons.clear.0.clear.ssa.ir
+debug: Output IR to tuple_support/out/TupleComparisons.ir/TupleComparisons.approval.3.destructured.ir
+debug: Output IR to tuple_support/out/TupleComparisons.ir/TupleComparisons.clear.0.ssa.ir
 info: optimizing clear program of test_cases.tuple_support.tuple_comparisons.TupleComparisons at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.tuple_support.tuple_comparisons.TupleComparisons.clear_state_program
@@ -2507,7 +2507,7 @@ debug: Coalescing local variables in test_cases.tuple_support.tuple_comparisons.
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.tuple_support.tuple_comparisons.TupleComparisons.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to tuple_support/out/TupleComparisons.ir/TupleComparisons.clear.1.clear.destructured.ir
+debug: Output IR to tuple_support/out/TupleComparisons.ir/TupleComparisons.clear.1.destructured.ir
 debug: Inserted main.ops[2]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[4]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[8]: 'l-store-copy tmp%0#0 0'
@@ -2522,7 +2522,7 @@ debug: Inserted main.ops[32]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[34]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 tuple_support/tuple_comparisons.py:5 debug: optimizing TEAL subroutine test_cases.tuple_support.tuple_comparisons.TupleComparisons.approval_program() -> uint64:
 tuple_support/tuple_comparisons.py:10 debug: optimizing TEAL subroutine test_cases.tuple_support.tuple_comparisons.TupleComparisons.clear_state_program() -> uint64:
-debug: Output IR to tuple_support/out/NestedTuples.ir/NestedTuples.approval.0.approval.ssa.ir
+debug: Output IR to tuple_support/out/NestedTuples.ir/NestedTuples.approval.0.ssa.ir
 info: optimizing approval program of test_cases.tuple_support.nested_tuples.NestedTuples at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.tuple_support.nested_tuples.NestedTuples.__init__ for inlining
@@ -3380,7 +3380,7 @@ debug: removing unused subroutine test_cases.tuple_support.nested_tuples.test_ne
 debug: removing unused subroutine test_cases.tuple_support.nested_tuples.test_nested_iteration
 debug: removing unused subroutine test_cases.tuple_support.nested_tuples.NestedTuples.test_single_evaluation_nested
 debug: removing unused subroutine test_cases.tuple_support.nested_tuples.NestedTuples.__algopy_default_create
-debug: Output IR to tuple_support/out/NestedTuples.ir/NestedTuples.approval.1.approval.ssa.opt.ir
+debug: Output IR to tuple_support/out/NestedTuples.ir/NestedTuples.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking single-use function test_cases.tuple_support.nested_tuples.NestedTuples.build_nested for inlining
 debug: marking trivial method test_cases.tuple_support.nested_tuples.NestedTuples.nested_tuple_params as inlineable
@@ -3558,7 +3558,7 @@ debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.tuple_support.nested_tuples.NestedTuples.__puya_arc4_router__
 debug: removing unused subroutine test_cases.tuple_support.nested_tuples.NestedTuples.build_nested
-debug: Output IR to tuple_support/out/NestedTuples.ir/NestedTuples.approval.2.approval.ssa.opt.ir
+debug: Output IR to tuple_support/out/NestedTuples.ir/NestedTuples.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: marking trivial method test_cases.tuple_support.nested_tuples.NestedTuples.nested_tuple_params as inlineable
 debug: marking trivial method test_cases.tuple_support.nested_tuples.NestedTuples.named_tuple as inlineable
@@ -3684,7 +3684,7 @@ debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.tuple_support.nested_tuples.NestedTuples.nested_tuple_params
 debug: removing unused subroutine test_cases.tuple_support.nested_tuples.NestedTuples.named_tuple
 debug: removing unused subroutine test_cases.tuple_support.nested_tuples.NestedTuples.nested_named_tuple_params
-debug: Output IR to tuple_support/out/NestedTuples.ir/NestedTuples.approval.3.approval.ssa.opt.ir
+debug: Output IR to tuple_support/out/NestedTuples.ir/NestedTuples.approval.3.ssa.opt.ir
 debug: Begin optimization pass 4/100
 debug: Optimizing subroutine test_cases.tuple_support.nested_tuples.NestedTuples.__algopy_entrypoint_with_init
 debug: Optimizer: Perform Subroutine Inlining
@@ -3872,8 +3872,8 @@ debug: * to_do s.2.0#0
 debug: * to_do s.1.0#1
 debug: * to_do s.0.0#0
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to tuple_support/out/NestedTuples.ir/NestedTuples.approval.4.approval.destructured.ir
-debug: Output IR to tuple_support/out/NestedTuples.ir/NestedTuples.clear.0.clear.ssa.ir
+debug: Output IR to tuple_support/out/NestedTuples.ir/NestedTuples.approval.4.destructured.ir
+debug: Output IR to tuple_support/out/NestedTuples.ir/NestedTuples.clear.0.ssa.ir
 info: optimizing clear program of test_cases.tuple_support.nested_tuples.NestedTuples at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -3899,7 +3899,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to tuple_support/out/NestedTuples.ir/NestedTuples.clear.1.clear.destructured.ir
+debug: Output IR to tuple_support/out/NestedTuples.ir/NestedTuples.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%0#2 0'
diff --git a/test_cases/tuple_support/puya_O2.log b/test_cases/tuple_support/puya_O2.log
index 51c5959b5f..5acfe5bb03 100644
--- a/test_cases/tuple_support/puya_O2.log
+++ b/test_cases/tuple_support/puya_O2.log
@@ -2104,7 +2104,7 @@ debug: * to_do value#1
 debug: * to_do total#0
 debug: * to_do loop_counter%0#0
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to tuple_support/out_O2/TupleSupport.ir/TupleSupport.approval.0.approval.destructured.ir
+debug: Output IR to tuple_support/out_O2/TupleSupport.ir/TupleSupport.approval.0.destructured.ir
 info: optimizing clear program of test_cases.tuple_support.tuple_support.TupleSupport at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.tuple_support.tuple_support.TupleSupport.clear_state_program
@@ -2130,7 +2130,7 @@ debug: Coalescing local variables in test_cases.tuple_support.tuple_support.Tupl
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.tuple_support.tuple_support.TupleSupport.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to tuple_support/out_O2/TupleSupport.ir/TupleSupport.clear.0.clear.destructured.ir
+debug: Output IR to tuple_support/out_O2/TupleSupport.ir/TupleSupport.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[4]: 'l-store-copy total#0 0'
@@ -2472,7 +2472,7 @@ debug: Coalescing tmp%0#0 with [tmp%0#1, tmp%0#2, tmp%0#3, tmp%0#4, tmp%0#5]
 debug: Coalescing resulted in 10 replacement/s
 debug: Sequentializing parallel copies in test_cases.tuple_support.tuple_comparisons.TupleComparisons.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to tuple_support/out_O2/TupleComparisons.ir/TupleComparisons.approval.0.approval.destructured.ir
+debug: Output IR to tuple_support/out_O2/TupleComparisons.ir/TupleComparisons.approval.0.destructured.ir
 info: optimizing clear program of test_cases.tuple_support.tuple_comparisons.TupleComparisons at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.tuple_support.tuple_comparisons.TupleComparisons.clear_state_program
@@ -2498,7 +2498,7 @@ debug: Coalescing local variables in test_cases.tuple_support.tuple_comparisons.
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.tuple_support.tuple_comparisons.TupleComparisons.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to tuple_support/out_O2/TupleComparisons.ir/TupleComparisons.clear.0.clear.destructured.ir
+debug: Output IR to tuple_support/out_O2/TupleComparisons.ir/TupleComparisons.clear.0.destructured.ir
 debug: Inserted main.ops[2]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[4]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[8]: 'l-store-copy tmp%0#0 0'
@@ -4310,7 +4310,7 @@ debug: * to_do a#4
 debug: * to_do total#0
 debug: * to_do loop_counter%1#0
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to tuple_support/out_O2/NestedTuples.ir/NestedTuples.approval.0.approval.destructured.ir
+debug: Output IR to tuple_support/out_O2/NestedTuples.ir/NestedTuples.approval.0.destructured.ir
 info: optimizing clear program of test_cases.tuple_support.nested_tuples.NestedTuples at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -4336,7 +4336,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to tuple_support/out_O2/NestedTuples.ir/NestedTuples.clear.0.clear.destructured.ir
+debug: Output IR to tuple_support/out_O2/NestedTuples.ir/NestedTuples.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%0#2 0'
diff --git a/test_cases/tuple_support/puya_unoptimized.log b/test_cases/tuple_support/puya_unoptimized.log
index 838c32506b..67a3007372 100644
--- a/test_cases/tuple_support/puya_unoptimized.log
+++ b/test_cases/tuple_support/puya_unoptimized.log
@@ -1367,7 +1367,7 @@ debug: Coalescing local variables in test_cases.tuple_support.tuple_support.test
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.tuple_support.tuple_support.test_empty
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to tuple_support/out_unoptimized/TupleSupport.ir/TupleSupport.approval.0.approval.destructured.ir
+debug: Output IR to tuple_support/out_unoptimized/TupleSupport.ir/TupleSupport.approval.0.destructured.ir
 info: optimizing clear program of test_cases.tuple_support.tuple_support.TupleSupport at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.tuple_support.tuple_support.TupleSupport.clear_state_program
@@ -1385,7 +1385,7 @@ debug: Coalescing local variables in test_cases.tuple_support.tuple_support.Tupl
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.tuple_support.tuple_support.TupleSupport.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to tuple_support/out_unoptimized/TupleSupport.ir/TupleSupport.clear.0.clear.destructured.ir
+debug: Output IR to tuple_support/out_unoptimized/TupleSupport.ir/TupleSupport.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%1#0 0'
@@ -1778,7 +1778,7 @@ debug: Coalescing local variables in test_cases.tuple_support.tuple_comparisons.
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.tuple_support.tuple_comparisons.test_tuple_cmp_empty
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to tuple_support/out_unoptimized/TupleComparisons.ir/TupleComparisons.approval.0.approval.destructured.ir
+debug: Output IR to tuple_support/out_unoptimized/TupleComparisons.ir/TupleComparisons.approval.0.destructured.ir
 info: optimizing clear program of test_cases.tuple_support.tuple_comparisons.TupleComparisons at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.tuple_support.tuple_comparisons.TupleComparisons.clear_state_program
@@ -1796,7 +1796,7 @@ debug: Coalescing local variables in test_cases.tuple_support.tuple_comparisons.
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.tuple_support.tuple_comparisons.TupleComparisons.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to tuple_support/out_unoptimized/TupleComparisons.ir/TupleComparisons.clear.0.clear.destructured.ir
+debug: Output IR to tuple_support/out_unoptimized/TupleComparisons.ir/TupleComparisons.clear.0.destructured.ir
 debug: Inserted test_tuple_cmp_eval.ops[6]: 'l-store-copy awst_tmp%0#0 0'
 debug: Replaced test_tuple_cmp_eval.ops[8]: 'v-load awst_tmp%0#0' with 'l-load awst_tmp%0#0'
 debug: Inserted test_tuple_cmp_eval.ops[9]: 'l-store-copy awst_tmp%0#0 0'
@@ -2656,7 +2656,7 @@ debug: Coalescing local variables in test_cases.tuple_support.nested_tuples.Nest
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.tuple_support.nested_tuples.NestedTuples.nested_named_tuple_params
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to tuple_support/out_unoptimized/NestedTuples.ir/NestedTuples.approval.0.approval.destructured.ir
+debug: Output IR to tuple_support/out_unoptimized/NestedTuples.ir/NestedTuples.approval.0.destructured.ir
 info: optimizing clear program of test_cases.tuple_support.nested_tuples.NestedTuples at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -2674,7 +2674,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to tuple_support/out_unoptimized/NestedTuples.ir/NestedTuples.clear.0.clear.destructured.ir
+debug: Output IR to tuple_support/out_unoptimized/NestedTuples.ir/NestedTuples.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main_after_if_else@2.ops[1]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/typed_abi_call/out/Greeter.ir/Greeter.approval.0.approval.ssa.ir b/test_cases/typed_abi_call/out/Greeter.ir/Greeter.approval.0.ssa.ir
similarity index 100%
rename from test_cases/typed_abi_call/out/Greeter.ir/Greeter.approval.0.approval.ssa.ir
rename to test_cases/typed_abi_call/out/Greeter.ir/Greeter.approval.0.ssa.ir
diff --git a/test_cases/typed_abi_call/out/Greeter.ir/Greeter.approval.1.approval.ssa.opt.ir b/test_cases/typed_abi_call/out/Greeter.ir/Greeter.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/typed_abi_call/out/Greeter.ir/Greeter.approval.1.approval.ssa.opt.ir
rename to test_cases/typed_abi_call/out/Greeter.ir/Greeter.approval.1.ssa.opt.ir
diff --git a/test_cases/typed_abi_call/out/Greeter.ir/Greeter.approval.2.approval.ssa.opt.ir b/test_cases/typed_abi_call/out/Greeter.ir/Greeter.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/typed_abi_call/out/Greeter.ir/Greeter.approval.2.approval.ssa.opt.ir
rename to test_cases/typed_abi_call/out/Greeter.ir/Greeter.approval.2.ssa.opt.ir
diff --git a/test_cases/typed_abi_call/out/Greeter.ir/Greeter.approval.3.approval.destructured.ir b/test_cases/typed_abi_call/out/Greeter.ir/Greeter.approval.3.destructured.ir
similarity index 100%
rename from test_cases/typed_abi_call/out/Greeter.ir/Greeter.approval.3.approval.destructured.ir
rename to test_cases/typed_abi_call/out/Greeter.ir/Greeter.approval.3.destructured.ir
diff --git a/test_cases/typed_abi_call/out/Greeter.ir/Greeter.clear.0.clear.ssa.ir b/test_cases/typed_abi_call/out/Greeter.ir/Greeter.clear.0.ssa.ir
similarity index 100%
rename from test_cases/typed_abi_call/out/Greeter.ir/Greeter.clear.0.clear.ssa.ir
rename to test_cases/typed_abi_call/out/Greeter.ir/Greeter.clear.0.ssa.ir
diff --git a/test_cases/typed_abi_call/out/Greeter.ir/Greeter.clear.1.clear.destructured.ir b/test_cases/typed_abi_call/out/Greeter.ir/Greeter.clear.1.destructured.ir
similarity index 100%
rename from test_cases/typed_abi_call/out/Greeter.ir/Greeter.clear.1.clear.destructured.ir
rename to test_cases/typed_abi_call/out/Greeter.ir/Greeter.clear.1.destructured.ir
diff --git a/test_cases/typed_abi_call/out/Logger.ir/Logger.approval.0.approval.ssa.ir b/test_cases/typed_abi_call/out/Logger.ir/Logger.approval.0.ssa.ir
similarity index 100%
rename from test_cases/typed_abi_call/out/Logger.ir/Logger.approval.0.approval.ssa.ir
rename to test_cases/typed_abi_call/out/Logger.ir/Logger.approval.0.ssa.ir
diff --git a/test_cases/typed_abi_call/out/Logger.ir/Logger.approval.1.approval.ssa.opt.ir b/test_cases/typed_abi_call/out/Logger.ir/Logger.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/typed_abi_call/out/Logger.ir/Logger.approval.1.approval.ssa.opt.ir
rename to test_cases/typed_abi_call/out/Logger.ir/Logger.approval.1.ssa.opt.ir
diff --git a/test_cases/typed_abi_call/out/Logger.ir/Logger.approval.2.approval.ssa.opt.ir b/test_cases/typed_abi_call/out/Logger.ir/Logger.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/typed_abi_call/out/Logger.ir/Logger.approval.2.approval.ssa.opt.ir
rename to test_cases/typed_abi_call/out/Logger.ir/Logger.approval.2.ssa.opt.ir
diff --git a/test_cases/typed_abi_call/out/Logger.ir/Logger.approval.3.approval.destructured.ir b/test_cases/typed_abi_call/out/Logger.ir/Logger.approval.3.destructured.ir
similarity index 100%
rename from test_cases/typed_abi_call/out/Logger.ir/Logger.approval.3.approval.destructured.ir
rename to test_cases/typed_abi_call/out/Logger.ir/Logger.approval.3.destructured.ir
diff --git a/test_cases/typed_abi_call/out/Logger.ir/Logger.clear.0.clear.ssa.ir b/test_cases/typed_abi_call/out/Logger.ir/Logger.clear.0.ssa.ir
similarity index 100%
rename from test_cases/typed_abi_call/out/Logger.ir/Logger.clear.0.clear.ssa.ir
rename to test_cases/typed_abi_call/out/Logger.ir/Logger.clear.0.ssa.ir
diff --git a/test_cases/typed_abi_call/out/Logger.ir/Logger.clear.1.clear.destructured.ir b/test_cases/typed_abi_call/out/Logger.ir/Logger.clear.1.destructured.ir
similarity index 100%
rename from test_cases/typed_abi_call/out/Logger.ir/Logger.clear.1.clear.destructured.ir
rename to test_cases/typed_abi_call/out/Logger.ir/Logger.clear.1.destructured.ir
diff --git a/test_cases/typed_abi_call/out_O2/Greeter.ir/Greeter.approval.0.approval.destructured.ir b/test_cases/typed_abi_call/out_O2/Greeter.ir/Greeter.approval.0.destructured.ir
similarity index 100%
rename from test_cases/typed_abi_call/out_O2/Greeter.ir/Greeter.approval.0.approval.destructured.ir
rename to test_cases/typed_abi_call/out_O2/Greeter.ir/Greeter.approval.0.destructured.ir
diff --git a/test_cases/typed_abi_call/out_O2/Greeter.ir/Greeter.clear.0.clear.destructured.ir b/test_cases/typed_abi_call/out_O2/Greeter.ir/Greeter.clear.0.destructured.ir
similarity index 100%
rename from test_cases/typed_abi_call/out_O2/Greeter.ir/Greeter.clear.0.clear.destructured.ir
rename to test_cases/typed_abi_call/out_O2/Greeter.ir/Greeter.clear.0.destructured.ir
diff --git a/test_cases/typed_abi_call/out_O2/Logger.ir/Logger.approval.0.approval.destructured.ir b/test_cases/typed_abi_call/out_O2/Logger.ir/Logger.approval.0.destructured.ir
similarity index 100%
rename from test_cases/typed_abi_call/out_O2/Logger.ir/Logger.approval.0.approval.destructured.ir
rename to test_cases/typed_abi_call/out_O2/Logger.ir/Logger.approval.0.destructured.ir
diff --git a/test_cases/typed_abi_call/out_O2/Logger.ir/Logger.clear.0.clear.destructured.ir b/test_cases/typed_abi_call/out_O2/Logger.ir/Logger.clear.0.destructured.ir
similarity index 100%
rename from test_cases/typed_abi_call/out_O2/Logger.ir/Logger.clear.0.clear.destructured.ir
rename to test_cases/typed_abi_call/out_O2/Logger.ir/Logger.clear.0.destructured.ir
diff --git a/test_cases/typed_abi_call/out_unoptimized/Greeter.ir/Greeter.approval.0.approval.destructured.ir b/test_cases/typed_abi_call/out_unoptimized/Greeter.ir/Greeter.approval.0.destructured.ir
similarity index 100%
rename from test_cases/typed_abi_call/out_unoptimized/Greeter.ir/Greeter.approval.0.approval.destructured.ir
rename to test_cases/typed_abi_call/out_unoptimized/Greeter.ir/Greeter.approval.0.destructured.ir
diff --git a/test_cases/typed_abi_call/out_unoptimized/Greeter.ir/Greeter.clear.0.clear.destructured.ir b/test_cases/typed_abi_call/out_unoptimized/Greeter.ir/Greeter.clear.0.destructured.ir
similarity index 100%
rename from test_cases/typed_abi_call/out_unoptimized/Greeter.ir/Greeter.clear.0.clear.destructured.ir
rename to test_cases/typed_abi_call/out_unoptimized/Greeter.ir/Greeter.clear.0.destructured.ir
diff --git a/test_cases/typed_abi_call/out_unoptimized/Logger.ir/Logger.approval.0.approval.destructured.ir b/test_cases/typed_abi_call/out_unoptimized/Logger.ir/Logger.approval.0.destructured.ir
similarity index 100%
rename from test_cases/typed_abi_call/out_unoptimized/Logger.ir/Logger.approval.0.approval.destructured.ir
rename to test_cases/typed_abi_call/out_unoptimized/Logger.ir/Logger.approval.0.destructured.ir
diff --git a/test_cases/typed_abi_call/out_unoptimized/Logger.ir/Logger.clear.0.clear.destructured.ir b/test_cases/typed_abi_call/out_unoptimized/Logger.ir/Logger.clear.0.destructured.ir
similarity index 100%
rename from test_cases/typed_abi_call/out_unoptimized/Logger.ir/Logger.clear.0.clear.destructured.ir
rename to test_cases/typed_abi_call/out_unoptimized/Logger.ir/Logger.clear.0.destructured.ir
diff --git a/test_cases/typed_abi_call/puya.log b/test_cases/typed_abi_call/puya.log
index fd1ba50683..c7f037f1c6 100644
--- a/test_cases/typed_abi_call/puya.log
+++ b/test_cases/typed_abi_call/puya.log
@@ -760,7 +760,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to typed_abi_call/out/Logger.ir/Logger.approval.0.approval.ssa.ir
+debug: Output IR to typed_abi_call/out/Logger.ir/Logger.approval.0.ssa.ir
 info: optimizing approval program of test_cases.typed_abi_call.logger.Logger at level 1
 debug: Begin optimization pass 1/100
 debug: marking trivial method test_cases.typed_abi_call.logger.Logger.no_args as inlineable
@@ -1287,7 +1287,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.typed_abi_call.logger.Logger.__puya_arc4_router__
-debug: Output IR to typed_abi_call/out/Logger.ir/Logger.approval.1.approval.ssa.opt.ir
+debug: Output IR to typed_abi_call/out/Logger.ir/Logger.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking trivial method test_cases.typed_abi_call.logger.Logger.no_args as inlineable
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
@@ -1595,7 +1595,7 @@ debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.typed_abi_call.logger.Logger.no_args
 debug: removing unused subroutine test_cases.typed_abi_call.logger.Logger.__algopy_default_create
-debug: Output IR to typed_abi_call/out/Logger.ir/Logger.approval.2.approval.ssa.opt.ir
+debug: Output IR to typed_abi_call/out/Logger.ir/Logger.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -1974,8 +1974,8 @@ debug: Coalescing local variables in test_cases.typed_abi_call.logger.Logger.log
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.typed_abi_call.logger.Logger.logs_are_equal
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to typed_abi_call/out/Logger.ir/Logger.approval.3.approval.destructured.ir
-debug: Output IR to typed_abi_call/out/Logger.ir/Logger.clear.0.clear.ssa.ir
+debug: Output IR to typed_abi_call/out/Logger.ir/Logger.approval.3.destructured.ir
+debug: Output IR to typed_abi_call/out/Logger.ir/Logger.clear.0.ssa.ir
 info: optimizing clear program of test_cases.typed_abi_call.logger.Logger at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -2001,7 +2001,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to typed_abi_call/out/Logger.ir/Logger.clear.1.clear.destructured.ir
+debug: Output IR to typed_abi_call/out/Logger.ir/Logger.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
@@ -2745,7 +2745,7 @@ typed_abi_call/logger.py:85 debug: optimizing TEAL subroutine test_cases.typed_a
 typed_abi_call/logger.py:96 debug: optimizing TEAL subroutine test_cases.typed_abi_call.logger.Logger.return_args_after_14th(_a1: bytes, _a2: bytes, _a3: bytes, _a4: bytes, _a5: bytes, _a6: bytes, _a7: bytes, _a8: bytes, _a9: bytes, _a10: bytes, _a11: bytes, _a12: bytes, _a13: bytes, _a14: bytes, a15: bytes, a16: bytes, a17: bytes, a18: bytes, a19: bytes, a20: bytes) -> bytes:
 typed_abi_call/logger.py:124 debug: optimizing TEAL subroutine test_cases.typed_abi_call.logger.Logger.logs_are_equal(log_1.level: uint64, log_1.message: bytes, log_2.level: uint64, log_2.message: bytes) -> uint64:
 debug: optimizing TEAL subroutine algopy.arc4.ARC4Contract.clear_state_program() -> uint64:
-debug: Output IR to typed_abi_call/out/Greeter.ir/Greeter.approval.0.approval.ssa.ir
+debug: Output IR to typed_abi_call/out/Greeter.ir/Greeter.approval.0.ssa.ir
 info: optimizing approval program of test_cases.typed_abi_call.typed_c2c.Greeter at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
@@ -9493,7 +9493,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.typed_abi_call.typed_c2c.Greeter.__puya_arc4_router__
-debug: Output IR to typed_abi_call/out/Greeter.ir/Greeter.approval.1.approval.ssa.opt.ir
+debug: Output IR to typed_abi_call/out/Greeter.ir/Greeter.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -9775,7 +9775,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.typed_abi_call.typed_c2c.Greeter.__algopy_default_create
-debug: Output IR to typed_abi_call/out/Greeter.ir/Greeter.approval.2.approval.ssa.opt.ir
+debug: Output IR to typed_abi_call/out/Greeter.ir/Greeter.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -10163,8 +10163,8 @@ debug: Coalescing result#0 with [result#1]
 debug: Coalescing resulted in 2 replacement/s
 debug: Sequentializing parallel copies in test_cases.typed_abi_call.typed_c2c.Greeter.test_named_tuples
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to typed_abi_call/out/Greeter.ir/Greeter.approval.3.approval.destructured.ir
-debug: Output IR to typed_abi_call/out/Greeter.ir/Greeter.clear.0.clear.ssa.ir
+debug: Output IR to typed_abi_call/out/Greeter.ir/Greeter.approval.3.destructured.ir
+debug: Output IR to typed_abi_call/out/Greeter.ir/Greeter.clear.0.ssa.ir
 info: optimizing clear program of test_cases.typed_abi_call.typed_c2c.Greeter at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -10190,7 +10190,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to typed_abi_call/out/Greeter.ir/Greeter.clear.1.clear.destructured.ir
+debug: Output IR to typed_abi_call/out/Greeter.ir/Greeter.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/typed_abi_call/puya_O2.log b/test_cases/typed_abi_call/puya_O2.log
index 78f3686213..04d52dfeee 100644
--- a/test_cases/typed_abi_call/puya_O2.log
+++ b/test_cases/typed_abi_call/puya_O2.log
@@ -2002,7 +2002,7 @@ debug: Coalescing encoded_tuple_buffer%5#0 with [encoded_tuple_buffer%5#1]
 debug: Coalescing resulted in 141 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to typed_abi_call/out_O2/Logger.ir/Logger.approval.0.approval.destructured.ir
+debug: Output IR to typed_abi_call/out_O2/Logger.ir/Logger.approval.0.destructured.ir
 info: optimizing clear program of test_cases.typed_abi_call.logger.Logger at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -2028,7 +2028,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to typed_abi_call/out_O2/Logger.ir/Logger.clear.0.clear.destructured.ir
+debug: Output IR to typed_abi_call/out_O2/Logger.ir/Logger.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
@@ -16418,7 +16418,7 @@ debug: Coalescing result#0 with [result#1]
 debug: Coalescing resulted in 696 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to typed_abi_call/out_O2/Greeter.ir/Greeter.approval.0.approval.destructured.ir
+debug: Output IR to typed_abi_call/out_O2/Greeter.ir/Greeter.approval.0.destructured.ir
 info: optimizing clear program of test_cases.typed_abi_call.typed_c2c.Greeter at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -16444,7 +16444,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to typed_abi_call/out_O2/Greeter.ir/Greeter.clear.0.clear.destructured.ir
+debug: Output IR to typed_abi_call/out_O2/Greeter.ir/Greeter.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/typed_abi_call/puya_unoptimized.log b/test_cases/typed_abi_call/puya_unoptimized.log
index 03c9b75e24..7829e51c04 100644
--- a/test_cases/typed_abi_call/puya_unoptimized.log
+++ b/test_cases/typed_abi_call/puya_unoptimized.log
@@ -1326,7 +1326,7 @@ debug: Coalescing local variables in test_cases.typed_abi_call.logger.Logger.log
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.typed_abi_call.logger.Logger.logs_are_equal
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to typed_abi_call/out_unoptimized/Logger.ir/Logger.approval.0.approval.destructured.ir
+debug: Output IR to typed_abi_call/out_unoptimized/Logger.ir/Logger.approval.0.destructured.ir
 info: optimizing clear program of test_cases.typed_abi_call.logger.Logger at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -1344,7 +1344,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to typed_abi_call/out_unoptimized/Logger.ir/Logger.clear.0.clear.destructured.ir
+debug: Output IR to typed_abi_call/out_unoptimized/Logger.ir/Logger.clear.0.destructured.ir
 debug: Inserted main_block@1.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main_block@1.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_block@1.ops[6]: 'l-store-copy tmp%1#0 0'
@@ -8356,7 +8356,7 @@ debug: Coalescing result#0 with [result#1]
 debug: Coalescing resulted in 2 replacement/s
 debug: Sequentializing parallel copies in test_cases.typed_abi_call.typed_c2c.Greeter.test_named_tuples
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to typed_abi_call/out_unoptimized/Greeter.ir/Greeter.approval.0.approval.destructured.ir
+debug: Output IR to typed_abi_call/out_unoptimized/Greeter.ir/Greeter.approval.0.destructured.ir
 info: optimizing clear program of test_cases.typed_abi_call.typed_c2c.Greeter at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -8374,7 +8374,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to typed_abi_call/out_unoptimized/Greeter.ir/Greeter.clear.0.clear.destructured.ir
+debug: Output IR to typed_abi_call/out_unoptimized/Greeter.ir/Greeter.clear.0.destructured.ir
 debug: Inserted main_block@1.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main_block@1.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_block@1.ops[6]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/typed_abi_call_txn/out/Caller.ir/Caller.approval.0.approval.ssa.ir b/test_cases/typed_abi_call_txn/out/Caller.ir/Caller.approval.0.ssa.ir
similarity index 100%
rename from test_cases/typed_abi_call_txn/out/Caller.ir/Caller.approval.0.approval.ssa.ir
rename to test_cases/typed_abi_call_txn/out/Caller.ir/Caller.approval.0.ssa.ir
diff --git a/test_cases/typed_abi_call_txn/out/Caller.ir/Caller.approval.1.approval.ssa.opt.ir b/test_cases/typed_abi_call_txn/out/Caller.ir/Caller.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/typed_abi_call_txn/out/Caller.ir/Caller.approval.1.approval.ssa.opt.ir
rename to test_cases/typed_abi_call_txn/out/Caller.ir/Caller.approval.1.ssa.opt.ir
diff --git a/test_cases/typed_abi_call_txn/out/Caller.ir/Caller.approval.2.approval.ssa.opt.ir b/test_cases/typed_abi_call_txn/out/Caller.ir/Caller.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/typed_abi_call_txn/out/Caller.ir/Caller.approval.2.approval.ssa.opt.ir
rename to test_cases/typed_abi_call_txn/out/Caller.ir/Caller.approval.2.ssa.opt.ir
diff --git a/test_cases/typed_abi_call_txn/out/Caller.ir/Caller.approval.3.approval.destructured.ir b/test_cases/typed_abi_call_txn/out/Caller.ir/Caller.approval.3.destructured.ir
similarity index 100%
rename from test_cases/typed_abi_call_txn/out/Caller.ir/Caller.approval.3.approval.destructured.ir
rename to test_cases/typed_abi_call_txn/out/Caller.ir/Caller.approval.3.destructured.ir
diff --git a/test_cases/typed_abi_call_txn/out/Caller.ir/Caller.clear.0.clear.ssa.ir b/test_cases/typed_abi_call_txn/out/Caller.ir/Caller.clear.0.ssa.ir
similarity index 100%
rename from test_cases/typed_abi_call_txn/out/Caller.ir/Caller.clear.0.clear.ssa.ir
rename to test_cases/typed_abi_call_txn/out/Caller.ir/Caller.clear.0.ssa.ir
diff --git a/test_cases/typed_abi_call_txn/out/Caller.ir/Caller.clear.1.clear.destructured.ir b/test_cases/typed_abi_call_txn/out/Caller.ir/Caller.clear.1.destructured.ir
similarity index 100%
rename from test_cases/typed_abi_call_txn/out/Caller.ir/Caller.clear.1.clear.destructured.ir
rename to test_cases/typed_abi_call_txn/out/Caller.ir/Caller.clear.1.destructured.ir
diff --git a/test_cases/typed_abi_call_txn/out/TxnContract.ir/TxnContract.approval.0.approval.ssa.ir b/test_cases/typed_abi_call_txn/out/TxnContract.ir/TxnContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/typed_abi_call_txn/out/TxnContract.ir/TxnContract.approval.0.approval.ssa.ir
rename to test_cases/typed_abi_call_txn/out/TxnContract.ir/TxnContract.approval.0.ssa.ir
diff --git a/test_cases/typed_abi_call_txn/out/TxnContract.ir/TxnContract.approval.1.approval.ssa.opt.ir b/test_cases/typed_abi_call_txn/out/TxnContract.ir/TxnContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/typed_abi_call_txn/out/TxnContract.ir/TxnContract.approval.1.approval.ssa.opt.ir
rename to test_cases/typed_abi_call_txn/out/TxnContract.ir/TxnContract.approval.1.ssa.opt.ir
diff --git a/test_cases/typed_abi_call_txn/out/TxnContract.ir/TxnContract.approval.2.approval.ssa.opt.ir b/test_cases/typed_abi_call_txn/out/TxnContract.ir/TxnContract.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/typed_abi_call_txn/out/TxnContract.ir/TxnContract.approval.2.approval.ssa.opt.ir
rename to test_cases/typed_abi_call_txn/out/TxnContract.ir/TxnContract.approval.2.ssa.opt.ir
diff --git a/test_cases/typed_abi_call_txn/out/TxnContract.ir/TxnContract.approval.3.approval.destructured.ir b/test_cases/typed_abi_call_txn/out/TxnContract.ir/TxnContract.approval.3.destructured.ir
similarity index 100%
rename from test_cases/typed_abi_call_txn/out/TxnContract.ir/TxnContract.approval.3.approval.destructured.ir
rename to test_cases/typed_abi_call_txn/out/TxnContract.ir/TxnContract.approval.3.destructured.ir
diff --git a/test_cases/typed_abi_call_txn/out/TxnContract.ir/TxnContract.clear.0.clear.ssa.ir b/test_cases/typed_abi_call_txn/out/TxnContract.ir/TxnContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/typed_abi_call_txn/out/TxnContract.ir/TxnContract.clear.0.clear.ssa.ir
rename to test_cases/typed_abi_call_txn/out/TxnContract.ir/TxnContract.clear.0.ssa.ir
diff --git a/test_cases/typed_abi_call_txn/out/TxnContract.ir/TxnContract.clear.1.clear.destructured.ir b/test_cases/typed_abi_call_txn/out/TxnContract.ir/TxnContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/typed_abi_call_txn/out/TxnContract.ir/TxnContract.clear.1.clear.destructured.ir
rename to test_cases/typed_abi_call_txn/out/TxnContract.ir/TxnContract.clear.1.destructured.ir
diff --git a/test_cases/typed_abi_call_txn/out_O2/Caller.ir/Caller.approval.0.approval.destructured.ir b/test_cases/typed_abi_call_txn/out_O2/Caller.ir/Caller.approval.0.destructured.ir
similarity index 100%
rename from test_cases/typed_abi_call_txn/out_O2/Caller.ir/Caller.approval.0.approval.destructured.ir
rename to test_cases/typed_abi_call_txn/out_O2/Caller.ir/Caller.approval.0.destructured.ir
diff --git a/test_cases/typed_abi_call_txn/out_O2/Caller.ir/Caller.clear.0.clear.destructured.ir b/test_cases/typed_abi_call_txn/out_O2/Caller.ir/Caller.clear.0.destructured.ir
similarity index 100%
rename from test_cases/typed_abi_call_txn/out_O2/Caller.ir/Caller.clear.0.clear.destructured.ir
rename to test_cases/typed_abi_call_txn/out_O2/Caller.ir/Caller.clear.0.destructured.ir
diff --git a/test_cases/typed_abi_call_txn/out_O2/TxnContract.ir/TxnContract.approval.0.approval.destructured.ir b/test_cases/typed_abi_call_txn/out_O2/TxnContract.ir/TxnContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/typed_abi_call_txn/out_O2/TxnContract.ir/TxnContract.approval.0.approval.destructured.ir
rename to test_cases/typed_abi_call_txn/out_O2/TxnContract.ir/TxnContract.approval.0.destructured.ir
diff --git a/test_cases/typed_abi_call_txn/out_O2/TxnContract.ir/TxnContract.clear.0.clear.destructured.ir b/test_cases/typed_abi_call_txn/out_O2/TxnContract.ir/TxnContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/typed_abi_call_txn/out_O2/TxnContract.ir/TxnContract.clear.0.clear.destructured.ir
rename to test_cases/typed_abi_call_txn/out_O2/TxnContract.ir/TxnContract.clear.0.destructured.ir
diff --git a/test_cases/typed_abi_call_txn/out_unoptimized/Caller.ir/Caller.approval.0.approval.destructured.ir b/test_cases/typed_abi_call_txn/out_unoptimized/Caller.ir/Caller.approval.0.destructured.ir
similarity index 100%
rename from test_cases/typed_abi_call_txn/out_unoptimized/Caller.ir/Caller.approval.0.approval.destructured.ir
rename to test_cases/typed_abi_call_txn/out_unoptimized/Caller.ir/Caller.approval.0.destructured.ir
diff --git a/test_cases/typed_abi_call_txn/out_unoptimized/Caller.ir/Caller.clear.0.clear.destructured.ir b/test_cases/typed_abi_call_txn/out_unoptimized/Caller.ir/Caller.clear.0.destructured.ir
similarity index 100%
rename from test_cases/typed_abi_call_txn/out_unoptimized/Caller.ir/Caller.clear.0.clear.destructured.ir
rename to test_cases/typed_abi_call_txn/out_unoptimized/Caller.ir/Caller.clear.0.destructured.ir
diff --git a/test_cases/typed_abi_call_txn/out_unoptimized/TxnContract.ir/TxnContract.approval.0.approval.destructured.ir b/test_cases/typed_abi_call_txn/out_unoptimized/TxnContract.ir/TxnContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/typed_abi_call_txn/out_unoptimized/TxnContract.ir/TxnContract.approval.0.approval.destructured.ir
rename to test_cases/typed_abi_call_txn/out_unoptimized/TxnContract.ir/TxnContract.approval.0.destructured.ir
diff --git a/test_cases/typed_abi_call_txn/out_unoptimized/TxnContract.ir/TxnContract.clear.0.clear.destructured.ir b/test_cases/typed_abi_call_txn/out_unoptimized/TxnContract.ir/TxnContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/typed_abi_call_txn/out_unoptimized/TxnContract.ir/TxnContract.clear.0.clear.destructured.ir
rename to test_cases/typed_abi_call_txn/out_unoptimized/TxnContract.ir/TxnContract.clear.0.destructured.ir
diff --git a/test_cases/typed_abi_call_txn/puya.log b/test_cases/typed_abi_call_txn/puya.log
index 61cffa73ee..4e5b5c3b1a 100644
--- a/test_cases/typed_abi_call_txn/puya.log
+++ b/test_cases/typed_abi_call_txn/puya.log
@@ -527,7 +527,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to typed_abi_call_txn/out/TxnContract.ir/TxnContract.approval.0.approval.ssa.ir
+debug: Output IR to typed_abi_call_txn/out/TxnContract.ir/TxnContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.typed_abi_call_txn.txn_contract.TxnContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
@@ -674,7 +674,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.typed_abi_call_txn.txn_contract.TxnContract.__puya_arc4_router__
-debug: Output IR to typed_abi_call_txn/out/TxnContract.ir/TxnContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to typed_abi_call_txn/out/TxnContract.ir/TxnContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -757,7 +757,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.typed_abi_call_txn.txn_contract.TxnContract.__algopy_default_create
-debug: Output IR to typed_abi_call_txn/out/TxnContract.ir/TxnContract.approval.2.approval.ssa.opt.ir
+debug: Output IR to typed_abi_call_txn/out/TxnContract.ir/TxnContract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -850,8 +850,8 @@ debug: Coalescing local variables in test_cases.typed_abi_call_txn.txn_contract.
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.typed_abi_call_txn.txn_contract.TxnContract.call_with_acfg_no_return
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to typed_abi_call_txn/out/TxnContract.ir/TxnContract.approval.3.approval.destructured.ir
-debug: Output IR to typed_abi_call_txn/out/TxnContract.ir/TxnContract.clear.0.clear.ssa.ir
+debug: Output IR to typed_abi_call_txn/out/TxnContract.ir/TxnContract.approval.3.destructured.ir
+debug: Output IR to typed_abi_call_txn/out/TxnContract.ir/TxnContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.typed_abi_call_txn.txn_contract.TxnContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -877,7 +877,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to typed_abi_call_txn/out/TxnContract.ir/TxnContract.clear.1.clear.destructured.ir
+debug: Output IR to typed_abi_call_txn/out/TxnContract.ir/TxnContract.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
@@ -1022,7 +1022,7 @@ typed_abi_call_txn/txn_contract.py:12 debug: optimizing TEAL subroutine test_cas
 typed_abi_call_txn/txn_contract.py:20 debug: optimizing TEAL subroutine test_cases.typed_abi_call_txn.txn_contract.TxnContract.call_with_acfg(a: bytes, acfg: uint64, b: bytes) -> uint64:
 typed_abi_call_txn/txn_contract.py:27 debug: optimizing TEAL subroutine test_cases.typed_abi_call_txn.txn_contract.TxnContract.call_with_acfg_no_return(a: bytes, acfg: uint64, b: bytes) -> void:
 debug: optimizing TEAL subroutine algopy.arc4.ARC4Contract.clear_state_program() -> uint64:
-debug: Output IR to typed_abi_call_txn/out/Caller.ir/Caller.approval.0.approval.ssa.ir
+debug: Output IR to typed_abi_call_txn/out/Caller.ir/Caller.approval.0.ssa.ir
 info: optimizing approval program of test_cases.typed_abi_call_txn.caller.Caller at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
@@ -1850,7 +1850,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.typed_abi_call_txn.caller.Caller.__puya_arc4_router__
-debug: Output IR to typed_abi_call_txn/out/Caller.ir/Caller.approval.1.approval.ssa.opt.ir
+debug: Output IR to typed_abi_call_txn/out/Caller.ir/Caller.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -1950,7 +1950,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.typed_abi_call_txn.caller.Caller.__algopy_default_create
-debug: Output IR to typed_abi_call_txn/out/Caller.ir/Caller.approval.2.approval.ssa.opt.ir
+debug: Output IR to typed_abi_call_txn/out/Caller.ir/Caller.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -2065,8 +2065,8 @@ debug: Coalescing local variables in test_cases.typed_abi_call_txn.caller.Caller
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.typed_abi_call_txn.caller.Caller.test_call_with_acfg_no_return
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to typed_abi_call_txn/out/Caller.ir/Caller.approval.3.approval.destructured.ir
-debug: Output IR to typed_abi_call_txn/out/Caller.ir/Caller.clear.0.clear.ssa.ir
+debug: Output IR to typed_abi_call_txn/out/Caller.ir/Caller.approval.3.destructured.ir
+debug: Output IR to typed_abi_call_txn/out/Caller.ir/Caller.clear.0.ssa.ir
 info: optimizing clear program of test_cases.typed_abi_call_txn.caller.Caller at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -2092,7 +2092,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to typed_abi_call_txn/out/Caller.ir/Caller.clear.1.clear.destructured.ir
+debug: Output IR to typed_abi_call_txn/out/Caller.ir/Caller.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/typed_abi_call_txn/puya_O2.log b/test_cases/typed_abi_call_txn/puya_O2.log
index fe51af029f..109fea3d99 100644
--- a/test_cases/typed_abi_call_txn/puya_O2.log
+++ b/test_cases/typed_abi_call_txn/puya_O2.log
@@ -853,7 +853,7 @@ debug: Coalescing test_cases.typed_abi_call_txn.txn_contract.TxnContract.__puya_
 debug: Coalescing resulted in 43 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to typed_abi_call_txn/out_O2/TxnContract.ir/TxnContract.approval.0.approval.destructured.ir
+debug: Output IR to typed_abi_call_txn/out_O2/TxnContract.ir/TxnContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.typed_abi_call_txn.txn_contract.TxnContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -879,7 +879,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to typed_abi_call_txn/out_O2/TxnContract.ir/TxnContract.clear.0.clear.destructured.ir
+debug: Output IR to typed_abi_call_txn/out_O2/TxnContract.ir/TxnContract.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
@@ -2729,7 +2729,7 @@ debug: Coalescing tmp%0#0 with [tmp%0#6, tmp%0#2]
 debug: Coalescing resulted in 106 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to typed_abi_call_txn/out_O2/Caller.ir/Caller.approval.0.approval.destructured.ir
+debug: Output IR to typed_abi_call_txn/out_O2/Caller.ir/Caller.approval.0.destructured.ir
 info: optimizing clear program of test_cases.typed_abi_call_txn.caller.Caller at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -2755,7 +2755,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to typed_abi_call_txn/out_O2/Caller.ir/Caller.clear.0.clear.destructured.ir
+debug: Output IR to typed_abi_call_txn/out_O2/Caller.ir/Caller.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/typed_abi_call_txn/puya_unoptimized.log b/test_cases/typed_abi_call_txn/puya_unoptimized.log
index 6c0ea10ffd..374a1c651f 100644
--- a/test_cases/typed_abi_call_txn/puya_unoptimized.log
+++ b/test_cases/typed_abi_call_txn/puya_unoptimized.log
@@ -671,7 +671,7 @@ debug: Coalescing local variables in test_cases.typed_abi_call_txn.txn_contract.
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.typed_abi_call_txn.txn_contract.TxnContract.call_with_acfg_no_return
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to typed_abi_call_txn/out_unoptimized/TxnContract.ir/TxnContract.approval.0.approval.destructured.ir
+debug: Output IR to typed_abi_call_txn/out_unoptimized/TxnContract.ir/TxnContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.typed_abi_call_txn.txn_contract.TxnContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -689,7 +689,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to typed_abi_call_txn/out_unoptimized/TxnContract.ir/TxnContract.clear.0.clear.destructured.ir
+debug: Output IR to typed_abi_call_txn/out_unoptimized/TxnContract.ir/TxnContract.clear.0.destructured.ir
 debug: Inserted main_block@1.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main_block@1.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_block@1.ops[6]: 'l-store-copy tmp%1#0 0'
@@ -1662,7 +1662,7 @@ debug: Coalescing local variables in test_cases.typed_abi_call_txn.caller.Caller
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.typed_abi_call_txn.caller.Caller.test_call_with_acfg_no_return
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to typed_abi_call_txn/out_unoptimized/Caller.ir/Caller.approval.0.approval.destructured.ir
+debug: Output IR to typed_abi_call_txn/out_unoptimized/Caller.ir/Caller.approval.0.destructured.ir
 info: optimizing clear program of test_cases.typed_abi_call_txn.caller.Caller at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -1680,7 +1680,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to typed_abi_call_txn/out_unoptimized/Caller.ir/Caller.clear.0.clear.destructured.ir
+debug: Output IR to typed_abi_call_txn/out_unoptimized/Caller.ir/Caller.clear.0.destructured.ir
 debug: Inserted main_block@1.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main_block@1.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_block@1.ops[6]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/unary/out/UnaryContract.ir/UnaryContract.approval.0.approval.ssa.ir b/test_cases/unary/out/UnaryContract.ir/UnaryContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/unary/out/UnaryContract.ir/UnaryContract.approval.0.approval.ssa.ir
rename to test_cases/unary/out/UnaryContract.ir/UnaryContract.approval.0.ssa.ir
diff --git a/test_cases/unary/out/UnaryContract.ir/UnaryContract.approval.1.approval.ssa.opt.ir b/test_cases/unary/out/UnaryContract.ir/UnaryContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/unary/out/UnaryContract.ir/UnaryContract.approval.1.approval.ssa.opt.ir
rename to test_cases/unary/out/UnaryContract.ir/UnaryContract.approval.1.ssa.opt.ir
diff --git a/test_cases/unary/out/UnaryContract.ir/UnaryContract.approval.2.approval.destructured.ir b/test_cases/unary/out/UnaryContract.ir/UnaryContract.approval.2.destructured.ir
similarity index 100%
rename from test_cases/unary/out/UnaryContract.ir/UnaryContract.approval.2.approval.destructured.ir
rename to test_cases/unary/out/UnaryContract.ir/UnaryContract.approval.2.destructured.ir
diff --git a/test_cases/unary/out/UnaryContract.ir/UnaryContract.clear.0.clear.ssa.ir b/test_cases/unary/out/UnaryContract.ir/UnaryContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/unary/out/UnaryContract.ir/UnaryContract.clear.0.clear.ssa.ir
rename to test_cases/unary/out/UnaryContract.ir/UnaryContract.clear.0.ssa.ir
diff --git a/test_cases/unary/out/UnaryContract.ir/UnaryContract.clear.1.clear.destructured.ir b/test_cases/unary/out/UnaryContract.ir/UnaryContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/unary/out/UnaryContract.ir/UnaryContract.clear.1.clear.destructured.ir
rename to test_cases/unary/out/UnaryContract.ir/UnaryContract.clear.1.destructured.ir
diff --git a/test_cases/unary/out_O2/UnaryContract.ir/UnaryContract.approval.0.approval.destructured.ir b/test_cases/unary/out_O2/UnaryContract.ir/UnaryContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/unary/out_O2/UnaryContract.ir/UnaryContract.approval.0.approval.destructured.ir
rename to test_cases/unary/out_O2/UnaryContract.ir/UnaryContract.approval.0.destructured.ir
diff --git a/test_cases/unary/out_O2/UnaryContract.ir/UnaryContract.clear.0.clear.destructured.ir b/test_cases/unary/out_O2/UnaryContract.ir/UnaryContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/unary/out_O2/UnaryContract.ir/UnaryContract.clear.0.clear.destructured.ir
rename to test_cases/unary/out_O2/UnaryContract.ir/UnaryContract.clear.0.destructured.ir
diff --git a/test_cases/unary/out_unoptimized/UnaryContract.ir/UnaryContract.approval.0.approval.destructured.ir b/test_cases/unary/out_unoptimized/UnaryContract.ir/UnaryContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/unary/out_unoptimized/UnaryContract.ir/UnaryContract.approval.0.approval.destructured.ir
rename to test_cases/unary/out_unoptimized/UnaryContract.ir/UnaryContract.approval.0.destructured.ir
diff --git a/test_cases/unary/out_unoptimized/UnaryContract.ir/UnaryContract.clear.0.clear.destructured.ir b/test_cases/unary/out_unoptimized/UnaryContract.ir/UnaryContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/unary/out_unoptimized/UnaryContract.ir/UnaryContract.clear.0.clear.destructured.ir
rename to test_cases/unary/out_unoptimized/UnaryContract.ir/UnaryContract.clear.0.destructured.ir
diff --git a/test_cases/unary/puya.log b/test_cases/unary/puya.log
index 8ca922fb3c..4e44c3a109 100644
--- a/test_cases/unary/puya.log
+++ b/test_cases/unary/puya.log
@@ -440,7 +440,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to unary/out/UnaryContract.ir/UnaryContract.approval.0.approval.ssa.ir
+debug: Output IR to unary/out/UnaryContract.ir/UnaryContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.unary.contract.UnaryContract at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.unary.contract.uint_unary for inlining
@@ -565,7 +565,7 @@ debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.unary.contract.uint_unary
 debug: removing unused subroutine test_cases.unary.contract.biguint_unary
 debug: removing unused subroutine test_cases.unary.contract.bytes_unary
-debug: Output IR to unary/out/UnaryContract.ir/UnaryContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to unary/out/UnaryContract.ir/UnaryContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.unary.contract.UnaryContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -622,8 +622,8 @@ debug: to_do: loop_counter%0#0, i#0
 debug: * to_do i#0
 debug: * to_do loop_counter%0#0
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to unary/out/UnaryContract.ir/UnaryContract.approval.2.approval.destructured.ir
-debug: Output IR to unary/out/UnaryContract.ir/UnaryContract.clear.0.clear.ssa.ir
+debug: Output IR to unary/out/UnaryContract.ir/UnaryContract.approval.2.destructured.ir
+debug: Output IR to unary/out/UnaryContract.ir/UnaryContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.unary.contract.UnaryContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.unary.contract.UnaryContract.clear_state_program
@@ -649,7 +649,7 @@ debug: Coalescing local variables in test_cases.unary.contract.UnaryContract.cle
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.unary.contract.UnaryContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to unary/out/UnaryContract.ir/UnaryContract.clear.1.clear.destructured.ir
+debug: Output IR to unary/out/UnaryContract.ir/UnaryContract.clear.1.destructured.ir
 debug: Inserted main_for_body@2.ops[3]: 'l-store-copy tmp%1#0 0'
 debug: Replaced main_for_body@2.ops[5]: 'v-load tmp%1#0' with 'l-load tmp%1#0'
 debug: Inserted main_for_body@2.ops[7]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/unary/puya_O2.log b/test_cases/unary/puya_O2.log
index 109fe05f94..932de8b119 100644
--- a/test_cases/unary/puya_O2.log
+++ b/test_cases/unary/puya_O2.log
@@ -619,7 +619,7 @@ debug: to_do: loop_counter%0#0, i#0
 debug: * to_do i#0
 debug: * to_do loop_counter%0#0
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to unary/out_O2/UnaryContract.ir/UnaryContract.approval.0.approval.destructured.ir
+debug: Output IR to unary/out_O2/UnaryContract.ir/UnaryContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.unary.contract.UnaryContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.unary.contract.UnaryContract.clear_state_program
@@ -645,7 +645,7 @@ debug: Coalescing local variables in test_cases.unary.contract.UnaryContract.cle
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.unary.contract.UnaryContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to unary/out_O2/UnaryContract.ir/UnaryContract.clear.0.clear.destructured.ir
+debug: Output IR to unary/out_O2/UnaryContract.ir/UnaryContract.clear.0.destructured.ir
 debug: Inserted main_for_body@2.ops[3]: 'l-store-copy tmp%1#0 0'
 debug: Replaced main_for_body@2.ops[5]: 'v-load tmp%1#0' with 'l-load tmp%1#0'
 debug: Inserted main_for_body@2.ops[7]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/unary/puya_unoptimized.log b/test_cases/unary/puya_unoptimized.log
index 6727a5341a..d06a3e8213 100644
--- a/test_cases/unary/puya_unoptimized.log
+++ b/test_cases/unary/puya_unoptimized.log
@@ -530,7 +530,7 @@ debug: Coalescing local variables in test_cases.unary.contract.bytes_unary using
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.unary.contract.bytes_unary
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to unary/out_unoptimized/UnaryContract.ir/UnaryContract.approval.0.approval.destructured.ir
+debug: Output IR to unary/out_unoptimized/UnaryContract.ir/UnaryContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.unary.contract.UnaryContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.unary.contract.UnaryContract.clear_state_program
@@ -548,7 +548,7 @@ debug: Coalescing local variables in test_cases.unary.contract.UnaryContract.cle
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.unary.contract.UnaryContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to unary/out_unoptimized/UnaryContract.ir/UnaryContract.clear.0.clear.destructured.ir
+debug: Output IR to unary/out_unoptimized/UnaryContract.ir/UnaryContract.clear.0.destructured.ir
 debug: Inserted uint_unary.ops[3]: 'l-store-copy tmp%0#0 0'
 debug: Replaced uint_unary.ops[5]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted uint_unary_for_body@1.ops[3]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/unassigned_expression/out/Unassigned.ir/Unassigned.approval.0.approval.ssa.ir b/test_cases/unassigned_expression/out/Unassigned.ir/Unassigned.approval.0.ssa.ir
similarity index 100%
rename from test_cases/unassigned_expression/out/Unassigned.ir/Unassigned.approval.0.approval.ssa.ir
rename to test_cases/unassigned_expression/out/Unassigned.ir/Unassigned.approval.0.ssa.ir
diff --git a/test_cases/unassigned_expression/out/Unassigned.ir/Unassigned.approval.1.approval.ssa.opt.ir b/test_cases/unassigned_expression/out/Unassigned.ir/Unassigned.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/unassigned_expression/out/Unassigned.ir/Unassigned.approval.1.approval.ssa.opt.ir
rename to test_cases/unassigned_expression/out/Unassigned.ir/Unassigned.approval.1.ssa.opt.ir
diff --git a/test_cases/unassigned_expression/out/Unassigned.ir/Unassigned.approval.2.approval.ssa.opt.ir b/test_cases/unassigned_expression/out/Unassigned.ir/Unassigned.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/unassigned_expression/out/Unassigned.ir/Unassigned.approval.2.approval.ssa.opt.ir
rename to test_cases/unassigned_expression/out/Unassigned.ir/Unassigned.approval.2.ssa.opt.ir
diff --git a/test_cases/unassigned_expression/out/Unassigned.ir/Unassigned.approval.3.approval.destructured.ir b/test_cases/unassigned_expression/out/Unassigned.ir/Unassigned.approval.3.destructured.ir
similarity index 100%
rename from test_cases/unassigned_expression/out/Unassigned.ir/Unassigned.approval.3.approval.destructured.ir
rename to test_cases/unassigned_expression/out/Unassigned.ir/Unassigned.approval.3.destructured.ir
diff --git a/test_cases/unassigned_expression/out/Unassigned.ir/Unassigned.clear.0.clear.ssa.ir b/test_cases/unassigned_expression/out/Unassigned.ir/Unassigned.clear.0.ssa.ir
similarity index 100%
rename from test_cases/unassigned_expression/out/Unassigned.ir/Unassigned.clear.0.clear.ssa.ir
rename to test_cases/unassigned_expression/out/Unassigned.ir/Unassigned.clear.0.ssa.ir
diff --git a/test_cases/unassigned_expression/out/Unassigned.ir/Unassigned.clear.1.clear.destructured.ir b/test_cases/unassigned_expression/out/Unassigned.ir/Unassigned.clear.1.destructured.ir
similarity index 100%
rename from test_cases/unassigned_expression/out/Unassigned.ir/Unassigned.clear.1.clear.destructured.ir
rename to test_cases/unassigned_expression/out/Unassigned.ir/Unassigned.clear.1.destructured.ir
diff --git a/test_cases/unassigned_expression/out_O2/Unassigned.ir/Unassigned.approval.0.approval.destructured.ir b/test_cases/unassigned_expression/out_O2/Unassigned.ir/Unassigned.approval.0.destructured.ir
similarity index 100%
rename from test_cases/unassigned_expression/out_O2/Unassigned.ir/Unassigned.approval.0.approval.destructured.ir
rename to test_cases/unassigned_expression/out_O2/Unassigned.ir/Unassigned.approval.0.destructured.ir
diff --git a/test_cases/unassigned_expression/out_O2/Unassigned.ir/Unassigned.clear.0.clear.destructured.ir b/test_cases/unassigned_expression/out_O2/Unassigned.ir/Unassigned.clear.0.destructured.ir
similarity index 100%
rename from test_cases/unassigned_expression/out_O2/Unassigned.ir/Unassigned.clear.0.clear.destructured.ir
rename to test_cases/unassigned_expression/out_O2/Unassigned.ir/Unassigned.clear.0.destructured.ir
diff --git a/test_cases/unassigned_expression/out_unoptimized/Unassigned.ir/Unassigned.approval.0.approval.destructured.ir b/test_cases/unassigned_expression/out_unoptimized/Unassigned.ir/Unassigned.approval.0.destructured.ir
similarity index 100%
rename from test_cases/unassigned_expression/out_unoptimized/Unassigned.ir/Unassigned.approval.0.approval.destructured.ir
rename to test_cases/unassigned_expression/out_unoptimized/Unassigned.ir/Unassigned.approval.0.destructured.ir
diff --git a/test_cases/unassigned_expression/out_unoptimized/Unassigned.ir/Unassigned.clear.0.clear.destructured.ir b/test_cases/unassigned_expression/out_unoptimized/Unassigned.ir/Unassigned.clear.0.destructured.ir
similarity index 100%
rename from test_cases/unassigned_expression/out_unoptimized/Unassigned.ir/Unassigned.clear.0.clear.destructured.ir
rename to test_cases/unassigned_expression/out_unoptimized/Unassigned.ir/Unassigned.clear.0.destructured.ir
diff --git a/test_cases/unassigned_expression/puya.log b/test_cases/unassigned_expression/puya.log
index 47be9ec264..9511bfb521 100644
--- a/test_cases/unassigned_expression/puya.log
+++ b/test_cases/unassigned_expression/puya.log
@@ -443,7 +443,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to unassigned_expression/out/Unassigned.ir/Unassigned.approval.0.approval.ssa.ir
+debug: Output IR to unassigned_expression/out/Unassigned.ir/Unassigned.approval.0.ssa.ir
 info: optimizing approval program of test_cases.unassigned_expression.contract.Unassigned at level 1
 debug: Begin optimization pass 1/100
 debug: marking trivial method test_cases.unassigned_expression.contract.get_a_value as inlineable
@@ -608,7 +608,7 @@ debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.unassigned_expression.contract.Unassigned.__puya_arc4_router__
 debug: removing unused subroutine test_cases.unassigned_expression.contract.get_a_value
-debug: Output IR to unassigned_expression/out/Unassigned.ir/Unassigned.approval.1.approval.ssa.opt.ir
+debug: Output IR to unassigned_expression/out/Unassigned.ir/Unassigned.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking trivial method test_cases.unassigned_expression.contract.Unassigned.discard_op as inlineable
 debug: marking trivial method test_cases.unassigned_expression.contract.Unassigned.discard_subroutine as inlineable
@@ -712,7 +712,7 @@ debug: removing unused subroutine test_cases.unassigned_expression.contract.Unas
 debug: removing unused subroutine test_cases.unassigned_expression.contract.Unassigned.discard_subroutine
 debug: removing unused subroutine test_cases.unassigned_expression.contract.Unassigned.discard_constants
 debug: removing unused subroutine test_cases.unassigned_expression.contract.Unassigned.__algopy_default_create
-debug: Output IR to unassigned_expression/out/Unassigned.ir/Unassigned.approval.2.approval.ssa.opt.ir
+debug: Output IR to unassigned_expression/out/Unassigned.ir/Unassigned.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -739,8 +739,8 @@ debug: Coalescing tmp%0#0 with [tmp%0#2]
 debug: Coalescing resulted in 14 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.approval_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to unassigned_expression/out/Unassigned.ir/Unassigned.approval.3.approval.destructured.ir
-debug: Output IR to unassigned_expression/out/Unassigned.ir/Unassigned.clear.0.clear.ssa.ir
+debug: Output IR to unassigned_expression/out/Unassigned.ir/Unassigned.approval.3.destructured.ir
+debug: Output IR to unassigned_expression/out/Unassigned.ir/Unassigned.clear.0.ssa.ir
 info: optimizing clear program of test_cases.unassigned_expression.contract.Unassigned at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -766,7 +766,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to unassigned_expression/out/Unassigned.ir/Unassigned.clear.1.clear.destructured.ir
+debug: Output IR to unassigned_expression/out/Unassigned.ir/Unassigned.clear.1.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/unassigned_expression/puya_O2.log b/test_cases/unassigned_expression/puya_O2.log
index 731f5e5f7d..3750477aec 100644
--- a/test_cases/unassigned_expression/puya_O2.log
+++ b/test_cases/unassigned_expression/puya_O2.log
@@ -746,7 +746,7 @@ debug: Coalescing tmp%0#0 with [tmp%0#2]
 debug: Coalescing resulted in 14 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to unassigned_expression/out_O2/Unassigned.ir/Unassigned.approval.0.approval.destructured.ir
+debug: Output IR to unassigned_expression/out_O2/Unassigned.ir/Unassigned.approval.0.destructured.ir
 info: optimizing clear program of test_cases.unassigned_expression.contract.Unassigned at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -772,7 +772,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to unassigned_expression/out_O2/Unassigned.ir/Unassigned.clear.0.clear.destructured.ir
+debug: Output IR to unassigned_expression/out_O2/Unassigned.ir/Unassigned.clear.0.destructured.ir
 debug: Inserted main.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_abi_routing@2.ops[1]: 'l-store-copy tmp%2#0 0'
diff --git a/test_cases/unassigned_expression/puya_unoptimized.log b/test_cases/unassigned_expression/puya_unoptimized.log
index 30db91d950..acc83c0e7f 100644
--- a/test_cases/unassigned_expression/puya_unoptimized.log
+++ b/test_cases/unassigned_expression/puya_unoptimized.log
@@ -615,7 +615,7 @@ debug: Coalescing local variables in test_cases.unassigned_expression.contract.U
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.unassigned_expression.contract.Unassigned.discard_constants
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to unassigned_expression/out_unoptimized/Unassigned.ir/Unassigned.approval.0.approval.destructured.ir
+debug: Output IR to unassigned_expression/out_unoptimized/Unassigned.ir/Unassigned.approval.0.destructured.ir
 info: optimizing clear program of test_cases.unassigned_expression.contract.Unassigned at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine algopy.arc4.ARC4Contract.clear_state_program
@@ -633,7 +633,7 @@ debug: Coalescing local variables in algopy.arc4.ARC4Contract.clear_state_progra
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in algopy.arc4.ARC4Contract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to unassigned_expression/out_unoptimized/Unassigned.ir/Unassigned.clear.0.clear.destructured.ir
+debug: Output IR to unassigned_expression/out_unoptimized/Unassigned.ir/Unassigned.clear.0.destructured.ir
 debug: Inserted main_block@1.ops[1]: 'l-store-copy tmp%0#1 0'
 debug: Replaced main_block@1.ops[3]: 'v-load tmp%0#1' with 'l-load tmp%0#1'
 debug: Inserted main_block@1.ops[6]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/undefined_phi_args/out/Baddie.ir/Baddie.approval.0.approval.ssa.ir b/test_cases/undefined_phi_args/out/Baddie.ir/Baddie.approval.0.ssa.ir
similarity index 100%
rename from test_cases/undefined_phi_args/out/Baddie.ir/Baddie.approval.0.approval.ssa.ir
rename to test_cases/undefined_phi_args/out/Baddie.ir/Baddie.approval.0.ssa.ir
diff --git a/test_cases/undefined_phi_args/out/Baddie.ir/Baddie.approval.1.approval.ssa.opt.ir b/test_cases/undefined_phi_args/out/Baddie.ir/Baddie.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/undefined_phi_args/out/Baddie.ir/Baddie.approval.1.approval.ssa.opt.ir
rename to test_cases/undefined_phi_args/out/Baddie.ir/Baddie.approval.1.ssa.opt.ir
diff --git a/test_cases/undefined_phi_args/out/Baddie.ir/Baddie.approval.2.approval.ssa.opt.ir b/test_cases/undefined_phi_args/out/Baddie.ir/Baddie.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/undefined_phi_args/out/Baddie.ir/Baddie.approval.2.approval.ssa.opt.ir
rename to test_cases/undefined_phi_args/out/Baddie.ir/Baddie.approval.2.ssa.opt.ir
diff --git a/test_cases/undefined_phi_args/out/Baddie.ir/Baddie.approval.3.approval.ssa.opt.ir b/test_cases/undefined_phi_args/out/Baddie.ir/Baddie.approval.3.ssa.opt.ir
similarity index 100%
rename from test_cases/undefined_phi_args/out/Baddie.ir/Baddie.approval.3.approval.ssa.opt.ir
rename to test_cases/undefined_phi_args/out/Baddie.ir/Baddie.approval.3.ssa.opt.ir
diff --git a/test_cases/undefined_phi_args/out/Baddie.ir/Baddie.approval.4.approval.destructured.ir b/test_cases/undefined_phi_args/out/Baddie.ir/Baddie.approval.4.destructured.ir
similarity index 100%
rename from test_cases/undefined_phi_args/out/Baddie.ir/Baddie.approval.4.approval.destructured.ir
rename to test_cases/undefined_phi_args/out/Baddie.ir/Baddie.approval.4.destructured.ir
diff --git a/test_cases/undefined_phi_args/out/Baddie.ir/Baddie.clear.0.clear.ssa.ir b/test_cases/undefined_phi_args/out/Baddie.ir/Baddie.clear.0.ssa.ir
similarity index 100%
rename from test_cases/undefined_phi_args/out/Baddie.ir/Baddie.clear.0.clear.ssa.ir
rename to test_cases/undefined_phi_args/out/Baddie.ir/Baddie.clear.0.ssa.ir
diff --git a/test_cases/undefined_phi_args/out/Baddie.ir/Baddie.clear.1.clear.destructured.ir b/test_cases/undefined_phi_args/out/Baddie.ir/Baddie.clear.1.destructured.ir
similarity index 100%
rename from test_cases/undefined_phi_args/out/Baddie.ir/Baddie.clear.1.clear.destructured.ir
rename to test_cases/undefined_phi_args/out/Baddie.ir/Baddie.clear.1.destructured.ir
diff --git a/test_cases/undefined_phi_args/out_O2/Baddie.ir/Baddie.approval.0.approval.destructured.ir b/test_cases/undefined_phi_args/out_O2/Baddie.ir/Baddie.approval.0.destructured.ir
similarity index 100%
rename from test_cases/undefined_phi_args/out_O2/Baddie.ir/Baddie.approval.0.approval.destructured.ir
rename to test_cases/undefined_phi_args/out_O2/Baddie.ir/Baddie.approval.0.destructured.ir
diff --git a/test_cases/undefined_phi_args/out_O2/Baddie.ir/Baddie.clear.0.clear.destructured.ir b/test_cases/undefined_phi_args/out_O2/Baddie.ir/Baddie.clear.0.destructured.ir
similarity index 100%
rename from test_cases/undefined_phi_args/out_O2/Baddie.ir/Baddie.clear.0.clear.destructured.ir
rename to test_cases/undefined_phi_args/out_O2/Baddie.ir/Baddie.clear.0.destructured.ir
diff --git a/test_cases/undefined_phi_args/out_unoptimized/Baddie.ir/Baddie.approval.0.approval.destructured.ir b/test_cases/undefined_phi_args/out_unoptimized/Baddie.ir/Baddie.approval.0.destructured.ir
similarity index 100%
rename from test_cases/undefined_phi_args/out_unoptimized/Baddie.ir/Baddie.approval.0.approval.destructured.ir
rename to test_cases/undefined_phi_args/out_unoptimized/Baddie.ir/Baddie.approval.0.destructured.ir
diff --git a/test_cases/undefined_phi_args/out_unoptimized/Baddie.ir/Baddie.clear.0.clear.destructured.ir b/test_cases/undefined_phi_args/out_unoptimized/Baddie.ir/Baddie.clear.0.destructured.ir
similarity index 100%
rename from test_cases/undefined_phi_args/out_unoptimized/Baddie.ir/Baddie.clear.0.clear.destructured.ir
rename to test_cases/undefined_phi_args/out_unoptimized/Baddie.ir/Baddie.clear.0.destructured.ir
diff --git a/test_cases/undefined_phi_args/puya.log b/test_cases/undefined_phi_args/puya.log
index 71a4bb353d..1d33cbe7ce 100644
--- a/test_cases/undefined_phi_args/puya.log
+++ b/test_cases/undefined_phi_args/puya.log
@@ -622,7 +622,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to undefined_phi_args/out/Baddie.ir/Baddie.approval.0.approval.ssa.ir
+debug: Output IR to undefined_phi_args/out/Baddie.ir/Baddie.approval.0.ssa.ir
 info: optimizing approval program of test_cases.undefined_phi_args.baddie.Baddie at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.undefined_phi_args.baddie.Baddie.approval_program
@@ -698,7 +698,7 @@ debug: Optimizer: Remove Linear Jump
 debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to undefined_phi_args/out/Baddie.ir/Baddie.approval.1.approval.ssa.opt.ir
+debug: Output IR to undefined_phi_args/out/Baddie.ir/Baddie.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: Optimizing subroutine test_cases.undefined_phi_args.baddie.Baddie.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -775,7 +775,7 @@ debug: replaced goto x#0 ? block@5 : block@5 with goto block@5
 debug: Removed empty block: block@4
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to undefined_phi_args/out/Baddie.ir/Baddie.approval.2.approval.ssa.opt.ir
+debug: Output IR to undefined_phi_args/out/Baddie.ir/Baddie.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.undefined_phi_args.baddie.Baddie.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -846,7 +846,7 @@ debug: Merged linear block@5 into block@2
 debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
-debug: Output IR to undefined_phi_args/out/Baddie.ir/Baddie.approval.3.approval.ssa.opt.ir
+debug: Output IR to undefined_phi_args/out/Baddie.ir/Baddie.approval.3.ssa.opt.ir
 debug: Begin optimization pass 4/100
 debug: Optimizing subroutine test_cases.undefined_phi_args.baddie.Baddie.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -945,8 +945,8 @@ debug: Coalescing c#0 with [c#5, c#1, c#2]
 debug: Coalescing resulted in 14 replacement/s
 debug: Sequentializing parallel copies in test_cases.undefined_phi_args.baddie.test_mixed_undefined
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to undefined_phi_args/out/Baddie.ir/Baddie.approval.4.approval.destructured.ir
-debug: Output IR to undefined_phi_args/out/Baddie.ir/Baddie.clear.0.clear.ssa.ir
+debug: Output IR to undefined_phi_args/out/Baddie.ir/Baddie.approval.4.destructured.ir
+debug: Output IR to undefined_phi_args/out/Baddie.ir/Baddie.clear.0.ssa.ir
 info: optimizing clear program of test_cases.undefined_phi_args.baddie.Baddie at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.undefined_phi_args.baddie.Baddie.clear_state_program
@@ -972,7 +972,7 @@ debug: Coalescing local variables in test_cases.undefined_phi_args.baddie.Baddie
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.undefined_phi_args.baddie.Baddie.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to undefined_phi_args/out/Baddie.ir/Baddie.clear.1.clear.destructured.ir
+debug: Output IR to undefined_phi_args/out/Baddie.ir/Baddie.clear.1.destructured.ir
 debug: Inserted main.ops[3]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[5]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[8]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/undefined_phi_args/puya_O2.log b/test_cases/undefined_phi_args/puya_O2.log
index df73ad073e..0ee9541ac0 100644
--- a/test_cases/undefined_phi_args/puya_O2.log
+++ b/test_cases/undefined_phi_args/puya_O2.log
@@ -1263,7 +1263,7 @@ debug: Coalescing c#21 with [c#27]
 debug: Coalescing resulted in 9 replacement/s
 debug: Sequentializing parallel copies in test_cases.undefined_phi_args.baddie.Baddie.approval_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to undefined_phi_args/out_O2/Baddie.ir/Baddie.approval.0.approval.destructured.ir
+debug: Output IR to undefined_phi_args/out_O2/Baddie.ir/Baddie.approval.0.destructured.ir
 info: optimizing clear program of test_cases.undefined_phi_args.baddie.Baddie at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.undefined_phi_args.baddie.Baddie.clear_state_program
@@ -1289,7 +1289,7 @@ debug: Coalescing local variables in test_cases.undefined_phi_args.baddie.Baddie
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.undefined_phi_args.baddie.Baddie.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to undefined_phi_args/out_O2/Baddie.ir/Baddie.clear.0.clear.destructured.ir
+debug: Output IR to undefined_phi_args/out_O2/Baddie.ir/Baddie.clear.0.destructured.ir
 debug: Inserted main.ops[3]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[5]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[8]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/undefined_phi_args/puya_unoptimized.log b/test_cases/undefined_phi_args/puya_unoptimized.log
index 57604fca28..da05cb64e3 100644
--- a/test_cases/undefined_phi_args/puya_unoptimized.log
+++ b/test_cases/undefined_phi_args/puya_unoptimized.log
@@ -754,7 +754,7 @@ debug: Coalescing c#0 with [c#5, c#1, c#2]
 debug: Coalescing resulted in 14 replacement/s
 debug: Sequentializing parallel copies in test_cases.undefined_phi_args.baddie.test_mixed_undefined
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to undefined_phi_args/out_unoptimized/Baddie.ir/Baddie.approval.0.approval.destructured.ir
+debug: Output IR to undefined_phi_args/out_unoptimized/Baddie.ir/Baddie.approval.0.destructured.ir
 info: optimizing clear program of test_cases.undefined_phi_args.baddie.Baddie at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.undefined_phi_args.baddie.Baddie.clear_state_program
@@ -772,7 +772,7 @@ debug: Coalescing local variables in test_cases.undefined_phi_args.baddie.Baddie
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.undefined_phi_args.baddie.Baddie.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to undefined_phi_args/out_unoptimized/Baddie.ir/Baddie.clear.0.clear.destructured.ir
+debug: Output IR to undefined_phi_args/out_unoptimized/Baddie.ir/Baddie.clear.0.destructured.ir
 debug: Inserted main.ops[3]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[5]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[8]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/unssa/out/UnSSAContract.ir/UnSSAContract.approval.0.approval.ssa.ir b/test_cases/unssa/out/UnSSAContract.ir/UnSSAContract.approval.0.ssa.ir
similarity index 100%
rename from test_cases/unssa/out/UnSSAContract.ir/UnSSAContract.approval.0.approval.ssa.ir
rename to test_cases/unssa/out/UnSSAContract.ir/UnSSAContract.approval.0.ssa.ir
diff --git a/test_cases/unssa/out/UnSSAContract.ir/UnSSAContract.approval.1.approval.ssa.opt.ir b/test_cases/unssa/out/UnSSAContract.ir/UnSSAContract.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/unssa/out/UnSSAContract.ir/UnSSAContract.approval.1.approval.ssa.opt.ir
rename to test_cases/unssa/out/UnSSAContract.ir/UnSSAContract.approval.1.ssa.opt.ir
diff --git a/test_cases/unssa/out/UnSSAContract.ir/UnSSAContract.approval.2.approval.ssa.opt.ir b/test_cases/unssa/out/UnSSAContract.ir/UnSSAContract.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/unssa/out/UnSSAContract.ir/UnSSAContract.approval.2.approval.ssa.opt.ir
rename to test_cases/unssa/out/UnSSAContract.ir/UnSSAContract.approval.2.ssa.opt.ir
diff --git a/test_cases/unssa/out/UnSSAContract.ir/UnSSAContract.approval.3.approval.destructured.ir b/test_cases/unssa/out/UnSSAContract.ir/UnSSAContract.approval.3.destructured.ir
similarity index 100%
rename from test_cases/unssa/out/UnSSAContract.ir/UnSSAContract.approval.3.approval.destructured.ir
rename to test_cases/unssa/out/UnSSAContract.ir/UnSSAContract.approval.3.destructured.ir
diff --git a/test_cases/unssa/out/UnSSAContract.ir/UnSSAContract.clear.0.clear.ssa.ir b/test_cases/unssa/out/UnSSAContract.ir/UnSSAContract.clear.0.ssa.ir
similarity index 100%
rename from test_cases/unssa/out/UnSSAContract.ir/UnSSAContract.clear.0.clear.ssa.ir
rename to test_cases/unssa/out/UnSSAContract.ir/UnSSAContract.clear.0.ssa.ir
diff --git a/test_cases/unssa/out/UnSSAContract.ir/UnSSAContract.clear.1.clear.destructured.ir b/test_cases/unssa/out/UnSSAContract.ir/UnSSAContract.clear.1.destructured.ir
similarity index 100%
rename from test_cases/unssa/out/UnSSAContract.ir/UnSSAContract.clear.1.clear.destructured.ir
rename to test_cases/unssa/out/UnSSAContract.ir/UnSSAContract.clear.1.destructured.ir
diff --git a/test_cases/unssa/out_O2/UnSSAContract.ir/UnSSAContract.approval.0.approval.destructured.ir b/test_cases/unssa/out_O2/UnSSAContract.ir/UnSSAContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/unssa/out_O2/UnSSAContract.ir/UnSSAContract.approval.0.approval.destructured.ir
rename to test_cases/unssa/out_O2/UnSSAContract.ir/UnSSAContract.approval.0.destructured.ir
diff --git a/test_cases/unssa/out_O2/UnSSAContract.ir/UnSSAContract.clear.0.clear.destructured.ir b/test_cases/unssa/out_O2/UnSSAContract.ir/UnSSAContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/unssa/out_O2/UnSSAContract.ir/UnSSAContract.clear.0.clear.destructured.ir
rename to test_cases/unssa/out_O2/UnSSAContract.ir/UnSSAContract.clear.0.destructured.ir
diff --git a/test_cases/unssa/out_unoptimized/UnSSAContract.ir/UnSSAContract.approval.0.approval.destructured.ir b/test_cases/unssa/out_unoptimized/UnSSAContract.ir/UnSSAContract.approval.0.destructured.ir
similarity index 100%
rename from test_cases/unssa/out_unoptimized/UnSSAContract.ir/UnSSAContract.approval.0.approval.destructured.ir
rename to test_cases/unssa/out_unoptimized/UnSSAContract.ir/UnSSAContract.approval.0.destructured.ir
diff --git a/test_cases/unssa/out_unoptimized/UnSSAContract.ir/UnSSAContract.clear.0.clear.destructured.ir b/test_cases/unssa/out_unoptimized/UnSSAContract.ir/UnSSAContract.clear.0.destructured.ir
similarity index 100%
rename from test_cases/unssa/out_unoptimized/UnSSAContract.ir/UnSSAContract.clear.0.clear.destructured.ir
rename to test_cases/unssa/out_unoptimized/UnSSAContract.ir/UnSSAContract.clear.0.destructured.ir
diff --git a/test_cases/unssa/puya.log b/test_cases/unssa/puya.log
index f052933f50..104445b08e 100644
--- a/test_cases/unssa/puya.log
+++ b/test_cases/unssa/puya.log
@@ -623,7 +623,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to unssa/out/UnSSAContract.ir/UnSSAContract.approval.0.approval.ssa.ir
+debug: Output IR to unssa/out/UnSSAContract.ir/UnSSAContract.approval.0.ssa.ir
 info: optimizing approval program of test_cases.unssa.contract.UnSSAContract at level 1
 debug: Begin optimization pass 1/100
 debug: marking single-use function test_cases.unssa.contract.test_self_ref_phi for inlining
@@ -983,7 +983,7 @@ debug: removing unused subroutine test_cases.unssa.contract.test_param_update_wi
 debug: removing unused subroutine test_cases.unssa.contract.test_param_update_with_reentrant_entry_block_v2
 debug: removing unused subroutine test_cases.unssa.contract.test_param_update_with_reentrant_entry_block_v3
 debug: removing unused subroutine test_cases.unssa.contract.test_swap_args
-debug: Output IR to unssa/out/UnSSAContract.ir/UnSSAContract.approval.1.approval.ssa.opt.ir
+debug: Output IR to unssa/out/UnSSAContract.ir/UnSSAContract.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking trivial method test_cases.unssa.contract.one as inlineable
 debug: marking trivial method test_cases.unssa.contract.swap_args as inlineable
@@ -1108,7 +1108,7 @@ debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.unssa.contract.one
 debug: removing unused subroutine test_cases.unssa.contract.swap_args
-debug: Output IR to unssa/out/UnSSAContract.ir/UnSSAContract.approval.2.approval.ssa.opt.ir
+debug: Output IR to unssa/out/UnSSAContract.ir/UnSSAContract.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 debug: Optimizing subroutine test_cases.unssa.contract.UnSSAContract.approval_program
 debug: Optimizer: Perform Subroutine Inlining
@@ -1291,8 +1291,8 @@ debug: * avail a#0
 debug: * avail b#0
 debug: * to_do _item#0
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to unssa/out/UnSSAContract.ir/UnSSAContract.approval.3.approval.destructured.ir
-debug: Output IR to unssa/out/UnSSAContract.ir/UnSSAContract.clear.0.clear.ssa.ir
+debug: Output IR to unssa/out/UnSSAContract.ir/UnSSAContract.approval.3.destructured.ir
+debug: Output IR to unssa/out/UnSSAContract.ir/UnSSAContract.clear.0.ssa.ir
 info: optimizing clear program of test_cases.unssa.contract.UnSSAContract at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.unssa.contract.UnSSAContract.clear_state_program
@@ -1318,7 +1318,7 @@ debug: Coalescing local variables in test_cases.unssa.contract.UnSSAContract.cle
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.unssa.contract.UnSSAContract.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to unssa/out/UnSSAContract.ir/UnSSAContract.clear.1.clear.destructured.ir
+debug: Output IR to unssa/out/UnSSAContract.ir/UnSSAContract.clear.1.destructured.ir
 debug: Inserted main_while_top@41.ops[3]: 'l-store-copy tmp%0#2 0'
 debug: Replaced main_while_top@41.ops[5]: 'v-load tmp%0#2' with 'l-load tmp%0#2'
 debug: Inserted main_while_body@42.ops[3]: 'l-store-copy tmp%1#4 0'
diff --git a/test_cases/unssa/puya_O2.log b/test_cases/unssa/puya_O2.log
index 04995fa3dc..8ac6b793c1 100644
--- a/test_cases/unssa/puya_O2.log
+++ b/test_cases/unssa/puya_O2.log
@@ -1287,7 +1287,7 @@ debug: * avail a#0
 debug: * avail b#0
 debug: * to_do _item#0
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to unssa/out_O2/UnSSAContract.ir/UnSSAContract.approval.0.approval.destructured.ir
+debug: Output IR to unssa/out_O2/UnSSAContract.ir/UnSSAContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.unssa.contract.UnSSAContract at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.unssa.contract.UnSSAContract.clear_state_program
@@ -1313,7 +1313,7 @@ debug: Coalescing local variables in test_cases.unssa.contract.UnSSAContract.cle
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.unssa.contract.UnSSAContract.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to unssa/out_O2/UnSSAContract.ir/UnSSAContract.clear.0.clear.destructured.ir
+debug: Output IR to unssa/out_O2/UnSSAContract.ir/UnSSAContract.clear.0.destructured.ir
 debug: Inserted main_while_top@41.ops[3]: 'l-store-copy tmp%0#2 0'
 debug: Replaced main_while_top@41.ops[5]: 'v-load tmp%0#2' with 'l-load tmp%0#2'
 debug: Inserted main_while_body@42.ops[3]: 'l-store-copy tmp%1#4 0'
diff --git a/test_cases/unssa/puya_unoptimized.log b/test_cases/unssa/puya_unoptimized.log
index 27e71c5ca7..1f6d4d34f6 100644
--- a/test_cases/unssa/puya_unoptimized.log
+++ b/test_cases/unssa/puya_unoptimized.log
@@ -887,7 +887,7 @@ debug: * to_do a#0
 debug: * to_do b#0
 debug: * to_do _item#0
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to unssa/out_unoptimized/UnSSAContract.ir/UnSSAContract.approval.0.approval.destructured.ir
+debug: Output IR to unssa/out_unoptimized/UnSSAContract.ir/UnSSAContract.approval.0.destructured.ir
 info: optimizing clear program of test_cases.unssa.contract.UnSSAContract at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.unssa.contract.UnSSAContract.clear_state_program
@@ -905,7 +905,7 @@ debug: Coalescing local variables in test_cases.unssa.contract.UnSSAContract.cle
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.unssa.contract.UnSSAContract.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to unssa/out_unoptimized/UnSSAContract.ir/UnSSAContract.clear.0.clear.destructured.ir
+debug: Output IR to unssa/out_unoptimized/UnSSAContract.ir/UnSSAContract.clear.0.destructured.ir
 debug: Inserted main.ops[4]: 'l-store-copy result1#0 0'
 debug: Replaced main.ops[6]: 'v-load result1#0' with 'l-load result1#0'
 debug: Inserted main.ops[8]: 'l-store-copy tmp%0#0 0'
diff --git a/test_cases/with_reentrancy/out/WithReentrancy.ir/WithReentrancy.approval.0.approval.ssa.ir b/test_cases/with_reentrancy/out/WithReentrancy.ir/WithReentrancy.approval.0.ssa.ir
similarity index 100%
rename from test_cases/with_reentrancy/out/WithReentrancy.ir/WithReentrancy.approval.0.approval.ssa.ir
rename to test_cases/with_reentrancy/out/WithReentrancy.ir/WithReentrancy.approval.0.ssa.ir
diff --git a/test_cases/with_reentrancy/out/WithReentrancy.ir/WithReentrancy.approval.1.approval.ssa.opt.ir b/test_cases/with_reentrancy/out/WithReentrancy.ir/WithReentrancy.approval.1.ssa.opt.ir
similarity index 100%
rename from test_cases/with_reentrancy/out/WithReentrancy.ir/WithReentrancy.approval.1.approval.ssa.opt.ir
rename to test_cases/with_reentrancy/out/WithReentrancy.ir/WithReentrancy.approval.1.ssa.opt.ir
diff --git a/test_cases/with_reentrancy/out/WithReentrancy.ir/WithReentrancy.approval.2.approval.ssa.opt.ir b/test_cases/with_reentrancy/out/WithReentrancy.ir/WithReentrancy.approval.2.ssa.opt.ir
similarity index 100%
rename from test_cases/with_reentrancy/out/WithReentrancy.ir/WithReentrancy.approval.2.approval.ssa.opt.ir
rename to test_cases/with_reentrancy/out/WithReentrancy.ir/WithReentrancy.approval.2.ssa.opt.ir
diff --git a/test_cases/with_reentrancy/out/WithReentrancy.ir/WithReentrancy.approval.3.approval.destructured.ir b/test_cases/with_reentrancy/out/WithReentrancy.ir/WithReentrancy.approval.3.destructured.ir
similarity index 100%
rename from test_cases/with_reentrancy/out/WithReentrancy.ir/WithReentrancy.approval.3.approval.destructured.ir
rename to test_cases/with_reentrancy/out/WithReentrancy.ir/WithReentrancy.approval.3.destructured.ir
diff --git a/test_cases/with_reentrancy/out/WithReentrancy.ir/WithReentrancy.clear.0.clear.ssa.ir b/test_cases/with_reentrancy/out/WithReentrancy.ir/WithReentrancy.clear.0.ssa.ir
similarity index 100%
rename from test_cases/with_reentrancy/out/WithReentrancy.ir/WithReentrancy.clear.0.clear.ssa.ir
rename to test_cases/with_reentrancy/out/WithReentrancy.ir/WithReentrancy.clear.0.ssa.ir
diff --git a/test_cases/with_reentrancy/out/WithReentrancy.ir/WithReentrancy.clear.1.clear.destructured.ir b/test_cases/with_reentrancy/out/WithReentrancy.ir/WithReentrancy.clear.1.destructured.ir
similarity index 100%
rename from test_cases/with_reentrancy/out/WithReentrancy.ir/WithReentrancy.clear.1.clear.destructured.ir
rename to test_cases/with_reentrancy/out/WithReentrancy.ir/WithReentrancy.clear.1.destructured.ir
diff --git a/test_cases/with_reentrancy/out_O2/WithReentrancy.ir/WithReentrancy.approval.0.approval.destructured.ir b/test_cases/with_reentrancy/out_O2/WithReentrancy.ir/WithReentrancy.approval.0.destructured.ir
similarity index 100%
rename from test_cases/with_reentrancy/out_O2/WithReentrancy.ir/WithReentrancy.approval.0.approval.destructured.ir
rename to test_cases/with_reentrancy/out_O2/WithReentrancy.ir/WithReentrancy.approval.0.destructured.ir
diff --git a/test_cases/with_reentrancy/out_O2/WithReentrancy.ir/WithReentrancy.clear.0.clear.destructured.ir b/test_cases/with_reentrancy/out_O2/WithReentrancy.ir/WithReentrancy.clear.0.destructured.ir
similarity index 100%
rename from test_cases/with_reentrancy/out_O2/WithReentrancy.ir/WithReentrancy.clear.0.clear.destructured.ir
rename to test_cases/with_reentrancy/out_O2/WithReentrancy.ir/WithReentrancy.clear.0.destructured.ir
diff --git a/test_cases/with_reentrancy/out_unoptimized/WithReentrancy.ir/WithReentrancy.approval.0.approval.destructured.ir b/test_cases/with_reentrancy/out_unoptimized/WithReentrancy.ir/WithReentrancy.approval.0.destructured.ir
similarity index 100%
rename from test_cases/with_reentrancy/out_unoptimized/WithReentrancy.ir/WithReentrancy.approval.0.approval.destructured.ir
rename to test_cases/with_reentrancy/out_unoptimized/WithReentrancy.ir/WithReentrancy.approval.0.destructured.ir
diff --git a/test_cases/with_reentrancy/out_unoptimized/WithReentrancy.ir/WithReentrancy.clear.0.clear.destructured.ir b/test_cases/with_reentrancy/out_unoptimized/WithReentrancy.ir/WithReentrancy.clear.0.destructured.ir
similarity index 100%
rename from test_cases/with_reentrancy/out_unoptimized/WithReentrancy.ir/WithReentrancy.clear.0.clear.destructured.ir
rename to test_cases/with_reentrancy/out_unoptimized/WithReentrancy.ir/WithReentrancy.clear.0.destructured.ir
diff --git a/test_cases/with_reentrancy/puya.log b/test_cases/with_reentrancy/puya.log
index 2b00e1beb2..28c2276300 100644
--- a/test_cases/with_reentrancy/puya.log
+++ b/test_cases/with_reentrancy/puya.log
@@ -468,7 +468,7 @@ debug: removing unused subroutine _puya_lib.arc4.dynamic_array_replace_dynamic_e
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_dynamic_element
 debug: removing unused subroutine _puya_lib.arc4.static_array_replace_byte_length_head
 debug: removing unused subroutine _puya_lib.arc4.recalculate_head_for_elements_with_byte_length_head
-debug: Output IR to with_reentrancy/out/WithReentrancy.ir/WithReentrancy.approval.0.approval.ssa.ir
+debug: Output IR to with_reentrancy/out/WithReentrancy.ir/WithReentrancy.approval.0.ssa.ir
 info: optimizing approval program of test_cases.with_reentrancy.contract.WithReentrancy at level 1
 debug: Begin optimization pass 1/100
 with_reentrancy/contract.py:25 debug: function is auto-recursive: test_cases.with_reentrancy.contract.fibonacci
@@ -599,7 +599,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.with_reentrancy.contract.silly2
-debug: Output IR to with_reentrancy/out/WithReentrancy.ir/WithReentrancy.approval.1.approval.ssa.opt.ir
+debug: Output IR to with_reentrancy/out/WithReentrancy.ir/WithReentrancy.approval.1.ssa.opt.ir
 debug: Begin optimization pass 2/100
 debug: marking single-use function test_cases.with_reentrancy.contract.silly3 for inlining
 debug: Optimizing subroutine test_cases.with_reentrancy.contract.WithReentrancy.approval_program
@@ -690,7 +690,7 @@ debug: Optimizer: Remove Empty Blocks
 debug: Optimizer: Remove Unreachable Blocks
 debug: Optimizer: Repeated Expression Elimination
 debug: removing unused subroutine test_cases.with_reentrancy.contract.silly3
-debug: Output IR to with_reentrancy/out/WithReentrancy.ir/WithReentrancy.approval.2.approval.ssa.opt.ir
+debug: Output IR to with_reentrancy/out/WithReentrancy.ir/WithReentrancy.approval.2.ssa.opt.ir
 debug: Begin optimization pass 3/100
 with_reentrancy/contract.py:32 debug: function is auto-recursive: test_cases.with_reentrancy.contract.silly
 debug: Optimizing subroutine test_cases.with_reentrancy.contract.WithReentrancy.approval_program
@@ -806,8 +806,8 @@ debug: Coalescing local variables in test_cases.with_reentrancy.contract.itoa us
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.with_reentrancy.contract.itoa
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to with_reentrancy/out/WithReentrancy.ir/WithReentrancy.approval.3.approval.destructured.ir
-debug: Output IR to with_reentrancy/out/WithReentrancy.ir/WithReentrancy.clear.0.clear.ssa.ir
+debug: Output IR to with_reentrancy/out/WithReentrancy.ir/WithReentrancy.approval.3.destructured.ir
+debug: Output IR to with_reentrancy/out/WithReentrancy.ir/WithReentrancy.clear.0.ssa.ir
 info: optimizing clear program of test_cases.with_reentrancy.contract.WithReentrancy at level 1
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.with_reentrancy.contract.WithReentrancy.clear_state_program
@@ -833,7 +833,7 @@ debug: Coalescing local variables in test_cases.with_reentrancy.contract.WithRee
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.with_reentrancy.contract.WithReentrancy.clear_state_program
 debug: Performing post-SSA optimizations at level 1
-debug: Output IR to with_reentrancy/out/WithReentrancy.ir/WithReentrancy.clear.1.clear.destructured.ir
+debug: Output IR to with_reentrancy/out/WithReentrancy.ir/WithReentrancy.clear.1.destructured.ir
 debug: Inserted main.ops[2]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[4]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[6]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/with_reentrancy/puya_O2.log b/test_cases/with_reentrancy/puya_O2.log
index ec0d42bed4..c1f3732d1d 100644
--- a/test_cases/with_reentrancy/puya_O2.log
+++ b/test_cases/with_reentrancy/puya_O2.log
@@ -802,7 +802,7 @@ debug: Coalescing local variables in test_cases.with_reentrancy.contract.itoa us
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.with_reentrancy.contract.itoa
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to with_reentrancy/out_O2/WithReentrancy.ir/WithReentrancy.approval.0.approval.destructured.ir
+debug: Output IR to with_reentrancy/out_O2/WithReentrancy.ir/WithReentrancy.approval.0.destructured.ir
 info: optimizing clear program of test_cases.with_reentrancy.contract.WithReentrancy at level 2
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.with_reentrancy.contract.WithReentrancy.clear_state_program
@@ -828,7 +828,7 @@ debug: Coalescing local variables in test_cases.with_reentrancy.contract.WithRee
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.with_reentrancy.contract.WithReentrancy.clear_state_program
 debug: Performing post-SSA optimizations at level 2
-debug: Output IR to with_reentrancy/out_O2/WithReentrancy.ir/WithReentrancy.clear.0.clear.destructured.ir
+debug: Output IR to with_reentrancy/out_O2/WithReentrancy.ir/WithReentrancy.clear.0.destructured.ir
 debug: Inserted main.ops[2]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[4]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[6]: 'l-store-copy tmp%1#0 0'
diff --git a/test_cases/with_reentrancy/puya_unoptimized.log b/test_cases/with_reentrancy/puya_unoptimized.log
index d2f0794abc..1867b9b8e1 100644
--- a/test_cases/with_reentrancy/puya_unoptimized.log
+++ b/test_cases/with_reentrancy/puya_unoptimized.log
@@ -622,7 +622,7 @@ debug: Coalescing local variables in test_cases.with_reentrancy.contract.itoa us
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.with_reentrancy.contract.itoa
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to with_reentrancy/out_unoptimized/WithReentrancy.ir/WithReentrancy.approval.0.approval.destructured.ir
+debug: Output IR to with_reentrancy/out_unoptimized/WithReentrancy.ir/WithReentrancy.approval.0.destructured.ir
 info: optimizing clear program of test_cases.with_reentrancy.contract.WithReentrancy at level 0
 debug: Begin optimization pass 1/100
 debug: Optimizing subroutine test_cases.with_reentrancy.contract.WithReentrancy.clear_state_program
@@ -640,7 +640,7 @@ debug: Coalescing local variables in test_cases.with_reentrancy.contract.WithRee
 debug: Coalescing resulted in 0 replacement/s
 debug: Sequentializing parallel copies in test_cases.with_reentrancy.contract.WithReentrancy.clear_state_program
 debug: Performing post-SSA optimizations at level 0
-debug: Output IR to with_reentrancy/out_unoptimized/WithReentrancy.ir/WithReentrancy.clear.0.clear.destructured.ir
+debug: Output IR to with_reentrancy/out_unoptimized/WithReentrancy.ir/WithReentrancy.clear.0.destructured.ir
 debug: Inserted main.ops[2]: 'l-store-copy tmp%0#0 0'
 debug: Replaced main.ops[4]: 'v-load tmp%0#0' with 'l-load tmp%0#0'
 debug: Inserted main.ops[6]: 'l-store-copy tmp%1#0 0'