diff --git a/lib/core/package.json b/lib/core/package.json
index f380be1923..ab27c95535 100644
--- a/lib/core/package.json
+++ b/lib/core/package.json
@@ -25,8 +25,8 @@
     "@angular/platform-browser": ">=5.1.1",
     "@angular/platform-browser-dynamic": ">=5.1.1",
     "@angular/router": ">=5.1.1",
-    "@mat-datetimepicker/core": "1.0.4",
-    "@mat-datetimepicker/moment": "1.0.4",
+    "@mat-datetimepicker/core": "2.0.1",
+    "@mat-datetimepicker/moment": "2.0.1",
     "alfresco-js-api": "2.5.0-beta2",
     "rxjs": ">=6.2.2",
     "@ngx-translate/core": "^10.0.2",
diff --git a/lib/core/viewer/components/viewer.component.ts b/lib/core/viewer/components/viewer.component.ts
index 5b4c06438d..dfac49d00b 100644
--- a/lib/core/viewer/components/viewer.component.ts
+++ b/lib/core/viewer/components/viewer.component.ts
@@ -406,7 +406,7 @@ export class ViewerComponent implements OnChanges, OnInit, OnDestroy {
     }
 
     private getDisplayName(name) {
-        return this.displayName || name;
+        return name || this.displayName ;
     }
 
     scrollTop() {
diff --git a/package.json b/package.json
index 1659f1549d..c147cd453f 100644
--- a/package.json
+++ b/package.json
@@ -72,8 +72,8 @@
     "@angular/platform-browser": "6.1.0",
     "@angular/platform-browser-dynamic": "6.1.0",
     "@angular/router": "6.1.0",
-    "@mat-datetimepicker/core": "1.0.4",
-    "@mat-datetimepicker/moment": "1.0.4",
+    "@mat-datetimepicker/core": "2.0.1",
+    "@mat-datetimepicker/moment": "2.0.1",
     "@ngx-translate/core": "10.0.2",
     "@nrwl/schematics": "^1.0.3",
     "@schematics/angular": "^0.6.8",