diff --git a/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/config/EiffelRepoApiConfig.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/config/EiffelRepoApiConfig.java
index 2078398..96bbe36 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/config/EiffelRepoApiConfig.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/config/EiffelRepoApiConfig.java
@@ -32,7 +32,7 @@
     private static final String CONNECT_TIMEOUT = "connectTimeout";
     private static final String EIFFELREPO_CLIENT = "EiffelRepoClient";
     private static final String PASSWORD = "password";
-    private static final String USER_NAME = "userName";
+    private static final String USER_NAME = "username";
     private static final String GRAPHQL_URL = "graphQlUrl";
     private static final String GOREST_URL = "goRestUrl";
     private static final int DEFAULT_CONNECT_TIMEOUT = 20;
diff --git a/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/config/RabbitMqConfig.java b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/config/RabbitMqConfig.java
index 0de1b58..353cc21 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/config/RabbitMqConfig.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/eventseiffel/config/RabbitMqConfig.java
@@ -40,7 +40,7 @@
     private static final String PERSISTENT_DELIVERY = "persistentDelivery";
     private static final String RABBIT_MQ = "RabbitMq";
     private static final String ROUTING_KEY_TAG = "routingKeyTag";
-    private static final String USER_NAME = "userName";
+    private static final String USER_NAME = "username";
     private static final String URL = "url";
     private static final String VIRTUAL_HOST = "virtualHost";
     private static final String WAIT_FOR_CONFIRM = "waitForConfirm";
@@ -99,7 +99,7 @@
   private RabbitMqConfig(
       String uri,
       String virtualHost,
-      String userName,
+      String username,
       String passWord,
       String exchange,
       boolean persistentDelivery,
@@ -131,8 +131,8 @@
       cf.setVirtualHost(virtualHost);
     }
 
-    if (userName != null) {
-      cf.setUsername(userName);
+    if (username != null) {
+      cf.setUsername(username);
       if (passWord != null) {
         cf.setPassword(passWord);
       }
diff --git a/src/main/resources/Documentation/config.md b/src/main/resources/Documentation/config.md
index 0bf1344..b3fa201 100644
--- a/src/main/resources/Documentation/config.md
+++ b/src/main/resources/Documentation/config.md
@@ -8,14 +8,14 @@
     [RabbitMq]
       url = amqp://rabbit.company.com:5672
       exchange = eiffel.events
-      userName = user
+      username = user
       password = secret
       waitForConfirms = 7 seconds
       maxBatchSize = 100
     [EiffelRepoClient]
       graphQlUrl = https://eiffel.company.com/graphql
       goRestUrl = https://eiffel.company.com/rest/
-      userName = user
+      username = user
       password = secret
     [EventParsing]
       poolSize = 4
@@ -42,7 +42,7 @@
 : The virtual host to use when connecting to the broker
   (Default: _"/"_).
 
-userName
+username
 : The AMQP user name to use when connecting to the broker.
 
 password
@@ -91,7 +91,7 @@
 : The url to the GoER REST endpoint.
   (_Required_)
 
-userName
+username
 : The user name for the GraphQL service.
 
 password