diff --git a/crates/apollo_consensus_orchestrator/src/build_proposal.rs b/crates/apollo_consensus_orchestrator/src/build_proposal.rs
index 1bb00d2cf1a..b024afcebcc 100644
--- a/crates/apollo_consensus_orchestrator/src/build_proposal.rs
+++ b/crates/apollo_consensus_orchestrator/src/build_proposal.rs
@@ -269,11 +269,16 @@ async fn get_proposal_content(
                 // If the blob writing operation to Aerospike doesn't return a success status, we
                 // can't finish the proposal. Must wait for it at least until batcher_timeout is
                 // reached.
-                let remaining = (args.batcher_deadline - args.deps.clock.now())
+                let remaining_duration = (args.batcher_deadline - args.deps.clock.now())
                     .to_std()
                     .unwrap_or_default()
-                    .max(MIN_WAIT_DURATION); // Ensure we wait at least 1 ms to avoid immediate timeout. 
-                match tokio::time::timeout(remaining, args.cende_write_success.borrow_mut()).await {
+                    .max(MIN_WAIT_DURATION); // Ensure we wait at least 1 ms to avoid immediate timeout.
+                match tokio::time::timeout(
+                    remaining_duration,
+                    args.cende_write_success.borrow_mut(),
+                )
+                .await
+                {
                     Err(_) => {
                         return Err(BuildProposalError::CendeWriteError(
                             "Writing blob to Aerospike didn't return in time.".to_string(),
diff --git a/crates/apollo_consensus_orchestrator/src/utils.rs b/crates/apollo_consensus_orchestrator/src/utils.rs
index d49a284c566..f8c4e329df7 100644
--- a/crates/apollo_consensus_orchestrator/src/utils.rs
+++ b/crates/apollo_consensus_orchestrator/src/utils.rs
@@ -447,14 +447,14 @@ pub(crate) fn truncate_to_executed_txs(
     // Truncate `content` to keep only the first `final_n_executed_txs`, preserving batch
     // structure.
     let mut executed_content: Vec<Vec<InternalConsensusTransaction>> = Vec::new();
-    let mut remaining = final_n_executed_txs;
+    let mut remaining_tx_count = final_n_executed_txs;
 
     for batch in content {
-        if remaining < batch.len() {
-            executed_content.push(batch.into_iter().take(remaining).collect());
+        if remaining_tx_count < batch.len() {
+            executed_content.push(batch.into_iter().take(remaining_tx_count).collect());
             break;
         } else {
-            remaining -= batch.len();
+            remaining_tx_count -= batch.len();
             executed_content.push(batch);
         }
     }
diff --git a/crates/blockifier/src/execution/entry_point_execution.rs b/crates/blockifier/src/execution/entry_point_execution.rs
index 2ae01a339c3..7cbc29b9565 100644
--- a/crates/blockifier/src/execution/entry_point_execution.rs
+++ b/crates/blockifier/src/execution/entry_point_execution.rs
@@ -500,7 +500,7 @@ pub fn get_call_result(
     let [failure_flag, retdata_start, retdata_end]: &[MaybeRelocatable; 3] =
         (&return_result[2..]).try_into().expect("Return values must be of size 3.");
 
-    let failed = if *failure_flag == MaybeRelocatable::from(0) {
+    let execution_failed = if *failure_flag == MaybeRelocatable::from(0) {
         false
     } else if *failure_flag == MaybeRelocatable::from(1) {
         true
@@ -535,7 +535,7 @@ pub fn get_call_result(
         TrackedResource::SierraGas => syscall_handler.base.call.initial_gas - gas,
     };
     Ok(CallResult {
-        failed,
+        failed: execution_failed,
         retdata: read_execution_retdata(runner, retdata_size, retdata_start)?,
         gas_consumed,
     })
diff --git a/crates/blockifier/src/execution/syscalls/syscall_base.rs b/crates/blockifier/src/execution/syscalls/syscall_base.rs
index 06f0cf08eda..721e12037a5 100644
--- a/crates/blockifier/src/execution/syscalls/syscall_base.rs
+++ b/crates/blockifier/src/execution/syscalls/syscall_base.rs
@@ -449,9 +449,9 @@ impl<'state> SyscallHandlerBase<'state> {
         let call_info = call.execute(self.state, self.context, remaining_gas)?;
 
         let mut raw_retdata = call_info.execution.retdata.0.clone();
-        let failed = call_info.execution.failed;
+        let call_failed = call_info.execution.failed;
         self.inner_calls.push(call_info);
-        if failed {
+        if call_failed {
             self.context.revert(revert_idx, self.state)?;
 
             // Delete events and l2_to_l1_messages from the reverted call.