diff --git a/docs/alpha/smart_rollups.rst b/docs/alpha/smart_rollups.rst
index 8d22a186dc19985f155ea0bdba483400cf596c61..d0245c86ba6807842e2cbd0ea02853f0bb926b26 100644
--- a/docs/alpha/smart_rollups.rst
+++ b/docs/alpha/smart_rollups.rst
@@ -98,7 +98,7 @@ kernel.
 
 There are two ways for an end-user to push an external message to the
 rollups inbox: first, she can inject the dedicated layer-1 operation
-using the Octez client (see command ``send sc rollup message
+using the Octez client (see command ``send smart rollup message
 <messages> from <src>``) ; second, she can use the batcher
 of a smart rollup node. More details can be found in :ref:`sending_external_inbox_message_alpha`.
 
@@ -330,7 +330,7 @@ the Octez client:
 
 .. code:: sh
 
-    octez-client originate sc rollup from "${OPERATOR_ADDR}" \
+    octez-client originate smart rollup from "${OPERATOR_ADDR}" \
       of kind wasm_2_0_0 \
       of type bytes \
       with kernel "${KERNEL}" \
diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_client/commands.ml b/src/proto_016_PtMumbai/bin_sc_rollup_client/commands.ml
index cd492698bddecf221397a95f0ac0719953ce8d0c..6e64a0af47453d05517a1ca65f08b9c0c5d9db0e 100644
--- a/src/proto_016_PtMumbai/bin_sc_rollup_client/commands.ml
+++ b/src/proto_016_PtMumbai/bin_sc_rollup_client/commands.ml
@@ -47,10 +47,9 @@ let block_arg =
 
 let get_sc_rollup_addresses_command () =
   Tezos_clic.command
-    ~desc:
-      "Retrieve the smart-contract rollup address the node is interacting with."
+    ~desc:"Retrieve the smart rollup address the node is interacting with."
     Tezos_clic.no_options
-    (Tezos_clic.fixed ["get"; "sc"; "rollup"; "address"])
+    (Tezos_clic.fixed ["get"; "smart"; "rollup"; "address"])
     (fun () (cctxt : #Configuration.sc_client_context) ->
       RPC.get_sc_rollup_addresses_command cctxt >>=? fun addr ->
       cctxt#message "@[%a@]" Sc_rollup.Address.pp addr >>= fun () -> return_unit)
diff --git a/src/proto_016_PtMumbai/lib_client_commands/client_proto_context_commands.ml b/src/proto_016_PtMumbai/lib_client_commands/client_proto_context_commands.ml
index 2cba3a052d678424e5c183f9acafae2830e5bf23..1987478030af59bfa4a6a43dd1e50488cfbdca77 100644
--- a/src/proto_016_PtMumbai/lib_client_commands/client_proto_context_commands.ml
+++ b/src/proto_016_PtMumbai/lib_client_commands/client_proto_context_commands.ml
@@ -3244,7 +3244,7 @@ let commands_rw () =
         | None -> cctxt#error "ticket quantity should not be zero or negative");
     command
       ~group
-      ~desc:"Originate a new smart-contract rollup."
+      ~desc:"Originate a new smart rollup."
       (args7
          fee_arg
          dry_run_switch
@@ -3253,26 +3253,26 @@ let commands_rw () =
          fee_parameter_args
          storage_limit_arg
          counter_arg)
-      (prefixes ["originate"; "sc"; "rollup"; "from"]
+      (prefixes ["originate"; "smart"; "rollup"; "from"]
       @@ Client_keys.Public_key_hash.source_param
            ~name:"src"
-           ~desc:"Name of the account originating the smart-contract rollup."
+           ~desc:"Name of the account originating the smart rollup."
       @@ prefixes ["of"; "kind"]
       @@ param
-           ~name:"sc_rollup_kind"
-           ~desc:"Kind of the smart-contract rollup to be originated."
+           ~name:"smart_rollup_kind"
+           ~desc:"Kind of the smart rollup to be originated."
            Sc_rollup_params.rollup_kind_parameter
       @@ prefixes ["of"; "type"]
       @@ param
            ~name:"parameters_type"
            ~desc:
-             "The interface of the smart-contract rollup including its \
-              entrypoints and their signatures."
+             "The interface of the smart rollup including its entrypoints and \
+              their signatures."
            data_parameter
       @@ prefixes ["with"; "kernel"]
       @@ param
            ~name:"kernel"
-           ~desc:"The kernel for the smart-contract rollup."
+           ~desc:"The kernel for the smart rollup."
            Sc_rollup_params.boot_sector_parameter
       @@ stop)
       (fun ( fee,
@@ -3317,7 +3317,7 @@ let commands_rw () =
         return_unit);
     command
       ~group
-      ~desc:"Send one or more messages to a smart-contract rollup."
+      ~desc:"Send one or more messages to a smart rollup."
       (args7
          fee_arg
          dry_run_switch
@@ -3326,7 +3326,7 @@ let commands_rw () =
          fee_parameter_args
          storage_limit_arg
          counter_arg)
-      (prefixes ["send"; "sc"; "rollup"; "message"]
+      (prefixes ["send"; "smart"; "rollup"; "message"]
       @@ param
            ~name:"messages"
            ~desc:
@@ -3398,7 +3398,7 @@ let commands_rw () =
         return_unit);
     command
       ~group
-      ~desc:"Publish a commitment for a sc rollup"
+      ~desc:"Publish a commitment for a smart rollup"
       (args7
          fee_arg
          dry_run_switch
@@ -3412,17 +3412,17 @@ let commands_rw () =
       @@ Client_keys.Public_key_hash.source_param
            ~name:"src"
            ~desc:"Name of the source contract."
-      @@ prefixes ["for"; "sc"; "rollup"]
+      @@ prefixes ["for"; "smart"; "rollup"]
       @@ param
-           ~name:"sc_rollup"
+           ~name:"smart_rollup_address"
            ~desc:
-             "The address of the sc rollup where the commitment will be \
+             "The address of the smart rollup where the commitment will be \
               published."
            Sc_rollup_params.sc_rollup_address_parameter
       @@ prefixes ["with"; "compressed"; "state"]
       @@ param
            ~name:"compressed_state"
-           ~desc:"The compressed state of the sc rollup for the commitment."
+           ~desc:"The compressed state of the smart rollup for the commitment."
            Sc_rollup_params.compressed_state_parameter
       @@ prefixes ["at"; "inbox"; "level"]
       @@ param
@@ -3482,7 +3482,7 @@ let commands_rw () =
         return_unit);
     command
       ~group
-      ~desc:"Cement a commitment for a sc rollup."
+      ~desc:"Cement a commitment for a smart rollup."
       (args7
          fee_arg
          dry_run_switch
@@ -3494,17 +3494,17 @@ let commands_rw () =
       (prefixes ["cement"; "commitment"]
       @@ param
            ~name:"commitment"
-           ~desc:"The hash of the commitment to be cemented for a sc rollup."
+           ~desc:"The hash of the commitment to be cemented for a smart rollup."
            Sc_rollup_params.commitment_hash_parameter
       @@ prefixes ["from"]
       @@ Client_keys.Public_key_hash.source_param
            ~name:"src"
            ~desc:"Name of the source contract."
-      @@ prefixes ["for"; "sc"; "rollup"]
+      @@ prefixes ["for"; "smart"; "rollup"]
       @@ param
-           ~name:"sc_rollup"
+           ~name:"smart_rollup_address"
            ~desc:
-             "The address of the sc rollup where the commitment will be \
+             "The address of the smart rollup of which the commitment will be \
               cemented."
            Sc_rollup_params.sc_rollup_address_parameter
       @@ stop)
@@ -3544,7 +3544,7 @@ let commands_rw () =
         return_unit);
     command
       ~group
-      ~desc:"Timeout a staker from dispute on a smart-contract rollup."
+      ~desc:"Timeout a staker from dispute on a smart rollup."
       (args7
          fee_arg
          dry_run_switch
@@ -3553,12 +3553,12 @@ let commands_rw () =
          storage_limit_arg
          counter_arg
          fee_parameter_args)
-      (prefixes ["timeout"; "dispute"; "on"; "sc"; "rollup"]
+      (prefixes ["timeout"; "dispute"; "on"; "smart"; "rollup"]
       @@ param
-           ~name:"sc_rollup"
+           ~name:"smart_rollup_address"
            ~desc:
-             "The address of the smart-contract rollup where the staker of the \
-              dispute has timed-out."
+             "The address of the smart rollup where the staker of the dispute \
+              has timed-out."
            Sc_rollup_params.sc_rollup_address_parameter
       @@ prefixes ["with"]
       @@ Client_keys.Public_key_hash.source_param
@@ -3635,9 +3635,9 @@ let commands_rw () =
         return_unit);
     command
       ~group
-      ~desc:"List originated smart-contract rollups."
+      ~desc:"List originated smart rollups."
       no_options
-      (prefixes ["list"; "sc"; "rollups"] @@ stop)
+      (prefixes ["list"; "smart"; "rollups"] @@ stop)
       (fun () (cctxt : Protocol_client_context.full) ->
         let open Lwt_result_syntax in
         let* rollups =
@@ -3653,7 +3653,7 @@ let commands_rw () =
     command
       ~group
       ~desc:
-        "Execute a message from a smart-contract rollup's outbox of a cemented \
+        "Execute a message from a smart rollup's outbox of a cemented \
          commitment."
       (args7
          fee_arg
@@ -3663,12 +3663,10 @@ let commands_rw () =
          fee_parameter_args
          storage_limit_arg
          counter_arg)
-      (prefixes ["execute"; "outbox"; "message"; "of"; "sc"; "rollup"]
+      (prefixes ["execute"; "outbox"; "message"; "of"; "smart"; "rollup"]
       @@ param
-           ~name:"rollup"
-           ~desc:
-             "The address of the smart-contract rollup where the message \
-              resides."
+           ~name:"smart_rollup_address"
+           ~desc:"The address of the smart rollup where the message resides."
            Sc_rollup_params.sc_rollup_address_parameter
       @@ prefix "from"
       @@ Client_keys.Public_key_hash.source_param
@@ -3724,7 +3722,7 @@ let commands_rw () =
         return_unit);
     command
       ~group
-      ~desc:"Recover commitment bond from a smart contract rollup."
+      ~desc:"Recover commitment bond from a smart rollup."
       (args7
          fee_arg
          dry_run_switch
@@ -3737,10 +3735,10 @@ let commands_rw () =
       @@ Client_keys.Public_key_hash.source_param
            ~name:"staker"
            ~desc:"The implicit account that owns the frozen bond."
-      @@ prefixes ["for"; "sc"; "rollup"]
+      @@ prefixes ["for"; "smart"; "rollup"]
       @@ Tezos_clic.param
-           ~name:"smart contract rollup address"
-           ~desc:"The address of the smart-contract rollup of the bond."
+           ~name:"smart rollup address"
+           ~desc:"The address of the smart rollup of the bond."
            Sc_rollup_params.sc_rollup_address_parameter
       @@ prefixes ["from"]
       @@ Client_keys.Public_key_hash.source_param
diff --git a/src/proto_alpha/bin_sc_rollup_client/commands.ml b/src/proto_alpha/bin_sc_rollup_client/commands.ml
index cd492698bddecf221397a95f0ac0719953ce8d0c..6e64a0af47453d05517a1ca65f08b9c0c5d9db0e 100644
--- a/src/proto_alpha/bin_sc_rollup_client/commands.ml
+++ b/src/proto_alpha/bin_sc_rollup_client/commands.ml
@@ -47,10 +47,9 @@ let block_arg =
 
 let get_sc_rollup_addresses_command () =
   Tezos_clic.command
-    ~desc:
-      "Retrieve the smart-contract rollup address the node is interacting with."
+    ~desc:"Retrieve the smart rollup address the node is interacting with."
     Tezos_clic.no_options
-    (Tezos_clic.fixed ["get"; "sc"; "rollup"; "address"])
+    (Tezos_clic.fixed ["get"; "smart"; "rollup"; "address"])
     (fun () (cctxt : #Configuration.sc_client_context) ->
       RPC.get_sc_rollup_addresses_command cctxt >>=? fun addr ->
       cctxt#message "@[%a@]" Sc_rollup.Address.pp addr >>= fun () -> return_unit)
diff --git a/src/proto_alpha/lib_client_commands/client_proto_context_commands.ml b/src/proto_alpha/lib_client_commands/client_proto_context_commands.ml
index 2cba3a052d678424e5c183f9acafae2830e5bf23..1987478030af59bfa4a6a43dd1e50488cfbdca77 100644
--- a/src/proto_alpha/lib_client_commands/client_proto_context_commands.ml
+++ b/src/proto_alpha/lib_client_commands/client_proto_context_commands.ml
@@ -3244,7 +3244,7 @@ let commands_rw () =
         | None -> cctxt#error "ticket quantity should not be zero or negative");
     command
       ~group
-      ~desc:"Originate a new smart-contract rollup."
+      ~desc:"Originate a new smart rollup."
       (args7
          fee_arg
          dry_run_switch
@@ -3253,26 +3253,26 @@ let commands_rw () =
          fee_parameter_args
          storage_limit_arg
          counter_arg)
-      (prefixes ["originate"; "sc"; "rollup"; "from"]
+      (prefixes ["originate"; "smart"; "rollup"; "from"]
       @@ Client_keys.Public_key_hash.source_param
            ~name:"src"
-           ~desc:"Name of the account originating the smart-contract rollup."
+           ~desc:"Name of the account originating the smart rollup."
       @@ prefixes ["of"; "kind"]
       @@ param
-           ~name:"sc_rollup_kind"
-           ~desc:"Kind of the smart-contract rollup to be originated."
+           ~name:"smart_rollup_kind"
+           ~desc:"Kind of the smart rollup to be originated."
            Sc_rollup_params.rollup_kind_parameter
       @@ prefixes ["of"; "type"]
       @@ param
            ~name:"parameters_type"
            ~desc:
-             "The interface of the smart-contract rollup including its \
-              entrypoints and their signatures."
+             "The interface of the smart rollup including its entrypoints and \
+              their signatures."
            data_parameter
       @@ prefixes ["with"; "kernel"]
       @@ param
            ~name:"kernel"
-           ~desc:"The kernel for the smart-contract rollup."
+           ~desc:"The kernel for the smart rollup."
            Sc_rollup_params.boot_sector_parameter
       @@ stop)
       (fun ( fee,
@@ -3317,7 +3317,7 @@ let commands_rw () =
         return_unit);
     command
       ~group
-      ~desc:"Send one or more messages to a smart-contract rollup."
+      ~desc:"Send one or more messages to a smart rollup."
       (args7
          fee_arg
          dry_run_switch
@@ -3326,7 +3326,7 @@ let commands_rw () =
          fee_parameter_args
          storage_limit_arg
          counter_arg)
-      (prefixes ["send"; "sc"; "rollup"; "message"]
+      (prefixes ["send"; "smart"; "rollup"; "message"]
       @@ param
            ~name:"messages"
            ~desc:
@@ -3398,7 +3398,7 @@ let commands_rw () =
         return_unit);
     command
       ~group
-      ~desc:"Publish a commitment for a sc rollup"
+      ~desc:"Publish a commitment for a smart rollup"
       (args7
          fee_arg
          dry_run_switch
@@ -3412,17 +3412,17 @@ let commands_rw () =
       @@ Client_keys.Public_key_hash.source_param
            ~name:"src"
            ~desc:"Name of the source contract."
-      @@ prefixes ["for"; "sc"; "rollup"]
+      @@ prefixes ["for"; "smart"; "rollup"]
       @@ param
-           ~name:"sc_rollup"
+           ~name:"smart_rollup_address"
            ~desc:
-             "The address of the sc rollup where the commitment will be \
+             "The address of the smart rollup where the commitment will be \
               published."
            Sc_rollup_params.sc_rollup_address_parameter
       @@ prefixes ["with"; "compressed"; "state"]
       @@ param
            ~name:"compressed_state"
-           ~desc:"The compressed state of the sc rollup for the commitment."
+           ~desc:"The compressed state of the smart rollup for the commitment."
            Sc_rollup_params.compressed_state_parameter
       @@ prefixes ["at"; "inbox"; "level"]
       @@ param
@@ -3482,7 +3482,7 @@ let commands_rw () =
         return_unit);
     command
       ~group
-      ~desc:"Cement a commitment for a sc rollup."
+      ~desc:"Cement a commitment for a smart rollup."
       (args7
          fee_arg
          dry_run_switch
@@ -3494,17 +3494,17 @@ let commands_rw () =
       (prefixes ["cement"; "commitment"]
       @@ param
            ~name:"commitment"
-           ~desc:"The hash of the commitment to be cemented for a sc rollup."
+           ~desc:"The hash of the commitment to be cemented for a smart rollup."
            Sc_rollup_params.commitment_hash_parameter
       @@ prefixes ["from"]
       @@ Client_keys.Public_key_hash.source_param
            ~name:"src"
            ~desc:"Name of the source contract."
-      @@ prefixes ["for"; "sc"; "rollup"]
+      @@ prefixes ["for"; "smart"; "rollup"]
       @@ param
-           ~name:"sc_rollup"
+           ~name:"smart_rollup_address"
            ~desc:
-             "The address of the sc rollup where the commitment will be \
+             "The address of the smart rollup of which the commitment will be \
               cemented."
            Sc_rollup_params.sc_rollup_address_parameter
       @@ stop)
@@ -3544,7 +3544,7 @@ let commands_rw () =
         return_unit);
     command
       ~group
-      ~desc:"Timeout a staker from dispute on a smart-contract rollup."
+      ~desc:"Timeout a staker from dispute on a smart rollup."
       (args7
          fee_arg
          dry_run_switch
@@ -3553,12 +3553,12 @@ let commands_rw () =
          storage_limit_arg
          counter_arg
          fee_parameter_args)
-      (prefixes ["timeout"; "dispute"; "on"; "sc"; "rollup"]
+      (prefixes ["timeout"; "dispute"; "on"; "smart"; "rollup"]
       @@ param
-           ~name:"sc_rollup"
+           ~name:"smart_rollup_address"
            ~desc:
-             "The address of the smart-contract rollup where the staker of the \
-              dispute has timed-out."
+             "The address of the smart rollup where the staker of the dispute \
+              has timed-out."
            Sc_rollup_params.sc_rollup_address_parameter
       @@ prefixes ["with"]
       @@ Client_keys.Public_key_hash.source_param
@@ -3635,9 +3635,9 @@ let commands_rw () =
         return_unit);
     command
       ~group
-      ~desc:"List originated smart-contract rollups."
+      ~desc:"List originated smart rollups."
       no_options
-      (prefixes ["list"; "sc"; "rollups"] @@ stop)
+      (prefixes ["list"; "smart"; "rollups"] @@ stop)
       (fun () (cctxt : Protocol_client_context.full) ->
         let open Lwt_result_syntax in
         let* rollups =
@@ -3653,7 +3653,7 @@ let commands_rw () =
     command
       ~group
       ~desc:
-        "Execute a message from a smart-contract rollup's outbox of a cemented \
+        "Execute a message from a smart rollup's outbox of a cemented \
          commitment."
       (args7
          fee_arg
@@ -3663,12 +3663,10 @@ let commands_rw () =
          fee_parameter_args
          storage_limit_arg
          counter_arg)
-      (prefixes ["execute"; "outbox"; "message"; "of"; "sc"; "rollup"]
+      (prefixes ["execute"; "outbox"; "message"; "of"; "smart"; "rollup"]
       @@ param
-           ~name:"rollup"
-           ~desc:
-             "The address of the smart-contract rollup where the message \
-              resides."
+           ~name:"smart_rollup_address"
+           ~desc:"The address of the smart rollup where the message resides."
            Sc_rollup_params.sc_rollup_address_parameter
       @@ prefix "from"
       @@ Client_keys.Public_key_hash.source_param
@@ -3724,7 +3722,7 @@ let commands_rw () =
         return_unit);
     command
       ~group
-      ~desc:"Recover commitment bond from a smart contract rollup."
+      ~desc:"Recover commitment bond from a smart rollup."
       (args7
          fee_arg
          dry_run_switch
@@ -3737,10 +3735,10 @@ let commands_rw () =
       @@ Client_keys.Public_key_hash.source_param
            ~name:"staker"
            ~desc:"The implicit account that owns the frozen bond."
-      @@ prefixes ["for"; "sc"; "rollup"]
+      @@ prefixes ["for"; "smart"; "rollup"]
       @@ Tezos_clic.param
-           ~name:"smart contract rollup address"
-           ~desc:"The address of the smart-contract rollup of the bond."
+           ~name:"smart rollup address"
+           ~desc:"The address of the smart rollup of the bond."
            Sc_rollup_params.sc_rollup_address_parameter
       @@ prefixes ["from"]
       @@ Client_keys.Public_key_hash.source_param
diff --git a/tezt/lib_tezos/client.ml b/tezt/lib_tezos/client.ml
index 8b0e30ffd778e729cba03b01ee83cfdd48ed920e..10e8c90d14439c98ca5866d4617729c58bebd362 100644
--- a/tezt/lib_tezos/client.ml
+++ b/tezt/lib_tezos/client.ml
@@ -2118,7 +2118,7 @@ module Sc_rollup = struct
       (["--wait"; wait]
       @ [
           "originate";
-          "sc";
+          "smart";
           "rollup";
           "from";
           src;
@@ -2160,7 +2160,7 @@ module Sc_rollup = struct
       ?hooks
       client
       (["--wait"; wait]
-      @ ["send"; "sc"; "rollup"; "message"; msg; "from"; src]
+      @ ["send"; "smart"; "rollup"; "message"; msg; "from"; src]
       @ optional_arg "burn-cap" Tez.to_string burn_cap)
 
   let send_message ?hooks ?wait ?burn_cap ~msg ~src client =
@@ -2180,7 +2180,7 @@ module Sc_rollup = struct
             "from";
             src;
             "for";
-            "sc";
+            "smart";
             "rollup";
             sc_rollup;
             "with";
@@ -2213,7 +2213,15 @@ module Sc_rollup = struct
         client
         (["--wait"; wait]
         @ [
-            "cement"; "commitment"; hash; "from"; src; "for"; "sc"; "rollup"; dst;
+            "cement";
+            "commitment";
+            hash;
+            "from";
+            src;
+            "for";
+            "smart";
+            "rollup";
+            dst;
           ]
         @ optional_arg "burn-cap" Tez.to_string burn_cap)
     in
@@ -2231,7 +2239,7 @@ module Sc_rollup = struct
             "timeout";
             "dispute";
             "on";
-            "sc";
+            "smart";
             "rollup";
             dst;
             "with";
@@ -2259,7 +2267,7 @@ module Sc_rollup = struct
             "of";
             staker;
             "for";
-            "sc";
+            "smart";
             "rollup";
             rollup;
             "from";
@@ -2290,7 +2298,7 @@ module Sc_rollup = struct
         ?hooks
         client
         (["--wait"; wait]
-        @ ["execute"; "outbox"; "message"; "of"; "sc"; "rollup"; rollup]
+        @ ["execute"; "outbox"; "message"; "of"; "smart"; "rollup"; rollup]
         @ ["from"; src]
         @ ["for"; "commitment"; "hash"; commitment_hash]
         @ ["and"; "output"; "proof"; proof]
diff --git a/tezt/lib_tezos/sc_rollup_client.ml b/tezt/lib_tezos/sc_rollup_client.ml
index 108f4028939d90dad76e56c7d08e6e91d20fe69a..33733c71a0fc5514d58bab368f0dd49ab01a5d82 100644
--- a/tezt/lib_tezos/sc_rollup_client.ml
+++ b/tezt/lib_tezos/sc_rollup_client.ml
@@ -108,7 +108,7 @@ let spawn_command ?hooks sc_client command =
   Runnable.{value = process; run = Process.check_and_read_stdout}
 
 let sc_rollup_address ?hooks sc_client =
-  spawn_command ?hooks sc_client ["get"; "sc"; "rollup"; "address"]
+  spawn_command ?hooks sc_client ["get"; "smart"; "rollup"; "address"]
   |> Runnable.map String.trim
 
 let state_value ?hooks ?(block = "head") sc_client ~key =
diff --git a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (dac_reveals_data_hash_chain_v0).out b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (dac_reveals_data_hash_chain_v0).out
index 72e683002f09050a601bac30bb41f87d51fa3afd..473783e0dce3c3eec4c0bc92612bda355daf47b3 100644
--- a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (dac_reveals_data_hash_chain_v0).out	
+++ b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (dac_reveals_data_hash_chain_v0).out	
@@ -1,5 +1,5 @@
 
-./octez-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string with kernel  --burn-cap 9999999
+./octez-client --wait none originate smart rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string with kernel  --burn-cap 9999999
 Node is bootstrapped.
 Estimated gas: 2748.037 units (will add 100 for safety)
 Estimated storage: 6552 bytes added (will add 20 for safety)
diff --git a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (dac_reveals_data_merkle_tree_v0).out b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (dac_reveals_data_merkle_tree_v0).out
index 72e683002f09050a601bac30bb41f87d51fa3afd..473783e0dce3c3eec4c0bc92612bda355daf47b3 100644
--- a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (dac_reveals_data_merkle_tree_v0).out	
+++ b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (dac_reveals_data_merkle_tree_v0).out	
@@ -1,5 +1,5 @@
 
-./octez-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string with kernel  --burn-cap 9999999
+./octez-client --wait none originate smart rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string with kernel  --burn-cap 9999999
 Node is bootstrapped.
 Estimated gas: 2748.037 units (will add 100 for safety)
 Estimated storage: 6552 bytes added (will add 20 for safety)
diff --git a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (dac_rollup_arith_uses_reveals).out b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (dac_rollup_arith_uses_reveals).out
index e49af7887cbfa15d245e909112fd94356bf6c3da..1dd4daba69d52ffd38e9755e5f31e979227a8253 100644
--- a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (dac_rollup_arith_uses_reveals).out	
+++ b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (dac_rollup_arith_uses_reveals).out	
@@ -1,5 +1,5 @@
 
-./octez-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string with kernel  --burn-cap 9999999
+./octez-client --wait none originate smart rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string with kernel  --burn-cap 9999999
 Node is bootstrapped.
 Estimated gas: 2748.037 units (will add 100 for safety)
 Estimated storage: 6552 bytes added (will add 20 for safety)
@@ -37,7 +37,7 @@ This sequence of operations was run:
 { "level": 2,
   "commitment_hash": "[SC_ROLLUP_COMMITMENT_HASH]" }
 
-./octez-client --wait none send sc rollup message 'text:["hash:0027782d2a7020be332cc42c4e66592ec50305f559a4011981f1d5af81428e7aa3"]' from bootstrap2
+./octez-client --wait none send smart rollup message 'text:["hash:0027782d2a7020be332cc42c4e66592ec50305f559a4011981f1d5af81428e7aa3"]' from bootstrap2
 Node is bootstrapped.
 Estimated gas: 1001.427 units (will add 100 for safety)
 Estimated storage: no bytes added
diff --git a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (dac_rollup_arith_wrong_hash).out b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (dac_rollup_arith_wrong_hash).out
index 6b26fb8b9a2abfe028f0ebe87941e861a5092f5c..040b08bc5256c563510de36db81965a3d4373377 100644
--- a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (dac_rollup_arith_wrong_hash).out	
+++ b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (dac_rollup_arith_wrong_hash).out	
@@ -1,5 +1,5 @@
 
-./octez-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string with kernel  --burn-cap 9999999
+./octez-client --wait none originate smart rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string with kernel  --burn-cap 9999999
 Node is bootstrapped.
 Estimated gas: 2748.037 units (will add 100 for safety)
 Estimated storage: 6552 bytes added (will add 20 for safety)
@@ -37,7 +37,7 @@ This sequence of operations was run:
 { "level": 2,
   "commitment_hash": "[SC_ROLLUP_COMMITMENT_HASH]" }
 
-./octez-client --wait none send sc rollup message 'text:["hash:0027782d2a7020be332cc42c4e66592ec50305f559a4011981f1d5af81428ecafe"]' from bootstrap2
+./octez-client --wait none send smart rollup message 'text:["hash:0027782d2a7020be332cc42c4e66592ec50305f559a4011981f1d5af81428ecafe"]' from bootstrap2
 Node is bootstrapped.
 Estimated gas: 1001.427 units (will add 100 for safety)
 Estimated storage: no bytes added
diff --git a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (rollup_node_applies_dal_pages).out b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (rollup_node_applies_dal_pages).out
index e4c05de40a77ee97f16c5e70b8ef42b2b47bf822..83b90809efe95bd3a738102c637e5e58ae6301a2 100644
--- a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (rollup_node_applies_dal_pages).out	
+++ b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (rollup_node_applies_dal_pages).out	
@@ -1,5 +1,5 @@
 
-./octez-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string with kernel  --burn-cap 9999999
+./octez-client --wait none originate smart rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string with kernel  --burn-cap 9999999
 Node is bootstrapped.
 Estimated gas: 2748.037 units (will add 100 for safety)
 Estimated storage: 6552 bytes added (will add 20 for safety)
@@ -51,7 +51,7 @@ This sequence of operations was run:
 ./octez-sc-rollup-client-alpha rpc get /global/block/head/dal/confirmed_slot_pages
 []
 
-./octez-client --wait none send sc rollup message '["dal:3:0:0","dal:3:1:0"]' from bootstrap2
+./octez-client --wait none send smart rollup message '["dal:3:0:0","dal:3:1:0"]' from bootstrap2
 Node is bootstrapped.
 Estimated gas: 1002.500 units (will add 100 for safety)
 Estimated storage: no bytes added
@@ -80,7 +80,7 @@ This sequence of operations was run:
 { "level": 2,
   "commitment_hash": "[SC_ROLLUP_COMMITMENT_HASH]" }
 
-./octez-client --wait none send sc rollup message '[" 99 3 "," dal:3:1:0 "," dal:3:1:1 "," dal:3:0:0 "," dal:3:0:2 "," dal:2:1:0 "," dal:5:1:0 "," dal:3:10000:0 "," dal:3:0:100000 "," dal:3:-10000:0 "," dal:3:0:-100000 "," dal:3:expecting_integer:0 "," dal:3:0:expecting_integer "," dal:1002147483647:1:1 ","   + + value"]' from bootstrap2
+./octez-client --wait none send smart rollup message '[" 99 3 "," dal:3:1:0 "," dal:3:1:1 "," dal:3:0:0 "," dal:3:0:2 "," dal:2:1:0 "," dal:5:1:0 "," dal:3:10000:0 "," dal:3:0:100000 "," dal:3:-10000:0 "," dal:3:0:-100000 "," dal:3:expecting_integer:0 "," dal:3:0:expecting_integer "," dal:1002147483647:1:1 ","   + + value"]' from bootstrap2
 Node is bootstrapped.
 Estimated gas: 1021.270 units (will add 100 for safety)
 Estimated storage: no bytes added
diff --git a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (rollup_node_downloads_slots).out b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (rollup_node_downloads_slots).out
index 7b9bb7a4049b79841a4ce4f0064eb35fd56535ba..57ab162317cbde4f9eb6a726e7dcd16861e35222 100644
--- a/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (rollup_node_downloads_slots).out	
+++ b/tezt/tests/expected/dal.ml/Alpha- Testing DAL rollup and node with L1 (rollup_node_downloads_slots).out	
@@ -1,5 +1,5 @@
 
-./octez-client --wait none originate sc rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string with kernel  --burn-cap 9999999
+./octez-client --wait none originate smart rollup from '[PUBLIC_KEY_HASH]' of kind arith of type string with kernel  --burn-cap 9999999
 Node is bootstrapped.
 Estimated gas: 2748.037 units (will add 100 for safety)
 Estimated storage: 6552 bytes added (will add 20 for safety)
@@ -51,7 +51,7 @@ This sequence of operations was run:
 ./octez-sc-rollup-client-alpha rpc get /global/block/head/dal/confirmed_slot_pages
 []
 
-./octez-client --wait none send sc rollup message '["dal:3:0:0","dal:3:1:0"]' from bootstrap2
+./octez-client --wait none send smart rollup message '["dal:3:0:0","dal:3:1:0"]' from bootstrap2
 Node is bootstrapped.
 Estimated gas: 1002.500 units (will add 100 for safety)
 Estimated storage: no bytes added
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - RPC API should work and be stable.out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - RPC API should work and be stable.out
index 4d4dcd79c3efe100ce46fb581a7aeabbf1062010..821ddf95b81073773e243676eb2e67b24496f631 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - RPC API should work and be stable.out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - RPC API should work and be stable.out	
@@ -1,5 +1,5 @@
 
-./octez-client --wait none originate sc rollup from bootstrap1 of kind arith of type string with kernel  --burn-cap 9999999
+./octez-client --wait none originate smart rollup from bootstrap1 of kind arith of type string with kernel  --burn-cap 9999999
 Node is bootstrapped.
 Estimated gas: 2748.037 units (will add 100 for safety)
 Estimated storage: 6552 bytes added (will add 20 for safety)
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - boot sector is evaluated.out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - boot sector is evaluated.out
index d7cf1fa3cc410e3c187b7460902475750199ca0d..ff5fb3ef522b71b3868ea8f95c0bf9b3b6454772 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - boot sector is evaluated.out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - boot sector is evaluated.out	
@@ -1,5 +1,5 @@
 
-./octez-client --wait none originate sc rollup from bootstrap1 of kind arith of type string with kernel '10 10 10 + +' --burn-cap 9999999
+./octez-client --wait none originate smart rollup from bootstrap1 of kind arith of type string with kernel '10 10 10 + +' --burn-cap 9999999
 Node is bootstrapped.
 Estimated gas: 2748.037 units (will add 100 for safety)
 Estimated storage: 6552 bytes added (will add 20 for safety)
@@ -33,7 +33,7 @@ This sequence of operations was run:
         storage fees ........................... +ꜩ1.638
 
 
-./octez-client --wait none originate sc rollup from bootstrap2 of kind arith of type string with kernel 31 --burn-cap 9999999
+./octez-client --wait none originate smart rollup from bootstrap2 of kind arith of type string with kernel 31 --burn-cap 9999999
 Node is bootstrapped.
 Estimated gas: 2748.037 units (will add 100 for safety)
 Estimated storage: 6552 bytes added (will add 20 for safety)
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - node advances PVM state with messages (external).out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - node advances PVM state with messages (external).out
index b88f0d1ab0c063607e1646e5e2fb723ca9a2d223..08cd08d02521853ac581f7f65e46559cc5b92a33 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - node advances PVM state with messages (external).out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - node advances PVM state with messages (external).out	
@@ -1,5 +1,5 @@
 
-./octez-client --wait none originate sc rollup from bootstrap1 of kind arith of type bytes with kernel  --burn-cap 9999999
+./octez-client --wait none originate smart rollup from bootstrap1 of kind arith of type bytes with kernel  --burn-cap 9999999
 Node is bootstrapped.
 Estimated gas: 2748.037 units (will add 100 for safety)
 Estimated storage: 6552 bytes added (will add 20 for safety)
@@ -43,7 +43,7 @@ This sequence of operations was run:
 ./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks
 "0"
 
-./octez-client --wait none send sc rollup message '["1 6 + value"]' from bootstrap2
+./octez-client --wait none send smart rollup message '["1 6 + value"]' from bootstrap2
 Node is bootstrapped.
 Estimated gas: 1001.239 units (will add 100 for safety)
 Estimated storage: no bytes added
@@ -83,7 +83,7 @@ This sequence of operations was run:
 ./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks
 "23"
 
-./octez-client --wait none send sc rollup message '["2 8 + value"]' from bootstrap2
+./octez-client --wait none send smart rollup message '["2 8 + value"]' from bootstrap2
 Node is bootstrapped.
 Estimated gas: 1001.239 units (will add 100 for safety)
 Estimated storage: no bytes added
@@ -123,7 +123,7 @@ This sequence of operations was run:
 ./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks
 "44"
 
-./octez-client --wait none send sc rollup message '["3 10 + value"]' from bootstrap2
+./octez-client --wait none send smart rollup message '["3 10 + value"]' from bootstrap2
 Node is bootstrapped.
 Estimated gas: 1001.242 units (will add 100 for safety)
 Estimated storage: no bytes added
@@ -163,7 +163,7 @@ This sequence of operations was run:
 ./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks
 "66"
 
-./octez-client --wait none send sc rollup message '["4 12 + value"]' from bootstrap2
+./octez-client --wait none send smart rollup message '["4 12 + value"]' from bootstrap2
 Node is bootstrapped.
 Estimated gas: 1001.242 units (will add 100 for safety)
 Estimated storage: no bytes added
@@ -203,7 +203,7 @@ This sequence of operations was run:
 ./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks
 "88"
 
-./octez-client --wait none send sc rollup message '["5 14 + value"]' from bootstrap2
+./octez-client --wait none send smart rollup message '["5 14 + value"]' from bootstrap2
 Node is bootstrapped.
 Estimated gas: 1001.242 units (will add 100 for safety)
 Estimated storage: no bytes added
@@ -243,7 +243,7 @@ This sequence of operations was run:
 ./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks
 "110"
 
-./octez-client --wait none send sc rollup message '["6 16 + value"]' from bootstrap2
+./octez-client --wait none send smart rollup message '["6 16 + value"]' from bootstrap2
 Node is bootstrapped.
 Estimated gas: 1001.242 units (will add 100 for safety)
 Estimated storage: no bytes added
@@ -283,7 +283,7 @@ This sequence of operations was run:
 ./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks
 "132"
 
-./octez-client --wait none send sc rollup message '["7 18 + value"]' from bootstrap2
+./octez-client --wait none send smart rollup message '["7 18 + value"]' from bootstrap2
 Node is bootstrapped.
 Estimated gas: 1001.242 units (will add 100 for safety)
 Estimated storage: no bytes added
@@ -323,7 +323,7 @@ This sequence of operations was run:
 ./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks
 "154"
 
-./octez-client --wait none send sc rollup message '["8 20 + value"]' from bootstrap2
+./octez-client --wait none send smart rollup message '["8 20 + value"]' from bootstrap2
 Node is bootstrapped.
 Estimated gas: 1001.242 units (will add 100 for safety)
 Estimated storage: no bytes added
@@ -363,7 +363,7 @@ This sequence of operations was run:
 ./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks
 "176"
 
-./octez-client --wait none send sc rollup message '["9 22 + value"]' from bootstrap2
+./octez-client --wait none send smart rollup message '["9 22 + value"]' from bootstrap2
 Node is bootstrapped.
 Estimated gas: 1001.242 units (will add 100 for safety)
 Estimated storage: no bytes added
@@ -403,7 +403,7 @@ This sequence of operations was run:
 ./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks
 "198"
 
-./octez-client --wait none send sc rollup message '["10 24 + value"]' from bootstrap2
+./octez-client --wait none send smart rollup message '["10 24 + value"]' from bootstrap2
 Node is bootstrapped.
 Estimated gas: 1001.245 units (will add 100 for safety)
 Estimated storage: no bytes added
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - node advances PVM state with messages (internal).out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - node advances PVM state with messages (internal).out
index 04e477554392f3a0fb5a6b3fc0f4aaa79815c3aa..d32676b18ea0e4c1f184247219e9d4e6b53b20b2 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - node advances PVM state with messages (internal).out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - node advances PVM state with messages (internal).out	
@@ -1,5 +1,5 @@
 
-./octez-client --wait none originate sc rollup from bootstrap1 of kind arith of type bytes with kernel  --burn-cap 9999999
+./octez-client --wait none originate smart rollup from bootstrap1 of kind arith of type bytes with kernel  --burn-cap 9999999
 Node is bootstrapped.
 Estimated gas: 2748.037 units (will add 100 for safety)
 Estimated storage: 6552 bytes added (will add 20 for safety)
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - origination of a SCORU executes without error.out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - origination of a SCORU executes without error.out
index 2030819114f3365e4c4e37f758f86b92bed84eb9..940da7858ab7ce1db8d3a9af1251540bf28a650a 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - origination of a SCORU executes without error.out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - origination of a SCORU executes without error.out	
@@ -1,5 +1,5 @@
 
-./octez-client --wait none originate sc rollup from bootstrap1 of kind arith of type string with kernel  --burn-cap 9999999
+./octez-client --wait none originate smart rollup from bootstrap1 of kind arith of type string with kernel  --burn-cap 9999999
 Node is bootstrapped.
 Estimated gas: 2748.037 units (will add 100 for safety)
 Estimated storage: 6552 bytes added (will add 20 for safety)
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - participant of a refutation game are slashed-rewarded.out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - participant of a refutation game are slashed-rewarded.out
index 8b4b659da4d02875040d011a9d2becfe8f53ae7f..c053228d3a137114480877fa53f9d619742e4096 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - participant of a refutation game are slashed-rewarded.out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - participant of a refutation game are slashed-rewarded.out	
@@ -1,5 +1,5 @@
 
-./octez-client --wait none originate sc rollup from bootstrap1 of kind arith of type string with kernel  --burn-cap 9999999
+./octez-client --wait none originate smart rollup from bootstrap1 of kind arith of type string with kernel  --burn-cap 9999999
 Node is bootstrapped.
 Estimated gas: 2748.037 units (will add 100 for safety)
 Estimated storage: 6552 bytes added (will add 20 for safety)
@@ -33,7 +33,7 @@ This sequence of operations was run:
         storage fees ........................... +ꜩ1.638
 
 
-./octez-client --wait none publish commitment from '[PUBLIC_KEY_HASH]' for sc rollup '[SMART_ROLLUP_HASH]' with compressed state '[SC_ROLLUP_PVM_STATE_HASH]' at inbox level 4 and predecessor '[SC_ROLLUP_COMMITMENT_HASH]' and number of ticks 1
+./octez-client --wait none publish commitment from '[PUBLIC_KEY_HASH]' for smart rollup '[SMART_ROLLUP_HASH]' with compressed state '[SC_ROLLUP_PVM_STATE_HASH]' at inbox level 4 and predecessor '[SC_ROLLUP_COMMITMENT_HASH]' and number of ticks 1
 Node is bootstrapped.
 Estimated gas: 7197.763 units (will add 100 for safety)
 Estimated storage: no bytes added
@@ -69,7 +69,7 @@ This sequence of operations was run:
         Frozen_bonds([PUBLIC_KEY_HASH],[SMART_ROLLUP_HASH]) ... +ꜩ10000
 
 
-./octez-client --wait none publish commitment from '[PUBLIC_KEY_HASH]' for sc rollup '[SMART_ROLLUP_HASH]' with compressed state '[SC_ROLLUP_PVM_STATE_HASH]' at inbox level 4 and predecessor '[SC_ROLLUP_COMMITMENT_HASH]' and number of ticks 2
+./octez-client --wait none publish commitment from '[PUBLIC_KEY_HASH]' for smart rollup '[SMART_ROLLUP_HASH]' with compressed state '[SC_ROLLUP_PVM_STATE_HASH]' at inbox level 4 and predecessor '[SC_ROLLUP_COMMITMENT_HASH]' and number of ticks 2
 Node is bootstrapped.
 Estimated gas: 7895.965 units (will add 100 for safety)
 Estimated storage: no bytes added
@@ -105,7 +105,7 @@ This sequence of operations was run:
         Frozen_bonds([PUBLIC_KEY_HASH],[SMART_ROLLUP_HASH]) ... +ꜩ10000
 
 
-./octez-client --wait none timeout dispute on sc rollup '[SMART_ROLLUP_HASH]' with '[PUBLIC_KEY_HASH]' against '[PUBLIC_KEY_HASH]' from bootstrap1
+./octez-client --wait none timeout dispute on smart rollup '[SMART_ROLLUP_HASH]' with '[PUBLIC_KEY_HASH]' against '[PUBLIC_KEY_HASH]' from bootstrap1
 Node is bootstrapped.
 Estimated gas: 4545.618 units (will add 100 for safety)
 Estimated storage: no bytes added
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - recover bond of stakers.out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - recover bond of stakers.out
index d7070c1e018bfe8ff12bcfa47990cbc12a618cbe..3c059276b3fd99d798b41d77bf5f1e73f57143d9 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - recover bond of stakers.out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - recover bond of stakers.out	
@@ -1,5 +1,5 @@
 
-./octez-client --wait none originate sc rollup from bootstrap1 of kind arith of type string with kernel  --burn-cap 9999999
+./octez-client --wait none originate smart rollup from bootstrap1 of kind arith of type string with kernel  --burn-cap 9999999
 Node is bootstrapped.
 Estimated gas: 2748.037 units (will add 100 for safety)
 Estimated storage: 6552 bytes added (will add 20 for safety)
@@ -33,7 +33,7 @@ This sequence of operations was run:
         storage fees ........................... +ꜩ1.638
 
 
-./octez-client --wait none publish commitment from '[PUBLIC_KEY_HASH]' for sc rollup '[SMART_ROLLUP_HASH]' with compressed state '[SC_ROLLUP_PVM_STATE_HASH]' at inbox level 12 and predecessor '[SC_ROLLUP_COMMITMENT_HASH]' and number of ticks 1
+./octez-client --wait none publish commitment from '[PUBLIC_KEY_HASH]' for smart rollup '[SMART_ROLLUP_HASH]' with compressed state '[SC_ROLLUP_PVM_STATE_HASH]' at inbox level 12 and predecessor '[SC_ROLLUP_COMMITMENT_HASH]' and number of ticks 1
 Node is bootstrapped.
 Estimated gas: 7197.763 units (will add 100 for safety)
 Estimated storage: no bytes added
@@ -69,7 +69,7 @@ This sequence of operations was run:
         Frozen_bonds([PUBLIC_KEY_HASH],[SMART_ROLLUP_HASH]) ... +ꜩ10000
 
 
-./octez-client --wait none publish commitment from '[PUBLIC_KEY_HASH]' for sc rollup '[SMART_ROLLUP_HASH]' with compressed state '[SC_ROLLUP_PVM_STATE_HASH]' at inbox level 12 and predecessor '[SC_ROLLUP_COMMITMENT_HASH]' and number of ticks 1
+./octez-client --wait none publish commitment from '[PUBLIC_KEY_HASH]' for smart rollup '[SMART_ROLLUP_HASH]' with compressed state '[SC_ROLLUP_PVM_STATE_HASH]' at inbox level 12 and predecessor '[SC_ROLLUP_COMMITMENT_HASH]' and number of ticks 1
 Node is bootstrapped.
 Estimated gas: 7419.691 units (will add 100 for safety)
 Estimated storage: no bytes added
@@ -105,7 +105,7 @@ This sequence of operations was run:
         Frozen_bonds([PUBLIC_KEY_HASH],[SMART_ROLLUP_HASH]) ... +ꜩ10000
 
 
-./octez-client --wait none cement commitment '[SC_ROLLUP_COMMITMENT_HASH]' from bootstrap1 for sc rollup '[SMART_ROLLUP_HASH]'
+./octez-client --wait none cement commitment '[SC_ROLLUP_COMMITMENT_HASH]' from bootstrap1 for smart rollup '[SMART_ROLLUP_HASH]'
 Node is bootstrapped.
 Estimated gas: 5210.592 units (will add 100 for safety)
 Estimated storage: no bytes added
@@ -133,7 +133,7 @@ This sequence of operations was run:
       Inbox level: 12
 
 
-./octez-client --wait none recover bond of '[PUBLIC_KEY_HASH]' for sc rollup '[SMART_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]' --fee 1
+./octez-client --wait none recover bond of '[PUBLIC_KEY_HASH]' for smart rollup '[SMART_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]' --fee 1
 Node is bootstrapped.
 Estimated gas: 3915.240 units (will add 100 for safety)
 Estimated storage: no bytes added
@@ -163,7 +163,7 @@ This sequence of operations was run:
       Consumed gas: 3915.240
 
 
-./octez-client --wait none recover bond of '[PUBLIC_KEY_HASH]' for sc rollup '[SMART_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]' --fee 1
+./octez-client --wait none recover bond of '[PUBLIC_KEY_HASH]' for smart rollup '[SMART_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]' --fee 1
 Node is bootstrapped.
 Estimated gas: 3915.240 units (will add 100 for safety)
 Estimated storage: no bytes added
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - trigger exec output (entrypoint- -aux- earliness- 0- external).out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - trigger exec output (entrypoint- -aux- earliness- 0- external).out
index da373474d3f7cb11450dc4ce056bfae721694e04..159eac8529569f2219c635d808aef1626f0dc269 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - trigger exec output (entrypoint- -aux- earliness- 0- external).out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - trigger exec output (entrypoint- -aux- earliness- 0- external).out	
@@ -1,5 +1,5 @@
 
-./octez-client --wait none originate sc rollup from bootstrap1 of kind arith of type bytes with kernel  --burn-cap 9999999
+./octez-client --wait none originate smart rollup from bootstrap1 of kind arith of type bytes with kernel  --burn-cap 9999999
 Node is bootstrapped.
 Estimated gas: 2748.037 units (will add 100 for safety)
 Estimated storage: 6552 bytes added (will add 20 for safety)
@@ -33,7 +33,7 @@ This sequence of operations was run:
         storage fees ........................... +ꜩ1.638
 
 
-./octez-client --wait none send sc rollup message 'hex:["3337204b54314332756d56796773744c5456396d7945733445416d4778634c566467363732457425617578"]' from bootstrap2
+./octez-client --wait none send smart rollup message 'hex:["3337204b54314332756d56796773744c5456396d7945733445416d4778634c566467363732457425617578"]' from bootstrap2
 Node is bootstrapped.
 Estimated gas: 1001.339 units (will add 100 for safety)
 Estimated storage: no bytes added
@@ -58,7 +58,7 @@ This sequence of operations was run:
       Consumed gas: 1001.373
 
 
-./octez-client --wait none execute outbox message of sc rollup '[SMART_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]' for commitment hash '[SC_ROLLUP_COMMITMENT_HASH]' and output proof 0x030002665448ee15b02a17221b1bf1bda2f45ac07bc4bfa19bdb50b6ac30e2877849c0665448ee15b02a17221b1bf1bda2f45ac07bc4bfa19bdb50b6ac30e2877849c000100007d0030170000382066f7574707574810130c8f8998d37dfa232d0909fd39b306e9e32717bb5485f65af18f207aa0fba88cfc80c7061727365725f7374617465c8407f958990678e2e9fb06758bc6520dae46d838d39948a4c51a5b19bd079293dc0fa513fc9657217226bee9cf2242f01b8939ef07b7363a2c7ba435a57c2cbed83c0dcbfd954157d90d8b062937cc05974b4cdacdca1a6a3dc90749de22781f0118bc0341f98e2e09c8e648e2ad9572b9a0a6c2fadeb87e5334650a4e0bb0abefd5f49665448ee15b02a17221b1bf1bda2f45ac07bc4bfa19bdb50b6ac30e2877849c00000000500000000001f00250125da0a10a3eddbd3377e9a13656edd869bb9cdbe0000000003617578 --burn-cap 10
+./octez-client --wait none execute outbox message of smart rollup '[SMART_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]' for commitment hash '[SC_ROLLUP_COMMITMENT_HASH]' and output proof 0x030002665448ee15b02a17221b1bf1bda2f45ac07bc4bfa19bdb50b6ac30e2877849c0665448ee15b02a17221b1bf1bda2f45ac07bc4bfa19bdb50b6ac30e2877849c000100007d0030170000382066f7574707574810130c8f8998d37dfa232d0909fd39b306e9e32717bb5485f65af18f207aa0fba88cfc80c7061727365725f7374617465c8407f958990678e2e9fb06758bc6520dae46d838d39948a4c51a5b19bd079293dc0fa513fc9657217226bee9cf2242f01b8939ef07b7363a2c7ba435a57c2cbed83c0dcbfd954157d90d8b062937cc05974b4cdacdca1a6a3dc90749de22781f0118bc0341f98e2e09c8e648e2ad9572b9a0a6c2fadeb87e5334650a4e0bb0abefd5f49665448ee15b02a17221b1bf1bda2f45ac07bc4bfa19bdb50b6ac30e2877849c00000000500000000001f00250125da0a10a3eddbd3377e9a13656edd869bb9cdbe0000000003617578 --burn-cap 10
 Node is bootstrapped.
 Estimated gas: 6400.614 units (will add 100 for safety)
 Estimated storage: 5 bytes added (will add 20 for safety)
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - trigger exec output (entrypoint- -aux- earliness- 0- internal).out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - trigger exec output (entrypoint- -aux- earliness- 0- internal).out
index 4ab325ec3e0d69da0217ddbbf86e19bafa1a4560..12b4427e5ca0725fdceb715b24290f867901c982 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - trigger exec output (entrypoint- -aux- earliness- 0- internal).out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - trigger exec output (entrypoint- -aux- earliness- 0- internal).out	
@@ -1,5 +1,5 @@
 
-./octez-client --wait none originate sc rollup from bootstrap1 of kind arith of type bytes with kernel  --burn-cap 9999999
+./octez-client --wait none originate smart rollup from bootstrap1 of kind arith of type bytes with kernel  --burn-cap 9999999
 Node is bootstrapped.
 Estimated gas: 2748.037 units (will add 100 for safety)
 Estimated storage: 6552 bytes added (will add 20 for safety)
@@ -33,7 +33,7 @@ This sequence of operations was run:
         storage fees ........................... +ꜩ1.638
 
 
-./octez-client --wait none execute outbox message of sc rollup '[SMART_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]' for commitment hash '[SC_ROLLUP_COMMITMENT_HASH]' and output proof 0x03000250b0fff5dca0a60eb45b08619fb3ce4cc06c7eddb6da4dd935112b45ee4f1fd250b0fff5dca0a60eb45b08619fb3ce4cc06c7eddb6da4dd935112b45ee4f1fd200100007d0030170000382066f7574707574810130c8f8998d37dfa232d0909fd39b306e9e32717bb5485f65af18f207aa0fba88cfc80c7061727365725f7374617465c8407f958990678e2e9fb06758bc6520dae46d838d39948a4c51a5b19bd079293dc0fa513fc9657217226bee9cf2242f01b8939ef07b7363a2c7ba435a57c2cbed83c0dcbfd954157d90d8b062937cc05974b4cdacdca1a6a3dc90749de22781f0118bc06cebd770767d6e9e746e42e5b2c772092c7874983cd57a5a7d57128ad2a26eb750b0fff5dca0a60eb45b08619fb3ce4cc06c7eddb6da4dd935112b45ee4f1fd20000000500000000001f00250125da0a10a3eddbd3377e9a13656edd869bb9cdbe0000000003617578 --burn-cap 10
+./octez-client --wait none execute outbox message of smart rollup '[SMART_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]' for commitment hash '[SC_ROLLUP_COMMITMENT_HASH]' and output proof 0x03000250b0fff5dca0a60eb45b08619fb3ce4cc06c7eddb6da4dd935112b45ee4f1fd250b0fff5dca0a60eb45b08619fb3ce4cc06c7eddb6da4dd935112b45ee4f1fd200100007d0030170000382066f7574707574810130c8f8998d37dfa232d0909fd39b306e9e32717bb5485f65af18f207aa0fba88cfc80c7061727365725f7374617465c8407f958990678e2e9fb06758bc6520dae46d838d39948a4c51a5b19bd079293dc0fa513fc9657217226bee9cf2242f01b8939ef07b7363a2c7ba435a57c2cbed83c0dcbfd954157d90d8b062937cc05974b4cdacdca1a6a3dc90749de22781f0118bc06cebd770767d6e9e746e42e5b2c772092c7874983cd57a5a7d57128ad2a26eb750b0fff5dca0a60eb45b08619fb3ce4cc06c7eddb6da4dd935112b45ee4f1fd20000000500000000001f00250125da0a10a3eddbd3377e9a13656edd869bb9cdbe0000000003617578 --burn-cap 10
 Node is bootstrapped.
 Estimated gas: 6400.614 units (will add 100 for safety)
 Estimated storage: 5 bytes added (will add 20 for safety)
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - trigger exec output (entrypoint- -default- earliness- 0- external.out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - trigger exec output (entrypoint- -default- earliness- 0- external.out
index b1844218f709ed6121185987af7a02d7470cdf95..ca6ba8c3ebe84cf7bad4aebf3ee4dbe10d120000 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - trigger exec output (entrypoint- -default- earliness- 0- external.out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - trigger exec output (entrypoint- -default- earliness- 0- external.out	
@@ -1,5 +1,5 @@
 
-./octez-client --wait none originate sc rollup from bootstrap1 of kind arith of type bytes with kernel  --burn-cap 9999999
+./octez-client --wait none originate smart rollup from bootstrap1 of kind arith of type bytes with kernel  --burn-cap 9999999
 Node is bootstrapped.
 Estimated gas: 2748.037 units (will add 100 for safety)
 Estimated storage: 6552 bytes added (will add 20 for safety)
@@ -33,7 +33,7 @@ This sequence of operations was run:
         storage fees ........................... +ꜩ1.638
 
 
-./octez-client --wait none send sc rollup message 'hex:["3337204b54314332756d56796773744c5456396d7945733445416d4778634c5664673637324574"]' from bootstrap2
+./octez-client --wait none send smart rollup message 'hex:["3337204b54314332756d56796773744c5456396d7945733445416d4778634c5664673637324574"]' from bootstrap2
 Node is bootstrapped.
 Estimated gas: 1001.327 units (will add 100 for safety)
 Estimated storage: no bytes added
@@ -58,7 +58,7 @@ This sequence of operations was run:
       Consumed gas: 1001.361
 
 
-./octez-client --wait none execute outbox message of sc rollup '[SMART_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]' for commitment hash '[SC_ROLLUP_COMMITMENT_HASH]' and output proof 0x0300021bca32698f75f6b3c784f41ec1bed48c4a58ffcd22aadcdcb0f9ed4b5af9827d1bca32698f75f6b3c784f41ec1bed48c4a58ffcd22aadcdcb0f9ed4b5af9827d00100007d0030170000382066f7574707574810130c8bcacb1531b6e96b5ffc7a75859c34f1f1f9330f5e1b24f183f07e7068710de540c7061727365725f7374617465c8407f958990678e2e9fb06758bc6520dae46d838d39948a4c51a5b19bd079293dc0fa513fc9657217226bee9cf2242f01b8939ef07b7363a2c7ba435a57c2cbed83c0c235965dde95e47330643d042f34eb7354baf4786f0e9f0b0c42243ddae431a8c097354cf34106c0e824fd1b44d759ce74dc917914c3ab5b23d62120d4ff1dabd31bca32698f75f6b3c784f41ec1bed48c4a58ffcd22aadcdcb0f9ed4b5af9827d0000000500000000002300250125da0a10a3eddbd3377e9a13656edd869bb9cdbe000000000764656661756c74 --burn-cap 10
+./octez-client --wait none execute outbox message of smart rollup '[SMART_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]' for commitment hash '[SC_ROLLUP_COMMITMENT_HASH]' and output proof 0x0300021bca32698f75f6b3c784f41ec1bed48c4a58ffcd22aadcdcb0f9ed4b5af9827d1bca32698f75f6b3c784f41ec1bed48c4a58ffcd22aadcdcb0f9ed4b5af9827d00100007d0030170000382066f7574707574810130c8bcacb1531b6e96b5ffc7a75859c34f1f1f9330f5e1b24f183f07e7068710de540c7061727365725f7374617465c8407f958990678e2e9fb06758bc6520dae46d838d39948a4c51a5b19bd079293dc0fa513fc9657217226bee9cf2242f01b8939ef07b7363a2c7ba435a57c2cbed83c0c235965dde95e47330643d042f34eb7354baf4786f0e9f0b0c42243ddae431a8c097354cf34106c0e824fd1b44d759ce74dc917914c3ab5b23d62120d4ff1dabd31bca32698f75f6b3c784f41ec1bed48c4a58ffcd22aadcdcb0f9ed4b5af9827d0000000500000000002300250125da0a10a3eddbd3377e9a13656edd869bb9cdbe000000000764656661756c74 --burn-cap 10
 Node is bootstrapped.
 Estimated gas: 6400.612 units (will add 100 for safety)
 Estimated storage: 5 bytes added (will add 20 for safety)
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - trigger exec output (entrypoint- -default- earliness- 0- internal.out b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - trigger exec output (entrypoint- -default- earliness- 0- internal.out
index b6a1291429ff95f4e9477f31aadcc0de0827cb01..159a7d26f241cfadbad1f5a1f59ecf9e4906eec0 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- arith - trigger exec output (entrypoint- -default- earliness- 0- internal.out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- arith - trigger exec output (entrypoint- -default- earliness- 0- internal.out	
@@ -1,5 +1,5 @@
 
-./octez-client --wait none originate sc rollup from bootstrap1 of kind arith of type bytes with kernel  --burn-cap 9999999
+./octez-client --wait none originate smart rollup from bootstrap1 of kind arith of type bytes with kernel  --burn-cap 9999999
 Node is bootstrapped.
 Estimated gas: 2748.037 units (will add 100 for safety)
 Estimated storage: 6552 bytes added (will add 20 for safety)
@@ -33,7 +33,7 @@ This sequence of operations was run:
         storage fees ........................... +ꜩ1.638
 
 
-./octez-client --wait none execute outbox message of sc rollup '[SMART_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]' for commitment hash '[SC_ROLLUP_COMMITMENT_HASH]' and output proof 0x030002ddb4257d46a1588326014019bad84b4fc9b84bf4c53bf757e7cdd2a9bdc1780fddb4257d46a1588326014019bad84b4fc9b84bf4c53bf757e7cdd2a9bdc1780f00100007d0030170000382066f7574707574810130c8bcacb1531b6e96b5ffc7a75859c34f1f1f9330f5e1b24f183f07e7068710de540c7061727365725f7374617465c8407f958990678e2e9fb06758bc6520dae46d838d39948a4c51a5b19bd079293dc0fa513fc9657217226bee9cf2242f01b8939ef07b7363a2c7ba435a57c2cbed83c0c235965dde95e47330643d042f34eb7354baf4786f0e9f0b0c42243ddae431a8c093cf7b0656a49a394fee9856478046aff511d04dd9d8cfcfa32a2182074c29c3ddb4257d46a1588326014019bad84b4fc9b84bf4c53bf757e7cdd2a9bdc1780f0000000500000000002300250125da0a10a3eddbd3377e9a13656edd869bb9cdbe000000000764656661756c74 --burn-cap 10
+./octez-client --wait none execute outbox message of smart rollup '[SMART_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]' for commitment hash '[SC_ROLLUP_COMMITMENT_HASH]' and output proof 0x030002ddb4257d46a1588326014019bad84b4fc9b84bf4c53bf757e7cdd2a9bdc1780fddb4257d46a1588326014019bad84b4fc9b84bf4c53bf757e7cdd2a9bdc1780f00100007d0030170000382066f7574707574810130c8bcacb1531b6e96b5ffc7a75859c34f1f1f9330f5e1b24f183f07e7068710de540c7061727365725f7374617465c8407f958990678e2e9fb06758bc6520dae46d838d39948a4c51a5b19bd079293dc0fa513fc9657217226bee9cf2242f01b8939ef07b7363a2c7ba435a57c2cbed83c0c235965dde95e47330643d042f34eb7354baf4786f0e9f0b0c42243ddae431a8c093cf7b0656a49a394fee9856478046aff511d04dd9d8cfcfa32a2182074c29c3ddb4257d46a1588326014019bad84b4fc9b84bf4c53bf757e7cdd2a9bdc1780f0000000500000000002300250125da0a10a3eddbd3377e9a13656edd869bb9cdbe000000000764656661756c74 --burn-cap 10
 Node is bootstrapped.
 Estimated gas: 6400.612 units (will add 100 for safety)
 Estimated storage: 5 bytes added (will add 20 for safety)
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - RPC API should work and be stable.out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - RPC API should work and be stable.out
index 24ce75da6a2b0688db735ae7c4014b65a96893d7..9044f7ed17638b8aba316b77494006a41bbca2bb 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - RPC API should work and be stable.out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - RPC API should work and be stable.out	
@@ -1,5 +1,5 @@
 
-./octez-client --wait none originate sc rollup from bootstrap1 of kind wasm_2_0_0 of type string with kernel 0061736d0100000001280760037f7f7f017f60027f7f017f60057f7f7f7f7f017f60017f0060017f017f60027f7f0060000002610311736d6172745f726f6c6c75705f636f72650a726561645f696e707574000011736d6172745f726f6c6c75705f636f72650c77726974655f6f7574707574000111736d6172745f726f6c6c75705f636f72650b73746f72655f77726974650002030504030405060503010001071402036d656d02000a6b65726e656c5f72756e00060aa401042a01027f41fa002f0100210120002f010021022001200247044041e4004112410041e400410010021a0b0b0800200041c4006b0b5001057f41fe002d0000210341fc002f0100210220002d0000210420002f0100210520011004210620042003460440200041016a200141016b10011a0520052002460440200041076a200610011a0b0b0b1d01017f41dc0141840241901c100021004184022000100541840210030b0b38050041e4000b122f6b65726e656c2f656e762f7265626f6f740041f8000b0200010041fa000b0200020041fc000b0200000041fe000b0101 --burn-cap 9999999
+./octez-client --wait none originate smart rollup from bootstrap1 of kind wasm_2_0_0 of type string with kernel 0061736d0100000001280760037f7f7f017f60027f7f017f60057f7f7f7f7f017f60017f0060017f017f60027f7f0060000002610311736d6172745f726f6c6c75705f636f72650a726561645f696e707574000011736d6172745f726f6c6c75705f636f72650c77726974655f6f7574707574000111736d6172745f726f6c6c75705f636f72650b73746f72655f77726974650002030504030405060503010001071402036d656d02000a6b65726e656c5f72756e00060aa401042a01027f41fa002f0100210120002f010021022001200247044041e4004112410041e400410010021a0b0b0800200041c4006b0b5001057f41fe002d0000210341fc002f0100210220002d0000210420002f0100210520011004210620042003460440200041016a200141016b10011a0520052002460440200041076a200610011a0b0b0b1d01017f41dc0141840241901c100021004184022000100541840210030b0b38050041e4000b122f6b65726e656c2f656e762f7265626f6f740041f8000b0200010041fa000b0200020041fc000b0200000041fe000b0101 --burn-cap 9999999
 Node is bootstrapped.
 Estimated gas: 2748.037 units (will add 100 for safety)
 Estimated storage: 6552 bytes added (will add 20 for safety)
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - node advances PVM state with messages (external).out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - node advances PVM state with messages (external).out
index 3a17cb25cf63754d24c54f2687e8e737010f0ffc..64ad8e6d4a1e827caa6fb9548aa3c651d1b6f8a7 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - node advances PVM state with messages (external).out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - node advances PVM state with messages (external).out	
@@ -1,5 +1,5 @@
 
-./octez-client --wait none originate sc rollup from bootstrap1 of kind wasm_2_0_0 of type bytes with kernel 0061736d0100000001280760037f7f7f017f60027f7f017f60057f7f7f7f7f017f60017f0060017f017f60027f7f0060000002610311736d6172745f726f6c6c75705f636f72650a726561645f696e707574000011736d6172745f726f6c6c75705f636f72650c77726974655f6f7574707574000111736d6172745f726f6c6c75705f636f72650b73746f72655f77726974650002030504030405060503010001071402036d656d02000a6b65726e656c5f72756e00060aa401042a01027f41fa002f0100210120002f010021022001200247044041e4004112410041e400410010021a0b0b0800200041c4006b0b5001057f41fe002d0000210341fc002f0100210220002d0000210420002f0100210520011004210620042003460440200041016a200141016b10011a0520052002460440200041076a200610011a0b0b0b1d01017f41dc0141840241901c100021004184022000100541840210030b0b38050041e4000b122f6b65726e656c2f656e762f7265626f6f740041f8000b0200010041fa000b0200020041fc000b0200000041fe000b0101 --burn-cap 9999999
+./octez-client --wait none originate smart rollup from bootstrap1 of kind wasm_2_0_0 of type bytes with kernel 0061736d0100000001280760037f7f7f017f60027f7f017f60057f7f7f7f7f017f60017f0060017f017f60027f7f0060000002610311736d6172745f726f6c6c75705f636f72650a726561645f696e707574000011736d6172745f726f6c6c75705f636f72650c77726974655f6f7574707574000111736d6172745f726f6c6c75705f636f72650b73746f72655f77726974650002030504030405060503010001071402036d656d02000a6b65726e656c5f72756e00060aa401042a01027f41fa002f0100210120002f010021022001200247044041e4004112410041e400410010021a0b0b0800200041c4006b0b5001057f41fe002d0000210341fc002f0100210220002d0000210420002f0100210520011004210620042003460440200041016a200141016b10011a0520052002460440200041076a200610011a0b0b0b1d01017f41dc0141840241901c100021004184022000100541840210030b0b38050041e4000b122f6b65726e656c2f656e762f7265626f6f740041f8000b0200010041fa000b0200020041fc000b0200000041fe000b0101 --burn-cap 9999999
 Node is bootstrapped.
 Estimated gas: 2748.037 units (will add 100 for safety)
 Estimated storage: 6552 bytes added (will add 20 for safety)
@@ -43,7 +43,7 @@ This sequence of operations was run:
 ./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks
 "0"
 
-./octez-client --wait none send sc rollup message '["1 6 + value"]' from bootstrap2
+./octez-client --wait none send smart rollup message '["1 6 + value"]' from bootstrap2
 Node is bootstrapped.
 Estimated gas: 1001.239 units (will add 100 for safety)
 Estimated storage: no bytes added
@@ -80,7 +80,7 @@ This sequence of operations was run:
 ./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks
 "55000000000"
 
-./octez-client --wait none send sc rollup message '["2 8 + value"]' from bootstrap2
+./octez-client --wait none send smart rollup message '["2 8 + value"]' from bootstrap2
 Node is bootstrapped.
 Estimated gas: 1001.239 units (will add 100 for safety)
 Estimated storage: no bytes added
@@ -117,7 +117,7 @@ This sequence of operations was run:
 ./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks
 "110000000000"
 
-./octez-client --wait none send sc rollup message '["3 10 + value"]' from bootstrap2
+./octez-client --wait none send smart rollup message '["3 10 + value"]' from bootstrap2
 Node is bootstrapped.
 Estimated gas: 1001.242 units (will add 100 for safety)
 Estimated storage: no bytes added
@@ -154,7 +154,7 @@ This sequence of operations was run:
 ./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks
 "165000000000"
 
-./octez-client --wait none send sc rollup message '["4 12 + value"]' from bootstrap2
+./octez-client --wait none send smart rollup message '["4 12 + value"]' from bootstrap2
 Node is bootstrapped.
 Estimated gas: 1001.242 units (will add 100 for safety)
 Estimated storage: no bytes added
@@ -191,7 +191,7 @@ This sequence of operations was run:
 ./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks
 "220000000000"
 
-./octez-client --wait none send sc rollup message '["5 14 + value"]' from bootstrap2
+./octez-client --wait none send smart rollup message '["5 14 + value"]' from bootstrap2
 Node is bootstrapped.
 Estimated gas: 1001.242 units (will add 100 for safety)
 Estimated storage: no bytes added
@@ -228,7 +228,7 @@ This sequence of operations was run:
 ./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks
 "275000000000"
 
-./octez-client --wait none send sc rollup message '["6 16 + value"]' from bootstrap2
+./octez-client --wait none send smart rollup message '["6 16 + value"]' from bootstrap2
 Node is bootstrapped.
 Estimated gas: 1001.242 units (will add 100 for safety)
 Estimated storage: no bytes added
@@ -265,7 +265,7 @@ This sequence of operations was run:
 ./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks
 "330000000000"
 
-./octez-client --wait none send sc rollup message '["7 18 + value"]' from bootstrap2
+./octez-client --wait none send smart rollup message '["7 18 + value"]' from bootstrap2
 Node is bootstrapped.
 Estimated gas: 1001.242 units (will add 100 for safety)
 Estimated storage: no bytes added
@@ -302,7 +302,7 @@ This sequence of operations was run:
 ./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks
 "385000000000"
 
-./octez-client --wait none send sc rollup message '["8 20 + value"]' from bootstrap2
+./octez-client --wait none send smart rollup message '["8 20 + value"]' from bootstrap2
 Node is bootstrapped.
 Estimated gas: 1001.242 units (will add 100 for safety)
 Estimated storage: no bytes added
@@ -339,7 +339,7 @@ This sequence of operations was run:
 ./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks
 "440000000000"
 
-./octez-client --wait none send sc rollup message '["9 22 + value"]' from bootstrap2
+./octez-client --wait none send smart rollup message '["9 22 + value"]' from bootstrap2
 Node is bootstrapped.
 Estimated gas: 1001.242 units (will add 100 for safety)
 Estimated storage: no bytes added
@@ -376,7 +376,7 @@ This sequence of operations was run:
 ./octez-sc-rollup-client-alpha rpc get /global/block/head/total_ticks
 "495000000000"
 
-./octez-client --wait none send sc rollup message '["10 24 + value"]' from bootstrap2
+./octez-client --wait none send smart rollup message '["10 24 + value"]' from bootstrap2
 Node is bootstrapped.
 Estimated gas: 1001.245 units (will add 100 for safety)
 Estimated storage: no bytes added
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - node advances PVM state with messages (internal).out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - node advances PVM state with messages (internal).out
index bcd4b400e198aed5afde188f969366a8702e51a2..ce858e5b36b496f4548f52e275b0bc0afcd8ec1f 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - node advances PVM state with messages (internal).out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - node advances PVM state with messages (internal).out	
@@ -1,5 +1,5 @@
 
-./octez-client --wait none originate sc rollup from bootstrap1 of kind wasm_2_0_0 of type bytes with kernel 0061736d0100000001280760037f7f7f017f60027f7f017f60057f7f7f7f7f017f60017f0060017f017f60027f7f0060000002610311736d6172745f726f6c6c75705f636f72650a726561645f696e707574000011736d6172745f726f6c6c75705f636f72650c77726974655f6f7574707574000111736d6172745f726f6c6c75705f636f72650b73746f72655f77726974650002030504030405060503010001071402036d656d02000a6b65726e656c5f72756e00060aa401042a01027f41fa002f0100210120002f010021022001200247044041e4004112410041e400410010021a0b0b0800200041c4006b0b5001057f41fe002d0000210341fc002f0100210220002d0000210420002f0100210520011004210620042003460440200041016a200141016b10011a0520052002460440200041076a200610011a0b0b0b1d01017f41dc0141840241901c100021004184022000100541840210030b0b38050041e4000b122f6b65726e656c2f656e762f7265626f6f740041f8000b0200010041fa000b0200020041fc000b0200000041fe000b0101 --burn-cap 9999999
+./octez-client --wait none originate smart rollup from bootstrap1 of kind wasm_2_0_0 of type bytes with kernel 0061736d0100000001280760037f7f7f017f60027f7f017f60057f7f7f7f7f017f60017f0060017f017f60027f7f0060000002610311736d6172745f726f6c6c75705f636f72650a726561645f696e707574000011736d6172745f726f6c6c75705f636f72650c77726974655f6f7574707574000111736d6172745f726f6c6c75705f636f72650b73746f72655f77726974650002030504030405060503010001071402036d656d02000a6b65726e656c5f72756e00060aa401042a01027f41fa002f0100210120002f010021022001200247044041e4004112410041e400410010021a0b0b0800200041c4006b0b5001057f41fe002d0000210341fc002f0100210220002d0000210420002f0100210520011004210620042003460440200041016a200141016b10011a0520052002460440200041076a200610011a0b0b0b1d01017f41dc0141840241901c100021004184022000100541840210030b0b38050041e4000b122f6b65726e656c2f656e762f7265626f6f740041f8000b0200010041fa000b0200020041fc000b0200000041fe000b0101 --burn-cap 9999999
 Node is bootstrapped.
 Estimated gas: 2748.037 units (will add 100 for safety)
 Estimated storage: 6552 bytes added (will add 20 for safety)
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - origination of a SCORU executes without error.out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - origination of a SCORU executes without error.out
index 866fa51444ba94ecd31bc5b2efd1bc16b74d5b3d..8af682ae889aa6062978083512574d055301d6a8 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - origination of a SCORU executes without error.out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - origination of a SCORU executes without error.out	
@@ -1,5 +1,5 @@
 
-./octez-client --wait none originate sc rollup from bootstrap1 of kind wasm_2_0_0 of type string with kernel 0061736d0100000001280760037f7f7f017f60027f7f017f60057f7f7f7f7f017f60017f0060017f017f60027f7f0060000002610311736d6172745f726f6c6c75705f636f72650a726561645f696e707574000011736d6172745f726f6c6c75705f636f72650c77726974655f6f7574707574000111736d6172745f726f6c6c75705f636f72650b73746f72655f77726974650002030504030405060503010001071402036d656d02000a6b65726e656c5f72756e00060aa401042a01027f41fa002f0100210120002f010021022001200247044041e4004112410041e400410010021a0b0b0800200041c4006b0b5001057f41fe002d0000210341fc002f0100210220002d0000210420002f0100210520011004210620042003460440200041016a200141016b10011a0520052002460440200041076a200610011a0b0b0b1d01017f41dc0141840241901c100021004184022000100541840210030b0b38050041e4000b122f6b65726e656c2f656e762f7265626f6f740041f8000b0200010041fa000b0200020041fc000b0200000041fe000b0101 --burn-cap 9999999
+./octez-client --wait none originate smart rollup from bootstrap1 of kind wasm_2_0_0 of type string with kernel 0061736d0100000001280760037f7f7f017f60027f7f017f60057f7f7f7f7f017f60017f0060017f017f60027f7f0060000002610311736d6172745f726f6c6c75705f636f72650a726561645f696e707574000011736d6172745f726f6c6c75705f636f72650c77726974655f6f7574707574000111736d6172745f726f6c6c75705f636f72650b73746f72655f77726974650002030504030405060503010001071402036d656d02000a6b65726e656c5f72756e00060aa401042a01027f41fa002f0100210120002f010021022001200247044041e4004112410041e400410010021a0b0b0800200041c4006b0b5001057f41fe002d0000210341fc002f0100210220002d0000210420002f0100210520011004210620042003460440200041016a200141016b10011a0520052002460440200041076a200610011a0b0b0b1d01017f41dc0141840241901c100021004184022000100541840210030b0b38050041e4000b122f6b65726e656c2f656e762f7265626f6f740041f8000b0200010041fa000b0200020041fc000b0200000041fe000b0101 --burn-cap 9999999
 Node is bootstrapped.
 Estimated gas: 2748.037 units (will add 100 for safety)
 Estimated storage: 6552 bytes added (will add 20 for safety)
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -aux- earliness- 0- externa.out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -aux- earliness- 0- externa.out
index dccd8427151d55eb791149a1020ddb35e2e131de..2b305f8ba09103e280c271861769f3fb6dbecd25 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -aux- earliness- 0- externa.out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -aux- earliness- 0- externa.out	
@@ -1,5 +1,5 @@
 
-./octez-client --wait none originate sc rollup from bootstrap1 of kind wasm_2_0_0 of type bytes with kernel 0061736d0100000001280760037f7f7f017f60027f7f017f60057f7f7f7f7f017f60017f0060017f017f60027f7f0060000002610311736d6172745f726f6c6c75705f636f72650a726561645f696e707574000011736d6172745f726f6c6c75705f636f72650c77726974655f6f7574707574000111736d6172745f726f6c6c75705f636f72650b73746f72655f77726974650002030504030405060503010001071402036d656d02000a6b65726e656c5f72756e00060aa401042a01027f41fa002f0100210120002f010021022001200247044041e4004112410041e400410010021a0b0b0800200041c4006b0b5001057f41fe002d0000210341fc002f0100210220002d0000210420002f0100210520011004210620042003460440200041016a200141016b10011a0520052002460440200041076a200610011a0b0b0b1d01017f41dc0141840241901c100021004184022000100541840210030b0b38050041e4000b122f6b65726e656c2f656e762f7265626f6f740041f8000b0200010041fa000b0200020041fc000b0200000041fe000b0101 --burn-cap 9999999
+./octez-client --wait none originate smart rollup from bootstrap1 of kind wasm_2_0_0 of type bytes with kernel 0061736d0100000001280760037f7f7f017f60027f7f017f60057f7f7f7f7f017f60017f0060017f017f60027f7f0060000002610311736d6172745f726f6c6c75705f636f72650a726561645f696e707574000011736d6172745f726f6c6c75705f636f72650c77726974655f6f7574707574000111736d6172745f726f6c6c75705f636f72650b73746f72655f77726974650002030504030405060503010001071402036d656d02000a6b65726e656c5f72756e00060aa401042a01027f41fa002f0100210120002f010021022001200247044041e4004112410041e400410010021a0b0b0800200041c4006b0b5001057f41fe002d0000210341fc002f0100210220002d0000210420002f0100210520011004210620042003460440200041016a200141016b10011a0520052002460440200041076a200610011a0b0b0b1d01017f41dc0141840241901c100021004184022000100541840210030b0b38050041e4000b122f6b65726e656c2f656e762f7265626f6f740041f8000b0200010041fa000b0200020041fc000b0200000041fe000b0101 --burn-cap 9999999
 Node is bootstrapped.
 Estimated gas: 2748.037 units (will add 100 for safety)
 Estimated storage: 6552 bytes added (will add 20 for safety)
@@ -33,7 +33,7 @@ This sequence of operations was run:
         storage fees ........................... +ꜩ1.638
 
 
-./octez-client --wait none send sc rollup message 'hex:["000000001f002501286d8a3f7f7bed4e400f5b7d83e0c31f72cb295a0000000003617578"]' from bootstrap2
+./octez-client --wait none send smart rollup message 'hex:["000000001f002501286d8a3f7f7bed4e400f5b7d83e0c31f72cb295a0000000003617578"]' from bootstrap2
 Node is bootstrapped.
 Estimated gas: 1001.317 units (will add 100 for safety)
 Estimated storage: no bytes added
@@ -58,7 +58,7 @@ This sequence of operations was run:
       Consumed gas: 1001.351
 
 
-./octez-client --wait none execute outbox message of sc rollup '[SMART_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]' for commitment hash '[SC_ROLLUP_COMMITMENT_HASH]' and output proof 0x0300027d727b240ed0facc0fb57564d6bb5120136200e58038aa6f1fc674871d86ad1d7d727b240ed0facc0fb57564d6bb5120136200e58038aa6f1fc674871d86ad1d0005820764757261626c65d07eb5216be3fcfd8317136e559c80d1a5eeb8f7b684c2101e92efb2b1b9c5324603746167c00800000004536f6d650003c03c8a412b606614757b99ab1cdad9c8355b06e80804cbda187baa6e341bfb09b1820576616c7565810370766d8107627566666572738205696e707574820468656164c00100066c656e677468c00100066f75747075740004820132810a6c6173745f6c6576656cc004000000080133810f76616c69646974795f706572696f64c00400013b0082013181086f7574626f78657300060004c0135db12c9dff68c37e3ca222ff3610666772481b317188e348aff2b0f96247740003c046249f852b8b3004ec9a6b9e479c88d4b0ead13b4dbc4f54f6483aa5b4a622708201350003810468656164c001008208636f6e74656e7473810130c02800000024000000001f002501286d8a3f7f7bed4e400f5b7d83e0c31f72cb295a0000000003617578066c656e677468c001010136820468656164c00100066c656e677468c00100c0c9e4c229dd7bef220d2450007566e287ff2d159abe2d41f35a62cf6020bfce320134810d6d6573736167655f6c696d6974c002a401047761736dd0fe03ae018cf40eea79437f939ebfc1536e92d117f97c036943fe5a37a2a038b97d727b240ed0facc0fb57564d6bb5120136200e58038aa6f1fc674871d86ad1d0000000500000000001f002501286d8a3f7f7bed4e400f5b7d83e0c31f72cb295a0000000003617578 --burn-cap 10
+./octez-client --wait none execute outbox message of smart rollup '[SMART_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]' for commitment hash '[SC_ROLLUP_COMMITMENT_HASH]' and output proof 0x0300027d727b240ed0facc0fb57564d6bb5120136200e58038aa6f1fc674871d86ad1d7d727b240ed0facc0fb57564d6bb5120136200e58038aa6f1fc674871d86ad1d0005820764757261626c65d07eb5216be3fcfd8317136e559c80d1a5eeb8f7b684c2101e92efb2b1b9c5324603746167c00800000004536f6d650003c03c8a412b606614757b99ab1cdad9c8355b06e80804cbda187baa6e341bfb09b1820576616c7565810370766d8107627566666572738205696e707574820468656164c00100066c656e677468c00100066f75747075740004820132810a6c6173745f6c6576656cc004000000080133810f76616c69646974795f706572696f64c00400013b0082013181086f7574626f78657300060004c0135db12c9dff68c37e3ca222ff3610666772481b317188e348aff2b0f96247740003c046249f852b8b3004ec9a6b9e479c88d4b0ead13b4dbc4f54f6483aa5b4a622708201350003810468656164c001008208636f6e74656e7473810130c02800000024000000001f002501286d8a3f7f7bed4e400f5b7d83e0c31f72cb295a0000000003617578066c656e677468c001010136820468656164c00100066c656e677468c00100c0c9e4c229dd7bef220d2450007566e287ff2d159abe2d41f35a62cf6020bfce320134810d6d6573736167655f6c696d6974c002a401047761736dd0fe03ae018cf40eea79437f939ebfc1536e92d117f97c036943fe5a37a2a038b97d727b240ed0facc0fb57564d6bb5120136200e58038aa6f1fc674871d86ad1d0000000500000000001f002501286d8a3f7f7bed4e400f5b7d83e0c31f72cb295a0000000003617578 --burn-cap 10
 Node is bootstrapped.
 Estimated gas: 6405.256 units (will add 100 for safety)
 Estimated storage: 5 bytes added (will add 20 for safety)
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -aux- earliness- 0- interna.out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -aux- earliness- 0- interna.out
index bfbbc646bf4b450acf4ea87f9530715b0cc68bf5..6e92920c8cb4f769b8699334d6db02d11b9de57f 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -aux- earliness- 0- interna.out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -aux- earliness- 0- interna.out	
@@ -1,5 +1,5 @@
 
-./octez-client --wait none originate sc rollup from bootstrap1 of kind wasm_2_0_0 of type bytes with kernel 0061736d0100000001280760037f7f7f017f60027f7f017f60057f7f7f7f7f017f60017f0060017f017f60027f7f0060000002610311736d6172745f726f6c6c75705f636f72650a726561645f696e707574000011736d6172745f726f6c6c75705f636f72650c77726974655f6f7574707574000111736d6172745f726f6c6c75705f636f72650b73746f72655f77726974650002030504030405060503010001071402036d656d02000a6b65726e656c5f72756e00060aa401042a01027f41fa002f0100210120002f010021022001200247044041e4004112410041e400410010021a0b0b0800200041c4006b0b5001057f41fe002d0000210341fc002f0100210220002d0000210420002f0100210520011004210620042003460440200041016a200141016b10011a0520052002460440200041076a200610011a0b0b0b1d01017f41dc0141840241901c100021004184022000100541840210030b0b38050041e4000b122f6b65726e656c2f656e762f7265626f6f740041f8000b0200010041fa000b0200020041fc000b0200000041fe000b0101 --burn-cap 9999999
+./octez-client --wait none originate smart rollup from bootstrap1 of kind wasm_2_0_0 of type bytes with kernel 0061736d0100000001280760037f7f7f017f60027f7f017f60057f7f7f7f7f017f60017f0060017f017f60027f7f0060000002610311736d6172745f726f6c6c75705f636f72650a726561645f696e707574000011736d6172745f726f6c6c75705f636f72650c77726974655f6f7574707574000111736d6172745f726f6c6c75705f636f72650b73746f72655f77726974650002030504030405060503010001071402036d656d02000a6b65726e656c5f72756e00060aa401042a01027f41fa002f0100210120002f010021022001200247044041e4004112410041e400410010021a0b0b0800200041c4006b0b5001057f41fe002d0000210341fc002f0100210220002d0000210420002f0100210520011004210620042003460440200041016a200141016b10011a0520052002460440200041076a200610011a0b0b0b1d01017f41dc0141840241901c100021004184022000100541840210030b0b38050041e4000b122f6b65726e656c2f656e762f7265626f6f740041f8000b0200010041fa000b0200020041fc000b0200000041fe000b0101 --burn-cap 9999999
 Node is bootstrapped.
 Estimated gas: 2748.037 units (will add 100 for safety)
 Estimated storage: 6552 bytes added (will add 20 for safety)
@@ -33,7 +33,7 @@ This sequence of operations was run:
         storage fees ........................... +ꜩ1.638
 
 
-./octez-client --wait none execute outbox message of sc rollup '[SMART_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]' for commitment hash '[SC_ROLLUP_COMMITMENT_HASH]' and output proof 0x03000209260cd9440cb935fabee26a31c7177e9d1c5c5ad1400c08c78f3d53c8a2d33b09260cd9440cb935fabee26a31c7177e9d1c5c5ad1400c08c78f3d53c8a2d33b0005820764757261626c65d07eb5216be3fcfd8317136e559c80d1a5eeb8f7b684c2101e92efb2b1b9c5324603746167c00800000004536f6d650003c008a566a6e047f5869527e0aa0fbbe7af6182e3f5bb9b9abb712cdac0ba8d3e4d820576616c7565810370766d8107627566666572738205696e707574820468656164c00100066c656e677468c00100066f75747075740004820132810a6c6173745f6c6576656cc004000000060133810f76616c69646974795f706572696f64c00400013b0082013181086f7574626f78657300040003e00003c046249f852b8b3004ec9a6b9e479c88d4b0ead13b4dbc4f54f6483aa5b4a622708201350003810468656164c001008208636f6e74656e7473810130c02800000024000000001f002501286d8a3f7f7bed4e400f5b7d83e0c31f72cb295a0000000003617578066c656e677468c001010136820468656164c00100066c656e677468c00100c0ce13fd6c245acffc4c3c2ac8f373b58d30b0f11d1f1b11e8ef99563beb593eec0134810d6d6573736167655f6c696d6974c002a401047761736dd053d416b7282d6e92d846683e6b738a5dc1f374d3857e9d9cf8125b268f60bb0509260cd9440cb935fabee26a31c7177e9d1c5c5ad1400c08c78f3d53c8a2d33b0000000500000000001f002501286d8a3f7f7bed4e400f5b7d83e0c31f72cb295a0000000003617578 --burn-cap 10
+./octez-client --wait none execute outbox message of smart rollup '[SMART_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]' for commitment hash '[SC_ROLLUP_COMMITMENT_HASH]' and output proof 0x03000209260cd9440cb935fabee26a31c7177e9d1c5c5ad1400c08c78f3d53c8a2d33b09260cd9440cb935fabee26a31c7177e9d1c5c5ad1400c08c78f3d53c8a2d33b0005820764757261626c65d07eb5216be3fcfd8317136e559c80d1a5eeb8f7b684c2101e92efb2b1b9c5324603746167c00800000004536f6d650003c008a566a6e047f5869527e0aa0fbbe7af6182e3f5bb9b9abb712cdac0ba8d3e4d820576616c7565810370766d8107627566666572738205696e707574820468656164c00100066c656e677468c00100066f75747075740004820132810a6c6173745f6c6576656cc004000000060133810f76616c69646974795f706572696f64c00400013b0082013181086f7574626f78657300040003e00003c046249f852b8b3004ec9a6b9e479c88d4b0ead13b4dbc4f54f6483aa5b4a622708201350003810468656164c001008208636f6e74656e7473810130c02800000024000000001f002501286d8a3f7f7bed4e400f5b7d83e0c31f72cb295a0000000003617578066c656e677468c001010136820468656164c00100066c656e677468c00100c0ce13fd6c245acffc4c3c2ac8f373b58d30b0f11d1f1b11e8ef99563beb593eec0134810d6d6573736167655f6c696d6974c002a401047761736dd053d416b7282d6e92d846683e6b738a5dc1f374d3857e9d9cf8125b268f60bb0509260cd9440cb935fabee26a31c7177e9d1c5c5ad1400c08c78f3d53c8a2d33b0000000500000000001f002501286d8a3f7f7bed4e400f5b7d83e0c31f72cb295a0000000003617578 --burn-cap 10
 Node is bootstrapped.
 Estimated gas: 6404.712 units (will add 100 for safety)
 Estimated storage: 5 bytes added (will add 20 for safety)
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -default- earliness- 0- ext.out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -default- earliness- 0- ext.out
index 18f22364c391f1e276b4c6f4332d7f4e995b012d..78aec6d83ef8e1854054b738d9dfabbe7258c889 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -default- earliness- 0- ext.out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -default- earliness- 0- ext.out	
@@ -1,5 +1,5 @@
 
-./octez-client --wait none originate sc rollup from bootstrap1 of kind wasm_2_0_0 of type bytes with kernel 0061736d0100000001280760037f7f7f017f60027f7f017f60057f7f7f7f7f017f60017f0060017f017f60027f7f0060000002610311736d6172745f726f6c6c75705f636f72650a726561645f696e707574000011736d6172745f726f6c6c75705f636f72650c77726974655f6f7574707574000111736d6172745f726f6c6c75705f636f72650b73746f72655f77726974650002030504030405060503010001071402036d656d02000a6b65726e656c5f72756e00060aa401042a01027f41fa002f0100210120002f010021022001200247044041e4004112410041e400410010021a0b0b0800200041c4006b0b5001057f41fe002d0000210341fc002f0100210220002d0000210420002f0100210520011004210620042003460440200041016a200141016b10011a0520052002460440200041076a200610011a0b0b0b1d01017f41dc0141840241901c100021004184022000100541840210030b0b38050041e4000b122f6b65726e656c2f656e762f7265626f6f740041f8000b0200010041fa000b0200020041fc000b0200000041fe000b0101 --burn-cap 9999999
+./octez-client --wait none originate smart rollup from bootstrap1 of kind wasm_2_0_0 of type bytes with kernel 0061736d0100000001280760037f7f7f017f60027f7f017f60057f7f7f7f7f017f60017f0060017f017f60027f7f0060000002610311736d6172745f726f6c6c75705f636f72650a726561645f696e707574000011736d6172745f726f6c6c75705f636f72650c77726974655f6f7574707574000111736d6172745f726f6c6c75705f636f72650b73746f72655f77726974650002030504030405060503010001071402036d656d02000a6b65726e656c5f72756e00060aa401042a01027f41fa002f0100210120002f010021022001200247044041e4004112410041e400410010021a0b0b0800200041c4006b0b5001057f41fe002d0000210341fc002f0100210220002d0000210420002f0100210520011004210620042003460440200041016a200141016b10011a0520052002460440200041076a200610011a0b0b0b1d01017f41dc0141840241901c100021004184022000100541840210030b0b38050041e4000b122f6b65726e656c2f656e762f7265626f6f740041f8000b0200010041fa000b0200020041fc000b0200000041fe000b0101 --burn-cap 9999999
 Node is bootstrapped.
 Estimated gas: 2748.037 units (will add 100 for safety)
 Estimated storage: 6552 bytes added (will add 20 for safety)
@@ -33,7 +33,7 @@ This sequence of operations was run:
         storage fees ........................... +ꜩ1.638
 
 
-./octez-client --wait none send sc rollup message 'hex:["0000000023002501286d8a3f7f7bed4e400f5b7d83e0c31f72cb295a000000000764656661756c74"]' from bootstrap2
+./octez-client --wait none send smart rollup message 'hex:["0000000023002501286d8a3f7f7bed4e400f5b7d83e0c31f72cb295a000000000764656661756c74"]' from bootstrap2
 Node is bootstrapped.
 Estimated gas: 1001.330 units (will add 100 for safety)
 Estimated storage: no bytes added
@@ -58,7 +58,7 @@ This sequence of operations was run:
       Consumed gas: 1001.364
 
 
-./octez-client --wait none execute outbox message of sc rollup '[SMART_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]' for commitment hash '[SC_ROLLUP_COMMITMENT_HASH]' and output proof 0x0300029016dec61aa9a9dd8d6c9f2fff04ac470e99c6987f05c5a9299530b8b4467ed99016dec61aa9a9dd8d6c9f2fff04ac470e99c6987f05c5a9299530b8b4467ed90005820764757261626c65d07eb5216be3fcfd8317136e559c80d1a5eeb8f7b684c2101e92efb2b1b9c5324603746167c00800000004536f6d650003c03c8a412b606614757b99ab1cdad9c8355b06e80804cbda187baa6e341bfb09b1820576616c7565810370766d8107627566666572738205696e707574820468656164c00100066c656e677468c00100066f75747075740004820132810a6c6173745f6c6576656cc004000000080133810f76616c69646974795f706572696f64c00400013b0082013181086f7574626f78657300060004c0135db12c9dff68c37e3ca222ff3610666772481b317188e348aff2b0f96247740003c046249f852b8b3004ec9a6b9e479c88d4b0ead13b4dbc4f54f6483aa5b4a622708201350003810468656164c001008208636f6e74656e7473810130c02c000000280000000023002501286d8a3f7f7bed4e400f5b7d83e0c31f72cb295a000000000764656661756c74066c656e677468c001010136820468656164c00100066c656e677468c00100c0c9e4c229dd7bef220d2450007566e287ff2d159abe2d41f35a62cf6020bfce320134810d6d6573736167655f6c696d6974c002a401047761736dd0fe03ae018cf40eea79437f939ebfc1536e92d117f97c036943fe5a37a2a038b99016dec61aa9a9dd8d6c9f2fff04ac470e99c6987f05c5a9299530b8b4467ed900000005000000000023002501286d8a3f7f7bed4e400f5b7d83e0c31f72cb295a000000000764656661756c74 --burn-cap 10
+./octez-client --wait none execute outbox message of smart rollup '[SMART_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]' for commitment hash '[SC_ROLLUP_COMMITMENT_HASH]' and output proof 0x0300029016dec61aa9a9dd8d6c9f2fff04ac470e99c6987f05c5a9299530b8b4467ed99016dec61aa9a9dd8d6c9f2fff04ac470e99c6987f05c5a9299530b8b4467ed90005820764757261626c65d07eb5216be3fcfd8317136e559c80d1a5eeb8f7b684c2101e92efb2b1b9c5324603746167c00800000004536f6d650003c03c8a412b606614757b99ab1cdad9c8355b06e80804cbda187baa6e341bfb09b1820576616c7565810370766d8107627566666572738205696e707574820468656164c00100066c656e677468c00100066f75747075740004820132810a6c6173745f6c6576656cc004000000080133810f76616c69646974795f706572696f64c00400013b0082013181086f7574626f78657300060004c0135db12c9dff68c37e3ca222ff3610666772481b317188e348aff2b0f96247740003c046249f852b8b3004ec9a6b9e479c88d4b0ead13b4dbc4f54f6483aa5b4a622708201350003810468656164c001008208636f6e74656e7473810130c02c000000280000000023002501286d8a3f7f7bed4e400f5b7d83e0c31f72cb295a000000000764656661756c74066c656e677468c001010136820468656164c00100066c656e677468c00100c0c9e4c229dd7bef220d2450007566e287ff2d159abe2d41f35a62cf6020bfce320134810d6d6573736167655f6c696d6974c002a401047761736dd0fe03ae018cf40eea79437f939ebfc1536e92d117f97c036943fe5a37a2a038b99016dec61aa9a9dd8d6c9f2fff04ac470e99c6987f05c5a9299530b8b4467ed900000005000000000023002501286d8a3f7f7bed4e400f5b7d83e0c31f72cb295a000000000764656661756c74 --burn-cap 10
 Node is bootstrapped.
 Estimated gas: 6405.322 units (will add 100 for safety)
 Estimated storage: 5 bytes added (will add 20 for safety)
diff --git a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -default- earliness- 0- int.out b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -default- earliness- 0- int.out
index adedc65d4629b9f139e4f7df6bc55d1b005853c4..c43cba4818a31ce888985d346d63ba78d666fd5b 100644
--- a/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -default- earliness- 0- int.out	
+++ b/tezt/tests/expected/sc_rollup.ml/Alpha- wasm_2_0_0 - trigger exec output (entrypoint- -default- earliness- 0- int.out	
@@ -1,5 +1,5 @@
 
-./octez-client --wait none originate sc rollup from bootstrap1 of kind wasm_2_0_0 of type bytes with kernel 0061736d0100000001280760037f7f7f017f60027f7f017f60057f7f7f7f7f017f60017f0060017f017f60027f7f0060000002610311736d6172745f726f6c6c75705f636f72650a726561645f696e707574000011736d6172745f726f6c6c75705f636f72650c77726974655f6f7574707574000111736d6172745f726f6c6c75705f636f72650b73746f72655f77726974650002030504030405060503010001071402036d656d02000a6b65726e656c5f72756e00060aa401042a01027f41fa002f0100210120002f010021022001200247044041e4004112410041e400410010021a0b0b0800200041c4006b0b5001057f41fe002d0000210341fc002f0100210220002d0000210420002f0100210520011004210620042003460440200041016a200141016b10011a0520052002460440200041076a200610011a0b0b0b1d01017f41dc0141840241901c100021004184022000100541840210030b0b38050041e4000b122f6b65726e656c2f656e762f7265626f6f740041f8000b0200010041fa000b0200020041fc000b0200000041fe000b0101 --burn-cap 9999999
+./octez-client --wait none originate smart rollup from bootstrap1 of kind wasm_2_0_0 of type bytes with kernel 0061736d0100000001280760037f7f7f017f60027f7f017f60057f7f7f7f7f017f60017f0060017f017f60027f7f0060000002610311736d6172745f726f6c6c75705f636f72650a726561645f696e707574000011736d6172745f726f6c6c75705f636f72650c77726974655f6f7574707574000111736d6172745f726f6c6c75705f636f72650b73746f72655f77726974650002030504030405060503010001071402036d656d02000a6b65726e656c5f72756e00060aa401042a01027f41fa002f0100210120002f010021022001200247044041e4004112410041e400410010021a0b0b0800200041c4006b0b5001057f41fe002d0000210341fc002f0100210220002d0000210420002f0100210520011004210620042003460440200041016a200141016b10011a0520052002460440200041076a200610011a0b0b0b1d01017f41dc0141840241901c100021004184022000100541840210030b0b38050041e4000b122f6b65726e656c2f656e762f7265626f6f740041f8000b0200010041fa000b0200020041fc000b0200000041fe000b0101 --burn-cap 9999999
 Node is bootstrapped.
 Estimated gas: 2748.037 units (will add 100 for safety)
 Estimated storage: 6552 bytes added (will add 20 for safety)
@@ -33,7 +33,7 @@ This sequence of operations was run:
         storage fees ........................... +ꜩ1.638
 
 
-./octez-client --wait none execute outbox message of sc rollup '[SMART_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]' for commitment hash '[SC_ROLLUP_COMMITMENT_HASH]' and output proof 0x0300025e7daa1d44f0af4430d1a03d3bff48b10fa2c14ce8bbcb49c7fbfe2308a6e4a35e7daa1d44f0af4430d1a03d3bff48b10fa2c14ce8bbcb49c7fbfe2308a6e4a30005820764757261626c65d07eb5216be3fcfd8317136e559c80d1a5eeb8f7b684c2101e92efb2b1b9c5324603746167c00800000004536f6d650003c008a566a6e047f5869527e0aa0fbbe7af6182e3f5bb9b9abb712cdac0ba8d3e4d820576616c7565810370766d8107627566666572738205696e707574820468656164c00100066c656e677468c00100066f75747075740004820132810a6c6173745f6c6576656cc004000000060133810f76616c69646974795f706572696f64c00400013b0082013181086f7574626f78657300040003e00003c046249f852b8b3004ec9a6b9e479c88d4b0ead13b4dbc4f54f6483aa5b4a622708201350003810468656164c001008208636f6e74656e7473810130c02c000000280000000023002501286d8a3f7f7bed4e400f5b7d83e0c31f72cb295a000000000764656661756c74066c656e677468c001010136820468656164c00100066c656e677468c00100c0ce13fd6c245acffc4c3c2ac8f373b58d30b0f11d1f1b11e8ef99563beb593eec0134810d6d6573736167655f6c696d6974c002a401047761736dd053d416b7282d6e92d846683e6b738a5dc1f374d3857e9d9cf8125b268f60bb055e7daa1d44f0af4430d1a03d3bff48b10fa2c14ce8bbcb49c7fbfe2308a6e4a300000005000000000023002501286d8a3f7f7bed4e400f5b7d83e0c31f72cb295a000000000764656661756c74 --burn-cap 10
+./octez-client --wait none execute outbox message of smart rollup '[SMART_ROLLUP_HASH]' from '[PUBLIC_KEY_HASH]' for commitment hash '[SC_ROLLUP_COMMITMENT_HASH]' and output proof 0x0300025e7daa1d44f0af4430d1a03d3bff48b10fa2c14ce8bbcb49c7fbfe2308a6e4a35e7daa1d44f0af4430d1a03d3bff48b10fa2c14ce8bbcb49c7fbfe2308a6e4a30005820764757261626c65d07eb5216be3fcfd8317136e559c80d1a5eeb8f7b684c2101e92efb2b1b9c5324603746167c00800000004536f6d650003c008a566a6e047f5869527e0aa0fbbe7af6182e3f5bb9b9abb712cdac0ba8d3e4d820576616c7565810370766d8107627566666572738205696e707574820468656164c00100066c656e677468c00100066f75747075740004820132810a6c6173745f6c6576656cc004000000060133810f76616c69646974795f706572696f64c00400013b0082013181086f7574626f78657300040003e00003c046249f852b8b3004ec9a6b9e479c88d4b0ead13b4dbc4f54f6483aa5b4a622708201350003810468656164c001008208636f6e74656e7473810130c02c000000280000000023002501286d8a3f7f7bed4e400f5b7d83e0c31f72cb295a000000000764656661756c74066c656e677468c001010136820468656164c00100066c656e677468c00100c0ce13fd6c245acffc4c3c2ac8f373b58d30b0f11d1f1b11e8ef99563beb593eec0134810d6d6573736167655f6c696d6974c002a401047761736dd053d416b7282d6e92d846683e6b738a5dc1f374d3857e9d9cf8125b268f60bb055e7daa1d44f0af4430d1a03d3bff48b10fa2c14ce8bbcb49c7fbfe2308a6e4a300000005000000000023002501286d8a3f7f7bed4e400f5b7d83e0c31f72cb295a000000000764656661756c74 --burn-cap 10
 Node is bootstrapped.
 Estimated gas: 6404.778 units (will add 100 for safety)
 Estimated storage: 5 bytes added (will add 20 for safety)