diff --git a/examples/demo-rollup/src/rollup.rs b/examples/demo-rollup/src/rollup.rs
index 6758fa983..c0c135ca0 100644
--- a/examples/demo-rollup/src/rollup.rs
+++ b/examples/demo-rollup/src/rollup.rs
@@ -21,7 +21,6 @@ use sov_modules_api::default_context::ZkDefaultContext;
 #[cfg(feature = "experimental")]
 use sov_modules_api::default_signature::private_key::DefaultPrivateKey;
 use sov_modules_stf_template::AppTemplate;
-use sov_risc0_adapter::guest::Risc0Guest;
 use sov_rollup_interface::mocks::{
     MockAddress, MockDaConfig, MockDaService, MOCK_SEQUENCER_DA_ADDRESS,
 };
@@ -70,7 +69,7 @@ pub fn configure_prover<Vm: ZkvmHost, Da: DaService>(
 ) -> Prover<ZkStf<Da::Spec, Vm::Guest>, Da, Vm> {
     let config = match cfg {
         DemoProverConfig::Simulate => ProofGenConfig::Simulate(AppVerifier::new(
-            ZkApp::<Risc0Guest, _>::default().stf,
+            ZkApp::<Vm::Guest, _>::default().stf,
             da_verifier,
         )),
         DemoProverConfig::Execute => ProofGenConfig::Execute,
diff --git a/examples/demo-stf/src/cli.rs b/examples/demo-stf/src/cli.rs
index 86523900f..7864971d9 100644
--- a/examples/demo-stf/src/cli.rs
+++ b/examples/demo-stf/src/cli.rs
@@ -30,7 +30,7 @@ pub enum Workflows<Da: DaSpec> {
 
 #[derive(clap::Parser)]
 #[command(author, version, about, long_about = None)]
-pub struct App<Da: DaSpec> {
+pub struct CliApp<Da: DaSpec> {
     #[clap(subcommand)]
     workflow: Workflows<Da>,
 }
@@ -44,7 +44,7 @@ pub async fn run<Da: DaSpec + serde::Serialize + serde::de::DeserializeOwned>(
     let mut wallet_state: WalletState<RuntimeCall<Ctx, Da>, Ctx> =
         WalletState::load(&wallet_state_path)?;
 
-    let invocation = App::<Da>::parse();
+    let invocation = CliApp::<Da>::parse();
 
     match invocation.workflow {
         Workflows::Transactions(tx) => tx