diff --git a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/Module.java b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/Module.java
index e9ec6a6..669af1f 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/Module.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/Module.java
@@ -25,8 +25,8 @@
   protected void configure() {
     bind(AMQPSession.class);
     bind(ConnectionMonitorTask.class);
-    DynamicSet.bind(binder(), ChangeListener.class).to(PluginChangeListener.class);
-    DynamicSet.bind(binder(), LifecycleListener.class).to(PluginChangeListener.class);
+    DynamicSet.bind(binder(), ChangeListener.class).to(RabbitMQManager.class);
+    DynamicSet.bind(binder(), LifecycleListener.class).to(RabbitMQManager.class);
     install(new FactoryModuleBuilder().build(AMQPSession.Factory.class));
   }
 }
diff --git a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/PluginChangeListener.java b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/RabbitMQManager.java
similarity index 80%
rename from src/main/java/com/googlesource/gerrit/plugins/rabbitmq/PluginChangeListener.java
rename to src/main/java/com/googlesource/gerrit/plugins/rabbitmq/RabbitMQManager.java
index 982db87..af02df8 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/PluginChangeListener.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/RabbitMQManager.java
@@ -11,9 +11,9 @@
 
 import java.util.Timer;
 
-public class PluginChangeListener implements ChangeListener, LifecycleListener {
+public class RabbitMQManager implements ChangeListener, LifecycleListener {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(PluginChangeListener.class);
+  private static final Logger LOGGER = LoggerFactory.getLogger(RabbitMQManager.class);
   private final static int MONITOR_FIRATTIME_DELAY = 15000;
   private final Properties properties;
   private final AMQPSession.Factory factory;
@@ -23,7 +23,7 @@
   private final ConnectionMonitorTask monitorTask;
 
   @Inject
-  public PluginChangeListener(Properties properties, AMQPSession.Factory factory, ConnectionMonitorTask monitorTask) {
+  public RabbitMQManager(Properties properties, AMQPSession.Factory factory, ConnectionMonitorTask monitorTask) {
     this.properties = properties;
     this.factory = factory;
     this.monitorTask = monitorTask;