diff --git a/ping-pong/Cargo.toml b/ping-pong/Cargo.toml
index 5b2da0f..598d7df 100644
--- a/ping-pong/Cargo.toml
+++ b/ping-pong/Cargo.toml
@@ -8,7 +8,6 @@ publish = false
 [lib]
 path = "src/ping_pong.rs"
 [dependencies.multiversx-sc]
-version = "0.39.5"
-
+version = "0.42.0"
 [dev-dependencies.multiversx-sc-scenario]
-version = "0.39.5"
+version = "0.42.0"
diff --git a/ping-pong/meta/Cargo.toml b/ping-pong/meta/Cargo.toml
index 63e0553..77d6721 100644
--- a/ping-pong/meta/Cargo.toml
+++ b/ping-pong/meta/Cargo.toml
@@ -8,4 +8,4 @@ publish = false
 path = ".."
 
 [dependencies.multiversx-sc-meta]
-version = "0.39.5"
+version = "0.42.0"
diff --git a/ping-pong/mandos/ping-pong-call-ping-second-user.scen.json b/ping-pong/scenarios/ping-pong-call-ping-second-user.scen.json
similarity index 100%
rename from ping-pong/mandos/ping-pong-call-ping-second-user.scen.json
rename to ping-pong/scenarios/ping-pong-call-ping-second-user.scen.json
diff --git a/ping-pong/mandos/ping-pong-call-ping-twice.scen.json b/ping-pong/scenarios/ping-pong-call-ping-twice.scen.json
similarity index 100%
rename from ping-pong/mandos/ping-pong-call-ping-twice.scen.json
rename to ping-pong/scenarios/ping-pong-call-ping-twice.scen.json
diff --git a/ping-pong/mandos/ping-pong-call-ping-wrong-amount.scen.json b/ping-pong/scenarios/ping-pong-call-ping-wrong-amount.scen.json
similarity index 100%
rename from ping-pong/mandos/ping-pong-call-ping-wrong-amount.scen.json
rename to ping-pong/scenarios/ping-pong-call-ping-wrong-amount.scen.json
diff --git a/ping-pong/mandos/ping-pong-call-ping.scen.json b/ping-pong/scenarios/ping-pong-call-ping.scen.json
similarity index 100%
rename from ping-pong/mandos/ping-pong-call-ping.scen.json
rename to ping-pong/scenarios/ping-pong-call-ping.scen.json
diff --git a/ping-pong/mandos/ping-pong-call-pong-before-deadline.scen.json b/ping-pong/scenarios/ping-pong-call-pong-before-deadline.scen.json
similarity index 100%
rename from ping-pong/mandos/ping-pong-call-pong-before-deadline.scen.json
rename to ping-pong/scenarios/ping-pong-call-pong-before-deadline.scen.json
diff --git a/ping-pong/mandos/ping-pong-call-pong-twice.scen.json b/ping-pong/scenarios/ping-pong-call-pong-twice.scen.json
similarity index 100%
rename from ping-pong/mandos/ping-pong-call-pong-twice.scen.json
rename to ping-pong/scenarios/ping-pong-call-pong-twice.scen.json
diff --git a/ping-pong/mandos/ping-pong-call-pong-without-ping.scen.json b/ping-pong/scenarios/ping-pong-call-pong-without-ping.scen.json
similarity index 100%
rename from ping-pong/mandos/ping-pong-call-pong-without-ping.scen.json
rename to ping-pong/scenarios/ping-pong-call-pong-without-ping.scen.json
diff --git a/ping-pong/mandos/ping-pong-call-pong.scen.json b/ping-pong/scenarios/ping-pong-call-pong.scen.json
similarity index 100%
rename from ping-pong/mandos/ping-pong-call-pong.scen.json
rename to ping-pong/scenarios/ping-pong-call-pong.scen.json
diff --git a/ping-pong/mandos/ping-pong-init.scen.json b/ping-pong/scenarios/ping-pong-init.scen.json
similarity index 100%
rename from ping-pong/mandos/ping-pong-init.scen.json
rename to ping-pong/scenarios/ping-pong-init.scen.json
diff --git a/ping-pong/tests/ping_pong_egld_scenario_go_test.rs b/ping-pong/tests/ping_pong_egld_scenario_go_test.rs
index 1adc8a3..facffe1 100644
--- a/ping-pong/tests/ping_pong_egld_scenario_go_test.rs
+++ b/ping-pong/tests/ping_pong_egld_scenario_go_test.rs
@@ -1,44 +1,50 @@
+use multiversx_sc_scenario::*;
+
+fn world() -> ScenarioWorld {
+    ScenarioWorld::vm_go()
+}
+
 #[test]
 fn ping_pong_call_ping_go() {
-    multiversx_sc_scenario::run_go("mandos/ping-pong-call-ping.scen.json");
+    world().run("scenarios/ping-pong-call-ping.scen.json");
 }
 
 #[test]
 fn ping_pong_call_ping_second_user_go() {
-    multiversx_sc_scenario::run_go("mandos/ping-pong-call-ping-second-user.scen.json");
+    world().run("scenarios/ping-pong-call-ping-second-user.scen.json");
 }
 
 #[test]
 fn ping_pong_call_ping_twice_go() {
-    multiversx_sc_scenario::run_go("mandos/ping-pong-call-ping-twice.scen.json");
+    world().run("scenarios/ping-pong-call-ping-twice.scen.json");
 }
 
 #[test]
 fn ping_pong_call_ping_wrong_amount_go() {
-    multiversx_sc_scenario::run_go("mandos/ping-pong-call-ping-wrong-amount.scen.json");
+    world().run("scenarios/ping-pong-call-ping-wrong-amount.scen.json");
 }
 
 #[test]
 fn ping_pong_call_pong_go() {
-    multiversx_sc_scenario::run_go("mandos/ping-pong-call-pong.scen.json");
+    world().run("scenarios/ping-pong-call-pong.scen.json");
 }
 
 #[test]
 fn ping_pong_call_pong_before_deadline_go() {
-    multiversx_sc_scenario::run_go("mandos/ping-pong-call-pong-before-deadline.scen.json");
+    world().run("scenarios/ping-pong-call-pong-before-deadline.scen.json");
 }
 
 #[test]
 fn ping_pong_call_pong_twice_go() {
-    multiversx_sc_scenario::run_go("mandos/ping-pong-call-pong-twice.scen.json");
+    world().run("scenarios/ping-pong-call-pong-twice.scen.json");
 }
 
 #[test]
 fn ping_pong_call_pong_without_ping_go() {
-    multiversx_sc_scenario::run_go("mandos/ping-pong-call-pong-without-ping.scen.json");
+    world().run("scenarios/ping-pong-call-pong-without-ping.scen.json");
 }
 
 #[test]
 fn ping_pong_init_go() {
-    multiversx_sc_scenario::run_go("mandos/ping-pong-init.scen.json");
+    world().run("scenarios/ping-pong-init.scen.json");
 }
diff --git a/ping-pong/tests/ping_pong_egld_scenario_rs_test.rs b/ping-pong/tests/ping_pong_egld_scenario_rs_test.rs
index b8b936e..a693da3 100644
--- a/ping-pong/tests/ping_pong_egld_scenario_rs_test.rs
+++ b/ping-pong/tests/ping_pong_egld_scenario_rs_test.rs
@@ -10,48 +10,45 @@ fn world() -> ScenarioWorld {
 
 #[test]
 fn ping_pong_call_ping_rs() {
-    multiversx_sc_scenario::run_rs("mandos/ping-pong-call-ping.scen.json", world());
+    world().run("scenarios/ping-pong-call-ping.scen.json");
 }
 
 #[test]
 fn ping_pong_call_ping_second_user_rs() {
-    multiversx_sc_scenario::run_rs("mandos/ping-pong-call-ping-second-user.scen.json", world());
+    world().run("scenarios/ping-pong-call-ping-second-user.scen.json");
 }
 
 #[test]
 fn ping_pong_call_ping_twice_rs() {
-    multiversx_sc_scenario::run_rs("mandos/ping-pong-call-ping-twice.scen.json", world());
+    world().run("scenarios/ping-pong-call-ping-twice.scen.json");
 }
 
 #[test]
 fn ping_pong_call_ping_wrong_amount_rs() {
-    multiversx_sc_scenario::run_rs("mandos/ping-pong-call-ping-wrong-amount.scen.json", world());
+    world().run("scenarios/ping-pong-call-ping-wrong-amount.scen.json");
 }
 
 #[test]
 fn ping_pong_call_pong_rs() {
-    multiversx_sc_scenario::run_rs("mandos/ping-pong-call-pong.scen.json", world());
+    world().run("scenarios/ping-pong-call-pong.scen.json");
 }
 
 #[test]
 fn ping_pong_call_pong_before_deadline_rs() {
-    multiversx_sc_scenario::run_rs(
-        "mandos/ping-pong-call-pong-before-deadline.scen.json",
-        world(),
-    );
+    world().run("scenarios/ping-pong-call-pong-before-deadline.scen.json");
 }
 
 #[test]
 fn ping_pong_call_pong_twice_rs() {
-    multiversx_sc_scenario::run_rs("mandos/ping-pong-call-pong-twice.scen.json", world());
+    world().run("scenarios/ping-pong-call-pong-twice.scen.json");
 }
 
 #[test]
 fn ping_pong_call_pong_without_ping_rs() {
-    multiversx_sc_scenario::run_rs("mandos/ping-pong-call-pong-without-ping.scen.json", world());
+    world().run("scenarios/ping-pong-call-pong-without-ping.scen.json");
 }
 
 #[test]
 fn ping_pong_init_rs() {
-    multiversx_sc_scenario::run_rs("mandos/ping-pong-init.scen.json", world());
+    world().run("scenarios/ping-pong-init.scen.json");
 }
diff --git a/ping-pong/wasm/Cargo.toml b/ping-pong/wasm/Cargo.toml
index a1db174..0b65009 100644
--- a/ping-pong/wasm/Cargo.toml
+++ b/ping-pong/wasm/Cargo.toml
@@ -19,4 +19,4 @@ panic = "abort"
 path = ".."
 
 [dependencies.multiversx-sc-wasm-adapter]
-version = "0.39.5"
+version = "0.42.0"
diff --git a/ping-pong/wasm/src/lib.rs b/ping-pong/wasm/src/lib.rs
index 28d430e..c5efc18 100644
--- a/ping-pong/wasm/src/lib.rs
+++ b/ping-pong/wasm/src/lib.rs
@@ -10,7 +10,7 @@
 // Total number of exported functions:  11
 
 #![no_std]
-#![feature(alloc_error_handler, lang_items)]
+#![feature(lang_items)]
 
 multiversx_sc_wasm_adapter::allocator!();
 multiversx_sc_wasm_adapter::panic_handler!();
@@ -18,16 +18,17 @@ multiversx_sc_wasm_adapter::panic_handler!();
 multiversx_sc_wasm_adapter::endpoints! {
     ping_pong
     (
-        ping
-        pong
-        didUserPing
-        getPongEnableTimestamp
-        getTimeToPong
-        getAcceptedPaymentToken
-        getPingAmount
-        getDurationTimestamp
-        getUserPingTimestamp
+        init => init
+        ping => ping
+        pong => pong
+        didUserPing => did_user_ping
+        getPongEnableTimestamp => get_pong_enable_timestamp
+        getTimeToPong => get_time_to_pong
+        getAcceptedPaymentToken => accepted_payment_token_id
+        getPingAmount => ping_amount
+        getDurationTimestamp => duration_in_seconds
+        getUserPingTimestamp => user_ping_timestamp
     )
 }
 
-multiversx_sc_wasm_adapter::empty_callback! {}
+multiversx_sc_wasm_adapter::async_callback_empty! {}