diff --git a/inject-generator/src/main/java/io/avaje/inject/generator/ScopeUtil.java b/inject-generator/src/main/java/io/avaje/inject/generator/ScopeUtil.java
index aefdb320d..c18bc9e15 100644
--- a/inject-generator/src/main/java/io/avaje/inject/generator/ScopeUtil.java
+++ b/inject-generator/src/main/java/io/avaje/inject/generator/ScopeUtil.java
@@ -4,7 +4,17 @@ final class ScopeUtil {
 
   static String initName(String name) {
     name = name(name);
-    return "Inject".equals(name) ? "DInject" : name;
+    if (name == null) {
+      return null;
+    }
+    switch (name) {
+      case "Inject":
+        return "DInject";
+      case "Avaje":
+        return "AvajeInject";
+      default:
+        return name;
+    }
   }
 
   static String name(String name) {
diff --git a/inject-generator/src/test/java/io/avaje/inject/generator/ScopeUtilTest.java b/inject-generator/src/test/java/io/avaje/inject/generator/ScopeUtilTest.java
index cf7e8fec3..14403fef4 100644
--- a/inject-generator/src/test/java/io/avaje/inject/generator/ScopeUtilTest.java
+++ b/inject-generator/src/test/java/io/avaje/inject/generator/ScopeUtilTest.java
@@ -1,8 +1,9 @@
 package io.avaje.inject.generator;
 
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
-import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
 
 class ScopeUtilTest {
 
@@ -12,6 +13,9 @@ void name() {
     assertEquals("Example", ScopeUtil.name("org.Example"));
     assertEquals("Example", ScopeUtil.name("example"));
     assertEquals("Example", ScopeUtil.name("Example"));
+    assertEquals("Example", ScopeUtil.name("ExampleScope"));
+    assertEquals("Example", ScopeUtil.name("ExampleModule"));
+    assertNull(ScopeUtil.name(null));
   }
 
   @Test
@@ -19,6 +23,14 @@ void initName_inject() {
     // resulting module can't be InjectModule as that clashes with @InjectModule
     assertEquals("DInject", ScopeUtil.initName("org.example.inject"));
     assertEquals("Foo", ScopeUtil.initName("org.example.foo"));
+    assertNull(ScopeUtil.initName(null));
+  }
+
+  @Test
+  void initName_avaje() {
+    // resulting module can't be InjectModule as that clashes with @InjectModule
+    assertEquals("AvajeInject", ScopeUtil.initName("org.example.avaje"));
+    assertEquals("Foo", ScopeUtil.initName("org.example.foo"));
   }
 
   @Test