diff --git a/templates/axon-event.java.mustache b/templates/axon-event.java.mustache
index de49897..dcc92ad 100644
--- a/templates/axon-event.java.mustache
+++ b/templates/axon-event.java.mustache
@@ -34,7 +34,7 @@ public class {{name}} {{#implements.length}}implements {{#implements}}{{name}}{{
     @Data
     @AllArgsConstructor
     @NoArgsConstructor
-    public static class {{name}}Command {
+    public static class Command {
 
         {{#fields}}{{#isAggregateId}}
         @TargetAggregateIdentifier{{/isAggregateId}}