diff --git a/miden-lib/src/notes/mod.rs b/miden-lib/src/notes/mod.rs
index 2c7e27cd6..2997e1588 100644
--- a/miden-lib/src/notes/mod.rs
+++ b/miden-lib/src/notes/mod.rs
@@ -3,6 +3,7 @@ use alloc::vec::Vec;
 use miden_objects::{
     accounts::AccountId,
     assets::Asset,
+    block::BlockNumber,
     crypto::rand::FeltRng,
     notes::{
         Note, NoteAssets, NoteDetails, NoteExecutionHint, NoteExecutionMode, NoteInputs,
@@ -65,7 +66,7 @@ pub fn create_p2idr_note<R: FeltRng>(
     assets: Vec<Asset>,
     note_type: NoteType,
     aux: Felt,
-    recall_height: u32,
+    recall_height: BlockNumber,
     rng: &mut R,
 ) -> Result<Note, NoteError> {
     let note_script = scripts::p2idr();
diff --git a/miden-tx/src/testing/mock_chain/mod.rs b/miden-tx/src/testing/mock_chain/mod.rs
index 5c63d2aae..7122471a6 100644
--- a/miden-tx/src/testing/mock_chain/mod.rs
+++ b/miden-tx/src/testing/mock_chain/mod.rs
@@ -384,7 +384,7 @@ impl MockChain {
         target_account_id: AccountId,
         asset: &[Asset],
         note_type: NoteType,
-        reclaim_height: Option<u32>,
+        reclaim_height: Option<BlockNumber>,
     ) -> Result<Note, NoteError> {
         let mut rng = RpoRandomCoin::new(Word::default());
 
diff --git a/miden-tx/tests/integration/scripts/p2idr.rs b/miden-tx/tests/integration/scripts/p2idr.rs
index fe255d055..e48ffcb17 100644
--- a/miden-tx/tests/integration/scripts/p2idr.rs
+++ b/miden-tx/tests/integration/scripts/p2idr.rs
@@ -25,8 +25,8 @@ fn p2idr_script() {
     let malicious_account = mock_chain.add_existing_wallet(Auth::BasicAuth, vec![]);
 
     // Create the reclaim block heights
-    let reclaim_block_height_in_time = 7_u32;
-    let reclaim_block_height_reclaimable = 2_u32;
+    let reclaim_block_height_in_time = 7.into();
+    let reclaim_block_height_reclaimable = 2.into();
 
     // Create the notes with the P2IDR script
     let note_in_time = mock_chain