diff --git a/air/src/execution_step/air/ap.rs b/air/src/execution_step/instructions/ap.rs
similarity index 98%
rename from air/src/execution_step/air/ap.rs
rename to air/src/execution_step/instructions/ap.rs
index 5618338c..cc0967f6 100644
--- a/air/src/execution_step/air/ap.rs
+++ b/air/src/execution_step/instructions/ap.rs
@@ -20,8 +20,8 @@ mod utils;
 use super::ExecutionCtx;
 use super::ExecutionResult;
 use super::TraceHandler;
-use crate::execution_step::air::ValueAggregate;
 use crate::execution_step::boxed_value::Variable;
+use crate::execution_step::instructions::ValueAggregate;
 use crate::execution_step::resolver::apply_lambda;
 use crate::log_instruction;
 use crate::trace_to_exec_err;
diff --git a/air/src/execution_step/air/ap/apply_to_arguments.rs b/air/src/execution_step/instructions/ap/apply_to_arguments.rs
similarity index 100%
rename from air/src/execution_step/air/ap/apply_to_arguments.rs
rename to air/src/execution_step/instructions/ap/apply_to_arguments.rs
diff --git a/air/src/execution_step/air/ap/utils.rs b/air/src/execution_step/instructions/ap/utils.rs
similarity index 100%
rename from air/src/execution_step/air/ap/utils.rs
rename to air/src/execution_step/instructions/ap/utils.rs
diff --git a/air/src/execution_step/air/call.rs b/air/src/execution_step/instructions/call.rs
similarity index 100%
rename from air/src/execution_step/air/call.rs
rename to air/src/execution_step/instructions/call.rs
diff --git a/air/src/execution_step/air/call/call_result_setter.rs b/air/src/execution_step/instructions/call/call_result_setter.rs
similarity index 100%
rename from air/src/execution_step/air/call/call_result_setter.rs
rename to air/src/execution_step/instructions/call/call_result_setter.rs
diff --git a/air/src/execution_step/air/call/prev_result_handler.rs b/air/src/execution_step/instructions/call/prev_result_handler.rs
similarity index 98%
rename from air/src/execution_step/air/call/prev_result_handler.rs
rename to air/src/execution_step/instructions/call/prev_result_handler.rs
index 717801a5..36651ec8 100644
--- a/air/src/execution_step/air/call/prev_result_handler.rs
+++ b/air/src/execution_step/instructions/call/prev_result_handler.rs
@@ -15,7 +15,7 @@
  */
 
 use super::*;
-use crate::execution_step::air::call::call_result_setter::populate_context_from_data;
+use crate::execution_step::instructions::call::call_result_setter::populate_context_from_data;
 use crate::execution_step::CatchableError;
 use crate::execution_step::RcSecurityTetraplet;
 
diff --git a/air/src/execution_step/air/call/resolved_call.rs b/air/src/execution_step/instructions/call/resolved_call.rs
similarity index 100%
rename from air/src/execution_step/air/call/resolved_call.rs
rename to air/src/execution_step/instructions/call/resolved_call.rs
diff --git a/air/src/execution_step/air/call/triplet.rs b/air/src/execution_step/instructions/call/triplet.rs
similarity index 100%
rename from air/src/execution_step/air/call/triplet.rs
rename to air/src/execution_step/instructions/call/triplet.rs
diff --git a/air/src/execution_step/air/canon.rs b/air/src/execution_step/instructions/canon.rs
similarity index 97%
rename from air/src/execution_step/air/canon.rs
rename to air/src/execution_step/instructions/canon.rs
index 1f3a8fbf..ae6d4f69 100644
--- a/air/src/execution_step/air/canon.rs
+++ b/air/src/execution_step/instructions/canon.rs
@@ -71,7 +71,7 @@ fn handle_unseen_canon(
     exec_ctx: &mut ExecutionCtx<'_>,
     trace_ctx: &mut TraceHandler,
 ) -> ExecutionResult<()> {
-    let peer_id = crate::execution_step::air::resolve_peer_id_to_string(&ast_canon.peer_id, exec_ctx)?;
+    let peer_id = crate::execution_step::instructions::resolve_peer_id_to_string(&ast_canon.peer_id, exec_ctx)?;
 
     if exec_ctx.run_parameters.current_peer_id.as_str() != peer_id {
         exec_ctx.subgraph_complete = false;
diff --git a/air/src/execution_step/air/compare_matchable/comparator.rs b/air/src/execution_step/instructions/compare_matchable/comparator.rs
similarity index 99%
rename from air/src/execution_step/air/compare_matchable/comparator.rs
rename to air/src/execution_step/instructions/compare_matchable/comparator.rs
index 5bed296d..aed6510b 100644
--- a/air/src/execution_step/air/compare_matchable/comparator.rs
+++ b/air/src/execution_step/instructions/compare_matchable/comparator.rs
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-use crate::execution_step::air::ExecutionResult;
 use crate::execution_step::execution_context::ExecutionCtx;
+use crate::execution_step::instructions::ExecutionResult;
 use crate::execution_step::resolver::prepare_last_error;
 use crate::execution_step::resolver::resolve_ast_variable;
 use crate::execution_step::resolver::resolve_ast_variable_wl;
diff --git a/air/src/execution_step/air/compare_matchable/mod.rs b/air/src/execution_step/instructions/compare_matchable/mod.rs
similarity index 100%
rename from air/src/execution_step/air/compare_matchable/mod.rs
rename to air/src/execution_step/instructions/compare_matchable/mod.rs
diff --git a/air/src/execution_step/air/fail.rs b/air/src/execution_step/instructions/fail.rs
similarity index 100%
rename from air/src/execution_step/air/fail.rs
rename to air/src/execution_step/instructions/fail.rs
diff --git a/air/src/execution_step/air/fold/fold_state.rs b/air/src/execution_step/instructions/fold/fold_state.rs
similarity index 100%
rename from air/src/execution_step/air/fold/fold_state.rs
rename to air/src/execution_step/instructions/fold/fold_state.rs
diff --git a/air/src/execution_step/air/fold/mod.rs b/air/src/execution_step/instructions/fold/mod.rs
similarity index 100%
rename from air/src/execution_step/air/fold/mod.rs
rename to air/src/execution_step/instructions/fold/mod.rs
diff --git a/air/src/execution_step/air/fold/utils.rs b/air/src/execution_step/instructions/fold/utils.rs
similarity index 100%
rename from air/src/execution_step/air/fold/utils.rs
rename to air/src/execution_step/instructions/fold/utils.rs
diff --git a/air/src/execution_step/air/fold_scalar.rs b/air/src/execution_step/instructions/fold_scalar.rs
similarity index 100%
rename from air/src/execution_step/air/fold_scalar.rs
rename to air/src/execution_step/instructions/fold_scalar.rs
diff --git a/air/src/execution_step/air/fold_stream.rs b/air/src/execution_step/instructions/fold_stream.rs
similarity index 100%
rename from air/src/execution_step/air/fold_stream.rs
rename to air/src/execution_step/instructions/fold_stream.rs
diff --git a/air/src/execution_step/air/fold_stream/completeness_updater.rs b/air/src/execution_step/instructions/fold_stream/completeness_updater.rs
similarity index 100%
rename from air/src/execution_step/air/fold_stream/completeness_updater.rs
rename to air/src/execution_step/instructions/fold_stream/completeness_updater.rs
diff --git a/air/src/execution_step/air/fold_stream/stream_cursor.rs b/air/src/execution_step/instructions/fold_stream/stream_cursor.rs
similarity index 95%
rename from air/src/execution_step/air/fold_stream/stream_cursor.rs
rename to air/src/execution_step/instructions/fold_stream/stream_cursor.rs
index cdd848ba..c210f982 100644
--- a/air/src/execution_step/air/fold_stream/stream_cursor.rs
+++ b/air/src/execution_step/instructions/fold_stream/stream_cursor.rs
@@ -15,9 +15,9 @@
  */
 
 use super::construct_stream_iterable_values;
-use crate::execution_step::air::fold::IterableValue;
 use crate::execution_step::boxed_value::Generation;
 use crate::execution_step::boxed_value::Stream;
+use crate::execution_step::instructions::fold::IterableValue;
 
 pub(super) struct StreamCursor {
     last_seen_generation: u32,
diff --git a/air/src/execution_step/air/match_.rs b/air/src/execution_step/instructions/match_.rs
similarity index 100%
rename from air/src/execution_step/air/match_.rs
rename to air/src/execution_step/instructions/match_.rs
diff --git a/air/src/execution_step/air/mismatch.rs b/air/src/execution_step/instructions/mismatch.rs
similarity index 100%
rename from air/src/execution_step/air/mismatch.rs
rename to air/src/execution_step/instructions/mismatch.rs
diff --git a/air/src/execution_step/air/mod.rs b/air/src/execution_step/instructions/mod.rs
similarity index 100%
rename from air/src/execution_step/air/mod.rs
rename to air/src/execution_step/instructions/mod.rs
diff --git a/air/src/execution_step/air/never.rs b/air/src/execution_step/instructions/never.rs
similarity index 100%
rename from air/src/execution_step/air/never.rs
rename to air/src/execution_step/instructions/never.rs
diff --git a/air/src/execution_step/air/new.rs b/air/src/execution_step/instructions/new.rs
similarity index 100%
rename from air/src/execution_step/air/new.rs
rename to air/src/execution_step/instructions/new.rs
diff --git a/air/src/execution_step/air/next.rs b/air/src/execution_step/instructions/next.rs
similarity index 100%
rename from air/src/execution_step/air/next.rs
rename to air/src/execution_step/instructions/next.rs
diff --git a/air/src/execution_step/air/null.rs b/air/src/execution_step/instructions/null.rs
similarity index 100%
rename from air/src/execution_step/air/null.rs
rename to air/src/execution_step/instructions/null.rs
diff --git a/air/src/execution_step/air/par.rs b/air/src/execution_step/instructions/par.rs
similarity index 100%
rename from air/src/execution_step/air/par.rs
rename to air/src/execution_step/instructions/par.rs
diff --git a/air/src/execution_step/air/par/completeness_updater.rs b/air/src/execution_step/instructions/par/completeness_updater.rs
similarity index 100%
rename from air/src/execution_step/air/par/completeness_updater.rs
rename to air/src/execution_step/instructions/par/completeness_updater.rs
diff --git a/air/src/execution_step/air/seq.rs b/air/src/execution_step/instructions/seq.rs
similarity index 100%
rename from air/src/execution_step/air/seq.rs
rename to air/src/execution_step/instructions/seq.rs
diff --git a/air/src/execution_step/air/xor.rs b/air/src/execution_step/instructions/xor.rs
similarity index 100%
rename from air/src/execution_step/air/xor.rs
rename to air/src/execution_step/instructions/xor.rs
diff --git a/air/src/execution_step/mod.rs b/air/src/execution_step/mod.rs
index 3ed10431..17c5871c 100644
--- a/air/src/execution_step/mod.rs
+++ b/air/src/execution_step/mod.rs
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-mod air;
 mod boxed_value;
 mod errors;
 pub(crate) mod execution_context;
+mod instructions;
 mod lambda_applier;
 mod resolver;
 
@@ -38,8 +38,8 @@ pub mod errors_prelude {
     pub use super::UncatchableError;
 }
 
-pub(super) use self::air::ExecutableInstruction;
-pub(super) use self::air::FoldState;
+pub(super) use self::instructions::ExecutableInstruction;
+pub(super) use self::instructions::FoldState;
 pub(super) use boxed_value::Generation;
 pub(super) use boxed_value::ScalarRef;
 pub(super) use boxed_value::Stream;