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 84eb600..7aeba64 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/kafka/Manager.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/kafka/Manager.java
@@ -17,7 +17,7 @@
 import com.google.gerrit.extensions.events.LifecycleListener;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
-import com.googlesource.gerrit.plugins.kafka.message.Publisher;
+import com.googlesource.gerrit.plugins.kafka.publish.Publisher;
 
 @Singleton
 public class Manager implements LifecycleListener {
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 7cf75fb..44cdced 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/kafka/Module.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/kafka/Module.java
@@ -20,8 +20,8 @@
 import com.google.gson.Gson;
 import com.google.inject.AbstractModule;
 import com.google.inject.Singleton;
-import com.googlesource.gerrit.plugins.kafka.message.GsonProvider;
-import com.googlesource.gerrit.plugins.kafka.message.Publisher;
+import com.googlesource.gerrit.plugins.kafka.publish.GsonProvider;
+import com.googlesource.gerrit.plugins.kafka.publish.Publisher;
 
 class Module extends AbstractModule {
 
diff --git a/src/main/java/com/googlesource/gerrit/plugins/kafka/message/GsonProvider.java b/src/main/java/com/googlesource/gerrit/plugins/kafka/publish/GsonProvider.java
similarity index 94%
rename from src/main/java/com/googlesource/gerrit/plugins/kafka/message/GsonProvider.java
rename to src/main/java/com/googlesource/gerrit/plugins/kafka/publish/GsonProvider.java
index 40080cf..df9fd65 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/kafka/message/GsonProvider.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/kafka/publish/GsonProvider.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.kafka.message;
+package com.googlesource.gerrit.plugins.kafka.publish;
 
 import com.google.common.base.Supplier;
 import com.google.gerrit.server.events.SupplierSerializer;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/kafka/message/Publisher.java b/src/main/java/com/googlesource/gerrit/plugins/kafka/publish/Publisher.java
similarity index 96%
rename from src/main/java/com/googlesource/gerrit/plugins/kafka/message/Publisher.java
rename to src/main/java/com/googlesource/gerrit/plugins/kafka/publish/Publisher.java
index 25de2dc..727fc16 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/kafka/message/Publisher.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/kafka/publish/Publisher.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.kafka.message;
+package com.googlesource.gerrit.plugins.kafka.publish;
 
 import com.google.gerrit.server.events.Event;
 import com.google.gerrit.server.events.EventListener;