diff --git a/crates/crunch-cli/src/main.rs b/crates/crunch-cli/src/main.rs
index 4b6192b..ad05656 100644
--- a/crates/crunch-cli/src/main.rs
+++ b/crates/crunch-cli/src/main.rs
@@ -144,7 +144,8 @@ message MyEvent {{
     string my_field = 1;
 }}
 "#,
-                                        config.service.domain, entity
+                                        config.service.domain.replace("-", "_"),
+                                        entity.replace("-", "_")
                                     )
                                     .as_bytes(),
                                 )