diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.html
index 93d3954f2f..4cb34a140b 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.html
@@ -11,9 +11,9 @@
       <ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
         <h4 class="card-title" [innerHTML]="dso.firstMetadataValue('dc.title')"></h4>
       </ds-truncatable-part>
-      <p *ngIf="dso.hasMetadata('journalissue.issuedate')" class="item-date card-text text-muted">
+      <p *ngIf="dso.hasMetadata('creativework.datePublished')" class="item-date card-text text-muted">
         <ds-truncatable-part [id]="dso.id" [minLines]="1">
-          <span [innerHTML]="firstMetadataValue('journalissue.issuedate')"></span>
+          <span [innerHTML]="firstMetadataValue('creativework.datePublished')"></span>
         </ds-truncatable-part>
       </p>
       <p *ngIf="dso.hasMetadata('journal.title')" class="item-journal-title card-text">
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.spec.ts
index 3af407d0f8..68a05b66c3 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.spec.ts
@@ -15,7 +15,7 @@ mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
         value: 'This is just another title'
       }
     ],
-    'journalissue.issuedate': [
+    'creativework.datePublished': [
       {
         language: null,
         value: '2015-06-26'
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.html
index f5487a34cf..d7c9b68a24 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.html
@@ -11,14 +11,14 @@
       <ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
         <h4 class="card-title" [innerHTML]="dso.firstMetadataValue('dc.title')"></h4>
       </ds-truncatable-part>
-      <p *ngIf="dso.hasMetadata('journalvolume.issuedate')" class="item-date card-text text-muted">
+      <p *ngIf="dso.hasMetadata('creativework.datePublished')" class="item-date card-text text-muted">
         <ds-truncatable-part [id]="dso.id" [minLines]="1">
-          <span [innerHTML]="firstMetadataValue('journalvolume.issuedate')"></span>
+          <span [innerHTML]="firstMetadataValue('creativework.datePublished')"></span>
         </ds-truncatable-part>
       </p>
-      <p *ngIf="dso.hasMetadata('journalvolume.identifier.description')" class="item-description card-text">
+      <p *ngIf="dso.hasMetadata('dc.description')" class="item-description card-text">
         <ds-truncatable-part [id]="dso.id" [minLines]="3">
-          <span [innerHTML]="firstMetadataValue('journalvolume.identifier.description')"></span>
+          <span [innerHTML]="firstMetadataValue('dc.description')"></span>
         </ds-truncatable-part>
       </p>
       <div class="text-center">
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.spec.ts
index 4751ed4cd8..5a8fca5fc6 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.spec.ts
@@ -15,13 +15,13 @@ mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
         value: 'This is just another title'
       }
     ],
-    'journalvolume.issuedate': [
+    'creativework.datePublished': [
       {
         language: null,
         value: '2015-06-26'
       }
     ],
-    'journalvolume.identifier.description': [
+    'dc.description': [
       {
         language: 'en_US',
         value: 'A description for the journal volume'
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.html b/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.html
index d4354efcf4..467cdd1594 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.html
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.html
@@ -11,17 +11,19 @@
       <ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
         <h4 class="card-title" [innerHTML]="dso.firstMetadataValue('dc.title')"></h4>
       </ds-truncatable-part>
-      <p *ngIf="dso.hasMetadata('journal.contributor.editor')"
+      <p *ngIf="dso.hasMetadata('creativework.editor')"
          class="item-publisher card-text text-muted">
         <ds-truncatable-part [id]="dso.id" [minLines]="1">
-          <span *ngIf="dso.hasMetadata('journal.contributor.editor')" class="item-editor">{{dso.firstMetadataValue('journal.contributor.editor')}}</span>
-          <span>, </span>
-          <span *ngIf="dso.hasMetadata('journal.publisher')" class="item-publisher">{{dso.firstMetadataValue('journal.publisher')}}</span>
+          <span class="item-editor">{{dso.firstMetadataValue('creativework.editor')}}</span>
+          <span *ngIf="dso.hasMetadata('creativework.publisher')" class="item-publisher">
+            <span>, </span>
+            {{dso.firstMetadataValue('creativework.publisher')}}
+          </span>
         </ds-truncatable-part>
       </p>
-      <p *ngIf="dso.hasMetadata('journal.identifier.description')" class="item-description card-text">
+      <p *ngIf="dso.hasMetadata('dc.description')" class="item-description card-text">
         <ds-truncatable-part [id]="dso.id" [minLines]="3">
-          <span [innerHTML]="firstMetadataValue('journal.identifier.description')"></span>
+          <span [innerHTML]="firstMetadataValue('dc.description')"></span>
         </ds-truncatable-part>
       </p>
       <div class="text-center">
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.spec.ts
index d9934e2d2f..8c12c1a266 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.spec.ts
@@ -15,19 +15,19 @@ mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
         value: 'This is just another title'
       }
     ],
-    'journal.contributor.editor': [
+    'creativework.editor': [
       {
         language: 'en_US',
         value: 'Smith, Donald'
       }
     ],
-    'journal.publisher': [
+    'creativework.publisher': [
       {
         language: 'en_US',
         value: 'A company'
       }
     ],
-    'journal.identifier.description': [
+    'dc.description': [
       {
         language: 'en_US',
         value: 'This is the description'
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/orgunit/orgunit-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/orgunit/orgunit-grid-element.component.html
index 92fffd0166..104d3a0a57 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/orgunit/orgunit-grid-element.component.html
+++ b/src/app/entity-groups/research-entities/item-grid-elements/orgunit/orgunit-grid-element.component.html
@@ -9,19 +9,21 @@
     <div class="card-body">
       <ds-item-type-badge [object]="object"></ds-item-type-badge>
       <ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
-        <h4 class="card-title" [innerHTML]="dso.firstMetadataValue('dc.title')"></h4>
+        <h4 class="card-title" [innerHTML]="dso.firstMetadataValue('organization.legalName')"></h4>
       </ds-truncatable-part>
-      <p *ngIf="dso.hasMetadata('orgunit.identifier.dateestablished')" class="item-date card-text text-muted">
+      <p *ngIf="dso.hasMetadata('organization.foundingDate')" class="item-date card-text text-muted">
         <ds-truncatable-part [id]="dso.id" [minLines]="1">
-          <span [innerHTML]="firstMetadataValue('orgunit.identifier.dateestablished')"></span>
+          <span [innerHTML]="firstMetadataValue('organization.foundingDate')"></span>
         </ds-truncatable-part>
       </p>
-      <p *ngIf="dso.hasMetadata('orgunit.identifier.country')"
+      <p *ngIf="dso.hasMetadata('organization.address.addressCountry')"
          class="item-location card-text">
         <ds-truncatable-part [id]="dso.id" [minLines]="3">
-          <span *ngIf="dso.hasMetadata('orgunit.identifier.country')" class="item-country">{{dso.firstMetadataValue('orgunit.identifier.country')}}</span>
-          <span>, </span>
-          <span *ngIf="dso.hasMetadata('orgunit.identifier.city')" class="item-city">{{dso.firstMetadataValue('orgunit.identifier.city')}}</span>
+          <span class="item-country">{{dso.firstMetadataValue('organization.address.addressCountry')}}</span>
+          <span *ngIf="dso.hasMetadata('organization.address.addressLocality')" class="item-city">
+            <span>, </span>
+            {{dso.firstMetadataValue('organization.address.addressLocality')}}
+          </span>
         </ds-truncatable-part>
       </p>
       <div class="text-center">
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/orgunit/orgunit-grid-element.component.spec.ts b/src/app/entity-groups/research-entities/item-grid-elements/orgunit/orgunit-grid-element.component.spec.ts
index 25249fd2b0..39ddea4c7b 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/orgunit/orgunit-grid-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-grid-elements/orgunit/orgunit-grid-element.component.spec.ts
@@ -15,19 +15,19 @@ mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
         value: 'This is just another title'
       }
     ],
-    'orgunit.identifier.dateestablished': [
+    'organization.foundingDate': [
       {
         language: null,
         value: '2015-06-26'
       }
     ],
-    'orgunit.identifier.country': [
+    'organization.address.addressCountry': [
       {
         language: 'en_US',
         value: 'Belgium'
       }
     ],
-    'orgunit.identifier.city': [
+    'organization.address.addressLocality': [
       {
         language: 'en_US',
         value: 'Brussels'
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.html
index 92d1ed40a8..86353377fa 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.html
+++ b/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.html
@@ -16,9 +16,9 @@
           <span [innerHTML]="firstMetadataValue('person.email')"></span>
         </ds-truncatable-part>
       </p>
-      <p *ngIf="dso.hasMetadata('person.jobtitle')" class="item-jobtitle card-text">
+      <p *ngIf="dso.hasMetadata('person.jobTitle')" class="item-jobtitle card-text">
         <ds-truncatable-part [id]="dso.id" [minLines]="3">
-          <span [innerHTML]="firstMetadataValue('person.jobtitle')"></span>
+          <span [innerHTML]="firstMetadataValue('person.jobTitle')"></span>
         </ds-truncatable-part>
       </p>
       <div class="text-center">
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.spec.ts b/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.spec.ts
index b3343a0605..a0f8e4c29e 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.spec.ts
@@ -15,13 +15,13 @@ mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
         value: 'This is just another title'
       }
     ],
-    'person.identifier.email': [
+    'person.email': [
       {
         language: 'en_US',
         value: 'Smith-Donald@gmail.com'
       }
     ],
-    'person.identifier.jobtitle': [
+    'person.jobTitle': [
       {
         language: 'en_US',
         value: 'Web Developer'
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.html b/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.html
index 1fe4d18dae..a595791cc4 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.html
+++ b/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.html
@@ -11,9 +11,9 @@
       <ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
         <h4 class="card-title" [innerHTML]="dso.firstMetadataValue('dc.title')"></h4>
       </ds-truncatable-part>
-      <p *ngIf="dso.hasMetadata('project.identifier.funder')" class="item-funder card-text text-muted">
+      <p *ngIf="dso.hasMetadata('dc.description')" class="item-description card-text text-muted">
         <ds-truncatable-part [id]="dso.id" [minLines]="3">
-          <span [innerHTML]="firstMetadataValue('project.identifier.funder')"></span>
+          <span [innerHTML]="firstMetadataValue('dc.description')"></span>
         </ds-truncatable-part>
       </p>
       <div class="text-center">
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.spec.ts b/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.spec.ts
index bcf19ed96a..9ad26935b7 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.spec.ts
@@ -15,10 +15,10 @@ mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
         value: 'This is just another title'
       }
     ],
-    'project.identifier.funder': [
+    'dc.description': [
       {
         language: 'en_US',
-        value: 'The project funder'
+        value: 'The project description'
       }
     ]
   }
@@ -38,4 +38,4 @@ mockItemWithoutMetadata.indexableObject = Object.assign(new Item(), {
   }
 });
 
-describe('ProjectGridElementComponent', getEntityGridElementTestComponent(ProjectGridElementComponent, mockItemWithMetadata, mockItemWithoutMetadata, ['funder']));
+describe('ProjectGridElementComponent', getEntityGridElementTestComponent(ProjectGridElementComponent, mockItemWithMetadata, mockItemWithoutMetadata, ['description']));