diff --git a/interface/modules/zend_modules/module/Carecoordination/src/Carecoordination/Model/EncounterccdadispatchTable.php b/interface/modules/zend_modules/module/Carecoordination/src/Carecoordination/Model/EncounterccdadispatchTable.php
index d9d254ada03..b0c2b335f6b 100644
--- a/interface/modules/zend_modules/module/Carecoordination/src/Carecoordination/Model/EncounterccdadispatchTable.php
+++ b/interface/modules/zend_modules/module/Carecoordination/src/Carecoordination/Model/EncounterccdadispatchTable.php
@@ -29,6 +29,7 @@
 use OpenEMR\Services\CodeTypesService;
 use OpenEMR\Services\ContactService;
 use OpenEMR\Services\EncounterService;
+use OpenEMR\Services\PatientNameHistoryService;
 use OpenEMR\Services\PatientService;
 use OpenEMR\Services\Search\DateSearchField;
 use OpenEMR\Services\Search\SearchComparator;
@@ -204,8 +205,8 @@ public function getPreviousAddresses($pid): array
      */
     public function getPreviousNames($pid): array
     {
-        $patientService = new PatientService();
-        return $patientService->getPatientNameHistory($pid) ?? [];
+        $nameService = new PatientNameHistoryService();
+        return $nameService->getPatientNameHistory($pid) ?? [];
     }
 
     /* Fetch Patient data from EMR
diff --git a/library/ajax/specialty_form_ajax.php b/library/ajax/specialty_form_ajax.php
index 9afc63837bf..f6fab5bda2c 100644
--- a/library/ajax/specialty_form_ajax.php
+++ b/library/ajax/specialty_form_ajax.php
@@ -15,7 +15,7 @@
 require_once(__DIR__ . "/../../interface/globals.php");
 
 use OpenEMR\Common\Csrf\CsrfUtils;
-use OpenEMR\Services\PatientService;
+use OpenEMR\Services\PatientNameHistoryService;
 
 if (!CsrfUtils::verifyCsrfToken($_POST["csrf_token_form"])) {
     CsrfUtils::csrfNotVerified();
@@ -31,8 +31,8 @@
 
 function nameHistoryDelete($id)
 {
-    $patientService = new PatientService();
-    $is_ok = $patientService->deletePatientNameHistoryById($id);
+    $patientNameService = new PatientNameHistoryService();
+    $is_ok = $patientNameService->deletePatientNameHistoryById($id);
     $is_ok =  empty($is_ok) ? xlt("Success") : xlt("Failed");
     echo js_escape($is_ok);
     exit;
@@ -44,9 +44,9 @@ function nameHistorySave($post_items)
         $date = new DateTime($post_items['previous_name_enddate']);
         $post_items['previous_name_enddate'] = $date->format('Y-m-d');
     }
-    $patientService = new PatientService('patient_history');
-    $is_new = $patientService->createPatientNameHistory($post_items['pid'], $post_items);
-    $name = $patientService->formatPreviousName($post_items);
+    $patientNameService = new PatientNameHistoryService();
+    $is_new = $patientNameService->createPatientNameHistory($post_items['pid'], $post_items);
+    $name = $patientNameService->formatPreviousName($post_items);
 
     $ret = array();
     if (!empty($is_new)) {
diff --git a/library/options.inc.php b/library/options.inc.php
index e6398a79e2e..c47fc06decb 100644
--- a/library/options.inc.php
+++ b/library/options.inc.php
@@ -62,6 +62,7 @@
 use OpenEMR\Services\EncounterService;
 use OpenEMR\Services\FacilityService;
 use OpenEMR\Services\PatientService;
+use OpenEMR\Services\PatientNameHistoryService;
 use OpenEMR\Events\PatientDemographics\RenderPharmacySectionEvent;
 
 $facilityService = new FacilityService();
@@ -1626,8 +1627,8 @@ class='form-control{$smallform}'
     } elseif ($data_type == 52) {
         global $pid;
         $pid = ($frow['blank_form'] ?? null) ? null : $pid;
-        $patientService = new PatientService();
-        $res = $patientService->getPatientNameHistory($pid);
+        $patientNameService = new PatientNameHistoryService();
+        $res = $patientNameService->getPatientNameHistory($pid);
         echo "<div class='input-group w-75'>";
         echo "<select name='form_$field_id_esc" . "[]'" . " id='form_$field_id_esc' title='$description' $lbfonchange $disabled class='form-control$smallform select-previous-names' multiple='multiple'>";
         foreach ($res as $row) {
@@ -2854,8 +2855,8 @@ function generate_display_field($frow, $currvalue)
         }
     } elseif ($data_type == 52) {
         global $pid;
-        $patientService = new PatientService();
-        $rows = $patientService->getPatientNameHistory($pid);
+        $patientNameService = new PatientNameHistoryService();
+        $rows = $patientNameService->getPatientNameHistory($pid);
         $i = 0;
         foreach ($rows as $row) {
             // name escaped in fetch
diff --git a/src/Services/PatientNameHistoryService.php b/src/Services/PatientNameHistoryService.php
new file mode 100644
index 00000000000..e8adb418bf7
--- /dev/null
+++ b/src/Services/PatientNameHistoryService.php
@@ -0,0 +1,148 @@
+<?php
+
+/**
+ * Handles the interactions with the patient_history table.
+ *
+ * @package   OpenEMR
+ * @link      http://www.open-emr.org
+ *
+ * @author    Jerry Padgett <sjpadgett@gmail.com>
+ * @author    Stephen Nielson <snielson@discoverandchange.com>
+ * @copyright Copyright (c) 2024 Care Management Solutions, Inc. <stephen.waite@cmsvt.com>
+ * @copyright Copyright (c) 2020 Jerry Padgett <sjpadgett@gmail.com>
+ * @license   https://github.com/openemr/openemr/blob/master/LICENSE GNU General Public License 3
+ */
+
+namespace OpenEMR\Services;
+
+use OpenEMR\Common\Database\QueryUtils;
+use OpenEMR\Common\Logging\SystemLogger;
+use OpenEMR\Common\Uuid\UuidRegistry;
+use OpenEMR\Services\PatientService;
+
+class PatientNameHistoryService extends BaseService
+{
+    public const TABLE_NAME = "patient_history";
+    public function __construct()
+    {
+        // note the constant for this table is PRIVATE and should either be protected or PUBLIC
+        parent::__construct(self::TABLE_NAME);
+    }
+
+    public function deletePatientNameHistoryById($id)
+    {
+        $sql = "DELETE FROM patient_history WHERE id = ?";
+        return sqlQuery($sql, array($id));
+    }
+
+    /**
+     * Create a previous patient name history
+     * Updates not allowed for this history feature.
+     *
+     * @param string $pid patient internal id
+     * @param array $record array values to insert
+     * @return int | false new id or false if name already exist
+     */
+    public function createPatientNameHistory($pid, $record)
+    {
+        // we should never be null here but for legacy reasons we are going to default to this
+        $createdBy = $_SESSION['authUserID'] ?? null; // we don't let anyone else but the current user be the createdBy
+        if ($pid <= 0) {
+            return false;
+        }
+        $insertData = [
+            'pid' => $pid,
+            'history_type_key' => 'name_history',
+            'previous_name_prefix' => $record['previous_name_prefix'],
+            'previous_name_first' => $record['previous_name_first'],
+            'previous_name_middle' => $record['previous_name_middle'],
+            'previous_name_last' => $record['previous_name_last'],
+            'previous_name_suffix' => $record['previous_name_suffix'],
+            'previous_name_enddate' => $record['previous_name_enddate']
+        ];
+        $sql = "SELECT pid FROM " . self::TABLE_NAME . " WHERE
+            pid = ? AND
+            history_type_key = ? AND
+            previous_name_prefix = ? AND
+            previous_name_first = ? AND
+            previous_name_middle = ? AND
+            previous_name_last = ? AND
+            previous_name_suffix = ? AND
+            previous_name_enddate = ?
+        ";
+        $go_flag = QueryUtils::fetchSingleValue($sql, 'pid', $insertData);
+        // return false which calling routine should understand as existing name record
+        if (!empty($go_flag)) {
+            return false;
+        }
+        // finish up the insert
+        $insertData['created_by'] = $createdBy;
+        $insertData['uuid'] = UuidRegistry::getRegistryForTable(self::TABLE_NAME)->createUuid();
+        $insert = $this->buildInsertColumns($insertData);
+        $sql = "INSERT INTO " . self::TABLE_NAME . " SET " . $insert['set'];
+
+        return QueryUtils::sqlInsert($sql, $insert['bind']);
+    }
+
+
+    public static function formatPreviousName($item)
+    {
+        if (
+            $item['previous_name_enddate'] === '0000-00-00'
+            || $item['previous_name_enddate'] === '00/00/0000'
+        ) {
+            $item['previous_name_enddate'] = '';
+        }
+        $item['previous_name_enddate'] = oeFormatShortDate($item['previous_name_enddate']);
+        $name = ($item['previous_name_prefix'] ? $item['previous_name_prefix'] . " " : "") .
+            $item['previous_name_first'] .
+            ($item['previous_name_middle'] ? " " . $item['previous_name_middle'] . " " : " ") .
+            $item['previous_name_last'] .
+            ($item['previous_name_suffix'] ? " " . $item['previous_name_suffix'] : "") .
+            ($item['previous_name_enddate'] ? " " . $item['previous_name_enddate'] : "");
+
+        return text($name);
+    }
+
+
+    public function getPatientNameHistory($pid)
+    {
+        $sql = "SELECT pid,
+            id,
+            previous_name_prefix,
+            previous_name_first,
+            previous_name_middle,
+            previous_name_last,
+            previous_name_suffix,
+            previous_name_enddate
+            FROM patient_history
+            WHERE pid = ? AND history_type_key = ?";
+        $results =  QueryUtils::sqlStatementThrowException($sql, array($pid, 'name_history'));
+        $rows = [];
+        while ($row = sqlFetchArray($results)) {
+            $row['formatted_name'] = $this->formatPreviousName($row);
+            $rows[] = $row;
+        }
+
+        return $rows;
+    }
+
+
+    public function getPatientNameHistoryById($pid, $id)
+    {
+        $sql = "SELECT pid,
+            id,
+            previous_name_prefix,
+            previous_name_first,
+            previous_name_middle,
+            previous_name_last,
+            previous_name_suffix,
+            previous_name_enddate
+            FROM patient_history
+            WHERE pid = ? AND id = ? AND history_type_key = ?";
+        $result =  sqlQuery($sql, array($pid, $id, 'name_history'));
+        $result['formatted_name'] = $this->formatPreviousName($result);
+
+        return $result;
+    }
+}
diff --git a/src/Services/PatientService.php b/src/Services/PatientService.php
index 2f466430357..9069e7d0a3c 100644
--- a/src/Services/PatientService.php
+++ b/src/Services/PatientService.php
@@ -18,6 +18,7 @@
 
 use OpenEMR\Common\Database\QueryPagination;
 use OpenEMR\Common\Database\QueryUtils;
+use OpenEMR\Common\Logging\SystemLogger;
 use OpenEMR\Common\ORDataObject\Address;
 use OpenEMR\Common\ORDataObject\ContactAddress;
 use OpenEMR\Common\Uuid\UuidRegistry;
@@ -662,118 +663,9 @@ private function saveCareTeamHistory($patientData, $oldProviders, $oldFacilities
         $careTeamService->createCareTeamHistory($patientData['pid'], $oldProviders, $oldFacilities);
     }
 
-    public function getPatientNameHistory($pid)
-    {
-        $sql = "SELECT pid,
-            id,
-            previous_name_prefix,
-            previous_name_first,
-            previous_name_middle,
-            previous_name_last,
-            previous_name_suffix,
-            previous_name_enddate
-            FROM patient_history
-            WHERE pid = ? AND history_type_key = ?";
-        $results =  QueryUtils::sqlStatementThrowException($sql, array($pid, 'name_history'));
-        $rows = [];
-        while ($row = sqlFetchArray($results)) {
-            $row['formatted_name'] = $this->formatPreviousName($row);
-            $rows[] = $row;
-        }
-
-        return $rows;
-    }
-
-    public function deletePatientNameHistoryById($id)
-    {
-        $sql = "DELETE FROM patient_history WHERE id = ?";
-        return sqlQuery($sql, array($id));
-    }
-
-    public function getPatientNameHistoryById($pid, $id)
-    {
-        $sql = "SELECT pid,
-            id,
-            previous_name_prefix,
-            previous_name_first,
-            previous_name_middle,
-            previous_name_last,
-            previous_name_suffix,
-            previous_name_enddate
-            FROM patient_history
-            WHERE pid = ? AND id = ? AND history_type_key = ?";
-        $result =  sqlQuery($sql, array($pid, $id, 'name_history'));
-        $result['formatted_name'] = $this->formatPreviousName($result);
-
-        return $result;
-    }
-
-    /**
-     * Create a previous patient name history
-     * Updates not allowed for this history feature.
-     *
-     * @param string $pid patient internal id
-     * @param array $record array values to insert
-     * @return int | false new id or false if name already exist
-     */
-    public function createPatientNameHistory($pid, $record)
-    {
-        // we should never be null here but for legacy reasons we are going to default to this
-        $createdBy = $_SESSION['authUserID'] ?? null; // we don't let anyone else but the current user be the createdBy
-        if ($pid <= 0) {
-            return false;
-        }
-        $insertData = [
-            'pid' => $pid,
-            'history_type_key' => 'name_history',
-            'previous_name_prefix' => $record['previous_name_prefix'],
-            'previous_name_first' => $record['previous_name_first'],
-            'previous_name_middle' => $record['previous_name_middle'],
-            'previous_name_last' => $record['previous_name_last'],
-            'previous_name_suffix' => $record['previous_name_suffix'],
-            'previous_name_enddate' => $record['previous_name_enddate']
-        ];
-        $sql = "SELECT pid FROM " . self::PATIENT_HISTORY_TABLE . " WHERE
-            pid = ? AND
-            history_type_key = ? AND
-            previous_name_prefix = ? AND
-            previous_name_first = ? AND
-            previous_name_middle = ? AND
-            previous_name_last = ? AND
-            previous_name_suffix = ? AND
-            previous_name_enddate = ?
-        ";
-        $go_flag = QueryUtils::fetchSingleValue($sql, 'pid', $insertData);
-        // return false which calling routine should understand as existing name record
-        if (!empty($go_flag)) {
-            return false;
-        }
-        // finish up the insert
-        $insertData['created_by'] = $createdBy;
-        $insertData['uuid'] = UuidRegistry::getRegistryForTable(self::PATIENT_HISTORY_TABLE)->createUuid();
-        $insert = $this->buildInsertColumns($insertData);
-        $sql = "INSERT INTO " . self::PATIENT_HISTORY_TABLE . " SET " . $insert['set'];
-
-        return QueryUtils::sqlInsert($sql, $insert['bind']);
-    }
-
     public function formatPreviousName($item)
     {
-        if (
-            $item['previous_name_enddate'] === '0000-00-00'
-            || $item['previous_name_enddate'] === '00/00/0000'
-        ) {
-            $item['previous_name_enddate'] = '';
-        }
-        $item['previous_name_enddate'] = oeFormatShortDate($item['previous_name_enddate']);
-        $name = ($item['previous_name_prefix'] ? $item['previous_name_prefix'] . " " : "") .
-            $item['previous_name_first'] .
-            ($item['previous_name_middle'] ? " " . $item['previous_name_middle'] . " " : " ") .
-            $item['previous_name_last'] .
-            ($item['previous_name_suffix'] ? " " . $item['previous_name_suffix'] : "") .
-            ($item['previous_name_enddate'] ? " " . $item['previous_name_enddate'] : "");
-
-        return text($name);
+        return PatientNameHistoryService::formatPreviousName($item);
     }
 
     /**