diff --git a/yarn-project/noir-libs/easy-private-state/src/easy_private_state.nr b/yarn-project/noir-libs/easy-private-state/src/easy_private_state.nr
index df5390631a4..a5072a3f6f2 100644
--- a/yarn-project/noir-libs/easy-private-state/src/easy_private_state.nr
+++ b/yarn-project/noir-libs/easy-private-state/src/easy_private_state.nr
@@ -13,7 +13,7 @@ use dep::value_note::{
 };
 
 struct EasyPrivateUint {
-    context: Option<&mut PrivateContext>,
+    maybe_context: Option<&mut PrivateContext>,
     set: Set<ValueNote, VALUE_NOTE_LEN>,
     storage_slot: Field,
 }
@@ -32,7 +32,7 @@ impl EasyPrivateUint {
             note_interface: ValueNoteMethods,
         };
         EasyPrivateUint {
-            context: private_context,
+            maybe_context: private_context,
             set,
             storage_slot,
         }
@@ -48,10 +48,10 @@ impl EasyPrivateUint {
 
         // Emit the newly created encrypted note preimages via oracle calls.
         let owner_key = get_public_key(owner);
-        let maybeContext = self.context.unwrap();
+        let context = self.maybe_context.unwrap();
         emit_encrypted_log(
-            maybeContext,
-            (*maybeContext).this_address(),
+            context,
+            (*context).this_address(),
             self.set.storage_slot,
             owner_key,
             addend_note.serialise(),
@@ -94,10 +94,10 @@ impl EasyPrivateUint {
 
         let owner_key = get_public_key(owner);
 
-        let maybeContext = self.context.unwrap();
+        let context = self.maybe_context.unwrap();
         emit_encrypted_log(
-            maybeContext,
-            (*maybeContext).this_address(),
+            context,
+            (*context).this_address(),
             self.set.storage_slot,
             owner_key,
             encrypted_data,