diff --git a/crates/dojo-core/src/tests/world/resources.cairo b/crates/dojo-core/src/tests/world/resources.cairo
index 94702f02a7..f553085026 100644
--- a/crates/dojo-core/src/tests/world/resources.cairo
+++ b/crates/dojo-core/src/tests/world/resources.cairo
@@ -354,7 +354,7 @@ fn test_deploy_contract_for_namespace_owner() {
     let event = event.unwrap();
     assert(event.salt == 'salt1', 'bad event salt');
     assert(event.class_hash == class_hash, 'bad class_hash');
-    assert(event.name == dispatcher.contract_name(), 'bad contract name');
+    assert(event.name == dispatcher.name(), 'bad contract name');
     assert(event.namespace == dispatcher.namespace(), 'bad namespace');
     assert(
         event.address != core::num::traits::Zero::<ContractAddress>::zero(), 'bad contract address'
diff --git a/crates/dojo-core/src/world/world_contract.cairo b/crates/dojo-core/src/world/world_contract.cairo
index f2b151b64c..c9675a1b41 100644
--- a/crates/dojo-core/src/world/world_contract.cairo
+++ b/crates/dojo-core/src/world/world_contract.cairo
@@ -633,7 +633,7 @@ pub mod world {
 
             let dispatcher = IContractDispatcher { contract_address };
             let namespace = dispatcher.namespace();
-            let name = dispatcher.contract_name();
+            let name = dispatcher.name();
             let namespace_hash = dispatcher.namespace_hash();
 
             if !self.is_namespace_registered(namespace_hash) {
diff --git a/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/dojo-world.toml b/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/dojo-world.toml
index fcb2f0e910..4dfc391ebd 100644
--- a/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/dojo-world.toml
+++ b/crates/dojo-lang/src/manifest_test_data/compiler_cairo/manifests/dev/base/dojo-world.toml
@@ -1,6 +1,6 @@
 kind = "Class"
-class_hash = "0x5c4271c8cd454ceb8049d2b0724c99d12c2ef8077fc6ad325b18978f614aab0"
-original_class_hash = "0x5c4271c8cd454ceb8049d2b0724c99d12c2ef8077fc6ad325b18978f614aab0"
+class_hash = "0x6f38d5d9507c5d9546290e1a27e309efe5a9af3770b6cc1627db4a1b90a7dce"
+original_class_hash = "0x6f38d5d9507c5d9546290e1a27e309efe5a9af3770b6cc1627db4a1b90a7dce"
 abi = "manifests/dev/base/abis/dojo-world.json"
 tag = "dojo-world"
 manifest_name = "dojo-world"
diff --git a/crates/dojo-lang/src/plugin_test_data/system b/crates/dojo-lang/src/plugin_test_data/system
index 392a84efd9..2d53e0fb5d 100644
--- a/crates/dojo-lang/src/plugin_test_data/system
+++ b/crates/dojo-lang/src/plugin_test_data/system
@@ -661,7 +661,7 @@ impl StorageStorageBaseMutCopy of core::traits::Copy::<StorageStorageBaseMut>;
 
                     #[abi(embed_v0)]
                     pub impl ContractImpl of IContract<ContractState> {
-                        fn contract_name(self: @ContractState) -> ByteArray {
+                        fn name(self: @ContractState) -> ByteArray {
                             "bad_namespace_format"
                         }
 
@@ -921,7 +921,7 @@ pub fn unsafe_new_contract_state() -> ContractState {
 use starknet::storage::Map as LegacyMap;
 
 #[implicit_precedence(core::pedersen::Pedersen, core::RangeCheck, core::integer::Bitwise, core::ec::EcOp, core::poseidon::Poseidon, core::SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, core::gas::GasBuiltin, System)]
-fn __wrapper__ContractImpl__contract_name(mut data: Span::<felt252>) -> Span::<felt252> {
+fn __wrapper__ContractImpl__name(mut data: Span::<felt252>) -> Span::<felt252> {
     core::internal::require_implicit::<System>();
     core::internal::revoke_ap_tracking();
     core::option::OptionTraitImpl::expect(core::gas::withdraw_gas(), 'Out of gas');
@@ -931,7 +931,7 @@ fn __wrapper__ContractImpl__contract_name(mut data: Span::<felt252>) -> Span::<f
         core::gas::withdraw_gas_all(core::gas::get_builtin_costs()), 'Out of gas',
     );
     let mut contract_state = unsafe_new_contract_state();
-    let res = ContractImpl::contract_name(@contract_state, );
+    let res = ContractImpl::name(@contract_state, );
     let mut arr = ArrayTrait::new();
     // References.
     // Result.
@@ -1079,7 +1079,7 @@ fn __wrapper__IDojoInitImpl__dojo_init(mut data: Span::<felt252>) -> Span::<felt
 
 
 pub mod __external {
-    pub use super::__wrapper__ContractImpl__contract_name as contract_name;
+    pub use super::__wrapper__ContractImpl__name as name;
     pub use super::__wrapper__ContractImpl__namespace as namespace;
     pub use super::__wrapper__ContractImpl__tag as tag;
     pub use super::__wrapper__ContractImpl__name_hash as name_hash;
@@ -1486,7 +1486,7 @@ impl IDojoInitSafeDispatcherSubPointersMutCopy of core::traits::Copy::<IDojoInit
 
                     #[abi(embed_v0)]
                     pub impl ContractImpl of IContract<ContractState> {
-                        fn contract_name(self: @ContractState) -> ByteArray {
+                        fn name(self: @ContractState) -> ByteArray {
                             "spawn"
                         }
 
@@ -1746,7 +1746,7 @@ pub fn unsafe_new_contract_state() -> ContractState {
 use starknet::storage::Map as LegacyMap;
 
 #[implicit_precedence(core::pedersen::Pedersen, core::RangeCheck, core::integer::Bitwise, core::ec::EcOp, core::poseidon::Poseidon, core::SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, core::gas::GasBuiltin, System)]
-fn __wrapper__ContractImpl__contract_name(mut data: Span::<felt252>) -> Span::<felt252> {
+fn __wrapper__ContractImpl__name(mut data: Span::<felt252>) -> Span::<felt252> {
     core::internal::require_implicit::<System>();
     core::internal::revoke_ap_tracking();
     core::option::OptionTraitImpl::expect(core::gas::withdraw_gas(), 'Out of gas');
@@ -1756,7 +1756,7 @@ fn __wrapper__ContractImpl__contract_name(mut data: Span::<felt252>) -> Span::<f
         core::gas::withdraw_gas_all(core::gas::get_builtin_costs()), 'Out of gas',
     );
     let mut contract_state = unsafe_new_contract_state();
-    let res = ContractImpl::contract_name(@contract_state, );
+    let res = ContractImpl::name(@contract_state, );
     let mut arr = ArrayTrait::new();
     // References.
     // Result.
@@ -1904,7 +1904,7 @@ fn __wrapper__IDojoInitImpl__dojo_init(mut data: Span::<felt252>) -> Span::<felt
 
 
 pub mod __external {
-    pub use super::__wrapper__ContractImpl__contract_name as contract_name;
+    pub use super::__wrapper__ContractImpl__name as name;
     pub use super::__wrapper__ContractImpl__namespace as namespace;
     pub use super::__wrapper__ContractImpl__tag as tag;
     pub use super::__wrapper__ContractImpl__name_hash as name_hash;
@@ -2311,7 +2311,7 @@ impl IDojoInitSafeDispatcherSubPointersMutCopy of core::traits::Copy::<IDojoInit
 
                     #[abi(embed_v0)]
                     pub impl ContractImpl of IContract<ContractState> {
-                        fn contract_name(self: @ContractState) -> ByteArray {
+                        fn name(self: @ContractState) -> ByteArray {
                             "proxy"
                         }
 
@@ -2568,7 +2568,7 @@ pub fn unsafe_new_contract_state() -> ContractState {
 use starknet::storage::Map as LegacyMap;
 
 #[implicit_precedence(core::pedersen::Pedersen, core::RangeCheck, core::integer::Bitwise, core::ec::EcOp, core::poseidon::Poseidon, core::SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, core::gas::GasBuiltin, System)]
-fn __wrapper__ContractImpl__contract_name(mut data: Span::<felt252>) -> Span::<felt252> {
+fn __wrapper__ContractImpl__name(mut data: Span::<felt252>) -> Span::<felt252> {
     core::internal::require_implicit::<System>();
     core::internal::revoke_ap_tracking();
     core::option::OptionTraitImpl::expect(core::gas::withdraw_gas(), 'Out of gas');
@@ -2578,7 +2578,7 @@ fn __wrapper__ContractImpl__contract_name(mut data: Span::<felt252>) -> Span::<f
         core::gas::withdraw_gas_all(core::gas::get_builtin_costs()), 'Out of gas',
     );
     let mut contract_state = unsafe_new_contract_state();
-    let res = ContractImpl::contract_name(@contract_state, );
+    let res = ContractImpl::name(@contract_state, );
     let mut arr = ArrayTrait::new();
     // References.
     // Result.
@@ -2726,7 +2726,7 @@ fn __wrapper__IDojoInitImpl__dojo_init(mut data: Span::<felt252>) -> Span::<felt
 
 
 pub mod __external {
-    pub use super::__wrapper__ContractImpl__contract_name as contract_name;
+    pub use super::__wrapper__ContractImpl__name as name;
     pub use super::__wrapper__ContractImpl__namespace as namespace;
     pub use super::__wrapper__ContractImpl__tag as tag;
     pub use super::__wrapper__ContractImpl__name_hash as name_hash;
@@ -3133,7 +3133,7 @@ impl IDojoInitSafeDispatcherSubPointersMutCopy of core::traits::Copy::<IDojoInit
 
                     #[abi(embed_v0)]
                     pub impl ContractImpl of IContract<ContractState> {
-                        fn contract_name(self: @ContractState) -> ByteArray {
+                        fn name(self: @ContractState) -> ByteArray {
                             "ctxnamed"
                         }
 
@@ -3393,7 +3393,7 @@ pub fn unsafe_new_contract_state() -> ContractState {
 use starknet::storage::Map as LegacyMap;
 
 #[implicit_precedence(core::pedersen::Pedersen, core::RangeCheck, core::integer::Bitwise, core::ec::EcOp, core::poseidon::Poseidon, core::SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, core::gas::GasBuiltin, System)]
-fn __wrapper__ContractImpl__contract_name(mut data: Span::<felt252>) -> Span::<felt252> {
+fn __wrapper__ContractImpl__name(mut data: Span::<felt252>) -> Span::<felt252> {
     core::internal::require_implicit::<System>();
     core::internal::revoke_ap_tracking();
     core::option::OptionTraitImpl::expect(core::gas::withdraw_gas(), 'Out of gas');
@@ -3403,7 +3403,7 @@ fn __wrapper__ContractImpl__contract_name(mut data: Span::<felt252>) -> Span::<f
         core::gas::withdraw_gas_all(core::gas::get_builtin_costs()), 'Out of gas',
     );
     let mut contract_state = unsafe_new_contract_state();
-    let res = ContractImpl::contract_name(@contract_state, );
+    let res = ContractImpl::name(@contract_state, );
     let mut arr = ArrayTrait::new();
     // References.
     // Result.
@@ -3551,7 +3551,7 @@ fn __wrapper__IDojoInitImpl__dojo_init(mut data: Span::<felt252>) -> Span::<felt
 
 
 pub mod __external {
-    pub use super::__wrapper__ContractImpl__contract_name as contract_name;
+    pub use super::__wrapper__ContractImpl__name as name;
     pub use super::__wrapper__ContractImpl__namespace as namespace;
     pub use super::__wrapper__ContractImpl__tag as tag;
     pub use super::__wrapper__ContractImpl__name_hash as name_hash;
@@ -3958,7 +3958,7 @@ impl IDojoInitSafeDispatcherSubPointersMutCopy of core::traits::Copy::<IDojoInit
 
                     #[abi(embed_v0)]
                     pub impl ContractImpl of IContract<ContractState> {
-                        fn contract_name(self: @ContractState) -> ByteArray {
+                        fn name(self: @ContractState) -> ByteArray {
                             "withevent"
                         }
 
@@ -4251,7 +4251,7 @@ pub fn unsafe_new_contract_state() -> ContractState {
 use starknet::storage::Map as LegacyMap;
 
 #[implicit_precedence(core::pedersen::Pedersen, core::RangeCheck, core::integer::Bitwise, core::ec::EcOp, core::poseidon::Poseidon, core::SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, core::gas::GasBuiltin, System)]
-fn __wrapper__ContractImpl__contract_name(mut data: Span::<felt252>) -> Span::<felt252> {
+fn __wrapper__ContractImpl__name(mut data: Span::<felt252>) -> Span::<felt252> {
     core::internal::require_implicit::<System>();
     core::internal::revoke_ap_tracking();
     core::option::OptionTraitImpl::expect(core::gas::withdraw_gas(), 'Out of gas');
@@ -4261,7 +4261,7 @@ fn __wrapper__ContractImpl__contract_name(mut data: Span::<felt252>) -> Span::<f
         core::gas::withdraw_gas_all(core::gas::get_builtin_costs()), 'Out of gas',
     );
     let mut contract_state = unsafe_new_contract_state();
-    let res = ContractImpl::contract_name(@contract_state, );
+    let res = ContractImpl::name(@contract_state, );
     let mut arr = ArrayTrait::new();
     // References.
     // Result.
@@ -4409,7 +4409,7 @@ fn __wrapper__IDojoInitImpl__dojo_init(mut data: Span::<felt252>) -> Span::<felt
 
 
 pub mod __external {
-    pub use super::__wrapper__ContractImpl__contract_name as contract_name;
+    pub use super::__wrapper__ContractImpl__name as name;
     pub use super::__wrapper__ContractImpl__namespace as namespace;
     pub use super::__wrapper__ContractImpl__tag as tag;
     pub use super::__wrapper__ContractImpl__name_hash as name_hash;
@@ -4816,7 +4816,7 @@ impl IDojoInitSafeDispatcherSubPointersMutCopy of core::traits::Copy::<IDojoInit
 
                     #[abi(embed_v0)]
                     pub impl ContractImpl of IContract<ContractState> {
-                        fn contract_name(self: @ContractState) -> ByteArray {
+                        fn name(self: @ContractState) -> ByteArray {
                             "withcomponent"
                         }
 
@@ -4971,7 +4971,7 @@ pub fn unsafe_new_contract_state() -> ContractState {
 use starknet::storage::Map as LegacyMap;
 
 #[implicit_precedence(core::pedersen::Pedersen, core::RangeCheck, core::integer::Bitwise, core::ec::EcOp, core::poseidon::Poseidon, core::SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, core::gas::GasBuiltin, System)]
-fn __wrapper__ContractImpl__contract_name(mut data: Span::<felt252>) -> Span::<felt252> {
+fn __wrapper__ContractImpl__name(mut data: Span::<felt252>) -> Span::<felt252> {
     core::internal::require_implicit::<System>();
     core::internal::revoke_ap_tracking();
     core::option::OptionTraitImpl::expect(core::gas::withdraw_gas(), 'Out of gas');
@@ -4981,7 +4981,7 @@ fn __wrapper__ContractImpl__contract_name(mut data: Span::<felt252>) -> Span::<f
         core::gas::withdraw_gas_all(core::gas::get_builtin_costs()), 'Out of gas',
     );
     let mut contract_state = unsafe_new_contract_state();
-    let res = ContractImpl::contract_name(@contract_state, );
+    let res = ContractImpl::name(@contract_state, );
     let mut arr = ArrayTrait::new();
     // References.
     // Result.
@@ -5129,7 +5129,7 @@ fn __wrapper__IDojoInitImpl__dojo_init(mut data: Span::<felt252>) -> Span::<felt
 
 
 pub mod __external {
-    pub use super::__wrapper__ContractImpl__contract_name as contract_name;
+    pub use super::__wrapper__ContractImpl__name as name;
     pub use super::__wrapper__ContractImpl__namespace as namespace;
     pub use super::__wrapper__ContractImpl__tag as tag;
     pub use super::__wrapper__ContractImpl__name_hash as name_hash;
@@ -5752,7 +5752,7 @@ impl IDojoInitSafeDispatcherSubPointersMutCopy of core::traits::Copy::<IDojoInit
 
                     #[abi(embed_v0)]
                     pub impl ContractImpl of IContract<ContractState> {
-                        fn contract_name(self: @ContractState) -> ByteArray {
+                        fn name(self: @ContractState) -> ByteArray {
                             "MyFaultyContract"
                         }
 
@@ -6021,7 +6021,7 @@ pub fn unsafe_new_contract_state() -> ContractState {
 use starknet::storage::Map as LegacyMap;
 
 #[implicit_precedence(core::pedersen::Pedersen, core::RangeCheck, core::integer::Bitwise, core::ec::EcOp, core::poseidon::Poseidon, core::SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, core::gas::GasBuiltin, System)]
-fn __wrapper__ContractImpl__contract_name(mut data: Span::<felt252>) -> Span::<felt252> {
+fn __wrapper__ContractImpl__name(mut data: Span::<felt252>) -> Span::<felt252> {
     core::internal::require_implicit::<System>();
     core::internal::revoke_ap_tracking();
     core::option::OptionTraitImpl::expect(core::gas::withdraw_gas(), 'Out of gas');
@@ -6031,7 +6031,7 @@ fn __wrapper__ContractImpl__contract_name(mut data: Span::<felt252>) -> Span::<f
         core::gas::withdraw_gas_all(core::gas::get_builtin_costs()), 'Out of gas',
     );
     let mut contract_state = unsafe_new_contract_state();
-    let res = ContractImpl::contract_name(@contract_state, );
+    let res = ContractImpl::name(@contract_state, );
     let mut arr = ArrayTrait::new();
     // References.
     // Result.
@@ -6333,7 +6333,7 @@ fn __wrapper__IDojoInitImpl__dojo_init(mut data: Span::<felt252>) -> Span::<felt
 
 
 pub mod __external {
-    pub use super::__wrapper__ContractImpl__contract_name as contract_name;
+    pub use super::__wrapper__ContractImpl__name as name;
     pub use super::__wrapper__ContractImpl__namespace as namespace;
     pub use super::__wrapper__ContractImpl__tag as tag;
     pub use super::__wrapper__ContractImpl__name_hash as name_hash;
@@ -6747,7 +6747,7 @@ impl IDojoInitSafeDispatcherSubPointersMutCopy of core::traits::Copy::<IDojoInit
 
                     #[abi(embed_v0)]
                     pub impl ContractImpl of IContract<ContractState> {
-                        fn contract_name(self: @ContractState) -> ByteArray {
+                        fn name(self: @ContractState) -> ByteArray {
                             "MyNominalContract"
                         }
 
@@ -7027,7 +7027,7 @@ pub fn unsafe_new_contract_state() -> ContractState {
 use starknet::storage::Map as LegacyMap;
 
 #[implicit_precedence(core::pedersen::Pedersen, core::RangeCheck, core::integer::Bitwise, core::ec::EcOp, core::poseidon::Poseidon, core::SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, core::gas::GasBuiltin, System)]
-fn __wrapper__ContractImpl__contract_name(mut data: Span::<felt252>) -> Span::<felt252> {
+fn __wrapper__ContractImpl__name(mut data: Span::<felt252>) -> Span::<felt252> {
     core::internal::require_implicit::<System>();
     core::internal::revoke_ap_tracking();
     core::option::OptionTraitImpl::expect(core::gas::withdraw_gas(), 'Out of gas');
@@ -7037,7 +7037,7 @@ fn __wrapper__ContractImpl__contract_name(mut data: Span::<felt252>) -> Span::<f
         core::gas::withdraw_gas_all(core::gas::get_builtin_costs()), 'Out of gas',
     );
     let mut contract_state = unsafe_new_contract_state();
-    let res = ContractImpl::contract_name(@contract_state, );
+    let res = ContractImpl::name(@contract_state, );
     let mut arr = ArrayTrait::new();
     // References.
     // Result.
@@ -7350,7 +7350,7 @@ fn __wrapper__IDojoInitImpl__dojo_init(mut data: Span::<felt252>) -> Span::<felt
 
 
 pub mod __external {
-    pub use super::__wrapper__ContractImpl__contract_name as contract_name;
+    pub use super::__wrapper__ContractImpl__name as name;
     pub use super::__wrapper__ContractImpl__namespace as namespace;
     pub use super::__wrapper__ContractImpl__tag as tag;
     pub use super::__wrapper__ContractImpl__name_hash as name_hash;
@@ -7765,7 +7765,7 @@ impl IDojoInitSafeDispatcherSubPointersMutCopy of core::traits::Copy::<IDojoInit
 
                     #[abi(embed_v0)]
                     pub impl ContractImpl of IContract<ContractState> {
-                        fn contract_name(self: @ContractState) -> ByteArray {
+                        fn name(self: @ContractState) -> ByteArray {
                             "init_test"
                         }
 
@@ -8039,7 +8039,7 @@ pub fn unsafe_new_contract_state() -> ContractState {
 use starknet::storage::Map as LegacyMap;
 
 #[implicit_precedence(core::pedersen::Pedersen, core::RangeCheck, core::integer::Bitwise, core::ec::EcOp, core::poseidon::Poseidon, core::SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, core::gas::GasBuiltin, System)]
-fn __wrapper__ContractImpl__contract_name(mut data: Span::<felt252>) -> Span::<felt252> {
+fn __wrapper__ContractImpl__name(mut data: Span::<felt252>) -> Span::<felt252> {
     core::internal::require_implicit::<System>();
     core::internal::revoke_ap_tracking();
     core::option::OptionTraitImpl::expect(core::gas::withdraw_gas(), 'Out of gas');
@@ -8049,7 +8049,7 @@ fn __wrapper__ContractImpl__contract_name(mut data: Span::<felt252>) -> Span::<f
         core::gas::withdraw_gas_all(core::gas::get_builtin_costs()), 'Out of gas',
     );
     let mut contract_state = unsafe_new_contract_state();
-    let res = ContractImpl::contract_name(@contract_state, );
+    let res = ContractImpl::name(@contract_state, );
     let mut arr = ArrayTrait::new();
     // References.
     // Result.
@@ -8208,7 +8208,7 @@ fn __wrapper__IDojoInitImpl__dojo_init(mut data: Span::<felt252>) -> Span::<felt
 
 
 pub mod __external {
-    pub use super::__wrapper__ContractImpl__contract_name as contract_name;
+    pub use super::__wrapper__ContractImpl__name as name;
     pub use super::__wrapper__ContractImpl__namespace as namespace;
     pub use super::__wrapper__ContractImpl__tag as tag;
     pub use super::__wrapper__ContractImpl__name_hash as name_hash;
@@ -8615,7 +8615,7 @@ impl IDojoInitSafeDispatcherSubPointersMutCopy of core::traits::Copy::<IDojoInit
 
                     #[abi(embed_v0)]
                     pub impl ContractImpl of IContract<ContractState> {
-                        fn contract_name(self: @ContractState) -> ByteArray {
+                        fn name(self: @ContractState) -> ByteArray {
                             "no_init_test"
                         }
 
@@ -8869,7 +8869,7 @@ pub fn unsafe_new_contract_state() -> ContractState {
 use starknet::storage::Map as LegacyMap;
 
 #[implicit_precedence(core::pedersen::Pedersen, core::RangeCheck, core::integer::Bitwise, core::ec::EcOp, core::poseidon::Poseidon, core::SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, core::gas::GasBuiltin, System)]
-fn __wrapper__ContractImpl__contract_name(mut data: Span::<felt252>) -> Span::<felt252> {
+fn __wrapper__ContractImpl__name(mut data: Span::<felt252>) -> Span::<felt252> {
     core::internal::require_implicit::<System>();
     core::internal::revoke_ap_tracking();
     core::option::OptionTraitImpl::expect(core::gas::withdraw_gas(), 'Out of gas');
@@ -8879,7 +8879,7 @@ fn __wrapper__ContractImpl__contract_name(mut data: Span::<felt252>) -> Span::<f
         core::gas::withdraw_gas_all(core::gas::get_builtin_costs()), 'Out of gas',
     );
     let mut contract_state = unsafe_new_contract_state();
-    let res = ContractImpl::contract_name(@contract_state, );
+    let res = ContractImpl::name(@contract_state, );
     let mut arr = ArrayTrait::new();
     // References.
     // Result.
@@ -9027,7 +9027,7 @@ fn __wrapper__IDojoInitImpl__dojo_init(mut data: Span::<felt252>) -> Span::<felt
 
 
 pub mod __external {
-    pub use super::__wrapper__ContractImpl__contract_name as contract_name;
+    pub use super::__wrapper__ContractImpl__name as name;
     pub use super::__wrapper__ContractImpl__namespace as namespace;
     pub use super::__wrapper__ContractImpl__tag as tag;
     pub use super::__wrapper__ContractImpl__name_hash as name_hash;
diff --git a/crates/sozo/ops/src/tests/model.rs b/crates/sozo/ops/src/tests/model.rs
index 0b420d8bad..015da45829 100644
--- a/crates/sozo/ops/src/tests/model.rs
+++ b/crates/sozo/ops/src/tests/model.rs
@@ -54,7 +54,7 @@ async fn test_model_ops(sequencer: &RunnerCtx) {
         )
         .await
         .unwrap(),
-        Felt::from_hex("0x237386e1b35190b45c7d0aa29b3957d84ba2d4d22c2c10f7511b3abf0d7bd73")
+        Felt::from_hex("0x60d4450c23606e0e9bdd4f1b146ef50e5bc4dde5034946b54c3012bae1add02")
             .unwrap()
     );
 
diff --git a/examples/spawn-and-move/dojo_dev.toml b/examples/spawn-and-move/dojo_dev.toml
index a132488bf0..d87d819044 100644
--- a/examples/spawn-and-move/dojo_dev.toml
+++ b/examples/spawn-and-move/dojo_dev.toml
@@ -14,4 +14,4 @@ rpc_url = "http://localhost:5050/"
 # Default account for katana with seed = 0
 account_address = "0x6162896d1d7ab204c7ccac6dd5f8e9e7c25ecd5ae4fcb4ad32e57786bb46e03"
 private_key = "0x1800000000300000180000000000030000000000003006001800006600"
-world_address = "0x15b584f1132fe386a0aa7a447e7073233a545ac4b84b361ed797edaa8f0f14"
+world_address = "0x46c1fd10836a8426197bf412fc5f26ea10f11a8d5c61474407f03f82c096593"
diff --git a/examples/spawn-and-move/manifests/dev/base/abis/contracts/dojo_examples-actions-40b6994c.json b/examples/spawn-and-move/manifests/dev/base/abis/contracts/dojo_examples-actions-40b6994c.json
index fdba39296f..ce8ce13c25 100644
--- a/examples/spawn-and-move/manifests/dev/base/abis/contracts/dojo_examples-actions-40b6994c.json
+++ b/examples/spawn-and-move/manifests/dev/base/abis/contracts/dojo_examples-actions-40b6994c.json
@@ -28,7 +28,7 @@
     "items": [
       {
         "type": "function",
-        "name": "contract_name",
+        "name": "name",
         "inputs": [],
         "outputs": [
           {
diff --git a/examples/spawn-and-move/manifests/dev/base/abis/contracts/dojo_examples-dungeon-6620e0e6.json b/examples/spawn-and-move/manifests/dev/base/abis/contracts/dojo_examples-dungeon-6620e0e6.json
index 91fe2a95d0..753438f06f 100644
--- a/examples/spawn-and-move/manifests/dev/base/abis/contracts/dojo_examples-dungeon-6620e0e6.json
+++ b/examples/spawn-and-move/manifests/dev/base/abis/contracts/dojo_examples-dungeon-6620e0e6.json
@@ -28,7 +28,7 @@
     "items": [
       {
         "type": "function",
-        "name": "contract_name",
+        "name": "name",
         "inputs": [],
         "outputs": [
           {
diff --git a/examples/spawn-and-move/manifests/dev/base/abis/contracts/dojo_examples-mock_token-31599eb2.json b/examples/spawn-and-move/manifests/dev/base/abis/contracts/dojo_examples-mock_token-31599eb2.json
index 278cbb1cc0..c72fe81e69 100644
--- a/examples/spawn-and-move/manifests/dev/base/abis/contracts/dojo_examples-mock_token-31599eb2.json
+++ b/examples/spawn-and-move/manifests/dev/base/abis/contracts/dojo_examples-mock_token-31599eb2.json
@@ -28,7 +28,7 @@
     "items": [
       {
         "type": "function",
-        "name": "contract_name",
+        "name": "name",
         "inputs": [],
         "outputs": [
           {
diff --git a/examples/spawn-and-move/manifests/dev/base/abis/contracts/dojo_examples-others-61de2c18.json b/examples/spawn-and-move/manifests/dev/base/abis/contracts/dojo_examples-others-61de2c18.json
index 86d2a176ff..b8cbcf6f22 100644
--- a/examples/spawn-and-move/manifests/dev/base/abis/contracts/dojo_examples-others-61de2c18.json
+++ b/examples/spawn-and-move/manifests/dev/base/abis/contracts/dojo_examples-others-61de2c18.json
@@ -28,7 +28,7 @@
     "items": [
       {
         "type": "function",
-        "name": "contract_name",
+        "name": "name",
         "inputs": [],
         "outputs": [
           {
diff --git a/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples-actions-40b6994c.toml b/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples-actions-40b6994c.toml
index 0ae312f5c4..6fbfd7f944 100644
--- a/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples-actions-40b6994c.toml
+++ b/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples-actions-40b6994c.toml
@@ -1,6 +1,6 @@
 kind = "DojoContract"
-class_hash = "0x67a20ea91a4b9bb9cdb46cefc41dd6ca4c07c22d4d413205720963944fd817d"
-original_class_hash = "0x67a20ea91a4b9bb9cdb46cefc41dd6ca4c07c22d4d413205720963944fd817d"
+class_hash = "0x2aaecb3ded9ebb721f13780007e9704cba0d96b48195f357a35f4969d1b1941"
+original_class_hash = "0x2aaecb3ded9ebb721f13780007e9704cba0d96b48195f357a35f4969d1b1941"
 base_class_hash = "0x0"
 abi = "manifests/dev/base/abis/contracts/dojo_examples-actions-40b6994c.json"
 reads = []
diff --git a/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples-dungeon-6620e0e6.toml b/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples-dungeon-6620e0e6.toml
index 75d087c886..cf60c05c33 100644
--- a/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples-dungeon-6620e0e6.toml
+++ b/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples-dungeon-6620e0e6.toml
@@ -1,6 +1,6 @@
 kind = "DojoContract"
-class_hash = "0x4590a27e4ec7366358ba5f60323777f301435ebbdd113ab02c54b947717530d"
-original_class_hash = "0x4590a27e4ec7366358ba5f60323777f301435ebbdd113ab02c54b947717530d"
+class_hash = "0x117e4d75bef86d66e413d13f30904d2c93798f513ffa0bf83b4fac3fdfc4a62"
+original_class_hash = "0x117e4d75bef86d66e413d13f30904d2c93798f513ffa0bf83b4fac3fdfc4a62"
 base_class_hash = "0x0"
 abi = "manifests/dev/base/abis/contracts/dojo_examples-dungeon-6620e0e6.json"
 reads = []
diff --git a/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples-mock_token-31599eb2.toml b/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples-mock_token-31599eb2.toml
index 6385a30c6c..1f108c745f 100644
--- a/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples-mock_token-31599eb2.toml
+++ b/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples-mock_token-31599eb2.toml
@@ -1,6 +1,6 @@
 kind = "DojoContract"
-class_hash = "0x67edb33671cd2f5b766d073e3dec53b03400761a20f349ea9628cf4c883b393"
-original_class_hash = "0x67edb33671cd2f5b766d073e3dec53b03400761a20f349ea9628cf4c883b393"
+class_hash = "0x3ad65950996d7b0bc6c04a94d401cdb19bda3ab2cffc2098d90e25077dfa11a"
+original_class_hash = "0x3ad65950996d7b0bc6c04a94d401cdb19bda3ab2cffc2098d90e25077dfa11a"
 base_class_hash = "0x0"
 abi = "manifests/dev/base/abis/contracts/dojo_examples-mock_token-31599eb2.json"
 reads = []
diff --git a/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples-others-61de2c18.toml b/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples-others-61de2c18.toml
index 5a43d3fad8..910cd889a8 100644
--- a/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples-others-61de2c18.toml
+++ b/examples/spawn-and-move/manifests/dev/base/contracts/dojo_examples-others-61de2c18.toml
@@ -1,6 +1,6 @@
 kind = "DojoContract"
-class_hash = "0x40e824b8814bafef18cce2cf68f5765e9c9a1c86f55a8491b0c2a4faebdcc87"
-original_class_hash = "0x40e824b8814bafef18cce2cf68f5765e9c9a1c86f55a8491b0c2a4faebdcc87"
+class_hash = "0x2331b72955719869459bdacf66061a55975d6c2bc379349b082ee9d9a350a18"
+original_class_hash = "0x2331b72955719869459bdacf66061a55975d6c2bc379349b082ee9d9a350a18"
 base_class_hash = "0x0"
 abi = "manifests/dev/base/abis/contracts/dojo_examples-others-61de2c18.json"
 reads = []
diff --git a/examples/spawn-and-move/manifests/dev/base/dojo-world.toml b/examples/spawn-and-move/manifests/dev/base/dojo-world.toml
index fcb2f0e910..4dfc391ebd 100644
--- a/examples/spawn-and-move/manifests/dev/base/dojo-world.toml
+++ b/examples/spawn-and-move/manifests/dev/base/dojo-world.toml
@@ -1,6 +1,6 @@
 kind = "Class"
-class_hash = "0x5c4271c8cd454ceb8049d2b0724c99d12c2ef8077fc6ad325b18978f614aab0"
-original_class_hash = "0x5c4271c8cd454ceb8049d2b0724c99d12c2ef8077fc6ad325b18978f614aab0"
+class_hash = "0x6f38d5d9507c5d9546290e1a27e309efe5a9af3770b6cc1627db4a1b90a7dce"
+original_class_hash = "0x6f38d5d9507c5d9546290e1a27e309efe5a9af3770b6cc1627db4a1b90a7dce"
 abi = "manifests/dev/base/abis/dojo-world.json"
 tag = "dojo-world"
 manifest_name = "dojo-world"
diff --git a/examples/spawn-and-move/manifests/dev/deployment/abis/contracts/dojo_examples-actions-40b6994c.json b/examples/spawn-and-move/manifests/dev/deployment/abis/contracts/dojo_examples-actions-40b6994c.json
index fdba39296f..ce8ce13c25 100644
--- a/examples/spawn-and-move/manifests/dev/deployment/abis/contracts/dojo_examples-actions-40b6994c.json
+++ b/examples/spawn-and-move/manifests/dev/deployment/abis/contracts/dojo_examples-actions-40b6994c.json
@@ -28,7 +28,7 @@
     "items": [
       {
         "type": "function",
-        "name": "contract_name",
+        "name": "name",
         "inputs": [],
         "outputs": [
           {
diff --git a/examples/spawn-and-move/manifests/dev/deployment/abis/contracts/dojo_examples-dungeon-6620e0e6.json b/examples/spawn-and-move/manifests/dev/deployment/abis/contracts/dojo_examples-dungeon-6620e0e6.json
index 91fe2a95d0..753438f06f 100644
--- a/examples/spawn-and-move/manifests/dev/deployment/abis/contracts/dojo_examples-dungeon-6620e0e6.json
+++ b/examples/spawn-and-move/manifests/dev/deployment/abis/contracts/dojo_examples-dungeon-6620e0e6.json
@@ -28,7 +28,7 @@
     "items": [
       {
         "type": "function",
-        "name": "contract_name",
+        "name": "name",
         "inputs": [],
         "outputs": [
           {
diff --git a/examples/spawn-and-move/manifests/dev/deployment/abis/contracts/dojo_examples-mock_token-31599eb2.json b/examples/spawn-and-move/manifests/dev/deployment/abis/contracts/dojo_examples-mock_token-31599eb2.json
index 278cbb1cc0..c72fe81e69 100644
--- a/examples/spawn-and-move/manifests/dev/deployment/abis/contracts/dojo_examples-mock_token-31599eb2.json
+++ b/examples/spawn-and-move/manifests/dev/deployment/abis/contracts/dojo_examples-mock_token-31599eb2.json
@@ -28,7 +28,7 @@
     "items": [
       {
         "type": "function",
-        "name": "contract_name",
+        "name": "name",
         "inputs": [],
         "outputs": [
           {
diff --git a/examples/spawn-and-move/manifests/dev/deployment/abis/contracts/dojo_examples-others-61de2c18.json b/examples/spawn-and-move/manifests/dev/deployment/abis/contracts/dojo_examples-others-61de2c18.json
index 86d2a176ff..b8cbcf6f22 100644
--- a/examples/spawn-and-move/manifests/dev/deployment/abis/contracts/dojo_examples-others-61de2c18.json
+++ b/examples/spawn-and-move/manifests/dev/deployment/abis/contracts/dojo_examples-others-61de2c18.json
@@ -28,7 +28,7 @@
     "items": [
       {
         "type": "function",
-        "name": "contract_name",
+        "name": "name",
         "inputs": [],
         "outputs": [
           {
diff --git a/examples/spawn-and-move/manifests/dev/deployment/manifest.json b/examples/spawn-and-move/manifests/dev/deployment/manifest.json
index 8665507c3f..c3d4991c46 100644
--- a/examples/spawn-and-move/manifests/dev/deployment/manifest.json
+++ b/examples/spawn-and-move/manifests/dev/deployment/manifest.json
@@ -1,8 +1,8 @@
 {
   "world": {
     "kind": "WorldContract",
-    "class_hash": "0x5c4271c8cd454ceb8049d2b0724c99d12c2ef8077fc6ad325b18978f614aab0",
-    "original_class_hash": "0x5c4271c8cd454ceb8049d2b0724c99d12c2ef8077fc6ad325b18978f614aab0",
+    "class_hash": "0x6f38d5d9507c5d9546290e1a27e309efe5a9af3770b6cc1627db4a1b90a7dce",
+    "original_class_hash": "0x6f38d5d9507c5d9546290e1a27e309efe5a9af3770b6cc1627db4a1b90a7dce",
     "abi": [
       {
         "type": "impl",
@@ -1234,8 +1234,8 @@
         ]
       }
     ],
-    "address": "0x15b584f1132fe386a0aa7a447e7073233a545ac4b84b361ed797edaa8f0f14",
-    "transaction_hash": "0x715b5d1bde9766b6db3f8b903a0626343c553a91e199f96d721644d121e676b",
+    "address": "0x46c1fd10836a8426197bf412fc5f26ea10f11a8d5c61474407f03f82c096593",
+    "transaction_hash": "0x7f540b040b1638b76a7f2a8fc13a33050d1c0556a63814f319a01d022b172cf",
     "block_number": 3,
     "seed": "dojo_examples",
     "metadata": {
@@ -1255,9 +1255,9 @@
   "contracts": [
     {
       "kind": "DojoContract",
-      "address": "0x54de18a0d4dcd51213c3375061fd5cd5a30dbefdb50c9718ae9a8004162abbd",
-      "class_hash": "0x67a20ea91a4b9bb9cdb46cefc41dd6ca4c07c22d4d413205720963944fd817d",
-      "original_class_hash": "0x67a20ea91a4b9bb9cdb46cefc41dd6ca4c07c22d4d413205720963944fd817d",
+      "address": "0x7fed9d6acaa45011152ea992784d41df3ae74eedbc199feb91b3fcbdb78abad",
+      "class_hash": "0x2aaecb3ded9ebb721f13780007e9704cba0d96b48195f357a35f4969d1b1941",
+      "original_class_hash": "0x2aaecb3ded9ebb721f13780007e9704cba0d96b48195f357a35f4969d1b1941",
       "base_class_hash": "0x2427dd10a58850ac9a5ca6ce04b7771b05330fd18f2e481831ad903b969e6b2",
       "abi": [
         {
@@ -1289,7 +1289,7 @@
           "items": [
             {
               "type": "function",
-              "name": "contract_name",
+              "name": "name",
               "inputs": [],
               "outputs": [
                 {
@@ -1686,9 +1686,9 @@
     },
     {
       "kind": "DojoContract",
-      "address": "0x3af2ea94daa59a22d5b979004019de544dbf92a2e4ff5f4869abb7ded9ca669",
-      "class_hash": "0x4590a27e4ec7366358ba5f60323777f301435ebbdd113ab02c54b947717530d",
-      "original_class_hash": "0x4590a27e4ec7366358ba5f60323777f301435ebbdd113ab02c54b947717530d",
+      "address": "0x47dcd4e30618d32fd27951e977df1d819d6edff2506e52c653f658134062036",
+      "class_hash": "0x117e4d75bef86d66e413d13f30904d2c93798f513ffa0bf83b4fac3fdfc4a62",
+      "original_class_hash": "0x117e4d75bef86d66e413d13f30904d2c93798f513ffa0bf83b4fac3fdfc4a62",
       "base_class_hash": "0x2427dd10a58850ac9a5ca6ce04b7771b05330fd18f2e481831ad903b969e6b2",
       "abi": [
         {
@@ -1720,7 +1720,7 @@
           "items": [
             {
               "type": "function",
-              "name": "contract_name",
+              "name": "name",
               "inputs": [],
               "outputs": [
                 {
@@ -1925,9 +1925,9 @@
     },
     {
       "kind": "DojoContract",
-      "address": "0x7ba7852396ce1e20e332e6ad1af1a978c866d61d8ad3d2d58f618dac027c8e1",
-      "class_hash": "0x67edb33671cd2f5b766d073e3dec53b03400761a20f349ea9628cf4c883b393",
-      "original_class_hash": "0x67edb33671cd2f5b766d073e3dec53b03400761a20f349ea9628cf4c883b393",
+      "address": "0x71c327d19b2d0c6a0f65cced59f60fe69776af6885e8f42d8f6775af00f5d5b",
+      "class_hash": "0x3ad65950996d7b0bc6c04a94d401cdb19bda3ab2cffc2098d90e25077dfa11a",
+      "original_class_hash": "0x3ad65950996d7b0bc6c04a94d401cdb19bda3ab2cffc2098d90e25077dfa11a",
       "base_class_hash": "0x2427dd10a58850ac9a5ca6ce04b7771b05330fd18f2e481831ad903b969e6b2",
       "abi": [
         {
@@ -1959,7 +1959,7 @@
           "items": [
             {
               "type": "function",
-              "name": "contract_name",
+              "name": "name",
               "inputs": [],
               "outputs": [
                 {
@@ -2146,9 +2146,9 @@
     },
     {
       "kind": "DojoContract",
-      "address": "0x3be251ef8450c757a5712e203eef1ce65a49678a3fe711df29012de99d61c8",
-      "class_hash": "0x40e824b8814bafef18cce2cf68f5765e9c9a1c86f55a8491b0c2a4faebdcc87",
-      "original_class_hash": "0x40e824b8814bafef18cce2cf68f5765e9c9a1c86f55a8491b0c2a4faebdcc87",
+      "address": "0x6a116545acc77daea729bf5f14a71f634ddddedb7e7e77f280d8d984054edaf",
+      "class_hash": "0x2331b72955719869459bdacf66061a55975d6c2bc379349b082ee9d9a350a18",
+      "original_class_hash": "0x2331b72955719869459bdacf66061a55975d6c2bc379349b082ee9d9a350a18",
       "base_class_hash": "0x2427dd10a58850ac9a5ca6ce04b7771b05330fd18f2e481831ad903b969e6b2",
       "abi": [
         {
@@ -2180,7 +2180,7 @@
           "items": [
             {
               "type": "function",
-              "name": "contract_name",
+              "name": "name",
               "inputs": [],
               "outputs": [
                 {
diff --git a/examples/spawn-and-move/manifests/dev/deployment/manifest.toml b/examples/spawn-and-move/manifests/dev/deployment/manifest.toml
index 0bc300f306..4e1ffec809 100644
--- a/examples/spawn-and-move/manifests/dev/deployment/manifest.toml
+++ b/examples/spawn-and-move/manifests/dev/deployment/manifest.toml
@@ -1,10 +1,10 @@
 [world]
 kind = "WorldContract"
-class_hash = "0x5c4271c8cd454ceb8049d2b0724c99d12c2ef8077fc6ad325b18978f614aab0"
-original_class_hash = "0x5c4271c8cd454ceb8049d2b0724c99d12c2ef8077fc6ad325b18978f614aab0"
+class_hash = "0x6f38d5d9507c5d9546290e1a27e309efe5a9af3770b6cc1627db4a1b90a7dce"
+original_class_hash = "0x6f38d5d9507c5d9546290e1a27e309efe5a9af3770b6cc1627db4a1b90a7dce"
 abi = "manifests/dev/deployment/abis/dojo-world.json"
-address = "0x15b584f1132fe386a0aa7a447e7073233a545ac4b84b361ed797edaa8f0f14"
-transaction_hash = "0x715b5d1bde9766b6db3f8b903a0626343c553a91e199f96d721644d121e676b"
+address = "0x46c1fd10836a8426197bf412fc5f26ea10f11a8d5c61474407f03f82c096593"
+transaction_hash = "0x7f540b040b1638b76a7f2a8fc13a33050d1c0556a63814f319a01d022b172cf"
 block_number = 3
 seed = "dojo_examples"
 manifest_name = "dojo-world"
@@ -23,9 +23,9 @@ manifest_name = "dojo-base"
 
 [[contracts]]
 kind = "DojoContract"
-address = "0x54de18a0d4dcd51213c3375061fd5cd5a30dbefdb50c9718ae9a8004162abbd"
-class_hash = "0x67a20ea91a4b9bb9cdb46cefc41dd6ca4c07c22d4d413205720963944fd817d"
-original_class_hash = "0x67a20ea91a4b9bb9cdb46cefc41dd6ca4c07c22d4d413205720963944fd817d"
+address = "0x7fed9d6acaa45011152ea992784d41df3ae74eedbc199feb91b3fcbdb78abad"
+class_hash = "0x2aaecb3ded9ebb721f13780007e9704cba0d96b48195f357a35f4969d1b1941"
+original_class_hash = "0x2aaecb3ded9ebb721f13780007e9704cba0d96b48195f357a35f4969d1b1941"
 base_class_hash = "0x2427dd10a58850ac9a5ca6ce04b7771b05330fd18f2e481831ad903b969e6b2"
 abi = "manifests/dev/deployment/abis/contracts/dojo_examples-actions-40b6994c.json"
 reads = []
@@ -47,9 +47,9 @@ manifest_name = "dojo_examples-actions-40b6994c"
 
 [[contracts]]
 kind = "DojoContract"
-address = "0x3af2ea94daa59a22d5b979004019de544dbf92a2e4ff5f4869abb7ded9ca669"
-class_hash = "0x4590a27e4ec7366358ba5f60323777f301435ebbdd113ab02c54b947717530d"
-original_class_hash = "0x4590a27e4ec7366358ba5f60323777f301435ebbdd113ab02c54b947717530d"
+address = "0x47dcd4e30618d32fd27951e977df1d819d6edff2506e52c653f658134062036"
+class_hash = "0x117e4d75bef86d66e413d13f30904d2c93798f513ffa0bf83b4fac3fdfc4a62"
+original_class_hash = "0x117e4d75bef86d66e413d13f30904d2c93798f513ffa0bf83b4fac3fdfc4a62"
 base_class_hash = "0x2427dd10a58850ac9a5ca6ce04b7771b05330fd18f2e481831ad903b969e6b2"
 abi = "manifests/dev/deployment/abis/contracts/dojo_examples-dungeon-6620e0e6.json"
 reads = []
@@ -61,9 +61,9 @@ manifest_name = "dojo_examples-dungeon-6620e0e6"
 
 [[contracts]]
 kind = "DojoContract"
-address = "0x7ba7852396ce1e20e332e6ad1af1a978c866d61d8ad3d2d58f618dac027c8e1"
-class_hash = "0x67edb33671cd2f5b766d073e3dec53b03400761a20f349ea9628cf4c883b393"
-original_class_hash = "0x67edb33671cd2f5b766d073e3dec53b03400761a20f349ea9628cf4c883b393"
+address = "0x71c327d19b2d0c6a0f65cced59f60fe69776af6885e8f42d8f6775af00f5d5b"
+class_hash = "0x3ad65950996d7b0bc6c04a94d401cdb19bda3ab2cffc2098d90e25077dfa11a"
+original_class_hash = "0x3ad65950996d7b0bc6c04a94d401cdb19bda3ab2cffc2098d90e25077dfa11a"
 base_class_hash = "0x2427dd10a58850ac9a5ca6ce04b7771b05330fd18f2e481831ad903b969e6b2"
 abi = "manifests/dev/deployment/abis/contracts/dojo_examples-mock_token-31599eb2.json"
 reads = []
@@ -75,9 +75,9 @@ manifest_name = "dojo_examples-mock_token-31599eb2"
 
 [[contracts]]
 kind = "DojoContract"
-address = "0x3be251ef8450c757a5712e203eef1ce65a49678a3fe711df29012de99d61c8"
-class_hash = "0x40e824b8814bafef18cce2cf68f5765e9c9a1c86f55a8491b0c2a4faebdcc87"
-original_class_hash = "0x40e824b8814bafef18cce2cf68f5765e9c9a1c86f55a8491b0c2a4faebdcc87"
+address = "0x6a116545acc77daea729bf5f14a71f634ddddedb7e7e77f280d8d984054edaf"
+class_hash = "0x2331b72955719869459bdacf66061a55975d6c2bc379349b082ee9d9a350a18"
+original_class_hash = "0x2331b72955719869459bdacf66061a55975d6c2bc379349b082ee9d9a350a18"
 base_class_hash = "0x2427dd10a58850ac9a5ca6ce04b7771b05330fd18f2e481831ad903b969e6b2"
 abi = "manifests/dev/deployment/abis/contracts/dojo_examples-others-61de2c18.json"
 reads = []
diff --git a/examples/spawn-and-move/manifests/release/base/abis/contracts/dojo_examples-actions-40b6994c.json b/examples/spawn-and-move/manifests/release/base/abis/contracts/dojo_examples-actions-40b6994c.json
index fdba39296f..ce8ce13c25 100644
--- a/examples/spawn-and-move/manifests/release/base/abis/contracts/dojo_examples-actions-40b6994c.json
+++ b/examples/spawn-and-move/manifests/release/base/abis/contracts/dojo_examples-actions-40b6994c.json
@@ -28,7 +28,7 @@
     "items": [
       {
         "type": "function",
-        "name": "contract_name",
+        "name": "name",
         "inputs": [],
         "outputs": [
           {
diff --git a/examples/spawn-and-move/manifests/release/base/abis/contracts/dojo_examples-dungeon-6620e0e6.json b/examples/spawn-and-move/manifests/release/base/abis/contracts/dojo_examples-dungeon-6620e0e6.json
index 91fe2a95d0..753438f06f 100644
--- a/examples/spawn-and-move/manifests/release/base/abis/contracts/dojo_examples-dungeon-6620e0e6.json
+++ b/examples/spawn-and-move/manifests/release/base/abis/contracts/dojo_examples-dungeon-6620e0e6.json
@@ -28,7 +28,7 @@
     "items": [
       {
         "type": "function",
-        "name": "contract_name",
+        "name": "name",
         "inputs": [],
         "outputs": [
           {
diff --git a/examples/spawn-and-move/manifests/release/base/abis/contracts/dojo_examples-mock_token-31599eb2.json b/examples/spawn-and-move/manifests/release/base/abis/contracts/dojo_examples-mock_token-31599eb2.json
index 278cbb1cc0..c72fe81e69 100644
--- a/examples/spawn-and-move/manifests/release/base/abis/contracts/dojo_examples-mock_token-31599eb2.json
+++ b/examples/spawn-and-move/manifests/release/base/abis/contracts/dojo_examples-mock_token-31599eb2.json
@@ -28,7 +28,7 @@
     "items": [
       {
         "type": "function",
-        "name": "contract_name",
+        "name": "name",
         "inputs": [],
         "outputs": [
           {
diff --git a/examples/spawn-and-move/manifests/release/base/abis/contracts/dojo_examples-others-61de2c18.json b/examples/spawn-and-move/manifests/release/base/abis/contracts/dojo_examples-others-61de2c18.json
index 86d2a176ff..b8cbcf6f22 100644
--- a/examples/spawn-and-move/manifests/release/base/abis/contracts/dojo_examples-others-61de2c18.json
+++ b/examples/spawn-and-move/manifests/release/base/abis/contracts/dojo_examples-others-61de2c18.json
@@ -28,7 +28,7 @@
     "items": [
       {
         "type": "function",
-        "name": "contract_name",
+        "name": "name",
         "inputs": [],
         "outputs": [
           {
diff --git a/examples/spawn-and-move/manifests/release/base/contracts/dojo_examples-actions-40b6994c.toml b/examples/spawn-and-move/manifests/release/base/contracts/dojo_examples-actions-40b6994c.toml
index eaf518064d..e15acdf766 100644
--- a/examples/spawn-and-move/manifests/release/base/contracts/dojo_examples-actions-40b6994c.toml
+++ b/examples/spawn-and-move/manifests/release/base/contracts/dojo_examples-actions-40b6994c.toml
@@ -1,6 +1,6 @@
 kind = "DojoContract"
-class_hash = "0x67a20ea91a4b9bb9cdb46cefc41dd6ca4c07c22d4d413205720963944fd817d"
-original_class_hash = "0x67a20ea91a4b9bb9cdb46cefc41dd6ca4c07c22d4d413205720963944fd817d"
+class_hash = "0x2aaecb3ded9ebb721f13780007e9704cba0d96b48195f357a35f4969d1b1941"
+original_class_hash = "0x2aaecb3ded9ebb721f13780007e9704cba0d96b48195f357a35f4969d1b1941"
 base_class_hash = "0x0"
 abi = "manifests/release/base/abis/contracts/dojo_examples-actions-40b6994c.json"
 reads = []
diff --git a/examples/spawn-and-move/manifests/release/base/contracts/dojo_examples-dungeon-6620e0e6.toml b/examples/spawn-and-move/manifests/release/base/contracts/dojo_examples-dungeon-6620e0e6.toml
index a3a45a7634..2d3cd43c81 100644
--- a/examples/spawn-and-move/manifests/release/base/contracts/dojo_examples-dungeon-6620e0e6.toml
+++ b/examples/spawn-and-move/manifests/release/base/contracts/dojo_examples-dungeon-6620e0e6.toml
@@ -1,6 +1,6 @@
 kind = "DojoContract"
-class_hash = "0x4590a27e4ec7366358ba5f60323777f301435ebbdd113ab02c54b947717530d"
-original_class_hash = "0x4590a27e4ec7366358ba5f60323777f301435ebbdd113ab02c54b947717530d"
+class_hash = "0x117e4d75bef86d66e413d13f30904d2c93798f513ffa0bf83b4fac3fdfc4a62"
+original_class_hash = "0x117e4d75bef86d66e413d13f30904d2c93798f513ffa0bf83b4fac3fdfc4a62"
 base_class_hash = "0x0"
 abi = "manifests/release/base/abis/contracts/dojo_examples-dungeon-6620e0e6.json"
 reads = []
diff --git a/examples/spawn-and-move/manifests/release/base/contracts/dojo_examples-mock_token-31599eb2.toml b/examples/spawn-and-move/manifests/release/base/contracts/dojo_examples-mock_token-31599eb2.toml
index a91d6e646d..9619bdb4e6 100644
--- a/examples/spawn-and-move/manifests/release/base/contracts/dojo_examples-mock_token-31599eb2.toml
+++ b/examples/spawn-and-move/manifests/release/base/contracts/dojo_examples-mock_token-31599eb2.toml
@@ -1,6 +1,6 @@
 kind = "DojoContract"
-class_hash = "0x67edb33671cd2f5b766d073e3dec53b03400761a20f349ea9628cf4c883b393"
-original_class_hash = "0x67edb33671cd2f5b766d073e3dec53b03400761a20f349ea9628cf4c883b393"
+class_hash = "0x3ad65950996d7b0bc6c04a94d401cdb19bda3ab2cffc2098d90e25077dfa11a"
+original_class_hash = "0x3ad65950996d7b0bc6c04a94d401cdb19bda3ab2cffc2098d90e25077dfa11a"
 base_class_hash = "0x0"
 abi = "manifests/release/base/abis/contracts/dojo_examples-mock_token-31599eb2.json"
 reads = []
diff --git a/examples/spawn-and-move/manifests/release/base/contracts/dojo_examples-others-61de2c18.toml b/examples/spawn-and-move/manifests/release/base/contracts/dojo_examples-others-61de2c18.toml
index 0e3f247385..a5627d0b65 100644
--- a/examples/spawn-and-move/manifests/release/base/contracts/dojo_examples-others-61de2c18.toml
+++ b/examples/spawn-and-move/manifests/release/base/contracts/dojo_examples-others-61de2c18.toml
@@ -1,6 +1,6 @@
 kind = "DojoContract"
-class_hash = "0x40e824b8814bafef18cce2cf68f5765e9c9a1c86f55a8491b0c2a4faebdcc87"
-original_class_hash = "0x40e824b8814bafef18cce2cf68f5765e9c9a1c86f55a8491b0c2a4faebdcc87"
+class_hash = "0x2331b72955719869459bdacf66061a55975d6c2bc379349b082ee9d9a350a18"
+original_class_hash = "0x2331b72955719869459bdacf66061a55975d6c2bc379349b082ee9d9a350a18"
 base_class_hash = "0x0"
 abi = "manifests/release/base/abis/contracts/dojo_examples-others-61de2c18.json"
 reads = []
diff --git a/examples/spawn-and-move/manifests/release/base/dojo-world.toml b/examples/spawn-and-move/manifests/release/base/dojo-world.toml
index c97d092ceb..39ebfa681c 100644
--- a/examples/spawn-and-move/manifests/release/base/dojo-world.toml
+++ b/examples/spawn-and-move/manifests/release/base/dojo-world.toml
@@ -1,6 +1,6 @@
 kind = "Class"
-class_hash = "0x5c4271c8cd454ceb8049d2b0724c99d12c2ef8077fc6ad325b18978f614aab0"
-original_class_hash = "0x5c4271c8cd454ceb8049d2b0724c99d12c2ef8077fc6ad325b18978f614aab0"
+class_hash = "0x6f38d5d9507c5d9546290e1a27e309efe5a9af3770b6cc1627db4a1b90a7dce"
+original_class_hash = "0x6f38d5d9507c5d9546290e1a27e309efe5a9af3770b6cc1627db4a1b90a7dce"
 abi = "manifests/release/base/abis/dojo-world.json"
 tag = "dojo-world"
 manifest_name = "dojo-world"
diff --git a/spawn-and-move-db.tar.gz b/spawn-and-move-db.tar.gz
index a7f95e1b16..c55d890bc2 100644
Binary files a/spawn-and-move-db.tar.gz and b/spawn-and-move-db.tar.gz differ
diff --git a/types-test-db.tar.gz b/types-test-db.tar.gz
index 5694495f0d..4caaae7f17 100644
Binary files a/types-test-db.tar.gz and b/types-test-db.tar.gz differ