diff --git a/repository/src/main/config/module-context.xml b/repository/src/main/config/module-context.xml
index 7327a0e..fb8b27b 100644
--- a/repository/src/main/config/module-context.xml
+++ b/repository/src/main/config/module-context.xml
@@ -64,7 +64,7 @@
                 <value>org.alfresco.repo.web.auth.AuthenticationListener</value>
             </list>
         </property>
-        <property name="sourceBeanName" value="${moduleId}.authenticationListener" />
+        <property name="sourceBeanName" value="${moduleId}.keycloakAuthenticationListener" />
         <property name="defaultTarget">
             <bean class="org.alfresco.repo.web.auth.NoopAuthenticationListener" />
         </property>
diff --git a/repository/src/main/globalConfig/subsystems/Authentication/keycloak/keycloak-authentication-context.xml b/repository/src/main/globalConfig/subsystems/Authentication/keycloak/keycloak-authentication-context.xml
index fd43f65..2f91008 100644
--- a/repository/src/main/globalConfig/subsystems/Authentication/keycloak/keycloak-authentication-context.xml
+++ b/repository/src/main/globalConfig/subsystems/Authentication/keycloak/keycloak-authentication-context.xml
@@ -148,7 +148,7 @@
         <property name="keycloakTicketTokenCache" ref="${moduleId}-ticketTokenCache" />
     </bean>
 
-    <bean id="${moduleId}.authenticationListener" class="${project.artifactId}.authentication.KeycloakAuthenticationListener">
+    <bean id="${moduleId}.keycloakAuthenticationListener" class="${project.artifactId}.authentication.KeycloakAuthenticationListener">
         <property name="authenticationService" ref="AuthenticationService" />
         <property name="keycloakAuthenticationComponent" ref="authenticationComponent" />
         <property name="keycloakTicketTokenCache" ref="${moduleId}-ticketTokenCache" />