diff --git a/common/src/transaction.rs b/common/src/transaction.rs
index 5cfc9661..4d332ef9 100644
--- a/common/src/transaction.rs
+++ b/common/src/transaction.rs
@@ -70,14 +70,14 @@ impl NSSATransaction {
         self,
         state: &mut V03State,
         block_id: BlockId,
-        timestamp_ms: Timestamp,
+        timestamp: Timestamp,
     ) -> Result<Self, nssa::error::NssaError> {
         match &self {
             Self::Public(tx) => {
-                state.transition_from_public_transaction(tx, block_id, timestamp_ms)
+                state.transition_from_public_transaction(tx, block_id, timestamp)
             }
             Self::PrivacyPreserving(tx) => {
-                state.transition_from_privacy_preserving_transaction(tx, block_id, timestamp_ms)
+                state.transition_from_privacy_preserving_transaction(tx, block_id, timestamp)
             }
             Self::ProgramDeployment(tx) => state.transition_from_program_deployment_transaction(tx),
         }
diff --git a/nssa/src/privacy_preserving_transaction/transaction.rs b/nssa/src/privacy_preserving_transaction/transaction.rs
index 51e00ddf..3963c037 100644
--- a/nssa/src/privacy_preserving_transaction/transaction.rs
+++ b/nssa/src/privacy_preserving_transaction/transaction.rs
@@ -37,7 +37,7 @@ impl PrivacyPreservingTransaction {
         &self,
         state: &V03State,
         block_id: BlockId,
-        timestamp_ms: Timestamp,
+        timestamp: Timestamp,
     ) -> Result<HashMap<AccountId, Account>, NssaError> {
         let message = &self.message;
         let witness_set = &self.witness_set;
@@ -96,7 +96,7 @@ impl PrivacyPreservingTransaction {
 
         // Verify validity window
         if !message.block_validity_window.is_valid_for(block_id)
-            || !message.timestamp_validity_window.is_valid_for(timestamp_ms)
+            || !message.timestamp_validity_window.is_valid_for(timestamp)
         {
             return Err(NssaError::OutOfValidityWindow);
         }
diff --git a/nssa/src/public_transaction/transaction.rs b/nssa/src/public_transaction/transaction.rs
index d22e8936..57562776 100644
--- a/nssa/src/public_transaction/transaction.rs
+++ b/nssa/src/public_transaction/transaction.rs
@@ -72,7 +72,7 @@ impl PublicTransaction {
         &self,
         state: &V03State,
         block_id: BlockId,
-        timestamp_ms: Timestamp,
+        timestamp: Timestamp,
     ) -> Result<HashMap<AccountId, Account>, NssaError> {
         let message = self.message();
         let witness_set = self.witness_set();
@@ -196,7 +196,7 @@ impl PublicTransaction {
             // Verify validity window
             ensure!(
                 program_output.block_validity_window.is_valid_for(block_id)
-                    && program_output.timestamp_validity_window.is_valid_for(timestamp_ms),
+                    && program_output.timestamp_validity_window.is_valid_for(timestamp),
                 NssaError::OutOfValidityWindow
             );
 
diff --git a/nssa/src/state.rs b/nssa/src/state.rs
index 23cd326c..148146d4 100644
--- a/nssa/src/state.rs
+++ b/nssa/src/state.rs
@@ -159,9 +159,9 @@ impl V03State {
         &mut self,
         tx: &PublicTransaction,
         block_id: BlockId,
-        timestamp_ms: Timestamp,
+        timestamp: Timestamp,
     ) -> Result<(), NssaError> {
-        let state_diff = tx.validate_and_produce_public_state_diff(self, block_id, timestamp_ms)?;
+        let state_diff = tx.validate_and_produce_public_state_diff(self, block_id, timestamp)?;
 
         #[expect(
             clippy::iter_over_hash_type,
@@ -185,11 +185,11 @@ impl V03State {
         &mut self,
         tx: &PrivacyPreservingTransaction,
         block_id: BlockId,
-        timestamp_ms: Timestamp,
+        timestamp: Timestamp,
     ) -> Result<(), NssaError> {
         // 1. Verify the transaction satisfies acceptance criteria
         let public_state_diff =
-            tx.validate_and_produce_public_state_diff(self, block_id, timestamp_ms)?;
+            tx.validate_and_produce_public_state_diff(self, block_id, timestamp)?;
 
         let message = tx.message();
 
@@ -3066,7 +3066,7 @@ pub mod tests {
     #[test_case::test_case((None, None), 100; "no bounds - always valid 2")]
     fn timestamp_validity_window_works_in_public_transactions(
         validity_window: (Option<Timestamp>, Option<Timestamp>),
-        timestamp_ms: Timestamp,
+        timestamp: Timestamp,
     ) {
         let timestamp_validity_window: TimestampValidityWindow =
             validity_window.try_into().unwrap();
@@ -3086,12 +3086,12 @@ pub mod tests {
             let witness_set = public_transaction::WitnessSet::for_message(&message, &[]);
             PublicTransaction::new(message, witness_set)
         };
-        let result = state.transition_from_public_transaction(&tx, 1, timestamp_ms);
+        let result = state.transition_from_public_transaction(&tx, 1, timestamp);
         let is_inside_validity_window =
             match (timestamp_validity_window.start(), timestamp_validity_window.end()) {
-                (Some(s), Some(e)) => s <= timestamp_ms && timestamp_ms < e,
-                (Some(s), None) => s <= timestamp_ms,
-                (None, Some(e)) => timestamp_ms < e,
+                (Some(s), Some(e)) => s <= timestamp && timestamp < e,
+                (Some(s), None) => s <= timestamp,
+                (None, Some(e)) => timestamp < e,
                 (None, None) => true,
             };
         if is_inside_validity_window {
@@ -3181,7 +3181,7 @@ pub mod tests {
     #[test_case::test_case((None, None), 100; "no bounds - always valid 2")]
     fn timestamp_validity_window_works_in_privacy_preserving_transactions(
         validity_window: (Option<Timestamp>, Option<Timestamp>),
-        timestamp_ms: Timestamp,
+        timestamp: Timestamp,
     ) {
         let timestamp_validity_window: TimestampValidityWindow =
             validity_window.try_into().unwrap();
@@ -3218,12 +3218,12 @@ pub mod tests {
             let witness_set = WitnessSet::for_message(&message, proof, &[]);
             PrivacyPreservingTransaction::new(message, witness_set)
         };
-        let result = state.transition_from_privacy_preserving_transaction(&tx, 1, timestamp_ms);
+        let result = state.transition_from_privacy_preserving_transaction(&tx, 1, timestamp);
         let is_inside_validity_window =
             match (timestamp_validity_window.start(), timestamp_validity_window.end()) {
-                (Some(s), Some(e)) => s <= timestamp_ms && timestamp_ms < e,
-                (Some(s), None) => s <= timestamp_ms,
-                (None, Some(e)) => timestamp_ms < e,
+                (Some(s), Some(e)) => s <= timestamp && timestamp < e,
+                (Some(s), None) => s <= timestamp,
+                (None, Some(e)) => timestamp < e,
                 (None, None) => true,
             };
         if is_inside_validity_window {