diff --git a/dspace-api/src/main/java/org/dspace/qaevent/script/OpenaireEventsImport.java b/dspace-api/src/main/java/org/dspace/qaevent/script/OpenaireEventsImport.java
index 8bd864d7da..9087606aa6 100644
--- a/dspace-api/src/main/java/org/dspace/qaevent/script/OpenaireEventsImport.java
+++ b/dspace-api/src/main/java/org/dspace/qaevent/script/OpenaireEventsImport.java
@@ -32,7 +32,7 @@ import org.dspace.content.QAEvent;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.factory.EPersonServiceFactory;
-import org.dspace.qaevent.service.BrokerClientFactory;
+import org.dspace.qaevent.service.OpenaireClientFactory;
 import org.dspace.qaevent.service.QAEventService;
 import org.dspace.scripts.DSpaceRunnable;
 import org.dspace.services.ConfigurationService;
@@ -105,7 +105,7 @@ public class OpenaireEventsImport
 
         qaEventService = new DSpace().getSingletonService(QAEventService.class);
         configurationService = DSpaceServicesFactory.getInstance().getConfigurationService();
-        brokerClient = BrokerClientFactory.getInstance().getBrokerClient();
+        brokerClient = OpenaireClientFactory.getInstance().getBrokerClient();
 
         topicsToImport = configurationService.getArrayProperty("qaevents.openaire.import.topic");
         openaireBrokerURL = getOpenaireBrokerUri();
diff --git a/dspace-api/src/main/java/org/dspace/qaevent/service/BrokerClientFactory.java b/dspace-api/src/main/java/org/dspace/qaevent/service/OpenaireClientFactory.java
similarity index 81%
rename from dspace-api/src/main/java/org/dspace/qaevent/service/BrokerClientFactory.java
rename to dspace-api/src/main/java/org/dspace/qaevent/service/OpenaireClientFactory.java
index c17a7a3ff5..e7a7be33c1 100644
--- a/dspace-api/src/main/java/org/dspace/qaevent/service/BrokerClientFactory.java
+++ b/dspace-api/src/main/java/org/dspace/qaevent/service/OpenaireClientFactory.java
@@ -16,7 +16,7 @@ import org.dspace.utils.DSpace;
  * @author Luca Giamminonni (luca.giamminonni at 4science.it)
  *
  */
-public interface BrokerClientFactory {
+public interface OpenaireClientFactory {
 
     /**
      * Returns an instance of the {@link BrokerClient}.
@@ -25,7 +25,7 @@ public interface BrokerClientFactory {
      */
     public BrokerClient getBrokerClient();
 
-    public static BrokerClientFactory getInstance() {
-        return new DSpace().getServiceManager().getServiceByName("brokerClientFactory", BrokerClientFactory.class);
+    public static OpenaireClientFactory getInstance() {
+        return new DSpace().getServiceManager().getServiceByName("openaireClientFactory", OpenaireClientFactory.class);
     }
 }
diff --git a/dspace-api/src/main/java/org/dspace/qaevent/service/impl/BrokerClientFactoryImpl.java b/dspace-api/src/main/java/org/dspace/qaevent/service/impl/OpenaireClientFactoryImpl.java
similarity index 78%
rename from dspace-api/src/main/java/org/dspace/qaevent/service/impl/BrokerClientFactoryImpl.java
rename to dspace-api/src/main/java/org/dspace/qaevent/service/impl/OpenaireClientFactoryImpl.java
index 8d3f2cdaac..5839f5e877 100644
--- a/dspace-api/src/main/java/org/dspace/qaevent/service/impl/BrokerClientFactoryImpl.java
+++ b/dspace-api/src/main/java/org/dspace/qaevent/service/impl/OpenaireClientFactoryImpl.java
@@ -8,17 +8,17 @@
 package org.dspace.qaevent.service.impl;
 
 import eu.dnetlib.broker.BrokerClient;
-import org.dspace.qaevent.service.BrokerClientFactory;
+import org.dspace.qaevent.service.OpenaireClientFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
- * Implementation of {@link BrokerClientFactory} that returns the instance of
+ * Implementation of {@link OpenaireClientFactory} that returns the instance of
  * {@link BrokerClient} managed by the Spring context.
  *
  * @author Luca Giamminonni (luca.giamminonni at 4science.it)
  *
  */
-public class BrokerClientFactoryImpl implements BrokerClientFactory {
+public class OpenaireClientFactoryImpl implements OpenaireClientFactory {
 
     @Autowired
     private BrokerClient brokerClient;
diff --git a/dspace-api/src/test/java/org/dspace/qaevent/script/OpenaireEventsImportIT.java b/dspace-api/src/test/java/org/dspace/qaevent/script/OpenaireEventsImportIT.java
index dbe44fd2e7..35d9231ea5 100644
--- a/dspace-api/src/test/java/org/dspace/qaevent/script/OpenaireEventsImportIT.java
+++ b/dspace-api/src/test/java/org/dspace/qaevent/script/OpenaireEventsImportIT.java
@@ -45,9 +45,9 @@ import org.dspace.content.Collection;
 import org.dspace.content.Item;
 import org.dspace.matcher.QASourceMatcher;
 import org.dspace.matcher.QATopicMatcher;
-import org.dspace.qaevent.service.BrokerClientFactory;
+import org.dspace.qaevent.service.OpenaireClientFactory;
 import org.dspace.qaevent.service.QAEventService;
-import org.dspace.qaevent.service.impl.BrokerClientFactoryImpl;
+import org.dspace.qaevent.service.impl.OpenaireClientFactoryImpl;
 import org.dspace.utils.DSpace;
 import org.junit.After;
 import org.junit.Before;
@@ -67,7 +67,7 @@ public class OpenaireEventsImportIT extends AbstractIntegrationTestWithDatabase
 
     private Collection collection;
 
-    private BrokerClient brokerClient = BrokerClientFactory.getInstance().getBrokerClient();
+    private BrokerClient brokerClient = OpenaireClientFactory.getInstance().getBrokerClient();
 
     private BrokerClient mockBrokerClient = mock(BrokerClient.class);
 
@@ -86,12 +86,12 @@ public class OpenaireEventsImportIT extends AbstractIntegrationTestWithDatabase
 
         context.restoreAuthSystemState();
 
-        ((BrokerClientFactoryImpl) BrokerClientFactory.getInstance()).setBrokerClient(mockBrokerClient);
+        ((OpenaireClientFactoryImpl) OpenaireClientFactory.getInstance()).setBrokerClient(mockBrokerClient);
     }
 
     @After
     public void after() {
-        ((BrokerClientFactoryImpl) BrokerClientFactory.getInstance()).setBrokerClient(brokerClient);
+        ((OpenaireClientFactoryImpl) OpenaireClientFactory.getInstance()).setBrokerClient(brokerClient);
     }
 
     @Test
diff --git a/dspace/config/spring/api/qaevents.xml b/dspace/config/spring/api/qaevents.xml
index 300a47c8f2..8c52b8b1f2 100644
--- a/dspace/config/spring/api/qaevents.xml
+++ b/dspace/config/spring/api/qaevents.xml
@@ -13,7 +13,7 @@
     
     <bean id="openaireBrokerClient" class="eu.dnetlib.broker.BrokerClient" />
     
-    <bean id="brokerClientFactory" class="org.dspace.qaevent.service.impl.BrokerClientFactoryImpl" />
+    <bean id="openaireClientFactory" class="org.dspace.qaevent.service.impl.OpenaireClientFactoryImpl" />
  
      <bean id="org.dspace.qaevent.service.QAEventActionService" class="org.dspace.qaevent.service.impl.QAEventActionServiceImpl">
         <property name="topicsToActions">