diff --git a/corelib/src/integer.cairo b/corelib/src/integer.cairo
index df489f351b4..177614a2fc1 100644
--- a/corelib/src/integer.cairo
+++ b/corelib/src/integer.cairo
@@ -1059,7 +1059,7 @@ impl U64BitOr of BitOr<u64> {
     }
 }
 
-#[derive(Copy, Drop, PartialEq, Serde, starknet::StorageAccess)]
+#[derive(Copy, Drop, PartialEq, Serde, starknet::StorageValue)]
 struct u256 {
     low: u128,
     high: u128,
diff --git a/corelib/src/starknet.cairo b/corelib/src/starknet.cairo
index 9d85c8fb49c..841f62a314f 100644
--- a/corelib/src/starknet.cairo
+++ b/corelib/src/starknet.cairo
@@ -6,10 +6,10 @@ use traits::TryInto;
 use zeroable::Zeroable;
 
 // Re-imports
-// StorageAccess
+// StorageValue
 mod storage_access;
 use storage_access::{
-    StorageAccess, StorageAddress, StorageBaseAddress, storage_base_address_const,
+    StorageValue, StorageAddress, StorageBaseAddress, storage_base_address_const,
     storage_base_address_from_felt252, storage_address_from_base,
     storage_address_from_base_and_offset, storage_address_to_felt252,
     storage_address_try_from_felt252
diff --git a/corelib/src/starknet/eth_address.cairo b/corelib/src/starknet/eth_address.cairo
index 99e23d0b421..8f1b4c75b16 100644
--- a/corelib/src/starknet/eth_address.cairo
+++ b/corelib/src/starknet/eth_address.cairo
@@ -6,7 +6,7 @@ use traits::{Into, TryInto};
 use zeroable::Zeroable;
 
 // An Ethereum address (160 bits).
-#[derive(Copy, Drop, starknet::StorageAccess)]
+#[derive(Copy, Drop, starknet::StorageValue)]
 struct EthAddress {
     address: felt252, 
 }
diff --git a/corelib/src/starknet/secp256_trait.cairo b/corelib/src/starknet/secp256_trait.cairo
index bb78f46198b..b6f00087596 100644
--- a/corelib/src/starknet/secp256_trait.cairo
+++ b/corelib/src/starknet/secp256_trait.cairo
@@ -7,7 +7,7 @@ use traits::{Into, TryInto};
 use integer::U256TryIntoNonZero;
 
 /// Secp256{k/r}1 ECDSA signature.
-#[derive(Copy, Drop, PartialEq, Serde, starknet::StorageAccess)]
+#[derive(Copy, Drop, PartialEq, Serde, starknet::StorageValue)]
 struct Signature {
     r: u256,
     s: u256,
diff --git a/corelib/src/starknet/storage_access.cairo b/corelib/src/starknet/storage_access.cairo
index a2656620d5c..3b1bbecd019 100644
--- a/corelib/src/starknet/storage_access.cairo
+++ b/corelib/src/starknet/storage_access.cairo
@@ -52,7 +52,7 @@ impl StorageAddressSerde of serde::Serde<StorageAddress> {
     }
 }
 
-trait StorageAccess<T> {
+trait StorageValue<T> {
     fn read(address_domain: u32, base: StorageBaseAddress) -> SyscallResult<T>;
     fn write(address_domain: u32, base: StorageBaseAddress, value: T) -> SyscallResult<()>;
     fn read_at_offset(
@@ -64,7 +64,7 @@ trait StorageAccess<T> {
     fn size() -> u8;
 }
 
-impl StorageAccessFelt252 of StorageAccess<felt252> {
+impl StorageValueFelt252 of StorageValue<felt252> {
     #[inline(always)]
     fn read(address_domain: u32, base: StorageBaseAddress) -> SyscallResult<felt252> {
         storage_read_syscall(address_domain, storage_address_from_base(base))
@@ -93,13 +93,13 @@ impl StorageAccessFelt252 of StorageAccess<felt252> {
     }
 }
 
-impl StorageAccessBool of StorageAccess<bool> {
+impl StorageValueBool of StorageValue<bool> {
     fn read(address_domain: u32, base: StorageBaseAddress) -> SyscallResult<bool> {
-        Result::Ok(StorageAccess::<felt252>::read(address_domain, base)? != 0)
+        Result::Ok(StorageValue::<felt252>::read(address_domain, base)? != 0)
     }
     #[inline(always)]
     fn write(address_domain: u32, base: StorageBaseAddress, value: bool) -> SyscallResult<()> {
-        StorageAccess::<felt252>::write(address_domain, base, if value {
+        StorageValue::<felt252>::write(address_domain, base, if value {
             1
         } else {
             0
@@ -109,13 +109,13 @@ impl StorageAccessBool of StorageAccess<bool> {
     fn read_at_offset(
         address_domain: u32, base: StorageBaseAddress, offset: u8
     ) -> SyscallResult<bool> {
-        Result::Ok(StorageAccess::<felt252>::read_at_offset(address_domain, base, offset)? != 0)
+        Result::Ok(StorageValue::<felt252>::read_at_offset(address_domain, base, offset)? != 0)
     }
     #[inline(always)]
     fn write_at_offset(
         address_domain: u32, base: StorageBaseAddress, offset: u8, value: bool
     ) -> SyscallResult<()> {
-        StorageAccess::<felt252>::write_at_offset(
+        StorageValue::<felt252>::write_at_offset(
             address_domain, base, offset, if value {
                 1
             } else {
@@ -129,33 +129,33 @@ impl StorageAccessBool of StorageAccess<bool> {
     }
 }
 
-impl StorageAccessU8 of StorageAccess<u8> {
+impl StorageValueU8 of StorageValue<u8> {
     fn read(address_domain: u32, base: StorageBaseAddress) -> SyscallResult<u8> {
         Result::Ok(
-            StorageAccess::<felt252>::read(address_domain, base)?
+            StorageValue::<felt252>::read(address_domain, base)?
                 .try_into()
-                .expect('StorageAccessU8 - non u8')
+                .expect('StorageValueU8 - non u8')
         )
     }
     #[inline(always)]
     fn write(address_domain: u32, base: StorageBaseAddress, value: u8) -> SyscallResult<()> {
-        StorageAccess::<felt252>::write(address_domain, base, value.into())
+        StorageValue::<felt252>::write(address_domain, base, value.into())
     }
     #[inline(always)]
     fn read_at_offset(
         address_domain: u32, base: StorageBaseAddress, offset: u8
     ) -> SyscallResult<u8> {
         Result::Ok(
-            StorageAccess::<felt252>::read_at_offset(address_domain, base, offset)?
+            StorageValue::<felt252>::read_at_offset(address_domain, base, offset)?
                 .try_into()
-                .expect('StorageAccessU8 - non u8')
+                .expect('StorageValueU8 - non u8')
         )
     }
     #[inline(always)]
     fn write_at_offset(
         address_domain: u32, base: StorageBaseAddress, offset: u8, value: u8
     ) -> SyscallResult<()> {
-        StorageAccess::<felt252>::write_at_offset(address_domain, base, offset, value.into())
+        StorageValue::<felt252>::write_at_offset(address_domain, base, offset, value.into())
     }
     #[inline(always)]
     fn size() -> u8 {
@@ -163,33 +163,33 @@ impl StorageAccessU8 of StorageAccess<u8> {
     }
 }
 
-impl StorageAccessU16 of StorageAccess<u16> {
+impl StorageValueU16 of StorageValue<u16> {
     fn read(address_domain: u32, base: StorageBaseAddress) -> SyscallResult<u16> {
         Result::Ok(
-            StorageAccess::<felt252>::read(address_domain, base)?
+            StorageValue::<felt252>::read(address_domain, base)?
                 .try_into()
-                .expect('StorageAccessU16 - non u16')
+                .expect('StorageValueU16 - non u16')
         )
     }
     #[inline(always)]
     fn write(address_domain: u32, base: StorageBaseAddress, value: u16) -> SyscallResult<()> {
-        StorageAccess::<felt252>::write(address_domain, base, value.into())
+        StorageValue::<felt252>::write(address_domain, base, value.into())
     }
     #[inline(always)]
     fn read_at_offset(
         address_domain: u32, base: StorageBaseAddress, offset: u8
     ) -> SyscallResult<u16> {
         Result::Ok(
-            StorageAccess::<felt252>::read_at_offset(address_domain, base, offset)?
+            StorageValue::<felt252>::read_at_offset(address_domain, base, offset)?
                 .try_into()
-                .expect('StorageAccessU16 - non u16')
+                .expect('StorageValueU16 - non u16')
         )
     }
     #[inline(always)]
     fn write_at_offset(
         address_domain: u32, base: StorageBaseAddress, offset: u8, value: u16
     ) -> SyscallResult<()> {
-        StorageAccess::<felt252>::write_at_offset(address_domain, base, offset, value.into())
+        StorageValue::<felt252>::write_at_offset(address_domain, base, offset, value.into())
     }
     #[inline(always)]
     fn size() -> u8 {
@@ -197,33 +197,33 @@ impl StorageAccessU16 of StorageAccess<u16> {
     }
 }
 
-impl StorageAccessU32 of StorageAccess<u32> {
+impl StorageValueU32 of StorageValue<u32> {
     fn read(address_domain: u32, base: StorageBaseAddress) -> SyscallResult<u32> {
         Result::Ok(
-            StorageAccess::<felt252>::read(address_domain, base)?
+            StorageValue::<felt252>::read(address_domain, base)?
                 .try_into()
-                .expect('StorageAccessU32 - non u32')
+                .expect('StorageValueU32 - non u32')
         )
     }
     #[inline(always)]
     fn write(address_domain: u32, base: StorageBaseAddress, value: u32) -> SyscallResult<()> {
-        StorageAccess::<felt252>::write(address_domain, base, value.into())
+        StorageValue::<felt252>::write(address_domain, base, value.into())
     }
     #[inline(always)]
     fn read_at_offset(
         address_domain: u32, base: StorageBaseAddress, offset: u8
     ) -> SyscallResult<u32> {
         Result::Ok(
-            StorageAccess::<felt252>::read_at_offset(address_domain, base, offset)?
+            StorageValue::<felt252>::read_at_offset(address_domain, base, offset)?
                 .try_into()
-                .expect('StorageAccessU32 - non u32')
+                .expect('StorageValueU32 - non u32')
         )
     }
     #[inline(always)]
     fn write_at_offset(
         address_domain: u32, base: StorageBaseAddress, offset: u8, value: u32
     ) -> SyscallResult<()> {
-        StorageAccess::<felt252>::write_at_offset(address_domain, base, offset, value.into())
+        StorageValue::<felt252>::write_at_offset(address_domain, base, offset, value.into())
     }
     #[inline(always)]
     fn size() -> u8 {
@@ -231,33 +231,33 @@ impl StorageAccessU32 of StorageAccess<u32> {
     }
 }
 
-impl StorageAccessU64 of StorageAccess<u64> {
+impl StorageValueU64 of StorageValue<u64> {
     fn read(address_domain: u32, base: StorageBaseAddress) -> SyscallResult<u64> {
         Result::Ok(
-            StorageAccess::<felt252>::read(address_domain, base)?
+            StorageValue::<felt252>::read(address_domain, base)?
                 .try_into()
-                .expect('StorageAccessU64 - non u64')
+                .expect('StorageValueU64 - non u64')
         )
     }
     #[inline(always)]
     fn write(address_domain: u32, base: StorageBaseAddress, value: u64) -> SyscallResult<()> {
-        StorageAccess::<felt252>::write(address_domain, base, value.into())
+        StorageValue::<felt252>::write(address_domain, base, value.into())
     }
     #[inline(always)]
     fn read_at_offset(
         address_domain: u32, base: StorageBaseAddress, offset: u8
     ) -> SyscallResult<u64> {
         Result::Ok(
-            StorageAccess::<felt252>::read_at_offset(address_domain, base, offset)?
+            StorageValue::<felt252>::read_at_offset(address_domain, base, offset)?
                 .try_into()
-                .expect('StorageAccessU64 - non u64')
+                .expect('StorageValueU64 - non u64')
         )
     }
     #[inline(always)]
     fn write_at_offset(
         address_domain: u32, base: StorageBaseAddress, offset: u8, value: u64
     ) -> SyscallResult<()> {
-        StorageAccess::<felt252>::write_at_offset(address_domain, base, offset, value.into())
+        StorageValue::<felt252>::write_at_offset(address_domain, base, offset, value.into())
     }
     #[inline(always)]
     fn size() -> u8 {
@@ -265,33 +265,33 @@ impl StorageAccessU64 of StorageAccess<u64> {
     }
 }
 
-impl StorageAccessU128 of StorageAccess<u128> {
+impl StorageValueU128 of StorageValue<u128> {
     fn read(address_domain: u32, base: StorageBaseAddress) -> SyscallResult<u128> {
         Result::Ok(
-            StorageAccess::<felt252>::read(address_domain, base)?
+            StorageValue::<felt252>::read(address_domain, base)?
                 .try_into()
-                .expect('StorageAccessU128 - non u128')
+                .expect('StorageValueU128 - non u128')
         )
     }
     #[inline(always)]
     fn write(address_domain: u32, base: StorageBaseAddress, value: u128) -> SyscallResult<()> {
-        StorageAccess::<felt252>::write(address_domain, base, value.into())
+        StorageValue::<felt252>::write(address_domain, base, value.into())
     }
     #[inline(always)]
     fn read_at_offset(
         address_domain: u32, base: StorageBaseAddress, offset: u8
     ) -> SyscallResult<u128> {
         Result::Ok(
-            StorageAccess::<felt252>::read_at_offset(address_domain, base, offset)?
+            StorageValue::<felt252>::read_at_offset(address_domain, base, offset)?
                 .try_into()
-                .expect('StorageAccessU128 - non u128')
+                .expect('StorageValueU128 - non u128')
         )
     }
     #[inline(always)]
     fn write_at_offset(
         address_domain: u32, base: StorageBaseAddress, offset: u8, value: u128
     ) -> SyscallResult<()> {
-        StorageAccess::<felt252>::write_at_offset(address_domain, base, offset, value.into())
+        StorageValue::<felt252>::write_at_offset(address_domain, base, offset, value.into())
     }
     #[inline(always)]
     fn size() -> u8 {
@@ -299,10 +299,10 @@ impl StorageAccessU128 of StorageAccess<u128> {
     }
 }
 
-impl StorageAccessStorageAddress of StorageAccess<StorageAddress> {
+impl StorageValueStorageAddress of StorageValue<StorageAddress> {
     fn read(address_domain: u32, base: StorageBaseAddress) -> SyscallResult<StorageAddress> {
         Result::Ok(
-            StorageAccess::<felt252>::read(address_domain, base)?
+            StorageValue::<felt252>::read(address_domain, base)?
                 .try_into()
                 .expect('Non StorageAddress')
         )
@@ -311,14 +311,14 @@ impl StorageAccessStorageAddress of StorageAccess<StorageAddress> {
     fn write(
         address_domain: u32, base: StorageBaseAddress, value: StorageAddress
     ) -> SyscallResult<()> {
-        StorageAccess::<felt252>::write(address_domain, base, value.into())
+        StorageValue::<felt252>::write(address_domain, base, value.into())
     }
     #[inline(always)]
     fn read_at_offset(
         address_domain: u32, base: StorageBaseAddress, offset: u8
     ) -> SyscallResult<StorageAddress> {
         Result::Ok(
-            StorageAccess::<felt252>::read_at_offset(address_domain, base, offset)?
+            StorageValue::<felt252>::read_at_offset(address_domain, base, offset)?
                 .try_into()
                 .expect('Non StorageAddress')
         )
@@ -327,7 +327,7 @@ impl StorageAccessStorageAddress of StorageAccess<StorageAddress> {
     fn write_at_offset(
         address_domain: u32, base: StorageBaseAddress, offset: u8, value: StorageAddress
     ) -> SyscallResult<()> {
-        StorageAccess::<felt252>::write_at_offset(address_domain, base, offset, value.into())
+        StorageValue::<felt252>::write_at_offset(address_domain, base, offset, value.into())
     }
     #[inline(always)]
     fn size() -> u8 {
@@ -335,10 +335,10 @@ impl StorageAccessStorageAddress of StorageAccess<StorageAddress> {
     }
 }
 
-impl StorageAccessContractAddress of StorageAccess<ContractAddress> {
+impl StorageValueContractAddress of StorageValue<ContractAddress> {
     fn read(address_domain: u32, base: StorageBaseAddress) -> SyscallResult<ContractAddress> {
         Result::Ok(
-            StorageAccess::<felt252>::read(address_domain, base)?
+            StorageValue::<felt252>::read(address_domain, base)?
                 .try_into()
                 .expect('Non ContractAddress')
         )
@@ -347,14 +347,14 @@ impl StorageAccessContractAddress of StorageAccess<ContractAddress> {
     fn write(
         address_domain: u32, base: StorageBaseAddress, value: ContractAddress
     ) -> SyscallResult<()> {
-        StorageAccess::<felt252>::write(address_domain, base, value.into())
+        StorageValue::<felt252>::write(address_domain, base, value.into())
     }
     #[inline(always)]
     fn read_at_offset(
         address_domain: u32, base: StorageBaseAddress, offset: u8
     ) -> SyscallResult<ContractAddress> {
         Result::Ok(
-            StorageAccess::<felt252>::read_at_offset(address_domain, base, offset)?
+            StorageValue::<felt252>::read_at_offset(address_domain, base, offset)?
                 .try_into()
                 .expect('Non ContractAddress')
         )
@@ -363,7 +363,7 @@ impl StorageAccessContractAddress of StorageAccess<ContractAddress> {
     fn write_at_offset(
         address_domain: u32, base: StorageBaseAddress, offset: u8, value: ContractAddress
     ) -> SyscallResult<()> {
-        StorageAccess::<felt252>::write_at_offset(address_domain, base, offset, value.into())
+        StorageValue::<felt252>::write_at_offset(address_domain, base, offset, value.into())
     }
     #[inline(always)]
     fn size() -> u8 {
@@ -371,22 +371,22 @@ impl StorageAccessContractAddress of StorageAccess<ContractAddress> {
     }
 }
 
-impl StorageAccessClassHash of StorageAccess<ClassHash> {
+impl StorageValueClassHash of StorageValue<ClassHash> {
     fn read(address_domain: u32, base: StorageBaseAddress) -> SyscallResult<ClassHash> {
         Result::Ok(
-            StorageAccess::<felt252>::read(address_domain, base)?.try_into().expect('Non ClassHash')
+            StorageValue::<felt252>::read(address_domain, base)?.try_into().expect('Non ClassHash')
         )
     }
     #[inline(always)]
     fn write(address_domain: u32, base: StorageBaseAddress, value: ClassHash) -> SyscallResult<()> {
-        StorageAccess::<felt252>::write(address_domain, base, value.into())
+        StorageValue::<felt252>::write(address_domain, base, value.into())
     }
     #[inline(always)]
     fn read_at_offset(
         address_domain: u32, base: StorageBaseAddress, offset: u8
     ) -> SyscallResult<ClassHash> {
         Result::Ok(
-            StorageAccess::<felt252>::read_at_offset(address_domain, base, offset)?
+            StorageValue::<felt252>::read_at_offset(address_domain, base, offset)?
                 .try_into()
                 .expect('Non ClassHash')
         )
@@ -395,7 +395,7 @@ impl StorageAccessClassHash of StorageAccess<ClassHash> {
     fn write_at_offset(
         address_domain: u32, base: StorageBaseAddress, offset: u8, value: ClassHash
     ) -> SyscallResult<()> {
-        StorageAccess::<felt252>::write_at_offset(address_domain, base, offset, value.into())
+        StorageValue::<felt252>::write_at_offset(address_domain, base, offset, value.into())
     }
     #[inline(always)]
     fn size() -> u8 {
diff --git a/crates/cairo-lang-starknet/cairo_level_tests/storage_access.cairo b/crates/cairo-lang-starknet/cairo_level_tests/storage_access.cairo
index 639d2a3b039..0b2fa74ce15 100644
--- a/crates/cairo-lang-starknet/cairo_level_tests/storage_access.cairo
+++ b/crates/cairo-lang-starknet/cairo_level_tests/storage_access.cairo
@@ -19,14 +19,14 @@ impl StorageAddressPartialEq of PartialEq<StorageAddress> {
     }
 }
 
-#[derive(Drop, Serde, PartialEq, Copy, starknet::StorageAccess)]
+#[derive(Drop, Serde, PartialEq, Copy, starknet::StorageValue)]
 struct Abc {
     a: u8,
     b: u16,
     c: u32,
 }
 
-#[derive(Drop, Serde, PartialEq, Copy, starknet::StorageAccess)]
+#[derive(Drop, Serde, PartialEq, Copy, starknet::StorageValue)]
 struct AbcEtc {
     a: u8,
     b: u16,
diff --git a/crates/cairo-lang-starknet/src/plugin/dispatcher.rs b/crates/cairo-lang-starknet/src/plugin/dispatcher.rs
index e8d82a4dffe..f3963831eb1 100644
--- a/crates/cairo-lang-starknet/src/plugin/dispatcher.rs
+++ b/crates/cairo-lang-starknet/src/plugin/dispatcher.rs
@@ -205,7 +205,7 @@ pub fn handle_trait(db: &dyn SyntaxGroup, trait_ast: ast::ItemTrait) -> PluginRe
             $dispatcher_signatures$
             }}
 
-            #[derive(Copy, Drop, starknet::StorageAccess, Serde)]
+            #[derive(Copy, Drop, starknet::StorageValue, Serde)]
             struct {contract_caller_name} {{
                 contract_address: starknet::ContractAddress,
             }}
@@ -214,7 +214,7 @@ pub fn handle_trait(db: &dyn SyntaxGroup, trait_ast: ast::ItemTrait) -> PluginRe
             $contract_caller_method_impls$
             }}
 
-            #[derive(Copy, Drop, starknet::StorageAccess, Serde)]
+            #[derive(Copy, Drop, starknet::StorageValue, Serde)]
             struct {library_caller_name} {{
                 class_hash: starknet::ClassHash,
             }}
@@ -227,7 +227,7 @@ pub fn handle_trait(db: &dyn SyntaxGroup, trait_ast: ast::ItemTrait) -> PluginRe
             $safe_dispatcher_signatures$
             }}
 
-            #[derive(Copy, Drop, starknet::StorageAccess, Serde)]
+            #[derive(Copy, Drop, starknet::StorageValue, Serde)]
             struct {safe_library_caller_name} {{
                 class_hash: starknet::ClassHash,
             }}
@@ -238,7 +238,7 @@ pub fn handle_trait(db: &dyn SyntaxGroup, trait_ast: ast::ItemTrait) -> PluginRe
             }}
 
 
-            #[derive(Copy, Drop, starknet::StorageAccess, Serde)]
+            #[derive(Copy, Drop, starknet::StorageValue, Serde)]
             struct {safe_contract_caller_name} {{
                 contract_address: starknet::ContractAddress,
             }}
diff --git a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/diagnostics b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/diagnostics
index 4af02f659f9..00134692315 100644
--- a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/diagnostics
+++ b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/diagnostics
@@ -1983,7 +1983,7 @@ use starknet::event::EventEmitter;
             fn read(self: @ContractState) -> felt252 {
                 // Only address_domain 0 is currently supported.
                 let address_domain = 0_u32;
-                starknet::StorageAccess::<felt252>::read(
+                starknet::StorageValue::<felt252>::read(
                     address_domain,
                     self.address(),
                 ).unwrap_syscall()
@@ -1991,7 +1991,7 @@ use starknet::event::EventEmitter;
             fn write(ref self: ContractState, value: felt252) {
                 // Only address_domain 0 is currently supported.
                 let address_domain = 0_u32;
-                starknet::StorageAccess::<felt252>::write(
+                starknet::StorageValue::<felt252>::write(
                     address_domain,
                     self.address(),
                     value,
diff --git a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/dispatcher b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/dispatcher
index d69a7556a86..cf56b958f9f 100644
--- a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/dispatcher
+++ b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/dispatcher
@@ -36,7 +36,7 @@ trait IContractDispatcherTrait<T> {
     fn empty(self: T, );
 }
 
-#[derive(Copy, Drop, starknet::StorageAccess, Serde)]
+#[derive(Copy, Drop, starknet::StorageValue, Serde)]
 struct IContractDispatcher {
     contract_address: starknet::ContractAddress,
 }
@@ -73,7 +73,7 @@ impl IContractDispatcherImpl of IContractDispatcherTrait<IContractDispatcher> {
 
 }
 
-#[derive(Copy, Drop, starknet::StorageAccess, Serde)]
+#[derive(Copy, Drop, starknet::StorageValue, Serde)]
 struct IContractLibraryDispatcher {
     class_hash: starknet::ClassHash,
 }
@@ -115,7 +115,7 @@ trait IContractSafeDispatcherTrait<T> {
     fn empty(self: T, ) -> starknet::SyscallResult<()>;
 }
 
-#[derive(Copy, Drop, starknet::StorageAccess, Serde)]
+#[derive(Copy, Drop, starknet::StorageValue, Serde)]
 struct IContractSafeLibraryDispatcher {
     class_hash: starknet::ClassHash,
 }
@@ -155,7 +155,7 @@ impl IContractSafeLibraryDispatcherImpl of IContractSafeDispatcherTrait<IContrac
 }
 
 
-#[derive(Copy, Drop, starknet::StorageAccess, Serde)]
+#[derive(Copy, Drop, starknet::StorageValue, Serde)]
 struct IContractSafeDispatcher {
     contract_address: starknet::ContractAddress,
 }
@@ -213,9 +213,9 @@ impl IContractDispatcherSerde<> of serde::Serde::<IContractDispatcher<>> {
 
 storage_access_impl:
 
-impl StorageAccessIContractDispatcher of starknet::StorageAccess::<IContractDispatcher> {
+impl StorageValueIContractDispatcher of starknet::StorageValue::<IContractDispatcher> {
     fn read(address_domain: u32, base: starknet::StorageBaseAddress) -> starknet::SyscallResult<IContractDispatcher> {
-        let contract_address = starknet::StorageAccess::<starknet::ContractAddress>::read(address_domain, base)?;
+        let contract_address = starknet::StorageValue::<starknet::ContractAddress>::read(address_domain, base)?;
         starknet::SyscallResult::Ok(
             IContractDispatcher {
                 contract_address,
@@ -223,11 +223,11 @@ impl StorageAccessIContractDispatcher of starknet::StorageAccess::<IContractDisp
         )
     }
     fn write(address_domain: u32, base: starknet::StorageBaseAddress, value: IContractDispatcher) -> starknet::SyscallResult<()> {
-        starknet::StorageAccess::<starknet::ContractAddress>::write(address_domain, base, value.contract_address)?;
+        starknet::StorageValue::<starknet::ContractAddress>::write(address_domain, base, value.contract_address)?;
         starknet::SyscallResult::Ok(())
     }
     fn read_at_offset(address_domain: u32, base: starknet::StorageBaseAddress, offset: u8) -> starknet::SyscallResult<IContractDispatcher> {
-        let contract_address = starknet::StorageAccess::<starknet::ContractAddress>::read_at_offset(address_domain, base, offset)?;
+        let contract_address = starknet::StorageValue::<starknet::ContractAddress>::read_at_offset(address_domain, base, offset)?;
         starknet::SyscallResult::Ok(
             IContractDispatcher {
                 contract_address,
@@ -236,12 +236,12 @@ impl StorageAccessIContractDispatcher of starknet::StorageAccess::<IContractDisp
     }
     #[inline(always)]
     fn write_at_offset(address_domain: u32, base: starknet::StorageBaseAddress, offset: u8, value: IContractDispatcher) -> starknet::SyscallResult<()> {
-        starknet::StorageAccess::<starknet::ContractAddress>::write_at_offset(address_domain, base, offset, value.contract_address)?;
+        starknet::StorageValue::<starknet::ContractAddress>::write_at_offset(address_domain, base, offset, value.contract_address)?;
         starknet::SyscallResult::Ok(())
     }
     #[inline(always)]
     fn size() -> u8 {
-        starknet::StorageAccess::<starknet::ContractAddress>::size()
+        starknet::StorageValue::<starknet::ContractAddress>::size()
     }
 }
 
@@ -263,9 +263,9 @@ impl IContractLibraryDispatcherSerde<> of serde::Serde::<IContractLibraryDispatc
 
 storage_access_impl:
 
-impl StorageAccessIContractLibraryDispatcher of starknet::StorageAccess::<IContractLibraryDispatcher> {
+impl StorageValueIContractLibraryDispatcher of starknet::StorageValue::<IContractLibraryDispatcher> {
     fn read(address_domain: u32, base: starknet::StorageBaseAddress) -> starknet::SyscallResult<IContractLibraryDispatcher> {
-        let class_hash = starknet::StorageAccess::<starknet::ClassHash>::read(address_domain, base)?;
+        let class_hash = starknet::StorageValue::<starknet::ClassHash>::read(address_domain, base)?;
         starknet::SyscallResult::Ok(
             IContractLibraryDispatcher {
                 class_hash,
@@ -273,11 +273,11 @@ impl StorageAccessIContractLibraryDispatcher of starknet::StorageAccess::<IContr
         )
     }
     fn write(address_domain: u32, base: starknet::StorageBaseAddress, value: IContractLibraryDispatcher) -> starknet::SyscallResult<()> {
-        starknet::StorageAccess::<starknet::ClassHash>::write(address_domain, base, value.class_hash)?;
+        starknet::StorageValue::<starknet::ClassHash>::write(address_domain, base, value.class_hash)?;
         starknet::SyscallResult::Ok(())
     }
     fn read_at_offset(address_domain: u32, base: starknet::StorageBaseAddress, offset: u8) -> starknet::SyscallResult<IContractLibraryDispatcher> {
-        let class_hash = starknet::StorageAccess::<starknet::ClassHash>::read_at_offset(address_domain, base, offset)?;
+        let class_hash = starknet::StorageValue::<starknet::ClassHash>::read_at_offset(address_domain, base, offset)?;
         starknet::SyscallResult::Ok(
             IContractLibraryDispatcher {
                 class_hash,
@@ -286,12 +286,12 @@ impl StorageAccessIContractLibraryDispatcher of starknet::StorageAccess::<IContr
     }
     #[inline(always)]
     fn write_at_offset(address_domain: u32, base: starknet::StorageBaseAddress, offset: u8, value: IContractLibraryDispatcher) -> starknet::SyscallResult<()> {
-        starknet::StorageAccess::<starknet::ClassHash>::write_at_offset(address_domain, base, offset, value.class_hash)?;
+        starknet::StorageValue::<starknet::ClassHash>::write_at_offset(address_domain, base, offset, value.class_hash)?;
         starknet::SyscallResult::Ok(())
     }
     #[inline(always)]
     fn size() -> u8 {
-        starknet::StorageAccess::<starknet::ClassHash>::size()
+        starknet::StorageValue::<starknet::ClassHash>::size()
     }
 }
 
@@ -313,9 +313,9 @@ impl IContractSafeLibraryDispatcherSerde<> of serde::Serde::<IContractSafeLibrar
 
 storage_access_impl:
 
-impl StorageAccessIContractSafeLibraryDispatcher of starknet::StorageAccess::<IContractSafeLibraryDispatcher> {
+impl StorageValueIContractSafeLibraryDispatcher of starknet::StorageValue::<IContractSafeLibraryDispatcher> {
     fn read(address_domain: u32, base: starknet::StorageBaseAddress) -> starknet::SyscallResult<IContractSafeLibraryDispatcher> {
-        let class_hash = starknet::StorageAccess::<starknet::ClassHash>::read(address_domain, base)?;
+        let class_hash = starknet::StorageValue::<starknet::ClassHash>::read(address_domain, base)?;
         starknet::SyscallResult::Ok(
             IContractSafeLibraryDispatcher {
                 class_hash,
@@ -323,11 +323,11 @@ impl StorageAccessIContractSafeLibraryDispatcher of starknet::StorageAccess::<IC
         )
     }
     fn write(address_domain: u32, base: starknet::StorageBaseAddress, value: IContractSafeLibraryDispatcher) -> starknet::SyscallResult<()> {
-        starknet::StorageAccess::<starknet::ClassHash>::write(address_domain, base, value.class_hash)?;
+        starknet::StorageValue::<starknet::ClassHash>::write(address_domain, base, value.class_hash)?;
         starknet::SyscallResult::Ok(())
     }
     fn read_at_offset(address_domain: u32, base: starknet::StorageBaseAddress, offset: u8) -> starknet::SyscallResult<IContractSafeLibraryDispatcher> {
-        let class_hash = starknet::StorageAccess::<starknet::ClassHash>::read_at_offset(address_domain, base, offset)?;
+        let class_hash = starknet::StorageValue::<starknet::ClassHash>::read_at_offset(address_domain, base, offset)?;
         starknet::SyscallResult::Ok(
             IContractSafeLibraryDispatcher {
                 class_hash,
@@ -336,12 +336,12 @@ impl StorageAccessIContractSafeLibraryDispatcher of starknet::StorageAccess::<IC
     }
     #[inline(always)]
     fn write_at_offset(address_domain: u32, base: starknet::StorageBaseAddress, offset: u8, value: IContractSafeLibraryDispatcher) -> starknet::SyscallResult<()> {
-        starknet::StorageAccess::<starknet::ClassHash>::write_at_offset(address_domain, base, offset, value.class_hash)?;
+        starknet::StorageValue::<starknet::ClassHash>::write_at_offset(address_domain, base, offset, value.class_hash)?;
         starknet::SyscallResult::Ok(())
     }
     #[inline(always)]
     fn size() -> u8 {
-        starknet::StorageAccess::<starknet::ClassHash>::size()
+        starknet::StorageValue::<starknet::ClassHash>::size()
     }
 }
 
@@ -363,9 +363,9 @@ impl IContractSafeDispatcherSerde<> of serde::Serde::<IContractSafeDispatcher<>>
 
 storage_access_impl:
 
-impl StorageAccessIContractSafeDispatcher of starknet::StorageAccess::<IContractSafeDispatcher> {
+impl StorageValueIContractSafeDispatcher of starknet::StorageValue::<IContractSafeDispatcher> {
     fn read(address_domain: u32, base: starknet::StorageBaseAddress) -> starknet::SyscallResult<IContractSafeDispatcher> {
-        let contract_address = starknet::StorageAccess::<starknet::ContractAddress>::read(address_domain, base)?;
+        let contract_address = starknet::StorageValue::<starknet::ContractAddress>::read(address_domain, base)?;
         starknet::SyscallResult::Ok(
             IContractSafeDispatcher {
                 contract_address,
@@ -373,11 +373,11 @@ impl StorageAccessIContractSafeDispatcher of starknet::StorageAccess::<IContract
         )
     }
     fn write(address_domain: u32, base: starknet::StorageBaseAddress, value: IContractSafeDispatcher) -> starknet::SyscallResult<()> {
-        starknet::StorageAccess::<starknet::ContractAddress>::write(address_domain, base, value.contract_address)?;
+        starknet::StorageValue::<starknet::ContractAddress>::write(address_domain, base, value.contract_address)?;
         starknet::SyscallResult::Ok(())
     }
     fn read_at_offset(address_domain: u32, base: starknet::StorageBaseAddress, offset: u8) -> starknet::SyscallResult<IContractSafeDispatcher> {
-        let contract_address = starknet::StorageAccess::<starknet::ContractAddress>::read_at_offset(address_domain, base, offset)?;
+        let contract_address = starknet::StorageValue::<starknet::ContractAddress>::read_at_offset(address_domain, base, offset)?;
         starknet::SyscallResult::Ok(
             IContractSafeDispatcher {
                 contract_address,
@@ -386,12 +386,12 @@ impl StorageAccessIContractSafeDispatcher of starknet::StorageAccess::<IContract
     }
     #[inline(always)]
     fn write_at_offset(address_domain: u32, base: starknet::StorageBaseAddress, offset: u8, value: IContractSafeDispatcher) -> starknet::SyscallResult<()> {
-        starknet::StorageAccess::<starknet::ContractAddress>::write_at_offset(address_domain, base, offset, value.contract_address)?;
+        starknet::StorageValue::<starknet::ContractAddress>::write_at_offset(address_domain, base, offset, value.contract_address)?;
         starknet::SyscallResult::Ok(())
     }
     #[inline(always)]
     fn size() -> u8 {
-        starknet::StorageAccess::<starknet::ContractAddress>::size()
+        starknet::StorageValue::<starknet::ContractAddress>::size()
     }
 }
 
diff --git a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/hello_starknet b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/hello_starknet
index eb8dd05ecaa..d4ac944fc3b 100644
--- a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/hello_starknet
+++ b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/hello_starknet
@@ -109,7 +109,7 @@ use starknet::event::EventEmitter;
             fn read(self: @ContractState) -> felt252 {
                 // Only address_domain 0 is currently supported.
                 let address_domain = 0_u32;
-                starknet::StorageAccess::<felt252>::read(
+                starknet::StorageValue::<felt252>::read(
                     address_domain,
                     self.address(),
                 ).unwrap_syscall()
@@ -117,7 +117,7 @@ use starknet::event::EventEmitter;
             fn write(ref self: ContractState, value: felt252) {
                 // Only address_domain 0 is currently supported.
                 let address_domain = 0_u32;
-                starknet::StorageAccess::<felt252>::write(
+                starknet::StorageValue::<felt252>::write(
                     address_domain,
                     self.address(),
                     value,
diff --git a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/storage b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/storage
index fd3c3663ea5..eb629e0a5ca 100644
--- a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/storage
+++ b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/storage
@@ -127,7 +127,7 @@ use starknet::event::EventEmitter;
             fn read(self: @ContractState) -> felt252 {
                 // Only address_domain 0 is currently supported.
                 let address_domain = 0_u32;
-                starknet::StorageAccess::<felt252>::read(
+                starknet::StorageValue::<felt252>::read(
                     address_domain,
                     self.address(),
                 ).unwrap_syscall()
@@ -135,7 +135,7 @@ use starknet::event::EventEmitter;
             fn write(ref self: ContractState, value: felt252) {
                 // Only address_domain 0 is currently supported.
                 let address_domain = 0_u32;
-                starknet::StorageAccess::<felt252>::write(
+                starknet::StorageValue::<felt252>::write(
                     address_domain,
                     self.address(),
                     value,
@@ -169,7 +169,7 @@ use starknet::event::EventEmitter;
             fn read(self: @ContractState) -> u8 {
                 // Only address_domain 0 is currently supported.
                 let address_domain = 0_u32;
-                starknet::StorageAccess::<u8>::read(
+                starknet::StorageValue::<u8>::read(
                     address_domain,
                     self.address(),
                 ).unwrap_syscall()
@@ -177,7 +177,7 @@ use starknet::event::EventEmitter;
             fn write(ref self: ContractState, value: u8) {
                 // Only address_domain 0 is currently supported.
                 let address_domain = 0_u32;
-                starknet::StorageAccess::<u8>::write(
+                starknet::StorageValue::<u8>::write(
                     address_domain,
                     self.address(),
                     value,
@@ -211,7 +211,7 @@ use starknet::event::EventEmitter;
             fn read(self: @ContractState) -> u16 {
                 // Only address_domain 0 is currently supported.
                 let address_domain = 0_u32;
-                starknet::StorageAccess::<u16>::read(
+                starknet::StorageValue::<u16>::read(
                     address_domain,
                     self.address(),
                 ).unwrap_syscall()
@@ -219,7 +219,7 @@ use starknet::event::EventEmitter;
             fn write(ref self: ContractState, value: u16) {
                 // Only address_domain 0 is currently supported.
                 let address_domain = 0_u32;
-                starknet::StorageAccess::<u16>::write(
+                starknet::StorageValue::<u16>::write(
                     address_domain,
                     self.address(),
                     value,
@@ -253,7 +253,7 @@ use starknet::event::EventEmitter;
             fn read(self: @ContractState) -> u32 {
                 // Only address_domain 0 is currently supported.
                 let address_domain = 0_u32;
-                starknet::StorageAccess::<u32>::read(
+                starknet::StorageValue::<u32>::read(
                     address_domain,
                     self.address(),
                 ).unwrap_syscall()
@@ -261,7 +261,7 @@ use starknet::event::EventEmitter;
             fn write(ref self: ContractState, value: u32) {
                 // Only address_domain 0 is currently supported.
                 let address_domain = 0_u32;
-                starknet::StorageAccess::<u32>::write(
+                starknet::StorageValue::<u32>::write(
                     address_domain,
                     self.address(),
                     value,
@@ -295,7 +295,7 @@ use starknet::event::EventEmitter;
             fn read(self: @ContractState) -> u64 {
                 // Only address_domain 0 is currently supported.
                 let address_domain = 0_u32;
-                starknet::StorageAccess::<u64>::read(
+                starknet::StorageValue::<u64>::read(
                     address_domain,
                     self.address(),
                 ).unwrap_syscall()
@@ -303,7 +303,7 @@ use starknet::event::EventEmitter;
             fn write(ref self: ContractState, value: u64) {
                 // Only address_domain 0 is currently supported.
                 let address_domain = 0_u32;
-                starknet::StorageAccess::<u64>::write(
+                starknet::StorageValue::<u64>::write(
                     address_domain,
                     self.address(),
                     value,
@@ -337,7 +337,7 @@ use starknet::event::EventEmitter;
             fn read(self: @ContractState) -> u128 {
                 // Only address_domain 0 is currently supported.
                 let address_domain = 0_u32;
-                starknet::StorageAccess::<u128>::read(
+                starknet::StorageValue::<u128>::read(
                     address_domain,
                     self.address(),
                 ).unwrap_syscall()
@@ -345,7 +345,7 @@ use starknet::event::EventEmitter;
             fn write(ref self: ContractState, value: u128) {
                 // Only address_domain 0 is currently supported.
                 let address_domain = 0_u32;
-                starknet::StorageAccess::<u128>::write(
+                starknet::StorageValue::<u128>::write(
                     address_domain,
                     self.address(),
                     value,
@@ -379,7 +379,7 @@ use starknet::event::EventEmitter;
             fn read(self: @ContractState) -> bool {
                 // Only address_domain 0 is currently supported.
                 let address_domain = 0_u32;
-                starknet::StorageAccess::<bool>::read(
+                starknet::StorageValue::<bool>::read(
                     address_domain,
                     self.address(),
                 ).unwrap_syscall()
@@ -387,7 +387,7 @@ use starknet::event::EventEmitter;
             fn write(ref self: ContractState, value: bool) {
                 // Only address_domain 0 is currently supported.
                 let address_domain = 0_u32;
-                starknet::StorageAccess::<bool>::write(
+                starknet::StorageValue::<bool>::write(
                     address_domain,
                     self.address(),
                     value,
@@ -422,7 +422,7 @@ use starknet::event::EventEmitter;
             fn read(self: @ContractState, key: felt252) -> u128 {
                 // Only address_domain 0 is currently supported.
                 let address_domain = 0_u32;
-                starknet::StorageAccess::<u128>::read(
+                starknet::StorageValue::<u128>::read(
                     address_domain,
                     self.address(key),
                 ).unwrap_syscall()
@@ -430,7 +430,7 @@ use starknet::event::EventEmitter;
             fn write(ref self: ContractState, key: felt252, value: u128) {
                 // Only address_domain 0 is currently supported.
                 let address_domain = 0_u32;
-                starknet::StorageAccess::<u128>::write(
+                starknet::StorageValue::<u128>::write(
                     address_domain,
                     self.address(key),
                     value,
@@ -465,7 +465,7 @@ use starknet::event::EventEmitter;
             fn read(self: @ContractState, key: u128) -> bool {
                 // Only address_domain 0 is currently supported.
                 let address_domain = 0_u32;
-                starknet::StorageAccess::<bool>::read(
+                starknet::StorageValue::<bool>::read(
                     address_domain,
                     self.address(key),
                 ).unwrap_syscall()
@@ -473,7 +473,7 @@ use starknet::event::EventEmitter;
             fn write(ref self: ContractState, key: u128, value: bool) {
                 // Only address_domain 0 is currently supported.
                 let address_domain = 0_u32;
-                starknet::StorageAccess::<bool>::write(
+                starknet::StorageValue::<bool>::write(
                     address_domain,
                     self.address(key),
                     value,
@@ -508,7 +508,7 @@ use starknet::event::EventEmitter;
             fn read(self: @ContractState, key: bool) -> felt252 {
                 // Only address_domain 0 is currently supported.
                 let address_domain = 0_u32;
-                starknet::StorageAccess::<felt252>::read(
+                starknet::StorageValue::<felt252>::read(
                     address_domain,
                     self.address(key),
                 ).unwrap_syscall()
@@ -516,7 +516,7 @@ use starknet::event::EventEmitter;
             fn write(ref self: ContractState, key: bool, value: felt252) {
                 // Only address_domain 0 is currently supported.
                 let address_domain = 0_u32;
-                starknet::StorageAccess::<felt252>::write(
+                starknet::StorageValue::<felt252>::write(
                     address_domain,
                     self.address(key),
                     value,
diff --git a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/user_defined_types b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/user_defined_types
index f5c1af7db23..c9d12bc003d 100644
--- a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/user_defined_types
+++ b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/user_defined_types
@@ -26,21 +26,21 @@ mod test_contract {
             Option::<WrappedFelt252>::Some(WrappedFelt252 { value: *serialized.pop_front()? })
         }
     }
-    impl WrappedFelt252StorageAccess of starknet::StorageAccess::<WrappedFelt252> {
+    impl WrappedFelt252StorageValue of starknet::StorageValue::<WrappedFelt252> {
         fn read(address_domain: u32, base: starknet::StorageBaseAddress) -> starknet::SyscallResult::<WrappedFelt252> {
             starknet::SyscallResult::<WrappedFelt252>::Ok(WrappedFelt252 {
-                value: starknet::StorageAccess::read(address_domain, base)?
+                value: starknet::StorageValue::read(address_domain, base)?
             })
         }
         #[inline(always)]
         fn write(address_domain: u32, base: starknet::StorageBaseAddress, value: WrappedFelt252) -> starknet::SyscallResult::<()> {
-            starknet::StorageAccess::write(address_domain, base, value.value)
+            starknet::StorageValue::write(address_domain, base, value.value)
         }
         fn read_at_offset(address_domain: u32, base: starknet::StorageBaseAddress, offset: u8) -> starknet::SyscallResult<WrappedFelt252> {
-            WrappedFelt252StorageAccess::read_at_offset(address_domain, base, offset)
+            WrappedFelt252StorageValue::read_at_offset(address_domain, base, offset)
         }
         fn write_at_offset(address_domain: u32, base: starknet::StorageBaseAddress, offset: u8, value: WrappedFelt252) -> starknet::SyscallResult<()> {
-            WrappedFelt252StorageAccess::write_at_offset(address_domain, base, offset, value)
+            WrappedFelt252StorageValue::write_at_offset(address_domain, base, offset, value)
         }
         fn size() -> u8 {
             1_u8
@@ -79,21 +79,21 @@ mod test_contract {
             Option::<WrappedFelt252>::Some(WrappedFelt252 { value: *serialized.pop_front()? })
         }
     }
-    impl WrappedFelt252StorageAccess of starknet::StorageAccess::<WrappedFelt252> {
+    impl WrappedFelt252StorageValue of starknet::StorageValue::<WrappedFelt252> {
         fn read(address_domain: u32, base: starknet::StorageBaseAddress) -> starknet::SyscallResult::<WrappedFelt252> {
             starknet::SyscallResult::<WrappedFelt252>::Ok(WrappedFelt252 {
-                value: starknet::StorageAccess::read(address_domain, base)?
+                value: starknet::StorageValue::read(address_domain, base)?
             })
         }
         #[inline(always)]
         fn write(address_domain: u32, base: starknet::StorageBaseAddress, value: WrappedFelt252) -> starknet::SyscallResult::<()> {
-            starknet::StorageAccess::write(address_domain, base, value.value)
+            starknet::StorageValue::write(address_domain, base, value.value)
         }
         fn read_at_offset(address_domain: u32, base: starknet::StorageBaseAddress, offset: u8) -> starknet::SyscallResult<WrappedFelt252> {
-            WrappedFelt252StorageAccess::read_at_offset(address_domain, base, offset)
+            WrappedFelt252StorageValue::read_at_offset(address_domain, base, offset)
         }
         fn write_at_offset(address_domain: u32, base: starknet::StorageBaseAddress, offset: u8, value: WrappedFelt252) -> starknet::SyscallResult<()> {
-            WrappedFelt252StorageAccess::write_at_offset(address_domain, base, offset, value)
+            WrappedFelt252StorageValue::write_at_offset(address_domain, base, offset, value)
         }
         fn size() -> u8 {
             1_u8
@@ -113,7 +113,7 @@ use starknet::SyscallResultTrait;
 use starknet::SyscallResultTraitImpl;
 
 #[cfg(test)]
-const TEST_CLASS_HASH: felt252 = 394969725949366389516495711547626411624038480626028142496787748928710591764;
+const TEST_CLASS_HASH: felt252 = 223611098400995658723781781896611886370340839786470233194538330510196415446;
 use starknet::event::EventEmitter;
 #[derive(Drop)]
     struct ContractState {
@@ -155,7 +155,7 @@ use starknet::event::EventEmitter;
         use super::ArrayTrait;
         use super::SpanTrait;
         use super::WrappedFelt252Serde;
-        use super::WrappedFelt252StorageAccess;
+        use super::WrappedFelt252StorageValue;
         use super::WrappedFelt252LegacyHash;
         use starknet::class_hash::ClassHashSerde;
         use starknet::contract_address::ContractAddressSerde;
@@ -181,7 +181,7 @@ use starknet::event::EventEmitter;
             fn read(self: @ContractState) -> WrappedFelt252 {
                 // Only address_domain 0 is currently supported.
                 let address_domain = 0_u32;
-                starknet::StorageAccess::<WrappedFelt252>::read(
+                starknet::StorageValue::<WrappedFelt252>::read(
                     address_domain,
                     self.address(),
                 ).unwrap_syscall()
@@ -189,7 +189,7 @@ use starknet::event::EventEmitter;
             fn write(ref self: ContractState, value: WrappedFelt252) {
                 // Only address_domain 0 is currently supported.
                 let address_domain = 0_u32;
-                starknet::StorageAccess::<WrappedFelt252>::write(
+                starknet::StorageValue::<WrappedFelt252>::write(
                     address_domain,
                     self.address(),
                     value,
@@ -203,7 +203,7 @@ use starknet::event::EventEmitter;
         use super::ArrayTrait;
         use super::SpanTrait;
         use super::WrappedFelt252Serde;
-        use super::WrappedFelt252StorageAccess;
+        use super::WrappedFelt252StorageValue;
         use super::WrappedFelt252LegacyHash;
         use starknet::class_hash::ClassHashSerde;
         use starknet::contract_address::ContractAddressSerde;
@@ -230,7 +230,7 @@ use starknet::event::EventEmitter;
             fn read(self: @ContractState, key: WrappedFelt252) -> WrappedFelt252 {
                 // Only address_domain 0 is currently supported.
                 let address_domain = 0_u32;
-                starknet::StorageAccess::<WrappedFelt252>::read(
+                starknet::StorageValue::<WrappedFelt252>::read(
                     address_domain,
                     self.address(key),
                 ).unwrap_syscall()
@@ -238,7 +238,7 @@ use starknet::event::EventEmitter;
             fn write(ref self: ContractState, key: WrappedFelt252, value: WrappedFelt252) {
                 // Only address_domain 0 is currently supported.
                 let address_domain = 0_u32;
-                starknet::StorageAccess::<WrappedFelt252>::write(
+                starknet::StorageValue::<WrappedFelt252>::write(
                     address_domain,
                     self.address(key),
                     value,
@@ -260,7 +260,7 @@ mod __external {
         use super::ArrayTrait;
         use super::SpanTrait;
         use super::WrappedFelt252Serde;
-        use super::WrappedFelt252StorageAccess;
+        use super::WrappedFelt252StorageValue;
         use super::WrappedFelt252LegacyHash;
         use starknet::class_hash::ClassHashSerde;
         use starknet::contract_address::ContractAddressSerde;
@@ -276,7 +276,7 @@ mod __l1_handler {
         use super::ArrayTrait;
         use super::SpanTrait;
         use super::WrappedFelt252Serde;
-        use super::WrappedFelt252StorageAccess;
+        use super::WrappedFelt252StorageValue;
         use super::WrappedFelt252LegacyHash;
         use starknet::class_hash::ClassHashSerde;
         use starknet::contract_address::ContractAddressSerde;
@@ -292,7 +292,7 @@ mod __constructor {
         use super::ArrayTrait;
         use super::SpanTrait;
         use super::WrappedFelt252Serde;
-        use super::WrappedFelt252StorageAccess;
+        use super::WrappedFelt252StorageValue;
         use super::WrappedFelt252LegacyHash;
         use starknet::class_hash::ClassHashSerde;
         use starknet::contract_address::ContractAddressSerde;
diff --git a/crates/cairo-lang-starknet/src/plugin/storage.rs b/crates/cairo-lang-starknet/src/plugin/storage.rs
index 68e5c9e129f..7bc1ca50e63 100644
--- a/crates/cairo-lang-starknet/src/plugin/storage.rs
+++ b/crates/cairo-lang-starknet/src/plugin/storage.rs
@@ -193,7 +193,7 @@ fn handle_simple_storage_var(address: &str) -> String {
             fn read(self: @ContractState) -> $type_name$ {{
                 // Only address_domain 0 is currently supported.
                 let address_domain = 0_u32;
-                starknet::StorageAccess::<$type_name$>::read(
+                starknet::StorageValue::<$type_name$>::read(
                     address_domain,
                     self.address(),
                 ).unwrap_syscall()
@@ -201,7 +201,7 @@ fn handle_simple_storage_var(address: &str) -> String {
             fn write(ref self: ContractState, value: $type_name$) {{
                 // Only address_domain 0 is currently supported.
                 let address_domain = 0_u32;
-                starknet::StorageAccess::<$type_name$>::write(
+                starknet::StorageValue::<$type_name$>::write(
                     address_domain,
                     self.address(),
                     value,
@@ -238,7 +238,7 @@ fn handle_legacy_mapping_storage_var(address: &str) -> String {
             fn read(self: @ContractState, key: $key_type$) -> $value_type$ {{
                 // Only address_domain 0 is currently supported.
                 let address_domain = 0_u32;
-                starknet::StorageAccess::<$value_type$>::read(
+                starknet::StorageValue::<$value_type$>::read(
                     address_domain,
                     self.address(key),
                 ).unwrap_syscall()
@@ -246,7 +246,7 @@ fn handle_legacy_mapping_storage_var(address: &str) -> String {
             fn write(ref self: ContractState, key: $key_type$, value: $value_type$) {{
                 // Only address_domain 0 is currently supported.
                 let address_domain = 0_u32;
-                starknet::StorageAccess::<$value_type$>::write(
+                starknet::StorageValue::<$value_type$>::write(
                     address_domain,
                     self.address(key),
                     value,
diff --git a/crates/cairo-lang-starknet/src/plugin/storage_access.rs b/crates/cairo-lang-starknet/src/plugin/storage_access.rs
index b4318657ca7..4cf2f68837b 100644
--- a/crates/cairo-lang-starknet/src/plugin/storage_access.rs
+++ b/crates/cairo-lang-starknet/src/plugin/storage_access.rs
@@ -10,7 +10,7 @@ use cairo_lang_syntax::node::helpers::QueryAttrs;
 use cairo_lang_syntax::node::{ast, TypedSyntaxNode};
 use indoc::formatdoc;
 
-/// Derive the `StorageAccess` trait for structs annotated with `derive(starknet::StorageAccess)`.
+/// Derive the `StorageValue` trait for structs annotated with `derive(starknet::StorageValue)`.
 pub fn handle_struct(db: &dyn SyntaxGroup, struct_ast: ast::ItemStruct) -> PluginResult {
     let mut reads_values = Vec::new();
     let mut reads_values_at_offset = Vec::new();
@@ -25,18 +25,18 @@ pub fn handle_struct(db: &dyn SyntaxGroup, struct_ast: ast::ItemStruct) -> Plugi
 
         if i == 0 {
             reads_values.push(format!(
-                "let {field_name} = starknet::StorageAccess::<{field_type}>::read(address_domain, \
+                "let {field_name} = starknet::StorageValue::<{field_type}>::read(address_domain, \
                  base)?;"
             ));
             reads_values_at_offset.push(format!(
                 "let {field_name} = \
-                 starknet::StorageAccess::<{field_type}>::read_at_offset(address_domain, base, \
+                 starknet::StorageValue::<{field_type}>::read_at_offset(address_domain, base, \
                  offset)?;"
             ));
         } else {
             let subsequent_read = format!(
                 "let {field_name} = \
-                 starknet::StorageAccess::<{field_type}>::read_at_offset(address_domain, base, \
+                 starknet::StorageValue::<{field_type}>::read_at_offset(address_domain, base, \
                  current_offset)?;"
             );
             reads_values.push(subsequent_read.clone());
@@ -45,15 +45,15 @@ pub fn handle_struct(db: &dyn SyntaxGroup, struct_ast: ast::ItemStruct) -> Plugi
         if i < struct_ast.members(db).elements(db).len() - 1 {
             if i == 0 {
                 reads_values.push(format!(
-                    "let mut current_offset = starknet::StorageAccess::<{field_type}>::size();"
+                    "let mut current_offset = starknet::StorageValue::<{field_type}>::size();"
                 ));
                 reads_values_at_offset.push(format!(
                     "let mut current_offset = offset + \
-                     starknet::StorageAccess::<{field_type}>::size();"
+                     starknet::StorageValue::<{field_type}>::size();"
                 ));
             } else {
                 let subsequent_read =
-                    format!("current_offset += starknet::StorageAccess::<{field_type}>::size();");
+                    format!("current_offset += starknet::StorageValue::<{field_type}>::size();");
                 reads_values.push(subsequent_read.clone());
                 reads_values_at_offset.push(subsequent_read);
             }
@@ -63,16 +63,16 @@ pub fn handle_struct(db: &dyn SyntaxGroup, struct_ast: ast::ItemStruct) -> Plugi
 
         if i == 0 {
             writes.push(format!(
-                "starknet::StorageAccess::<{field_type}>::write(address_domain, base, \
+                "starknet::StorageValue::<{field_type}>::write(address_domain, base, \
                  value.{field_name})?;"
             ));
             writes_at_offset.push(format!(
-                "starknet::StorageAccess::<{field_type}>::write_at_offset(address_domain, base, \
+                "starknet::StorageValue::<{field_type}>::write_at_offset(address_domain, base, \
                  offset, value.{field_name})?;"
             ));
         } else {
             let subsequent_write = format!(
-                "starknet::StorageAccess::<{field_type}>::write_at_offset(address_domain, base, \
+                "starknet::StorageValue::<{field_type}>::write_at_offset(address_domain, base, \
                  current_offset, value.{field_name})?;"
             );
             writes.push(subsequent_write.clone());
@@ -82,25 +82,25 @@ pub fn handle_struct(db: &dyn SyntaxGroup, struct_ast: ast::ItemStruct) -> Plugi
         if i < struct_ast.members(db).elements(db).len() - 1 {
             if i == 0 {
                 writes.push(format!(
-                    "let mut current_offset = starknet::StorageAccess::<{field_type}>::size();"
+                    "let mut current_offset = starknet::StorageValue::<{field_type}>::size();"
                 ));
                 writes_at_offset.push(format!(
                     "let mut current_offset = offset + \
-                     starknet::StorageAccess::<{field_type}>::size();"
+                     starknet::StorageValue::<{field_type}>::size();"
                 ));
             } else {
                 let subsequent_write =
-                    format!("current_offset += starknet::StorageAccess::<{field_type}>::size();");
+                    format!("current_offset += starknet::StorageValue::<{field_type}>::size();");
                 writes.push(subsequent_write.clone());
                 writes_at_offset.push(subsequent_write);
             }
         }
-        sizes.push(format!("starknet::StorageAccess::<{field_type}>::size()"));
+        sizes.push(format!("starknet::StorageValue::<{field_type}>::size()"));
     }
 
     let sa_impl = formatdoc!(
         "
-        impl StorageAccess{struct_name} of starknet::StorageAccess::<{struct_name}> {{
+        impl StorageValue{struct_name} of starknet::StorageValue::<{struct_name}> {{
             fn read(address_domain: u32, base: starknet::StorageBaseAddress) -> \
          starknet::SyscallResult<{struct_name}> {{
                 {reads_values}
@@ -169,7 +169,7 @@ pub fn derive_storage_access_needed<T: QueryAttrs>(with_attrs: &T, db: &dyn Synt
             else {
                 continue;
             };
-            if path.as_syntax_node().get_text_without_trivia(db) == "starknet::StorageAccess" {
+            if path.as_syntax_node().get_text_without_trivia(db) == "starknet::StorageValue" {
                 return true;
             }
         }
diff --git a/crates/cairo-lang-starknet/test_data/erc20.casm.json b/crates/cairo-lang-starknet/test_data/erc20.casm.json
index 8f31ff53b14..678b0a9848f 100644
--- a/crates/cairo-lang-starknet/test_data/erc20.casm.json
+++ b/crates/cairo-lang-starknet/test_data/erc20.casm.json
@@ -3960,7 +3960,7 @@
     "0x40780017fff7fff",
     "0x1",
     "0x480680017fff8000",
-    "0x53746f726167654163636573735538202d206e6f6e207538",
+    "0x53746f7261676556616c75655538202d206e6f6e207538",
     "0x400080007ffe7fff",
     "0x48127ff97fff8000",
     "0x48127ffb7fff8000",
@@ -4045,7 +4045,7 @@
     "0x40780017fff7fff",
     "0x1",
     "0x480680017fff8000",
-    "0x53746f7261676541636365737355313238202d206e6f6e2075313238",
+    "0x53746f7261676556616c756555313238202d206e6f6e2075313238",
     "0x400080007ffe7fff",
     "0x48127ff97fff8000",
     "0x48127ffb7fff8000",
@@ -4655,7 +4655,7 @@
     "0x40780017fff7fff",
     "0x1",
     "0x480680017fff8000",
-    "0x53746f7261676541636365737355313238202d206e6f6e2075313238",
+    "0x53746f7261676556616c756555313238202d206e6f6e2075313238",
     "0x400080007ffe7fff",
     "0x48127ff97fff8000",
     "0x48127ffb7fff8000",
diff --git a/crates/cairo-lang-starknet/test_data/erc20.sierra b/crates/cairo-lang-starknet/test_data/erc20.sierra
index 1fa341a3aff..dfe25f3b799 100644
--- a/crates/cairo-lang-starknet/test_data/erc20.sierra
+++ b/crates/cairo-lang-starknet/test_data/erc20.sierra
@@ -305,13 +305,13 @@ libfunc function_call<user@core::starknet::SyscallResultTraitImpl::<core::felt25
 libfunc storage_base_address_const<944713526212149105522785400348068751682982210605126537021911324578866405028> = storage_base_address_const<944713526212149105522785400348068751682982210605126537021911324578866405028>;
 libfunc storage_base_address_const<134830404806214277570220174593674215737759987247891306080029841794115377321> = storage_base_address_const<134830404806214277570220174593674215737759987247891306080029841794115377321>;
 libfunc store_temp<StorageBaseAddress> = store_temp<StorageBaseAddress>;
-libfunc function_call<user@core::starknet::storage_access::StorageAccessU8::read> = function_call<user@core::starknet::storage_access::StorageAccessU8::read>;
+libfunc function_call<user@core::starknet::storage_access::StorageValueU8::read> = function_call<user@core::starknet::storage_access::StorageValueU8::read>;
 libfunc enum_match<core::panics::PanicResult::<(core::result::Result::<core::integer::u8, core::array::Array::<core::felt252>>,)>> = enum_match<core::panics::PanicResult::<(core::result::Result::<core::integer::u8, core::array::Array::<core::felt252>>,)>>;
 libfunc struct_deconstruct<Tuple<core::result::Result::<core::integer::u8, core::array::Array::<core::felt252>>>> = struct_deconstruct<Tuple<core::result::Result::<core::integer::u8, core::array::Array::<core::felt252>>>>;
 libfunc store_temp<core::result::Result::<core::integer::u8, core::array::Array::<core::felt252>>> = store_temp<core::result::Result::<core::integer::u8, core::array::Array::<core::felt252>>>;
 libfunc function_call<user@core::starknet::SyscallResultTraitImpl::<core::integer::u8>::unwrap_syscall> = function_call<user@core::starknet::SyscallResultTraitImpl::<core::integer::u8>::unwrap_syscall>;
 libfunc storage_base_address_const<603278275252936218847294002513349627170936020082667936993356353388973422646> = storage_base_address_const<603278275252936218847294002513349627170936020082667936993356353388973422646>;
-libfunc function_call<user@core::integer::StorageAccessu256::read> = function_call<user@core::integer::StorageAccessu256::read>;
+libfunc function_call<user@core::integer::StorageValueu256::read> = function_call<user@core::integer::StorageValueu256::read>;
 libfunc enum_match<core::panics::PanicResult::<(core::result::Result::<core::integer::u256, core::array::Array::<core::felt252>>,)>> = enum_match<core::panics::PanicResult::<(core::result::Result::<core::integer::u256, core::array::Array::<core::felt252>>,)>>;
 libfunc struct_deconstruct<Tuple<core::result::Result::<core::integer::u256, core::array::Array::<core::felt252>>>> = struct_deconstruct<Tuple<core::result::Result::<core::integer::u256, core::array::Array::<core::felt252>>>>;
 libfunc store_temp<core::result::Result::<core::integer::u256, core::array::Array::<core::felt252>>> = store_temp<core::result::Result::<core::integer::u256, core::array::Array::<core::felt252>>>;
@@ -388,7 +388,7 @@ libfunc enum_init<core::panics::PanicResult::<(erc20::erc20::erc_20::decimals::C
 libfunc store_temp<core::panics::PanicResult::<(erc20::erc20::erc_20::decimals::ContractState, ())>> = store_temp<core::panics::PanicResult::<(erc20::erc20::erc_20::decimals::ContractState, ())>>;
 libfunc enum_init<core::panics::PanicResult::<(erc20::erc20::erc_20::decimals::ContractState, ())>, 1> = enum_init<core::panics::PanicResult::<(erc20::erc20::erc_20::decimals::ContractState, ())>, 1>;
 libfunc snapshot_take<erc20::erc20::erc_20::total_supply::ContractState> = snapshot_take<erc20::erc20::erc_20::total_supply::ContractState>;
-libfunc function_call<user@core::integer::StorageAccessu256::write> = function_call<user@core::integer::StorageAccessu256::write>;
+libfunc function_call<user@core::integer::StorageValueu256::write> = function_call<user@core::integer::StorageValueu256::write>;
 libfunc struct_construct<Tuple<erc20::erc20::erc_20::total_supply::ContractState, Unit>> = struct_construct<Tuple<erc20::erc20::erc_20::total_supply::ContractState, Unit>>;
 libfunc enum_init<core::panics::PanicResult::<(erc20::erc20::erc_20::total_supply::ContractState, ())>, 0> = enum_init<core::panics::PanicResult::<(erc20::erc20::erc_20::total_supply::ContractState, ())>, 0>;
 libfunc store_temp<core::panics::PanicResult::<(erc20::erc20::erc_20::total_supply::ContractState, ())>> = store_temp<core::panics::PanicResult::<(erc20::erc20::erc_20::total_supply::ContractState, ())>>;
@@ -407,13 +407,13 @@ libfunc enum_init<core::result::Result::<core::integer::u8, core::array::Array::
 libfunc struct_construct<Tuple<core::result::Result::<core::integer::u8, core::array::Array::<core::felt252>>>> = struct_construct<Tuple<core::result::Result::<core::integer::u8, core::array::Array::<core::felt252>>>>;
 libfunc enum_init<core::panics::PanicResult::<(core::result::Result::<core::integer::u8, core::array::Array::<core::felt252>>,)>, 0> = enum_init<core::panics::PanicResult::<(core::result::Result::<core::integer::u8, core::array::Array::<core::felt252>>,)>, 0>;
 libfunc store_temp<core::panics::PanicResult::<(core::result::Result::<core::integer::u8, core::array::Array::<core::felt252>>,)>> = store_temp<core::panics::PanicResult::<(core::result::Result::<core::integer::u8, core::array::Array::<core::felt252>>,)>>;
-libfunc felt252_const<2046306368138969050899942931452836379425163887498684822840> = felt252_const<2046306368138969050899942931452836379425163887498684822840>;
+libfunc felt252_const<7993384250542847882981489198721643573611695218582648120> = felt252_const<7993384250542847882981489198721643573611695218582648120>;
 libfunc enum_init<core::panics::PanicResult::<(core::result::Result::<core::integer::u8, core::array::Array::<core::felt252>>,)>, 1> = enum_init<core::panics::PanicResult::<(core::result::Result::<core::integer::u8, core::array::Array::<core::felt252>>,)>, 1>;
 libfunc enum_init<core::result::Result::<core::integer::u8, core::array::Array::<core::felt252>>, 1> = enum_init<core::result::Result::<core::integer::u8, core::array::Array::<core::felt252>>, 1>;
 libfunc enum_match<core::result::Result::<core::integer::u8, core::array::Array::<core::felt252>>> = enum_match<core::result::Result::<core::integer::u8, core::array::Array::<core::felt252>>>;
 libfunc dup<u32> = dup<u32>;
 libfunc dup<StorageBaseAddress> = dup<StorageBaseAddress>;
-libfunc function_call<user@core::starknet::storage_access::StorageAccessU128::read> = function_call<user@core::starknet::storage_access::StorageAccessU128::read>;
+libfunc function_call<user@core::starknet::storage_access::StorageValueU128::read> = function_call<user@core::starknet::storage_access::StorageValueU128::read>;
 libfunc enum_match<core::panics::PanicResult::<(core::result::Result::<core::integer::u128, core::array::Array::<core::felt252>>,)>> = enum_match<core::panics::PanicResult::<(core::result::Result::<core::integer::u128, core::array::Array::<core::felt252>>,)>>;
 libfunc struct_deconstruct<Tuple<core::result::Result::<core::integer::u128, core::array::Array::<core::felt252>>>> = struct_deconstruct<Tuple<core::result::Result::<core::integer::u128, core::array::Array::<core::felt252>>>>;
 libfunc enum_match<core::result::Result::<core::integer::u128, core::array::Array::<core::felt252>>> = enum_match<core::result::Result::<core::integer::u128, core::array::Array::<core::felt252>>>;
@@ -423,7 +423,7 @@ libfunc enum_init<core::result::Result::<core::integer::u256, core::array::Array
 libfunc struct_construct<Tuple<core::result::Result::<core::integer::u256, core::array::Array::<core::felt252>>>> = struct_construct<Tuple<core::result::Result::<core::integer::u256, core::array::Array::<core::felt252>>>>;
 libfunc enum_init<core::panics::PanicResult::<(core::result::Result::<core::integer::u256, core::array::Array::<core::felt252>>,)>, 0> = enum_init<core::panics::PanicResult::<(core::result::Result::<core::integer::u256, core::array::Array::<core::felt252>>,)>, 0>;
 libfunc store_temp<core::panics::PanicResult::<(core::result::Result::<core::integer::u256, core::array::Array::<core::felt252>>,)>> = store_temp<core::panics::PanicResult::<(core::result::Result::<core::integer::u256, core::array::Array::<core::felt252>>,)>>;
-libfunc felt252_const<8788818928753408456771414258856301875522769902639082522293830758968> = felt252_const<8788818928753408456771414258856301875522769902639082522293830758968>;
+libfunc felt252_const<34331323940443001904108331081886563608674525958940010332952801848> = felt252_const<34331323940443001904108331081886563608674525958940010332952801848>;
 libfunc enum_init<core::panics::PanicResult::<(core::result::Result::<core::integer::u256, core::array::Array::<core::felt252>>,)>, 1> = enum_init<core::panics::PanicResult::<(core::result::Result::<core::integer::u256, core::array::Array::<core::felt252>>,)>, 1>;
 libfunc enum_init<core::result::Result::<core::integer::u256, core::array::Array::<core::felt252>>, 1> = enum_init<core::result::Result::<core::integer::u256, core::array::Array::<core::felt252>>, 1>;
 libfunc drop<StorageBaseAddress> = drop<StorageBaseAddress>;
@@ -3201,7 +3201,7 @@ store_temp<GasBuiltin>([1]) -> ([11]);
 store_temp<System>([2]) -> ([12]);
 store_temp<u32>([5]) -> ([13]);
 store_temp<StorageBaseAddress>([4]) -> ([14]);
-function_call<user@core::starknet::storage_access::StorageAccessU8::read>([10], [11], [12], [13], [14]) -> ([6], [7], [8], [9]);
+function_call<user@core::starknet::storage_access::StorageValueU8::read>([10], [11], [12], [13], [14]) -> ([6], [7], [8], [9]);
 enum_match<core::panics::PanicResult::<(core::result::Result::<core::integer::u8, core::array::Array::<core::felt252>>,)>>([9]) { fallthrough([15]) 2730([16]) };
 branch_align() -> ();
 struct_deconstruct<Tuple<core::result::Result::<core::integer::u8, core::array::Array::<core::felt252>>>>([15]) -> ([17]);
@@ -3239,7 +3239,7 @@ store_temp<GasBuiltin>([1]) -> ([11]);
 store_temp<System>([2]) -> ([12]);
 store_temp<u32>([5]) -> ([13]);
 store_temp<StorageBaseAddress>([4]) -> ([14]);
-function_call<user@core::integer::StorageAccessu256::read>([10], [11], [12], [13], [14]) -> ([6], [7], [8], [9]);
+function_call<user@core::integer::StorageValueu256::read>([10], [11], [12], [13], [14]) -> ([6], [7], [8], [9]);
 enum_match<core::panics::PanicResult::<(core::result::Result::<core::integer::u256, core::array::Array::<core::felt252>>,)>>([9]) { fallthrough([15]) 2768([16]) };
 branch_align() -> ();
 struct_deconstruct<Tuple<core::result::Result::<core::integer::u256, core::array::Array::<core::felt252>>>>([15]) -> ([17]);
@@ -3292,7 +3292,7 @@ store_temp<GasBuiltin>([1]) -> ([19]);
 store_temp<System>([3]) -> ([20]);
 store_temp<u32>([13]) -> ([21]);
 store_temp<StorageBaseAddress>([8]) -> ([22]);
-function_call<user@core::integer::StorageAccessu256::read>([18], [19], [20], [21], [22]) -> ([14], [15], [16], [17]);
+function_call<user@core::integer::StorageValueu256::read>([18], [19], [20], [21], [22]) -> ([14], [15], [16], [17]);
 enum_match<core::panics::PanicResult::<(core::result::Result::<core::integer::u256, core::array::Array::<core::felt252>>,)>>([17]) { fallthrough([23]) 2823([24]) };
 branch_align() -> ();
 struct_deconstruct<Tuple<core::result::Result::<core::integer::u256, core::array::Array::<core::felt252>>>>([23]) -> ([25]);
@@ -3336,7 +3336,7 @@ store_temp<GasBuiltin>([1]) -> ([19]);
 store_temp<System>([3]) -> ([20]);
 store_temp<u32>([13]) -> ([21]);
 store_temp<StorageBaseAddress>([8]) -> ([22]);
-function_call<user@core::integer::StorageAccessu256::read>([18], [19], [20], [21], [22]) -> ([14], [15], [16], [17]);
+function_call<user@core::integer::StorageValueu256::read>([18], [19], [20], [21], [22]) -> ([14], [15], [16], [17]);
 enum_match<core::panics::PanicResult::<(core::result::Result::<core::integer::u256, core::array::Array::<core::felt252>>,)>>([17]) { fallthrough([23]) 2867([24]) };
 branch_align() -> ();
 struct_deconstruct<Tuple<core::result::Result::<core::integer::u256, core::array::Array::<core::felt252>>>>([23]) -> ([25]);
@@ -4178,7 +4178,7 @@ store_temp<System>([1]) -> ([12]);
 store_temp<u32>([7]) -> ([13]);
 store_temp<StorageBaseAddress>([6]) -> ([14]);
 store_temp<core::integer::u256>([3]) -> ([15]);
-function_call<user@core::integer::StorageAccessu256::write>([11], [12], [13], [14], [15]) -> ([8], [9], [10]);
+function_call<user@core::integer::StorageValueu256::write>([11], [12], [13], [14], [15]) -> ([8], [9], [10]);
 rename<core::result::Result::<(), core::array::Array::<core::felt252>>>([10]) -> ([17]);
 function_call<user@core::starknet::SyscallResultTraitImpl::<()>::unwrap_syscall>([17]) -> ([16]);
 enum_match<core::panics::PanicResult::<((),)>>([16]) { fallthrough([18]) 3696([19]) };
@@ -4209,7 +4209,7 @@ store_temp<System>([3]) -> ([21]);
 store_temp<u32>([16]) -> ([22]);
 store_temp<StorageBaseAddress>([11]) -> ([23]);
 store_temp<core::integer::u256>([6]) -> ([24]);
-function_call<user@core::integer::StorageAccessu256::write>([20], [21], [22], [23], [24]) -> ([17], [18], [19]);
+function_call<user@core::integer::StorageValueu256::write>([20], [21], [22], [23], [24]) -> ([17], [18], [19]);
 rename<core::result::Result::<(), core::array::Array::<core::felt252>>>([19]) -> ([26]);
 function_call<user@core::starknet::SyscallResultTraitImpl::<()>::unwrap_syscall>([26]) -> ([25]);
 enum_match<core::panics::PanicResult::<((),)>>([25]) { fallthrough([27]) 3729([28]) };
@@ -4315,7 +4315,7 @@ return([21], [22], [23], [24]);
 branch_align() -> ();
 drop<Unit>([17]) -> ();
 array_new<felt252>() -> ([25]);
-felt252_const<2046306368138969050899942931452836379425163887498684822840>() -> ([26]);
+felt252_const<7993384250542847882981489198721643573611695218582648120>() -> ([26]);
 store_temp<felt252>([26]) -> ([26]);
 array_append<felt252>([25], [26]) -> ([27]);
 struct_construct<core::panics::Panic>() -> ([28]);
@@ -4354,7 +4354,7 @@ dup<u32>([3]) -> ([3], [12]);
 store_temp<u32>([12]) -> ([12]);
 dup<StorageBaseAddress>([4]) -> ([4], [13]);
 store_temp<StorageBaseAddress>([13]) -> ([13]);
-function_call<user@core::starknet::storage_access::StorageAccessU128::read>([9], [10], [11], [12], [13]) -> ([5], [6], [7], [8]);
+function_call<user@core::starknet::storage_access::StorageValueU128::read>([9], [10], [11], [12], [13]) -> ([5], [6], [7], [8]);
 enum_match<core::panics::PanicResult::<(core::result::Result::<core::integer::u128, core::array::Array::<core::felt252>>,)>>([8]) { fallthrough([14]) 3923([15]) };
 branch_align() -> ();
 struct_deconstruct<Tuple<core::result::Result::<core::integer::u128, core::array::Array::<core::felt252>>>>([14]) -> ([16]);
@@ -4385,7 +4385,7 @@ branch_align() -> ();
 drop<Unit>([32]) -> ();
 drop<u128>([17]) -> ();
 array_new<felt252>() -> ([41]);
-felt252_const<8788818928753408456771414258856301875522769902639082522293830758968>() -> ([42]);
+felt252_const<34331323940443001904108331081886563608674525958940010332952801848>() -> ([42]);
 store_temp<felt252>([42]) -> ([42]);
 array_append<felt252>([41], [42]) -> ([43]);
 struct_construct<core::panics::Panic>() -> ([44]);
@@ -4567,7 +4567,7 @@ store_temp<System>([3]) -> ([21]);
 store_temp<u32>([16]) -> ([22]);
 store_temp<StorageBaseAddress>([11]) -> ([23]);
 store_temp<core::integer::u256>([6]) -> ([24]);
-function_call<user@core::integer::StorageAccessu256::write>([20], [21], [22], [23], [24]) -> ([17], [18], [19]);
+function_call<user@core::integer::StorageValueu256::write>([20], [21], [22], [23], [24]) -> ([17], [18], [19]);
 rename<core::result::Result::<(), core::array::Array::<core::felt252>>>([19]) -> ([26]);
 function_call<user@core::starknet::SyscallResultTraitImpl::<()>::unwrap_syscall>([26]) -> ([25]);
 enum_match<core::panics::PanicResult::<((),)>>([25]) { fallthrough([27]) 4087([28]) };
@@ -4779,7 +4779,7 @@ return([21], [22], [23], [24]);
 branch_align() -> ();
 drop<Unit>([17]) -> ();
 array_new<felt252>() -> ([25]);
-felt252_const<8788818928753408456771414258856301875522769902639082522293830758968>() -> ([26]);
+felt252_const<34331323940443001904108331081886563608674525958940010332952801848>() -> ([26]);
 store_temp<felt252>([26]) -> ([26]);
 array_append<felt252>([25], [26]) -> ([27]);
 struct_construct<core::panics::Panic>() -> ([28]);
@@ -5051,9 +5051,9 @@ erc20::erc20::erc_20::total_supply::InternalContractStateImpl::write@3675([0]: G
 erc20::erc20::erc_20::balances::InternalContractStateImpl::write@3703([0]: RangeCheck, [1]: GasBuiltin, [2]: Pedersen, [3]: System, [4]: erc20::erc20::erc_20::balances::ContractState, [5]: ContractAddress, [6]: core::integer::u256) -> (RangeCheck, GasBuiltin, Pedersen, System, core::panics::PanicResult::<(erc20::erc20::erc_20::balances::ContractState, ())>);
 erc20::erc20::erc_20::ContractStateEventEmitter::emit::<erc20::erc20::erc_20::Event, core::traits::TIntoT::<erc20::erc20::erc_20::Event>>@3738([0]: GasBuiltin, [1]: System, [2]: erc20::erc20::erc_20::ContractState, [3]: erc20::erc20::erc_20::Event) -> (GasBuiltin, System, core::panics::PanicResult::<(erc20::erc20::erc_20::ContractState, ())>);
 core::starknet::SyscallResultTraitImpl::<core::felt252>::unwrap_syscall@3788([0]: core::result::Result::<core::felt252, core::array::Array::<core::felt252>>) -> (core::panics::PanicResult::<(core::felt252,)>);
-core::starknet::storage_access::StorageAccessU8::read@3800([0]: RangeCheck, [1]: GasBuiltin, [2]: System, [3]: u32, [4]: StorageBaseAddress) -> (RangeCheck, GasBuiltin, System, core::panics::PanicResult::<(core::result::Result::<core::integer::u8, core::array::Array::<core::felt252>>,)>);
+core::starknet::storage_access::StorageValueU8::read@3800([0]: RangeCheck, [1]: GasBuiltin, [2]: System, [3]: u32, [4]: StorageBaseAddress) -> (RangeCheck, GasBuiltin, System, core::panics::PanicResult::<(core::result::Result::<core::integer::u8, core::array::Array::<core::felt252>>,)>);
 core::starknet::SyscallResultTraitImpl::<core::integer::u8>::unwrap_syscall@3841([0]: core::result::Result::<core::integer::u8, core::array::Array::<core::felt252>>) -> (core::panics::PanicResult::<(core::integer::u8,)>);
-core::integer::StorageAccessu256::read@3853([0]: RangeCheck, [1]: GasBuiltin, [2]: System, [3]: u32, [4]: StorageBaseAddress) -> (RangeCheck, GasBuiltin, System, core::panics::PanicResult::<(core::result::Result::<core::integer::u256, core::array::Array::<core::felt252>>,)>);
+core::integer::StorageValueu256::read@3853([0]: RangeCheck, [1]: GasBuiltin, [2]: System, [3]: u32, [4]: StorageBaseAddress) -> (RangeCheck, GasBuiltin, System, core::panics::PanicResult::<(core::result::Result::<core::integer::u256, core::array::Array::<core::felt252>>,)>);
 core::starknet::SyscallResultTraitImpl::<core::integer::u256>::unwrap_syscall@3932([0]: core::result::Result::<core::integer::u256, core::array::Array::<core::felt252>>) -> (core::panics::PanicResult::<(core::integer::u256,)>);
 erc20::erc20::erc_20::balances::InternalContractStateImpl::address@3944([0]: RangeCheck, [1]: Pedersen, [2]: erc20::erc20::erc_20::balances::ContractState, [3]: ContractAddress) -> (RangeCheck, Pedersen, StorageBaseAddress);
 erc20::erc20::erc_20::allowances::InternalContractStateImpl::address@3955([0]: RangeCheck, [1]: Pedersen, [2]: erc20::erc20::erc_20::allowances::ContractState, [3]: Tuple<ContractAddress, ContractAddress>) -> (RangeCheck, Pedersen, StorageBaseAddress);
@@ -5065,10 +5065,10 @@ erc20::erc20::erc_20::ContractStateEventEmitter::emit::<erc20::erc20::erc_20::Ap
 core::integer::u256_checked_add@4146([0]: RangeCheck, [1]: core::integer::u256, [2]: core::integer::u256) -> (RangeCheck, core::option::Option::<core::integer::u256>);
 core::integer::u256_checked_sub@4166([0]: RangeCheck, [1]: core::integer::u256, [2]: core::integer::u256) -> (RangeCheck, core::option::Option::<core::integer::u256>);
 core::starknet::SyscallResultTraitImpl::<()>::unwrap_syscall@4186([0]: core::result::Result::<(), core::array::Array::<core::felt252>>) -> (core::panics::PanicResult::<((),)>);
-core::integer::StorageAccessu256::write@4198([0]: GasBuiltin, [1]: System, [2]: u32, [3]: StorageBaseAddress, [4]: core::integer::u256) -> (GasBuiltin, System, core::result::Result::<(), core::array::Array::<core::felt252>>);
+core::integer::StorageValueu256::write@4198([0]: GasBuiltin, [1]: System, [2]: u32, [3]: StorageBaseAddress, [4]: core::integer::u256) -> (GasBuiltin, System, core::result::Result::<(), core::array::Array::<core::felt252>>);
 core::traits::TIntoT::<erc20::erc20::erc_20::Event>::into@4233([0]: erc20::erc20::erc_20::Event) -> (erc20::erc20::erc_20::Event);
 erc20::erc20::erc_20::EventIsEvent::append_keys_and_data@4235([0]: erc20::erc20::erc_20::Event, [1]: Array<felt252>, [2]: Array<felt252>) -> (Array<felt252>, Array<felt252>, Unit);
-core::starknet::storage_access::StorageAccessU128::read@4264([0]: RangeCheck, [1]: GasBuiltin, [2]: System, [3]: u32, [4]: StorageBaseAddress) -> (RangeCheck, GasBuiltin, System, core::panics::PanicResult::<(core::result::Result::<core::integer::u128, core::array::Array::<core::felt252>>,)>);
+core::starknet::storage_access::StorageValueU128::read@4264([0]: RangeCheck, [1]: GasBuiltin, [2]: System, [3]: u32, [4]: StorageBaseAddress) -> (RangeCheck, GasBuiltin, System, core::panics::PanicResult::<(core::result::Result::<core::integer::u128, core::array::Array::<core::felt252>>,)>);
 core::hash::LegacyHashContractAddress::hash@4305([0]: Pedersen, [1]: felt252, [2]: ContractAddress) -> (Pedersen, felt252);
 core::hash::TupleSize2LegacyHash::<core::starknet::contract_address::ContractAddress, core::starknet::contract_address::ContractAddress, core::hash::LegacyHashContractAddress, core::hash::LegacyHashContractAddress, core::starknet::contract_address::ContractAddressDrop, core::starknet::contract_address::ContractAddressDrop>::hash@4310([0]: Pedersen, [1]: felt252, [2]: Tuple<ContractAddress, ContractAddress>) -> (Pedersen, felt252);
 core::starknet::SyscallResultTraitImpl::<core::box::Box::<core::starknet::info::ExecutionInfo>>::unwrap_syscall@4322([0]: core::result::Result::<core::box::Box::<core::starknet::info::ExecutionInfo>, core::array::Array::<core::felt252>>) -> (core::panics::PanicResult::<(core::box::Box::<core::starknet::info::ExecutionInfo>,)>);
diff --git a/crates/cairo-lang-starknet/test_data/erc20.sierra.json b/crates/cairo-lang-starknet/test_data/erc20.sierra.json
index 3de96507630..e4f9bd28937 100644
--- a/crates/cairo-lang-starknet/test_data/erc20.sierra.json
+++ b/crates/cairo-lang-starknet/test_data/erc20.sierra.json
@@ -214,11 +214,11 @@
     "0x4f",
     "0x51",
     "0x656d69745f6576656e745f73797363616c6c",
-    "0x53746f726167654163636573735538202d206e6f6e207538",
+    "0x53746f7261676556616c75655538202d206e6f6e207538",
     "0x54",
     "0x75385f636f6e7374",
     "0x2679d68052ccd03a53755ca9169677965fbd93e489df62f5f40d4f03c24f7a4",
-    "0x53746f7261676541636365737355313238202d206e6f6e2075313238",
+    "0x53746f7261676556616c756555313238202d206e6f6e2075313238",
     "0x25b1ef8ee6544359221f3cf316f768360e83448109193bdcef77f52a79d95c4",
     "0xad292db4ff05a993c318438c1b6c8a8303266af2da151aa28ccece6726f1f1",
     "0xbf4c436d6f8521e5c6189511c75075de702ad597ce22c1786275e8e5167ec7",
@@ -3627,7 +3627,7 @@
       ],
       [
         217,
-        "function_call<user@core::starknet::storage_access::StorageAccessU8::read>"
+        "function_call<user@core::starknet::storage_access::StorageValueU8::read>"
       ],
       [
         218,
@@ -3651,7 +3651,7 @@
       ],
       [
         223,
-        "function_call<user@core::integer::StorageAccessu256::read>"
+        "function_call<user@core::integer::StorageValueu256::read>"
       ],
       [
         224,
@@ -3959,7 +3959,7 @@
       ],
       [
         300,
-        "function_call<user@core::integer::StorageAccessu256::write>"
+        "function_call<user@core::integer::StorageValueu256::write>"
       ],
       [
         301,
@@ -4035,7 +4035,7 @@
       ],
       [
         319,
-        "felt252_const<2046306368138969050899942931452836379425163887498684822840>"
+        "felt252_const<7993384250542847882981489198721643573611695218582648120>"
       ],
       [
         320,
@@ -4059,7 +4059,7 @@
       ],
       [
         325,
-        "function_call<user@core::starknet::storage_access::StorageAccessU128::read>"
+        "function_call<user@core::starknet::storage_access::StorageValueU128::read>"
       ],
       [
         326,
@@ -4099,7 +4099,7 @@
       ],
       [
         335,
-        "felt252_const<8788818928753408456771414258856301875522769902639082522293830758968>"
+        "felt252_const<34331323940443001904108331081886563608674525958940010332952801848>"
       ],
       [
         336,
@@ -4597,7 +4597,7 @@
       ],
       [
         54,
-        "core::starknet::storage_access::StorageAccessU8::read"
+        "core::starknet::storage_access::StorageValueU8::read"
       ],
       [
         55,
@@ -4605,7 +4605,7 @@
       ],
       [
         56,
-        "core::integer::StorageAccessu256::read"
+        "core::integer::StorageValueu256::read"
       ],
       [
         57,
@@ -4653,7 +4653,7 @@
       ],
       [
         68,
-        "core::integer::StorageAccessu256::write"
+        "core::integer::StorageValueu256::write"
       ],
       [
         69,
@@ -4665,7 +4665,7 @@
       ],
       [
         71,
-        "core::starknet::storage_access::StorageAccessU128::read"
+        "core::starknet::storage_access::StorageValueU128::read"
       ],
       [
         72,
diff --git a/crates/cairo-lang-starknet/test_data/new_syntax_test_contract.casm.json b/crates/cairo-lang-starknet/test_data/new_syntax_test_contract.casm.json
index e65bfb24f53..7900fa7e49b 100644
--- a/crates/cairo-lang-starknet/test_data/new_syntax_test_contract.casm.json
+++ b/crates/cairo-lang-starknet/test_data/new_syntax_test_contract.casm.json
@@ -1492,7 +1492,7 @@
     "0x40780017fff7fff",
     "0x1",
     "0x480680017fff8000",
-    "0x53746f7261676541636365737355313238202d206e6f6e2075313238",
+    "0x53746f7261676556616c756555313238202d206e6f6e2075313238",
     "0x400080007ffe7fff",
     "0x48127ff97fff8000",
     "0x48127ffb7fff8000",
diff --git a/crates/cairo-lang-starknet/test_data/new_syntax_test_contract.sierra b/crates/cairo-lang-starknet/test_data/new_syntax_test_contract.sierra
index 1e75e220535..4ecdcfc090e 100644
--- a/crates/cairo-lang-starknet/test_data/new_syntax_test_contract.sierra
+++ b/crates/cairo-lang-starknet/test_data/new_syntax_test_contract.sierra
@@ -191,7 +191,7 @@ libfunc enum_match<core::panics::PanicResult::<(new_syntax_test_contract::new_sy
 libfunc struct_deconstruct<Tuple<new_syntax_test_contract::new_syntax_test_contract::counter_contract::other_contract::ContractState, Unit>> = struct_deconstruct<Tuple<new_syntax_test_contract::new_syntax_test_contract::counter_contract::other_contract::ContractState, Unit>>;
 libfunc storage_base_address_const<223925651276572801467025322450506123433664924558092583619131301620304795732> = storage_base_address_const<223925651276572801467025322450506123433664924558092583619131301620304795732>;
 libfunc store_temp<StorageBaseAddress> = store_temp<StorageBaseAddress>;
-libfunc function_call<user@core::starknet::storage_access::StorageAccessU128::read> = function_call<user@core::starknet::storage_access::StorageAccessU128::read>;
+libfunc function_call<user@core::starknet::storage_access::StorageValueU128::read> = function_call<user@core::starknet::storage_access::StorageValueU128::read>;
 libfunc enum_match<core::panics::PanicResult::<(core::result::Result::<core::integer::u128, core::array::Array::<core::felt252>>,)>> = enum_match<core::panics::PanicResult::<(core::result::Result::<core::integer::u128, core::array::Array::<core::felt252>>,)>>;
 libfunc struct_deconstruct<Tuple<core::result::Result::<core::integer::u128, core::array::Array::<core::felt252>>>> = struct_deconstruct<Tuple<core::result::Result::<core::integer::u128, core::array::Array::<core::felt252>>>>;
 libfunc store_temp<core::result::Result::<core::integer::u128, core::array::Array::<core::felt252>>> = store_temp<core::result::Result::<core::integer::u128, core::array::Array::<core::felt252>>>;
@@ -229,7 +229,7 @@ libfunc store_temp<new_syntax_test_contract::new_syntax_test_contract::counter_c
 libfunc function_call<user@new_syntax_test_contract::new_syntax_test_contract::counter_contract::EventIsEvent::append_keys_and_data> = function_call<user@new_syntax_test_contract::new_syntax_test_contract::counter_contract::EventIsEvent::append_keys_and_data>;
 libfunc emit_event_syscall = emit_event_syscall;
 libfunc storage_base_address_const<376313616497945473624065492941162130666019289552693032300931764466904068779> = storage_base_address_const<376313616497945473624065492941162130666019289552693032300931764466904068779>;
-libfunc function_call<user@new_syntax_test_contract::new_syntax_test_contract::StorageAccessIOtherContractDispatcher::read> = function_call<user@new_syntax_test_contract::new_syntax_test_contract::StorageAccessIOtherContractDispatcher::read>;
+libfunc function_call<user@new_syntax_test_contract::new_syntax_test_contract::StorageValueIOtherContractDispatcher::read> = function_call<user@new_syntax_test_contract::new_syntax_test_contract::StorageValueIOtherContractDispatcher::read>;
 libfunc enum_match<core::panics::PanicResult::<(core::result::Result::<new_syntax_test_contract::new_syntax_test_contract::IOtherContractDispatcher, core::array::Array::<core::felt252>>,)>> = enum_match<core::panics::PanicResult::<(core::result::Result::<new_syntax_test_contract::new_syntax_test_contract::IOtherContractDispatcher, core::array::Array::<core::felt252>>,)>>;
 libfunc struct_deconstruct<Tuple<core::result::Result::<new_syntax_test_contract::new_syntax_test_contract::IOtherContractDispatcher, core::array::Array::<core::felt252>>>> = struct_deconstruct<Tuple<core::result::Result::<new_syntax_test_contract::new_syntax_test_contract::IOtherContractDispatcher, core::array::Array::<core::felt252>>>>;
 libfunc store_temp<core::result::Result::<new_syntax_test_contract::new_syntax_test_contract::IOtherContractDispatcher, core::array::Array::<core::felt252>>> = store_temp<core::result::Result::<new_syntax_test_contract::new_syntax_test_contract::IOtherContractDispatcher, core::array::Array::<core::felt252>>>;
@@ -261,7 +261,7 @@ libfunc function_call<user@new_syntax_test_contract::new_syntax_test_contract::c
 libfunc enum_init<core::option::Option::<core::felt252>, 0> = enum_init<core::option::Option::<core::felt252>, 0>;
 libfunc store_temp<core::option::Option::<core::felt252>> = store_temp<core::option::Option::<core::felt252>>;
 libfunc enum_init<core::option::Option::<core::felt252>, 1> = enum_init<core::option::Option::<core::felt252>, 1>;
-libfunc function_call<user@new_syntax_test_contract::new_syntax_test_contract::StorageAccessIOtherContractDispatcher::write> = function_call<user@new_syntax_test_contract::new_syntax_test_contract::StorageAccessIOtherContractDispatcher::write>;
+libfunc function_call<user@new_syntax_test_contract::new_syntax_test_contract::StorageValueIOtherContractDispatcher::write> = function_call<user@new_syntax_test_contract::new_syntax_test_contract::StorageValueIOtherContractDispatcher::write>;
 libfunc struct_construct<Tuple<new_syntax_test_contract::new_syntax_test_contract::counter_contract::other_contract::ContractState, Unit>> = struct_construct<Tuple<new_syntax_test_contract::new_syntax_test_contract::counter_contract::other_contract::ContractState, Unit>>;
 libfunc enum_init<core::panics::PanicResult::<(new_syntax_test_contract::new_syntax_test_contract::counter_contract::other_contract::ContractState, ())>, 0> = enum_init<core::panics::PanicResult::<(new_syntax_test_contract::new_syntax_test_contract::counter_contract::other_contract::ContractState, ())>, 0>;
 libfunc store_temp<core::panics::PanicResult::<(new_syntax_test_contract::new_syntax_test_contract::counter_contract::other_contract::ContractState, ())>> = store_temp<core::panics::PanicResult::<(new_syntax_test_contract::new_syntax_test_contract::counter_contract::other_contract::ContractState, ())>>;
@@ -271,7 +271,7 @@ libfunc enum_init<core::result::Result::<core::integer::u128, core::array::Array
 libfunc struct_construct<Tuple<core::result::Result::<core::integer::u128, core::array::Array::<core::felt252>>>> = struct_construct<Tuple<core::result::Result::<core::integer::u128, core::array::Array::<core::felt252>>>>;
 libfunc enum_init<core::panics::PanicResult::<(core::result::Result::<core::integer::u128, core::array::Array::<core::felt252>>,)>, 0> = enum_init<core::panics::PanicResult::<(core::result::Result::<core::integer::u128, core::array::Array::<core::felt252>>,)>, 0>;
 libfunc store_temp<core::panics::PanicResult::<(core::result::Result::<core::integer::u128, core::array::Array::<core::felt252>>,)>> = store_temp<core::panics::PanicResult::<(core::result::Result::<core::integer::u128, core::array::Array::<core::felt252>>,)>>;
-libfunc felt252_const<8788818928753408456771414258856301875522769902639082522293830758968> = felt252_const<8788818928753408456771414258856301875522769902639082522293830758968>;
+libfunc felt252_const<34331323940443001904108331081886563608674525958940010332952801848> = felt252_const<34331323940443001904108331081886563608674525958940010332952801848>;
 libfunc enum_init<core::panics::PanicResult::<(core::result::Result::<core::integer::u128, core::array::Array::<core::felt252>>,)>, 1> = enum_init<core::panics::PanicResult::<(core::result::Result::<core::integer::u128, core::array::Array::<core::felt252>>,)>, 1>;
 libfunc enum_init<core::result::Result::<core::integer::u128, core::array::Array::<core::felt252>>, 1> = enum_init<core::result::Result::<core::integer::u128, core::array::Array::<core::felt252>>, 1>;
 libfunc enum_match<core::result::Result::<core::integer::u128, core::array::Array::<core::felt252>>> = enum_match<core::result::Result::<core::integer::u128, core::array::Array::<core::felt252>>>;
@@ -288,7 +288,7 @@ libfunc function_call<user@new_syntax_test_contract::new_syntax_test_contract::c
 libfunc felt252_const<364451368385661037075321874576483508309644891427381190745986300576661518140> = felt252_const<364451368385661037075321874576483508309644891427381190745986300576661518140>;
 libfunc function_call<user@new_syntax_test_contract::new_syntax_test_contract::counter_contract::CounterDecreasedIsEvent::append_keys_and_data> = function_call<user@new_syntax_test_contract::new_syntax_test_contract::counter_contract::CounterDecreasedIsEvent::append_keys_and_data>;
 libfunc rename<Array<felt252>> = rename<Array<felt252>>;
-libfunc function_call<user@core::starknet::storage_access::StorageAccessContractAddress::read> = function_call<user@core::starknet::storage_access::StorageAccessContractAddress::read>;
+libfunc function_call<user@core::starknet::storage_access::StorageValueContractAddress::read> = function_call<user@core::starknet::storage_access::StorageValueContractAddress::read>;
 libfunc enum_match<core::panics::PanicResult::<(core::result::Result::<core::starknet::contract_address::ContractAddress, core::array::Array::<core::felt252>>,)>> = enum_match<core::panics::PanicResult::<(core::result::Result::<core::starknet::contract_address::ContractAddress, core::array::Array::<core::felt252>>,)>>;
 libfunc struct_deconstruct<Tuple<core::result::Result::<core::starknet::contract_address::ContractAddress, core::array::Array::<core::felt252>>>> = struct_deconstruct<Tuple<core::result::Result::<core::starknet::contract_address::ContractAddress, core::array::Array::<core::felt252>>>>;
 libfunc enum_match<core::result::Result::<core::starknet::contract_address::ContractAddress, core::array::Array::<core::felt252>>> = enum_match<core::result::Result::<core::starknet::contract_address::ContractAddress, core::array::Array::<core::felt252>>>;
@@ -1168,7 +1168,7 @@ store_temp<GasBuiltin>([1]) -> ([11]);
 store_temp<System>([2]) -> ([12]);
 store_temp<u32>([5]) -> ([13]);
 store_temp<StorageBaseAddress>([4]) -> ([14]);
-function_call<user@core::starknet::storage_access::StorageAccessU128::read>([10], [11], [12], [13], [14]) -> ([6], [7], [8], [9]);
+function_call<user@core::starknet::storage_access::StorageValueU128::read>([10], [11], [12], [13], [14]) -> ([6], [7], [8], [9]);
 enum_match<core::panics::PanicResult::<(core::result::Result::<core::integer::u128, core::array::Array::<core::felt252>>,)>>([9]) { fallthrough([15]) 866([16]) };
 branch_align() -> ();
 struct_deconstruct<Tuple<core::result::Result::<core::integer::u128, core::array::Array::<core::felt252>>>>([15]) -> ([17]);
@@ -1344,7 +1344,7 @@ store_temp<GasBuiltin>([1]) -> ([11]);
 store_temp<System>([2]) -> ([12]);
 store_temp<u32>([5]) -> ([13]);
 store_temp<StorageBaseAddress>([4]) -> ([14]);
-function_call<user@new_syntax_test_contract::new_syntax_test_contract::StorageAccessIOtherContractDispatcher::read>([10], [11], [12], [13], [14]) -> ([6], [7], [8], [9]);
+function_call<user@new_syntax_test_contract::new_syntax_test_contract::StorageValueIOtherContractDispatcher::read>([10], [11], [12], [13], [14]) -> ([6], [7], [8], [9]);
 enum_match<core::panics::PanicResult::<(core::result::Result::<new_syntax_test_contract::new_syntax_test_contract::IOtherContractDispatcher, core::array::Array::<core::felt252>>,)>>([9]) { fallthrough([15]) 1042([16]) };
 branch_align() -> ();
 struct_deconstruct<Tuple<core::result::Result::<new_syntax_test_contract::new_syntax_test_contract::IOtherContractDispatcher, core::array::Array::<core::felt252>>>>([15]) -> ([17]);
@@ -1544,7 +1544,7 @@ store_temp<System>([1]) -> ([12]);
 store_temp<u32>([7]) -> ([13]);
 store_temp<StorageBaseAddress>([6]) -> ([14]);
 store_temp<new_syntax_test_contract::new_syntax_test_contract::IOtherContractDispatcher>([3]) -> ([15]);
-function_call<user@new_syntax_test_contract::new_syntax_test_contract::StorageAccessIOtherContractDispatcher::write>([11], [12], [13], [14], [15]) -> ([8], [9], [10]);
+function_call<user@new_syntax_test_contract::new_syntax_test_contract::StorageValueIOtherContractDispatcher::write>([11], [12], [13], [14], [15]) -> ([8], [9], [10]);
 rename<core::result::Result::<(), core::array::Array::<core::felt252>>>([10]) -> ([17]);
 function_call<user@core::starknet::SyscallResultTraitImpl::<()>::unwrap_syscall>([17]) -> ([16]);
 enum_match<core::panics::PanicResult::<((),)>>([16]) { fallthrough([18]) 1231([19]) };
@@ -1584,7 +1584,7 @@ return([21], [22], [23], [24]);
 branch_align() -> ();
 drop<Unit>([17]) -> ();
 array_new<felt252>() -> ([25]);
-felt252_const<8788818928753408456771414258856301875522769902639082522293830758968>() -> ([26]);
+felt252_const<34331323940443001904108331081886563608674525958940010332952801848>() -> ([26]);
 store_temp<felt252>([26]) -> ([26]);
 array_append<felt252>([25], [26]) -> ([27]);
 struct_construct<core::panics::Panic>() -> ([28]);
@@ -1681,7 +1681,7 @@ store_temp<GasBuiltin>([1]) -> ([10]);
 store_temp<System>([2]) -> ([11]);
 store_temp<u32>([3]) -> ([12]);
 store_temp<StorageBaseAddress>([4]) -> ([13]);
-function_call<user@core::starknet::storage_access::StorageAccessContractAddress::read>([9], [10], [11], [12], [13]) -> ([5], [6], [7], [8]);
+function_call<user@core::starknet::storage_access::StorageValueContractAddress::read>([9], [10], [11], [12], [13]) -> ([5], [6], [7], [8]);
 enum_match<core::panics::PanicResult::<(core::result::Result::<core::starknet::contract_address::ContractAddress, core::array::Array::<core::felt252>>,)>>([8]) { fallthrough([14]) 1380([15]) };
 branch_align() -> ();
 struct_deconstruct<Tuple<core::result::Result::<core::starknet::contract_address::ContractAddress, core::array::Array::<core::felt252>>>>([14]) -> ([16]);
@@ -1913,19 +1913,19 @@ core::integer::U128Sub::sub@1104([0]: RangeCheck, [1]: u128, [2]: u128) -> (Rang
 new_syntax_test_contract::new_syntax_test_contract::counter_contract::ContractStateEventEmitter::emit::<new_syntax_test_contract::new_syntax_test_contract::counter_contract::CounterDecreased, new_syntax_test_contract::new_syntax_test_contract::counter_contract::EventCounterDecreasedIntoEvent>@1131([0]: GasBuiltin, [1]: System, [2]: new_syntax_test_contract::new_syntax_test_contract::counter_contract::ContractState, [3]: new_syntax_test_contract::new_syntax_test_contract::counter_contract::CounterDecreased) -> (GasBuiltin, System, core::panics::PanicResult::<(new_syntax_test_contract::new_syntax_test_contract::counter_contract::ContractState, ())>);
 core::Felt252Serde::deserialize@1181([0]: core::array::Span::<core::felt252>) -> (core::array::Span::<core::felt252>, core::option::Option::<core::felt252>);
 new_syntax_test_contract::new_syntax_test_contract::counter_contract::other_contract::InternalContractStateImpl::write@1210([0]: GasBuiltin, [1]: System, [2]: new_syntax_test_contract::new_syntax_test_contract::counter_contract::other_contract::ContractState, [3]: new_syntax_test_contract::new_syntax_test_contract::IOtherContractDispatcher) -> (GasBuiltin, System, core::panics::PanicResult::<(new_syntax_test_contract::new_syntax_test_contract::counter_contract::other_contract::ContractState, ())>);
-core::starknet::storage_access::StorageAccessU128::read@1238([0]: RangeCheck, [1]: GasBuiltin, [2]: System, [3]: u32, [4]: StorageBaseAddress) -> (RangeCheck, GasBuiltin, System, core::panics::PanicResult::<(core::result::Result::<core::integer::u128, core::array::Array::<core::felt252>>,)>);
+core::starknet::storage_access::StorageValueU128::read@1238([0]: RangeCheck, [1]: GasBuiltin, [2]: System, [3]: u32, [4]: StorageBaseAddress) -> (RangeCheck, GasBuiltin, System, core::panics::PanicResult::<(core::result::Result::<core::integer::u128, core::array::Array::<core::felt252>>,)>);
 core::starknet::SyscallResultTraitImpl::<core::integer::u128>::unwrap_syscall@1279([0]: core::result::Result::<core::integer::u128, core::array::Array::<core::felt252>>) -> (core::panics::PanicResult::<(core::integer::u128,)>);
 core::result::ResultTraitImpl::<core::integer::u128, core::integer::u128>::expect::<core::integer::u128Drop>@1291([0]: core::result::Result::<core::integer::u128, core::integer::u128>, [1]: felt252) -> (core::panics::PanicResult::<(core::integer::u128,)>);
 core::starknet::SyscallResultTraitImpl::<()>::unwrap_syscall@1307([0]: core::result::Result::<(), core::array::Array::<core::felt252>>) -> (core::panics::PanicResult::<((),)>);
 new_syntax_test_contract::new_syntax_test_contract::counter_contract::EventCounterIncreasedIntoEvent::into@1319([0]: new_syntax_test_contract::new_syntax_test_contract::counter_contract::CounterIncreased) -> (new_syntax_test_contract::new_syntax_test_contract::counter_contract::Event);
 new_syntax_test_contract::new_syntax_test_contract::counter_contract::EventIsEvent::append_keys_and_data@1322([0]: new_syntax_test_contract::new_syntax_test_contract::counter_contract::Event, [1]: Array<felt252>, [2]: Array<felt252>) -> (Array<felt252>, Array<felt252>, Unit);
-new_syntax_test_contract::new_syntax_test_contract::StorageAccessIOtherContractDispatcher::read@1351([0]: RangeCheck, [1]: GasBuiltin, [2]: System, [3]: u32, [4]: StorageBaseAddress) -> (RangeCheck, GasBuiltin, System, core::panics::PanicResult::<(core::result::Result::<new_syntax_test_contract::new_syntax_test_contract::IOtherContractDispatcher, core::array::Array::<core::felt252>>,)>);
+new_syntax_test_contract::new_syntax_test_contract::StorageValueIOtherContractDispatcher::read@1351([0]: RangeCheck, [1]: GasBuiltin, [2]: System, [3]: u32, [4]: StorageBaseAddress) -> (RangeCheck, GasBuiltin, System, core::panics::PanicResult::<(core::result::Result::<new_syntax_test_contract::new_syntax_test_contract::IOtherContractDispatcher, core::array::Array::<core::felt252>>,)>);
 core::starknet::SyscallResultTraitImpl::<new_syntax_test_contract::new_syntax_test_contract::IOtherContractDispatcher>::unwrap_syscall@1387([0]: core::result::Result::<new_syntax_test_contract::new_syntax_test_contract::IOtherContractDispatcher, core::array::Array::<core::felt252>>) -> (core::panics::PanicResult::<(new_syntax_test_contract::new_syntax_test_contract::IOtherContractDispatcher,)>);
 core::starknet::SyscallResultTraitImpl::<core::array::Span::<core::felt252>>::unwrap_syscall@1399([0]: core::result::Result::<core::array::Span::<core::felt252>, core::array::Array::<core::felt252>>) -> (core::panics::PanicResult::<(core::array::Span::<core::felt252>,)>);
 core::BoolSerde::deserialize@1411([0]: core::array::Span::<core::felt252>) -> (core::array::Span::<core::felt252>, core::option::Option::<core::bool>);
 new_syntax_test_contract::new_syntax_test_contract::counter_contract::EventCounterDecreasedIntoEvent::into@1468([0]: new_syntax_test_contract::new_syntax_test_contract::counter_contract::CounterDecreased) -> (new_syntax_test_contract::new_syntax_test_contract::counter_contract::Event);
-new_syntax_test_contract::new_syntax_test_contract::StorageAccessIOtherContractDispatcher::write@1471([0]: GasBuiltin, [1]: System, [2]: u32, [3]: StorageBaseAddress, [4]: new_syntax_test_contract::new_syntax_test_contract::IOtherContractDispatcher) -> (GasBuiltin, System, core::result::Result::<(), core::array::Array::<core::felt252>>);
+new_syntax_test_contract::new_syntax_test_contract::StorageValueIOtherContractDispatcher::write@1471([0]: GasBuiltin, [1]: System, [2]: u32, [3]: StorageBaseAddress, [4]: new_syntax_test_contract::new_syntax_test_contract::IOtherContractDispatcher) -> (GasBuiltin, System, core::result::Result::<(), core::array::Array::<core::felt252>>);
 new_syntax_test_contract::new_syntax_test_contract::counter_contract::CounterIncreasedIsEvent::append_keys_and_data@1488([0]: new_syntax_test_contract::new_syntax_test_contract::counter_contract::CounterIncreased, [1]: Array<felt252>, [2]: Array<felt252>) -> (Array<felt252>, Array<felt252>, Unit);
 new_syntax_test_contract::new_syntax_test_contract::counter_contract::CounterDecreasedIsEvent::append_keys_and_data@1498([0]: new_syntax_test_contract::new_syntax_test_contract::counter_contract::CounterDecreased, [1]: Array<felt252>, [2]: Array<felt252>) -> (Array<felt252>, Array<felt252>, Unit);
-core::starknet::storage_access::StorageAccessContractAddress::read@1508([0]: RangeCheck, [1]: GasBuiltin, [2]: System, [3]: u32, [4]: StorageBaseAddress) -> (RangeCheck, GasBuiltin, System, core::panics::PanicResult::<(core::result::Result::<core::starknet::contract_address::ContractAddress, core::array::Array::<core::felt252>>,)>);
+core::starknet::storage_access::StorageValueContractAddress::read@1508([0]: RangeCheck, [1]: GasBuiltin, [2]: System, [3]: u32, [4]: StorageBaseAddress) -> (RangeCheck, GasBuiltin, System, core::panics::PanicResult::<(core::result::Result::<core::starknet::contract_address::ContractAddress, core::array::Array::<core::felt252>>,)>);
 core::starknet::contract_address::Felt252TryIntoContractAddress::try_into@1549([0]: RangeCheck, [1]: felt252) -> (RangeCheck, core::option::Option::<core::starknet::contract_address::ContractAddress>);
diff --git a/crates/cairo-lang-starknet/test_data/new_syntax_test_contract.sierra.json b/crates/cairo-lang-starknet/test_data/new_syntax_test_contract.sierra.json
index ea160cac477..ea160d5cda1 100644
--- a/crates/cairo-lang-starknet/test_data/new_syntax_test_contract.sierra.json
+++ b/crates/cairo-lang-starknet/test_data/new_syntax_test_contract.sierra.json
@@ -161,7 +161,7 @@
     "0x753132385f6f766572666c6f77696e675f737562",
     "0x753132385f737562204f766572666c6f77",
     "0x73746f726167655f726561645f73797363616c6c",
-    "0x53746f7261676541636365737355313238202d206e6f6e2075313238",
+    "0x53746f7261676556616c756555313238202d206e6f6e2075313238",
     "0xd3651022da7ddf0a226dd81c8a16106318358829bd09702eb656630219c030",
     "0xce45ac928a78c60422a89f5a3d772729bd0852a3ffded47f327bd7cb70373c",
     "0x3a",
@@ -1796,7 +1796,7 @@
       ],
       [
         132,
-        "function_call<user@core::starknet::storage_access::StorageAccessU128::read>"
+        "function_call<user@core::starknet::storage_access::StorageValueU128::read>"
       ],
       [
         133,
@@ -1948,7 +1948,7 @@
       ],
       [
         170,
-        "function_call<user@new_syntax_test_contract::new_syntax_test_contract::StorageAccessIOtherContractDispatcher::read>"
+        "function_call<user@new_syntax_test_contract::new_syntax_test_contract::StorageValueIOtherContractDispatcher::read>"
       ],
       [
         171,
@@ -2076,7 +2076,7 @@
       ],
       [
         202,
-        "function_call<user@new_syntax_test_contract::new_syntax_test_contract::StorageAccessIOtherContractDispatcher::write>"
+        "function_call<user@new_syntax_test_contract::new_syntax_test_contract::StorageValueIOtherContractDispatcher::write>"
       ],
       [
         203,
@@ -2116,7 +2116,7 @@
       ],
       [
         212,
-        "felt252_const<8788818928753408456771414258856301875522769902639082522293830758968>"
+        "felt252_const<34331323940443001904108331081886563608674525958940010332952801848>"
       ],
       [
         213,
@@ -2184,7 +2184,7 @@
       ],
       [
         229,
-        "function_call<user@core::starknet::storage_access::StorageAccessContractAddress::read>"
+        "function_call<user@core::starknet::storage_access::StorageValueContractAddress::read>"
       ],
       [
         230,
@@ -2426,7 +2426,7 @@
       ],
       [
         24,
-        "core::starknet::storage_access::StorageAccessU128::read"
+        "core::starknet::storage_access::StorageValueU128::read"
       ],
       [
         25,
@@ -2450,7 +2450,7 @@
       ],
       [
         30,
-        "new_syntax_test_contract::new_syntax_test_contract::StorageAccessIOtherContractDispatcher::read"
+        "new_syntax_test_contract::new_syntax_test_contract::StorageValueIOtherContractDispatcher::read"
       ],
       [
         31,
@@ -2470,7 +2470,7 @@
       ],
       [
         35,
-        "new_syntax_test_contract::new_syntax_test_contract::StorageAccessIOtherContractDispatcher::write"
+        "new_syntax_test_contract::new_syntax_test_contract::StorageValueIOtherContractDispatcher::write"
       ],
       [
         36,
@@ -2482,7 +2482,7 @@
       ],
       [
         38,
-        "core::starknet::storage_access::StorageAccessContractAddress::read"
+        "core::starknet::storage_access::StorageValueContractAddress::read"
       ],
       [
         39,
diff --git a/crates/cairo-lang-starknet/test_data/token_bridge.sierra b/crates/cairo-lang-starknet/test_data/token_bridge.sierra
index 25cef3e74d0..c4ac737c7b9 100644
--- a/crates/cairo-lang-starknet/test_data/token_bridge.sierra
+++ b/crates/cairo-lang-starknet/test_data/token_bridge.sierra
@@ -275,7 +275,7 @@ libfunc store_temp<core::panics::PanicResult::<(core::starknet::contract_address
 libfunc enum_init<core::panics::PanicResult::<(core::starknet::contract_address::ContractAddress,)>, 1> = enum_init<core::panics::PanicResult::<(core::starknet::contract_address::ContractAddress,)>, 1>;
 libfunc storage_base_address_const<1029731857676939251764310060221759735616133968799083538322288083634503518595> = storage_base_address_const<1029731857676939251764310060221759735616133968799083538322288083634503518595>;
 libfunc store_temp<StorageBaseAddress> = store_temp<StorageBaseAddress>;
-libfunc function_call<user@core::starknet::storage_access::StorageAccessContractAddress::read> = function_call<user@core::starknet::storage_access::StorageAccessContractAddress::read>;
+libfunc function_call<user@core::starknet::storage_access::StorageValueContractAddress::read> = function_call<user@core::starknet::storage_access::StorageValueContractAddress::read>;
 libfunc enum_match<core::panics::PanicResult::<(core::result::Result::<core::starknet::contract_address::ContractAddress, core::array::Array::<core::felt252>>,)>> = enum_match<core::panics::PanicResult::<(core::result::Result::<core::starknet::contract_address::ContractAddress, core::array::Array::<core::felt252>>,)>>;
 libfunc struct_deconstruct<Tuple<core::result::Result::<core::starknet::contract_address::ContractAddress, core::array::Array::<core::felt252>>>> = struct_deconstruct<Tuple<core::result::Result::<core::starknet::contract_address::ContractAddress, core::array::Array::<core::felt252>>>>;
 libfunc store_temp<core::result::Result::<core::starknet::contract_address::ContractAddress, core::array::Array::<core::felt252>>> = store_temp<core::result::Result::<core::starknet::contract_address::ContractAddress, core::array::Array::<core::felt252>>>;
@@ -2148,7 +2148,7 @@ store_temp<GasBuiltin>([1]) -> ([11]);
 store_temp<System>([2]) -> ([12]);
 store_temp<u32>([5]) -> ([13]);
 store_temp<StorageBaseAddress>([4]) -> ([14]);
-function_call<user@core::starknet::storage_access::StorageAccessContractAddress::read>([10], [11], [12], [13], [14]) -> ([6], [7], [8], [9]);
+function_call<user@core::starknet::storage_access::StorageValueContractAddress::read>([10], [11], [12], [13], [14]) -> ([6], [7], [8], [9]);
 enum_match<core::panics::PanicResult::<(core::result::Result::<core::starknet::contract_address::ContractAddress, core::array::Array::<core::felt252>>,)>>([9]) { fallthrough([15]) 1770([16]) };
 branch_align() -> ();
 struct_deconstruct<Tuple<core::result::Result::<core::starknet::contract_address::ContractAddress, core::array::Array::<core::felt252>>>>([15]) -> ([17]);
@@ -2312,7 +2312,7 @@ store_temp<GasBuiltin>([1]) -> ([11]);
 store_temp<System>([2]) -> ([12]);
 store_temp<u32>([5]) -> ([13]);
 store_temp<StorageBaseAddress>([4]) -> ([14]);
-function_call<user@core::starknet::storage_access::StorageAccessContractAddress::read>([10], [11], [12], [13], [14]) -> ([6], [7], [8], [9]);
+function_call<user@core::starknet::storage_access::StorageValueContractAddress::read>([10], [11], [12], [13], [14]) -> ([6], [7], [8], [9]);
 enum_match<core::panics::PanicResult::<(core::result::Result::<core::starknet::contract_address::ContractAddress, core::array::Array::<core::felt252>>,)>>([9]) { fallthrough([15]) 1934([16]) };
 branch_align() -> ();
 struct_deconstruct<Tuple<core::result::Result::<core::starknet::contract_address::ContractAddress, core::array::Array::<core::felt252>>>>([15]) -> ([17]);
@@ -3312,7 +3312,7 @@ token_bridge::token_bridge::token_bridge::governor::InternalContractStateImpl::w
 core::integer::u256_from_felt252@2440([0]: RangeCheck, [1]: felt252) -> (RangeCheck, core::integer::u256);
 core::integer::U256PartialOrd::lt@2454([0]: RangeCheck, [1]: core::integer::u256, [2]: core::integer::u256) -> (RangeCheck, core::bool);
 core::starknet::info::get_execution_info@2533([0]: GasBuiltin, [1]: System) -> (GasBuiltin, System, core::panics::PanicResult::<(core::box::Box::<core::starknet::info::ExecutionInfo>,)>);
-core::starknet::storage_access::StorageAccessContractAddress::read@2562([0]: RangeCheck, [1]: GasBuiltin, [2]: System, [3]: u32, [4]: StorageBaseAddress) -> (RangeCheck, GasBuiltin, System, core::panics::PanicResult::<(core::result::Result::<core::starknet::contract_address::ContractAddress, core::array::Array::<core::felt252>>,)>);
+core::starknet::storage_access::StorageValueContractAddress::read@2562([0]: RangeCheck, [1]: GasBuiltin, [2]: System, [3]: u32, [4]: StorageBaseAddress) -> (RangeCheck, GasBuiltin, System, core::panics::PanicResult::<(core::result::Result::<core::starknet::contract_address::ContractAddress, core::array::Array::<core::felt252>>,)>);
 core::starknet::SyscallResultTraitImpl::<core::starknet::contract_address::ContractAddress>::unwrap_syscall@2603([0]: core::result::Result::<core::starknet::contract_address::ContractAddress, core::array::Array::<core::felt252>>) -> (core::panics::PanicResult::<(core::starknet::contract_address::ContractAddress,)>);
 core::starknet::SyscallResultTraitImpl::<core::felt252>::unwrap_syscall@2615([0]: core::result::Result::<core::felt252, core::array::Array::<core::felt252>>) -> (core::panics::PanicResult::<(core::felt252,)>);
 core::starknet::SyscallResultTraitImpl::<()>::unwrap_syscall@2627([0]: core::result::Result::<(), core::array::Array::<core::felt252>>) -> (core::panics::PanicResult::<((),)>);
diff --git a/crates/cairo-lang-starknet/test_data/token_bridge.sierra.json b/crates/cairo-lang-starknet/test_data/token_bridge.sierra.json
index 593ddf01565..68570c360e1 100644
--- a/crates/cairo-lang-starknet/test_data/token_bridge.sierra.json
+++ b/crates/cairo-lang-starknet/test_data/token_bridge.sierra.json
@@ -2776,7 +2776,7 @@
       ],
       [
         206,
-        "function_call<user@core::starknet::storage_access::StorageAccessContractAddress::read>"
+        "function_call<user@core::starknet::storage_access::StorageValueContractAddress::read>"
       ],
       [
         207,
@@ -3434,7 +3434,7 @@
       ],
       [
         39,
-        "core::starknet::storage_access::StorageAccessContractAddress::read"
+        "core::starknet::storage_access::StorageValueContractAddress::read"
       ],
       [
         40,
diff --git a/tests/bug_samples/issue3153.cairo b/tests/bug_samples/issue3153.cairo
index 734146ceccd..c9838e30ed3 100644
--- a/tests/bug_samples/issue3153.cairo
+++ b/tests/bug_samples/issue3153.cairo
@@ -1,5 +1,5 @@
 use starknet::{
-    StorageAccess, SyscallResult, StorageBaseAddress, storage_read_syscall, storage_write_syscall,
+    StorageValue, SyscallResult, StorageBaseAddress, storage_read_syscall, storage_write_syscall,
     storage_address_from_base_and_offset
 };
 use integer::{
@@ -52,13 +52,13 @@ fn unpack_proposal_fields(packed: felt252) -> (felt252, u64) {
     (proposer, last_updated_at)
 }
 
-impl ProposalStorageAccess of StorageAccess<Proposal> {
+impl ProposalStorageValue of StorageValue<Proposal> {
     fn read(address_domain: u32, base: StorageBaseAddress) -> SyscallResult<Proposal> {
-        ProposalStorageAccess::read_at_offset(address_domain, base, 0)
+        ProposalStorageValue::read_at_offset(address_domain, base, 0)
     }
 
     fn write(address_domain: u32, base: StorageBaseAddress, value: Proposal) -> SyscallResult<()> {
-        ProposalStorageAccess::write_at_offset(address_domain, base, 0, value)
+        ProposalStorageValue::write_at_offset(address_domain, base, 0, value)
     }
     fn read_at_offset(
         address_domain: u32, base: StorageBaseAddress, offset: u8
diff --git a/tests/bug_samples/issue3345.cairo b/tests/bug_samples/issue3345.cairo
index c1261cb59c5..1cdd344ee19 100644
--- a/tests/bug_samples/issue3345.cairo
+++ b/tests/bug_samples/issue3345.cairo
@@ -1,4 +1,4 @@
-#[derive(Copy, Drop, starknet::StorageAccess)]
+#[derive(Copy, Drop, starknet::StorageValue)]
 struct Node {
     left: u128,
     right: u128