Rename plugin eiffel-events -> events-eiffel

Solves: Jira GER-1421
Change-Id: I4fb73adb60aecaf58dd0d3ae4816c080a60eaea1
diff --git a/BUILD b/BUILD
index da75521..c8ca728 100644
--- a/BUILD
+++ b/BUILD
@@ -2,11 +2,11 @@
 load("//tools/bzl:plugin.bzl", "PLUGIN_DEPS", "PLUGIN_TEST_DEPS", "gerrit_plugin")
 
 gerrit_plugin(
-    name = "eiffel-events",
+    name = "events-eiffel",
     srcs = glob(["src/main/java/**/*.java"]),
     manifest_entries = [
-        "Gerrit-PluginName: eiffel-events",
-        "Gerrit-Module: com.googlesource.gerrit.plugins.eiffelevents.Module",
+        "Gerrit-PluginName: events-eiffel",
+        "Gerrit-Module: com.googlesource.gerrit.plugins.eventseiffel.Module",
     ],
     resources = glob(["src/main/resources/**/*"]),
     deps = [
@@ -15,9 +15,9 @@
 )
 
 junit_tests(
-    name = "eiffel-events_tests",
+    name = "events-eiffel_tests",
     srcs = glob(["src/test/java/**/*.java"]),
-    tags = ["eiffel-events"],
+    tags = ["events-eiffel"],
     visibility = ["//visibility:public"],
-    deps = PLUGIN_TEST_DEPS + PLUGIN_DEPS + [":eiffel-events__plugin"],
+    deps = PLUGIN_TEST_DEPS + PLUGIN_DEPS + [":events-eiffel__plugin"],
 )
diff --git a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/EiffelEventHub.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/EiffelEventHub.java
similarity index 90%
rename from src/main/java/com/googlesource/gerrit/plugins/eiffelevents/EiffelEventHub.java
rename to src/main/java/com/googlesource/gerrit/plugins/eventseiffel/EiffelEventHub.java
index 8e5a158..a76b2ec 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/EiffelEventHub.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/EiffelEventHub.java
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents;
+package com.googlesource.gerrit.plugins.eventseiffel;
 
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.EventKey;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelEvent;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.EventKey;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelEvent;
 import java.util.Optional;
 import java.util.UUID;
 
diff --git a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/EiffelEventHubImpl.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/EiffelEventHubImpl.java
similarity index 95%
rename from src/main/java/com/googlesource/gerrit/plugins/eiffelevents/EiffelEventHubImpl.java
rename to src/main/java/com/googlesource/gerrit/plugins/eventseiffel/EiffelEventHubImpl.java
index f1467a9..b1fb30e 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/EiffelEventHubImpl.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/EiffelEventHubImpl.java
@@ -12,18 +12,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents;
+package com.googlesource.gerrit.plugins.eventseiffel;
 
 import static com.google.common.base.Preconditions.checkState;
-import static com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelEventType.SCC;
-import static com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelEventType.SCS;
+import static com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelEventType.SCC;
+import static com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelEventType.SCS;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.flogger.FluentLogger;
 import com.google.inject.Inject;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.EventKey;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelEvent;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.EventKey;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelEvent;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Queue;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/EiffelEventIdCache.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/EiffelEventIdCache.java
similarity index 86%
rename from src/main/java/com/googlesource/gerrit/plugins/eiffelevents/EiffelEventIdCache.java
rename to src/main/java/com/googlesource/gerrit/plugins/eventseiffel/EiffelEventIdCache.java
index d9167db..031a1e8 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/EiffelEventIdCache.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/EiffelEventIdCache.java
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents;
+package com.googlesource.gerrit.plugins.eventseiffel;
 
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.EventKey;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelEvent;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.EventKey;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelEvent;
 import java.util.Optional;
 import java.util.UUID;
 
diff --git a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/EiffelEventIdCacheImpl.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/EiffelEventIdCacheImpl.java
similarity index 86%
rename from src/main/java/com/googlesource/gerrit/plugins/eiffelevents/EiffelEventIdCacheImpl.java
rename to src/main/java/com/googlesource/gerrit/plugins/eventseiffel/EiffelEventIdCacheImpl.java
index 9f2bb26..074ac30 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/EiffelEventIdCacheImpl.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/EiffelEventIdCacheImpl.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents;
+package com.googlesource.gerrit.plugins.eventseiffel;
 
 import static com.google.common.base.Preconditions.checkState;
 
@@ -23,10 +23,10 @@
 import com.google.inject.Module;
 import com.google.inject.TypeLiteral;
 import com.google.inject.name.Named;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.EventKey;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.SourceChangeEventKey;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.api.EventStorage;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelEvent;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.EventKey;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.SourceChangeEventKey;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.api.EventStorage;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelEvent;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.ExecutionException;
@@ -69,7 +69,7 @@
   }
 
   /* (non-Javadoc)
-   * @see com.googlesource.gerrit.plugins.eiffelevents.EiffelEventIdCache#putId(com.googlesource.gerrit.plugins.eiffelevents.eiffel.EiffelEvent)
+   * @see com.googlesource.gerrit.plugins.eventseiffel.EiffelEventIdCache#putId(com.googlesource.gerrit.plugins.eventseiffel.eiffel.EiffelEvent)
    */
   @Override
   public void putId(EiffelEvent event) {
diff --git a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/EiffelEventIdLookupException.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/EiffelEventIdLookupException.java
similarity index 88%
rename from src/main/java/com/googlesource/gerrit/plugins/eiffelevents/EiffelEventIdLookupException.java
rename to src/main/java/com/googlesource/gerrit/plugins/eventseiffel/EiffelEventIdLookupException.java
index f6f4bd2..120f98b 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/EiffelEventIdLookupException.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/EiffelEventIdLookupException.java
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents;
+package com.googlesource.gerrit.plugins.eventseiffel;
 
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelEventType;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelEventType;
 
 public class EiffelEventIdLookupException extends Exception {
   private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/EiffelEventQueue.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/EiffelEventQueue.java
similarity index 91%
rename from src/main/java/com/googlesource/gerrit/plugins/eiffelevents/EiffelEventQueue.java
rename to src/main/java/com/googlesource/gerrit/plugins/eventseiffel/EiffelEventQueue.java
index 615bdbe..e3a3cb9 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/EiffelEventQueue.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/EiffelEventQueue.java
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents;
+package com.googlesource.gerrit.plugins.eventseiffel;
 
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelEvent;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelEvent;
 
 public interface EiffelEventQueue {
   /**
diff --git a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/GraphQlEventStorageProvider.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/GraphQlEventStorageProvider.java
similarity index 83%
rename from src/main/java/com/googlesource/gerrit/plugins/eiffelevents/GraphQlEventStorageProvider.java
rename to src/main/java/com/googlesource/gerrit/plugins/eventseiffel/GraphQlEventStorageProvider.java
index 134f0b3..ae36a72 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/GraphQlEventStorageProvider.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/GraphQlEventStorageProvider.java
@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents;
+package com.googlesource.gerrit.plugins.eventseiffel;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
-import com.googlesource.gerrit.plugins.eiffelevents.config.EiffelEventsConfig;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.api.EiffelGraphQlClient;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.api.EventStorage;
+import com.googlesource.gerrit.plugins.eventseiffel.config.EiffelEventsConfig;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.api.EiffelGraphQlClient;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.api.EventStorage;
 
 public class GraphQlEventStorageProvider implements Provider<EventStorage> {
 
diff --git a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/Module.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/Module.java
similarity index 82%
rename from src/main/java/com/googlesource/gerrit/plugins/eiffelevents/Module.java
rename to src/main/java/com/googlesource/gerrit/plugins/eventseiffel/Module.java
index 56dd603..c29ca1a 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/Module.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/Module.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents;
+package com.googlesource.gerrit.plugins.eventseiffel;
 
 import com.google.common.flogger.FluentLogger;
 import com.google.gerrit.extensions.config.FactoryModule;
@@ -23,16 +23,16 @@
 import com.google.inject.Inject;
 import com.google.inject.Scopes;
 import com.google.inject.internal.UniqueAnnotations;
-import com.googlesource.gerrit.plugins.eiffelevents.config.EiffelEventsConfig;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.api.EiffelEventPublisher;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.api.EventStorage;
-import com.googlesource.gerrit.plugins.eiffelevents.listeners.BranchUpdateListener;
-import com.googlesource.gerrit.plugins.eiffelevents.listeners.PatchsetCreatedListener;
-import com.googlesource.gerrit.plugins.eiffelevents.mapping.EiffelEventFactory;
-import com.googlesource.gerrit.plugins.eiffelevents.mapping.EiffelEventMapper;
-import com.googlesource.gerrit.plugins.eiffelevents.mq.RabbitMqPublisher;
-import com.googlesource.gerrit.plugins.eiffelevents.parsing.EiffelEventParsingExecutor;
-import com.googlesource.gerrit.plugins.eiffelevents.parsing.EiffelEventParsingQueue;
+import com.googlesource.gerrit.plugins.eventseiffel.config.EiffelEventsConfig;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.api.EiffelEventPublisher;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.api.EventStorage;
+import com.googlesource.gerrit.plugins.eventseiffel.listeners.BranchUpdateListener;
+import com.googlesource.gerrit.plugins.eventseiffel.listeners.PatchsetCreatedListener;
+import com.googlesource.gerrit.plugins.eventseiffel.mapping.EiffelEventFactory;
+import com.googlesource.gerrit.plugins.eventseiffel.mapping.EiffelEventMapper;
+import com.googlesource.gerrit.plugins.eventseiffel.mq.RabbitMqPublisher;
+import com.googlesource.gerrit.plugins.eventseiffel.parsing.EiffelEventParsingExecutor;
+import com.googlesource.gerrit.plugins.eventseiffel.parsing.EiffelEventParsingQueue;
 
 class Module extends FactoryModule {
   private static final FluentLogger logger = FluentLogger.forEnclosingClass();
diff --git a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/PublishEventWorker.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/PublishEventWorker.java
similarity index 92%
rename from src/main/java/com/googlesource/gerrit/plugins/eiffelevents/PublishEventWorker.java
rename to src/main/java/com/googlesource/gerrit/plugins/eventseiffel/PublishEventWorker.java
index 541297c..6f03c81 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/PublishEventWorker.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/PublishEventWorker.java
@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents;
+package com.googlesource.gerrit.plugins.eventseiffel;
 
 import com.google.common.flogger.FluentLogger;
 import com.google.gerrit.extensions.events.LifecycleListener;
 import com.google.inject.Inject;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.EventKey;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.api.EiffelEventPublisher;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelEvent;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.EventKey;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.api.EiffelEventPublisher;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelEvent;
 
 public class PublishEventWorker implements LifecycleListener {
   private static final FluentLogger logger = FluentLogger.forEnclosingClass();
diff --git a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/config/EiffelEventsConfig.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/config/EiffelEventsConfig.java
similarity index 99%
rename from src/main/java/com/googlesource/gerrit/plugins/eiffelevents/config/EiffelEventsConfig.java
rename to src/main/java/com/googlesource/gerrit/plugins/eventseiffel/config/EiffelEventsConfig.java
index d4a863e..62ee571 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/config/EiffelEventsConfig.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/config/EiffelEventsConfig.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents.config;
+package com.googlesource.gerrit.plugins.eventseiffel.config;
 
 import com.google.common.flogger.FluentLogger;
 import com.google.gerrit.extensions.annotations.PluginName;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/EventKey.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/EventKey.java
similarity index 87%
rename from src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/EventKey.java
rename to src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/EventKey.java
index e2aa5a9..e459578 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/EventKey.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/EventKey.java
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents.eiffel;
+package com.googlesource.gerrit.plugins.eventseiffel.eiffel;
 
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelEvent;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelEventType;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelEvent;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelEventType;
 
 /**
  * Identifies an EiffelEvent .
diff --git a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/SourceChangeEventKey.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/SourceChangeEventKey.java
similarity index 93%
rename from src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/SourceChangeEventKey.java
rename to src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/SourceChangeEventKey.java
index 3cf2a43..4444298 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/SourceChangeEventKey.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/SourceChangeEventKey.java
@@ -12,16 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents.eiffel;
+package com.googlesource.gerrit.plugins.eventseiffel.eiffel;
 
 import static com.google.common.base.Preconditions.checkState;
 
 import com.google.gerrit.entities.RefNames;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelEvent;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelEventType;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelGitIdentifierInfo;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelSourceChangeCreatedEventInfo;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelSourceChangeSubmittedEventInfo;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelEvent;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelEventType;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelGitIdentifierInfo;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelSourceChangeCreatedEventInfo;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelSourceChangeSubmittedEventInfo;
 import java.util.Objects;
 import org.eclipse.jgit.revwalk.RevCommit;
 
diff --git a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/api/EiffelEventPublisher.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/api/EiffelEventPublisher.java
similarity index 86%
rename from src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/api/EiffelEventPublisher.java
rename to src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/api/EiffelEventPublisher.java
index a22c7c5..4d4a729 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/api/EiffelEventPublisher.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/api/EiffelEventPublisher.java
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents.eiffel.api;
+package com.googlesource.gerrit.plugins.eventseiffel.eiffel.api;
 
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelEvent;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelEvent;
 
 public interface EiffelEventPublisher {
   /**
diff --git a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/api/EiffelGraphQlClient.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/api/EiffelGraphQlClient.java
similarity index 96%
rename from src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/api/EiffelGraphQlClient.java
rename to src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/api/EiffelGraphQlClient.java
index 0b0c31f..e727f50 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/api/EiffelGraphQlClient.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/api/EiffelGraphQlClient.java
@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents.eiffel.api;
+package com.googlesource.gerrit.plugins.eventseiffel.eiffel.api;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Lists;
 import com.google.common.flogger.FluentLogger;
 import com.google.gson.Gson;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.EventKey;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.SourceChangeEventKey;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.EventKey;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.SourceChangeEventKey;
 import java.io.IOException;
 import java.net.Authenticator;
 import java.net.PasswordAuthentication;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/api/EventStorage.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/api/EventStorage.java
similarity index 88%
rename from src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/api/EventStorage.java
rename to src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/api/EventStorage.java
index 7ff35da..df4a968 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/api/EventStorage.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/api/EventStorage.java
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents.eiffel.api;
+package com.googlesource.gerrit.plugins.eventseiffel.eiffel.api;
 
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.EventKey;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.EventKey;
 import java.util.Optional;
 import java.util.UUID;
 
diff --git a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/api/EventStorageException.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/api/EventStorageException.java
similarity index 93%
rename from src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/api/EventStorageException.java
rename to src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/api/EventStorageException.java
index 612fd3f..477e593 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/api/EventStorageException.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/api/EventStorageException.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents.eiffel.api;
+package com.googlesource.gerrit.plugins.eventseiffel.eiffel.api;
 
 public class EventStorageException extends Exception {
   private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelChangeInfo.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelChangeInfo.java
similarity index 97%
rename from src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelChangeInfo.java
rename to src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelChangeInfo.java
index 173c738..817834d 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelChangeInfo.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelChangeInfo.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto;
+package com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto;
 
 /**
  * A summary of the change.
diff --git a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelEvent.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelEvent.java
similarity index 97%
rename from src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelEvent.java
rename to src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelEvent.java
index 0d88bae..21ef889 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelEvent.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelEvent.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto;
+package com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto;
 
 import static com.google.common.base.Preconditions.checkState;
 
diff --git a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelEventType.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelEventType.java
similarity index 93%
rename from src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelEventType.java
rename to src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelEventType.java
index 7816e72..44bd90e 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelEventType.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelEventType.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto;
+package com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto;
 
 import com.google.gson.annotations.SerializedName;
 
diff --git a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelGitIdentifierInfo.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelGitIdentifierInfo.java
similarity index 97%
rename from src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelGitIdentifierInfo.java
rename to src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelGitIdentifierInfo.java
index 6a6c9e0..70622ce 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelGitIdentifierInfo.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelGitIdentifierInfo.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto;
+package com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto;
 
 import static com.google.common.base.Preconditions.checkState;
 
diff --git a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelIntegrityProtectionInfo.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelIntegrityProtectionInfo.java
similarity index 97%
rename from src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelIntegrityProtectionInfo.java
rename to src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelIntegrityProtectionInfo.java
index 8b16311..786c1e6 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelIntegrityProtectionInfo.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelIntegrityProtectionInfo.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto;
+package com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto;
 
 /**
  * An optional object for enabling information integrity protection via cryptographic signing.
diff --git a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelLinkInfo.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelLinkInfo.java
similarity index 96%
rename from src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelLinkInfo.java
rename to src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelLinkInfo.java
index 8924e01..0460c25 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelLinkInfo.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelLinkInfo.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto;
+package com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto;
 
 import static com.google.common.base.Preconditions.checkState;
 
diff --git a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelLinkType.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelLinkType.java
similarity index 97%
rename from src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelLinkType.java
rename to src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelLinkType.java
index 47146b6..f252308 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelLinkType.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelLinkType.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto;
+package com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto;
 
 public enum EiffelLinkType {
   /**
diff --git a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelMetaInfo.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelMetaInfo.java
similarity index 98%
rename from src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelMetaInfo.java
rename to src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelMetaInfo.java
index 67c37cc..1bea984 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelMetaInfo.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelMetaInfo.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto;
+package com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto;
 
 import static com.google.common.base.Preconditions.checkState;
 
diff --git a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelPersonInfo.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelPersonInfo.java
similarity index 96%
rename from src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelPersonInfo.java
rename to src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelPersonInfo.java
index 2f1fa09..051e99a 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelPersonInfo.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelPersonInfo.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto;
+package com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto;
 
 /**
  * The author of the change.
diff --git a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelSecurityInfo.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelSecurityInfo.java
similarity index 98%
rename from src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelSecurityInfo.java
rename to src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelSecurityInfo.java
index 690e907..3db09a4 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelSecurityInfo.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelSecurityInfo.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto;
+package com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto;
 
 import static com.google.common.base.Preconditions.checkState;
 
diff --git a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelSequenceProtectionInfo.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelSequenceProtectionInfo.java
similarity index 97%
rename from src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelSequenceProtectionInfo.java
rename to src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelSequenceProtectionInfo.java
index 5211147..e13fee6 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelSequenceProtectionInfo.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelSequenceProtectionInfo.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto;
+package com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto;
 
 import static com.google.common.base.Preconditions.checkState;
 
diff --git a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelSourceChangeCreatedEventInfo.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelSourceChangeCreatedEventInfo.java
similarity index 98%
rename from src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelSourceChangeCreatedEventInfo.java
rename to src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelSourceChangeCreatedEventInfo.java
index ad2ddd5..741683a 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelSourceChangeCreatedEventInfo.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelSourceChangeCreatedEventInfo.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto;
+package com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto;
 
 import com.google.common.collect.ImmutableSet;
 import java.util.Optional;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelSourceChangeSubmittedEventInfo.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelSourceChangeSubmittedEventInfo.java
similarity index 98%
rename from src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelSourceChangeSubmittedEventInfo.java
rename to src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelSourceChangeSubmittedEventInfo.java
index df7148e..65f1566 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelSourceChangeSubmittedEventInfo.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelSourceChangeSubmittedEventInfo.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto;
+package com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto;
 
 import com.google.common.collect.ImmutableSet;
 import java.util.Optional;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelSourceInfo.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelSourceInfo.java
similarity index 97%
rename from src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelSourceInfo.java
rename to src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelSourceInfo.java
index 05edf2c..93fb30a 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelSourceInfo.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelSourceInfo.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto;
+package com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto;
 
 /**
  * A description of the source of the event. This object is primarily for traceability purposes, and
diff --git a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/listeners/BranchUpdateListener.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/listeners/BranchUpdateListener.java
similarity index 91%
rename from src/main/java/com/googlesource/gerrit/plugins/eiffelevents/listeners/BranchUpdateListener.java
rename to src/main/java/com/googlesource/gerrit/plugins/eventseiffel/listeners/BranchUpdateListener.java
index 5628290..2056745 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/listeners/BranchUpdateListener.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/listeners/BranchUpdateListener.java
@@ -11,12 +11,12 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-package com.googlesource.gerrit.plugins.eiffelevents.listeners;
+package com.googlesource.gerrit.plugins.eventseiffel.listeners;
 
 import com.google.gerrit.entities.RefNames;
 import com.google.gerrit.extensions.events.GitReferenceUpdatedListener;
 import com.google.inject.Inject;
-import com.googlesource.gerrit.plugins.eiffelevents.parsing.EiffelEventParsingQueue;
+import com.googlesource.gerrit.plugins.eventseiffel.parsing.EiffelEventParsingQueue;
 import org.eclipse.jgit.lib.ObjectId;
 
 public class BranchUpdateListener implements GitReferenceUpdatedListener {
diff --git a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/listeners/PatchsetCreatedListener.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/listeners/PatchsetCreatedListener.java
similarity index 91%
rename from src/main/java/com/googlesource/gerrit/plugins/eiffelevents/listeners/PatchsetCreatedListener.java
rename to src/main/java/com/googlesource/gerrit/plugins/eventseiffel/listeners/PatchsetCreatedListener.java
index b5f2c3c..2cc56fc 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/listeners/PatchsetCreatedListener.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/listeners/PatchsetCreatedListener.java
@@ -11,12 +11,12 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-package com.googlesource.gerrit.plugins.eiffelevents.listeners;
+package com.googlesource.gerrit.plugins.eventseiffel.listeners;
 
 import com.google.gerrit.entities.RefNames;
 import com.google.gerrit.extensions.events.RevisionCreatedListener;
 import com.google.inject.Inject;
-import com.googlesource.gerrit.plugins.eiffelevents.parsing.EiffelEventParsingQueue;
+import com.googlesource.gerrit.plugins.eventseiffel.parsing.EiffelEventParsingQueue;
 
 public class PatchsetCreatedListener implements RevisionCreatedListener {
   private final EiffelEventParsingQueue queue;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/mapping/EiffelEventFactory.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/mapping/EiffelEventFactory.java
similarity index 92%
rename from src/main/java/com/googlesource/gerrit/plugins/eiffelevents/mapping/EiffelEventFactory.java
rename to src/main/java/com/googlesource/gerrit/plugins/eventseiffel/mapping/EiffelEventFactory.java
index 2f468b9..552639d 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/mapping/EiffelEventFactory.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/mapping/EiffelEventFactory.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents.mapping;
+package com.googlesource.gerrit.plugins.eventseiffel.mapping;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Charsets;
@@ -24,15 +24,15 @@
 import com.google.gerrit.server.config.CanonicalWebUrl;
 import com.google.gerrit.server.ssh.SshAdvertisedAddresses;
 import com.google.inject.Inject;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelChangeInfo;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelGitIdentifierInfo;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelLinkInfo;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelLinkType;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelMetaInfo;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelPersonInfo;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelSourceChangeCreatedEventInfo;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelSourceChangeSubmittedEventInfo;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelSourceInfo;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelChangeInfo;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelGitIdentifierInfo;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelLinkInfo;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelLinkType;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelMetaInfo;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelPersonInfo;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelSourceChangeCreatedEventInfo;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelSourceChangeSubmittedEventInfo;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelSourceInfo;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/mapping/EiffelEventMapper.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/mapping/EiffelEventMapper.java
similarity index 97%
rename from src/main/java/com/googlesource/gerrit/plugins/eiffelevents/mapping/EiffelEventMapper.java
rename to src/main/java/com/googlesource/gerrit/plugins/eventseiffel/mapping/EiffelEventMapper.java
index 95beabc..8522ae6 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/mapping/EiffelEventMapper.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/mapping/EiffelEventMapper.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents.mapping;
+package com.googlesource.gerrit.plugins.eventseiffel.mapping;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.flogger.FluentLogger;
@@ -29,8 +29,8 @@
 import com.google.gerrit.server.query.change.InternalChangeQuery;
 import com.google.inject.Inject;
 import com.google.inject.Provider;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelSourceChangeCreatedEventInfo;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelSourceChangeSubmittedEventInfo;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelSourceChangeCreatedEventInfo;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelSourceChangeSubmittedEventInfo;
 import java.io.IOException;
 import java.util.List;
 import java.util.Optional;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/mq/RabbitMqPublisher.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/mq/RabbitMqPublisher.java
similarity index 93%
rename from src/main/java/com/googlesource/gerrit/plugins/eiffelevents/mq/RabbitMqPublisher.java
rename to src/main/java/com/googlesource/gerrit/plugins/eventseiffel/mq/RabbitMqPublisher.java
index 03c3921..932a34f 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/mq/RabbitMqPublisher.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/mq/RabbitMqPublisher.java
@@ -12,16 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents.mq;
+package com.googlesource.gerrit.plugins.eventseiffel.mq;
 
 import com.google.common.flogger.FluentLogger;
 import com.google.gerrit.extensions.events.LifecycleListener;
 import com.google.gson.Gson;
 import com.google.inject.Inject;
-import com.googlesource.gerrit.plugins.eiffelevents.config.EiffelEventsConfig;
-import com.googlesource.gerrit.plugins.eiffelevents.config.EiffelEventsConfig.RabbitMqConfig;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.api.EiffelEventPublisher;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelEvent;
+import com.googlesource.gerrit.plugins.eventseiffel.config.EiffelEventsConfig;
+import com.googlesource.gerrit.plugins.eventseiffel.config.EiffelEventsConfig.RabbitMqConfig;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.api.EiffelEventPublisher;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelEvent;
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Connection;
 import java.io.IOException;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/parsing/EiffelEventParser.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/parsing/EiffelEventParser.java
similarity index 95%
rename from src/main/java/com/googlesource/gerrit/plugins/eiffelevents/parsing/EiffelEventParser.java
rename to src/main/java/com/googlesource/gerrit/plugins/eventseiffel/parsing/EiffelEventParser.java
index c4ebb92..a4064a7 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/parsing/EiffelEventParser.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/parsing/EiffelEventParser.java
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents.parsing;
+package com.googlesource.gerrit.plugins.eventseiffel.parsing;
 
-import static com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelEventType.SCC;
+import static com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelEventType.SCC;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Lists;
@@ -26,12 +26,12 @@
 import com.google.gerrit.extensions.events.RevisionCreatedListener.Event;
 import com.google.gerrit.server.git.GitRepositoryManager;
 import com.google.inject.Inject;
-import com.googlesource.gerrit.plugins.eiffelevents.EiffelEventHub;
-import com.googlesource.gerrit.plugins.eiffelevents.EiffelEventIdLookupException;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.EventKey;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.SourceChangeEventKey;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelEvent;
-import com.googlesource.gerrit.plugins.eiffelevents.mapping.EiffelEventMapper;
+import com.googlesource.gerrit.plugins.eventseiffel.EiffelEventHub;
+import com.googlesource.gerrit.plugins.eventseiffel.EiffelEventIdLookupException;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.EventKey;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.SourceChangeEventKey;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelEvent;
+import com.googlesource.gerrit.plugins.eventseiffel.mapping.EiffelEventMapper;
 import java.io.IOException;
 import java.util.Deque;
 import java.util.List;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/parsing/EiffelEventParsingExecutor.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/parsing/EiffelEventParsingExecutor.java
similarity index 94%
rename from src/main/java/com/googlesource/gerrit/plugins/eiffelevents/parsing/EiffelEventParsingExecutor.java
rename to src/main/java/com/googlesource/gerrit/plugins/eventseiffel/parsing/EiffelEventParsingExecutor.java
index a9119f9..407fd6a 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/parsing/EiffelEventParsingExecutor.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/parsing/EiffelEventParsingExecutor.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents.parsing;
+package com.googlesource.gerrit.plugins.eventseiffel.parsing;
 
 import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
 
@@ -22,7 +22,7 @@
 import com.google.gerrit.server.git.ProjectRunnable;
 import com.google.gerrit.server.git.WorkQueue;
 import com.google.inject.Inject;
-import com.googlesource.gerrit.plugins.eiffelevents.config.EiffelEventsConfig;
+import com.googlesource.gerrit.plugins.eventseiffel.config.EiffelEventsConfig;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
diff --git a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/parsing/EiffelEventParsingQueue.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/parsing/EiffelEventParsingQueue.java
similarity index 91%
rename from src/main/java/com/googlesource/gerrit/plugins/eiffelevents/parsing/EiffelEventParsingQueue.java
rename to src/main/java/com/googlesource/gerrit/plugins/eventseiffel/parsing/EiffelEventParsingQueue.java
index b2ab643..95c34b8 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eiffelevents/parsing/EiffelEventParsingQueue.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/parsing/EiffelEventParsingQueue.java
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents.parsing;
+package com.googlesource.gerrit.plugins.eventseiffel.parsing;
 
-import static com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelEventType.SCC;
-import static com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelEventType.SCS;
+import static com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelEventType.SCC;
+import static com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelEventType.SCS;
 
 import com.google.gerrit.entities.Project;
 import com.google.gerrit.entities.Project.NameKey;
@@ -25,8 +25,8 @@
 import com.google.gerrit.server.git.ProjectRunnable;
 import com.google.gerrit.server.util.time.TimeUtil;
 import com.google.inject.Inject;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.SourceChangeEventKey;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelEventType;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.SourceChangeEventKey;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelEventType;
 
 public class EiffelEventParsingQueue {
 
diff --git a/src/test/java/com/googlesource/gerrit/plugins/eiffelevents/EiffelEventHubIT.java b/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/EiffelEventHubIT.java
similarity index 91%
rename from src/test/java/com/googlesource/gerrit/plugins/eiffelevents/EiffelEventHubIT.java
rename to src/test/java/com/googlesource/gerrit/plugins/eventseiffel/EiffelEventHubIT.java
index ddcc980..be96278 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/eiffelevents/EiffelEventHubIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/EiffelEventHubIT.java
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents;
+package com.googlesource.gerrit.plugins.eventseiffel;
 
-import static com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelEventType.SCC;
-import static com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelEventType.SCS;
+import static com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelEventType.SCC;
+import static com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelEventType.SCS;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
@@ -28,14 +28,14 @@
 import com.google.inject.AbstractModule;
 import com.google.inject.Scopes;
 import com.google.inject.Singleton;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.EventKey;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.api.EventStorage;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelEvent;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelEventType;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelGitIdentifierInfo;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelMetaInfo;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelSourceChangeCreatedEventInfo;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelSourceChangeSubmittedEventInfo;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.EventKey;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.api.EventStorage;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelEvent;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelEventType;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelGitIdentifierInfo;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelMetaInfo;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelSourceChangeCreatedEventInfo;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelSourceChangeSubmittedEventInfo;
 import java.time.Instant;
 import java.util.List;
 import java.util.UUID;
@@ -45,8 +45,8 @@
 import org.junit.Test;
 
 @TestPlugin(
-    name = "eiffel-events",
-    sysModule = "com.googlesource.gerrit.plugins.eiffelevents.EiffelEventHubIT$TestModule")
+    name = "events-eiffel",
+    sysModule = "com.googlesource.gerrit.plugins.eventseiffel.EiffelEventHubIT$TestModule")
 public class EiffelEventHubIT extends LightweightPluginDaemonTest {
   private static final String BRANCH = "branch/%d";
   private static final String SHA1 = "aaaaaaaabbbbbbbbccccccccddddddddeeeeeeee";
diff --git a/src/test/java/com/googlesource/gerrit/plugins/eiffelevents/EiffelEventIdCacheIT.java b/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/EiffelEventIdCacheIT.java
similarity index 88%
rename from src/test/java/com/googlesource/gerrit/plugins/eiffelevents/EiffelEventIdCacheIT.java
rename to src/test/java/com/googlesource/gerrit/plugins/eventseiffel/EiffelEventIdCacheIT.java
index 6afa4bc..a584169 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/eiffelevents/EiffelEventIdCacheIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/EiffelEventIdCacheIT.java
@@ -12,29 +12,29 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents;
+package com.googlesource.gerrit.plugins.eventseiffel;
 
-import static com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelEventType.SCC;
+import static com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelEventType.SCC;
 import static org.junit.Assert.assertEquals;
 
 import com.google.gerrit.acceptance.LightweightPluginDaemonTest;
 import com.google.gerrit.acceptance.TestPlugin;
 import com.google.inject.AbstractModule;
 import com.google.inject.Singleton;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.EventKey;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.SourceChangeEventKey;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.api.EventStorage;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelGitIdentifierInfo;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelMetaInfo;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelSourceChangeCreatedEventInfo;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.EventKey;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.SourceChangeEventKey;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.api.EventStorage;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelGitIdentifierInfo;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelMetaInfo;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelSourceChangeCreatedEventInfo;
 import java.util.Optional;
 import java.util.UUID;
 import org.junit.Before;
 import org.junit.Test;
 
 @TestPlugin(
-    name = "eiffel-events",
-    sysModule = "com.googlesource.gerrit.plugins.eiffelevents.EiffelEventIdCacheIT$TestModule")
+    name = "events-eiffel",
+    sysModule = "com.googlesource.gerrit.plugins.eventseiffel.EiffelEventIdCacheIT$TestModule")
 public class EiffelEventIdCacheIT extends LightweightPluginDaemonTest {
   private static final String COMMIT_A = "ff5250a50456c8c151591bb5dcaff4e8cc70b7f3";
   private static final String COMMIT_B = "ff5250a50456c8c151591bb5dcaff4e8cc70b7f5";
diff --git a/src/test/java/com/googlesource/gerrit/plugins/eiffelevents/EiffelEventsTest.java b/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/EiffelEventsTest.java
similarity index 88%
rename from src/test/java/com/googlesource/gerrit/plugins/eiffelevents/EiffelEventsTest.java
rename to src/test/java/com/googlesource/gerrit/plugins/eventseiffel/EiffelEventsTest.java
index 21c4d50..9411ac3 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/eiffelevents/EiffelEventsTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/EiffelEventsTest.java
@@ -12,22 +12,22 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents;
+package com.googlesource.gerrit.plugins.eventseiffel;
 
 import static com.google.common.truth.Truth.assertThat;
-import static com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelEventType.SCC;
-import static com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelEventType.SCS;
+import static com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelEventType.SCC;
+import static com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelEventType.SCS;
 
 import com.google.common.collect.Streams;
 import com.google.gerrit.acceptance.LightweightPluginDaemonTest;
 import com.google.gerrit.acceptance.PushOneCommit;
 import com.google.gerrit.entities.RefNames;
 import com.google.inject.Provider;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.SourceChangeEventKey;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.api.EventStorageException;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelLinkInfo;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelLinkType;
-import com.googlesource.gerrit.plugins.eiffelevents.mapping.EiffelEventFactory;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.SourceChangeEventKey;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.api.EventStorageException;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelLinkInfo;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelLinkType;
+import com.googlesource.gerrit.plugins.eventseiffel.mapping.EiffelEventFactory;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
@@ -38,7 +38,7 @@
 @Ignore
 public class EiffelEventsTest extends LightweightPluginDaemonTest {
   protected static final String HOST_NAME = "localhost";
-  protected static final String PLUGIN_NAME = "eiffel-events";
+  protected static final String PLUGIN_NAME = "events-eiffel";
   protected static final String WEB_URL = "http://" + HOST_NAME + ":8080/gerrit";
   protected static final String VERSION = "1.2.3";
   protected static final int SSH_PORT = 29418;
diff --git a/src/test/java/com/googlesource/gerrit/plugins/eiffelevents/TestEventHub.java b/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/TestEventHub.java
similarity index 89%
rename from src/test/java/com/googlesource/gerrit/plugins/eiffelevents/TestEventHub.java
rename to src/test/java/com/googlesource/gerrit/plugins/eventseiffel/TestEventHub.java
index 79d0ecf..40e4a59 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/eiffelevents/TestEventHub.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/TestEventHub.java
@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents;
+package com.googlesource.gerrit.plugins.eventseiffel;
 
 import com.google.common.collect.Lists;
 import com.google.inject.Inject;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.EventKey;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelEvent;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.EventKey;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelEvent;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
diff --git a/src/test/java/com/googlesource/gerrit/plugins/eiffelevents/TestEventPublisher.java b/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/TestEventPublisher.java
similarity index 95%
rename from src/test/java/com/googlesource/gerrit/plugins/eiffelevents/TestEventPublisher.java
rename to src/test/java/com/googlesource/gerrit/plugins/eventseiffel/TestEventPublisher.java
index 6c3f47e..05f86ca 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/eiffelevents/TestEventPublisher.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/TestEventPublisher.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents;
+package com.googlesource.gerrit.plugins.eventseiffel;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
@@ -22,8 +22,8 @@
 import com.google.common.collect.Maps;
 import com.google.common.collect.Streams;
 import com.google.inject.Inject;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.EventKey;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelEvent;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.EventKey;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelEvent;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
diff --git a/src/test/java/com/googlesource/gerrit/plugins/eiffelevents/TestEventStorage.java b/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/TestEventStorage.java
similarity index 87%
rename from src/test/java/com/googlesource/gerrit/plugins/eiffelevents/TestEventStorage.java
rename to src/test/java/com/googlesource/gerrit/plugins/eventseiffel/TestEventStorage.java
index 85b0253..852cfbe 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/eiffelevents/TestEventStorage.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/TestEventStorage.java
@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents;
+package com.googlesource.gerrit.plugins.eventseiffel;
 
 import com.google.common.collect.Maps;
 import com.google.inject.Singleton;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.EventKey;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.api.EventStorage;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.api.EventStorageException;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.EventKey;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.api.EventStorage;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.api.EventStorageException;
 import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
diff --git a/src/test/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelChangeInfoTest.java b/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelChangeInfoTest.java
similarity index 96%
rename from src/test/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelChangeInfoTest.java
rename to src/test/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelChangeInfoTest.java
index 91145ad..40e402f 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelChangeInfoTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelChangeInfoTest.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto;
+package com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/src/test/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelEventTest.java b/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelEventTest.java
similarity index 98%
rename from src/test/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelEventTest.java
rename to src/test/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelEventTest.java
index f27ced9..f485557 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelEventTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelEventTest.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto;
+package com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto;
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.gerrit.testing.GerritJUnit.assertThrows;
diff --git a/src/test/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelGitIdentifierInfoTest.java b/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelGitIdentifierInfoTest.java
similarity index 98%
rename from src/test/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelGitIdentifierInfoTest.java
rename to src/test/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelGitIdentifierInfoTest.java
index 83e6c91..116d755 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelGitIdentifierInfoTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelGitIdentifierInfoTest.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto;
+package com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto;
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.gerrit.testing.GerritJUnit.assertThrows;
diff --git a/src/test/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelIntegrityProtectionInfoTest.java b/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelIntegrityProtectionInfoTest.java
similarity index 96%
rename from src/test/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelIntegrityProtectionInfoTest.java
rename to src/test/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelIntegrityProtectionInfoTest.java
index f9830f4..a2d8c66 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelIntegrityProtectionInfoTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelIntegrityProtectionInfoTest.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto;
+package com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/src/test/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelLinkInfoTest.java b/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelLinkInfoTest.java
similarity index 97%
rename from src/test/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelLinkInfoTest.java
rename to src/test/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelLinkInfoTest.java
index 8246c12..302db9f 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelLinkInfoTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelLinkInfoTest.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto;
+package com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto;
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.gerrit.testing.GerritJUnit.assertThrows;
diff --git a/src/test/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelMetaInfoTest.java b/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelMetaInfoTest.java
similarity index 98%
rename from src/test/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelMetaInfoTest.java
rename to src/test/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelMetaInfoTest.java
index dc7eb75..1179cdf 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelMetaInfoTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelMetaInfoTest.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto;
+package com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto;
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.gerrit.testing.GerritJUnit.assertThrows;
diff --git a/src/test/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelPersonInfoTest.java b/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelPersonInfoTest.java
similarity index 96%
rename from src/test/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelPersonInfoTest.java
rename to src/test/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelPersonInfoTest.java
index c5d289d..7b55a6f 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelPersonInfoTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelPersonInfoTest.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto;
+package com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/src/test/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelSecurityInfoTest.java b/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelSecurityInfoTest.java
similarity index 97%
rename from src/test/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelSecurityInfoTest.java
rename to src/test/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelSecurityInfoTest.java
index 46c15f5..5a74eba 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelSecurityInfoTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelSecurityInfoTest.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto;
+package com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto;
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.gerrit.testing.GerritJUnit.assertThrows;
diff --git a/src/test/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelSequenceProtectionInfoTest.java b/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelSequenceProtectionInfoTest.java
similarity index 97%
rename from src/test/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelSequenceProtectionInfoTest.java
rename to src/test/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelSequenceProtectionInfoTest.java
index 388e709..adbd814 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelSequenceProtectionInfoTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelSequenceProtectionInfoTest.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto;
+package com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto;
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.gerrit.testing.GerritJUnit.assertThrows;
diff --git a/src/test/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelSourceChangeCreatedEventInfoTest.java b/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelSourceChangeCreatedEventInfoTest.java
similarity index 98%
rename from src/test/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelSourceChangeCreatedEventInfoTest.java
rename to src/test/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelSourceChangeCreatedEventInfoTest.java
index 8078280..340ae9b 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelSourceChangeCreatedEventInfoTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelSourceChangeCreatedEventInfoTest.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto;
+package com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/src/test/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelSourceChangeSubmittedEventInfoTest.java b/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelSourceChangeSubmittedEventInfoTest.java
similarity index 98%
rename from src/test/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelSourceChangeSubmittedEventInfoTest.java
rename to src/test/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelSourceChangeSubmittedEventInfoTest.java
index 7dcc3dc..0bec54b 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/eiffelevents/eiffel/dto/EiffelSourceChangeSubmittedEventInfoTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/eiffel/dto/EiffelSourceChangeSubmittedEventInfoTest.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto;
+package com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/src/test/java/com/googlesource/gerrit/plugins/eiffelevents/listeners/GerritEventListenersIT.java b/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/listeners/GerritEventListenersIT.java
similarity index 82%
rename from src/test/java/com/googlesource/gerrit/plugins/eiffelevents/listeners/GerritEventListenersIT.java
rename to src/test/java/com/googlesource/gerrit/plugins/eventseiffel/listeners/GerritEventListenersIT.java
index 87468ef..5484ce8 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/eiffelevents/listeners/GerritEventListenersIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/listeners/GerritEventListenersIT.java
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents.listeners;
+package com.googlesource.gerrit.plugins.eventseiffel.listeners;
 
-import static com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelEventType.SCC;
-import static com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelEventType.SCS;
+import static com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelEventType.SCC;
+import static com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelEventType.SCS;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -30,21 +30,21 @@
 import com.google.inject.AbstractModule;
 import com.google.inject.Scopes;
 import com.google.inject.Singleton;
-import com.googlesource.gerrit.plugins.eiffelevents.EiffelEventHub;
-import com.googlesource.gerrit.plugins.eiffelevents.EiffelEventHubImpl;
-import com.googlesource.gerrit.plugins.eiffelevents.EiffelEventIdCacheImpl;
-import com.googlesource.gerrit.plugins.eiffelevents.EiffelEventQueue;
-import com.googlesource.gerrit.plugins.eiffelevents.EiffelEventsTest;
-import com.googlesource.gerrit.plugins.eiffelevents.TestEventPublisher;
-import com.googlesource.gerrit.plugins.eiffelevents.TestEventStorage;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.EventKey;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.SourceChangeEventKey;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.api.EventStorage;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelEvent;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelEventType;
-import com.googlesource.gerrit.plugins.eiffelevents.mapping.EiffelEventFactory;
-import com.googlesource.gerrit.plugins.eiffelevents.parsing.EiffelEventParsingExecutor;
-import com.googlesource.gerrit.plugins.eiffelevents.parsing.EiffelEventParsingQueue;
+import com.googlesource.gerrit.plugins.eventseiffel.EiffelEventHub;
+import com.googlesource.gerrit.plugins.eventseiffel.EiffelEventHubImpl;
+import com.googlesource.gerrit.plugins.eventseiffel.EiffelEventIdCacheImpl;
+import com.googlesource.gerrit.plugins.eventseiffel.EiffelEventQueue;
+import com.googlesource.gerrit.plugins.eventseiffel.EiffelEventsTest;
+import com.googlesource.gerrit.plugins.eventseiffel.TestEventPublisher;
+import com.googlesource.gerrit.plugins.eventseiffel.TestEventStorage;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.EventKey;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.SourceChangeEventKey;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.api.EventStorage;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelEvent;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelEventType;
+import com.googlesource.gerrit.plugins.eventseiffel.mapping.EiffelEventFactory;
+import com.googlesource.gerrit.plugins.eventseiffel.parsing.EiffelEventParsingExecutor;
+import com.googlesource.gerrit.plugins.eventseiffel.parsing.EiffelEventParsingQueue;
 import java.util.UUID;
 import org.eclipse.jgit.api.errors.GitAPIException;
 import org.eclipse.jgit.api.errors.InvalidRemoteException;
@@ -56,9 +56,9 @@
 import org.junit.Test;
 
 @TestPlugin(
-    name = "eiffel-events",
+    name = "events-eiffel",
     sysModule =
-        "com.googlesource.gerrit.plugins.eiffelevents.listeners.GerritEventListenersIT$TestModule")
+        "com.googlesource.gerrit.plugins.eventseiffel.listeners.GerritEventListenersIT$TestModule")
 public class GerritEventListenersIT extends EiffelEventsTest {
   private TestEventPublisher publisher;
 
diff --git a/src/test/java/com/googlesource/gerrit/plugins/eiffelevents/mapping/EventMappingIT.java b/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/mapping/EventMappingIT.java
similarity index 94%
rename from src/test/java/com/googlesource/gerrit/plugins/eiffelevents/mapping/EventMappingIT.java
rename to src/test/java/com/googlesource/gerrit/plugins/eventseiffel/mapping/EventMappingIT.java
index b573519..ec2f7ca 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/eiffelevents/mapping/EventMappingIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/mapping/EventMappingIT.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents.mapping;
+package com.googlesource.gerrit.plugins.eventseiffel.mapping;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -35,15 +35,15 @@
 import com.google.gerrit.server.query.change.ChangeData;
 import com.google.inject.AbstractModule;
 import com.google.inject.Singleton;
-import com.googlesource.gerrit.plugins.eiffelevents.EiffelEventsTest;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelChangeInfo;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelEventType;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelGitIdentifierInfo;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelLinkInfo;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelMetaInfo;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelPersonInfo;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelSourceChangeCreatedEventInfo;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelSourceChangeSubmittedEventInfo;
+import com.googlesource.gerrit.plugins.eventseiffel.EiffelEventsTest;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelChangeInfo;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelEventType;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelGitIdentifierInfo;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelLinkInfo;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelMetaInfo;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelPersonInfo;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelSourceChangeCreatedEventInfo;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelSourceChangeSubmittedEventInfo;
 import java.net.URLEncoder;
 import java.sql.Timestamp;
 import java.time.Instant;
@@ -55,8 +55,8 @@
 import org.junit.Test;
 
 @TestPlugin(
-    name = "eiffel-events",
-    sysModule = "com.googlesource.gerrit.plugins.eiffelevents.mapping.EventMappingIT$TestModule")
+    name = "events-eiffel",
+    sysModule = "com.googlesource.gerrit.plugins.eventseiffel.mapping.EventMappingIT$TestModule")
 public class EventMappingIT extends EiffelEventsTest {
   private static final String COMMIT_SHA1 = "58117b5a121eb516c2cdca463c51250ad3de9cd3";
   private static final String REPO_NAME = "repo/name";
diff --git a/src/test/java/com/googlesource/gerrit/plugins/eiffelevents/parsing/EiffelEventParserIT.java b/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/parsing/EiffelEventParserIT.java
similarity index 87%
rename from src/test/java/com/googlesource/gerrit/plugins/eiffelevents/parsing/EiffelEventParserIT.java
rename to src/test/java/com/googlesource/gerrit/plugins/eventseiffel/parsing/EiffelEventParserIT.java
index 0bd1c78..9b774c3 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/eiffelevents/parsing/EiffelEventParserIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/eventseiffel/parsing/EiffelEventParserIT.java
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.googlesource.gerrit.plugins.eiffelevents.parsing;
+package com.googlesource.gerrit.plugins.eventseiffel.parsing;
 
-import static com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelEventType.SCC;
+import static com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelEventType.SCC;
 import static org.junit.Assert.assertEquals;
 
 import com.google.gerrit.acceptance.PushOneCommit;
@@ -23,25 +23,25 @@
 import com.google.inject.AbstractModule;
 import com.google.inject.Scopes;
 import com.google.inject.Singleton;
-import com.googlesource.gerrit.plugins.eiffelevents.EiffelEventHub;
-import com.googlesource.gerrit.plugins.eiffelevents.EiffelEventIdCacheImpl;
-import com.googlesource.gerrit.plugins.eiffelevents.EiffelEventsTest;
-import com.googlesource.gerrit.plugins.eiffelevents.TestEventHub;
-import com.googlesource.gerrit.plugins.eiffelevents.TestEventStorage;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.SourceChangeEventKey;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.api.EventStorage;
-import com.googlesource.gerrit.plugins.eiffelevents.eiffel.dto.EiffelSourceChangeSubmittedEventInfo;
-import com.googlesource.gerrit.plugins.eiffelevents.mapping.EiffelEventFactory;
-import com.googlesource.gerrit.plugins.eiffelevents.mapping.EiffelEventMapper;
+import com.googlesource.gerrit.plugins.eventseiffel.EiffelEventHub;
+import com.googlesource.gerrit.plugins.eventseiffel.EiffelEventIdCacheImpl;
+import com.googlesource.gerrit.plugins.eventseiffel.EiffelEventsTest;
+import com.googlesource.gerrit.plugins.eventseiffel.TestEventHub;
+import com.googlesource.gerrit.plugins.eventseiffel.TestEventStorage;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.SourceChangeEventKey;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.api.EventStorage;
+import com.googlesource.gerrit.plugins.eventseiffel.eiffel.dto.EiffelSourceChangeSubmittedEventInfo;
+import com.googlesource.gerrit.plugins.eventseiffel.mapping.EiffelEventFactory;
+import com.googlesource.gerrit.plugins.eventseiffel.mapping.EiffelEventMapper;
 import java.time.Instant;
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.junit.Before;
 import org.junit.Test;
 
 @TestPlugin(
-    name = "eiffel-events",
+    name = "events-eiffel",
     sysModule =
-        "com.googlesource.gerrit.plugins.eiffelevents.parsing.EiffelEventParserIT$TestModule")
+        "com.googlesource.gerrit.plugins.eventseiffel.parsing.EiffelEventParserIT$TestModule")
 public class EiffelEventParserIT extends EiffelEventsTest {
   private EiffelEventParser eventParser;