diff --git a/packages/esm-tb-app/src/views/patient-summary/tb-patient-summary.component.tsx b/packages/esm-tb-app/src/views/patient-summary/tb-patient-summary.component.tsx
index ebd107dd1..597ed757e 100644
--- a/packages/esm-tb-app/src/views/patient-summary/tb-patient-summary.component.tsx
+++ b/packages/esm-tb-app/src/views/patient-summary/tb-patient-summary.component.tsx
@@ -1,11 +1,8 @@
-import { EmptyStateComingSoon } from '@ohri/openmrs-esm-ohri-commons-lib';
+import { EmptyStateComingSoon, PatientChartProps } from '@ohri/openmrs-esm-ohri-commons-lib';
 import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
-interface OverviewListProps {
-  patientUuid: string;
-}
 
-const TBSummaryOverviewList: React.FC<OverviewListProps> = ({ patientUuid }) => {
+const TBSummaryOverviewList: React.FC<PatientChartProps> = ({ patientUuid }) => {
   const { t } = useTranslation();
 
   const headerRecentTB = t('recentTuberculosis', 'Recent Tuberculosis');
diff --git a/packages/esm-tb-app/src/views/program-management/maternal-health.component.tsx b/packages/esm-tb-app/src/views/program-management/maternal-health.component.tsx
index 87e80afb8..98615bd73 100644
--- a/packages/esm-tb-app/src/views/program-management/maternal-health.component.tsx
+++ b/packages/esm-tb-app/src/views/program-management/maternal-health.component.tsx
@@ -4,12 +4,9 @@ import styles from '../common.scss';
 import { useTranslation } from 'react-i18next';
 import MdrTbList from './tabs/mdr-tb.component';
 import TbPatientTracing from './tabs/tb-patient-tracing.component';
+import { PatientChartProps } from '@ohri/openmrs-esm-ohri-commons-lib';
 
-interface OverviewListProps {
-  patientUuid: string;
-}
-
-const ProgramManagementSummary: React.FC<OverviewListProps> = ({ patientUuid }) => {
+const ProgramManagementSummary: React.FC<PatientChartProps> = ({ patientUuid }) => {
   const { t } = useTranslation();
   return (
     <div className={styles.tabContainer}>
diff --git a/packages/esm-tb-app/src/views/program-management/tabs/mdr-tb.component.tsx b/packages/esm-tb-app/src/views/program-management/tabs/mdr-tb.component.tsx
index 49fb3e736..136343de1 100644
--- a/packages/esm-tb-app/src/views/program-management/tabs/mdr-tb.component.tsx
+++ b/packages/esm-tb-app/src/views/program-management/tabs/mdr-tb.component.tsx
@@ -1,12 +1,8 @@
 import React, { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { EmptyStateComingSoon } from '@ohri/openmrs-esm-ohri-commons-lib';
+import { EmptyStateComingSoon, PatientChartProps } from '@ohri/openmrs-esm-ohri-commons-lib';
 
-interface MdrTbListProps {
-  patientUuid: string;
-}
-
-const MdrTbList: React.FC<MdrTbListProps> = ({ patientUuid }) => {
+const MdrTbList: React.FC<PatientChartProps> = ({ patientUuid }) => {
   const { t } = useTranslation();
   const headerTitle = t('MdrTbEnrolment', 'TB/MDR TB Enrolment');
 
diff --git a/packages/esm-tb-app/src/views/program-management/tabs/tb-patient-tracing.component.tsx b/packages/esm-tb-app/src/views/program-management/tabs/tb-patient-tracing.component.tsx
index 10fb50ee2..62dfe95ea 100644
--- a/packages/esm-tb-app/src/views/program-management/tabs/tb-patient-tracing.component.tsx
+++ b/packages/esm-tb-app/src/views/program-management/tabs/tb-patient-tracing.component.tsx
@@ -1,12 +1,8 @@
 import React, { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { EmptyStateComingSoon } from '@ohri/openmrs-esm-ohri-commons-lib';
+import { EmptyStateComingSoon, PatientChartProps } from '@ohri/openmrs-esm-ohri-commons-lib';
 
-interface TbPatientTracingProps {
-  patientUuid: string;
-}
-
-const TbPatientTracing: React.FC<TbPatientTracingProps> = ({ patientUuid }) => {
+const TbPatientTracing: React.FC<PatientChartProps> = ({ patientUuid }) => {
   const { t } = useTranslation();
   const headerTitle = t('PatientTracing', 'Patient Tracing');
 
diff --git a/packages/esm-tb-app/src/views/tb-contact-listing/tb-contact-list.component.tsx b/packages/esm-tb-app/src/views/tb-contact-listing/tb-contact-list.component.tsx
index 71d00c19b..e607b3d3a 100644
--- a/packages/esm-tb-app/src/views/tb-contact-listing/tb-contact-list.component.tsx
+++ b/packages/esm-tb-app/src/views/tb-contact-listing/tb-contact-list.component.tsx
@@ -1,12 +1,8 @@
 import React, { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { EmptyStateComingSoon } from '@ohri/openmrs-esm-ohri-commons-lib';
+import { EmptyStateComingSoon, PatientChartProps } from '@ohri/openmrs-esm-ohri-commons-lib';
 
-interface TbContactTracingListProps {
-  patientUuid: string;
-}
-
-const TbContactTracingList: React.FC<TbContactTracingListProps> = ({ patientUuid }) => {
+const TbContactTracingList: React.FC<PatientChartProps> = ({ patientUuid }) => {
   const { t } = useTranslation();
   const headerTitle = t('TbContactListing', 'TB Contact Listing');