diff --git a/demo-shell/src/app.config.json b/demo-shell/src/app.config.json
index 43d876f707..93410d0a9b 100644
--- a/demo-shell/src/app.config.json
+++ b/demo-shell/src/app.config.json
@@ -31,7 +31,7 @@
   "application": {
     "storagePrefix": "ADF",
     "name": "Alfresco ADF Application",
-    "copyright": "© 2016 - 2018 Alfresco Software, Inc. All Rights Reserved."
+    "copyright": "© 2016 - 2021 Alfresco Software, Inc. All Rights Reserved."
   },
   "search": {
     "filterWithContains": true,
diff --git a/demo-shell/src/app/components/document-list/extension-presets/name-column/name-column.component.ts b/demo-shell/src/app/components/document-list/extension-presets/name-column/name-column.component.ts
index 11dba7b150..ad6d6f1053 100644
--- a/demo-shell/src/app/components/document-list/extension-presets/name-column/name-column.component.ts
+++ b/demo-shell/src/app/components/document-list/extension-presets/name-column/name-column.component.ts
@@ -44,6 +44,9 @@ export class NameColumnComponent implements OnInit, OnDestroy {
     @Input()
     context: any;
 
+    @Input()
+    key = 'name';
+
     displayText$ = new BehaviorSubject<string>('');
     node: NodeEntry;
 
@@ -73,7 +76,8 @@ export class NameColumnComponent implements OnInit, OnDestroy {
         this.node = this.context.row.node;
 
         if (this.node && this.node.entry) {
-            this.displayText$.next(this.node.entry.name || this.node.entry.id);
+            const displayText = this.context.row.getValue(this.key);
+            this.displayText$.next(displayText || this.node.entry.id);
         }
     }
 
diff --git a/demo-shell/src/app/components/files/files.component.html b/demo-shell/src/app/components/files/files.component.html
index 0950e42f8d..4d7c7dd860 100644
--- a/demo-shell/src/app/components/files/files.component.html
+++ b/demo-shell/src/app/components/files/files.component.html
@@ -266,7 +266,7 @@
                         title="{{'DOCUMENT_LIST.COLUMNS.DISPLAY_NAME' | translate}}"
                         [formatTooltip]="getNodeNameTooltip">
                         <ng-template let-context>
-                            <adf-name-column [context]="context"></adf-name-column>
+                            <adf-name-column key="name" [context]="context"></adf-name-column>
                         </ng-template>
                     </data-column>
                     <data-column
diff --git a/docs/content-services/components/document-list.component.md b/docs/content-services/components/document-list.component.md
index 688dc15236..a3a271ed5c 100644
--- a/docs/content-services/components/document-list.component.md
+++ b/docs/content-services/components/document-list.component.md
@@ -583,7 +583,7 @@ For example:
 ```html
 <data-column key="name" title="Name">
     <ng-template let-context>
-        <adf-name-column [context]="context"></adf-name-column>
+        <adf-name-column key="name" [context]="context"></adf-name-column>
     </ng-template>
 </data-column>
 ```
diff --git a/lib/content-services/src/lib/document-list/components/name-column/name-column.component.spec.ts b/lib/content-services/src/lib/document-list/components/name-column/name-column.component.spec.ts
index ea6f6f3c44..8acb0c5b19 100644
--- a/lib/content-services/src/lib/document-list/components/name-column/name-column.component.spec.ts
+++ b/lib/content-services/src/lib/document-list/components/name-column/name-column.component.spec.ts
@@ -16,9 +16,59 @@
  */
 
 import { NameColumnComponent } from './name-column.component';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { ContentTestingModule } from '../../../testing/content.testing.module';
+import { skip } from 'rxjs/operators';
 
 describe('NameColumnComponent', () => {
-  it('should be defined', () => {
-    expect(NameColumnComponent).toBeDefined();
-  });
+    let fixture: ComponentFixture<NameColumnComponent>;
+    let context: any;
+    let component: NameColumnComponent;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                TranslateModule.forRoot(),
+                ContentTestingModule
+            ]
+        });
+
+        fixture = TestBed.createComponent(NameColumnComponent);
+
+        context = {
+            row: {
+                node: {entry: {}},
+                getValue(key) {
+                    return key;
+                }
+            }
+        };
+
+        component = fixture.componentInstance;
+        component.context = context;
+    });
+
+    it('should set the display value based on default key', (done) => {
+        component.displayText$
+            .pipe(skip(1))
+            .subscribe(value => {
+                expect(value).toBe('name');
+                done();
+            });
+
+        component.ngOnInit();
+    });
+
+    it('should set the display value based on the custom key', (done) => {
+        component.key = 'title';
+        component.displayText$
+            .pipe(skip(1))
+            .subscribe(value => {
+                expect(value).toBe('title');
+                done();
+            });
+
+        component.ngOnInit();
+    });
 });
diff --git a/lib/content-services/src/lib/document-list/components/name-column/name-column.component.ts b/lib/content-services/src/lib/document-list/components/name-column/name-column.component.ts
index fc47992374..fcdd8613c5 100644
--- a/lib/content-services/src/lib/document-list/components/name-column/name-column.component.ts
+++ b/lib/content-services/src/lib/document-list/components/name-column/name-column.component.ts
@@ -53,6 +53,9 @@ export class NameColumnComponent implements OnInit, OnDestroy {
     @Input()
     context: any;
 
+    @Input()
+    key = 'name';
+
     displayText$ = new BehaviorSubject<string>('');
     node: NodeEntry;
 
@@ -82,7 +85,8 @@ export class NameColumnComponent implements OnInit, OnDestroy {
         this.node = this.context.row.node;
 
         if (this.node && this.node.entry) {
-            this.displayText$.next(this.node.entry.name || this.node.entry.id);
+            const displayText = this.context.row.getValue(this.key);
+            this.displayText$.next(displayText || this.node.entry.id);
         }
     }