diff --git a/etherlink/bin_floodgate/main.ml b/etherlink/bin_floodgate/main.ml
index a7a9557b84143f1534ed6bc078e0f47d7d28ce94..795429a53c11ec7c3eeace9313862bab1b393d2d 100644
--- a/etherlink/bin_floodgate/main.ml
+++ b/etherlink/bin_floodgate/main.ml
@@ -259,4 +259,6 @@ let () =
         Short)
   in
   Lwt.Exception_filter.(set handle_all_except_runtime) ;
-  Lwt_main.run (Lwt_exit.wrap_and_exit (dispatch (argv ()))) |> handle_error
+  Tezos_base_unix.Event_loop.main_run
+    (Lwt_exit.wrap_and_exit (dispatch (argv ())))
+  |> handle_error
diff --git a/etherlink/bin_node/main.ml b/etherlink/bin_node/main.ml
index 0334a3c08d33d79871b0cb22d9915d7f86484ae8..19078554f2142a89c36b7ddb31bfd2044c807551 100644
--- a/etherlink/bin_node/main.ml
+++ b/etherlink/bin_node/main.ml
@@ -2671,4 +2671,6 @@ let () =
         Short)
   in
   Lwt.Exception_filter.(set handle_all_except_runtime) ;
-  Lwt_main.run (Lwt_exit.wrap_and_exit (dispatch (argv ()))) |> handle_error
+  Tezos_base_unix.Event_loop.main_run
+    (Lwt_exit.wrap_and_exit (dispatch (argv ())))
+  |> handle_error
diff --git a/etherlink/governance-metrics/src/governance_observer.ml b/etherlink/governance-metrics/src/governance_observer.ml
index 680df0bdef5d6e69c905c23861bc011500c99598..da11f4648149cb57f5b9c7962668fd06476fbf93 100644
--- a/etherlink/governance-metrics/src/governance_observer.ml
+++ b/etherlink/governance-metrics/src/governance_observer.ml
@@ -291,4 +291,4 @@ let handle_error = function
         errs ;
       Stdlib.exit 1
 
-let () = Lwt_main.run (parse_options ()) |> handle_error
+let () = Tezos_base_unix.Event_loop.main_run (parse_options ()) |> handle_error
diff --git a/src/bin_agnostic_baker/main_agnostic_baker.ml b/src/bin_agnostic_baker/main_agnostic_baker.ml
index ac627582e02caf07af369ba9e87aa54f4ae1d8db..493a23ff60d632b6e7bc63d44b963eefacdabb5f 100644
--- a/src/bin_agnostic_baker/main_agnostic_baker.ml
+++ b/src/bin_agnostic_baker/main_agnostic_baker.ml
@@ -28,7 +28,7 @@ let () =
         | exn -> failwith "%s" (Printexc.to_string exn))
   in
   Stdlib.exit
-    (Lwt_main.run
+    (Tezos_base_unix.Event_loop.main_run
        (let*! retcode =
           let*! r = Lwt_exit.wrap_and_exit main_promise in
           match r with
diff --git a/src/bin_codec/codec.ml b/src/bin_codec/codec.ml
index d7cd272ba99f6f7d6d5dd248f2054adb77e94cae..d2baa0ad676ea9be39428d18f0223a2274782768 100644
--- a/src/bin_codec/codec.ml
+++ b/src/bin_codec/codec.ml
@@ -159,7 +159,7 @@ let main commands =
     | None -> Tezos_clic.dispatch commands ctxt argv
   in
   Stdlib.exit
-    (Lwt_main.run
+    (Tezos_base_unix.Event_loop.main_run
        (let*! retcode =
           let*! r =
             Lwt.catch run (function
diff --git a/src/bin_dal_node/main.ml b/src/bin_dal_node/main.ml
index 3116102c1b4fd006fe4adbf9126727b93f166406..3e71eb6307ea96893a87b6346845f553909eee7c 100644
--- a/src/bin_dal_node/main.ml
+++ b/src/bin_dal_node/main.ml
@@ -103,15 +103,15 @@ let run subcommand cli_options =
           cli_options.Cli.data_dir
       in
       Lwt.Exception_filter.(set handle_all_except_runtime) ;
-      Lwt_main.run @@ wrap_with_error
+      Tezos_base_unix.Event_loop.main_run @@ wrap_with_error
       @@ Daemon.run ~data_dir ~configuration_override:(merge cli_options)
   | Config_init ->
       Lwt.Exception_filter.(set handle_all_except_runtime) ;
-      Lwt_main.run @@ wrap_with_error
+      Tezos_base_unix.Event_loop.main_run @@ wrap_with_error
       @@ Configuration_file.save (merge cli_options Configuration_file.default)
   | Config_update ->
       Lwt.Exception_filter.(set handle_all_except_runtime) ;
-      Lwt_main.run @@ wrap_with_error
+      Tezos_base_unix.Event_loop.main_run @@ wrap_with_error
       @@
       let open Lwt_result_syntax in
       let data_dir =
@@ -123,7 +123,7 @@ let run subcommand cli_options =
       Configuration_file.save (merge cli_options configuration)
   | Debug_print_store_schemas ->
       let open Lwt_result_syntax in
-      Lwt_main.run @@ wrap_with_error
+      Tezos_base_unix.Event_loop.main_run @@ wrap_with_error
       @@ Lwt_utils_unix.with_tempdir "store"
       @@ fun data_dir ->
       let* schemas = Store.Skip_list_cells.schemas data_dir in
diff --git a/src/bin_node/main.ml b/src/bin_node/main.ml
index 21acf7673825842fa8ea1df475d632b7291abd2d..4131ce1e975db43166e847b198d385f92f88c8f3 100644
--- a/src/bin_node/main.ml
+++ b/src/bin_node/main.ml
@@ -172,7 +172,7 @@ module Node_metrics_command = struct
     Format.printf "@]@." ;
     return_unit
 
-  let dump_metrics () = Lwt_main.run (dump_metrics ())
+  let dump_metrics () = Tezos_base_unix.Event_loop.main_run (dump_metrics ())
 
   module Term = struct
     let process _ = `Ok (dump_metrics ())
diff --git a/src/bin_node/node_reconstruct_command.ml b/src/bin_node/node_reconstruct_command.ml
index a3844a4ba66b013dbb3d71596e7a7ec27082d455..f014b4dbb022ee975ad36601b3a095c695346e2e 100644
--- a/src/bin_node/node_reconstruct_command.ml
+++ b/src/bin_node/node_reconstruct_command.ml
@@ -91,7 +91,7 @@ module Term = struct
         ~progress_display_mode
     in
     Lwt.Exception_filter.(set handle_all_except_runtime) ;
-    match Lwt_main.run @@ Lwt_exit.wrap_and_exit run with
+    match Tezos_base_unix.Event_loop.main_run @@ Lwt_exit.wrap_and_exit run with
     | Ok () -> `Ok ()
     | Error err -> `Error (false, Format.asprintf "%a" pp_print_trace err)
 
diff --git a/src/bin_node/node_replay_command.ml b/src/bin_node/node_replay_command.ml
index d2290514d03795a13c428e17f9321496dc62b5f5..cfd15ea42dbda4d36ec5323819757dbf9b4176ef 100644
--- a/src/bin_node/node_replay_command.ml
+++ b/src/bin_node/node_replay_command.ml
@@ -706,7 +706,7 @@ let process verbosity singleprocess strict repeat blocks stats_output data_dir
       blocks
   in
   Lwt.Exception_filter.(set handle_all_except_runtime) ;
-  match Lwt_main.run run with
+  match Tezos_base_unix.Event_loop.main_run run with
   | Ok () -> `Ok ()
   | Error err -> `Error (false, Format.asprintf "%a" pp_print_trace err)
 
diff --git a/src/bin_node/node_run_command.ml b/src/bin_node/node_run_command.ml
index cab0e2e391c243332b65244b784c66cdbe9475e7..0e3d169aafa8b31a9cc071ea532d7f35a074b069 100644
--- a/src/bin_node/node_run_command.ml
+++ b/src/bin_node/node_run_command.ml
@@ -917,7 +917,7 @@ let process sandbox verbosity target singleprocess force_history_mode_switch
       (function exn -> fail_with_exn exn)
   in
   Lwt.Exception_filter.(set handle_all_except_runtime) ;
-  Lwt_main.run
+  Tezos_base_unix.Event_loop.main_run
     (let*! r = Lwt_exit.wrap_and_exit main_promise in
      match r with
      | Ok () ->
diff --git a/src/bin_node/node_upgrade_command.ml b/src/bin_node/node_upgrade_command.ml
index 8d249d43646cec3c4f4d11eccddbe6f20bccb684..b3d4598919d7923a9fe6ab734edf40184fa9dc89 100644
--- a/src/bin_node/node_upgrade_command.ml
+++ b/src/bin_node/node_upgrade_command.ml
@@ -128,7 +128,7 @@ module Term = struct
           | errs -> Lwt.return errs)
     in
     Lwt.Exception_filter.(set handle_all_except_runtime) ;
-    match Lwt_main.run @@ Lwt_exit.wrap_and_exit run with
+    match Tezos_base_unix.Event_loop.main_run @@ Lwt_exit.wrap_and_exit run with
     | Ok () -> `Ok ()
     | Error err -> `Error (false, Format.asprintf "%a" pp_print_trace err)
 
diff --git a/src/lib_base/unix/event_loop.ml b/src/lib_base/unix/event_loop.ml
new file mode 100644
index 0000000000000000000000000000000000000000..fe44a3a0d4d525e9f7c74be943be6587e6b7da6f
--- /dev/null
+++ b/src/lib_base/unix/event_loop.ml
@@ -0,0 +1,21 @@
+(*****************************************************************************)
+(*                                                                           *)
+(* SPDX-License-Identifier: MIT                                              *)
+(* Copyright (c) 2025 Nomadic Labs. <contact@nomadic-labs.com>               *)
+(*                                                                           *)
+(*****************************************************************************)
+
+(** The [Event_loop] module provides an abstraction layer on top of promises
+    for use in the Octez codebase.
+
+    For now, it is just an alias for [Lwt_main.run], but [Lwt] use is about to
+    change / be replaced in the near future, following the recent adoption of
+    OCaml 5 and the opportunity to use parallelism.
+
+    Some components will use [eio*] libs, and if your library or binary uses
+    these components, you *MUST* use this module instead of the traditionnal
+    [Lwt_main.run].
+*)
+
+(** Alias of [Lwt_main.run] *)
+let main_run = Lwt_main.run
diff --git a/src/lib_client_base_unix/client_main_run.ml b/src/lib_client_base_unix/client_main_run.ml
index dc06ed167f3ea83a8286fdf276812f7769e749b8..02d2f5bc8200ccf99036ade78f136cb7f7e4de65 100644
--- a/src/lib_client_base_unix/client_main_run.ml
+++ b/src/lib_client_base_unix/client_main_run.ml
@@ -630,5 +630,6 @@ let run (module M : M)
        Client_config.cli_args ->
        Client_context.full Tezos_clic.command list tzresult Lwt.t) =
   Lwt.Exception_filter.(set handle_all_except_runtime) ;
-  Stdlib.exit @@ Lwt_main.run @@ Lwt_exit.wrap_and_forward
+  Stdlib.exit @@ Tezos_base_unix.Event_loop.main_run
+  @@ Lwt_exit.wrap_and_forward
   @@ main (module M) ~select_commands
diff --git a/src/lib_node_config/shared_arg.ml b/src/lib_node_config/shared_arg.ml
index ca64ad47d34642529eed8a506e2cdf4267c5e79e..2ed12e2d04f0c2506f371eab3bb0efe1cf0c82f5 100644
--- a/src/lib_node_config/shared_arg.ml
+++ b/src/lib_node_config/shared_arg.ml
@@ -258,7 +258,7 @@ let wrap data_dir config_file network connections max_download_speed
 
 let process_command run =
   Lwt.Exception_filter.(set handle_all_except_runtime) ;
-  match Lwt_main.run @@ Lwt_exit.wrap_and_exit run with
+  match Tezos_base_unix.Event_loop.main_run @@ Lwt_exit.wrap_and_exit run with
   | Ok () -> `Ok ()
   | Error err -> `Error (false, Format.asprintf "%a" pp_print_trace err)
 
diff --git a/src/lib_p2p/p2p_socket.ml b/src/lib_p2p/p2p_socket.ml
index bf121b7bd30d24dcd285d9c4dc805a912f97131e..622c1aed3bf8affe6fb79171254e971bfd855484 100644
--- a/src/lib_p2p/p2p_socket.ml
+++ b/src/lib_p2p/p2p_socket.ml
@@ -902,7 +902,7 @@ module Internal_for_tests = struct
         }
     in
     let scheduled_conn =
-      let f2d_t = Lwt_main.run (P2p_fd.socket ()) in
+      let f2d_t = Tezos_base_unix.Event_loop.main_run (P2p_fd.socket ()) in
       P2p_io_scheduler.register
         (P2p_io_scheduler.create ~read_buffer_size:0 ())
         f2d_t
diff --git a/src/lib_protocol_compiler/bin/main_embedded_packer.ml b/src/lib_protocol_compiler/bin/main_embedded_packer.ml
index d9d3d5bd1c1db1ea442358f78d61a29ef86e3b23..fd73cfd08871fd9d15a19cd0f03f6a55809a8b5e 100644
--- a/src/lib_protocol_compiler/bin/main_embedded_packer.ml
+++ b/src/lib_protocol_compiler/bin/main_embedded_packer.ml
@@ -62,7 +62,10 @@ let srcdir =
 
 let hash, sources =
   Lwt.Exception_filter.(set handle_all_except_runtime) ;
-  match Lwt_main.run (Tezos_base_unix.Protocol_files.read_dir srcdir) with
+  match
+    Tezos_base_unix.Event_loop.main_run
+      (Tezos_base_unix.Protocol_files.read_dir srcdir)
+  with
   | Ok (None, proto) -> (Protocol.hash proto, proto)
   | Ok (Some hash, proto) -> (hash, proto)
   | Error err ->
diff --git a/src/lib_protocol_environment/sigs/v1.ml b/src/lib_protocol_environment/sigs/v1.ml
index 781cb54ac674279ec1d6c2f7e1992ba4914d3652..ad4fa238005cf22f95a4bf4ddbe1f79e7b725129 100644
--- a/src/lib_protocol_environment/sigs/v1.ml
+++ b/src/lib_protocol_environment/sigs/v1.ml
@@ -3047,7 +3047,7 @@ let () =
       Lwt_io.(read_line stdin)
       (fun line -> Lwt_io.printl line)
   in
-  Lwt_main.run p_3
+  Tezos_base_unix.Event_loop.main_run p_3
 
 (* ocamlfind opt -linkpkg -thread -package lwt.unix code.ml && ./a.out *)
 ]}
@@ -3081,7 +3081,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt.bind Lwt_io.(read_line stdin) (fun line ->
       Lwt.bind (Lwt_unix.sleep 1.) (fun () ->
         Lwt_io.printf "One second ago, you entered %s\n" line))
@@ -3095,7 +3095,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt line = Lwt_io.(read_line stdin) in
     let%lwt () = Lwt_unix.sleep 1. in
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -3115,7 +3115,7 @@ let () =
 open Lwt.Infix
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt_io.(read_line stdin) >>= fun line ->
     Lwt_unix.sleep 1. >>= fun () ->
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -3149,7 +3149,7 @@ let read_int : unit -> int Lwt.t = fun () ->
     Lwt_io.(read_line stdin)
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt number = read_int () in
     Lwt_io.printf "%i\n" number
   end
diff --git a/src/lib_protocol_environment/sigs/v1/lwt.mli b/src/lib_protocol_environment/sigs/v1/lwt.mli
index 5361fc293adccdcee3df882c1e215a2c5c5cc9ff..c9aab4c626faaf095a6c43eba32d05f53985ab1b 100644
--- a/src/lib_protocol_environment/sigs/v1/lwt.mli
+++ b/src/lib_protocol_environment/sigs/v1/lwt.mli
@@ -78,7 +78,7 @@ let () =
       Lwt_io.(read_line stdin)
       (fun line -> Lwt_io.printl line)
   in
-  Lwt_main.run p_3
+  Tezos_base_unix.Event_loop.main_run p_3
 
 (* ocamlfind opt -linkpkg -thread -package lwt.unix code.ml && ./a.out *)
 ]}
@@ -112,7 +112,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt.bind Lwt_io.(read_line stdin) (fun line ->
       Lwt.bind (Lwt_unix.sleep 1.) (fun () ->
         Lwt_io.printf "One second ago, you entered %s\n" line))
@@ -126,7 +126,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt line = Lwt_io.(read_line stdin) in
     let%lwt () = Lwt_unix.sleep 1. in
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -146,7 +146,7 @@ let () =
 open Lwt.Infix
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt_io.(read_line stdin) >>= fun line ->
     Lwt_unix.sleep 1. >>= fun () ->
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -180,7 +180,7 @@ let read_int : unit -> int Lwt.t = fun () ->
     Lwt_io.(read_line stdin)
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt number = read_int () in
     Lwt_io.printf "%i\n" number
   end
diff --git a/src/lib_protocol_environment/sigs/v10.ml b/src/lib_protocol_environment/sigs/v10.ml
index 70da4339c8fb8e2d172016086b505de3e00bb6ff..2da046d1c3da74db48f77d8f47cb37a2a98433a2 100644
--- a/src/lib_protocol_environment/sigs/v10.ml
+++ b/src/lib_protocol_environment/sigs/v10.ml
@@ -3238,7 +3238,7 @@ let () =
       Lwt_io.(read_line stdin)
       (fun line -> Lwt_io.printl line)
   in
-  Lwt_main.run p_3
+  Tezos_base_unix.Event_loop.main_run p_3
 
 (* ocamlfind opt -linkpkg -thread -package lwt.unix code.ml && ./a.out *)
 ]}
@@ -3272,7 +3272,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt.bind Lwt_io.(read_line stdin) (fun line ->
       Lwt.bind (Lwt_unix.sleep 1.) (fun () ->
         Lwt_io.printf "One second ago, you entered %s\n" line))
@@ -3286,7 +3286,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt line = Lwt_io.(read_line stdin) in
     let%lwt () = Lwt_unix.sleep 1. in
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -3306,7 +3306,7 @@ let () =
 open Lwt.Infix
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt_io.(read_line stdin) >>= fun line ->
     Lwt_unix.sleep 1. >>= fun () ->
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -3350,7 +3350,7 @@ let read_int : unit -> int Lwt.t = fun () ->
     Lwt_io.(read_line stdin)
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt number = read_int () in
     Lwt_io.printf "%i\n" number
   end
diff --git a/src/lib_protocol_environment/sigs/v10/lwt.mli b/src/lib_protocol_environment/sigs/v10/lwt.mli
index 3540ecae0eb2d55b6e5dce095b559dac5ed6350e..b05fa364035a18ce0d0b84ecebcd80567d6e9221 100644
--- a/src/lib_protocol_environment/sigs/v10/lwt.mli
+++ b/src/lib_protocol_environment/sigs/v10/lwt.mli
@@ -85,7 +85,7 @@ let () =
       Lwt_io.(read_line stdin)
       (fun line -> Lwt_io.printl line)
   in
-  Lwt_main.run p_3
+  Tezos_base_unix.Event_loop.main_run p_3
 
 (* ocamlfind opt -linkpkg -thread -package lwt.unix code.ml && ./a.out *)
 ]}
@@ -119,7 +119,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt.bind Lwt_io.(read_line stdin) (fun line ->
       Lwt.bind (Lwt_unix.sleep 1.) (fun () ->
         Lwt_io.printf "One second ago, you entered %s\n" line))
@@ -133,7 +133,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt line = Lwt_io.(read_line stdin) in
     let%lwt () = Lwt_unix.sleep 1. in
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -153,7 +153,7 @@ let () =
 open Lwt.Infix
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt_io.(read_line stdin) >>= fun line ->
     Lwt_unix.sleep 1. >>= fun () ->
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -197,7 +197,7 @@ let read_int : unit -> int Lwt.t = fun () ->
     Lwt_io.(read_line stdin)
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt number = read_int () in
     Lwt_io.printf "%i\n" number
   end
diff --git a/src/lib_protocol_environment/sigs/v11.ml b/src/lib_protocol_environment/sigs/v11.ml
index 5ff2e686d67ce9e2fd2e4e9b06790016ed8d0303..09bd72e377cf9e4d4e9ed3bc2b60955445240840 100644
--- a/src/lib_protocol_environment/sigs/v11.ml
+++ b/src/lib_protocol_environment/sigs/v11.ml
@@ -3274,7 +3274,7 @@ let () =
       Lwt_io.(read_line stdin)
       (fun line -> Lwt_io.printl line)
   in
-  Lwt_main.run p_3
+  Tezos_base_unix.Event_loop.main_run p_3
 
 (* ocamlfind opt -linkpkg -thread -package lwt.unix code.ml && ./a.out *)
 ]}
@@ -3308,7 +3308,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt.bind Lwt_io.(read_line stdin) (fun line ->
       Lwt.bind (Lwt_unix.sleep 1.) (fun () ->
         Lwt_io.printf "One second ago, you entered %s\n" line))
@@ -3322,7 +3322,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt line = Lwt_io.(read_line stdin) in
     let%lwt () = Lwt_unix.sleep 1. in
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -3342,7 +3342,7 @@ let () =
 open Lwt.Infix
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt_io.(read_line stdin) >>= fun line ->
     Lwt_unix.sleep 1. >>= fun () ->
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -3386,7 +3386,7 @@ let read_int : unit -> int Lwt.t = fun () ->
     Lwt_io.(read_line stdin)
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt number = read_int () in
     Lwt_io.printf "%i\n" number
   end
diff --git a/src/lib_protocol_environment/sigs/v11/lwt.mli b/src/lib_protocol_environment/sigs/v11/lwt.mli
index 3540ecae0eb2d55b6e5dce095b559dac5ed6350e..b05fa364035a18ce0d0b84ecebcd80567d6e9221 100644
--- a/src/lib_protocol_environment/sigs/v11/lwt.mli
+++ b/src/lib_protocol_environment/sigs/v11/lwt.mli
@@ -85,7 +85,7 @@ let () =
       Lwt_io.(read_line stdin)
       (fun line -> Lwt_io.printl line)
   in
-  Lwt_main.run p_3
+  Tezos_base_unix.Event_loop.main_run p_3
 
 (* ocamlfind opt -linkpkg -thread -package lwt.unix code.ml && ./a.out *)
 ]}
@@ -119,7 +119,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt.bind Lwt_io.(read_line stdin) (fun line ->
       Lwt.bind (Lwt_unix.sleep 1.) (fun () ->
         Lwt_io.printf "One second ago, you entered %s\n" line))
@@ -133,7 +133,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt line = Lwt_io.(read_line stdin) in
     let%lwt () = Lwt_unix.sleep 1. in
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -153,7 +153,7 @@ let () =
 open Lwt.Infix
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt_io.(read_line stdin) >>= fun line ->
     Lwt_unix.sleep 1. >>= fun () ->
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -197,7 +197,7 @@ let read_int : unit -> int Lwt.t = fun () ->
     Lwt_io.(read_line stdin)
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt number = read_int () in
     Lwt_io.printf "%i\n" number
   end
diff --git a/src/lib_protocol_environment/sigs/v12.ml b/src/lib_protocol_environment/sigs/v12.ml
index 1245c7488f461c00335ff51740e2b626a73f10c6..34be27201c553d51c38135f9d18c9f0b9a829da0 100644
--- a/src/lib_protocol_environment/sigs/v12.ml
+++ b/src/lib_protocol_environment/sigs/v12.ml
@@ -3274,7 +3274,7 @@ let () =
       Lwt_io.(read_line stdin)
       (fun line -> Lwt_io.printl line)
   in
-  Lwt_main.run p_3
+  Tezos_base_unix.Event_loop.main_run p_3
 
 (* ocamlfind opt -linkpkg -thread -package lwt.unix code.ml && ./a.out *)
 ]}
@@ -3308,7 +3308,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt.bind Lwt_io.(read_line stdin) (fun line ->
       Lwt.bind (Lwt_unix.sleep 1.) (fun () ->
         Lwt_io.printf "One second ago, you entered %s\n" line))
@@ -3322,7 +3322,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt line = Lwt_io.(read_line stdin) in
     let%lwt () = Lwt_unix.sleep 1. in
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -3342,7 +3342,7 @@ let () =
 open Lwt.Infix
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt_io.(read_line stdin) >>= fun line ->
     Lwt_unix.sleep 1. >>= fun () ->
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -3386,7 +3386,7 @@ let read_int : unit -> int Lwt.t = fun () ->
     Lwt_io.(read_line stdin)
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt number = read_int () in
     Lwt_io.printf "%i\n" number
   end
diff --git a/src/lib_protocol_environment/sigs/v12/lwt.mli b/src/lib_protocol_environment/sigs/v12/lwt.mli
index 3540ecae0eb2d55b6e5dce095b559dac5ed6350e..b05fa364035a18ce0d0b84ecebcd80567d6e9221 100644
--- a/src/lib_protocol_environment/sigs/v12/lwt.mli
+++ b/src/lib_protocol_environment/sigs/v12/lwt.mli
@@ -85,7 +85,7 @@ let () =
       Lwt_io.(read_line stdin)
       (fun line -> Lwt_io.printl line)
   in
-  Lwt_main.run p_3
+  Tezos_base_unix.Event_loop.main_run p_3
 
 (* ocamlfind opt -linkpkg -thread -package lwt.unix code.ml && ./a.out *)
 ]}
@@ -119,7 +119,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt.bind Lwt_io.(read_line stdin) (fun line ->
       Lwt.bind (Lwt_unix.sleep 1.) (fun () ->
         Lwt_io.printf "One second ago, you entered %s\n" line))
@@ -133,7 +133,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt line = Lwt_io.(read_line stdin) in
     let%lwt () = Lwt_unix.sleep 1. in
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -153,7 +153,7 @@ let () =
 open Lwt.Infix
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt_io.(read_line stdin) >>= fun line ->
     Lwt_unix.sleep 1. >>= fun () ->
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -197,7 +197,7 @@ let read_int : unit -> int Lwt.t = fun () ->
     Lwt_io.(read_line stdin)
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt number = read_int () in
     Lwt_io.printf "%i\n" number
   end
diff --git a/src/lib_protocol_environment/sigs/v13.ml b/src/lib_protocol_environment/sigs/v13.ml
index 88e577578004fcc7670f683ff28c708ef8559021..c1f222ea45ed996dab80d2b3c6ac1073270f4f1f 100644
--- a/src/lib_protocol_environment/sigs/v13.ml
+++ b/src/lib_protocol_environment/sigs/v13.ml
@@ -3274,7 +3274,7 @@ let () =
       Lwt_io.(read_line stdin)
       (fun line -> Lwt_io.printl line)
   in
-  Lwt_main.run p_3
+  Tezos_base_unix.Event_loop.main_run p_3
 
 (* ocamlfind opt -linkpkg -thread -package lwt.unix code.ml && ./a.out *)
 ]}
@@ -3308,7 +3308,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt.bind Lwt_io.(read_line stdin) (fun line ->
       Lwt.bind (Lwt_unix.sleep 1.) (fun () ->
         Lwt_io.printf "One second ago, you entered %s\n" line))
@@ -3322,7 +3322,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt line = Lwt_io.(read_line stdin) in
     let%lwt () = Lwt_unix.sleep 1. in
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -3342,7 +3342,7 @@ let () =
 open Lwt.Infix
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt_io.(read_line stdin) >>= fun line ->
     Lwt_unix.sleep 1. >>= fun () ->
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -3386,7 +3386,7 @@ let read_int : unit -> int Lwt.t = fun () ->
     Lwt_io.(read_line stdin)
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt number = read_int () in
     Lwt_io.printf "%i\n" number
   end
diff --git a/src/lib_protocol_environment/sigs/v13/lwt.mli b/src/lib_protocol_environment/sigs/v13/lwt.mli
index 3540ecae0eb2d55b6e5dce095b559dac5ed6350e..b05fa364035a18ce0d0b84ecebcd80567d6e9221 100644
--- a/src/lib_protocol_environment/sigs/v13/lwt.mli
+++ b/src/lib_protocol_environment/sigs/v13/lwt.mli
@@ -85,7 +85,7 @@ let () =
       Lwt_io.(read_line stdin)
       (fun line -> Lwt_io.printl line)
   in
-  Lwt_main.run p_3
+  Tezos_base_unix.Event_loop.main_run p_3
 
 (* ocamlfind opt -linkpkg -thread -package lwt.unix code.ml && ./a.out *)
 ]}
@@ -119,7 +119,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt.bind Lwt_io.(read_line stdin) (fun line ->
       Lwt.bind (Lwt_unix.sleep 1.) (fun () ->
         Lwt_io.printf "One second ago, you entered %s\n" line))
@@ -133,7 +133,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt line = Lwt_io.(read_line stdin) in
     let%lwt () = Lwt_unix.sleep 1. in
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -153,7 +153,7 @@ let () =
 open Lwt.Infix
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt_io.(read_line stdin) >>= fun line ->
     Lwt_unix.sleep 1. >>= fun () ->
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -197,7 +197,7 @@ let read_int : unit -> int Lwt.t = fun () ->
     Lwt_io.(read_line stdin)
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt number = read_int () in
     Lwt_io.printf "%i\n" number
   end
diff --git a/src/lib_protocol_environment/sigs/v14.ml b/src/lib_protocol_environment/sigs/v14.ml
index 646a1f2d647df68002d2754fa8d1eca542ebc798..6ced2a63440b53c3cce443fb5659e52cb95fce4d 100644
--- a/src/lib_protocol_environment/sigs/v14.ml
+++ b/src/lib_protocol_environment/sigs/v14.ml
@@ -3274,7 +3274,7 @@ let () =
       Lwt_io.(read_line stdin)
       (fun line -> Lwt_io.printl line)
   in
-  Lwt_main.run p_3
+  Tezos_base_unix.Event_loop.main_run p_3
 
 (* ocamlfind opt -linkpkg -thread -package lwt.unix code.ml && ./a.out *)
 ]}
@@ -3308,7 +3308,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt.bind Lwt_io.(read_line stdin) (fun line ->
       Lwt.bind (Lwt_unix.sleep 1.) (fun () ->
         Lwt_io.printf "One second ago, you entered %s\n" line))
@@ -3322,7 +3322,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt line = Lwt_io.(read_line stdin) in
     let%lwt () = Lwt_unix.sleep 1. in
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -3342,7 +3342,7 @@ let () =
 open Lwt.Infix
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt_io.(read_line stdin) >>= fun line ->
     Lwt_unix.sleep 1. >>= fun () ->
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -3386,7 +3386,7 @@ let read_int : unit -> int Lwt.t = fun () ->
     Lwt_io.(read_line stdin)
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt number = read_int () in
     Lwt_io.printf "%i\n" number
   end
diff --git a/src/lib_protocol_environment/sigs/v14/lwt.mli b/src/lib_protocol_environment/sigs/v14/lwt.mli
index 3540ecae0eb2d55b6e5dce095b559dac5ed6350e..b05fa364035a18ce0d0b84ecebcd80567d6e9221 100644
--- a/src/lib_protocol_environment/sigs/v14/lwt.mli
+++ b/src/lib_protocol_environment/sigs/v14/lwt.mli
@@ -85,7 +85,7 @@ let () =
       Lwt_io.(read_line stdin)
       (fun line -> Lwt_io.printl line)
   in
-  Lwt_main.run p_3
+  Tezos_base_unix.Event_loop.main_run p_3
 
 (* ocamlfind opt -linkpkg -thread -package lwt.unix code.ml && ./a.out *)
 ]}
@@ -119,7 +119,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt.bind Lwt_io.(read_line stdin) (fun line ->
       Lwt.bind (Lwt_unix.sleep 1.) (fun () ->
         Lwt_io.printf "One second ago, you entered %s\n" line))
@@ -133,7 +133,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt line = Lwt_io.(read_line stdin) in
     let%lwt () = Lwt_unix.sleep 1. in
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -153,7 +153,7 @@ let () =
 open Lwt.Infix
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt_io.(read_line stdin) >>= fun line ->
     Lwt_unix.sleep 1. >>= fun () ->
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -197,7 +197,7 @@ let read_int : unit -> int Lwt.t = fun () ->
     Lwt_io.(read_line stdin)
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt number = read_int () in
     Lwt_io.printf "%i\n" number
   end
diff --git a/src/lib_protocol_environment/sigs/v2.ml b/src/lib_protocol_environment/sigs/v2.ml
index 3e660a634d9837cbe2b505ee15f1ef3e3f91fd4b..413236af86fb06b24c54d4e6d61957e936eb825d 100644
--- a/src/lib_protocol_environment/sigs/v2.ml
+++ b/src/lib_protocol_environment/sigs/v2.ml
@@ -3081,7 +3081,7 @@ let () =
       Lwt_io.(read_line stdin)
       (fun line -> Lwt_io.printl line)
   in
-  Lwt_main.run p_3
+  Tezos_base_unix.Event_loop.main_run p_3
 
 (* ocamlfind opt -linkpkg -thread -package lwt.unix code.ml && ./a.out *)
 ]}
@@ -3115,7 +3115,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt.bind Lwt_io.(read_line stdin) (fun line ->
       Lwt.bind (Lwt_unix.sleep 1.) (fun () ->
         Lwt_io.printf "One second ago, you entered %s\n" line))
@@ -3129,7 +3129,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt line = Lwt_io.(read_line stdin) in
     let%lwt () = Lwt_unix.sleep 1. in
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -3149,7 +3149,7 @@ let () =
 open Lwt.Infix
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt_io.(read_line stdin) >>= fun line ->
     Lwt_unix.sleep 1. >>= fun () ->
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -3183,7 +3183,7 @@ let read_int : unit -> int Lwt.t = fun () ->
     Lwt_io.(read_line stdin)
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt number = read_int () in
     Lwt_io.printf "%i\n" number
   end
diff --git a/src/lib_protocol_environment/sigs/v2/lwt.mli b/src/lib_protocol_environment/sigs/v2/lwt.mli
index 5361fc293adccdcee3df882c1e215a2c5c5cc9ff..c9aab4c626faaf095a6c43eba32d05f53985ab1b 100644
--- a/src/lib_protocol_environment/sigs/v2/lwt.mli
+++ b/src/lib_protocol_environment/sigs/v2/lwt.mli
@@ -78,7 +78,7 @@ let () =
       Lwt_io.(read_line stdin)
       (fun line -> Lwt_io.printl line)
   in
-  Lwt_main.run p_3
+  Tezos_base_unix.Event_loop.main_run p_3
 
 (* ocamlfind opt -linkpkg -thread -package lwt.unix code.ml && ./a.out *)
 ]}
@@ -112,7 +112,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt.bind Lwt_io.(read_line stdin) (fun line ->
       Lwt.bind (Lwt_unix.sleep 1.) (fun () ->
         Lwt_io.printf "One second ago, you entered %s\n" line))
@@ -126,7 +126,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt line = Lwt_io.(read_line stdin) in
     let%lwt () = Lwt_unix.sleep 1. in
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -146,7 +146,7 @@ let () =
 open Lwt.Infix
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt_io.(read_line stdin) >>= fun line ->
     Lwt_unix.sleep 1. >>= fun () ->
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -180,7 +180,7 @@ let read_int : unit -> int Lwt.t = fun () ->
     Lwt_io.(read_line stdin)
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt number = read_int () in
     Lwt_io.printf "%i\n" number
   end
diff --git a/src/lib_protocol_environment/sigs/v3.ml b/src/lib_protocol_environment/sigs/v3.ml
index 7e7c14bafe9e58ddb4c396cce762870a739fb63a..c9fb2c903b27a53f48a7fbea5547cb5d3ab0cf54 100644
--- a/src/lib_protocol_environment/sigs/v3.ml
+++ b/src/lib_protocol_environment/sigs/v3.ml
@@ -2801,7 +2801,7 @@ let () =
       Lwt_io.(read_line stdin)
       (fun line -> Lwt_io.printl line)
   in
-  Lwt_main.run p_3
+  Tezos_base_unix.Event_loop.main_run p_3
 
 (* ocamlfind opt -linkpkg -thread -package lwt.unix code.ml && ./a.out *)
 ]}
@@ -2835,7 +2835,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt.bind Lwt_io.(read_line stdin) (fun line ->
       Lwt.bind (Lwt_unix.sleep 1.) (fun () ->
         Lwt_io.printf "One second ago, you entered %s\n" line))
@@ -2849,7 +2849,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt line = Lwt_io.(read_line stdin) in
     let%lwt () = Lwt_unix.sleep 1. in
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -2869,7 +2869,7 @@ let () =
 open Lwt.Infix
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt_io.(read_line stdin) >>= fun line ->
     Lwt_unix.sleep 1. >>= fun () ->
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -2903,7 +2903,7 @@ let read_int : unit -> int Lwt.t = fun () ->
     Lwt_io.(read_line stdin)
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt number = read_int () in
     Lwt_io.printf "%i\n" number
   end
diff --git a/src/lib_protocol_environment/sigs/v3/lwt.mli b/src/lib_protocol_environment/sigs/v3/lwt.mli
index 5361fc293adccdcee3df882c1e215a2c5c5cc9ff..c9aab4c626faaf095a6c43eba32d05f53985ab1b 100644
--- a/src/lib_protocol_environment/sigs/v3/lwt.mli
+++ b/src/lib_protocol_environment/sigs/v3/lwt.mli
@@ -78,7 +78,7 @@ let () =
       Lwt_io.(read_line stdin)
       (fun line -> Lwt_io.printl line)
   in
-  Lwt_main.run p_3
+  Tezos_base_unix.Event_loop.main_run p_3
 
 (* ocamlfind opt -linkpkg -thread -package lwt.unix code.ml && ./a.out *)
 ]}
@@ -112,7 +112,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt.bind Lwt_io.(read_line stdin) (fun line ->
       Lwt.bind (Lwt_unix.sleep 1.) (fun () ->
         Lwt_io.printf "One second ago, you entered %s\n" line))
@@ -126,7 +126,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt line = Lwt_io.(read_line stdin) in
     let%lwt () = Lwt_unix.sleep 1. in
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -146,7 +146,7 @@ let () =
 open Lwt.Infix
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt_io.(read_line stdin) >>= fun line ->
     Lwt_unix.sleep 1. >>= fun () ->
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -180,7 +180,7 @@ let read_int : unit -> int Lwt.t = fun () ->
     Lwt_io.(read_line stdin)
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt number = read_int () in
     Lwt_io.printf "%i\n" number
   end
diff --git a/src/lib_protocol_environment/sigs/v4.ml b/src/lib_protocol_environment/sigs/v4.ml
index b5ccee2cffffcdffa69edb6d43f54812251d1e83..4c91ce32338e36962cd6d40fa246c707240a4c86 100644
--- a/src/lib_protocol_environment/sigs/v4.ml
+++ b/src/lib_protocol_environment/sigs/v4.ml
@@ -2810,7 +2810,7 @@ let () =
       Lwt_io.(read_line stdin)
       (fun line -> Lwt_io.printl line)
   in
-  Lwt_main.run p_3
+  Tezos_base_unix.Event_loop.main_run p_3
 
 (* ocamlfind opt -linkpkg -thread -package lwt.unix code.ml && ./a.out *)
 ]}
@@ -2844,7 +2844,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt.bind Lwt_io.(read_line stdin) (fun line ->
       Lwt.bind (Lwt_unix.sleep 1.) (fun () ->
         Lwt_io.printf "One second ago, you entered %s\n" line))
@@ -2858,7 +2858,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt line = Lwt_io.(read_line stdin) in
     let%lwt () = Lwt_unix.sleep 1. in
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -2878,7 +2878,7 @@ let () =
 open Lwt.Infix
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt_io.(read_line stdin) >>= fun line ->
     Lwt_unix.sleep 1. >>= fun () ->
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -2912,7 +2912,7 @@ let read_int : unit -> int Lwt.t = fun () ->
     Lwt_io.(read_line stdin)
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt number = read_int () in
     Lwt_io.printf "%i\n" number
   end
diff --git a/src/lib_protocol_environment/sigs/v4/lwt.mli b/src/lib_protocol_environment/sigs/v4/lwt.mli
index 5361fc293adccdcee3df882c1e215a2c5c5cc9ff..c9aab4c626faaf095a6c43eba32d05f53985ab1b 100644
--- a/src/lib_protocol_environment/sigs/v4/lwt.mli
+++ b/src/lib_protocol_environment/sigs/v4/lwt.mli
@@ -78,7 +78,7 @@ let () =
       Lwt_io.(read_line stdin)
       (fun line -> Lwt_io.printl line)
   in
-  Lwt_main.run p_3
+  Tezos_base_unix.Event_loop.main_run p_3
 
 (* ocamlfind opt -linkpkg -thread -package lwt.unix code.ml && ./a.out *)
 ]}
@@ -112,7 +112,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt.bind Lwt_io.(read_line stdin) (fun line ->
       Lwt.bind (Lwt_unix.sleep 1.) (fun () ->
         Lwt_io.printf "One second ago, you entered %s\n" line))
@@ -126,7 +126,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt line = Lwt_io.(read_line stdin) in
     let%lwt () = Lwt_unix.sleep 1. in
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -146,7 +146,7 @@ let () =
 open Lwt.Infix
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt_io.(read_line stdin) >>= fun line ->
     Lwt_unix.sleep 1. >>= fun () ->
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -180,7 +180,7 @@ let read_int : unit -> int Lwt.t = fun () ->
     Lwt_io.(read_line stdin)
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt number = read_int () in
     Lwt_io.printf "%i\n" number
   end
diff --git a/src/lib_protocol_environment/sigs/v5.ml b/src/lib_protocol_environment/sigs/v5.ml
index edb9a8d5d8ec041ecaf40a2c4aa4e63805b3ea34..3e40a3a3642834a734110e7877357e644b3c36fd 100644
--- a/src/lib_protocol_environment/sigs/v5.ml
+++ b/src/lib_protocol_environment/sigs/v5.ml
@@ -2901,7 +2901,7 @@ let () =
       Lwt_io.(read_line stdin)
       (fun line -> Lwt_io.printl line)
   in
-  Lwt_main.run p_3
+  Tezos_base_unix.Event_loop.main_run p_3
 
 (* ocamlfind opt -linkpkg -thread -package lwt.unix code.ml && ./a.out *)
 ]}
@@ -2935,7 +2935,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt.bind Lwt_io.(read_line stdin) (fun line ->
       Lwt.bind (Lwt_unix.sleep 1.) (fun () ->
         Lwt_io.printf "One second ago, you entered %s\n" line))
@@ -2949,7 +2949,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt line = Lwt_io.(read_line stdin) in
     let%lwt () = Lwt_unix.sleep 1. in
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -2969,7 +2969,7 @@ let () =
 open Lwt.Infix
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt_io.(read_line stdin) >>= fun line ->
     Lwt_unix.sleep 1. >>= fun () ->
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -3003,7 +3003,7 @@ let read_int : unit -> int Lwt.t = fun () ->
     Lwt_io.(read_line stdin)
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt number = read_int () in
     Lwt_io.printf "%i\n" number
   end
diff --git a/src/lib_protocol_environment/sigs/v5/lwt.mli b/src/lib_protocol_environment/sigs/v5/lwt.mli
index 5361fc293adccdcee3df882c1e215a2c5c5cc9ff..c9aab4c626faaf095a6c43eba32d05f53985ab1b 100644
--- a/src/lib_protocol_environment/sigs/v5/lwt.mli
+++ b/src/lib_protocol_environment/sigs/v5/lwt.mli
@@ -78,7 +78,7 @@ let () =
       Lwt_io.(read_line stdin)
       (fun line -> Lwt_io.printl line)
   in
-  Lwt_main.run p_3
+  Tezos_base_unix.Event_loop.main_run p_3
 
 (* ocamlfind opt -linkpkg -thread -package lwt.unix code.ml && ./a.out *)
 ]}
@@ -112,7 +112,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt.bind Lwt_io.(read_line stdin) (fun line ->
       Lwt.bind (Lwt_unix.sleep 1.) (fun () ->
         Lwt_io.printf "One second ago, you entered %s\n" line))
@@ -126,7 +126,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt line = Lwt_io.(read_line stdin) in
     let%lwt () = Lwt_unix.sleep 1. in
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -146,7 +146,7 @@ let () =
 open Lwt.Infix
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt_io.(read_line stdin) >>= fun line ->
     Lwt_unix.sleep 1. >>= fun () ->
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -180,7 +180,7 @@ let read_int : unit -> int Lwt.t = fun () ->
     Lwt_io.(read_line stdin)
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt number = read_int () in
     Lwt_io.printf "%i\n" number
   end
diff --git a/src/lib_protocol_environment/sigs/v6.ml b/src/lib_protocol_environment/sigs/v6.ml
index 223da4e135ec99858b6fea9360948aa9c348d7b9..10db21b05aa8cb626a775432c88677ac7f177e43 100644
--- a/src/lib_protocol_environment/sigs/v6.ml
+++ b/src/lib_protocol_environment/sigs/v6.ml
@@ -2901,7 +2901,7 @@ let () =
       Lwt_io.(read_line stdin)
       (fun line -> Lwt_io.printl line)
   in
-  Lwt_main.run p_3
+  Tezos_base_unix.Event_loop.main_run p_3
 
 (* ocamlfind opt -linkpkg -thread -package lwt.unix code.ml && ./a.out *)
 ]}
@@ -2935,7 +2935,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt.bind Lwt_io.(read_line stdin) (fun line ->
       Lwt.bind (Lwt_unix.sleep 1.) (fun () ->
         Lwt_io.printf "One second ago, you entered %s\n" line))
@@ -2949,7 +2949,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt line = Lwt_io.(read_line stdin) in
     let%lwt () = Lwt_unix.sleep 1. in
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -2969,7 +2969,7 @@ let () =
 open Lwt.Infix
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt_io.(read_line stdin) >>= fun line ->
     Lwt_unix.sleep 1. >>= fun () ->
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -3003,7 +3003,7 @@ let read_int : unit -> int Lwt.t = fun () ->
     Lwt_io.(read_line stdin)
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt number = read_int () in
     Lwt_io.printf "%i\n" number
   end
diff --git a/src/lib_protocol_environment/sigs/v6/lwt.mli b/src/lib_protocol_environment/sigs/v6/lwt.mli
index 5361fc293adccdcee3df882c1e215a2c5c5cc9ff..c9aab4c626faaf095a6c43eba32d05f53985ab1b 100644
--- a/src/lib_protocol_environment/sigs/v6/lwt.mli
+++ b/src/lib_protocol_environment/sigs/v6/lwt.mli
@@ -78,7 +78,7 @@ let () =
       Lwt_io.(read_line stdin)
       (fun line -> Lwt_io.printl line)
   in
-  Lwt_main.run p_3
+  Tezos_base_unix.Event_loop.main_run p_3
 
 (* ocamlfind opt -linkpkg -thread -package lwt.unix code.ml && ./a.out *)
 ]}
@@ -112,7 +112,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt.bind Lwt_io.(read_line stdin) (fun line ->
       Lwt.bind (Lwt_unix.sleep 1.) (fun () ->
         Lwt_io.printf "One second ago, you entered %s\n" line))
@@ -126,7 +126,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt line = Lwt_io.(read_line stdin) in
     let%lwt () = Lwt_unix.sleep 1. in
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -146,7 +146,7 @@ let () =
 open Lwt.Infix
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt_io.(read_line stdin) >>= fun line ->
     Lwt_unix.sleep 1. >>= fun () ->
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -180,7 +180,7 @@ let read_int : unit -> int Lwt.t = fun () ->
     Lwt_io.(read_line stdin)
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt number = read_int () in
     Lwt_io.printf "%i\n" number
   end
diff --git a/src/lib_protocol_environment/sigs/v7.ml b/src/lib_protocol_environment/sigs/v7.ml
index c8e22adc217fff8280dead6fc37d3595c6c45c0e..ac68701225eda64d40b632e1549996b6a2dae374 100644
--- a/src/lib_protocol_environment/sigs/v7.ml
+++ b/src/lib_protocol_environment/sigs/v7.ml
@@ -3180,7 +3180,7 @@ let () =
       Lwt_io.(read_line stdin)
       (fun line -> Lwt_io.printl line)
   in
-  Lwt_main.run p_3
+  Tezos_base_unix.Event_loop.main_run p_3
 
 (* ocamlfind opt -linkpkg -thread -package lwt.unix code.ml && ./a.out *)
 ]}
@@ -3214,7 +3214,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt.bind Lwt_io.(read_line stdin) (fun line ->
       Lwt.bind (Lwt_unix.sleep 1.) (fun () ->
         Lwt_io.printf "One second ago, you entered %s\n" line))
@@ -3228,7 +3228,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt line = Lwt_io.(read_line stdin) in
     let%lwt () = Lwt_unix.sleep 1. in
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -3248,7 +3248,7 @@ let () =
 open Lwt.Infix
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt_io.(read_line stdin) >>= fun line ->
     Lwt_unix.sleep 1. >>= fun () ->
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -3292,7 +3292,7 @@ let read_int : unit -> int Lwt.t = fun () ->
     Lwt_io.(read_line stdin)
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt number = read_int () in
     Lwt_io.printf "%i\n" number
   end
diff --git a/src/lib_protocol_environment/sigs/v7/lwt.mli b/src/lib_protocol_environment/sigs/v7/lwt.mli
index 3540ecae0eb2d55b6e5dce095b559dac5ed6350e..b05fa364035a18ce0d0b84ecebcd80567d6e9221 100644
--- a/src/lib_protocol_environment/sigs/v7/lwt.mli
+++ b/src/lib_protocol_environment/sigs/v7/lwt.mli
@@ -85,7 +85,7 @@ let () =
       Lwt_io.(read_line stdin)
       (fun line -> Lwt_io.printl line)
   in
-  Lwt_main.run p_3
+  Tezos_base_unix.Event_loop.main_run p_3
 
 (* ocamlfind opt -linkpkg -thread -package lwt.unix code.ml && ./a.out *)
 ]}
@@ -119,7 +119,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt.bind Lwt_io.(read_line stdin) (fun line ->
       Lwt.bind (Lwt_unix.sleep 1.) (fun () ->
         Lwt_io.printf "One second ago, you entered %s\n" line))
@@ -133,7 +133,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt line = Lwt_io.(read_line stdin) in
     let%lwt () = Lwt_unix.sleep 1. in
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -153,7 +153,7 @@ let () =
 open Lwt.Infix
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt_io.(read_line stdin) >>= fun line ->
     Lwt_unix.sleep 1. >>= fun () ->
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -197,7 +197,7 @@ let read_int : unit -> int Lwt.t = fun () ->
     Lwt_io.(read_line stdin)
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt number = read_int () in
     Lwt_io.printf "%i\n" number
   end
diff --git a/src/lib_protocol_environment/sigs/v8.ml b/src/lib_protocol_environment/sigs/v8.ml
index 2c3a02707306573c2a2fbd831a6c744f70851ea9..d7444e66bbdb470ef2550cdd25d944746fc155f5 100644
--- a/src/lib_protocol_environment/sigs/v8.ml
+++ b/src/lib_protocol_environment/sigs/v8.ml
@@ -3238,7 +3238,7 @@ let () =
       Lwt_io.(read_line stdin)
       (fun line -> Lwt_io.printl line)
   in
-  Lwt_main.run p_3
+  Tezos_base_unix.Event_loop.main_run p_3
 
 (* ocamlfind opt -linkpkg -thread -package lwt.unix code.ml && ./a.out *)
 ]}
@@ -3272,7 +3272,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt.bind Lwt_io.(read_line stdin) (fun line ->
       Lwt.bind (Lwt_unix.sleep 1.) (fun () ->
         Lwt_io.printf "One second ago, you entered %s\n" line))
@@ -3286,7 +3286,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt line = Lwt_io.(read_line stdin) in
     let%lwt () = Lwt_unix.sleep 1. in
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -3306,7 +3306,7 @@ let () =
 open Lwt.Infix
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt_io.(read_line stdin) >>= fun line ->
     Lwt_unix.sleep 1. >>= fun () ->
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -3350,7 +3350,7 @@ let read_int : unit -> int Lwt.t = fun () ->
     Lwt_io.(read_line stdin)
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt number = read_int () in
     Lwt_io.printf "%i\n" number
   end
diff --git a/src/lib_protocol_environment/sigs/v8/lwt.mli b/src/lib_protocol_environment/sigs/v8/lwt.mli
index 3540ecae0eb2d55b6e5dce095b559dac5ed6350e..b05fa364035a18ce0d0b84ecebcd80567d6e9221 100644
--- a/src/lib_protocol_environment/sigs/v8/lwt.mli
+++ b/src/lib_protocol_environment/sigs/v8/lwt.mli
@@ -85,7 +85,7 @@ let () =
       Lwt_io.(read_line stdin)
       (fun line -> Lwt_io.printl line)
   in
-  Lwt_main.run p_3
+  Tezos_base_unix.Event_loop.main_run p_3
 
 (* ocamlfind opt -linkpkg -thread -package lwt.unix code.ml && ./a.out *)
 ]}
@@ -119,7 +119,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt.bind Lwt_io.(read_line stdin) (fun line ->
       Lwt.bind (Lwt_unix.sleep 1.) (fun () ->
         Lwt_io.printf "One second ago, you entered %s\n" line))
@@ -133,7 +133,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt line = Lwt_io.(read_line stdin) in
     let%lwt () = Lwt_unix.sleep 1. in
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -153,7 +153,7 @@ let () =
 open Lwt.Infix
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt_io.(read_line stdin) >>= fun line ->
     Lwt_unix.sleep 1. >>= fun () ->
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -197,7 +197,7 @@ let read_int : unit -> int Lwt.t = fun () ->
     Lwt_io.(read_line stdin)
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt number = read_int () in
     Lwt_io.printf "%i\n" number
   end
diff --git a/src/lib_protocol_environment/sigs/v9.ml b/src/lib_protocol_environment/sigs/v9.ml
index badab5a6546a63dc2f38f92410881b48e3fc0988..300b85ec75dc31404f3bdbbb177d596ffa9f0e39 100644
--- a/src/lib_protocol_environment/sigs/v9.ml
+++ b/src/lib_protocol_environment/sigs/v9.ml
@@ -3238,7 +3238,7 @@ let () =
       Lwt_io.(read_line stdin)
       (fun line -> Lwt_io.printl line)
   in
-  Lwt_main.run p_3
+  Tezos_base_unix.Event_loop.main_run p_3
 
 (* ocamlfind opt -linkpkg -thread -package lwt.unix code.ml && ./a.out *)
 ]}
@@ -3272,7 +3272,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt.bind Lwt_io.(read_line stdin) (fun line ->
       Lwt.bind (Lwt_unix.sleep 1.) (fun () ->
         Lwt_io.printf "One second ago, you entered %s\n" line))
@@ -3286,7 +3286,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt line = Lwt_io.(read_line stdin) in
     let%lwt () = Lwt_unix.sleep 1. in
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -3306,7 +3306,7 @@ let () =
 open Lwt.Infix
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt_io.(read_line stdin) >>= fun line ->
     Lwt_unix.sleep 1. >>= fun () ->
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -3350,7 +3350,7 @@ let read_int : unit -> int Lwt.t = fun () ->
     Lwt_io.(read_line stdin)
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt number = read_int () in
     Lwt_io.printf "%i\n" number
   end
diff --git a/src/lib_protocol_environment/sigs/v9/lwt.mli b/src/lib_protocol_environment/sigs/v9/lwt.mli
index 3540ecae0eb2d55b6e5dce095b559dac5ed6350e..b05fa364035a18ce0d0b84ecebcd80567d6e9221 100644
--- a/src/lib_protocol_environment/sigs/v9/lwt.mli
+++ b/src/lib_protocol_environment/sigs/v9/lwt.mli
@@ -85,7 +85,7 @@ let () =
       Lwt_io.(read_line stdin)
       (fun line -> Lwt_io.printl line)
   in
-  Lwt_main.run p_3
+  Tezos_base_unix.Event_loop.main_run p_3
 
 (* ocamlfind opt -linkpkg -thread -package lwt.unix code.ml && ./a.out *)
 ]}
@@ -119,7 +119,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt.bind Lwt_io.(read_line stdin) (fun line ->
       Lwt.bind (Lwt_unix.sleep 1.) (fun () ->
         Lwt_io.printf "One second ago, you entered %s\n" line))
@@ -133,7 +133,7 @@ let () =
 
 {[
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt line = Lwt_io.(read_line stdin) in
     let%lwt () = Lwt_unix.sleep 1. in
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -153,7 +153,7 @@ let () =
 open Lwt.Infix
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     Lwt_io.(read_line stdin) >>= fun line ->
     Lwt_unix.sleep 1. >>= fun () ->
     Lwt_io.printf "One second ago, you entered %s\n" line
@@ -197,7 +197,7 @@ let read_int : unit -> int Lwt.t = fun () ->
     Lwt_io.(read_line stdin)
 
 let () =
-  Lwt_main.run begin
+  Tezos_base_unix.Event_loop.main_run begin
     let%lwt number = read_int () in
     Lwt_io.printf "%i\n" number
   end
diff --git a/src/lib_rpc_process/main.ml b/src/lib_rpc_process/main.ml
index 78002b6fa568414690f8f09715f8c12f2180eafc..bc87a8c3995ce952989a986dfd62950de519983a 100644
--- a/src/lib_rpc_process/main.ml
+++ b/src/lib_rpc_process/main.ml
@@ -285,7 +285,7 @@ let process socket_dir =
   let main_promise =
     Lwt.catch (fun () -> run socket_dir) (function exn -> fail_with_exn exn)
   in
-  Lwt_main.run
+  Tezos_base_unix.Event_loop.main_run
     (let*! r = Lwt_exit.wrap_and_exit main_promise in
      match r with
      | Ok () ->
diff --git a/src/lib_validation/command_line.ml b/src/lib_validation/command_line.ml
index 6387c3113cee71c01bdc5103abff4b1fc4ba3639..762833f31de74ff711608c00f6ef78fe2eeae1f1 100644
--- a/src/lib_validation/command_line.ml
+++ b/src/lib_validation/command_line.ml
@@ -67,7 +67,7 @@ let run () =
   Stdlib.exit
     (let open Lwt_syntax in
      Lwt.Exception_filter.(set handle_all_except_runtime) ;
-     Lwt_main.run
+     Tezos_base_unix.Event_loop.main_run
        (let* r = Lwt_exit.wrap_and_exit main_promise in
         match r with
         | Ok () -> Lwt_exit.exit_and_wait 0