diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/package-info.java b/inject-generator/src/main/java/io/avaje/inject/generator/package-info.java
index 4f345bbd0..b6e1ffeb3 100644
--- a/inject-generator/src/main/java/io/avaje/inject/generator/package-info.java
+++ b/inject-generator/src/main/java/io/avaje/inject/generator/package-info.java
@@ -26,7 +26,7 @@
 @GeneratePrism(value = RequiresBean.Container.class, name = "RequiresBeanContainerPrism")
 @GeneratePrism(value = RequiresProperty.Container.class, name = "RequiresPropertyContainerPrism")
 @GeneratePrism(Profile.class)
-@GeneratePrism(EventType.class)
+@GeneratePrism(ApplicationEvent.class)
 package io.avaje.inject.generator;
 
 import io.avaje.inject.*;
diff --git a/inject-generator/src/test/java/io/avaje/inject/generator/models/valid/observes/CustomEvent.java b/inject-generator/src/test/java/io/avaje/inject/generator/models/valid/observes/CustomEvent.java
index 0ed24d2c3..e6a73a5b8 100644
--- a/inject-generator/src/test/java/io/avaje/inject/generator/models/valid/observes/CustomEvent.java
+++ b/inject-generator/src/test/java/io/avaje/inject/generator/models/valid/observes/CustomEvent.java
@@ -1,8 +1,8 @@
 package io.avaje.inject.generator.models.valid.observes;
 
-import io.avaje.inject.event.EventType;
+import io.avaje.inject.event.ApplicationEvent;
 
-@EventType
+@ApplicationEvent
 public class CustomEvent {
 
 }
diff --git a/inject-test/src/test/java/org/example/observes/CustomEvent.java b/inject-test/src/test/java/org/example/observes/CustomEvent.java
index 7c245e4bb..b7ca2519b 100644
--- a/inject-test/src/test/java/org/example/observes/CustomEvent.java
+++ b/inject-test/src/test/java/org/example/observes/CustomEvent.java
@@ -1,8 +1,8 @@
 package org.example.observes;
 
-import io.avaje.inject.event.EventType;
+import io.avaje.inject.event.ApplicationEvent;
 
-@EventType
+@ApplicationEvent
 public class CustomEvent {
   private final String string;
 
diff --git a/inject/src/main/java/io/avaje/inject/event/EventType.java b/inject/src/main/java/io/avaje/inject/event/ApplicationEvent.java
similarity index 88%
rename from inject/src/main/java/io/avaje/inject/event/EventType.java
rename to inject/src/main/java/io/avaje/inject/event/ApplicationEvent.java
index e5a163358..e5d463d6e 100644
--- a/inject/src/main/java/io/avaje/inject/event/EventType.java
+++ b/inject/src/main/java/io/avaje/inject/event/ApplicationEvent.java
@@ -6,11 +6,10 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-// TODO better name???
 /**
  * Marks a class/record as an event class, signaling the annotation processor to generate a
  * publisher class for the annotated type.
  */
 @Target(TYPE)
 @Retention(SOURCE)
-public @interface EventType {}
+public @interface ApplicationEvent {}
diff --git a/inject/src/main/java/io/avaje/inject/event/Event.java b/inject/src/main/java/io/avaje/inject/event/Event.java
index 505751d0f..61c04c191 100644
--- a/inject/src/main/java/io/avaje/inject/event/Event.java
+++ b/inject/src/main/java/io/avaje/inject/event/Event.java
@@ -1,11 +1,8 @@
 package io.avaje.inject.event;
 
-import static java.util.stream.Collectors.toList;
-
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Comparator;
-import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
@@ -54,8 +51,7 @@ public void fire(T event, String qualifier) {
   }
 
   /**
-   * Fires an event asynchronously with the specified qualifier and notifies observers
-   * asynchronously.
+   * Fires an event with the specified qualifier and notifies asynchronous observers
    *
    * @param event the event object
    * @param qualifier the qualifier for this event
@@ -87,7 +83,7 @@ public CompletionStage<T> fireAsync(T event, String qualifier) {
   }
 
   /**
-   * Fires an event and notifies sync observers with no qualifier.
+   * Fires an event and notifies observers with no qualifier.
    *
    * @param qualifier qualifier for this event
    * @param event the event object
@@ -97,7 +93,7 @@ public void fire(T event) {
   }
 
   /**
-   * Fires an event asynchronously with the notifies async observers without qualifiers
+   * Fires an event to asynchronous observers without qualifiers
    *
    * @param event the event object
    * @param qualifier the qualifier for this event
diff --git a/inject/src/main/java/io/avaje/inject/event/ObservesAsync.java b/inject/src/main/java/io/avaje/inject/event/ObservesAsync.java
index 4a221f8f4..72b7b7c08 100644
--- a/inject/src/main/java/io/avaje/inject/event/ObservesAsync.java
+++ b/inject/src/main/java/io/avaje/inject/event/ObservesAsync.java
@@ -7,7 +7,7 @@
 import java.lang.annotation.Target;
 
 /**
- * Identifies the event parameter of an observer method. May be applied to a parameter of a method
+ * Identifies the event parameter of an asynchronous observer method. May be applied to a parameter of a method
  * of a bean class.
  *
  * <pre>
@@ -31,7 +31,7 @@
  * has occurred.
  *
  * <pre>
- * public void afterLogin(&#064;Observes LoggedInEvent event, &#064;Manager User user, Logger log) { ... }
+ * public void afterLogin(&#064;ObservesAsync LoggedInEvent event, &#064;Manager User user, Logger log) { ... }
  * </pre>
  */
 @Target(PARAMETER)