diff --git a/dspace/config/spring/api/virtual-metadata.xml.openaire4 b/dspace/config/spring/api/virtual-metadata.xml.openaire4
index 909468e088..bbdae0e759 100644
--- a/dspace/config/spring/api/virtual-metadata.xml.openaire4
+++ b/dspace/config/spring/api/virtual-metadata.xml.openaire4
@@ -15,7 +15,7 @@
                 <!-- relations based on OpenAIRE guidelines -->
                 <entry key="isContributorOfPublication" value-ref="isAuthorOfPublicationMap"/>
                 <entry key="isProjectOfPublication" value-ref="isProjectOfPublicationMap"/>
-                <entry key="isProjectOfFundingAgency" value-ref="isProjectOfFundingAgencyMap"/>
+                <entry key="isFundingAgencyOfProject" value-ref="isFundingAgencyOfProjectMap"/>
             </map>
         </property>
     </bean>
@@ -214,7 +214,7 @@
     <!-- Config like this will tell our VirtualMetadataPopulator to include the virtual metadata field
      'project.funder.*' on the appropriate item with the values defined in the value-ref.
       This value-ref should be a bean of type VirtualMetadataConfiguration -->
-    <util:map id="isProjectOfFundingAgencyMap">
+    <util:map id="isFundingAgencyOfProjectMap">
         <entry key="project.funder.name" value-ref="projectOrgUnit_orgName"/>
         <entry key="project.funder.identifier" value-ref="projectOrgUnit_orgId"/>
     </util:map> 
@@ -233,4 +233,4 @@
             </util:list>
         </property>
     </bean>
-</beans>
\ No newline at end of file
+</beans>
diff --git a/dspace/config/submission-forms.xml b/dspace/config/submission-forms.xml
index a948ee36e8..878b79ffd6 100644
--- a/dspace/config/submission-forms.xml
+++ b/dspace/config/submission-forms.xml
@@ -1212,7 +1212,7 @@
                     <label>Funding Agency</label>
                     <hint>Add a Funding Agency</hint>
                     <linked-metadata-field>
-                        <dc-schema>oaire</dc-schema>
+                        <dc-schema>project</dc-schema>
                         <dc-element>funder</dc-element>
                         <dc-qualifier>name</dc-qualifier>
                         <input-type>onebox</input-type>