diff --git a/packages/fhir-healthcare-service/src/components/HealthCareAddEdit/index.tsx b/packages/fhir-healthcare-service/src/components/HealthCareAddEdit/index.tsx
index 427a8ede4..b6110090f 100644
--- a/packages/fhir-healthcare-service/src/components/HealthCareAddEdit/index.tsx
+++ b/packages/fhir-healthcare-service/src/components/HealthCareAddEdit/index.tsx
@@ -63,8 +63,8 @@ export const HealthCareAddEdit = (props: HealthCareAddEditProps) => {
   const initialValues = getHealthCareFormFields(healthCareService.data);
 
   const pageTitle = healthCareService.data
-    ? t('Edit team | {{name}}', { name: healthCareService.data.name ?? '' })
-    : t('Create team');
+    ? t('Edit organization | {{name}}', { name: healthCareService.data.name ?? '' })
+    : t('Create organization');
   const headerProps = {
     pageHeaderProps: {
       title: pageTitle,
diff --git a/packages/fhir-team-management/src/components/AddEditOrganization/Form.tsx b/packages/fhir-team-management/src/components/AddEditOrganization/Form.tsx
index 5d5518a60..b6027bc3f 100644
--- a/packages/fhir-team-management/src/components/AddEditOrganization/Form.tsx
+++ b/packages/fhir-team-management/src/components/AddEditOrganization/Form.tsx
@@ -153,11 +153,11 @@ const OrganizationForm = (props: OrganizationFormProps) => {
       </FormItem>
 
       <FormItem name={name} rules={validationRules.name} id="name" label={t('Name')}>
-        <Input placeholder={t('Enter team name')} />
+        <Input placeholder={t('Enter organization name')} />
       </FormItem>
 
       <FormItem name={alias} rules={validationRules.alias} id="alias" label={t('Alias')}>
-        <Input placeholder={t('Enter team alias')} />
+        <Input placeholder={t('Enter organization alias')} />
       </FormItem>
 
       <FormItem id="status" name={active} label="Status" rules={validationRules.status}>
diff --git a/packages/fhir-team-management/src/components/AddEditOrganization/index.tsx b/packages/fhir-team-management/src/components/AddEditOrganization/index.tsx
index 9be0c1200..0650d298d 100644
--- a/packages/fhir-team-management/src/components/AddEditOrganization/index.tsx
+++ b/packages/fhir-team-management/src/components/AddEditOrganization/index.tsx
@@ -97,8 +97,8 @@ export const AddEditOrganization = (props: AddEditOrganizationProps) => {
   const initialValues = getOrgFormFields(organization.data, assignedPractitionerRoles);
 
   const pageTitle = organization.data
-    ? t('Edit team | {{teamName}}', { teamName: organization.data.name ?? '' })
-    : t('Create team');
+    ? t('Edit organization | {{teamName}}', { teamName: organization.data.name ?? '' })
+    : t('Create organization');
   const headerProps = {
     pageHeaderProps: {
       title: pageTitle,
diff --git a/packages/fhir-team-management/src/components/AddEditOrganization/tests/__snapshots__/Form.test.tsx.snap b/packages/fhir-team-management/src/components/AddEditOrganization/tests/__snapshots__/Form.test.tsx.snap
index 5dd5da7d0..fd05d03a2 100644
--- a/packages/fhir-team-management/src/components/AddEditOrganization/tests/__snapshots__/Form.test.tsx.snap
+++ b/packages/fhir-team-management/src/components/AddEditOrganization/tests/__snapshots__/Form.test.tsx.snap
@@ -11,7 +11,7 @@ exports[`OrganizationForm renders correctly: alias field 1`] = `
   onChange={[Function]}
   onFocus={[Function]}
   onKeyDown={[Function]}
-  placeholder="Enter team alias"
+  placeholder="Enter organization alias"
   style={Object {}}
   type="text"
   value=""
@@ -135,7 +135,7 @@ exports[`OrganizationForm renders correctly: name field 1`] = `
   onChange={[Function]}
   onFocus={[Function]}
   onKeyDown={[Function]}
-  placeholder="Enter team name"
+  placeholder="Enter organization name"
   style={Object {}}
   type="text"
   value=""
diff --git a/packages/fhir-team-management/src/components/AddEditOrganization/tests/__snapshots__/index.test.tsx.snap b/packages/fhir-team-management/src/components/AddEditOrganization/tests/__snapshots__/index.test.tsx.snap
index fd03220f9..cec85bc00 100644
--- a/packages/fhir-team-management/src/components/AddEditOrganization/tests/__snapshots__/index.test.tsx.snap
+++ b/packages/fhir-team-management/src/components/AddEditOrganization/tests/__snapshots__/index.test.tsx.snap
@@ -4,7 +4,7 @@ exports[`renders correctly for edit locations: alias field 1`] = `
 <input
   class="ant-input css-dev-only-do-not-override-k7429z"
   id="alias"
-  placeholder="Enter team alias"
+  placeholder="Enter organization alias"
   type="text"
   value=""
 />
@@ -15,7 +15,7 @@ exports[`renders correctly for edit locations: name field 1`] = `
   aria-required="true"
   class="ant-input css-dev-only-do-not-override-k7429z"
   id="name"
-  placeholder="Enter team name"
+  placeholder="Enter organization name"
   type="text"
   value="OpenSRP web Test Organisation"
 />
@@ -25,7 +25,7 @@ exports[`renders correctly for new organizations: alias field 1`] = `
 <input
   class="ant-input css-dev-only-do-not-override-k7429z"
   id="alias"
-  placeholder="Enter team alias"
+  placeholder="Enter organization alias"
   type="text"
   value=""
 />
@@ -36,7 +36,7 @@ exports[`renders correctly for new organizations: name field 1`] = `
   aria-required="true"
   class="ant-input css-dev-only-do-not-override-k7429z"
   id="name"
-  placeholder="Enter team name"
+  placeholder="Enter organization name"
   type="text"
   value=""
 />
diff --git a/packages/fhir-team-management/src/components/AddEditOrganization/tests/index.test.tsx b/packages/fhir-team-management/src/components/AddEditOrganization/tests/index.test.tsx
index c74859872..e4edf4015 100644
--- a/packages/fhir-team-management/src/components/AddEditOrganization/tests/index.test.tsx
+++ b/packages/fhir-team-management/src/components/AddEditOrganization/tests/index.test.tsx
@@ -128,7 +128,9 @@ test('renders correctly for edit locations', async () => {
   expect(nock.pendingMocks()).toEqual([]);
 
   await waitFor(() => {
-    expect(screen.getByText('Edit team | OpenSRP web Test Organisation')).toBeInTheDocument();
+    expect(
+      screen.getByText('Edit organization | OpenSRP web Test Organisation')
+    ).toBeInTheDocument();
   });
 
   // some small but incoclusive proof that the form rendered and has some initial values
diff --git a/packages/fhir-team-management/src/components/OrganizationAffiliation/Form.tsx b/packages/fhir-team-management/src/components/OrganizationAffiliation/Form.tsx
index f1acb73c1..2d8fff019 100644
--- a/packages/fhir-team-management/src/components/OrganizationAffiliation/Form.tsx
+++ b/packages/fhir-team-management/src/components/OrganizationAffiliation/Form.tsx
@@ -65,7 +65,7 @@ export const AffiliationModal = (props: AffiliationModalProps) => {
     {
       onError: (err: Error) => sendErrorNotification(err.message),
       onSuccess: () => {
-        sendSuccessNotification(t('Team assignments updated successfully'));
+        sendSuccessNotification(t('Organization assignments updated successfully'));
         handleCancel();
         queryClient.refetchQueries([organizationAffiliationResourceType]).catch(() => {
           sendInfoNotification(
@@ -92,7 +92,7 @@ export const AffiliationModal = (props: AffiliationModalProps) => {
   return (
     <Modal
       destroyOnClose={true}
-      title={t(`Assign/Unassign Teams | {{locationName}}`, { locationName })}
+      title={t(`Assign/Unassign Organizations | {{locationName}}`, { locationName })}
       open={visible}
       okText="Save"
       onCancel={handleCancel}
@@ -126,7 +126,7 @@ export const AffiliationModal = (props: AffiliationModalProps) => {
         mode="multiple"
         allowClear
         showSearch
-        placeholder={t('Select teams')}
+        placeholder={t('Select organizations')}
         options={orgSelectOptions}
         defaultValue={defaultOrgsValues as unknown as string[]}
         filterOption={orgsFilterFunction}
diff --git a/packages/fhir-team-management/src/components/OrganizationAffiliation/Table.tsx b/packages/fhir-team-management/src/components/OrganizationAffiliation/Table.tsx
index f2f0f1f49..f7e1edaf9 100644
--- a/packages/fhir-team-management/src/components/OrganizationAffiliation/Table.tsx
+++ b/packages/fhir-team-management/src/components/OrganizationAffiliation/Table.tsx
@@ -94,7 +94,9 @@ const AffiliationTable: React.FC<Props> = (props: Props) => {
 
   if ((affiliationsError && !affiliationsData) || (orgsError && !orgsData)) {
     return (
-      <BrokenPage errorMessage={t('Unable to load teams or teams assignments at the moment')} />
+      <BrokenPage
+        errorMessage={t('Unable to load organizations or their assignments at the moment')}
+      />
     );
   }
 
@@ -107,7 +109,7 @@ const AffiliationTable: React.FC<Props> = (props: Props) => {
       dataIndex: 'name',
     },
     {
-      title: t('Assigned teams'),
+      title: t('Assigned organizations'),
       render: (_, record) => {
         const { id } = record;
         // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
diff --git a/packages/fhir-team-management/src/components/OrganizationAffiliation/index.tsx b/packages/fhir-team-management/src/components/OrganizationAffiliation/index.tsx
index 7f11878d8..1ab53eda7 100644
--- a/packages/fhir-team-management/src/components/OrganizationAffiliation/index.tsx
+++ b/packages/fhir-team-management/src/components/OrganizationAffiliation/index.tsx
@@ -62,7 +62,7 @@ export const AffiliationList: React.FC<LocationUnitListProps> = (props: Location
     tableNodes = [selectedNode, ...sortedNodes];
   }
 
-  const pageTitle = t('Team Assignment');
+  const pageTitle = t('Assign Organizations to Locations');
   const headerProps = {
     pageHeaderProps: {
       title: pageTitle,
diff --git a/packages/fhir-team-management/src/components/OrganizationAffiliation/tests/index.test.tsx b/packages/fhir-team-management/src/components/OrganizationAffiliation/tests/index.test.tsx
index 02e952aa4..96233a63b 100644
--- a/packages/fhir-team-management/src/components/OrganizationAffiliation/tests/index.test.tsx
+++ b/packages/fhir-team-management/src/components/OrganizationAffiliation/tests/index.test.tsx
@@ -243,7 +243,7 @@ test('Edits organization affiliation correctly', async () => {
   fireEvent.click(submitBtn);
 
   await waitFor(() => {
-    expect(successMock).toHaveBeenCalledWith('Team assignments updated successfully');
+    expect(successMock).toHaveBeenCalledWith('Organization assignments updated successfully');
     expect(screen.queryByText(/Assign\/Unassign Teams/i)).not.toBeInTheDocument();
   });
 
@@ -272,7 +272,7 @@ test('Edits organization affiliation correctly', async () => {
   expect(nock.isDone()).toBeTruthy();
 
   await waitFor(() => {
-    expect(successMock).toHaveBeenCalledWith('Team assignments updated successfully');
+    expect(successMock).toHaveBeenCalledWith('Organization assignments updated successfully');
   });
 
   unmount();
diff --git a/packages/fhir-team-management/src/components/OrganizationList/ListView/index.tsx b/packages/fhir-team-management/src/components/OrganizationList/ListView/index.tsx
index 0921a1fdb..06e7ae865 100644
--- a/packages/fhir-team-management/src/components/OrganizationList/ListView/index.tsx
+++ b/packages/fhir-team-management/src/components/OrganizationList/ListView/index.tsx
@@ -76,7 +76,7 @@ export const OrganizationList = (props: OrganizationListProps) => {
 
   const columns = [
     {
-      title: t('Team name'),
+      title: t('Organization name'),
       dataIndex: 'name' as const,
       key: 'name' as const,
     },
diff --git a/packages/fhir-team-management/src/components/OrganizationList/ListView/tests/__snapshots__/index.test.tsx.snap b/packages/fhir-team-management/src/components/OrganizationList/ListView/tests/__snapshots__/index.test.tsx.snap
index ae4eb5df9..0acacabec 100644
--- a/packages/fhir-team-management/src/components/OrganizationList/ListView/tests/__snapshots__/index.test.tsx.snap
+++ b/packages/fhir-team-management/src/components/OrganizationList/ListView/tests/__snapshots__/index.test.tsx.snap
@@ -76,7 +76,7 @@ exports[`renders correctly when listing organizations: single key value pairs de
   class="singleKeyValue-pair__default"
 >
   <dt>
-    Team id
+    Organization id
   </dt>
   <dd>
     205
@@ -89,7 +89,7 @@ exports[`renders correctly when listing organizations: single key value pairs de
   class="singleKeyValue-pair__default"
 >
   <dt>
-    Team identifier
+    Organization identifier
   </dt>
   <dd>
     205
@@ -102,7 +102,7 @@ exports[`renders correctly when listing organizations: single key value pairs de
   class="singleKeyValue-pair__default"
 >
   <dt>
-    Team status
+    Organization status
   </dt>
   <dd>
     Active
@@ -115,7 +115,7 @@ exports[`renders correctly when listing organizations: single key value pairs de
   class="singleKeyValue-pair__default"
 >
   <dt>
-    Team practitioners
+    Organization practitioners
   </dt>
   <dd>
     <ul
diff --git a/packages/fhir-team-management/src/components/OrganizationList/ViewDetails/index.tsx b/packages/fhir-team-management/src/components/OrganizationList/ViewDetails/index.tsx
index 6d9ffe37d..773723b9d 100644
--- a/packages/fhir-team-management/src/components/OrganizationList/ViewDetails/index.tsx
+++ b/packages/fhir-team-management/src/components/OrganizationList/ViewDetails/index.tsx
@@ -129,7 +129,7 @@ export const ViewDetails = (props: ViewDetailsProps) => {
   const assignedLocations = FindAssignedLocations(affiliationsData ?? [], id);
 
   const practitionerKeyValues = {
-    [t('Team practitioners')]: (
+    [t('Organization practitioners')]: (
       <ul id="practitioner-teams">
         {(assignedPractitioners ?? []).map((practitioner) => {
           const officialNames = getObjLike(practitioner.name, 'use', IdentifierUseCodes.OFFICIAL);
@@ -151,9 +151,9 @@ export const ViewDetails = (props: ViewDetailsProps) => {
   };
 
   const organizationKeyValues = {
-    [t('Team id')]: id,
-    [t('Team identifier')]: identifier,
-    [t('Team status')]: active ? t('Active') : t('Disabled'),
+    [t('Organization id')]: id,
+    [t('Organization identifier')]: identifier,
+    [t('Organization status')]: active ? t('Active') : t('Disabled'),
   };
 
   return (
diff --git a/packages/i18n/locales/core/app/en.json b/packages/i18n/locales/core/app/en.json
index 3d9fb5422..ff4da145f 100644
--- a/packages/i18n/locales/core/app/en.json
+++ b/packages/i18n/locales/core/app/en.json
@@ -1,40 +1,26 @@
 {
   "404!": "",
-  "Active": "",
-  "Add inventory via CSV": "",
   "Administration": "",
-  "An error occurred": "",
-  "Card Support": "",
+  "All Locations": "",
   "Care Teams Management": "",
-  "Complete": "",
-  "District report": "",
-  "Download Client Data": "",
-  "Draft": "",
-  "Draft Files": "",
-  "Form Configuration": "",
-  "Group management": "",
+  "Commodity Management": "",
+  "Data Imports": "",
+  "Group Management": "",
   "Healthcare Services": "",
-  "Inventory": "",
-  "JSON Validators": "",
-  "Location Management": "",
-  "Location Unit Group": "",
   "Hierarchy": "",
+  "Location Management": "",
   "Login": "",
   "Logout": "",
   "Manage account": "",
-  "Manifest Releases": "",
+  "Missing the required permissions to view data on this page": "",
   "OpenSRP Web": "",
+  "Organization Assignment": "",
+  "Organization Management": "",
+  "Organizations": "",
   "Patients": "",
-  "Plans": "",
-  "Product Catalogue": "",
-  "Questionnaire": "",
-  "Reports": "",
-  "Retired": "",
-  "Server Settings": "",
-  "Service point inventory": "",
-  "Team Assignment": "",
-  "Team Management": "",
-  "Teams": "",
+  "Questionnaire Management": "",
+  "Service Points Inventory": "",
+  "There was a problem logging out. Please try again.": "",
   "User Groups": "",
   "User Management": "",
   "User Roles": "",
diff --git a/packages/i18n/locales/core/fhir-care-team/en.json b/packages/i18n/locales/core/fhir-care-team/en.json
index 63bbf93dd..5484ea6d8 100644
--- a/packages/i18n/locales/core/fhir-care-team/en.json
+++ b/packages/i18n/locales/core/fhir-care-team/en.json
@@ -1,28 +1,40 @@
 {
   "Actions": "",
   "Active": "",
-  "An error occurred": "",
   "Are you sure you want to delete this Care Team?": "",
   "Cancel": "",
+  "Care Team not found": "",
+  "CareTeam ID": "",
   "Create Care Team": "",
   "Delete": "",
   "Edit": "",
   "Edit Care Team | {{name}}": "",
+  "Fetching Care team": "",
   "FHIR Care Team": "",
+  "ID": "",
   "Identifier": "",
   "Inactive": "",
+  "Managing organizations": "",
   "Name": "",
   "Name is Required": "",
   "No": "",
-  "Participant": "",
+  "No managing organizations found": "",
+  "Participants": "",
+  "Practitioner Participant": "",
   "Save": "",
   "Saving": "",
+  "Select a managing Organization": "",
+  "Select one or more managing organizations": "",
+  "Select practitioners to assign to this Care Team": "",
+  "status": "",
   "Status": "",
-  "Subject": "",
-  "Successfully Added Care Teams": "",
+  "Successfully added CareTeams": "",
   "Successfully Deleted Care Team": "",
-  "Successfully Updated Care Teams": "",
-  "This is a required field": "",
+  "Successfully updated CareTeams": "",
+  "There was a problem creating the Care Team": "",
+  "There was a problem deleting the Care Team": "",
+  "There was a problem fetching the Care Team": "",
+  "There was a problem updating the Care Team": "",
   "UUID": "",
   "Yes": ""
 }
diff --git a/packages/i18n/locales/core/fhir-client/en.json b/packages/i18n/locales/core/fhir-client/en.json
index 9aa910dcd..21b6d5f1b 100644
--- a/packages/i18n/locales/core/fhir-client/en.json
+++ b/packages/i18n/locales/core/fhir-client/en.json
@@ -1,16 +1,19 @@
 {
   "{{val, datetime}}": "",
+  "Abatement date": "",
   "Achievement status": "",
   "Actions": "",
   "Active": "",
   "Address": "",
   "Administration Date": "",
-  "An error occurred": "",
   "Authored on": "",
-  "Birth Date": "",
+  "Business status": "",
+  "Canonical (PlanDefinition)": "",
+  "Care plan": "",
   "Category": "",
   "City": "",
   "Class": "",
+  "Clinical status": "",
   "Conclusion": "",
   "Condition": "",
   "Context": "",
@@ -18,20 +21,31 @@
   "Created at": "",
   "Date asserted": "",
   "Date authored": "",
+  "Date created": "",
   "Date Created": "",
   "Date issued": "",
+  "Date of birth": "",
   "Date Of Birth": "",
+  "Date recorded": "",
   "Deceased": "",
   "Description": "",
   "Details": "",
   "Document type": "",
+  "Dose quantity": "",
+  "Encounter Duration": "",
+  "Episode of care": "",
   "Event": "",
   "Facility": "",
+  "Fetching Patient details": "",
+  "First name": "",
   "Format": "",
   "Gender": "",
   "Id": "",
   "ID": "",
+  "Immunization": "",
   "Inactive": "",
+  "Intent": "",
+  "Last name": "",
   "Manufacturer": "",
   "Medication": "",
   "MRN": "",
@@ -41,26 +55,41 @@
   "Observation Issue Date": "",
   "Observation value": "",
   "Occurence Date": "",
-  "Patient Details": "",
+  "Onset date": "",
+  "Patient encounter": "",
+  "Patient profile": "",
   "Patients": "",
   "Performed Date": "",
   "Period": "",
   "Phone": "",
   "Practice Setting": "",
   "Preview/Download": "",
+  "Primary source": "",
   "Priority": "",
   "Procedure": "",
+  "protocol applied": "",
+  "reason": "",
   "Reason": "",
+  "Report origin": "",
   "S.no": "",
   "Security label": "",
+  "Service provider": "",
+  "Service type": "",
+  "Service Type": "",
   "Severity": "",
+  "stage": "",
   "State": "",
+  "status": "",
   "Status": "",
+  "Task": "",
   "Title": "",
   "Type": "",
   "UUID": "",
   "Vaccine Admnistered": "",
+  "Vaccine expiry date": "",
+  "Verification status": "",
   "Verification Status": "",
   "View": "",
-  "Work in progress": ""
+  "View details": "",
+  "View full details": ""
 }
diff --git a/packages/i18n/locales/core/fhir-flag/en.json b/packages/i18n/locales/core/fhir-flag/en.json
new file mode 100644
index 000000000..639dc20dc
--- /dev/null
+++ b/packages/i18n/locales/core/fhir-flag/en.json
@@ -0,0 +1,21 @@
+{
+  "(Auto generated)": "",
+  "Active": "",
+  "An error occurred while fetching the inventory": "",
+  "Close App": "",
+  "Error Occurred When Closing Flag": "",
+  "Error occurred while trying to fetch flag data": "",
+  "Error occurred while trying to fetch practitioners data": "",
+  "Flag Closed successfully": "",
+  "How was the flag resolved?": "",
+  "Inactive": "",
+  "Invalid Flag": "",
+  "Missing  location field. This information is required to close the flag form.": "",
+  "Missing Required permissions to perform this action": "",
+  "Product": "",
+  "Save": "",
+  "Saving": "",
+  "Select flag status": "",
+  "Service Point": "",
+  "Status": ""
+}
diff --git a/packages/i18n/locales/core/fhir-group-management/en.json b/packages/i18n/locales/core/fhir-group-management/en.json
index 95023ed71..de3b3777a 100644
--- a/packages/i18n/locales/core/fhir-group-management/en.json
+++ b/packages/i18n/locales/core/fhir-group-management/en.json
@@ -1,16 +1,89 @@
 {
+  "(Auto generated)": "",
   "{{val, datetime}}": "",
-  "{{val,datetime}}": "",
+  "Accountability end date": "",
+  "Accountability end date is required": "",
+  "Accountability period (in months)": "",
   "Actions": "",
   "Active": "",
-  "Create Group": "",
+  "Actual": "",
+  "Add commodity": "",
+  "Add Group": "",
+  "Add Service Point Inventory": "",
+  "Are you sure you want to delete this commodity?": "",
+  "attractiveFilter": "<0>Asset:<1><0>Yes</0><1>No</1><2>Show all</2></1></0>",
+  "Cancel": "",
+  "Commodity Id": "",
+  "Commodity List": "",
+  "Commodity updated successfully": "",
+  "Create commodity": "",
+  "Delete": "",
+  "Deletion of commodity failed": "",
+  "Delivery date": "",
+  "Delivery date is required": "",
+  "Describe how a supply monitor would assess whether the product is in good condition": "",
+  "Describe the product's intended use at the service point": "",
+  "Describe where a supply monitor can locate this product at the service point.": "",
+  "Disabled": "",
+  "Donor": "",
   "Edit": "",
-  "Groups list": "",
+  "Edit commodity | {{name}}": "",
+  "Edit Service Point Inventory": "",
+  "End date": "",
+  "Enter commodity name": "",
+  "Enter the product's material number": "",
+  "Expiry date": "",
+  "Failed to refresh data, please refresh the page": "",
+  "File must be smaller than 5MB!": "",
+  "Groups List": "",
+  "groupStatusFilter": "<0>Status:<1><0>Active</0><1>Inactive</1><2>Show all</2></1></0>",
   "Id": "",
-  "Last updated": "",
+  "Identifier": "",
+  "Inactive": "",
+  "Incorrect/Missing Configuration": "",
+  "Is it an Asset": "",
+  "Is it being used appropriately": "",
+  "Is it in good condition": "",
+  "Is it there": "",
   "Last Updated": "",
+  "List id is either incorrectly configured or missing. Kindly contact support to fix this.": "",
+  "Location inventory created successfully": "",
+  "Location inventory updated successfully": "",
+  "Material number": "",
+  "Material Number": "",
   "Members": "",
+  "Must be a valid date": "",
+  "Must be a valid string": "",
   "Name": "",
+  "No": "",
   "No. of Members": "",
-  "View Details": ""
+  "Photo of the product": "",
+  "PO number": "",
+  "product Id": "",
+  "Product Id": "",
+  "Product is required": "",
+  "Product name": "",
+  "Quantity": "",
+  "Required": "",
+  "save": "",
+  "Save": "",
+  "Saving": "",
+  "Select commodity status": "",
+  "Select commodity type": "",
+  "Select commodity Type": "",
+  "Select donor": "",
+  "Select product": "",
+  "Select the unit of measure": "",
+  "Select UNICEF section": "",
+  "Serial number": "",
+  "Serial number is required": "",
+  "Successfully deleted commodity": "",
+  "type": "",
+  "Type": "",
+  "Unable to refresh data at the moment, please refresh the page": "",
+  "UNICEF section": "",
+  "UNICEF section is required": "",
+  "Unit of measure": "",
+  "View Details": "",
+  "Yes": ""
 }
diff --git a/packages/i18n/locales/core/fhir-healthcare-service/en.json b/packages/i18n/locales/core/fhir-healthcare-service/en.json
index c67a087db..df18d675a 100644
--- a/packages/i18n/locales/core/fhir-healthcare-service/en.json
+++ b/packages/i18n/locales/core/fhir-healthcare-service/en.json
@@ -6,9 +6,9 @@
   "Cancel": "",
   "Comment": "",
   "Create Care Service": "",
-  "Create team": "",
+  "Create organization": "",
   "Edit": "",
-  "Edit team | {{name}}": "",
+  "Edit organization | {{name}}": "",
   "Enter comment": "",
   "Enter extra details": "",
   "Extra details": "",
diff --git a/packages/i18n/locales/core/fhir-import/en.json b/packages/i18n/locales/core/fhir-import/en.json
new file mode 100644
index 000000000..8a64b87c8
--- /dev/null
+++ b/packages/i18n/locales/core/fhir-import/en.json
@@ -0,0 +1,49 @@
+{
+  "A list resource Id is not correctly configured": "",
+  "Actions": "",
+  "An error occurred while fetching the csv templates": "",
+  "Attach assignment file": "",
+  "Attach careTeams file": "",
+  "Attach inventory file": "",
+  "Attach locations file": "",
+  "Attach organizations file": "",
+  "Attach product file": "",
+  "Attach users file": "",
+  "Author": "",
+  "Bulk upload": "",
+  "CareTeams": "",
+  "Check for any data inconsistencies or errors (e.g. missing values, incorrect data types) before uploading": "",
+  "Click the \"Attach\" button to select your prepared data file.": "",
+  "Click the button below to download the bulk upload template file(s).": "",
+  "Data import started successfully": "",
+  "Data imports": "",
+  "Date created": "",
+  "Date Created": "",
+  "Date Ended": "",
+  "Date Started": "",
+  "Download Template": "",
+  "Enter your data into the template file. Ensure all required fields are filled and follow the specified format(e.g. date format)": "",
+  "Failed to refresh data, please refresh the page": "",
+  "File name": "",
+  "Follow these simple instructions to help you prepare, upload, and verify your data smoothly and efficiently": "",
+  "Inventory": "",
+  "Locations": "",
+  "Log Output": "",
+  "Once the file or files are selected, click \"Start Import\" to begin the upload": "",
+  "Organization location assignment": "",
+  "Organizations": "",
+  "Prepare your data file": "",
+  "Products": "",
+  "Resource upload": "",
+  "Start Import": "",
+  "status": "",
+  "Step by step guide for bulk upload": "",
+  "Upload your data file": "",
+  "Uploading": "",
+  "User organization assignment": "",
+  "Users": "",
+  "View": "",
+  "View details | {{workflowId}}": "",
+  "Workflow Id": "",
+  "Workflow type": ""
+}
diff --git a/packages/i18n/locales/core/fhir-keycloak-user-management/en.json b/packages/i18n/locales/core/fhir-keycloak-user-management/en.json
index 27cc4cdba..c1614a242 100644
--- a/packages/i18n/locales/core/fhir-keycloak-user-management/en.json
+++ b/packages/i18n/locales/core/fhir-keycloak-user-management/en.json
@@ -1,30 +1,76 @@
 {
   "Actions": "",
-  "active": "",
+  "Active": "",
   "Add User": "",
+  "An error occurred when fetching the user details.": "",
+  "An error occurred while fetching the user's roles": "",
+  "An error occurred while fetching user groups that the user is assigned to": "",
+  "An error occurred while trying to fetch the practitioner details.": "",
   "Are you sure you want to delete this user?": "",
+  "CareTeams": "",
+  "Category": "",
+  "Client": "",
+  "Could not fetch this user's details.": "",
+  "Could not find the user.": "",
   "Credentials": "",
+  "Date Created": "",
   "Delete": "",
+  "Description": "",
+  "Disabled": "",
   "Edit": "",
   "Email": "",
+  "Enabled": "",
+  "Failed to create group resource": "",
+  "Failed to create practitioner": "",
+  "Failed to create practitionerRole": "",
+  "Failed to refresh data, please refresh the page": "",
   "Failed to update data, please refresh the page to see the most recent changes": "",
+  "Failed to update group resource": "",
   "Failed to update practitioner": "",
-  "Fetching linked care teams": "",
-  "Fetching linked practitioner": "",
+  "Failed to update practitionerRole": "",
+  "False": "",
+  "Fetching user details": "",
+  "FHIR Core App Id": "",
   "First name": "",
-  "inactive": "",
+  "First Name": "",
+  "Group deactivated": "",
+  "Group resource created successfully": "",
+  "Group resource updated successfully": "",
+  "Id": "",
+  "ID": "",
+  "keycloakUserStatusFilter": "<0>Status:<1><0>Enabled</0><1>Disabled</1><2>Show all</2></1></0>",
   "Last name": "",
+  "Last Name": "",
+  "Leave": "",
+  "Name": "",
+  "National ID": "",
   "No": "",
+  "Organizations": "",
+  "Path": "",
+  "Phone Number": "",
   "Practitioner created successfully": "",
   "Practitioner deactivated": "",
-  "Practitioner Id": "",
-  "Practitioner is not assigned to a care team": "",
-  "Practitioner status": "",
+  "Practitioner Role Coding": "",
+  "Practitioner role deactivated": "",
   "Practitioner updated successfully": "",
+  "PractitionerRole created successfully": "",
+  "PractitionerRole updated successfully": "",
+  "Practitioners": "",
+  "Status": "",
+  "True": "",
+  "Type": "",
   "User deleted successfully": "",
-  "User does not have a linked practitioner": "",
+  "User groups": "",
+  "User has been successfully removed from the keycloak group": "",
   "User Management": "",
+  "User roles": "",
+  "User Type": "",
   "Username": "",
+  "Users": "",
+  "Verified": "",
+  "View details": "",
   "View Details": "",
+  "View details | {{userName}}": "",
+  "View full details": "",
   "Yes": ""
 }
diff --git a/packages/i18n/locales/core/fhir-location-management/en.json b/packages/i18n/locales/core/fhir-location-management/en.json
index cd4d1f6ce..6bcff8986 100644
--- a/packages/i18n/locales/core/fhir-location-management/en.json
+++ b/packages/i18n/locales/core/fhir-location-management/en.json
@@ -1,69 +1,88 @@
 {
   "</> JSON": "",
+  "Accountability status:": "",
+  "Acct. end dt.": "",
   "Actions": "",
   "Active": "",
+  "Add Inventory": "",
+  "Add Location": "",
   "Add Location Unit": "",
-  "Add Location Unit Group": "",
+  "Add Service point": "",
+  "Administrative Level": "",
+  "alias": "",
   "Alias": "",
-  "An error occurred": "",
+  "Alias is required": "",
+  "An error occurred while fetching child locations": "",
+  "An error occurred while fetching inventory": "",
   "Building": "",
   "Cancel": "",
-  "Delete": "",
+  "Could not upload the root location at this time, please try again later.": "",
+  "Create root location.": "",
+  "Date Last Updated": "",
+  "Delivery dt.": "",
   "Description": "",
+  "Donor": "",
   "E.g. -16.08306": "",
   "E.g. 49.54933": "",
   "Edit": "",
-  "Edit Location Unit": "",
-  "Edit Location Unit Group": "",
-  "Enter a location group name": "",
+  "Edit > {{name}}": "",
+  "Edit details": "",
   "Enter a location name": "",
-  "External ID": "",
   "External ID can only contain letters, numbers and spaces": "",
   "Geometry": "",
   "Id": "",
   "Inactive": "",
-  "Instance": "",
+  "Inventory": "",
   "Jurisdiction": "",
   "Latitude": "",
-  "Level": "",
-  "Location category": "",
-  "Location category is required": "",
+  "Latitude & Longitude": "",
   "Location Name": "",
   "Location Unit": "",
-  "Location Unit created successfully": "",
-  "Location Unit Group": "",
-  "Location Unit Group can only contain letters, numbers and spaces": "",
-  "Location Unit Group Management": "",
   "Location Unit Management": "",
-  "Location Unit must be an array": "",
-  "Location Unit updated successfully": "",
   "Location was successfully created": "",
   "Location was successfully updated": "",
+  "Locations": "",
+  "locationsOnServer": "<0>There exists {{locationNum}} locations on the server.</0><1> One of these could be the intended but wrongly configured, root location. </1><2> If you are not sure, kindly reach out to the web administrator for help.</2>",
+  "locationStatusFilter": "<0>Status:<1></1></0>",
   "Longitude": "",
+  "LookingForUploadedLocations": "<0></0> Looking for uploaded locations on the server.",
   "Name": "",
   "Name can only contain letters, numbers and spaces": "",
   "Name is required": "",
+  "No data available to display, you can start adding data now": "",
+  "No locations have been uploaded yet.": "",
   "Only decimal values allowed": "",
+  "Parent": "",
   "Parent ID can only contain letters, numbers and spaces": "",
+  "parentLocationFilter": "<0>Parent Location:<1></1></0>",
   "Part Of": "",
+  "Physical type": "",
   "Physical Type": "",
+  "Please choose a parent location for this service point": "",
+  "PO no.": "",
+  "Proceed": "",
+  "Product name": "",
+  "Qty": "",
+  "Refreshing data": "",
+  "Request to update the location hierarchy is taking a bit long to respond.": "",
+  "Root location uploaded to the server.": "",
+  "Root location was not found": "",
+  "Root location with id: {{rootLocationId}} was not found on the server.": "",
   "Save": "",
   "Saving": "",
   "Search": "",
-  "Select status": "",
   "Select the parent location": "",
-  "Select the service point type": "",
-  "Select type": "",
-  "Service types is required": "",
+  "Serial no.": "",
+  "Service points": "",
+  "service type is required": "",
+  "Show all": "",
   "Status": "",
   "Status is required": "",
-  "Sync status": "",
+  "This action will create a new location with id {{rootLocationId}}. The web application will then use the created location as the root location.": "",
   "Type": "",
-  "Type can only contain letters, numbers and spaces": "",
-  "Type is required": "",
-  "Unit group": "",
-  "username": "",
-  "Username": "",
-  "Version": "",
-  "View Details": ""
+  "Unable to check if the server has any locations.": "",
+  "Unable to either load this location or the location hierarchy": "",
+  "Unicef section": "",
+  "View details": "",
+  "View details | {{locName}}": ""
 }
diff --git a/packages/i18n/locales/core/fhir-team-management/en.json b/packages/i18n/locales/core/fhir-team-management/en.json
index be96cd82d..88fa7bedf 100644
--- a/packages/i18n/locales/core/fhir-team-management/en.json
+++ b/packages/i18n/locales/core/fhir-team-management/en.json
@@ -1,37 +1,49 @@
 {
   "Actions": "",
   "active": "",
+  "Active": "",
   "Add Organization": "",
   "Alias": "",
-  "An Error occurred": "",
-  "Assign/Unassign Teams | {{locationName}}": "",
-  "Assigned teams": "",
+  "Assign Organizations to Locations": "",
+  "Assign/Unassign Organizations | {{locationName}}": "",
+  "Assigned locations": "",
+  "Assigned organizations": "",
   "Cancel": "",
-  "Create team": "",
+  "Create organization": "",
+  "Disabled": "",
   "Edit": "",
-  "Edit team | {{teamName}}": "",
-  "Enter team alias": "",
-  "Enter team name": "",
+  "Edit organization | {{teamName}}": "",
+  "Enter organization alias": "",
+  "Enter organization name": "",
   "Failed to refresh assignments, Please Refresh the page to see the changes": "",
   "Failed to refresh data, please refresh the page": "",
+  "Fetching assigned locations": "",
+  "Fetching assigned practitioners": "",
   "Id": "",
   "Identifier": "",
   "Inactive": "",
   "Must be a valid string": "",
   "Name": "",
+  "Organization assignments updated successfully": "",
+  "Organization does not have any assigned locations": "",
+  "Organization does not have any assigned practitioners": "",
+  "Organization id": "",
+  "Organization identifier": "",
   "Organization list": "",
+  "Organization name": "",
+  "Organization practitioners": "",
+  "Organization status": "",
   "Organization updated successfully": "",
   "Practitioner assignments updated successfully": "",
   "Practitioners": "",
   "Required": "",
   "save": "",
   "Saving": "",
-  "Select teams": "",
+  "Select organizations": "",
   "Select user (practitioners only)": "",
-  "Team Assignment": "",
-  "Team assignments updated successfully": "",
-  "Team name": "",
-  "Type": "",
-  "Unable to load teams or teams assignments at the moment": "",
+  "There was a problem fetching assigned practitioners": "",
+  "There was a problem fetching practitioners": "",
+  "There was a problem updating organization": "",
+  "Unable to load organizations or their assignments at the moment": "",
   "View Details": ""
 }
diff --git a/packages/i18n/locales/core/keycloak-user-management/en.json b/packages/i18n/locales/core/keycloak-user-management/en.json
index 97a8f1115..76c94826c 100644
--- a/packages/i18n/locales/core/keycloak-user-management/en.json
+++ b/packages/i18n/locales/core/keycloak-user-management/en.json
@@ -1,17 +1,16 @@
 {
   "Actions": "",
   "Add User": "",
-  "An error occurred": "",
+  "Application ID": "",
+  "Application Id is required": "",
   "Are you sure you want to delete this user?": "",
+  "Assigned Organizations": "",
   "Assigned Roles": "",
-  "Assigned Teams": "",
   "Available Roles": "",
   "Cancel": "",
+  "Composite": "",
   "Confirm Password": "",
   "Confirm Password is required": "",
-  "Contact": "",
-  "Contact is required": "",
-  "Contact should be 10 digits and start with 0": "",
   "Credentials": "",
   "Credentials updated successfully": "",
   "Delete": "",
@@ -19,29 +18,33 @@
   "Edit": "",
   "Edit User | {{username}}": "",
   "Edit User Group | {{name}}": "",
-  "Effective Roles": "",
   "Email": "",
   "Enable user": "",
+  "Failed to load practitioner role": "",
   "Failed to update data, please refresh the page to see the most recent changes": "",
   "First Name": "",
   "First Name is required": "",
-  "Group": "",
   "Group uuid": "",
+  "Keycloak User Group": "",
   "Keycloak UUID": "",
   "Last Name": "",
   "Last Name is required": "",
   "Mark as Practitioner": "",
   "Members": "",
+  "Mobile Phone Number": "",
   "Name": "",
   "Name is required": "",
+  "National Id": "",
+  "National Id number with 16 digits": "",
   "New User Group": "",
   "No": "",
   "No Active Practitioner": "",
   "No assigned members": "",
+  "No Assigned Organizations": "",
   "No assigned roles": "",
-  "No Assigned Teams": "",
   "Password": "",
   "Password is required": "",
+  "Please enter a Phone number with 10 to 16 digits.": "",
   "Please select": "",
   "Practitioner": "",
   "Practitioner created successfully": "",
@@ -58,8 +61,40 @@
   "SAVING": "",
   "Search": "",
   "Set password": "",
+  "Supervisor": "",
   "The list is empty": "",
   "The two passwords that you entered do not match!": "",
+  "There was a problem assigning roles": "",
+  "There was a problem creating group and practitioner": "",
+  "There was a problem creating practitioner": "",
+  "There was a problem creating the user": "",
+  "There was a problem creating User": "",
+  "There was a problem creating User Group": "",
+  "There was a problem deleting User and Practitioner": "",
+  "There was a problem editing User Group": "",
+  "There was a problem fetching assigned organizations": "",
+  "There was a problem fetching effective roles": "",
+  "There was a problem fetching Group Details": "",
+  "There was a problem fetching Group Members": "",
+  "There was a problem fetching organizations that practitioner is assigned to": "",
+  "There was a problem fetching practitioner": "",
+  "There was a problem fetching Practitioner details": "",
+  "There was a problem fetching Practitioner tied to this User": "",
+  "There was a problem fetching practitioners": "",
+  "There was a problem fetching realm roles": "",
+  "There was a problem fetching role mappings": "",
+  "There was a problem fetching roles": "",
+  "There was a problem fetching User": "",
+  "There was a problem fetching User Group": "",
+  "There was a problem fetching user groups": "",
+  "There was a problem fetching User Groups": "",
+  "There was a problem fetching Users": "",
+  "There was a problem removing assigned roles": "",
+  "There was a problem submitting the form": "",
+  "There was a problem updating groups and practitioners": "",
+  "There was a problem updating practitioner": "",
+  "There was a problem updating the user profile": "",
+  "There was a problem updating user details": "",
   "User created successfully": "",
   "User Credentials": "",
   "User deleted successfully": "",
@@ -69,6 +104,7 @@
   "User Groups": "",
   "User Management": "",
   "User roles": "",
+  "User Type": "",
   "Username": "",
   "Username is required": "",
   "View Details": "",
diff --git a/packages/i18n/locales/core/react-utils/en.json b/packages/i18n/locales/core/react-utils/en.json
index 5c3ee8300..f3b1272da 100644
--- a/packages/i18n/locales/core/react-utils/en.json
+++ b/packages/i18n/locales/core/react-utils/en.json
@@ -1,12 +1,22 @@
 {
-  "403": "",
   "404": "",
   "Actions": "",
+  "Class": "",
+  "Date created": "",
   "Error": "",
+  "Fetching next page": "",
   "Go back": "",
   "Go home": "",
+  "ID": "",
+  "Load more options": "",
+  "No data": "",
+  "No data available": "",
   "Search": "",
+  "Showing {{recordsFetchedNum}}; {{remainingRecords}} more records.": "",
   "Something went wrong": "",
   "Sorry, the resource you requested for, does not exist": "",
-  "Sorry, you are not authorized to access this page": ""
+  "Sorry, you are not authorized to access this page": "",
+  "status": "",
+  "Unable to load dropdown options.": "",
+  "View details": ""
 }
diff --git a/packages/keycloak-user-management/src/components/UserDetails/index.tsx b/packages/keycloak-user-management/src/components/UserDetails/index.tsx
index 20a4b601c..65efb0f1f 100644
--- a/packages/keycloak-user-management/src/components/UserDetails/index.tsx
+++ b/packages/keycloak-user-management/src/components/UserDetails/index.tsx
@@ -64,13 +64,13 @@ export const UserDetails = (props: Partial<UserDetailProps>) => {
         </div>
       )}
       <div className="mb-4 small">
-        <p className="mb-0 font-weight-bold">{t('Assigned Teams')}</p>
+        <p className="mb-0 font-weight-bold">{t('Assigned Organizations')}</p>
         {assignedTeams?.length ? (
           assignedTeams.map((team) => (
             <p key={team.identifier} className="mb-0" id="assignedTeam">{`${team.name}`}</p>
           ))
         ) : (
-          <p id="noAssignedTeams">{t('No Assigned Teams')}</p>
+          <p id="noAssignedTeams">{t('No Assigned Organizations')}</p>
         )}
       </div>
     </div>
diff --git a/packages/keycloak-user-management/src/components/UserDetails/tests/index.test.tsx b/packages/keycloak-user-management/src/components/UserDetails/tests/index.test.tsx
index cde967914..fde37347c 100644
--- a/packages/keycloak-user-management/src/components/UserDetails/tests/index.test.tsx
+++ b/packages/keycloak-user-management/src/components/UserDetails/tests/index.test.tsx
@@ -55,7 +55,9 @@ describe('components/TeamsDetail', () => {
   it('shows no team available message when team not available', () => {
     const newProps = { ...props, assignedTeams: [] };
     const wrapper = mount(<UserDetails {...newProps} />);
-    expect(wrapper.find('#noAssignedTeams').text()).toMatchInlineSnapshot(`"No Assigned Teams"`);
+    expect(wrapper.find('#noAssignedTeams').text()).toMatchInlineSnapshot(
+      `"No Assigned Organizations"`
+    );
   });
   it('shows spinner', () => {
     const newProps = { ...props, keycloakUser: undefined };
diff --git a/packages/keycloak-user-management/src/components/UserList/index.tsx b/packages/keycloak-user-management/src/components/UserList/index.tsx
index f4df6d3f9..fa027c83c 100644
--- a/packages/keycloak-user-management/src/components/UserList/index.tsx
+++ b/packages/keycloak-user-management/src/components/UserList/index.tsx
@@ -131,7 +131,9 @@ const UserList = (props: UserListTypes): JSX.Element => {
       const organizations: Organization[] = await serve.read(practitionerId);
       return organizations;
     } catch (error) {
-      sendErrorNotification(t('There was a problem fetching teams assigned to Practitioner'));
+      sendErrorNotification(
+        t('There was a problem fetching organizations that practitioner is assigned to')
+      );
       return [];
     }
   };
@@ -158,7 +160,7 @@ const UserList = (props: UserListTypes): JSX.Element => {
               });
             })
             .catch(() => {
-              sendErrorNotification(t('There was a problem fetching assigned teams'));
+              sendErrorNotification(t('There was a problem fetching assigned organizations'));
             });
         } else {
           setUserDetails({
@@ -169,7 +171,7 @@ const UserList = (props: UserListTypes): JSX.Element => {
         }
       })
       .catch(() => {
-        sendErrorNotification(t('There was a problem fetching practitioner'));
+        sendErrorNotification(t('There was a problem fetching practitioners'));
       });
   };