diff --git a/src/main/java/com/googlesource/gerrit/plugins/kafka/Manager.java b/src/main/java/com/googlesource/gerrit/plugins/kafka/Manager.java
index 7aeba64..b20b312 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/kafka/Manager.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/kafka/Manager.java
@@ -17,15 +17,15 @@
 import com.google.gerrit.extensions.events.LifecycleListener;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
-import com.googlesource.gerrit.plugins.kafka.publish.Publisher;
+import com.googlesource.gerrit.plugins.kafka.publish.KafkaPublisher;
 
 @Singleton
 public class Manager implements LifecycleListener {
 
-  private final Publisher publisher;
+  private final KafkaPublisher publisher;
 
   @Inject
-  public Manager(Publisher publisher) {
+  public Manager(KafkaPublisher publisher) {
     this.publisher = publisher;
   }
 
diff --git a/src/main/java/com/googlesource/gerrit/plugins/kafka/Module.java b/src/main/java/com/googlesource/gerrit/plugins/kafka/Module.java
index 44cdced..7f219d3 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/kafka/Module.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/kafka/Module.java
@@ -21,7 +21,7 @@
 import com.google.inject.AbstractModule;
 import com.google.inject.Singleton;
 import com.googlesource.gerrit.plugins.kafka.publish.GsonProvider;
-import com.googlesource.gerrit.plugins.kafka.publish.Publisher;
+import com.googlesource.gerrit.plugins.kafka.publish.KafkaPublisher;
 
 class Module extends AbstractModule {
 
@@ -29,6 +29,6 @@
   protected void configure() {
     bind(Gson.class).toProvider(GsonProvider.class).in(Singleton.class);
     DynamicSet.bind(binder(), LifecycleListener.class).to(Manager.class);
-    DynamicSet.bind(binder(), EventListener.class).to(Publisher.class);
+    DynamicSet.bind(binder(), EventListener.class).to(KafkaPublisher.class);
   }
 }
diff --git a/src/main/java/com/googlesource/gerrit/plugins/kafka/publish/Publisher.java b/src/main/java/com/googlesource/gerrit/plugins/kafka/publish/KafkaPublisher.java
similarity index 90%
rename from src/main/java/com/googlesource/gerrit/plugins/kafka/publish/Publisher.java
rename to src/main/java/com/googlesource/gerrit/plugins/kafka/publish/KafkaPublisher.java
index 727fc16..8c78439 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/kafka/publish/Publisher.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/kafka/publish/KafkaPublisher.java
@@ -19,17 +19,20 @@
 import com.google.gson.Gson;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
+
 import com.googlesource.gerrit.plugins.kafka.session.KafkaSession;
 
 @Singleton
-public class Publisher implements EventListener {
+public class KafkaPublisher implements EventListener {
 
   private final KafkaSession session;
   private final Gson gson;
   private boolean available = true;
 
   @Inject
-  public Publisher(KafkaSession kafkaSession, Gson gson) {
+  public KafkaPublisher(
+      KafkaSession kafkaSession,
+      Gson gson) {
     this.session = kafkaSession;
     this.gson = gson;
   }
@@ -65,10 +68,6 @@
     return available;
   }
 
-  public KafkaSession getSession() {
-    return session;
-  }
-
   public String getName() {
     return "Kafka";
   }