diff --git a/source/frontend/src/components/Table/Table.tsx b/source/frontend/src/components/Table/Table.tsx
index 64b7eced0c..5a93b1dfcb 100644
--- a/source/frontend/src/components/Table/Table.tsx
+++ b/source/frontend/src/components/Table/Table.tsx
@@ -489,7 +489,7 @@ export const Table = <T extends IIdentifiedObject, TFilter extends object = {}>(
         {props.canRowExpand ? <div className="th" style={{ width: '4.7rem' }}></div> : null}
         {filterable && (
           <div className={'th reset-filter svg-btn'}>
-            <TooltipWrapper toolTipId="properties-list-filter-reset-tooltip" toolTip="Reset Filter">
+            <TooltipWrapper tooltipId="properties-list-filter-reset-tooltip" tooltip="Reset Filter">
               <Button
                 onClick={() => {
                   const nextState: any = { ...props.filter };
@@ -568,8 +568,8 @@ export const Table = <T extends IIdentifiedObject, TFilter extends object = {}>(
       return (
         props.detailsPanel && (
           <TooltipWrapper
-            toolTipId="expand-all-rows"
-            toolTip={open ? 'Collapse Row' : 'Expand Row'}
+            tooltipId="expand-all-rows"
+            tooltip={open ? 'Collapse Row' : 'Expand Row'}
           >
             <div className={className + ' svg-btn'} onClick={onClick}>
               {open ? detailsOpenedIcon : detailsClosedIcon}
diff --git a/source/frontend/src/components/common/OverflowTip.tsx b/source/frontend/src/components/common/OverflowTip.tsx
index a0f47a6f63..805b3d4d4d 100644
--- a/source/frontend/src/components/common/OverflowTip.tsx
+++ b/source/frontend/src/components/common/OverflowTip.tsx
@@ -32,7 +32,7 @@ const OverflowTip: React.FunctionComponent<
   const [hoverStatus, setHover] = useState(false);
 
   return (
-    <TooltipWrapper toolTipId={`tooltip-title`} toolTip={hoverStatus ? fullText : ''}>
+    <TooltipWrapper tooltipId={`tooltip-title`} tooltip={hoverStatus ? fullText : ''}>
       <StyledOverflowDiv className={className} ref={textElementRef as any}>
         {fullText ?? ''}
       </StyledOverflowDiv>
diff --git a/source/frontend/src/components/common/TooltipWrapper.tsx b/source/frontend/src/components/common/TooltipWrapper.tsx
index 020206948e..a8c2aa6b60 100644
--- a/source/frontend/src/components/common/TooltipWrapper.tsx
+++ b/source/frontend/src/components/common/TooltipWrapper.tsx
@@ -14,14 +14,14 @@ interface ITooltipWrapperProps extends Partial<OverlayTriggerProps> {
    * @type {string}
    * @memberof ITooltipWrapperProps
    */
-  toolTip?: string | React.ReactElement;
+  tooltip?: string | React.ReactElement;
   /**
    * The tooltip element 'id'.
    *
    * @type {string}
    * @memberof ITooltipWrapperProps
    */
-  toolTipId: string;
+  tooltipId: string;
   className?: string;
 }
 
@@ -38,11 +38,11 @@ export const TooltipWrapper: React.FunctionComponent<
         {...props}
         overlay={
           <Tooltip
-            style={{ visibility: !props.toolTip ? 'hidden' : 'visible' }}
-            id={props.toolTipId}
+            style={{ visibility: !props.tooltip ? 'hidden' : 'visible' }}
+            id={props.tooltipId}
             className={props.className}
           >
-            {props.toolTip}
+            {props.tooltip}
           </Tooltip>
         }
       >
diff --git a/source/frontend/src/components/common/buttons/PlusButton.tsx b/source/frontend/src/components/common/buttons/PlusButton.tsx
index 138dda15da..700974531c 100644
--- a/source/frontend/src/components/common/buttons/PlusButton.tsx
+++ b/source/frontend/src/components/common/buttons/PlusButton.tsx
@@ -22,7 +22,7 @@ export const PlusButton: React.FC<React.PropsWithChildren<IPlusButtonProps>> = (
   ...props
 }) => {
   return (
-    <TooltipWrapper toolTipId={toolId} toolTip={toolText}>
+    <TooltipWrapper tooltipId={toolId} tooltip={toolText}>
       <StyledAddButton className="primary" {...props} icon={<FaPlus size={20} />} />
     </TooltipWrapper>
   );
diff --git a/source/frontend/src/components/common/buttons/ResetButton.tsx b/source/frontend/src/components/common/buttons/ResetButton.tsx
index 3167a3bc0b..0239915ed7 100644
--- a/source/frontend/src/components/common/buttons/ResetButton.tsx
+++ b/source/frontend/src/components/common/buttons/ResetButton.tsx
@@ -10,7 +10,7 @@ import { Button, ButtonProps } from '.';
  */
 export const ResetButton: React.FC<React.PropsWithChildren<ButtonProps>> = ({ ...props }) => {
   return (
-    <TooltipWrapper toolTipId="map-filter-reset-tooltip" toolTip="Reset Filter">
+    <TooltipWrapper tooltipId="map-filter-reset-tooltip" tooltip="Reset Filter">
       <Button
         data-testid="reset-button"
         title="reset-button"
diff --git a/source/frontend/src/components/common/buttons/SearchButton.tsx b/source/frontend/src/components/common/buttons/SearchButton.tsx
index 7ccfcaaff8..b80b67310e 100644
--- a/source/frontend/src/components/common/buttons/SearchButton.tsx
+++ b/source/frontend/src/components/common/buttons/SearchButton.tsx
@@ -10,7 +10,7 @@ import { Button, ButtonProps } from '.';
  */
 export const SearchButton: React.FC<React.PropsWithChildren<ButtonProps>> = ({ ...props }) => {
   return (
-    <TooltipWrapper toolTipId="map-filter-search-tooltip" toolTip="Search">
+    <TooltipWrapper tooltipId="map-filter-search-tooltip" tooltip="Search">
       <Button
         id="search-button"
         type={props.type ?? 'submit'}
diff --git a/source/frontend/src/components/common/form/AsyncTypeahead.tsx b/source/frontend/src/components/common/form/AsyncTypeahead.tsx
index 15a506e99b..678ea113dd 100644
--- a/source/frontend/src/components/common/form/AsyncTypeahead.tsx
+++ b/source/frontend/src/components/common/form/AsyncTypeahead.tsx
@@ -115,7 +115,7 @@ function AsyncTypeaheadInner<T extends TypeaheadModel>(
     >
       {label && <Form.Label htmlFor={`typeahead-${field}`}>{label}</Form.Label>}
       {tooltip && <TooltipIcon toolTipId={`${field}-tooltip`} toolTip={tooltip} />}
-      <TooltipWrapper toolTipId={`${field}-error-tooltip}`} toolTip={errorTooltip}>
+      <TooltipWrapper tooltipId={`${field}-error-tooltip}`} tooltip={errorTooltip}>
         <BaseAsyncTypeahead<T>
           ref={ref} // forward the ref to the inner typeahead control to be able to call its methods; e.g. typeahead.clear(), .blur() etc
           id={`typeahead-${field}`}
diff --git a/source/frontend/src/components/common/form/ContactInput.tsx b/source/frontend/src/components/common/form/ContactInput.tsx
index cba27ba98a..03d31e3aa7 100644
--- a/source/frontend/src/components/common/form/ContactInput.tsx
+++ b/source/frontend/src/components/common/form/ContactInput.tsx
@@ -62,7 +62,7 @@ export const ContactInput: React.FC<React.PropsWithChildren<ContactInputProps>>
     >
       {!!label && <Form.Label>{label}</Form.Label>}
 
-      <TooltipWrapper toolTipId={`${field}-error-tooltip}`} toolTip={errorTooltip}>
+      <TooltipWrapper tooltipId={`${field}-error-tooltip}`} tooltip={errorTooltip}>
         <Row>
           <Col>
             <StyledDiv className={!!error ? 'is-invalid' : ''}>
diff --git a/source/frontend/src/components/common/form/ContactInput/ContactInputView.tsx b/source/frontend/src/components/common/form/ContactInput/ContactInputView.tsx
index c7a6d721bb..2d520ab021 100644
--- a/source/frontend/src/components/common/form/ContactInput/ContactInputView.tsx
+++ b/source/frontend/src/components/common/form/ContactInput/ContactInputView.tsx
@@ -57,7 +57,7 @@ const ContactInputView: React.FunctionComponent<IContactInputViewProps> = ({
       <Form.Group controlId={`input-${field}`}>
         {!!label && <Form.Label>{label}</Form.Label>}
 
-        <TooltipWrapper toolTipId={`${field}-error-tooltip}`} toolTip={errorTooltip}>
+        <TooltipWrapper tooltipId={`${field}-error-tooltip}`} tooltip={errorTooltip}>
           <Row>
             <Col>
               <StyledDiv className={!!error && !!touch ? 'is-invalid' : ''}>
diff --git a/source/frontend/src/components/common/form/Input.tsx b/source/frontend/src/components/common/form/Input.tsx
index d5e217c81c..b45576fa50 100644
--- a/source/frontend/src/components/common/form/Input.tsx
+++ b/source/frontend/src/components/common/form/Input.tsx
@@ -123,7 +123,7 @@ export const Input: React.FC<React.PropsWithChildren<InputProps>> = ({
       )}
       {!!tooltip && !label && <TooltipIcon toolTipId={`${field}-tooltip`} toolTip={tooltip} />}
 
-      <TooltipWrapper toolTipId={`${field}-error-tooltip`} toolTip={errorTooltip}>
+      <TooltipWrapper tooltipId={`${field}-error-tooltip`} tooltip={errorTooltip}>
         <Form.Control
           className={innerClassName}
           as={asElement}
diff --git a/source/frontend/src/components/common/form/Multiselect.tsx b/source/frontend/src/components/common/form/Multiselect.tsx
index efadefb832..cd3d6090f3 100644
--- a/source/frontend/src/components/common/form/Multiselect.tsx
+++ b/source/frontend/src/components/common/form/Multiselect.tsx
@@ -107,7 +107,7 @@ export function MultiselectInner<T, U>(
       {label && <Form.Label htmlFor={`multiselect-${field}_input`}>{label}</Form.Label>}
       {tooltip && <TooltipIcon toolTipId={`${field}-tooltip`} toolTip={tooltip} />}
 
-      <TooltipWrapper toolTipId={`${field}-error-tooltip}`} toolTip={errorTooltip}>
+      <TooltipWrapper tooltipId={`${field}-error-tooltip}`} tooltip={errorTooltip}>
         <MultiselectBase
           {...rest}
           ref={ref as any}
diff --git a/source/frontend/src/components/common/form/Typeahead.tsx b/source/frontend/src/components/common/form/Typeahead.tsx
index 631424471b..5ec5ee0946 100644
--- a/source/frontend/src/components/common/form/Typeahead.tsx
+++ b/source/frontend/src/components/common/form/Typeahead.tsx
@@ -117,7 +117,7 @@ export function TypeaheadField<T extends TypeaheadModel>({
     <StyledFormGroup className={classNames(!!required ? 'required' : '', outerClassName)}>
       {!!label && <Form.Label>{label}</Form.Label>}
       {!!tooltip && <TooltipIcon toolTipId="typeAhead-tip" toolTip={tooltip} />}
-      <TooltipWrapper toolTipId={`${name}-error-tooltip}`} toolTip={errorTooltip}>
+      <TooltipWrapper tooltipId={`${name}-error-tooltip}`} tooltip={errorTooltip}>
         <Typeahead<T>
           {...rest}
           inputProps={{ ...rest.inputProps, name: name, id: `${name}-field` }}
diff --git a/source/frontend/src/components/common/form/TypeaheadSelect.tsx b/source/frontend/src/components/common/form/TypeaheadSelect.tsx
index a70fc1e27a..18a037bdae 100644
--- a/source/frontend/src/components/common/form/TypeaheadSelect.tsx
+++ b/source/frontend/src/components/common/form/TypeaheadSelect.tsx
@@ -90,7 +90,7 @@ export const TypeaheadSelect = React.forwardRef<Typeahead<SelectOption>, ITypeah
       >
         {label && <Form.Label htmlFor={`typeahead-select-${field}`}>{label}</Form.Label>}
         {tooltip && <TooltipIcon toolTipId={`${field}-tooltip`} toolTip={tooltip} />}
-        <TooltipWrapper toolTipId={`${field}-error-tooltip}`} toolTip={errorTooltip}>
+        <TooltipWrapper tooltipId={`${field}-error-tooltip}`} tooltip={errorTooltip}>
           <Typeahead
             ref={ref}
             id={`typeahead-select-${field}`}
diff --git a/source/frontend/src/components/common/form/YesNoSelect.tsx b/source/frontend/src/components/common/form/YesNoSelect.tsx
index 6b6cf6deeb..0b044c927f 100644
--- a/source/frontend/src/components/common/form/YesNoSelect.tsx
+++ b/source/frontend/src/components/common/form/YesNoSelect.tsx
@@ -57,7 +57,7 @@ export const YesNoSelect: React.FC<React.PropsWithChildren<IYesNoSelectProps>> =
       {label && <Form.Label>{label}</Form.Label>}
       {tooltip && <TooltipIcon toolTipId={`${field}-tooltip`} toolTip={tooltip} />}
 
-      <TooltipWrapper toolTipId={`${field}-error-tooltip}`} toolTip={errorTooltip}>
+      <TooltipWrapper tooltipId={`${field}-error-tooltip}`} tooltip={errorTooltip}>
         <Form.Control
           as="select"
           name={field}
diff --git a/source/frontend/src/components/layout/SideNavBar/NavIcon.tsx b/source/frontend/src/components/layout/SideNavBar/NavIcon.tsx
index 236a1b8df6..8ace7563b6 100644
--- a/source/frontend/src/components/layout/SideNavBar/NavIcon.tsx
+++ b/source/frontend/src/components/layout/SideNavBar/NavIcon.tsx
@@ -32,7 +32,7 @@ export const NavIcon = ({ icon, text, showText, onClick, roles, claims }: INavIc
       data-testid={`nav-tooltip-${text.replaceAll(' ', '').toLowerCase()}`}
     >
       <StyledLink>
-        <TooltipWrapper toolTipId={`nav-tooltip-${text}`} toolTip={text}>
+        <TooltipWrapper tooltipId={`nav-tooltip-${text}`} tooltip={text}>
           {icon}
         </TooltipWrapper>
         <StyledLabel className={clsx({ show: showText })}>{text}</StyledLabel>
diff --git a/source/frontend/src/components/maps/leaflet/Control/AdvancedFilter/AdvancedFilterButton.tsx b/source/frontend/src/components/maps/leaflet/Control/AdvancedFilter/AdvancedFilterButton.tsx
index 090097a7b3..4fcbbdf0da 100644
--- a/source/frontend/src/components/maps/leaflet/Control/AdvancedFilter/AdvancedFilterButton.tsx
+++ b/source/frontend/src/components/maps/leaflet/Control/AdvancedFilter/AdvancedFilterButton.tsx
@@ -21,7 +21,7 @@ const AdvancedFilterButton: React.FC<IAdvanceFilterButtonProps> = ({ open, onTog
   return (
     <Control position="topright">
       <div className="w-100">
-        <TooltipWrapper toolTipId="advanced-filter-button-id" toolTip="Advanced Map Filters">
+        <TooltipWrapper tooltipId="advanced-filter-button-id" tooltip="Advanced Map Filters">
           <ControlButton
             title="advanced-filter-button"
             variant="outline-secondary"
diff --git a/source/frontend/src/components/maps/leaflet/Control/LayersControl/LayersControl.tsx b/source/frontend/src/components/maps/leaflet/Control/LayersControl/LayersControl.tsx
index 3de21be2b7..ba0c884c80 100644
--- a/source/frontend/src/components/maps/leaflet/Control/LayersControl/LayersControl.tsx
+++ b/source/frontend/src/components/maps/leaflet/Control/LayersControl/LayersControl.tsx
@@ -109,7 +109,7 @@ const LayersControl: React.FC<React.PropsWithChildren<ILayersControl>> = ({ open
             <Title>Layers</Title>
           </LayersHeader>
         )}
-        <TooltipWrapper toolTipId="layer-control-id" toolTip="Layer Controls">
+        <TooltipWrapper tooltipId="layer-control-id" tooltip="Layer Controls">
           <ControlButton
             id="layersControlButton"
             variant="outline-secondary"
diff --git a/source/frontend/src/components/maps/leaflet/Control/Legend/LegendControl.tsx b/source/frontend/src/components/maps/leaflet/Control/Legend/LegendControl.tsx
index df6a1dca74..9047308bcc 100644
--- a/source/frontend/src/components/maps/leaflet/Control/Legend/LegendControl.tsx
+++ b/source/frontend/src/components/maps/leaflet/Control/Legend/LegendControl.tsx
@@ -33,8 +33,8 @@ export const LegendControl: React.FC<React.PropsWithChildren<unknown>> = () => {
       <ClickAwayListener onClickAway={() => setVisible(false)}>
         <div>
           <TooltipWrapper
-            toolTipId="marker-legendId"
-            toolTip={visible ? undefined : 'Marker legend'}
+            tooltipId="marker-legendId"
+            tooltip={visible ? undefined : 'Marker legend'}
           >
             <LegendButton ref={target} onClick={() => setVisible(!visible)}>
               <FiMapPin />
diff --git a/source/frontend/src/components/maps/leaflet/Control/ZoomOut/ZoomOutButton.tsx b/source/frontend/src/components/maps/leaflet/Control/ZoomOut/ZoomOutButton.tsx
index d47b47b3a3..1f73f87a82 100644
--- a/source/frontend/src/components/maps/leaflet/Control/ZoomOut/ZoomOutButton.tsx
+++ b/source/frontend/src/components/maps/leaflet/Control/ZoomOut/ZoomOutButton.tsx
@@ -30,7 +30,7 @@ export const ZoomOutButton: React.FC = () => {
   };
   return (
     <Control position="topleft">
-      <TooltipWrapper toolTipId="zoomout-id" toolTip="View entire province">
+      <TooltipWrapper tooltipId="zoomout-id" tooltip="View entire province">
         <ZoomButton onClick={zoomOut}>
           <FaExpandArrowsAlt />
         </ZoomButton>
diff --git a/source/frontend/src/features/acquisition/list/AcquisitionListView.tsx b/source/frontend/src/features/acquisition/list/AcquisitionListView.tsx
index 0a5462584a..06d55acbd7 100644
--- a/source/frontend/src/features/acquisition/list/AcquisitionListView.tsx
+++ b/source/frontend/src/features/acquisition/list/AcquisitionListView.tsx
@@ -1,6 +1,5 @@
 import { isEmpty } from 'lodash';
-import React, { useEffect } from 'react';
-import { useCallback } from 'react';
+import React, { useCallback, useEffect } from 'react';
 import { Col, Row } from 'react-bootstrap';
 import { FaFileExcel, FaPlus } from 'react-icons/fa';
 import { useHistory } from 'react-router';
@@ -109,7 +108,7 @@ export const AcquisitionListView: React.FunctionComponent<
               />
             </Col>
             <Col md="auto" className="px-0">
-              <TooltipWrapper toolTipId="export-to-excel" toolTip="Export to Excel">
+              <TooltipWrapper tooltipId="export-to-excel" tooltip="Export to Excel">
                 <StyledIconButton onClick={() => fetch('excel')}>
                   <FaFileExcel data-testid="excel-icon" size={36} />
                 </StyledIconButton>
diff --git a/source/frontend/src/features/admin/access-request/AccessRequestForm.tsx b/source/frontend/src/features/admin/access-request/AccessRequestForm.tsx
index 441b5b8185..38fefa87fb 100644
--- a/source/frontend/src/features/admin/access-request/AccessRequestForm.tsx
+++ b/source/frontend/src/features/admin/access-request/AccessRequestForm.tsx
@@ -87,8 +87,8 @@ export const AccessRequestForm: React.FunctionComponent<
         <SectionField label="Role" labelWidth="2" required>
           <Select field="roleId" options={selectRoles} placeholder="Select..." />
           <TooltipWrapper
-            toolTipId="role description tooltip icon"
-            toolTip={<RolesToolTip />}
+            tooltipId="role description tooltip icon"
+            tooltip={<RolesToolTip />}
             placement="auto"
             className="tooltip-light"
           >
diff --git a/source/frontend/src/features/admin/access/components/Filter.tsx b/source/frontend/src/features/admin/access/components/Filter.tsx
index 6ac41031dd..25a3db594a 100644
--- a/source/frontend/src/features/admin/access/components/Filter.tsx
+++ b/source/frontend/src/features/admin/access/components/Filter.tsx
@@ -52,10 +52,10 @@ export const AccessRequestFilter = (props: IProps) => {
           />
         </Col>
         <Col className="actions d-flex" md={1}>
-          <TooltipWrapper toolTipId="access-filter-search-tooltip" toolTip="Search">
+          <TooltipWrapper tooltipId="access-filter-search-tooltip" tooltip="Search">
             <SearchButton type="submit" onClick={search} />
           </TooltipWrapper>
-          <TooltipWrapper toolTipId="access-filter-reset-tooltip" toolTip="Reset Filter">
+          <TooltipWrapper tooltipId="access-filter-reset-tooltip" tooltip="Reset Filter">
             <Button
               title="reset"
               variant="info"
diff --git a/source/frontend/src/features/admin/edit-user/EditUserForm.tsx b/source/frontend/src/features/admin/edit-user/EditUserForm.tsx
index cef4593d61..074be2f5d6 100644
--- a/source/frontend/src/features/admin/edit-user/EditUserForm.tsx
+++ b/source/frontend/src/features/admin/edit-user/EditUserForm.tsx
@@ -105,8 +105,8 @@ const EditUserForm: React.FunctionComponent<React.PropsWithChildren<IEditUserFor
           <SectionField label="Role(s)" required labelWidth="2">
             <Multiselect placeholder="" field="roles" options={roles} displayValue="name" />
             <TooltipWrapper
-              toolTipId="role description tooltip icon"
-              toolTip={<RolesToolTip />}
+              tooltipId="role description tooltip icon"
+              tooltip={<RolesToolTip />}
               placement="auto"
               className="tooltip-light"
             >
@@ -140,8 +140,8 @@ const EditUserForm: React.FunctionComponent<React.PropsWithChildren<IEditUserFor
 
           <SectionField className="d-flex" label="Disable account?" labelWidth="2">
             <TooltipWrapper
-              toolTipId="is-disabled-tooltip"
-              toolTip={'Click to change account status then click Save.'}
+              tooltipId="is-disabled-tooltip"
+              tooltip={'Click to change account status then click Save.'}
             >
               <Check data-testid="isDisabled" field="isDisabled" />
             </TooltipWrapper>
diff --git a/source/frontend/src/features/admin/users/ManageUsersPage.tsx b/source/frontend/src/features/admin/users/ManageUsersPage.tsx
index 470557a9bb..5b4d9b13ae 100644
--- a/source/frontend/src/features/admin/users/ManageUsersPage.tsx
+++ b/source/frontend/src/features/admin/users/ManageUsersPage.tsx
@@ -1,6 +1,6 @@
 import fileDownload from 'js-file-download';
 import isEmpty from 'lodash/isEmpty';
-import React, { useMemo } from 'react';
+import { useMemo } from 'react';
 import { Col, Row } from 'react-bootstrap';
 import { FaFileExcel } from 'react-icons/fa';
 import styled from 'styled-components';
@@ -75,7 +75,7 @@ export const ManageUsersPage = () => {
           <UsersFilterBar values={filter} onChange={setFilter} />
         </Col>
         <Col md={4} className="align-items-center d-flex">
-          <TooltipWrapper toolTipId="export-to-excel" toolTip="Export to Excel">
+          <TooltipWrapper tooltipId="export-to-excel" tooltip="Export to Excel">
             <StyledIconButton onClick={() => fetch('excel')}>
               <FaFileExcel data-testid="excel-icon" size={36} />
             </StyledIconButton>
diff --git a/source/frontend/src/features/admin/users/components/UsersFilterBar.tsx b/source/frontend/src/features/admin/users/components/UsersFilterBar.tsx
index c70dfa413a..8077d768a4 100644
--- a/source/frontend/src/features/admin/users/components/UsersFilterBar.tsx
+++ b/source/frontend/src/features/admin/users/components/UsersFilterBar.tsx
@@ -67,10 +67,10 @@ export const UsersFilterBar: React.FC<React.PropsWithChildren<IProps>> = ({ valu
             <Col className="actions" md={2} sm={2}>
               <Row>
                 <Col className="d-flex">
-                  <TooltipWrapper toolTipId="map-filter-search-tooltip" toolTip="Search">
+                  <TooltipWrapper tooltipId="map-filter-search-tooltip" tooltip="Search">
                     <SearchButton className="mr-2" />
                   </TooltipWrapper>
-                  <TooltipWrapper toolTipId="map-filter-reset-tooltip" toolTip="Reset Filter">
+                  <TooltipWrapper tooltipId="map-filter-reset-tooltip" tooltip="Reset Filter">
                     <ResetButton
                       type=""
                       disabled={false}
diff --git a/source/frontend/src/features/advancedFilterBar/AdvancedFilterBar.tsx b/source/frontend/src/features/advancedFilterBar/AdvancedFilterBar.tsx
index 966ab9171a..18a58002a8 100644
--- a/source/frontend/src/features/advancedFilterBar/AdvancedFilterBar.tsx
+++ b/source/frontend/src/features/advancedFilterBar/AdvancedFilterBar.tsx
@@ -20,7 +20,7 @@ const AdvancedFilterBar: React.FC<React.PropsWithChildren<IAdvancedFilterBarProp
         <>
           <StyledHeader>
             <StyledTitle>Filter By:</StyledTitle>
-            <TooltipWrapper toolTipId="close-sidebar-tooltip" toolTip="Close Advanced Map Filters">
+            <TooltipWrapper tooltipId="close-sidebar-tooltip" tooltip="Close Advanced Map Filters">
               <CloseIcon title="close" onClick={toggle} />
             </TooltipWrapper>
           </StyledHeader>
diff --git a/source/frontend/src/features/help/containers/HelpContainer.tsx b/source/frontend/src/features/help/containers/HelpContainer.tsx
index 4de2be302c..6f171a87b6 100644
--- a/source/frontend/src/features/help/containers/HelpContainer.tsx
+++ b/source/frontend/src/features/help/containers/HelpContainer.tsx
@@ -22,7 +22,7 @@ export function HelpContainer() {
 
   return keycloak.obj.authenticated ? (
     <Nav.Item>
-      <TooltipWrapper toolTipId="help-tooltip" toolTip="Ask for Help">
+      <TooltipWrapper tooltipId="help-tooltip" tooltip="Ask for Help">
         <StyledContainer onClick={() => setShowHelp(true)}>
           <StyledHelpIcon size="24px" />
           <label>Help</label>
diff --git a/source/frontend/src/features/leases/list/LeaseListView.tsx b/source/frontend/src/features/leases/list/LeaseListView.tsx
index 8b2c7991c6..b946200c6e 100644
--- a/source/frontend/src/features/leases/list/LeaseListView.tsx
+++ b/source/frontend/src/features/leases/list/LeaseListView.tsx
@@ -1,9 +1,7 @@
 import { isEmpty } from 'lodash';
-import { useEffect } from 'react';
-import { useCallback } from 'react';
+import { useCallback, useEffect } from 'react';
 import { Col, Row } from 'react-bootstrap';
-import { FaFileAlt, FaFileExcel } from 'react-icons/fa';
-import { FaPlus } from 'react-icons/fa';
+import { FaFileAlt, FaFileExcel, FaPlus } from 'react-icons/fa';
 import { useHistory } from 'react-router';
 import { toast } from 'react-toastify';
 import styled from 'styled-components';
@@ -90,14 +88,14 @@ export const LeaseListView: React.FunctionComponent<React.PropsWithChildren<unkn
               <LeaseFilter filter={filter} setFilter={changeFilter} />
             </Col>
             <Col md="auto" className="px-0">
-              <TooltipWrapper toolTipId="export-to-excel" toolTip="Export to Excel">
+              <TooltipWrapper tooltipId="export-to-excel" tooltip="Export to Excel">
                 <StyledIconButton onClick={() => fetch('excel')}>
                   <FaFileExcel data-testid="excel-icon" size={36} />
                 </StyledIconButton>
               </TooltipWrapper>
             </Col>
             <Col md="auto" className="px-0">
-              <TooltipWrapper toolTipId="export-to-excel" toolTip="Export to CSV">
+              <TooltipWrapper tooltipId="export-to-excel" tooltip="Export to CSV">
                 <StyledIconButton onClick={() => fetch('csv')}>
                   <FaFileAlt data-testid="csv-icon" size={36} />
                 </StyledIconButton>
diff --git a/source/frontend/src/features/leases/reports/aggregated/ExportAggregatedLeasesContainer.tsx b/source/frontend/src/features/leases/reports/aggregated/ExportAggregatedLeasesContainer.tsx
index c9bbdf0247..41363641c1 100644
--- a/source/frontend/src/features/leases/reports/aggregated/ExportAggregatedLeasesContainer.tsx
+++ b/source/frontend/src/features/leases/reports/aggregated/ExportAggregatedLeasesContainer.tsx
@@ -50,7 +50,7 @@ export const ExportAggregatedLeasesContainer: React.FunctionComponent<
                 field="fiscalYear"
                 options={fiscalYearOptions}
               ></InlineSelect>
-              <TooltipWrapper toolTipId="download-aggregated-lease-report" toolTip="Download">
+              <TooltipWrapper tooltipId="download-aggregated-lease-report" tooltip="Download">
                 <ClickableDownload title="Export Aggregated Report" onClick={() => submitForm()} />
               </TooltipWrapper>
             </FlexRowDiv>
diff --git a/source/frontend/src/features/leases/reports/payments/ExportLeasePaymentsContainer.tsx b/source/frontend/src/features/leases/reports/payments/ExportLeasePaymentsContainer.tsx
index 181b4bb084..0d6411cf61 100644
--- a/source/frontend/src/features/leases/reports/payments/ExportLeasePaymentsContainer.tsx
+++ b/source/frontend/src/features/leases/reports/payments/ExportLeasePaymentsContainer.tsx
@@ -49,7 +49,7 @@ export const ExportLeasePaymentsContainer: React.FunctionComponent<
                 field="fiscalYear"
                 options={fiscalYearOptions}
               ></InlineSelect>
-              <TooltipWrapper toolTipId="download-lease-payments-report" toolTip="Download">
+              <TooltipWrapper tooltipId="download-lease-payments-report" tooltip="Download">
                 <ClickableDownload title="Export Aggregated Report" onClick={() => submitForm()} />
               </TooltipWrapper>
             </FlexRowDiv>
diff --git a/source/frontend/src/features/mapSideBar/layout/MapSideBarLayout.tsx b/source/frontend/src/features/mapSideBar/layout/MapSideBarLayout.tsx
index ca0f4d1b5d..62d22ee2ff 100644
--- a/source/frontend/src/features/mapSideBar/layout/MapSideBarLayout.tsx
+++ b/source/frontend/src/features/mapSideBar/layout/MapSideBarLayout.tsx
@@ -40,7 +40,7 @@ const MapSideBarLayout: React.FunctionComponent<
 
               {showCloseButton && (
                 <Col xs="auto">
-                  <TooltipWrapper toolTipId="close-sidebar-tooltip" toolTip="Close Form">
+                  <TooltipWrapper tooltipId="close-sidebar-tooltip" tooltip="Close Form">
                     <CloseIcon title="close" onClick={props.onClose} />
                   </TooltipWrapper>
                 </Col>
diff --git a/source/frontend/src/features/mapSideBar/property/MotiInventoryHeader.tsx b/source/frontend/src/features/mapSideBar/property/MotiInventoryHeader.tsx
index f1e89d92e6..a07e0121cd 100644
--- a/source/frontend/src/features/mapSideBar/property/MotiInventoryHeader.tsx
+++ b/source/frontend/src/features/mapSideBar/property/MotiInventoryHeader.tsx
@@ -65,7 +65,7 @@ export const MotiInventoryHeader: React.FunctionComponent<IMotiInventoryHeaderPr
           </Row>
         </Col>
         <Col xs="auto" className="d-flex p-0 align-items-center justify-content-end">
-          <TooltipWrapper toolTipId="property-zoom-map" toolTip="Zoom Map">
+          <TooltipWrapper tooltipId="property-zoom-map" tooltip="Zoom Map">
             <StyledIconButton
               variant="info"
               disabled={!props.onZoom}
diff --git a/source/frontend/src/features/properties/components/GeocoderAutoComplete.tsx b/source/frontend/src/features/properties/components/GeocoderAutoComplete.tsx
index bc63b738ef..7b6ac284da 100644
--- a/source/frontend/src/features/properties/components/GeocoderAutoComplete.tsx
+++ b/source/frontend/src/features/properties/components/GeocoderAutoComplete.tsx
@@ -118,7 +118,7 @@ export const GeocoderAutoComplete: React.FC<
           controlId={`input-${field}`}
           className={classNames(!!required ? 'required' : '', outerClassName)}
         >
-          <TooltipWrapper toolTipId={`${field}-error-tooltip}`} toolTip={errorTooltip}>
+          <TooltipWrapper tooltipId={`${field}-error-tooltip}`} tooltip={errorTooltip}>
             <InputControl
               data-testid="geocoder-input"
               autoComplete={autoSetting}
diff --git a/source/frontend/src/features/properties/filter/PropertySearchToggle.tsx b/source/frontend/src/features/properties/filter/PropertySearchToggle.tsx
index 6caca6f8ee..32e11141ae 100644
--- a/source/frontend/src/features/properties/filter/PropertySearchToggle.tsx
+++ b/source/frontend/src/features/properties/filter/PropertySearchToggle.tsx
@@ -31,7 +31,7 @@ export const PropertySearchToggle: React.FunctionComponent<
     <StyledToggle toggle={toggle}>
       <StyledNav>
         <StyledLink>
-          <TooltipWrapper toolTipId={`${toolId}-map`} toolTip="Map View">
+          <TooltipWrapper tooltipId={`${toolId}-map`} tooltip="Map View">
             <MapSvg
               onClick={() => {
                 if (toggle !== SearchToggleOption.Map) {
@@ -44,7 +44,7 @@ export const PropertySearchToggle: React.FunctionComponent<
       </StyledNav>
       <StyledNav>
         <StyledLink>
-          <TooltipWrapper toolTipId={`${toolId}-list`} toolTip="List View">
+          <TooltipWrapper tooltipId={`${toolId}-list`} tooltip="List View">
             <TableSvg
               onClick={() => {
                 if (toggle !== SearchToggleOption.List) {
diff --git a/source/frontend/src/features/properties/list/PropertyListView.tsx b/source/frontend/src/features/properties/list/PropertyListView.tsx
index 9bff5c207f..c2597e8ed4 100644
--- a/source/frontend/src/features/properties/list/PropertyListView.tsx
+++ b/source/frontend/src/features/properties/list/PropertyListView.tsx
@@ -168,12 +168,12 @@ const PropertyListView: React.FC<React.PropsWithChildren<unknown>> = () => {
         <Container fluid className="TableToolbar px-0">
           <h3>Property Information</h3>
           <div className="menu"></div>
-          <TooltipWrapper toolTipId="export-to-excel" toolTip="Export to Excel">
+          <TooltipWrapper tooltipId="export-to-excel" tooltip="Export to Excel">
             <StyledIconButton onClick={() => fetch('excel')}>
               <FaFileExcel data-testid="excel-icon" size={36} />
             </StyledIconButton>
           </TooltipWrapper>
-          <TooltipWrapper toolTipId="export-to-excel" toolTip="Export to CSV">
+          <TooltipWrapper tooltipId="export-to-excel" tooltip="Export to CSV">
             <StyledIconButton onClick={() => fetch('csv')}>
               <FaFileAlt data-testid="csv-icon" size={36} />
             </StyledIconButton>
diff --git a/source/frontend/src/hooks/useFavicon.test.ts b/source/frontend/src/hooks/useFavicon.test.ts
index b2fc7f7753..075ead7ee9 100644
--- a/source/frontend/src/hooks/useFavicon.test.ts
+++ b/source/frontend/src/hooks/useFavicon.test.ts
@@ -1,39 +1,38 @@
 import { renderHook } from '@testing-library/react-hooks';
 
+import { useTenant } from '@/tenants';
+
+import { ITenantConfig2 } from './pims-api/interfaces/ITenantConfig';
 import { useFavicon } from './useFavicon';
 
 jest.mock('@/tenants', () => ({
-  useTenant: () => ({ logo: { favicon: 'test' } }),
+  useTenant: jest.fn(),
 }));
 
-const spy = jest
-  .spyOn(document, 'getElementById')
-  .mockImplementation(() => document.createElement('<link id="favicon" />'));
+const mockUseTenant = useTenant as jest.Mock;
+const baseUrl = 'http://localhost/';
 
-describe('useFavicon suite', () => {
-  afterEach(() => {
-    jest.restoreAllMocks();
+describe('useFavicon hook', () => {
+  beforeAll(() => {
+    var favicon = document.createElement('link');
+    favicon.id = 'favicon';
+    favicon.rel = 'icon';
+    document.head.appendChild(favicon);
   });
 
-  it('useFavicon returns undefined link', () => {
-    renderHook(() => {
-      const link = useFavicon();
-      expect(link).toBeUndefined();
-    });
+  afterEach(() => {
+    jest.clearAllMocks();
   });
 
-  it('useFavicon returns empty link', () => {
-    renderHook(() => {
-      const link = useFavicon();
-      expect(link.href).toBeEmpty(); // TODO: PSP-4409 This test doesn't actually work.
-      expect(spy).toBeCalledTimes(1);
-    });
+  it('returns empty link when tenant data is unavailable', () => {
+    mockUseTenant.mockReturnValue({} as ITenantConfig2);
+    const { result } = renderHook(useFavicon);
+    expect(result.current.href).toBe(baseUrl);
   });
 
-  it('useFavicon returns tenant link', () => {
-    renderHook(() => {
-      const link = useFavicon();
-      expect(link.href).toBe('test'); // TODO: PSP-4409 This test doesn't actually work.
-    });
+  it('returns valid icon link from tenant', () => {
+    mockUseTenant.mockReturnValue({ logo: { favicon: 'test.ico' } });
+    const { result } = renderHook(useFavicon);
+    expect(result.current.href).toBe(`${baseUrl}test.ico`);
   });
 });
diff --git a/source/frontend/src/hooks/useFavicon.ts b/source/frontend/src/hooks/useFavicon.ts
index a6310b6e96..affef5227a 100644
--- a/source/frontend/src/hooks/useFavicon.ts
+++ b/source/frontend/src/hooks/useFavicon.ts
@@ -8,7 +8,7 @@ export const useFavicon = () => {
   const tenant = useTenant();
 
   const favicon = document.getElementById('favicon') as HTMLLinkElement;
-  if (favicon) favicon.href = tenant.logo.favicon;
+  if (favicon) favicon.href = tenant?.logo?.favicon ?? '';
 
   return favicon;
 };