diff --git a/Cargo.lock b/Cargo.lock
index 704935c6..6811089e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -105,7 +105,7 @@ checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd"
 [[package]]
 name = "aligned-sized"
 version = "1.1.0"
-source = "git+https://github.com/Lightprotocol/light-protocol?rev=d3e3170243d9cd87926ed41703f58374bfcaf532#d3e3170243d9cd87926ed41703f58374bfcaf532"
+source = "git+https://github.com/Lightprotocol/light-protocol?rev=3c1107cf1d6dd8e9bce29d4d22209673153db64b#3c1107cf1d6dd8e9bce29d4d22209673153db64b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3492,7 +3492,7 @@ dependencies = [
 [[package]]
 name = "light-account-checks"
 version = "0.1.0"
-source = "git+https://github.com/Lightprotocol/light-protocol?rev=d3e3170243d9cd87926ed41703f58374bfcaf532#d3e3170243d9cd87926ed41703f58374bfcaf532"
+source = "git+https://github.com/Lightprotocol/light-protocol?rev=3c1107cf1d6dd8e9bce29d4d22209673153db64b#3c1107cf1d6dd8e9bce29d4d22209673153db64b"
 dependencies = [
  "solana-program",
  "thiserror 2.0.12",
@@ -3501,7 +3501,7 @@ dependencies = [
 [[package]]
 name = "light-batched-merkle-tree"
 version = "0.1.0"
-source = "git+https://github.com/Lightprotocol/light-protocol?rev=d3e3170243d9cd87926ed41703f58374bfcaf532#d3e3170243d9cd87926ed41703f58374bfcaf532"
+source = "git+https://github.com/Lightprotocol/light-protocol?rev=3c1107cf1d6dd8e9bce29d4d22209673153db64b#3c1107cf1d6dd8e9bce29d4d22209673153db64b"
 dependencies = [
  "aligned-sized",
  "borsh 0.10.4",
@@ -3521,7 +3521,7 @@ dependencies = [
 [[package]]
 name = "light-bloom-filter"
 version = "0.1.0"
-source = "git+https://github.com/Lightprotocol/light-protocol?rev=d3e3170243d9cd87926ed41703f58374bfcaf532#d3e3170243d9cd87926ed41703f58374bfcaf532"
+source = "git+https://github.com/Lightprotocol/light-protocol?rev=3c1107cf1d6dd8e9bce29d4d22209673153db64b#3c1107cf1d6dd8e9bce29d4d22209673153db64b"
 dependencies = [
  "bitvec",
  "fastmurmur3",
@@ -3544,8 +3544,8 @@ dependencies = [
 
 [[package]]
 name = "light-compressed-account"
-version = "0.1.1"
-source = "git+https://github.com/Lightprotocol/light-protocol?rev=d3e3170243d9cd87926ed41703f58374bfcaf532#d3e3170243d9cd87926ed41703f58374bfcaf532"
+version = "0.1.0"
+source = "git+https://github.com/Lightprotocol/light-protocol?rev=3c1107cf1d6dd8e9bce29d4d22209673153db64b#3c1107cf1d6dd8e9bce29d4d22209673153db64b"
 dependencies = [
  "borsh 0.10.4",
  "bytemuck",
@@ -3561,7 +3561,7 @@ dependencies = [
 [[package]]
 name = "light-concurrent-merkle-tree"
 version = "1.1.0"
-source = "git+https://github.com/Lightprotocol/light-protocol?rev=d3e3170243d9cd87926ed41703f58374bfcaf532#d3e3170243d9cd87926ed41703f58374bfcaf532"
+source = "git+https://github.com/Lightprotocol/light-protocol?rev=3c1107cf1d6dd8e9bce29d4d22209673153db64b#3c1107cf1d6dd8e9bce29d4d22209673153db64b"
 dependencies = [
  "borsh 0.10.4",
  "light-bounded-vec",
@@ -3575,11 +3575,12 @@ dependencies = [
 [[package]]
 name = "light-hasher"
 version = "1.1.0"
-source = "git+https://github.com/Lightprotocol/light-protocol?rev=d3e3170243d9cd87926ed41703f58374bfcaf532#d3e3170243d9cd87926ed41703f58374bfcaf532"
+source = "git+https://github.com/Lightprotocol/light-protocol?rev=3c1107cf1d6dd8e9bce29d4d22209673153db64b#3c1107cf1d6dd8e9bce29d4d22209673153db64b"
 dependencies = [
  "ark-bn254 0.5.0",
  "ark-ff 0.5.0",
  "arrayvec",
+ "borsh 0.10.4",
  "light-poseidon 0.3.0",
  "num-bigint 0.4.6",
  "sha2 0.10.8",
@@ -3591,7 +3592,7 @@ dependencies = [
 [[package]]
 name = "light-indexed-array"
 version = "0.1.0"
-source = "git+https://github.com/Lightprotocol/light-protocol?rev=d3e3170243d9cd87926ed41703f58374bfcaf532#d3e3170243d9cd87926ed41703f58374bfcaf532"
+source = "git+https://github.com/Lightprotocol/light-protocol?rev=3c1107cf1d6dd8e9bce29d4d22209673153db64b#3c1107cf1d6dd8e9bce29d4d22209673153db64b"
 dependencies = [
  "light-hasher",
  "num-bigint 0.4.6",
@@ -3602,7 +3603,7 @@ dependencies = [
 [[package]]
 name = "light-indexed-merkle-tree"
 version = "1.1.0"
-source = "git+https://github.com/Lightprotocol/light-protocol?rev=d3e3170243d9cd87926ed41703f58374bfcaf532#d3e3170243d9cd87926ed41703f58374bfcaf532"
+source = "git+https://github.com/Lightprotocol/light-protocol?rev=3c1107cf1d6dd8e9bce29d4d22209673153db64b#3c1107cf1d6dd8e9bce29d4d22209673153db64b"
 dependencies = [
  "light-bounded-vec",
  "light-concurrent-merkle-tree",
@@ -3618,7 +3619,7 @@ dependencies = [
 [[package]]
 name = "light-macros"
 version = "1.1.0"
-source = "git+https://github.com/Lightprotocol/light-protocol?rev=d3e3170243d9cd87926ed41703f58374bfcaf532#d3e3170243d9cd87926ed41703f58374bfcaf532"
+source = "git+https://github.com/Lightprotocol/light-protocol?rev=3c1107cf1d6dd8e9bce29d4d22209673153db64b#3c1107cf1d6dd8e9bce29d4d22209673153db64b"
 dependencies = [
  "bs58 0.5.1",
  "proc-macro2",
@@ -3629,7 +3630,7 @@ dependencies = [
 [[package]]
 name = "light-merkle-tree-metadata"
 version = "0.1.0"
-source = "git+https://github.com/Lightprotocol/light-protocol?rev=d3e3170243d9cd87926ed41703f58374bfcaf532#d3e3170243d9cd87926ed41703f58374bfcaf532"
+source = "git+https://github.com/Lightprotocol/light-protocol?rev=3c1107cf1d6dd8e9bce29d4d22209673153db64b#3c1107cf1d6dd8e9bce29d4d22209673153db64b"
 dependencies = [
  "borsh 0.10.4",
  "bytemuck",
@@ -3642,7 +3643,7 @@ dependencies = [
 [[package]]
 name = "light-merkle-tree-reference"
 version = "1.1.0"
-source = "git+https://github.com/Lightprotocol/light-protocol?rev=d3e3170243d9cd87926ed41703f58374bfcaf532#d3e3170243d9cd87926ed41703f58374bfcaf532"
+source = "git+https://github.com/Lightprotocol/light-protocol?rev=3c1107cf1d6dd8e9bce29d4d22209673153db64b#3c1107cf1d6dd8e9bce29d4d22209673153db64b"
 dependencies = [
  "light-hasher",
  "light-indexed-array",
@@ -3678,7 +3679,7 @@ dependencies = [
 [[package]]
 name = "light-prover-client"
 version = "1.2.0"
-source = "git+https://github.com/Lightprotocol/light-protocol?rev=d3e3170243d9cd87926ed41703f58374bfcaf532#d3e3170243d9cd87926ed41703f58374bfcaf532"
+source = "git+https://github.com/Lightprotocol/light-protocol?rev=3c1107cf1d6dd8e9bce29d4d22209673153db64b#3c1107cf1d6dd8e9bce29d4d22209673153db64b"
 dependencies = [
  "ark-bn254 0.5.0",
  "ark-serialize 0.5.0",
@@ -3708,9 +3709,10 @@ dependencies = [
 [[package]]
 name = "light-sdk"
 version = "0.11.0"
-source = "git+https://github.com/Lightprotocol/light-protocol?rev=d3e3170243d9cd87926ed41703f58374bfcaf532#d3e3170243d9cd87926ed41703f58374bfcaf532"
+source = "git+https://github.com/Lightprotocol/light-protocol?rev=3c1107cf1d6dd8e9bce29d4d22209673153db64b#3c1107cf1d6dd8e9bce29d4d22209673153db64b"
 dependencies = [
  "borsh 0.10.4",
+ "light-account-checks",
  "light-compressed-account",
  "light-hasher",
  "light-macros",
@@ -3724,7 +3726,7 @@ dependencies = [
 [[package]]
 name = "light-sdk-macros"
 version = "0.4.0"
-source = "git+https://github.com/Lightprotocol/light-protocol?rev=d3e3170243d9cd87926ed41703f58374bfcaf532#d3e3170243d9cd87926ed41703f58374bfcaf532"
+source = "git+https://github.com/Lightprotocol/light-protocol?rev=3c1107cf1d6dd8e9bce29d4d22209673153db64b#3c1107cf1d6dd8e9bce29d4d22209673153db64b"
 dependencies = [
  "ark-bn254 0.5.0",
  "light-hasher",
@@ -3753,7 +3755,7 @@ dependencies = [
 [[package]]
 name = "light-verifier"
 version = "1.1.0"
-source = "git+https://github.com/Lightprotocol/light-protocol?rev=d3e3170243d9cd87926ed41703f58374bfcaf532#d3e3170243d9cd87926ed41703f58374bfcaf532"
+source = "git+https://github.com/Lightprotocol/light-protocol?rev=3c1107cf1d6dd8e9bce29d4d22209673153db64b#3c1107cf1d6dd8e9bce29d4d22209673153db64b"
 dependencies = [
  "groth16-solana 0.1.0",
  "light-compressed-account",
@@ -3764,7 +3766,7 @@ dependencies = [
 [[package]]
 name = "light-zero-copy"
 version = "0.1.0"
-source = "git+https://github.com/Lightprotocol/light-protocol?rev=d3e3170243d9cd87926ed41703f58374bfcaf532#d3e3170243d9cd87926ed41703f58374bfcaf532"
+source = "git+https://github.com/Lightprotocol/light-protocol?rev=3c1107cf1d6dd8e9bce29d4d22209673153db64b#3c1107cf1d6dd8e9bce29d4d22209673153db64b"
 dependencies = [
  "solana-program",
  "thiserror 2.0.12",
diff --git a/Cargo.toml b/Cargo.toml
index 0393186d..af8433c4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -77,15 +77,15 @@ solana-program = "1.18.0"
 solana-sdk = "1.18.0"
 solana-transaction-status = "1.18.0"
 
-light-batched-merkle-tree = { git = "https://github.com/Lightprotocol/light-protocol", rev = "d3e3170243d9cd87926ed41703f58374bfcaf532" }
-light-compressed-account = { git = "https://github.com/Lightprotocol/light-protocol", rev = "d3e3170243d9cd87926ed41703f58374bfcaf532" }
-light-concurrent-merkle-tree = { git = "https://github.com/Lightprotocol/light-protocol", rev = "d3e3170243d9cd87926ed41703f58374bfcaf532" }
-light-hasher = { git = "https://github.com/Lightprotocol/light-protocol", rev = "d3e3170243d9cd87926ed41703f58374bfcaf532" }
-light-indexed-merkle-tree = { git = "https://github.com/Lightprotocol/light-protocol", rev = "d3e3170243d9cd87926ed41703f58374bfcaf532" }
-light-merkle-tree-metadata = { git = "https://github.com/Lightprotocol/light-protocol", rev = "d3e3170243d9cd87926ed41703f58374bfcaf532" }
-light-merkle-tree-reference = { git = "https://github.com/Lightprotocol/light-protocol", rev = "d3e3170243d9cd87926ed41703f58374bfcaf532" }
-light-prover-client = { git = "https://github.com/Lightprotocol/light-protocol", rev = "d3e3170243d9cd87926ed41703f58374bfcaf532" }
-light-sdk = { git = "https://github.com/Lightprotocol/light-protocol", rev = "d3e3170243d9cd87926ed41703f58374bfcaf532" }
+light-batched-merkle-tree = { git = "https://github.com/Lightprotocol/light-protocol", rev = "3c1107cf1d6dd8e9bce29d4d22209673153db64b" }
+light-compressed-account = { git = "https://github.com/Lightprotocol/light-protocol", rev = "3c1107cf1d6dd8e9bce29d4d22209673153db64b" }
+light-concurrent-merkle-tree = { git = "https://github.com/Lightprotocol/light-protocol", rev = "3c1107cf1d6dd8e9bce29d4d22209673153db64b" }
+light-hasher = { git = "https://github.com/Lightprotocol/light-protocol", rev = "3c1107cf1d6dd8e9bce29d4d22209673153db64b" }
+light-indexed-merkle-tree = { git = "https://github.com/Lightprotocol/light-protocol", rev = "3c1107cf1d6dd8e9bce29d4d22209673153db64b" }
+light-merkle-tree-metadata = { git = "https://github.com/Lightprotocol/light-protocol", rev = "3c1107cf1d6dd8e9bce29d4d22209673153db64b" }
+light-merkle-tree-reference = { git = "https://github.com/Lightprotocol/light-protocol", rev = "3c1107cf1d6dd8e9bce29d4d22209673153db64b" }
+light-prover-client = { git = "https://github.com/Lightprotocol/light-protocol", rev = "3c1107cf1d6dd8e9bce29d4d22209673153db64b" }
+light-sdk = { git = "https://github.com/Lightprotocol/light-protocol", rev = "3c1107cf1d6dd8e9bce29d4d22209673153db64b" }
 
 sqlx = { version = "0.6.2", features = [
     "macros",
@@ -129,7 +129,7 @@ rust-s3 = "0.34.0"
 [dev-dependencies]
 function_name = "0.3.0"
 serial_test = "2.0.0"
-light-hasher = { git = "https://github.com/Lightprotocol/light-protocol", rev = "d3e3170243d9cd87926ed41703f58374bfcaf532" }
+light-hasher = { git = "https://github.com/Lightprotocol/light-protocol", rev = "3c1107cf1d6dd8e9bce29d4d22209673153db64b" }
 
 [profile.dev]
 # Do not produce debug info for ~40% faster incremental compilation.
diff --git a/src/api/method/get_multiple_new_address_proofs.rs b/src/api/method/get_multiple_new_address_proofs.rs
index 03e29597..9947501a 100644
--- a/src/api/method/get_multiple_new_address_proofs.rs
+++ b/src/api/method/get_multiple_new_address_proofs.rs
@@ -80,13 +80,13 @@ pub async fn get_multiple_new_address_proofs_helper(
             })?
             .clone();
         let (model, proof) = match tree_and_queue.tree_type {
-            TreeType::Address => {
+            TreeType::AddressV1 => {
                 let address = address.to_bytes_vec();
                 let tree = tree.to_bytes_vec();
                 get_exclusion_range_with_proof_legacy(txn, tree, tree_and_queue.height + 1, address)
                     .await?
             }
-            TreeType::BatchedAddress => {
+            TreeType::AddressV2 => {
                 get_exclusion_range_with_proof(
                     txn,
                     tree.to_bytes_vec(),
diff --git a/src/api/method/get_queue_elements.rs b/src/api/method/get_queue_elements.rs
index 3dc6004b..d2433fc6 100644
--- a/src/api/method/get_queue_elements.rs
+++ b/src/api/method/get_queue_elements.rs
@@ -72,7 +72,7 @@ pub async fn get_queue_elements(
         Condition::all().add(accounts::Column::Tree.eq(request.tree.to_vec()));
 
     match queue_type {
-        QueueType::BatchedInput => {
+        QueueType::InputStateV2 => {
             query_condition =
                 query_condition.add(accounts::Column::NullifierQueueIndex.is_not_null());
             if let Some(start_offset) = request.start_offset {
@@ -80,7 +80,7 @@ pub async fn get_queue_elements(
                     .add(accounts::Column::NullifierQueueIndex.gte(start_offset as i64));
             }
         }
-        QueueType::BatchedOutput => {
+        QueueType::OutputStateV2 => {
             query_condition = query_condition.add(accounts::Column::InOutputQueue.eq(true));
             if let Some(start_offset) = request.start_offset {
                 query_condition =
@@ -96,10 +96,10 @@ pub async fn get_queue_elements(
     }
 
     let query = match queue_type {
-        QueueType::BatchedInput => accounts::Entity::find()
+        QueueType::InputStateV2 => accounts::Entity::find()
             .filter(query_condition)
             .order_by_asc(accounts::Column::NullifierQueueIndex),
-        QueueType::BatchedOutput => accounts::Entity::find()
+        QueueType::OutputStateV2 => accounts::Entity::find()
             .filter(query_condition)
             .order_by_asc(accounts::Column::LeafIndex),
         _ => {
@@ -121,10 +121,10 @@ pub async fn get_queue_elements(
     let indices: Vec<u64> = queue_elements.iter().map(|e| e.leaf_index as u64).collect();
     let (proofs, first_value_queue_index) = if !indices.is_empty() {
         let first_value_queue_index = match queue_type {
-            QueueType::BatchedInput => Ok(queue_elements[0].nullifier_queue_index.ok_or(
+            QueueType::InputStateV2 => Ok(queue_elements[0].nullifier_queue_index.ok_or(
                 PhotonApiError::ValidationError("Nullifier queue index is missing".to_string()),
             )? as u64),
-            QueueType::BatchedOutput => Ok(queue_elements[0].leaf_index as u64),
+            QueueType::OutputStateV2 => Ok(queue_elements[0].leaf_index as u64),
             _ => Err(PhotonApiError::ValidationError(format!(
                 "Invalid queue type: {:?}",
                 queue_type
diff --git a/src/ingester/parser/tree_info.rs b/src/ingester/parser/tree_info.rs
index a9d4fd9c..62df4e56 100644
--- a/src/ingester/parser/tree_info.rs
+++ b/src/ingester/parser/tree_info.rs
@@ -182,7 +182,7 @@ lazy_static! {
                     tree: *legacy_tree,
                     queue: *legacy_queue,
                     height: 26,
-                    tree_type: TreeType::State,
+                    tree_type: TreeType::StateV1,
                 },
             );
 
@@ -192,7 +192,7 @@ lazy_static! {
                     tree: *legacy_tree,
                     queue: *legacy_queue,
                     height: 26,
-                    tree_type: TreeType::State,
+                    tree_type: TreeType::StateV1,
                 },
             );
         }
@@ -204,7 +204,7 @@ lazy_static! {
                     tree: *legacy_tree,
                     queue: *legacy_queue,
                     height: 26,
-                    tree_type: TreeType::Address,
+                    tree_type: TreeType::AddressV1,
                 },
             );
 
@@ -214,7 +214,7 @@ lazy_static! {
                     tree: *legacy_tree,
                     queue: *legacy_queue,
                     height: 26,
-                    tree_type: TreeType::Address,
+                    tree_type: TreeType::AddressV1,
                 },
             );
         }
@@ -225,7 +225,7 @@ lazy_static! {
                 tree: pubkey!("HLKs5NJ8FXkJg8BrzJt56adFYYuwg5etzDtBbQYTsixu"),
                 queue: pubkey!("6L7SzhYB3anwEQ9cphpJ1U7Scwj57bx2xueReg7R9cKU"),
                 height: 32,
-                tree_type: TreeType::BatchedState,
+                tree_type: TreeType::StateV2,
             },
         );
 
@@ -235,7 +235,7 @@ lazy_static! {
                 tree: pubkey!("HLKs5NJ8FXkJg8BrzJt56adFYYuwg5etzDtBbQYTsixu"),
                 queue: pubkey!("6L7SzhYB3anwEQ9cphpJ1U7Scwj57bx2xueReg7R9cKU"),
                 height: 32,
-                tree_type: TreeType::BatchedState,
+                tree_type: TreeType::StateV2,
             },
         );
 
@@ -245,7 +245,7 @@ lazy_static! {
                 tree: pubkey!("EzKE84aVTkCUhDHLELqyJaq1Y7UVVmqxXqZjVHwHY3rK"),
                 queue: pubkey!("EzKE84aVTkCUhDHLELqyJaq1Y7UVVmqxXqZjVHwHY3rK"),
                 height: 40,
-                tree_type: TreeType::BatchedAddress,
+                tree_type: TreeType::AddressV2,
             },
         );
 
diff --git a/src/ingester/parser/tx_event_parser.rs b/src/ingester/parser/tx_event_parser.rs
index f1e689f2..82412d56 100644
--- a/src/ingester/parser/tx_event_parser.rs
+++ b/src/ingester/parser/tx_event_parser.rs
@@ -70,7 +70,7 @@ pub fn create_state_update_v1(
             .clone();
 
         let mut seq = None;
-        if tree_and_queue.tree_type == TreeType::State {
+        if tree_and_queue.tree_type == TreeType::StateV1 {
             seq = Some(*tree_to_seq_number.get(&tree).ok_or_else(|| {
                 IngesterError::ParserError("Missing sequence number".to_string())
             })?);
@@ -81,7 +81,7 @@ pub fn create_state_update_v1(
             *seq += 1;
         }
 
-        let in_output_queue = tree_and_queue.tree_type == TreeType::BatchedState;
+        let in_output_queue = tree_and_queue.tree_type == TreeType::StateV2;
         let enriched_account = AccountWithContext::new(
             out_account.compressed_account.clone(),
             &hash,
diff --git a/tests/integration_tests/batched_state_tree_tests.rs b/tests/integration_tests/batched_state_tree_tests.rs
index 225de79f..b5b3ad3f 100644
--- a/tests/integration_tests/batched_state_tree_tests.rs
+++ b/tests/integration_tests/batched_state_tree_tests.rs
@@ -137,7 +137,7 @@ async fn test_batched_tree_transactions(
                 .get_queue_elements(GetQueueElementsRequest {
                     tree: merkle_tree_pubkey.to_bytes().into(),
                     start_offset: None,
-                    queue_type: QueueType::BatchedOutput as u8,
+                    queue_type: QueueType::OutputStateV2 as u8,
                     num_elements: 100,
                 })
                 .await
@@ -163,7 +163,7 @@ async fn test_batched_tree_transactions(
                 .get_queue_elements(GetQueueElementsRequest {
                     tree: merkle_tree_pubkey.to_bytes().into(),
                     start_offset: None,
-                    queue_type: QueueType::BatchedInput as u8,
+                    queue_type: QueueType::InputStateV2 as u8,
                     num_elements: 100,
                 })
                 .await
@@ -246,7 +246,7 @@ async fn test_batched_tree_transactions(
             .get_queue_elements(GetQueueElementsRequest {
                 tree: merkle_tree_pubkey.to_bytes().into(),
                 start_offset: None,
-                queue_type: QueueType::BatchedOutput as u8,
+                queue_type: QueueType::OutputStateV2 as u8,
                 num_elements: 100,
             })
             .await
@@ -256,7 +256,7 @@ async fn test_batched_tree_transactions(
             .get_queue_elements(GetQueueElementsRequest {
                 tree: merkle_tree_pubkey.to_bytes().into(),
                 start_offset: None,
-                queue_type: QueueType::BatchedInput as u8,
+                queue_type: QueueType::InputStateV2 as u8,
                 num_elements: 100,
             })
             .await
@@ -275,7 +275,7 @@ async fn test_batched_tree_transactions(
             .get_queue_elements(GetQueueElementsRequest {
                 tree: merkle_tree_pubkey.to_bytes().into(),
                 start_offset: None,
-                queue_type: QueueType::BatchedOutput as u8,
+                queue_type: QueueType::OutputStateV2 as u8,
                 num_elements: 100,
             })
             .await
@@ -285,7 +285,7 @@ async fn test_batched_tree_transactions(
             .get_queue_elements(GetQueueElementsRequest {
                 tree: merkle_tree_pubkey.to_bytes().into(),
                 start_offset: None,
-                queue_type: QueueType::BatchedInput as u8,
+                queue_type: QueueType::InputStateV2 as u8,
                 num_elements: 100,
             })
             .await
@@ -419,7 +419,7 @@ async fn test_batched_tree_transactions(
         .get_queue_elements(GetQueueElementsRequest {
             tree: merkle_tree_pubkey.to_bytes().into(),
             start_offset: None,
-            queue_type: QueueType::BatchedOutput as u8,
+            queue_type: QueueType::OutputStateV2 as u8,
             num_elements: 100,
         })
         .await
@@ -435,7 +435,7 @@ async fn test_batched_tree_transactions(
         .get_queue_elements(GetQueueElementsRequest {
             tree: merkle_tree_pubkey.to_bytes().into(),
             start_offset: None,
-            queue_type: QueueType::BatchedInput as u8,
+            queue_type: QueueType::InputStateV2 as u8,
             num_elements: 100,
         })
         .await
diff --git a/tests/integration_tests/mock_tests.rs b/tests/integration_tests/mock_tests.rs
index b525f57b..06483fa2 100644
--- a/tests/integration_tests/mock_tests.rs
+++ b/tests/integration_tests/mock_tests.rs
@@ -195,7 +195,7 @@ async fn test_multiple_accounts(
                 slot_created: UnsignedInteger(0),
             },
             context: AccountContext {
-                tree_type: TreeType::State as u16,
+                tree_type: TreeType::StateV1 as u16,
                 ..AccountContext::default()
             },
         },
@@ -216,7 +216,7 @@ async fn test_multiple_accounts(
                 slot_created: UnsignedInteger(0),
             },
             context: AccountContext {
-                tree_type: TreeType::State as u16,
+                tree_type: TreeType::StateV1 as u16,
                 ..AccountContext::default()
             },
         },
@@ -237,7 +237,7 @@ async fn test_multiple_accounts(
                 slot_created: UnsignedInteger(1),
             },
             context: AccountContext {
-                tree_type: TreeType::State as u16,
+                tree_type: TreeType::StateV1 as u16,
                 ..AccountContext::default()
             },
         },
@@ -258,7 +258,7 @@ async fn test_multiple_accounts(
                 slot_created: UnsignedInteger(0),
             },
             context: AccountContext {
-                tree_type: TreeType::State as u16,
+                tree_type: TreeType::StateV1 as u16,
                 ..AccountContext::default()
             },
         },
@@ -572,7 +572,7 @@ async fn test_persist_token_data(
             data_hash: Set(Some(Hash::new_unique().to_vec())),
             tree: Set(Pubkey::new_unique().to_bytes().to_vec()),
             queue: Set(Pubkey::new_unique().to_bytes().to_vec()),
-            tree_type: Set(TreeType::State as i32),
+            tree_type: Set(TreeType::StateV1 as i32),
             seq: Set(Some(0)),
             ..Default::default()
         };