diff --git a/dspace-api/src/main/resources/spring/spring-dspace-addon-import-services.xml b/dspace-api/src/main/resources/spring/spring-dspace-addon-import-services.xml
index 6b0ef3e9b9e3..a5cd2f85d398 100644
--- a/dspace-api/src/main/resources/spring/spring-dspace-addon-import-services.xml
+++ b/dspace-api/src/main/resources/spring/spring-dspace-addon-import-services.xml
@@ -137,8 +137,8 @@
         <property name="authUrl" value="${epo.authUrl}" />
         <property name="searchUrl" value="${epo.searchUrl}" />
         <!-- date filed mapped metadata, see epo-integration.xml -->
-        <property name="dateFiled" ref="epo.dc.date.filed" />
-        <property name="applicationNumber" ref="epo.dc.identifier" />
+        <property name="dateFiled" ref="dc.date.submitted" />
+        <property name="applicationNumber" ref="dc.identifier" />
     </bean>
     <bean id="epoMetadataFieldMapping" class="org.dspace.importer.external.epo.service.EpoFieldMapping"/>
 
@@ -195,9 +195,4 @@
     </bean>
     <bean id="ADSMetadataFieldMapping" class="org.dspace.importer.external.ads.ADSFieldMapping"/>
 
-    <!-- Metadatafield used to check against if it's already imported or not during the JSONLookupSearcher-->
-    <bean id="lookupID" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.identifier.other"/>
-    </bean>
-
 </beans>
diff --git a/dspace-api/src/test/data/dspaceFolder/config/spring/api/external-openaire.xml b/dspace-api/src/test/data/dspaceFolder/config/spring/api/external-openaire.xml
index f1e6c30d1398..8da12bbceaf4 100644
--- a/dspace-api/src/test/data/dspaceFolder/config/spring/api/external-openaire.xml
+++ b/dspace-api/src/test/data/dspaceFolder/config/spring/api/external-openaire.xml
@@ -29,61 +29,15 @@
 
     <util:map id="mapOfmetadata"
         map-class="java.util.HashMap" key-type="java.lang.String" value-type="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <entry key="awardNumber" value-ref="openaireAwardNumber" />
-        <entry key="fundingStream" value-ref="openaireFundingStream" />
-        <entry key="awardURI" value-ref="openaireAwardURI" />
-        <entry key="funderName" value-ref="openaireFunderName" />
-        <entry key="funderIdentifier" value-ref="openaireFunderIdentifier" />
-        <entry key="dcTitle" value-ref="openaireTitle" />
-        <entry key="titleAlternative" value-ref="openaireTitleAlternative" />
-        <entry key="dcIdentifier" value-ref="openaireIdentifier" />
-        <entry key="coverageSpatial" value-ref="openaireSpatial" />
-        <entry key="dcDescription" value-ref="openaireDescription" />
-        <entry key="dcSubject" value-ref="openaireSubject" />
+        <entry key="awardNumber" value-ref="oaire.awardNumber" />
+        <entry key="fundingStream" value-ref="oaire.fundingStream" />
+        <entry key="awardURI" value-ref="oaire.awardURI" />
+        <entry key="funderName" value-ref="project.funder.name" />
+        <entry key="funderIdentifier" value-ref="project.funder.identifier" />
+        <entry key="dcTitle" value-ref="dc.title" />
+        <entry key="titleAlternative" value-ref="dc.title.alternative" />
+        <entry key="coverageSpatial" value-ref="dc.coverage.spatial" />
+        <entry key="dcSubject" value-ref="dc.subject" />
     </util:map>
 
-    <bean id="openaireAwardNumber" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="oaire.awardNumber"/>
-    </bean>
-
-    <bean id="openaireFundingStream" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="oaire.fundingStream"/>
-    </bean>
-    
-    <bean id="openaireAwardURI" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="oaire.awardURI"/>
-    </bean>
-
-    <bean id="openaireFunderName" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="project.funder.name"/>
-    </bean>
-
-    <bean id="openaireFunderIdentifier" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="project.funder.identifier"/>
-    </bean>
-
-    <bean id="openaireTitle" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.title"/>
-    </bean>
-
-    <bean id="openaireTitleAlternative" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.title.alternative"/>
-    </bean>
-
-    <bean id="openaireIdentifier" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.identifier"/>
-    </bean>
-
-    <bean id="openaireSpatial" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.coverage.spatial"/>
-    </bean>
-
-    <bean id="openaireDescription" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.description"/>
-    </bean>
-
-    <bean id="openaireSubject" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.subject"/>
-    </bean>
-	
-</beans>
\ No newline at end of file
+</beans>
diff --git a/dspace/config/spring/api/ads-integration.xml b/dspace/config/spring/api/ads-integration.xml
index f611631f4e31..d2e90fe22718 100644
--- a/dspace/config/spring/api/ads-integration.xml
+++ b/dspace/config/spring/api/ads-integration.xml
@@ -12,10 +12,7 @@
     <!-- allows us to use spring annotations in beans -->
 
     <util:list id="adsMetadataFieldMap" value-type="org.dspace.importer.external.metadatamapping.contributor.MetadataContributor">
-        <description>Defines which metadatum is mapped on which metadatum. Note that while the key must be unique it
-            only matters here for postprocessing of the value. The mapped MetadatumContributor has full control over
-            what metadatafield is generated.
-        </description>
+        <description>Defines which metadatum is mapped on which metadatum.</description>
         <ref bean="adsAbstractContrib"/>
         <ref bean="adsAuthorContrib"/>
         <ref bean="adsDoiContrib"/>
@@ -29,84 +26,54 @@
     </util:list>
 
     <bean id="adsTitleContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
-        <property name="field" ref="ads.title"/>
+        <property name="field" ref="dc.title"/>
         <property name="query" value="/title"/>
     </bean>
-    <bean id="ads.title" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.title"/>
-    </bean>
 
     <bean id="adsSourceContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
-        <property name="field" ref="ads.source"/>
+        <property name="field" ref="dc.source"/>
         <property name="query" value="/pub"/>
     </bean>
-    <bean id="ads.source" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.source"/>
-    </bean>
 
     <bean id="adsLangContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
-        <property name="field" ref="ads.lang"/>
+        <property name="field" ref="dc.language.iso"/>
         <property name="query" value="/lang"/>
     </bean>
-    <bean id="ads.lang" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.language.iso"/>
-    </bean>
 
     <bean id="adsKeywordContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
-        <property name="field" ref="ads.keywrd"/>
+        <property name="field" ref="dc.subject"/>
         <property name="query" value="/keyword"/>
     </bean>
-    <bean id="ads.keywrd" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.subject"/>
-    </bean>
 
     <bean id="adsIssueContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
-        <property name="field" ref="ads.issue"/>
+        <property name="field" ref="dc.date.issued"/>
         <property name="query" value="/year"/>
     </bean>
-    <bean id="ads.issue" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.date.issued"/>
-    </bean>
 
     <bean id="adsIdContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
-        <property name="field" ref="ads.id"/>
+        <property name="field" ref="dc.identifier.other"/>
         <property name="query" value="/bibcode"/>
     </bean>
-    <bean id="ads.id" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.identifier.other"/>
-    </bean>
 
     <bean id="adsTypeContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
-        <property name="field" ref="ads.type"/>
+        <property name="field" ref="dc.type"/>
         <property name="query" value="/doctype"/>
     </bean>
-    <bean id="ads.type" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.type"/>
-    </bean>
 
     <bean id="adsDoiContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
-        <property name="field" ref="ads.doi"/>
+        <property name="field" ref="dc.identifier.doi"/>
         <property name="query" value="/doi"/>
     </bean>
-    <bean id="ads.doi" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.identifier.doi"/>
-    </bean>
 
     <bean id="adsAuthorContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
-        <property name="field" ref="ads.author"/>
+        <property name="field" ref="dc.contributor.author"/>
         <property name="query" value="/author"/>
     </bean>
-    <bean id="ads.author" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.contributor.author"/>
-    </bean>
 
     <bean id="adsAbstractContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
-        <property name="field" ref="ads.abstract"/>
+        <property name="field" ref="dc.description.abstract"/>
         <property name="query" value="/abstract"/>
     </bean>
-    <bean id="ads.abstract" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.description.abstract"/>
-    </bean>
 
     <bean class="java.lang.Integer" id="maxRetry">
         <constructor-arg value="3"/>
diff --git a/dspace/config/spring/api/arxiv-integration.xml b/dspace/config/spring/api/arxiv-integration.xml
index 48d6bb4f4e92..68b373133f0c 100644
--- a/dspace/config/spring/api/arxiv-integration.xml
+++ b/dspace/config/spring/api/arxiv-integration.xml
@@ -13,8 +13,7 @@
 
     <util:list id="arxivMetadataFieldMap"
               value-type="org.dspace.importer.external.metadatamapping.contributor.MetadataContributor">
-        <description>Defines which metadatum is mapped on which metadatum.
-        </description>
+        <description>Defines which metadatum is mapped on which metadatum.</description>
         <ref bean="arxivTitleContrib"/>
         <ref bean="arxivSummaryContrib"/>
         <ref bean="arxivPublishedContrib"/>
@@ -27,79 +26,54 @@
 
 
     <bean id="arxivOtherContrib" class="org.dspace.importer.external.arxiv.metadatamapping.contributor.ArXivIdMetadataContributor">
-        <property name="field" ref="arxiv.identifier.other"/>
+        <property name="field" ref="dc.identifier.other"/>
         <property name="query" value="ns:id"/>
         <property name="prefixToNamespaceMapping" ref="arxivBasePrefixToNamespaceMapping"/>
     </bean>
-    <bean id="arxiv.identifier.other" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.identifier.other"/>
-    </bean>
-
 
     <bean id="arxivTitleContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="arxiv.title"/>
+        <property name="field" ref="dc.title"/>
         <property name="query" value="ns:title"/>
         <property name="prefixToNamespaceMapping" ref="arxivBasePrefixToNamespaceMapping"/>
     </bean>
-    <bean id="arxiv.title" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.title"/>
-    </bean>
 
     <bean id="arxivSummaryContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="arxiv.summary"/>
+        <property name="field" ref="dc.description.abstract"/>
         <property name="query" value="ns:summary"/>
         <property name="prefixToNamespaceMapping" ref="arxivBasePrefixToNamespaceMapping"/>
     </bean>
-    <bean id="arxiv.summary" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.description.abstract"/>
-    </bean>
 
     <bean id="arxivPublishedContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathDateFormatMetadataContributor">
-        <property name="field" ref="arxiv.published"/>
+        <property name="field" ref="dc.date.issued"/>
         <property name="query" value="ns:published"/>
         <property name="prefixToNamespaceMapping" ref="arxivBasePrefixToNamespaceMapping"/>
         <property name="dateFormatFrom" value="yyyy-MM-dd'T'HH:mm:ss'Z'"/>
         <property name="dateFormatTo" value="yyyy-MM-dd"></property>
     </bean>
-    <bean id="arxiv.published" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.date.issued"/>
-    </bean>
 
     <bean id="arxivDoiContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="arxiv.arxiv.doi"/>
+        <property name="field" ref="dc.identifier"/>
         <property name="query" value="arxiv:doi"/>
         <property name="prefixToNamespaceMapping" ref="arxivArxivPrefixToNamespaceMapping"/>
     </bean>
-    <bean id="arxiv.arxiv.doi" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.identifier"/>
-    </bean>
 
     <bean id="arxivJournalContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="arxiv.arxiv.journal_ref"/>
+        <property name="field" ref="dc.source"/>
         <property name="query" value="arxiv:journal_ref"/>
         <property name="prefixToNamespaceMapping" ref="arxivArxivPrefixToNamespaceMapping"/>
     </bean>
-    <bean id="arxiv.arxiv.journal_ref" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.source"/>
-    </bean>
 
     <bean id="arxivCategoryTermContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="arxiv.category.term"/>
+        <property name="field" ref="dc.subject"/>
         <property name="query" value="ns:category/@term"/>
         <property name="prefixToNamespaceMapping" ref="arxivBasePrefixToNamespaceMapping"/>
     </bean>
-    <bean id="arxiv.category.term" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.subject"/>
-    </bean>
 
     <bean id="arxivAuthorContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="arxiv.author.name"/>
+        <property name="field" ref="dc.contributor.author"/>
         <property name="query" value="ns:author/name"/>
         <property name="prefixToNamespaceMapping" ref="arxivBasePrefixToNamespaceMapping"/>
     </bean>
-    <bean id="arxiv.author.name" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.contributor.author"/>
-    </bean>
 
     <util:map id="arxivBasePrefixToNamespaceMapping" map-class="java.util.HashMap"
         key-type="java.lang.String" value-type="java.lang.String">
diff --git a/dspace/config/spring/api/bibtex-integration.xml b/dspace/config/spring/api/bibtex-integration.xml
index 79633b0ab19c..044a9644027b 100644
--- a/dspace/config/spring/api/bibtex-integration.xml
+++ b/dspace/config/spring/api/bibtex-integration.xml
@@ -23,24 +23,24 @@
     </util:list>
 
     <bean id="bibtexJissnContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleMetadataContributor">
-        <property name="field" ref="dcJissn"/>
+        <property name="field" ref="dc.identifier.issn"/>
         <property name="key" value="ISSN" />
     </bean>
 
     <bean id="bibtexIssuedContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleMetadataContributor">
-        <property name="field" ref="dcIssued"/>
+        <property name="field" ref="dc.date.issued"/>
         <property name="key" value="year" />
     </bean>
 
     <bean id="bibtexJournalContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleMetadataContributor">
-        <property name="field" ref="dcJournal"/>
+        <property name="field" ref="dc.source"/>
         <property name="key" value="journal" />
     </bean>
     
     <bean id="bibtexAuthorsContrib" class="org.dspace.importer.external.metadatamapping.contributor.SplitMetadataContributor">
         <constructor-arg name="innerContributor">
             <bean class="org.dspace.importer.external.metadatamapping.contributor.SimpleMetadataContributor">
-                <property name="field" ref="dcAuthors"/>
+                <property name="field" ref="dc.contributor.author"/>
                 <property name="key" value="author" />
             </bean>
         </constructor-arg>
@@ -48,12 +48,12 @@
     </bean>
     
     <bean id="bibtexTitleContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleMetadataContributor">
-        <property name="field" ref="dcTitle"/>
+        <property name="field" ref="dc.title"/>
         <property name="key" value="title" />
     </bean>
 
     <bean id="bibtexTypeContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleMetadataContributor">
-        <property name="field" ref="dcType"/>
+        <property name="field" ref="dc.type"/>
         <property name="key" value="type" />
     </bean>
 
diff --git a/dspace/config/spring/api/characterseparated-integration.xml b/dspace/config/spring/api/characterseparated-integration.xml
index b8f744e1eebb..868e47f836ff 100644
--- a/dspace/config/spring/api/characterseparated-integration.xml
+++ b/dspace/config/spring/api/characterseparated-integration.xml
@@ -37,37 +37,37 @@
 
 
     <bean id="charSepTitleContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleMetadataContributor">
-        <property name="field" ref="dcTitle"/>
+        <property name="field" ref="dc.title"/>
         <property name="key" value="0" />
     </bean>
 
     <bean id="charSepAuthorsContrib" class="org.dspace.importer.external.metadatamapping.contributor.EnhancedSimpleMetadataContributor">
-        <property name="field" ref="dcAuthors"/>
+        <property name="field" ref="dc.contributor.author"/>
         <property name="key" value="1" />
     </bean>
 
     <bean id="charSepDateContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleMetadataContributor">
-        <property name="field" ref="dcIssued"/>
+        <property name="field" ref="dc.date.issued"/>
         <property name="key" value="2" />
     </bean>
     
     <bean id="charSepJournalContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleMetadataContributor">
-        <property name="field" ref="dcJournal"/>
+        <property name="field" ref="dc.source"/>
         <property name="key" value="3" />
     </bean>
     
     <bean id="charSepAbstractContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleMetadataContributor">
-        <property name="field" ref="dcAbstract"/>
+        <property name="field" ref="dc.description.abstract"/>
         <property name="key" value="4" />
     </bean>
 
     <bean id="charSepJissnContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleMetadataContributor">
-        <property name="field" ref="dcJissn"/>
+        <property name="field" ref="dc.identifier.issn"/>
         <property name="key" value="5" />
     </bean>
 
     <bean id="charSepTypeContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleMetadataContributor">
-        <property name="field" ref="dcSubtype"/>
+        <property name="field" ref="dc.type"/>
         <property name="key" value="6" />
     </bean>
 
diff --git a/dspace/config/spring/api/cinii-integration.xml b/dspace/config/spring/api/cinii-integration.xml
index bd1635d56b1e..b4cbe67cf9b5 100644
--- a/dspace/config/spring/api/cinii-integration.xml
+++ b/dspace/config/spring/api/cinii-integration.xml
@@ -20,8 +20,7 @@
     -->
     <util:list id="ciniiMetadataFieldMap"
               value-type="org.dspace.importer.external.metadatamapping.contributor.MetadataContributor">
-        <description>Defines which metadatum is mapped on which metadatum.
-        </description>
+        <description>Defines which metadatum is mapped on which metadatum.</description>
         <ref bean="ciniiTitleContrib"/>
         <ref bean="ciniiISSNContrib"/>
         <ref bean="ciniiJournalContrib"/>
@@ -31,62 +30,44 @@
     </util:list>
 
     <bean id="ciniiDescriptionContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="cinii.description"/>
+        <property name="field" ref="dc.description.abstract"/>
         <property name="query" value="dc:description"/>
         <property name="prefixToNamespaceMapping" ref="ciniiPrefixToNamespaceMapping"/>
     </bean>
-    <bean id="cinii.description" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.description.abstract"/>
-    </bean>
 
     <bean id="ciniiLanguageContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="cinii.language"/>
+        <property name="field" ref="dc.language.iso"/>
         <property name="query" value="dc:language"/>
         <property name="prefixToNamespaceMapping" ref="ciniiPrefixToNamespaceMapping"/>
     </bean>
-    <bean id="cinii.language" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.language.iso"/>
-    </bean>
 
     <bean id="ciniiIssuedContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="cinii.issued"/>
+        <property name="field" ref="dc.date.issued"/>
         <property name="query" value="prism:publicationDate"/>
         <property name="prefixToNamespaceMapping" ref="ciniiPrefixToNamespaceMapping"/>
     </bean>
-    <bean id="cinii.issued" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.date.issued"/>
-    </bean>
 
     <bean id="ciniiJournalContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="cinii.journal"/>
+        <property name="field" ref="dc.source"/>
         <property name="query" value="prism:publicationName"/>
         <property name="prefixToNamespaceMapping" ref="ciniiPrefixToNamespaceMapping"/>
     </bean>
-    <bean id="cinii.journal" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.source"/>
-    </bean>
 
     <bean id="ciniiISSNContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="cinii.issn"/>
+        <property name="field" ref="dc.identifier.issn"/>
         <property name="query" value="prism:issn"/>
         <property name="prefixToNamespaceMapping" ref="ciniiPrefixToNamespaceMapping"/>
     </bean>
-    <bean id="cinii.issn" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.identifier.issn"/>
-    </bean>
 
 	<!--  alternative authors, titles, etc (based on languages) isn't used at the moment, 
           org.dspace.importer.external.metadatamapping.contributor.CiniiMetadataContributor
           could be useful to implements metadata remapping.
     -->
     <bean id="ciniiTitleContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="cinii.title"/>
+        <property name="field" ref="dc.title"/>
         <property name="query" value="dc:title"/>
         <property name="prefixToNamespaceMapping" ref="ciniiPrefixToNamespaceMapping"/>
     </bean>
-    <bean id="cinii.title" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.title"/>
-    </bean>
 
 	<util:map id="ciniiPrefixToNamespaceMapping" map-class="java.util.HashMap">
 		<entry key="http://www.w3.org/1999/02/22-rdf-syntax-ns#" value="rdf" />
diff --git a/dspace/config/spring/api/crossref-integration.xml b/dspace/config/spring/api/crossref-integration.xml
index f350c74fdd97..8e473091d2b6 100644
--- a/dspace/config/spring/api/crossref-integration.xml
+++ b/dspace/config/spring/api/crossref-integration.xml
@@ -32,117 +32,78 @@
     </util:list>
 
     <bean id="crossrefIDContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
-        <property name="field" ref="crossref.id"/>
+        <property name="field" ref="dc.identifier.doi"/>
         <property name="query" value="/DOI"/>
     </bean>
-    <bean id="crossref.id" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.identifier.doi"/>
-    </bean>
 
     <bean id="crossrefJournalContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
-        <property name="field" ref="crossref.journal"/>
+        <property name="field" ref="dc.relation.ispartof"/>
         <property name="query" value="/container-title"/>
     </bean>
-    <bean id="crossref.journal" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.relation.ispartof"/>
-    </bean>
 
     <bean id="crossrefDoiTypeContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
-        <property name="field" ref="crossref.type"/>
+        <property name="field" ref="dc.type"/>
         <property name="query" value="/type"/>
     </bean>
-    <bean id="crossref.type" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.type"/>
-    </bean>
 
     <bean id="crossrefEditorsContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
-        <property name="field" ref="crossref.editors"/>
+        <property name="field" ref="dc.contributor.editor"/>
         <property name="metadataProcessor" ref="crossrefEditorMetadataProcessor"></property>
     </bean>
     <bean name="crossrefEditorMetadataProcessor" class="org.dspace.importer.external.crossref.CrossRefAuthorMetadataProcessor">
         <property name="pathToArray" value="/editor"></property>
 	</bean>
-    <bean id="crossref.editors" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.contributor.editor"/>
-    </bean>
 
     <bean id="crossrefYearContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
-        <property name="field" ref="crossref.year"/>
+        <property name="field" ref="dc.date.issued"/>
         <property name="metadataProcessor" ref="crossrefDateMetadataProcessor"></property>
     </bean>
 	<bean name="crossrefDateMetadataProcessor" class="org.dspace.importer.external.crossref.CrossRefDateMetadataProcessor">
 	    <property name="pathToArray" value="/issued/date-parts"></property>
 	</bean>
-    <bean id="crossref.year" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.date.issued"/>
-    </bean>
 
     <bean id="crossrefISBNContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
-        <property name="field" ref="crossref.isbn"/>
+        <property name="field" ref="dc.identifier.isbn"/>
         <property name="query" value="/ISBN"/>
     </bean>
-    <bean id="crossref.isbn" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.identifier.isbn"/>
-    </bean>
 
     <bean id="crossrefAuthorContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
-        <property name="field" ref="crossref.authors"/>
+        <property name="field" ref="dc.contributor.author"/>
         <property name="metadataProcessor" ref="crossrefAuthorMetadataProcessor"></property>
     </bean>
 	<bean name="crossrefAuthorMetadataProcessor" class="org.dspace.importer.external.crossref.CrossRefAuthorMetadataProcessor">
 	    <property name="pathToArray" value="/author"></property>
 	</bean>
-    <bean id="crossref.authors" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.contributor.author"/>
-    </bean>
 
     <bean id="crossrefTitleContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
-        <property name="field" ref="crossref.title"/>
+        <property name="field" ref="dc.title"/>
         <property name="query" value="/title"/>
     </bean>
-    <bean id="crossref.title" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.title"/>
-    </bean>
 
     <bean id="crossrefIdentifierISSN" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
-        <property name="field" ref="crossref.issn"/>
+        <property name="field" ref="dc.identifier.issn"/>
         <property name="query" value="/ISSN"/>
     </bean>
-    <bean id="crossref.issn" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.identifier.issn"/>
-    </bean>
 
     <bean id="crossrefVolume" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
-        <property name="field" ref="crossref.volume"/>
+        <property name="field" ref="oaire.citation.volume"/>
         <property name="query" value="/volume"/>
     </bean>
-    <bean id="crossref.volume" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="oaire.citation.volume"/>
-    </bean>
 
     <bean id="crossrefIssue" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
-        <property name="field" ref="crossref.issue"/>
+        <property name="field" ref="oaire.citation.issue"/>
         <property name="query" value="/journal-issue/issue"/>
     </bean>
-    <bean id="crossref.issue" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="oaire.citation.issue"/>
-    </bean>
 
     <bean id="crossrefAbstract" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
-        <property name="field" ref="crossref.abstract"/>
+        <property name="field" ref="dc.description.abstract"/>
         <property name="query" value="/abstract"/>
     </bean>
-    <bean id="crossref.abstract" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.description.abstract"/>
-    </bean>
 
     <bean id="crossrefPublisher" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
-        <property name="field" ref="crossref.publisher"/>
+        <property name="field" ref="dc.publisher"/>
         <property name="query" value="/publisher"/>
     </bean>
-    <bean id="crossref.publisher" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.publisher"/>
-    </bean>
 
     <bean class="java.lang.Integer" id="maxRetry">
         <constructor-arg value="3"/>
diff --git a/dspace/config/spring/api/datacite-integration.xml b/dspace/config/spring/api/datacite-integration.xml
index 2cf0944515f2..bf6aed227e9a 100644
--- a/dspace/config/spring/api/datacite-integration.xml
+++ b/dspace/config/spring/api/datacite-integration.xml
@@ -28,10 +28,7 @@
                 <property name="elementAttribute" value="/name"/>
             </bean>
         </property>
-        <property name="field" ref="datacite.author"/>
-    </bean>
-    <bean id="datacite.author" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.contributor.author"/>
+        <property name="field" ref="dc.contributor.author"/>
     </bean>
 
     <bean id="dataciteTitleContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
@@ -41,19 +38,13 @@
                 <property name="elementAttribute" value="/title"/>
             </bean>
         </property>
-        <property name="field" ref="datacite.title"/>
-    </bean>
-    <bean id="datacite.title" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.title"/>
+        <property name="field" ref="dc.title"/>
     </bean>
 
     <!-- must be present to be imported, since it's used as the recordId-->
     <bean id="dataciteIDContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
-        <property name="field" ref="datacite.id"/>
+        <property name="field" ref="dc.identifier.doi"/>
         <property name="query" value="/doi"/>
     </bean>
-    <bean id="datacite.id" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.identifier.doi"/>
-    </bean>
 
 </beans>
diff --git a/dspace/config/spring/api/dublicore-metadata-mapper.xml b/dspace/config/spring/api/dublicore-metadata-mapper.xml
deleted file mode 100644
index 82c0dd47dd97..000000000000
--- a/dspace/config/spring/api/dublicore-metadata-mapper.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
-       default-autowire-candidates="*Service,*DAO,javax.sql.DataSource">
-
- 
-     <bean id="dcJissn" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.identifier.issn"/>
-    </bean>
-     <bean id="dcPisbn" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.identifier.isbn"/>
-    </bean>
-    <bean id="dcIssued" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.date.issued"/>
-    </bean>
-     <bean id="dcLanguage" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.language.iso"/>
-    </bean>
-    <bean id="dcSubtype" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.type"/>
-    </bean>
-     <bean id="dcJournal" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.source"/>
-    </bean>
- 	<bean id="dcTitle" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.title"/>
-    </bean>
-    <bean id="dcType" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.type"/>
-    </bean>
- 	<bean id="dcAuthors" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.contributor.author"/>
-    </bean>
- 	<bean id="dcEditors" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.contributor.editor"/>
-    </bean>
- 	<bean id="dcTranslators" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.contributor.other"/>
-    </bean>
- 	<bean id="dcChairs" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.contributor.other"/>
-    </bean>
- 	<bean id="dcAbstract" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.description.abstract"/>
-    </bean>
- 	<bean id="dcAllKeyword" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.subject"/>
-    </bean>
- 	<bean id="dcArxivCategory" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.subject"/>
-    </bean>
- 	<bean id="dcDoi" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.identifier"/>
-    </bean>
- 	<bean id="dcPublisher" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.publisher"/>
-    </bean>
-</beans>
diff --git a/dspace/config/spring/api/endnote-integration.xml b/dspace/config/spring/api/endnote-integration.xml
index 38e5adba29f3..ebc61c272400 100644
--- a/dspace/config/spring/api/endnote-integration.xml
+++ b/dspace/config/spring/api/endnote-integration.xml
@@ -23,27 +23,27 @@
     </util:list>
 
     <bean id="endnoteJournalContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleMetadataContributor">
-        <property name="field" ref="dcJournal"/>
+        <property name="field" ref="dc.source"/>
         <property name="key" value="SO" />
     </bean>
 
     <bean id="endnoteIssuedContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleMetadataContributor">
-        <property name="field" ref="dcIssued"/>
+        <property name="field" ref="dc.date.issued"/>
         <property name="key" value="PY" />
     </bean>
 
     <bean id="endnoteAbstractContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleMetadataContributor">
-        <property name="field" ref="dcAbstract"/>
+        <property name="field" ref="dc.description.abstract"/>
         <property name="key" value="AB" />
     </bean>
     
     <bean id="endnoteAuthorsContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleMetadataContributor">
-        <property name="field" ref="dcAuthors"/>
+        <property name="field" ref="dc.contributor.author"/>
         <property name="key" value="AU" />
     </bean>
     
     <bean id="endnoteTitleContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleMetadataContributor">
-        <property name="field" ref="dcTitle"/>
+        <property name="field" ref="dc.title"/>
         <property name="key" value="TI" />
     </bean>
     
diff --git a/dspace/config/spring/api/epo-integration.xml b/dspace/config/spring/api/epo-integration.xml
index d439e1032fd9..0ae691f8f074 100644
--- a/dspace/config/spring/api/epo-integration.xml
+++ b/dspace/config/spring/api/epo-integration.xml
@@ -26,90 +26,63 @@
     </util:list>
         
     <bean id="epoIpcContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="epo.dc.subject"/>
+        <property name="field" ref="dc.subject"/>
         <property name="query" value="//ns:classification-ipcr/ns:text"/>
         <property name="prefixToNamespaceMapping" ref="nsEpoPrefixToNamespaceMapping"/>
     </bean>
-    <bean id="epo.dc.subject" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.subject"/>
-    </bean>
     
     <bean id="epoAbstractContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="epo.dc.description.abstract"/>
+        <property name="field" ref="dc.description.abstract"/>
         <property name="query" value="//ns:abstract"/>
         <property name="prefixToNamespaceMapping" ref="nsEpoPrefixToNamespaceMapping"/>
     </bean>
-    <bean id="epo.dc.description.abstract" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.description.abstract"/>
-    </bean>
     
     <bean id="epoIDContrib" class="org.dspace.importer.external.metadatamapping.contributor.EpoIdMetadataContributor">
-        <property name="field" ref="epo.identifier.other"/>
+        <property name="field" ref="dc.identifier.other"/>
         <property name="query" value="//ns:publication-reference"/>
         <property name="prefixToNamespaceMapping" ref="nsEpoPrefixToNamespaceMapping"/>
         <property name="needType" value="true"></property>
     </bean>
-    <bean id="epo.identifier.other" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.identifier.other"/>
-    </bean>
 
     <bean id="epoInventionTitleContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="epo.dc.title"/>
+        <property name="field" ref="dc.title"/>
         <property name="query" value="//ns:invention-title"/>
         <property name="prefixToNamespaceMapping" ref="nsEpoPrefixToNamespaceMapping"/>
     </bean>
-    <bean id="epo.dc.title" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.title"/>
-    </bean>
 
     <bean id="epoInventorContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="epo.dc.contributor.author"/>
+        <property name="field" ref="dc.contributor.author"/>
         <property name="query" value="//ns:inventor-name/ns:name"/>
         <property name="prefixToNamespaceMapping" ref="nsEpoPrefixToNamespaceMapping"/>
     </bean>
-    <bean id="epo.dc.contributor.author" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.contributor.author"/>
-    </bean>
 
     <bean id="epoApplicantContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="epo.dc.contributor"/>
+        <property name="field" ref="dc.contributor"/>
         <property name="query" value="//ns:applicant-name/ns:name"/>
         <property name="prefixToNamespaceMapping" ref="nsEpoPrefixToNamespaceMapping"/>
     </bean>
-    <bean id="epo.dc.contributor" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.contributor"/>
-    </bean>
 
     <bean id="epoApplicationNumberContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="epo.dc.identifier"/>
+        <property name="field" ref="dc.identifier"/>
         <property name="query" value="//ns:application-reference/ns:document-id[@document-id-type=&quot;original&quot;]/ns:doc-number"/>
         <property name="prefixToNamespaceMapping" ref="nsEpoPrefixToNamespaceMapping"/>
     </bean>
-    <bean id="epo.dc.identifier" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.identifier"/>
-    </bean>
 
     <bean id="epoDateContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathDateFormatMetadataContributor">
-        <property name="field" ref="epo.dc.date.issued"/>
+        <property name="field" ref="dc.date.issued"/>
         <property name="query" value="//ns:publication-reference/ns:document-id[@document-id-type=&quot;epodoc&quot;]/ns:date"/>
         <property name="prefixToNamespaceMapping" ref="nsEpoPrefixToNamespaceMapping"/>
         <property name="dateFormatFrom" value="yyyymmdd"/>
         <property name="dateFormatTo" value="yyyy-MM-dd"></property>
     </bean>
-    <bean id="epo.dc.date.issued" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.date.issued"/>
-    </bean>        
     
     <bean id="epoDateFiledContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathDateFormatMetadataContributor">
-        <property name="field" ref="epo.dc.date.filed"/>
+        <property name="field" ref="dc.date.submitted"/>
         <property name="query" value="//ns:application-reference/ns:document-id/ns:date"/>
         <property name="prefixToNamespaceMapping" ref="nsEpoPrefixToNamespaceMapping"/>
         <property name="dateFormatFrom" value="yyyymmdd"/>
         <property name="dateFormatTo" value="yyyy-MM-dd"></property>
     </bean>
-    <bean id="epo.dc.date.filed" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.date.submitted"/>
-    </bean>
     
     <util:map id="xlinkEpoPrefixToNamespaceMapping" map-class="java.util.HashMap"
         key-type="java.lang.String" value-type="java.lang.String">
diff --git a/dspace/config/spring/api/external-openaire.xml b/dspace/config/spring/api/external-openaire.xml
index 25a23a173900..c4ec7ece4ee4 100644
--- a/dspace/config/spring/api/external-openaire.xml
+++ b/dspace/config/spring/api/external-openaire.xml
@@ -28,51 +28,15 @@
 
     <util:map id="mapOfmetadata"
         map-class="java.util.HashMap" key-type="java.lang.String" value-type="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <entry key="awardNumber" value-ref="openaireAwardNumber" />
-        <entry key="fundingStream" value-ref="openaireFundingStream" />
-        <entry key="awardURI" value-ref="openaireAwardURI" />
-        <entry key="funderName" value-ref="openaireFunderName" />
-        <entry key="funderIdentifier" value-ref="openaireFunderIdentifier" />
-        <entry key="dcTitle" value-ref="openaireTitle" />
-        <entry key="titleAlternative" value-ref="openaireTitleAlternative" />
-        <entry key="coverageSpatial" value-ref="openaireSpatial" />
-        <entry key="dcSubject" value-ref="openaireSubject" />
+        <entry key="awardNumber" value-ref="oaire.awardNumber" />
+        <entry key="fundingStream" value-ref="oaire.fundingStream" />
+        <entry key="awardURI" value-ref="oaire.awardURI" />
+        <entry key="funderName" value-ref="project.funder.name" />
+        <entry key="funderIdentifier" value-ref="project.funder.identifier" />
+        <entry key="dcTitle" value-ref="dc.title" />
+        <entry key="titleAlternative" value-ref="dc.title.alternative" />
+        <entry key="coverageSpatial" value-ref="dc.coverage.spatial" />
+        <entry key="dcSubject" value-ref="dc.subject" />
     </util:map>
 
-    <bean id="openaireAwardNumber" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="oaire.awardNumber"/>
-    </bean>
-
-    <bean id="openaireFundingStream" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="oaire.fundingStream"/>
-    </bean>
-    
-    <bean id="openaireAwardURI" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="oaire.awardURI"/>
-    </bean>
-
-    <bean id="openaireFunderName" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="project.funder.name"/>
-    </bean>
-
-    <bean id="openaireFunderIdentifier" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="project.funder.identifier"/>
-    </bean>
-
-    <bean id="openaireTitle" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.title"/>
-    </bean>
-
-    <bean id="openaireTitleAlternative" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.title.alternative"/>
-    </bean>
-
-    <bean id="openaireSpatial" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.coverage.spatial"/>
-    </bean>
-
-    <bean id="openaireSubject" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.subject"/>
-    </bean>
-
-</beans>
\ No newline at end of file
+</beans>
diff --git a/dspace/config/spring/api/live-import-metadata-field-config.xml b/dspace/config/spring/api/live-import-metadata-field-config.xml
new file mode 100644
index 000000000000..2daf6f474766
--- /dev/null
+++ b/dspace/config/spring/api/live-import-metadata-field-config.xml
@@ -0,0 +1,143 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+           http://www.springframework.org/schema/context
+           http://www.springframework.org/schema/context/spring-context-2.5.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+       default-autowire-candidates="*Service,*DAO,javax.sql.DataSource">
+
+    <context:annotation-config/>
+    <!-- allows us to use spring annotations in beans -->
+
+    <bean id="dc.description.abstract" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.description.abstract"/>
+    </bean>
+
+    <bean id="dc.contributor.author" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.contributor.author"/>
+    </bean>
+
+    <bean id="dc.identifier.doi" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.identifier.doi"/>
+    </bean>
+
+    <bean id="dc.type" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.type"/>
+    </bean>
+
+    <bean id="dc.identifier.other" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.identifier.other"/>
+    </bean>
+
+    <bean id="dc.date.issued" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.date.issued"/>
+    </bean>
+
+    <bean id="dc.subject" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.subject"/>
+    </bean>
+
+    <bean id="dc.language.iso" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.language.iso"/>
+    </bean>
+
+    <bean id="dc.source" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.source"/>
+    </bean>
+
+    <bean id="dc.title" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.title"/>
+    </bean>
+
+    <bean id="dc.identifier" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.identifier"/>
+    </bean>
+    <bean id="dc.identifier.issn" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.identifier.issn"/>
+    </bean>
+
+    <bean id="dc.relation.ispartof" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.relation.ispartof"/>
+    </bean>
+
+    <bean id="dc.contributor.editor" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.contributor.editor"/>
+    </bean>
+
+    <bean id="dc.identifier.isbn" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.identifier.isbn"/>
+    </bean>
+
+    <bean id="oaire.citation.volume" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="oaire.citation.volume"/>
+    </bean>
+    <bean id="oaire.citation.issue" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="oaire.citation.issue"/>
+    </bean>
+    <bean id="dc.publisher" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.publisher"/>
+    </bean>
+    <bean id="dc.contributor" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.contributor"/>
+    </bean>
+    <bean id="dc.date.submitted" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.contributor"/>
+    </bean>
+    <bean id="oaire.citation.startPage" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="oaire.citation.startPage"/>
+    </bean>
+    <bean id="oaire.citation.endPage" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="oaire.citation.endPage"/>
+    </bean>
+    <bean id="dc.rights" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.rights"/>
+    </bean>
+
+
+    <bean id="oaire.awardNumber" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="oaire.awardNumber"/>
+    </bean>
+    <bean id="oaire.fundingStream" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="oaire.fundingStream"/>
+    </bean>
+    <bean id="oaire.awardURI" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="oaire.awardURI"/>
+    </bean>
+    <bean id="project.funder.name" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="project.funder.name"/>
+    </bean>
+    <bean id="project.funder.identifier" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="project.funder.name"/>
+    </bean>
+    <bean id="dc.title.alternative" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.title.alternative"/>
+    </bean>
+    <bean id="dc.coverage.spatial" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.coverage.spatial"/>
+    </bean>
+    <bean id="dc.relation.ispartofseries" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.relation.ispartofseries"/>
+    </bean>
+    <bean id="person.identifier.orcid" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="person.identifier.orcid"/>
+    </bean>
+    <bean id="person.identifier.scopus-author-id" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="person.identifier.scopus-author-id"/>
+    </bean>
+    <bean id="person.affiliation.name" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="person.affiliation.name"/>
+    </bean>
+    <bean id="oaire.citation.edition" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="oaire.citation.edition"/>
+    </bean>
+    <bean id="person.identifier.rid" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="person.identifier.rid"/>
+    </bean>
+
+
+
+
+
+</beans>
diff --git a/dspace/config/spring/api/pubmed-integration.xml b/dspace/config/spring/api/pubmed-integration.xml
index a0892c83d452..8c2c8d5f8ba0 100644
--- a/dspace/config/spring/api/pubmed-integration.xml
+++ b/dspace/config/spring/api/pubmed-integration.xml
@@ -112,37 +112,6 @@
         <property name="prefixToNamespaceMapping" ref="prefixToNamespaceMapping"/>
     </bean>
 
-    <bean id="dc.title" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.title"/>
-    </bean>
-
-    <bean id="dc.description.abstract" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.description.abstract"/>
-    </bean>
-
-
-    <bean id="dc.contributor.author" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.contributor.author"/>
-    </bean>
-
-    <bean id="dc.date.issued" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.date.issued"/>
-    </bean>
-
-    <bean id="dc.language.iso" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.language.iso"/>
-    </bean>
-
-
-    <bean id="dc.subject" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.subject"/>
-    </bean>
-
-    <bean id="dc.identifier.other" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.identifier.other"/>
-    </bean>
-
-
     <util:map id="prefixToNamespaceMapping">
     </util:map>
 
diff --git a/dspace/config/spring/api/pubmedeurope-integration.xml b/dspace/config/spring/api/pubmedeurope-integration.xml
index d23f5ab7f803..94eb078bff89 100644
--- a/dspace/config/spring/api/pubmedeurope-integration.xml
+++ b/dspace/config/spring/api/pubmedeurope-integration.xml
@@ -30,122 +30,81 @@
     </util:list>
 
     <bean id="pubEuOtherContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="pubeu.other"/>
+        <property name="field" ref="dc.identifier.other"/>
         <property name="query" value="id"/>
         <property name="prefixToNamespaceMapping" ref="pubEuPrefixToNamespaceMapping"/>
     </bean>
-    <bean id="pubeu.other" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.identifier.other"/>
-    </bean>
 
     <bean id="pubEuISSNContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="pubeu.sissn"/>
+        <property name="field" ref="dc.identifier.issn"/>
         <property name="query" value="journalInfo/journal/ISSN"/>
         <property name="prefixToNamespaceMapping" ref="pubEuPrefixToNamespaceMapping"/>
     </bean>    
-    <bean id="pubeu.sissn" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.identifier.issn"/>
-    </bean>
-    
+
     <bean id="pubEuISBNContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="pubeu.isbn"/>
+        <property name="field" ref="dc.identifier.isbn"/>
         <property name="query" value="seriesISSN"/>
         <property name="prefixToNamespaceMapping" ref="pubEuPrefixToNamespaceMapping"/>
-    </bean>    
-    <bean id="pubeu.isbn" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.identifier.isbn"/>
     </bean>
 
     <bean id="pubEuPublisherContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="pubeu.publisher"/>
+        <property name="field" ref="dc.publisher"/>
         <property name="query" value="publisher"/>
         <property name="prefixToNamespaceMapping" ref="pubEuPrefixToNamespaceMapping"/>
     </bean>    
-    <bean id="pubeu.publisher" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.publisher"/>
-    </bean>
-        
+
     <bean id="pubEuAbstractContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="pubeu.abstract"/>
+        <property name="field" ref="dc.description.abstract"/>
         <property name="query" value="abstractText"/>
         <property name="prefixToNamespaceMapping" ref="pubEuPrefixToNamespaceMapping"/>
-    </bean>    
-    <bean id="pubeu.abstract" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.description.abstract"/>
     </bean>
 
     <bean id="pubEuKeywordContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="pubeu.type"/>
+        <property name="field" ref="dc.subject"/>
         <property name="query" value="keywordList/keyword"/>
         <property name="prefixToNamespaceMapping" ref="pubEuPrefixToNamespaceMapping"/>
     </bean>        
-    <bean id="pubeu.keyword" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.subject"/>
-    </bean>
-    
+
     <bean id="pubEuTypeContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="pubeu.type"/>
+        <property name="field" ref="dc.type"/>
         <property name="query" value="pubTypeList/pubType"/>
         <property name="prefixToNamespaceMapping" ref="pubEuPrefixToNamespaceMapping"/>
-    </bean>    
-     <bean id="pubeu.type" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.type"/>
     </bean>
-
     <bean id="pubEuLangContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="pubeu.lang"/>
+        <property name="field" ref="dc.language.iso"/>
         <property name="query" value="language"/>
         <property name="prefixToNamespaceMapping" ref="pubEuPrefixToNamespaceMapping"/>
     </bean>    
-     <bean id="pubeu.lang" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.language.iso"/>
-    </bean>
 
     <bean id="pubEuDateContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="pubeu.date"/>
+        <property name="field" ref="dc.date.issued"/>
         <property name="query" value="journalInfo/yearOfPublication"/>
         <property name="prefixToNamespaceMapping" ref="pubEuPrefixToNamespaceMapping"/>
     </bean>    
-     <bean id="pubeu.date" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.date.issued"/>
-    </bean>
-    
+
     <bean id="pubEuJournalContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="pubeu.journal"/>
+        <property name="field" ref="dc.source"/>
         <property name="query" value="journalInfo/journal/title"/>
         <property name="prefixToNamespaceMapping" ref="pubEuPrefixToNamespaceMapping"/>
     </bean>    
-    <bean id="pubeu.journal" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.source"/>
-    </bean>
 
     <bean id="pubEuAuthorContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="pubeu.author"/>
+        <property name="field" ref="dc.contributor.author"/>
         <property name="query" value="authorList/author/fullName"/>
         <property name="prefixToNamespaceMapping" ref="pubEuPrefixToNamespaceMapping"/>
     </bean>
-    <bean id="pubeu.author" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.contributor.author"/>
-    </bean>
 
     <bean id="pubEuTitleContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="pubeu.title"/>
+        <property name="field" ref="dc.title"/>
         <property name="query" value="title"/>
         <property name="prefixToNamespaceMapping" ref="pubEuPrefixToNamespaceMapping"/>
     </bean>
-     <bean id="pubeu.title" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.title"/>
-    </bean>
 
     <bean id="pubEuDoiContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="pubeu.doi"/>
+        <property name="field" ref="dc.identifier"/>
         <property name="query" value="doi"/>
         <property name="prefixToNamespaceMapping" ref="pubEuPrefixToNamespaceMapping"/>
     </bean>
-     <bean id="pubeu.doi" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.identifier"/>
-    </bean>
-	
 
     <util:map id="pubEuPrefixToNamespaceMapping" map-class="java.util.HashMap"
         key-type="java.lang.String" value-type="java.lang.String">
diff --git a/dspace/config/spring/api/ris-integration.xml b/dspace/config/spring/api/ris-integration.xml
index c1db4f336e29..84cc339b50b8 100644
--- a/dspace/config/spring/api/ris-integration.xml
+++ b/dspace/config/spring/api/ris-integration.xml
@@ -13,10 +13,7 @@
 
     <util:list id="risMetadataFieldMap" 
               value-type="org.dspace.importer.external.metadatamapping.contributor.MetadataContributor">
-        <description>Defines which metadatum is mapped on which metadatum. Note that while the key must be unique it
-            only matters here for postprocessing of the value. The mapped MetadatumContributor has full control over
-            what metadatafield is generated.
-        </description>
+        <description>Defines which metadatum is mapped on which metadatum.        </description>
         <ref bean="risTitleContrib" />
         <ref bean="risAuthorContrib" />
         <ref bean="risSourceContrib" />
@@ -28,49 +25,49 @@
 
 
     <bean id="risTitleContrib" class="org.dspace.importer.external.metadatamapping.contributor.MultipleMetadataContributor">
-        <property name="field" ref="dcTitle"/>
+        <property name="field" ref="dc.title"/>
         <property name="metadatumContributors" ref="risTitleContribList" />
     </bean>
 
 	<util:list id="risTitleContribList">
 	    <bean id="risTitleContribTI" class="org.dspace.importer.external.metadatamapping.contributor.SimpleMetadataContributor">
-	        <property name="field" ref="dcTitle"/>
+	        <property name="field" ref="dc.title"/>
 	        <property name="key" value="TI" />
 	    </bean>
 	    <bean id="risTitleContribT1" class="org.dspace.importer.external.metadatamapping.contributor.SimpleMetadataContributor">
-	        <property name="field" ref="dcTitle"/>
+	        <property name="field" ref="dc.title"/>
 	        <property name="key" value="T1" />
 	    </bean>	
 	</util:list>
     
     <bean id="risAuthorContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleMetadataContributor">
-        <property name="field" ref="dcAuthors"/>
+        <property name="field" ref="dc.contributor.author"/>
         <property name="key" value="AU" />
     </bean>    
     
     <bean id="risSourceContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleMetadataContributor">
-        <property name="field" ref="dcJournal"/>
+        <property name="field" ref="dc.source"/>
         <property name="key" value="SO" />
     </bean>    
     
     
     <bean id="risDateContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleMetadataContributor">
-        <property name="field" ref="dcIssued"/>
+        <property name="field" ref="dc.date.issued"/>
         <property name="key" value="PY" />
     </bean>    
 
     <bean id="risISSNContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleMetadataContributor">
-        <property name="field" ref="dcJissn"/>
+        <property name="field" ref="dc.identifier.issn"/>
         <property name="key" value="SN" />
     </bean>    
     
    <bean id="risTypeContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleMetadataContributor">
-        <property name="field" ref="dcSubtype"/>
+        <property name="field" ref="dc.type"/>
         <property name="key" value="PT" />
     </bean>    
     
    <bean id="risAbstractContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleMetadataContributor">
-        <property name="field" ref="dcAbstract"/>
+        <property name="field" ref="dc.description.abstract"/>
         <property name="key" value="AB" />
     </bean>    
 
diff --git a/dspace/config/spring/api/scielo-integration.xml b/dspace/config/spring/api/scielo-integration.xml
index 888b2249aad9..c1e534fcc96d 100644
--- a/dspace/config/spring/api/scielo-integration.xml
+++ b/dspace/config/spring/api/scielo-integration.xml
@@ -15,95 +15,35 @@
 
     <util:list id="scieloMetadataFieldMap"
               value-type="org.dspace.importer.external.metadatamapping.contributor.MetadataContributor">
-        <description>Defines which metadatum is mapped on which metadatum. Note that while the key must be unique it
-            only matters here for postprocessing of the value. The mapped MetadatumContributor has full control over
-            what metadatafield is generated.
-        </description>
+        <description>Defines which metadatum is mapped on which metadatum.</description>
         <ref bean="scieloSimpleContrib"/>
         <ref bean="scieloAbstractContrib"/>
     </util:list>
 
     <bean id="scieloAbstractContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleRisToMetadataConcatContributor">
         <property name="tag" value="AB"/>
-        <property name="metadata" ref="scielo.abstract"/>
+        <property name="metadata" ref="dc.description.abstract"/>
     </bean>
-
-    <bean id="scielo.abstract" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.description.abstract"/>
-    </bean>
-
+    
     <bean id="scieloSimpleContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleRisToMetadataContributor">
         <property name="fieldToMetadata" ref="tag2metadata"/>
     </bean>
 
     <util:map id="tag2metadata" map-class="java.util.HashMap"
         key-type="java.lang.String" value-type="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <entry key="DO" value-ref="scielo.doi"/>
-        <entry key="AU" value-ref="scielo.author"/>
-        <entry key="TI" value-ref="scielo.title"/>
-        <entry key="SN" value-ref="scielo.issn"/>
-        <entry key="VL" value-ref="scielo.volume"/>
-        <entry key="IS" value-ref="scielo.issueIdentifier"/>
-        <entry key="ID" value-ref="scielo.id"/>
-        <entry key="SP" value-ref="scielo.startPage"/>
-        <entry key="EP" value-ref="scielo.endPage"/>
-        <entry key="KW" value-ref="scielo.keywords"/>
-        <entry key="TY" value-ref="scielo.type"/>
-        <entry key="PY" value-ref="scielo.publicationYear"/>
-        <entry key="JO" value-ref="scielo.isPartOf"/>
+        <entry key="DO" value-ref="dc.identifier.doi"/>
+        <entry key="AU" value-ref="dc.contributor.author"/>
+        <entry key="TI" value-ref="dc.title"/>
+        <entry key="SN" value-ref="dc.identifier.issn"/>
+        <entry key="VL" value-ref="oaire.citation.volume"/>
+        <entry key="IS" value-ref="oaire.citation.issue"/>
+        <entry key="ID" value-ref="dc.identifier.other"/>
+        <entry key="SP" value-ref="oaire.citation.startPage"/>
+        <entry key="EP" value-ref="oaire.citation.endPage"/>
+        <entry key="KW" value-ref="dc.subject"/>
+        <entry key="TY" value-ref="dc.type"/>
+        <entry key="PY" value-ref="dc.date.issued"/>
+        <entry key="JO" value-ref="dc.relation.ispartof"/>
     </util:map>
 
-    <bean id="scielo.doi" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.identifier.doi"/>
-    </bean>
-
-    <bean id="scielo.author" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.contributor.author"/>
-    </bean>
-
-    <bean id="scielo.title" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.title"/>
-    </bean>
-
-    <bean id="scielo.issn" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.identifier.issn"/>
-    </bean>
-
-    <bean id="scielo.volume" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="oaire.citation.volume"/>
-    </bean>
-
-    <bean id="scielo.issueIdentifier" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="oaire.citation.issue"/>
-    </bean>
-
-    <bean id="scielo.id" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.identifier.other"/>
-    </bean>
-
-    <bean id="scielo.startPage" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="oaire.citation.startPage"/>
-    </bean>
-    	
-    <bean id="scielo.endPage" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="oaire.citation.endPage"/>
-    </bean>
-
-    <bean id="scielo.keywords" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.subject"/>
-    </bean>
-
-    <bean id="scielo.type" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.type"/>
-    </bean>
-
-    <bean id="scielo.publicationYear" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.date.issued"/>
-    </bean>
-
-    <bean id="scielo.isPartOf" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.relation.ispartof"/>
-    </bean>
-
-
 </beans>
diff --git a/dspace/config/spring/api/scopus-integration.xml b/dspace/config/spring/api/scopus-integration.xml
index be71bb2d0517..ce1fbb22ed97 100644
--- a/dspace/config/spring/api/scopus-integration.xml
+++ b/dspace/config/spring/api/scopus-integration.xml
@@ -35,203 +35,117 @@
     </util:list>
     
     <bean id="scopusOpenaccessFlagContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="scopus.openaccessFlag"/>
+        <property name="field" ref="dc.rights"/>
         <property name="query" value="ns:openaccessFlag"/>
         <property name="prefixToNamespaceMapping" ref="scopusNs"/>
     </bean>
-    <bean id="scopus.openaccessFlag" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.rights"/>
-    </bean>
 
     <bean id="scopusAuthorsContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="scopus.author"/>
+        <property name="field" ref="dc.contributor.author"/>
         <property name="query" value="ns:author/ns:authname"/>
         <property name="prefixToNamespaceMapping" ref="scopusNs"/>
     </bean>
-    <bean id="scopus.author" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.contributor.author"/>
-    </bean>
-
 
     <bean id="scopusAbstractContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="scopus.abstract"/>
+        <property name="field" ref="dc.description.abstract"/>
         <property name="query" value="dc:description"/>
         <property name="prefixToNamespaceMapping" ref="scopusDc"/>
     </bean>
-    <bean id="scopus.abstract" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.description.abstract"/>
-    </bean>
 
     <bean id="scopusDateContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="scopus.date"/>
+        <property name="field" ref="dc.date.issued"/>
         <property name="query" value="prism:coverDate"/>
         <property name="prefixToNamespaceMapping" ref="scopusPrism"/>
     </bean>
-    <bean id="scopus.date" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.date.issued"/>
-    </bean>
-
+    
     <bean id="scopusIssnContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="scopus.issn"/>
+        <property name="field" ref="dc.identifier.issn"/>
         <property name="query" value="prism:issn"/>
         <property name="prefixToNamespaceMapping" ref="scopusPrism"/>
     </bean>
-    <bean id="scopus.issn" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.identifier.issn"/>
-    </bean>
 
     <bean id="scopusIsbnContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="scopus.isbn"/>
+        <property name="field" ref="dc.identifier.isbn"/>
         <property name="query" value="prism:isbn"/>
         <property name="prefixToNamespaceMapping" ref="scopusPrism"/>
     </bean>
-    <bean id="scopus.isbn" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.identifier.isbn"/>
-    </bean>
-
 
     <bean id="scopusSourceContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="scopus.source"/>
+        <property name="field" ref="dc.source"/>
         <property name="query" value="prism:publicationName"/>
         <property name="prefixToNamespaceMapping" ref="scopusPrism"/>
     </bean>
 
-    <bean id="scopus.source" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.source"/>
-    </bean>
-
     <bean id="scopusTypeContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="scopus.type"/>
+        <property name="field" ref="dc.type"/>
         <property name="query" value="prism:aggregationType"/>
         <property name="prefixToNamespaceMapping" ref="scopusPrism"/>
     </bean>
 
-    <bean id="scopus.type" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.type"/>
-    </bean>
-
     <bean id="scopusTitleContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="scopus.title"/>
+        <property name="field" ref="dc.title"/>
         <property name="query" value="dc:title"/>
         <property name="prefixToNamespaceMapping" ref="scopusDc"/>
     </bean>
-    <bean id="scopus.title" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.title"/>
-    </bean>
 
     <bean id="scopusDoiContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="scopus.doi"/>
+        <property name="field" ref="dc.identifier"/>
         <property name="query" value="prism:doi"/>
         <property name="prefixToNamespaceMapping" ref="scopusPrism"/>
     </bean>
-    <bean id="scopus.doi" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.identifier"/>
-    </bean>
 
     <bean id="scopusVolumeContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="scopus.volume"/>
+        <property name="field" ref="oaire.citation.volume"/>
         <property name="query" value="prism:volume"/>
         <property name="prefixToNamespaceMapping" ref="scopusPrism"/>
     </bean>
 
-    <bean id="scopus.volume" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="oaire.citation.volume"/>
-    </bean>
-
     <bean id="scopusIssueIdentifierContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="scopus.issueIdentifier"/>
+        <property name="field" ref="oaire.citation.issue"/>
         <property name="query" value="prism:issueIdentifier"/>
         <property name="prefixToNamespaceMapping" ref="scopusPrism"/>
     </bean>
 
-    <bean id="scopus.issueIdentifier" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="oaire.citation.issue"/>
-    </bean>
-
     <bean id="scopusEidContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="scopus.eid"/>
+        <property name="field" ref="dc.identifier.other"/>
         <property name="query" value="ns:eid"/>
         <property name="prefixToNamespaceMapping" ref="scopusNs"/>
     </bean>
 
-    <bean id="scopus.eid" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.identifier.other"/>
-    </bean>
-
     <bean id="scopusAuthkeywordsContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="scopus.authkeywords"/>
+        <property name="field" ref="dc.subject"/>
         <property name="query" value="ns:authkeywords"/>
         <property name="prefixToNamespaceMapping" ref="scopusNs"/>
     </bean>
 
-    <bean id="scopus.authkeywords" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.subject"/>
-    </bean>
-
     <bean id="scopusCreatorContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="scopus.creator"/>
+        <property name="field" ref="dc.contributor.author"/>
         <property name="query" value="dc:creator"/>
         <property name="prefixToNamespaceMapping" ref="scopusDc"/>
     </bean>
 
-    <bean id="scopus.creator" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.contributor.author"/>
-    </bean>
-
-    <bean id="scopus.startPage" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="oaire.citation.startPage"/>
-    </bean>
-    
-    <bean id="scopus.endPage" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="oaire.citation.endPage"/>
-    </bean>
-
     <bean id="scopusIspartofContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="scopus.ispartof"/>
+        <property name="field" ref="dc.relation.ispartof"/>
         <property name="query" value="prism:publicationName"/>
         <property name="prefixToNamespaceMapping" ref="scopusPrism"/>
     </bean>
 
-    <bean id="scopus.ispartof" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.relation.ispartof"/>
-    </bean>
-
     <bean id="scopusIspartofseriesContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="scopus.ispartofseries"/>
+        <property name="field" ref="dc.relation.ispartofseries"/>
         <property name="query" value="prism:publicationName"/>
         <property name="prefixToNamespaceMapping" ref="scopusPrism"/>
     </bean>
 
-    <bean id="scopus.ispartofseries" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.relation.ispartofseries"/>
-    </bean>
-
     <bean id="scopusAuthorMetadataContrib" class="org.dspace.importer.external.metadatamapping.contributor.AuthorMetadataContributor">
-        <property name="field" ref="scopus.authname"/>
-        <property name="authname" ref="scopus.authname"/>
-        <property name="orcid" ref="scopus.orcid"/>
-        <property name="scopusId" ref="scopus.scopusId"/>
-        <property name="affiliation" ref="scopus.affiliation"/>
+        <property name="field" ref="dc.contributor.author"/>
+        <property name="authname" ref="dc.contributor.author"/>
+        <property name="orcid" ref="person.identifier.orcid"/>
+        <property name="scopusId" ref="person.identifier.scopus-author-id"/>
+        <property name="affiliation" ref="person.affiliation.name"/>
         <property name="query" value=""/>
         <property name="prefixToNamespaceMapping" ref="scopusNs"/>
     </bean>
 
-    <bean id="scopus.authname" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.contributor.author"/>
-    </bean>
-
-    <bean id="scopus.orcid" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="person.identifier.orcid"/>
-    </bean>
-    
-    <bean id="scopus.scopusId" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="person.identifier.scopus-author-id"/>
-    </bean>
-
-    <bean id="scopus.affiliation" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="person.affiliation.name"/>
-    </bean>
-
     <util:map id="scopusAtom" map-class="java.util.HashMap"
         key-type="java.lang.String" value-type="java.lang.String">
     	<entry key="http://www.w3.org/2005/Atom" value="atom" />
diff --git a/dspace/config/spring/api/vufind-integration.xml b/dspace/config/spring/api/vufind-integration.xml
index 4b083935cbb6..0ff4692d17ac 100644
--- a/dspace/config/spring/api/vufind-integration.xml
+++ b/dspace/config/spring/api/vufind-integration.xml
@@ -30,72 +30,53 @@
     </util:list>
 
     <bean id="vufindIDContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
-        <property name="field" ref="vufind.id"/>
+        <property name="field" ref="dc.identifier.other"/>
         <property name="query" value="/id"/>
     </bean>
-    <bean id="vufind.id" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.identifier.other"/>
-    </bean>
 
     <bean id="vufindLanguages" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
-        <property name="field" ref="vufind.dc.language.iso"/>
+        <property name="field" ref="dc.language.iso"/>
         <property name="query" value="/languages"/>
     </bean>
-    <bean id="vufind.dc.language.iso" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.language.iso"/>
-    </bean>
 
     <bean id="vufindTitle" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
-        <property name="field" ref="vufind.dc.title"/>
+        <property name="field" ref="dc.title"/>
         <property name="query" value="/title"/>
     </bean>
-    <bean id="vufind.dc.title" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.title"/>
-    </bean>
 
     <bean id="vufindIdentifier" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
-        <property name="field" ref="vufind.dc.identifier"/>
+        <property name="field" ref="dc.identifier"/>
         <property name="metadataProcessor" ref="vufindUriProcessor"></property>
     </bean>
     <bean name="vufindUriProcessor" class="org.dspace.importer.external.metadatamapping.contributor.ArrayElementAttributeProcessor">
         <property name="pathToArray" value="/urls"></property>
         <property name="elementAttribute" value="/url"></property>
 	</bean>
-    <bean id="vufind.dc.identifier" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.identifier"/>
-    </bean>
 
     <bean id="vufindSubject" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
-        <property name="field" ref="vufind.dc.subject"/>
+        <property name="field" ref="dc.subject"/>
         <property name="metadataProcessor" ref="vufindSubjectsProcessor"></property>
     </bean>
     <bean name="vufindSubjectsProcessor" class="org.dspace.importer.external.metadatamapping.contributor.MatrixElementProcessor">
         <property name="pathToMatrix" value="/subjects"></property>
 	</bean>
-    <bean id="vufind.dc.subject" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.subject"/>
-    </bean>
 
     <bean id="vufindAuthors" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
-        <property name="field" ref="vufind.dc.contributor.author"/>
+        <property name="field" ref="dc.contributor.author"/>
         <property name="query" value="/dcContributorAuthor"/>
     </bean>
 
 	<util:list id="vufindAuthorsList">
 	    <bean id="vufindPrimaryAuthors" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
-	        <property name="field" ref="vufind.dc.contributor.author"/>
+	        <property name="field" ref="dc.contributor.author"/>
 	        <property name="query" value="/authors/primary" />
 	    </bean>
 	    <bean id="vufindSecondaryAuthors" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
-	        <property name="field" ref="vufind.dc.contributor.author"/>
+	        <property name="field" ref="dc.contributor.author"/>
 	        <property name="query" value="/authors/secondary" />
 	    </bean>
 	</util:list>
 
-    <bean id="vufind.dc.contributor.author" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.contributor.author"/>
-    </bean>
-
     <bean class="java.lang.Integer" id="maxRetry">
         <constructor-arg value="3"/>
     </bean>
@@ -104,59 +85,38 @@
          of ALICIA https://alicia.concytec.gob.pe/vufind/Search/Results?type=AllFields -->
 
     <bean id="vufindIdentifierIsbn" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
-        <property name="field" ref="vufind.dc.identifier.isbn"/>
+        <property name="field" ref="dc.identifier.isbn"/>
         <property name="query" value="/dcIdentifierIsbn"/>
     </bean>
-    <bean id="vufind.dc.identifier.isbn" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.identifier.isbn"/>
-    </bean>
 
     <bean id="vufindIdentifierDoi" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
-        <property name="field" ref="vufind.dc.identifier.doi"/>
+        <property name="field" ref="dc.identifier.doi"/>
         <property name="query" value="/dcIdentifierDoi"/>
     </bean>
-    <bean id="vufind.dc.identifier.doi" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.identifier.doi"/>
-    </bean>
 
     <bean id="vufindDateIssued" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
-        <property name="field" ref="vufind.dc.date.issued"/>
+        <property name="field" ref="dc.date.issued"/>
         <property name="query" value="/dcDateIssued"/>
     </bean>
-    <bean id="vufind.dc.date.issued" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.date.issued"/>
-    </bean>
 
     <bean id="vufindContributorEditor" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
-        <property name="field" ref="vufind.dc.contributor.editor"/>
+        <property name="field" ref="dc.contributor.editor"/>
         <property name="query" value="/dcContributorEditor"/>
     </bean>
-    <bean id="vufind.dc.contributor.editor" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.contributor.editor"/>
-    </bean>
 
     <bean id="vufindTitleAlternative" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
-        <property name="field" ref="vufind.dc.titlealternative"/>
+        <property name="field" ref="dc.title.alternative"/>
         <property name="query" value="/dcTitleAlternative"/>
     </bean>
-    <bean id="vufind.dc.titlealternative" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.title.alternative"/>
-    </bean>
 
     <bean id="vufindAbstract" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
-        <property name="field" ref="vufind.dc.description.abstract"/>
+        <property name="field" ref="dc.description.abstract"/>
         <property name="query" value="/dcDescriptionAbstract"/>
     </bean>
-    <bean id="vufind.dc.description.abstract" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.description.abstract"/>
-    </bean>
 
     <bean id="vufindPublisher" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
-        <property name="field" ref="vufind.dc.publisher"/>
+        <property name="field" ref="dc.publisher"/>
         <property name="query" value="/dcPublisher"/>
     </bean>
-    <bean id="vufind.dc.publisher" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.publisher"/>
-    </bean>
 
 </beans>
diff --git a/dspace/config/spring/api/wos-integration.xml b/dspace/config/spring/api/wos-integration.xml
index 404aeec1ac0f..e65473ae1add 100644
--- a/dspace/config/spring/api/wos-integration.xml
+++ b/dspace/config/spring/api/wos-integration.xml
@@ -39,70 +39,49 @@
     </util:list>
  
     <bean id="wosCitationEditionContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="wos.citationEdition"/>
+        <property name="field" ref="oaire.citation.edition"/>
         <property name="query" value="static_data/summary/EWUID/edition/@value"/>
         <property name="prefixToNamespaceMapping" ref="wosNs"/>
     </bean>
-    <bean id="wos.citationEdition" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="oaire.citation.edition"/>
-    </bean>
 
     <bean id="wosPubyearContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="wos.pubyear"/>
+        <property name="field" ref="dc.date.issued"/>
         <property name="query" value="static_data/summary/pub_info/@pubyear"/>
         <property name="prefixToNamespaceMapping" ref="wosNs"/>
     </bean>
-    <bean id="wos.pubyear" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.date.issued"/>
-    </bean>
 
     <bean id="wosStartPageContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="wos.startPage"/>
+        <property name="field" ref="oaire.citation.startPage"/>
         <property name="query" value="static_data/summary/pub_info/page/@begin"/>
         <property name="prefixToNamespaceMapping" ref="wosNs"/>
     </bean>
-    <bean id="wos.startPage" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="oaire.citation.startPage"/>
-    </bean>
 
     <bean id="wosEndPageContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="wos.endPage"/>
+        <property name="field" ref="oaire.citation.endPage"/>
         <property name="query" value="static_data/summary/pub_info/page/@end"/>
         <property name="prefixToNamespaceMapping" ref="wosNs"/>
     </bean>
-    <bean id="wos.endPage" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="oaire.citation.endPage"/>
-    </bean>
 
     <bean id="wosTypeContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="wos.type"/>
+        <property name="field" ref="dc.type"/>
         <property name="query" value="static_data/summary/pub_info/@pubtype"/>
         <property name="prefixToNamespaceMapping" ref="wosNs"/>
     </bean>
-    <bean id="wos.type" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.type"/>
-    </bean>
 
     <bean id="wosVolumeContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="wos.volume"/>
+        <property name="field" ref="oaire.citation.volume"/>
         <property name="query" value="static_data/summary/pub_info/@vol"/>
         <property name="prefixToNamespaceMapping" ref="wosNs"/>
     </bean>
-    <bean id="wos.volume" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="oaire.citation.volume"/>
-    </bean>
 
     <bean id="wosIssueContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="wos.issue"/>
+        <property name="field" ref="oaire.citation.issue"/>
         <property name="query" value="static_data/summary/pub_info/@issue"/>
         <property name="prefixToNamespaceMapping" ref="wosNs"/>
     </bean>
-    <bean id="wos.issue" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="oaire.citation.issue"/>
-    </bean>
 
     <bean id="wosIdentifierContrib" class="org.dspace.importer.external.metadatamapping.contributor.WosIdentifierContributor">
-        <property name="field" ref="wos.doi"/>
+        <property name="field" ref="dc.identifier"/>
         <property name="query" value="dynamic_data/cluster_related/identifiers/identifier"/>
         <property name="prefixToNamespaceMapping" ref="wosNs"/>
         <property name="identifier2field" ref="identifiers2fields"/>
@@ -110,29 +89,16 @@
 
     <util:map id="identifiers2fields" map-class="java.util.HashMap"
         key-type="java.lang.String" value-type="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <entry key="doi" value-ref="wos.doi" />
-        <entry key="issn" value-ref="wos.issn" />
-        <entry key="eisbn" value-ref="wos.isbn" />
+        <entry key="doi" value-ref="dc.identifier" />
+        <entry key="issn" value-ref="dc.identifier.issn" />
+        <entry key="eisbn" value-ref="dc.identifier.isbn" />
     </util:map>
 
-    <bean id="wos.doi" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.identifier"/>
-    </bean>
-    <bean id="wos.issn" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.identifier.issn"/>
-    </bean>
-    <bean id="wos.isbn" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.identifier.isbn"/>
-    </bean>
-
     <bean id="wosLanguageIsoContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="wos.languageIso"/>
+        <property name="field" ref="dc.language.iso"/>
         <property name="query" value="static_data/fullrecord_metadata/normalized_languages/@count"/>
         <property name="prefixToNamespaceMapping" ref="wosNs"/>
     </bean>
-    <bean id="wos.languageIso" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.language.iso"/>
-    </bean>
 
     <bean id="wosTitleContrib" class="org.dspace.importer.external.metadatamapping.contributor.WosAttribute2ValueContributor">
         <property name="query" value="static_data/summary/titles/title"/>
@@ -143,50 +109,27 @@
 
     <util:map id="title2fields" map-class="java.util.HashMap"
         key-type="java.lang.String" value-type="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <entry key="item" value-ref="wos.title" />
+        <entry key="item" value-ref="dc.title" />
     </util:map>
 
-    <bean id="wos.title" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.title"/>
-    </bean>
-
     <bean id="wosFullNameContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="wos.fullName"/>
+        <property name="field" ref="dc.contributor.author"/>
         <property name="query" value="static_data/summary/names/name/full_name"/>
         <property name="prefixToNamespaceMapping" ref="wosNs"/>
     </bean>
-    <bean id="wos.fullName" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.contributor.author"/>
-    </bean>
-
-<!--    <bean id="wosFirstNameContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">-->
-<!--        <property name="field" ref="wos.firstName"/>-->
-<!--        <property name="query" value="static_data/summary/names/name/first_name"/>-->
-<!--        <property name="prefixToNamespaceMapping" ref="wosNs"/>-->
-<!--    </bean>-->
-
-<!--    <bean id="wos.firstName" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">-->
-<!--        <constructor-arg value="person.givenName"/>-->
-<!--    </bean>-->
 
     <bean id="wosAbstractContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleConcatContributor">
-        <property name="field" ref="wos.abstract"/>
+        <property name="field" ref="dc.description.abstract"/>
         <property name="query" value="static_data/fullrecord_metadata/abstracts/abstract/abstract_text/p"/>
         <property name="prefixToNamespaceMapping" ref="wosNs"/>
     </bean>
-    <bean id="wos.abstract" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.description.abstract"/>
-    </bean>
 
     <bean id="wosSubjectContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleMultiplePathContributor">
-        <property name="field" ref="wos.subject"/>
+        <property name="field" ref="dc.subject"/>
         <property name="paths" ref="paths"/>
         <property name="query" value=""/>
         <property name="prefixToNamespaceMapping" ref="wosNs"/>
     </bean>
-    <bean id="wos.subject" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.subject"/>
-    </bean>
     <util:list id="paths" value-type="java.lang.String">
         <value>static_data/item/keywords_plus/keyword</value>
         <value>static_data/fullrecord_metadata/keywords/keyword</value>
@@ -195,23 +138,17 @@
     </util:list>
 
     <bean id="wosOrcidContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumAndAttributeContributor">
-        <property name="field" ref="wos.orcid"/>
+        <property name="field" ref="person.identifier.orcid"/>
         <property name="attribute" value="orcid_id"/>
         <property name="query" value="static_data/summary/names/name"/>
         <property name="prefixToNamespaceMapping" ref="wosNs"/>
     </bean>
-    <bean id="wos.orcid" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="person.identifier.orcid"/>
-    </bean>
 
     <bean id="wosPublisherContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="wos.publisher"/>
+        <property name="field" ref="dc.publisher"/>
         <property name="query" value="static_data/summary/publishers/publisher/names/name/display_name"/>
         <property name="prefixToNamespaceMapping" ref="wosNs"/>
     </bean>
-    <bean id="wos.publisher" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.publisher"/>
-    </bean>
 
     <bean id="wosIspartofContrib" class="org.dspace.importer.external.metadatamapping.contributor.WosAttribute2ValueContributor">
         <property name="attribute" value="type"/>
@@ -222,13 +159,9 @@
 
     <util:map id="ispartof2fields" map-class="java.util.HashMap"
         key-type="java.lang.String" value-type="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <entry key="source" value-ref="wos.ispartof" />
+        <entry key="source" value-ref="dc.relation.ispartof" />
     </util:map>
 
-    <bean id="wos.ispartof" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.relation.ispartof"/>
-    </bean>
-
     <bean id="wosIspartofseriesContrib" class="org.dspace.importer.external.metadatamapping.contributor.WosAttribute2ValueContributor">
         <property name="attribute" value="type"/>
         <property name="prefixToNamespaceMapping" ref="wosNs"/>
@@ -238,13 +171,9 @@
 
     <util:map id="ispartofseries2fields" map-class="java.util.HashMap"
         key-type="java.lang.String" value-type="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <entry key="source" value-ref="wos.ispartofseries" />
+        <entry key="source" value-ref="dc.relation.ispartofseries" />
     </util:map>
 
-    <bean id="wos.ispartofseries" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.relation.ispartofseries"/>
-    </bean>
-
     <bean id="wosContributorEditorContrib" class="org.dspace.importer.external.metadatamapping.contributor.WosAttribute2ValueContributor">
         <property name="attribute" value="role"/>
         <property name="firstChild" value="true"/>
@@ -255,33 +184,22 @@
     </bean>
 
     <bean id="wosIdContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="wos.wosId"/>
+        <property name="field" ref="dc.identifier.other"/>
         <property name="query" value="UID"/>
         <property name="prefixToNamespaceMapping" ref="wosNs"/>
     </bean>
-    <bean id="wos.wosId" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.identifier.other"/>
-    </bean>
 
     <util:map id="contributorEditor2fields" map-class="java.util.HashMap"
         key-type="java.lang.String" value-type="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <entry key="book_editor" value-ref="wos.contributorEditor" />
+        <entry key="book_editor" value-ref="dc.contributor.editor" />
     </util:map>
 
-    <bean id="wos.contributorEditor" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="dc.contributor.editor"/>
-    </bean>
-
     <bean id="wosRidContrib" class="org.dspace.importer.external.metadatamapping.contributor.WosIdentifierRidContributor">
-        <property name="field" ref="wos.rid"/>
+        <property name="field" ref="person.identifier.rid"/>
         <property name="query" value="static_data/contributors/contributor"/>
         <property name="prefixToNamespaceMapping" ref="wosNs"/>
     </bean>
 
-    <bean id="wos.rid" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
-        <constructor-arg value="person.identifier.rid"/>
-    </bean>
-
     <util:map id="wosNs" map-class="java.util.HashMap"
         key-type="java.lang.String" value-type="java.lang.String">
     </util:map>