diff --git a/pom.xml b/pom.xml
index 1aac62d..a44fd52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,14 +25,14 @@
     <groupId>com.cisco.gerrit.plugins</groupId>
     <artifactId>slack-integration</artifactId>
     <packaging>jar</packaging>
-    <version>2.9</version>
+    <version>2.10</version>
     <name>Slack Integration Plugin</name>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <gerrit-api-type>plugin</gerrit-api-type>
-        <gerrit-api-version>2.9</gerrit-api-version>
+        <gerrit-api-version>2.10</gerrit-api-version>
     </properties>
 
     <build>
diff --git a/src/main/java/com/cisco/gerrit/plugins/slack/EventListener.java b/src/main/java/com/cisco/gerrit/plugins/slack/PublishEventListener.java
similarity index 96%
rename from src/main/java/com/cisco/gerrit/plugins/slack/EventListener.java
rename to src/main/java/com/cisco/gerrit/plugins/slack/PublishEventListener.java
index b4c4ca5..f8a17e1 100644
--- a/src/main/java/com/cisco/gerrit/plugins/slack/EventListener.java
+++ b/src/main/java/com/cisco/gerrit/plugins/slack/PublishEventListener.java
@@ -37,10 +37,10 @@
  */
 @Listen
 @Singleton
-public class EventListener implements ChangeListener
+public class PublishEventListener implements ChangeListener
 {
     private static final Logger LOGGER =
-            LoggerFactory.getLogger(EventListener.class);
+            LoggerFactory.getLogger(PublishEventListener.class);
 
     private static final String ALL_PROJECTS = "All-Projects";
 
diff --git a/src/test/java/com/cisco/gerrit/plugins/slack/EventListenerTest.java b/src/test/java/com/cisco/gerrit/plugins/slack/PublishEventListenerTest.java
similarity index 89%
rename from src/test/java/com/cisco/gerrit/plugins/slack/EventListenerTest.java
rename to src/test/java/com/cisco/gerrit/plugins/slack/PublishEventListenerTest.java
index bed0523..4ca0f86 100644
--- a/src/test/java/com/cisco/gerrit/plugins/slack/EventListenerTest.java
+++ b/src/test/java/com/cisco/gerrit/plugins/slack/PublishEventListenerTest.java
@@ -25,19 +25,19 @@
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 
-public class EventListenerTest
+public class PublishEventListenerTest
 {
     private PatchSetCreatedEvent mockPatchSetCreatedEvent =
             mock(PatchSetCreatedEvent.class);
     private ChangeMergedEvent mocChangeMergedEvent =
             mock(ChangeMergedEvent.class);
 
-    private EventListener eventListener;
+    private PublishEventListener publishEventListener;
 
     @Before
     public void setup() throws Exception
     {
-        eventListener = new EventListener();
+        publishEventListener = new PublishEventListener();
     }
 
     @Test