diff --git a/event-bus-ap/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/event-bus-ap/src/main/resources/META-INF/services/javax.annotation.processing.Processor
deleted file mode 100644
index 13befff..0000000
--- a/event-bus-ap/src/main/resources/META-INF/services/javax.annotation.processing.Processor
+++ /dev/null
@@ -1 +0,0 @@
-dev.kske.eventbus.ap.EventProcessor
\ No newline at end of file
diff --git a/event-bus-ap/.classpath b/event-bus-proc/.classpath
similarity index 100%
rename from event-bus-ap/.classpath
rename to event-bus-proc/.classpath
diff --git a/event-bus-ap/.project b/event-bus-proc/.project
similarity index 94%
rename from event-bus-ap/.project
rename to event-bus-proc/.project
index 7976120..2ec4a0c 100644
--- a/event-bus-ap/.project
+++ b/event-bus-proc/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>event-bus-ap</name>
+	<name>event-bus-proc</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/event-bus-ap/pom.xml b/event-bus-proc/pom.xml
similarity index 88%
rename from event-bus-ap/pom.xml
rename to event-bus-proc/pom.xml
index e2e253f..b1be683 100644
--- a/event-bus-ap/pom.xml
+++ b/event-bus-proc/pom.xml
@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<artifactId>event-bus-ap</artifactId>
+	<artifactId>event-bus-proc</artifactId>
 
 	<name>Event Bus Annotation Processor</name>
 	<description>Annotation processor checking for errors related to the @Event annotation from Event Bus.</description>
@@ -28,6 +28,8 @@
 		<testSourceDirectory />
 
 		<plugins>
+
+			<!-- Prevent annotation processing error during compilation -->
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
@@ -35,6 +37,7 @@
 				</configuration>
 			</plugin>
 
+			<!-- Include event-bus-core classes into JAR -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-shade-plugin</artifactId>
@@ -54,4 +57,4 @@
 		</plugins>
 
 	</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/event-bus-ap/src/main/java/dev/kske/eventbus/ap/EventProcessor.java b/event-bus-proc/src/main/java/dev/kske/eventbus/proc/EventProcessor.java
similarity index 99%
rename from event-bus-ap/src/main/java/dev/kske/eventbus/ap/EventProcessor.java
rename to event-bus-proc/src/main/java/dev/kske/eventbus/proc/EventProcessor.java
index f6cc75d..f3ce505 100644
--- a/event-bus-ap/src/main/java/dev/kske/eventbus/ap/EventProcessor.java
+++ b/event-bus-proc/src/main/java/dev/kske/eventbus/proc/EventProcessor.java
@@ -1,4 +1,4 @@
-package dev.kske.eventbus.ap;
+package dev.kske.eventbus.proc;
 
 import java.util.Set;
 
diff --git a/event-bus-ap/src/main/java/dev/kske/eventbus/ap/package-info.java b/event-bus-proc/src/main/java/dev/kske/eventbus/proc/package-info.java
similarity index 76%
rename from event-bus-ap/src/main/java/dev/kske/eventbus/ap/package-info.java
rename to event-bus-proc/src/main/java/dev/kske/eventbus/proc/package-info.java
index 3a09965..81c96b0 100644
--- a/event-bus-ap/src/main/java/dev/kske/eventbus/ap/package-info.java
+++ b/event-bus-proc/src/main/java/dev/kske/eventbus/proc/package-info.java
@@ -4,4 +4,4 @@
  * @author Kai S. K. Engelbart
  * @since 1.0.0
  */
-package dev.kske.eventbus.ap;
+package dev.kske.eventbus.proc;
diff --git a/event-bus-ap/src/main/java/module-info.java b/event-bus-proc/src/main/java/module-info.java
similarity index 100%
rename from event-bus-ap/src/main/java/module-info.java
rename to event-bus-proc/src/main/java/module-info.java
diff --git a/event-bus-proc/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/event-bus-proc/src/main/resources/META-INF/services/javax.annotation.processing.Processor
new file mode 100644
index 0000000..38a4ce1
--- /dev/null
+++ b/event-bus-proc/src/main/resources/META-INF/services/javax.annotation.processing.Processor
@@ -0,0 +1 @@
+dev.kske.eventbus.proc.EventProcessor
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 6832280..c4ce552 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
 
 	<modules>
 		<module>event-bus-core</module>
-		<module>event-bus-ap</module>
+		<module>event-bus-proc</module>
 	</modules>
 
 	<licenses>
@@ -94,4 +94,4 @@
 
 		</plugins>
 	</build>
-</project>
\ No newline at end of file
+</project>