diff --git a/app/src/app/content-plugin/components/info-drawer/comments-tab/comments-tab.component.spec.ts b/app/src/app/content-plugin/components/info-drawer/comments-tab/comments-tab.component.spec.ts
index 9cb1f7d8b..0a488dc5a 100644
--- a/app/src/app/content-plugin/components/info-drawer/comments-tab/comments-tab.component.spec.ts
+++ b/app/src/app/content-plugin/components/info-drawer/comments-tab/comments-tab.component.spec.ts
@@ -28,7 +28,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { AppTestingModule } from '../../../testing/app-testing.module';
 import { NodePermissionService } from '@alfresco/aca-shared';
 import { Node } from '@alfresco/js-api';
-import { CommentsModule } from '@alfresco/adf-core';
+import { NodeCommentsModule } from '@alfresco/adf-content-services';
 
 describe('CommentsTabComponent', () => {
   let component: CommentsTabComponent;
@@ -38,7 +38,7 @@ describe('CommentsTabComponent', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [AppTestingModule, CommentsModule],
+      imports: [AppTestingModule, NodeCommentsModule],
       declarations: [CommentsTabComponent]
     });
 
diff --git a/app/src/app/content-plugin/components/info-drawer/comments-tab/comments-tab.component.ts b/app/src/app/content-plugin/components/info-drawer/comments-tab/comments-tab.component.ts
index bf74bccdf..0b08455b0 100644
--- a/app/src/app/content-plugin/components/info-drawer/comments-tab/comments-tab.component.ts
+++ b/app/src/app/content-plugin/components/info-drawer/comments-tab/comments-tab.component.ts
@@ -29,7 +29,7 @@ import { NodePermissionService, isLocked } from '@alfresco/aca-shared';
 
 @Component({
   selector: 'app-comments-tab',
-  template: `<mat-card><adf-comments [readOnly]="!canUpdateNode" [nodeId]="node?.id"></adf-comments></mat-card>`
+  template: `<mat-card><adf-node-comments [readOnly]="!canUpdateNode" [nodeId]="node?.id"></adf-node-comments></mat-card>`
 })
 export class CommentsTabComponent {
   @Input()