Rename functions getFoo() to foo() and return collections instead of arrays

80 files changed, 208 insertions, 211 deletions

diff --git a/resources/views/admin/merge-records-step-2.phtml b/resources/views/admin/merge-records-step-2.phtml
index 684ba4f1a8..1374527969 100644
--- a/resources/views/admin/merge-records-step-2.phtml
+++ b/resources/views/admin/merge-records-step-2.phtml
@@ -39,7 +39,7 @@
                                     <div class="gedcom-data" dir="ltr"><?= e($fact->gedcom()) ?></div>
                                     <?php if ($fact->target() instanceof GedcomRecord) : ?>
                                         <a href="<?= e($fact->target()->url()) ?>">
-                                            <?= $fact->target()->getFullName() ?>
+                                            <?= $fact->target()->fullName() ?>
                                         </a>
                                     <?php endif ?>
                                 </td>
@@ -60,7 +60,7 @@
             <div class="card">
                 <div class="card-header">
                     <h2 class="card-title">
-                        <?= /* I18N: the name of an individual, source, etc. */ I18N::translate('The following facts and events were only found in the record of %s.', '<a href="' . e($record1->url()) . '">' . $record1->getFullName()) . '</a>' ?>
+                        <?= /* I18N: the name of an individual, source, etc. */ I18N::translate('The following facts and events were only found in the record of %s.', '<a href="' . e($record1->url()) . '">' . $record1->fullName()) . '</a>' ?>
                     </h2>
                 </div>
                 <div class="card-body">
@@ -86,7 +86,7 @@
                                             <div class="gedcom-data" dir="ltr"><?= e($fact->gedcom()) ?></div>
                                             <?php if ($fact->target() instanceof GedcomRecord) : ?>
                                                 <a href="<?= e($fact->target()->url()) ?>">
-                                                    <?= $fact->target()->getFullName() ?>
+                                                    <?= $fact->target()->fullName() ?>
                                                 </a>
                                             <?php endif ?>
                                         </td>
@@ -106,7 +106,7 @@
             <div class="card">
                 <div class="card-header">
                     <h2 class="card-title">
-                        <?= /* I18N: the name of an individual, source, etc. */ I18N::translate('The following facts and events were only found in the record of %s.', '<a href="' . e($record2->url()) . '">' . $record2->getFullName()) . '</a>' ?>
+                        <?= /* I18N: the name of an individual, source, etc. */ I18N::translate('The following facts and events were only found in the record of %s.', '<a href="' . e($record2->url()) . '">' . $record2->fullName()) . '</a>' ?>
                     </h2>
                 </div>
                 <div class="card-body">
@@ -132,7 +132,7 @@
                                             <div class="gedcom-data" dir="ltr"><?= e($fact->gedcom()) ?></div>
                                             <?php if ($fact->target() instanceof GedcomRecord) : ?>
                                                 <a href="<?= e($fact->target()->url()) ?>">
-                                                    <?= $fact->target()->getFullName() ?>
+                                                    <?= $fact->target()->fullName() ?>
                                                 </a>
                                             <?php endif ?>
                                         </td>
diff --git a/resources/views/admin/trees-duplicates.phtml b/resources/views/admin/trees-duplicates.phtml
index 7d8da4778c..a91e1b63ba 100644
--- a/resources/views/admin/trees-duplicates.phtml
+++ b/resources/views/admin/trees-duplicates.phtml
@@ -11,7 +11,7 @@
         <ul>
             <?php foreach ($records as $duplicates) : ?>
                 <li>
-                    <?= $duplicates[0]->getFullName() ?>
+                    <?= $duplicates[0]->fullName() ?>
                     <?php foreach ($duplicates as $record) : ?>
                         —
                         <a href="<?= e($record->url()) ?>">
diff --git a/resources/views/admin/trees-privacy.phtml b/resources/views/admin/trees-privacy.phtml
index 8b724ac592..5bd9751d94 100644
--- a/resources/views/admin/trees-privacy.phtml
+++ b/resources/views/admin/trees-privacy.phtml
@@ -235,7 +235,7 @@ use Fisharebest\Webtrees\View; ?>
                 <tr>
                     <td>
                         <?php if ($privacy_restriction->record) : ?>
-                            <a href="<?= e($privacy_restriction->record->url()) ?>"><?= $privacy_restriction->record->getFullName() ?></a>
+                            <a href="<?= e($privacy_restriction->record->url()) ?>"><?= $privacy_restriction->record->fullName() ?></a>
                         <?php elseif ($privacy_restriction->xref) : ?>
                             <div class="text-danger">
                                 <?= $privacy_restriction->xref ?> — <?= I18N::translate('This record does not exist.') ?>
diff --git a/resources/views/admin/trees-unconnected.phtml b/resources/views/admin/trees-unconnected.phtml
index 273f54ba85..96d4605ad6 100644
--- a/resources/views/admin/trees-unconnected.phtml
+++ b/resources/views/admin/trees-unconnected.phtml
@@ -14,14 +14,14 @@
     </button>
 </form>
 
-<p><?= I18N::translate('These groups of individuals are not related to %s.', $root->getFullName()) ?></p>
+<p><?= I18N::translate('These groups of individuals are not related to %s.', $root->fullName()) ?></p>
 
 <?php foreach ($individual_groups as $group) : ?>
     <h2><?= I18N::plural('%s individual', '%s individuals', count($group), I18N::number(count($group))) ?></h2>
     <ul>
         <?php foreach ($group as $individual) : ?>
             <li>
-                <a href="<?= e($individual->url()) ?>"><?= $individual->getFullName() ?></a>
+                <a href="<?= e($individual->url()) ?>"><?= $individual->fullName() ?></a>
             </li>
         <?php endforeach ?>
     </ul>
diff --git a/resources/views/chart-box.phtml b/resources/views/chart-box.phtml
index 131cf029b9..6f9fca96ba 100644
--- a/resources/views/chart-box.phtml
+++ b/resources/views/chart-box.phtml
@@ -31,15 +31,15 @@ $menus = $module_service->findByComponent('chart', $individual->tree(), Auth::us
     return $module->chartBoxMenu($individual);
 })->filter();
 
-foreach ($individual->getSpouseFamilies() as $family) {
+foreach ($individual->spouseFamilies() as $family) {
     $menus[] = new Menu('<strong>' . I18N::translate('Family with spouse') . '</strong>', $family->url());
-    $spouse  = $family->getSpouse($individual);
+    $spouse  = $family->spouse($individual);
     if ($spouse && $spouse->canShow()) {
-        $menus->push(new Menu($spouse->getFullName(), $spouse->url()));
+        $menus->push(new Menu($spouse->fullName(), $spouse->url()));
     }
-    foreach ($family->getChildren() as $child) {
+    foreach ($family->children() as $child) {
         if ($child->canShow()) {
-            $menus->push(new Menu($child->getFullName(), $child->url()));
+            $menus->push(new Menu($child->fullName(), $child->url()));
         }
     }
 }
@@ -76,16 +76,16 @@ foreach ($individual->getSpouseFamilies() as $family) {
     ];
 
 
-/** @var Fact[] $all_facts */
+/** @var Collection|Fact[] $all_facts */
 $all_facts = $individual->facts();
-foreach ($individual->getSpouseFamilies() as $family) {
+foreach ($individual->spouseFamilies() as $family) {
     foreach ($family->facts() as $fact) {
-        $all_facts[] = $fact;
+        $all_facts->push($fact);
     }
 }
 Functions::sortFacts($all_facts);
 
-$all_facts = array_filter($all_facts, function (Fact $fact) use ($exclude): bool {
+$all_facts = $all_facts->filter(function (Fact $fact) use ($exclude): bool {
     return !in_array($fact->getTag(), $exclude);
 });
 
@@ -96,7 +96,7 @@ $id = Uuid::uuid4()->toString();
  * @var Individual $individual
  */
 ?>
-<div class="wt-chart-box wt-chart-box-<?= strtolower($individual->getSex()) ?>" style="overflow: hidden;" data-xref="<?= e($individual->xref()) ?>" data-tree="<?= e($individual->tree()->name()) ?>">
+<div class="wt-chart-box wt-chart-box-<?= strtolower($individual->sex()) ?>" style="overflow: hidden;" data-xref="<?= e($individual->xref()) ?>" data-tree="<?= e($individual->tree()->name()) ?>">
     <?php if ($individual->canShow() && $individual->tree()->getPreference('SHOW_HIGHLIGHT_IMAGES')) : ?>
         <div class="wt-chart-box-thumbnail float-left mr-1">
             <?= $individual->displayImage(40, 50, 'crop', ['class' => 'wt-chart-box-thumbnail']) ?>
@@ -133,11 +133,11 @@ $id = Uuid::uuid4()->toString();
     </div>
 
     <div class="wt-chart-box-name font-weight-bold">
-        <a href="<?= e($individual->url()) ?>" class="wt-chart-box-name"><?= $individual->getFullName() ?></a>
+        <a href="<?= e($individual->url()) ?>" class="wt-chart-box-name"><?= $individual->fullName() ?></a>
     </div>
 
     <div class="wt-chart-box-name font-weight-bold">
-        <?= $individual->getAddName() ?>
+        <?= $individual->alternateName() ?>
     </div>
 
     <div class="wt-chart-box-lifespan">
@@ -152,7 +152,7 @@ $id = Uuid::uuid4()->toString();
 
             foreach (Gedcom::BIRTH_EVENTS as $birttag) {
                 if (!in_array($birttag, $opt_tags)) {
-                    $event = $individual->getFirstFact($birttag);
+                    $event = $individual->firstFact($birttag);
                     if ($event instanceof Fact) {
                         echo $event->summary();
                         break;
@@ -162,7 +162,7 @@ $id = Uuid::uuid4()->toString();
             // Show optional events (before death)
             foreach ($opt_tags as $key => $tag) {
                 if (!in_array($tag, Gedcom::DEATH_EVENTS)) {
-                    $event = $individual->getFirstFact($tag);
+                    $event = $individual->firstFact($tag);
                     if ($event instanceof Fact) {
                         echo $event->summary();
                         unset($opt_tags[$key]);
@@ -171,7 +171,7 @@ $id = Uuid::uuid4()->toString();
             }
             // Show DEAT or equivalent event
             foreach (Gedcom::DEATH_EVENTS as $deattag) {
-                $event = $individual->getFirstFact($deattag);
+                $event = $individual->firstFact($deattag);
                 if ($event instanceof Fact) {
                     echo $event->summary();
                     if (in_array($deattag, $opt_tags)) {
@@ -182,7 +182,7 @@ $id = Uuid::uuid4()->toString();
             }
             // Show remaining optional events (after death)
             foreach ($opt_tags as $tag) {
-                $event = $individual->getFirstFact($tag);
+                $event = $individual->firstFact($tag);
                 if ($event instanceof Fact) {
                     echo $event->summary();
                 }
diff --git a/resources/views/edit-account-page.phtml b/resources/views/edit-account-page.phtml
index 22cf252c43..e558aac29d 100644
--- a/resources/views/edit-account-page.phtml
+++ b/resources/views/edit-account-page.phtml
@@ -42,7 +42,7 @@
         <div class="col-sm-9 wt-page-options-value">
             <select class="form-control" id="gedcom-id" aria-describedby="gedcom-id-description" disabled>
                 <?php if ($my_individual_record !== null) : ?>
-                    <option value=""><?= $my_individual_record->getFullName() ?></option>
+                    <option value=""><?= $my_individual_record->fullName() ?></option>
                 <?php else : ?>
                     <option value=""><?= I18N::translateContext('unknown people', 'Unknown') ?></option>
                 <?php endif ?>
diff --git a/resources/views/edit/change-family-members.phtml b/resources/views/edit/change-family-members.phtml
index da56ec535a..2c3be8b9e5 100644
--- a/resources/views/edit/change-family-members.phtml
+++ b/resources/views/edit/change-family-members.phtml
@@ -11,9 +11,9 @@
 
     <div class="form-group row">
         <label class="col-sm-3 col-form-label wt-page-options-label" for="HUSB">
-            <?php if ($father !== null && $father->getSex() === 'M') : ?>
+            <?php if ($father !== null && $father->sex() === 'M') : ?>
                 <?= I18N::translate('Husband') ?>
-            <?php elseif ($father !== null && $father->getSex() === 'F') : ?>
+            <?php elseif ($father !== null && $father->sex() === 'F') : ?>
                 <?= I18N::translate('Wife') ?>
             <?php else : ?>
                 <?= I18N::translate('Spouse') ?>
@@ -26,9 +26,9 @@
 
     <div class="form-group row">
         <label class="col-sm-3 col-form-label wt-page-options-label" for="WIFE">
-            <?php if ($mother !== null && $mother->getSex() === 'M') : ?>
+            <?php if ($mother !== null && $mother->sex() === 'M') : ?>
                 <?= I18N::translate('Husband') ?>
-            <?php elseif ($mother !== null && $mother->getSex() === 'F') : ?>
+            <?php elseif ($mother !== null && $mother->sex() === 'F') : ?>
                 <?= I18N::translate('Wife') ?>
             <?php else : ?>
                 <?= I18N::translate('Spouse') ?>
@@ -42,9 +42,9 @@
     <?php foreach ($children as $n => $child) : ?>
         <div class="form-group row">
             <label class="col-sm-3 col-form-label wt-page-options-label" for="CHIL<?= e($n) ?>">
-                <?php if ($child !== null && $child->getSex() === 'M') : ?>
+                <?php if ($child !== null && $child->sex() === 'M') : ?>
                     <?= I18N::translate('Son') ?>
-                <?php elseif ($child !== null && $child->getSex() === 'F') : ?>
+                <?php elseif ($child !== null && $child->sex() === 'F') : ?>
                     <?= I18N::translate('Daughter') ?>
                 <?php else : ?>
                     <?= I18N::translate('Child') ?>
diff --git a/resources/views/edit/new-individual.phtml b/resources/views/edit/new-individual.phtml
index 5cd96b58af..f43ee4ccd2 100644
--- a/resources/views/edit/new-individual.phtml
+++ b/resources/views/edit/new-individual.phtml
@@ -65,15 +65,15 @@ if ($name_fact !== null) {
 
     // Inherit surname from parents, spouse or child
     if ($family) {
-        $father = $family->getHusband();
-        if ($father && $father->getFirstFact('NAME')) {
-            $father_name = $father->getFirstFact('NAME')->value();
+        $father = $family->husband();
+        if ($father && $father->firstFact('NAME')) {
+            $father_name = $father->firstFact('NAME')->value();
         } else {
             $father_name = '';
         }
-        $mother = $family->getWife();
-        if ($mother && $mother->getFirstFact('NAME')) {
-            $mother_name = $mother->getFirstFact('NAME')->value();
+        $mother = $family->wife();
+        if ($mother && $mother->firstFact('NAME')) {
+            $mother_name = $mother->firstFact('NAME')->value();
         } else {
             $mother_name = '';
         }
@@ -83,8 +83,8 @@ if ($name_fact !== null) {
         $father_name = '';
         $mother_name = '';
     }
-    if ($individual && $individual->getFirstFact('NAME')) {
-        $indi_name = $individual->getFirstFact('NAME')->value();
+    if ($individual && $individual->firstFact('NAME')) {
+        $indi_name = $individual->firstFact('NAME')->value();
     } else {
         $indi_name = '';
     }
@@ -94,7 +94,7 @@ if ($name_fact !== null) {
             $name_fields = array_merge($name_fields, $surname_tradition->newChildNames($father_name, $mother_name, $gender));
             break;
         case 'add_child_to_individual_action':
-            if ($individual->getSex() === 'F') {
+            if ($individual->sex() === 'F') {
                 $name_fields = array_merge($name_fields, $surname_tradition->newChildNames('', $indi_name, $gender));
             } else {
                 $name_fields = array_merge($name_fields, $surname_tradition->newChildNames($indi_name, '', $gender));
diff --git a/resources/views/edit/paste-fact-row.phtml b/resources/views/edit/paste-fact-row.phtml
index 5ff0c3a0a6..31ee680dc6 100644
--- a/resources/views/edit/paste-fact-row.phtml
+++ b/resources/views/edit/paste-fact-row.phtml
@@ -15,7 +15,7 @@
                     <option value="<?= e($fact->id()) ?>">
                         <?= $fact->label() ?>
                         <?php if ($fact->target() !== null) : ?>
-                            – <?= strip_tags($fact->target()->getFullName()) ?>
+                            – <?= strip_tags($fact->target()->fullName()) ?>
                         <?php elseif ($fact->value() !== '') : ?>
                             – <?= e($fact->value()) ?>
                         <?php endif ?>
diff --git a/resources/views/edit/raw-gedcom-record.phtml b/resources/views/edit/raw-gedcom-record.phtml
index cd94fc1aba..661e5f7783 100644
--- a/resources/views/edit/raw-gedcom-record.phtml
+++ b/resources/views/edit/raw-gedcom-record.phtml
@@ -17,7 +17,7 @@
 
     <div class="card">
         <label class="card-header py-1 px-2" for="fact0">
-            <?= $record->getFullName() ?>
+            <?= $record->fullName() ?>
         </label>
         <div class="card-body form-control py-1 px-2">
             <textarea class="card-body form-control py-1 px-2" dir="ltr" id="fact0" rows="1">0 @<?= e($record->xref()) ?>@ <?= e($record::RECORD_TYPE) ?></textarea>
diff --git a/resources/views/edit/reorder-children.phtml b/resources/views/edit/reorder-children.phtml
index c23426b68e..3f43a48eae 100644
--- a/resources/views/edit/reorder-children.phtml
+++ b/resources/views/edit/reorder-children.phtml
@@ -12,7 +12,7 @@
                 <input type="hidden" name="order[]" value="<?= $fact->id() ?>">
                 <h3 class="card-header">
                     <?= view('icons/drag-handle') ?>
-                    <?= $fact->target()->getFullName() ?>
+                    <?= $fact->target()->fullName() ?>
                 </h3>
                 <div class="card-body">
                     <?= $fact->target()->formatFirstMajorFact(Gedcom::BIRTH_EVENTS, 2) ?>
diff --git a/resources/views/edit/reorder-media.phtml b/resources/views/edit/reorder-media.phtml
index 2df128d36f..4903ee49ee 100644
--- a/resources/views/edit/reorder-media.phtml
+++ b/resources/views/edit/reorder-media.phtml
@@ -11,7 +11,7 @@
                 <input type="hidden" name="order[]" value="<?= $fact->id() ?>">
                 <h3 class="card-header">
                     <?= view('icons/drag-handle') ?>
-                    <?= $fact->target()->getFullName() ?>
+                    <?= $fact->target()->fullName() ?>
                 </h3>
                 <div class="card-body">
                     <?= $fact->target()->displayImage(100, 100, "contain") ?>
diff --git a/resources/views/edit/reorder-spouses.phtml b/resources/views/edit/reorder-spouses.phtml
index 2da64355d9..376748e1f4 100644
--- a/resources/views/edit/reorder-spouses.phtml
+++ b/resources/views/edit/reorder-spouses.phtml
@@ -12,7 +12,7 @@
                 <input type="hidden" name="order[]" value="<?= $fact->id() ?>">
                 <h3 class="card-header">
                     <?= view('icons/drag-handle') ?>
-                    <?= $fact->target()->getFullName() ?>
+                    <?= $fact->target()->fullName() ?>
                 </h3>
                 <div class="card-body">
                     <?= $fact->target()->formatFirstMajorFact(Gedcom::MARRIAGE_EVENTS, 2) ?>
diff --git a/resources/views/family-page-menu.phtml b/resources/views/family-page-menu.phtml
index 07580f2887..f6da617ff2 100644
--- a/resources/views/family-page-menu.phtml
+++ b/resources/views/family-page-menu.phtml
@@ -15,7 +15,7 @@
             <?= I18N::translate('Add a child to this family') ?>
         </a>
 
-        <?php if ($record->getNumberOfChildren() > 1) : ?>
+        <?php if ($record->numberOfChildren() > 1) : ?>
             <a class="dropdown-item menu-fam-orderchil" href="<?= e(route('reorder-children', ['ged' => $record->tree()->name(), 'xref' => $record->xref()])) ?>">
                 <?= I18N::translate('Re-order children') ?>
             </a>
diff --git a/resources/views/family-page.phtml b/resources/views/family-page.phtml
index e14d541a58..9f9dbe1dbc 100644
--- a/resources/views/family-page.phtml
+++ b/resources/views/family-page.phtml
@@ -21,7 +21,7 @@
 
 <div class="d-flex mb-4">
     <h2 class="wt-page-title mx-auto">
-        <?= $record->getFullName() ?>
+        <?= $record->fullName() ?>
     </h2>
     <?php if ($record->canEdit() && !$record->isPendingDeletion()) : ?>
         <?= view('family-page-menu', ['record' => $record]) ?>
@@ -44,13 +44,13 @@
                         <td colspan="2">
                             <?php FunctionsCharts::printFamilyParents($record) ?>
                             <?php if (Auth::isEditor($record->tree())) : ?>
-                                <?php if ($record->getHusband() === null) : ?>
+                                <?php if ($record->husband() === null) : ?>
                                     <a href="<?= e(route('add-spouse-to-family', ['ged=' => $record->tree()->name(), 'xref' => $record->xref(), 'famtag' => 'HUSB'])) ?>">
                                         <?= I18N::translate('Add a father') ?>
                                     </a>
                                     <br>
                                 <?php endif ?>
-                                <?php if ($record->getWife() === null) : ?>
+                                <?php if ($record->wife() === null) : ?>
                                     <a href="<?= e(route('add-spouse-to-family', ['ged=' => $record->tree()->name(), 'xref' => $record->xref(), 'famtag' => 'WIFE'])) ?>">
                                         <?= I18N::translate('Add a mother') ?>
                                     </a>
@@ -65,7 +65,7 @@
     </table>
     <span class="subheaders"><?= I18N::translate('Family group information') ?></span>
     <table class="table wt-facts-table">
-        <?php if (empty($facts)) : ?>
+        <?php if ($facts->isEmpty()) : ?>
             <tr>
                 <td class="messagebox" colspan="2">
                     <?= I18N::translate('No facts exist for this family.') ?>
diff --git a/resources/views/gedcom-record-page-menu.phtml b/resources/views/gedcom-record-page-menu.phtml
index 7a348f5332..df82084185 100644
--- a/resources/views/gedcom-record-page-menu.phtml
+++ b/resources/views/gedcom-record-page-menu.phtml
@@ -7,7 +7,7 @@
         <?= I18N::translate('edit') ?>
     </button>
     <div class="dropdown-menu dropdown-menu-right wt-page-menu-items" aria-labelledby="page-menu">
-        <a class="dropdown-item menu-indi-del" href="#" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', strip_tags($record->getFullName())) ?>" onclick="return confirm(this.dataset.confirm) && delete_record('<?= e($record->xref()) ?>', '<?= e($record->tree()->name()) ?>');">
+        <a class="dropdown-item menu-indi-del" href="#" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', strip_tags($record->fullName())) ?>" onclick="return confirm(this.dataset.confirm) && delete_record('<?= e($record->xref()) ?>', '<?= e($record->tree()->name()) ?>');">
             <?= I18N::translate('Delete') ?>
         </a>
 
diff --git a/resources/views/gedcom-record-page.phtml b/resources/views/gedcom-record-page.phtml
index ccb234f638..0bdfe24dc1 100644
--- a/resources/views/gedcom-record-page.phtml
+++ b/resources/views/gedcom-record-page.phtml
@@ -20,7 +20,7 @@
 
 <div class="d-flex mb-4">
     <h2 class="wt-page-title mx-auto">
-        <?= $record->getFullName() ?>
+        <?= $record->fullName() ?>
     </h2>
     <?php if ($record->canEdit() && !$record->isPendingDeletion()) : ?>
         <?= view('gedcom-record-page-menu', ['record' => $record]) ?>
diff --git a/resources/views/individual-page-menu.phtml b/resources/views/individual-page-menu.phtml
index f29dda6349..83096b8578 100644
--- a/resources/views/individual-page-menu.phtml
+++ b/resources/views/individual-page-menu.phtml
@@ -24,14 +24,14 @@
             </a>
         <?php endif ?>
 
-        <?php if (empty($individual->facts(['SEX']))) : ?>
+        <?php if ($individual->facts(['SEX'])->isEmpty()) : ?>
             <a class="dropdown-item menu-indi-editraw" href="<?= e(route('add-fact', ['fact' => 'SEX', 'ged' => $individual->tree()->name(), 'xref' => $individual->xref()])) ?>">
                 <?= I18N::translate('Edit the gender') ?>
             </a>
         <?php endif ?>
 
 
-        <a class="dropdown-item menu-indi-del" href="#" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', strip_tags($individual->getFullName())) ?>" onclick="return confirm(this.dataset.confirm) && delete_record('<?= e($individual->xref()) ?>', '<?= e($individual->tree()->name()) ?>');">
+        <a class="dropdown-item menu-indi-del" href="#" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', strip_tags($individual->fullName())) ?>" onclick="return confirm(this.dataset.confirm) && delete_record('<?= e($individual->xref()) ?>', '<?= e($individual->tree()->name()) ?>');">
             <?= I18N::translate('Delete') ?>
         </a>
 
diff --git a/resources/views/individual-page.phtml b/resources/views/individual-page.phtml
index c922e95195..b70b06c6d6 100644
--- a/resources/views/individual-page.phtml
+++ b/resources/views/individual-page.phtml
@@ -25,7 +25,7 @@
 
 <div class="d-flex mb-4">
     <h2 class="wt-page-title mx-auto">
-        <?= $individual->getFullName() ?><?= $user_link ?>, <?= $individual->getLifeSpan() ?> <?= $age ?>
+        <?= $individual->fullName() ?><?= $user_link ?>, <?= $individual->getLifeSpan() ?> <?= $age ?>
     </h2>
     <?php if ($individual->canEdit() && !$individual->isPendingDeletion()) : ?>
         <?= view('individual-page-menu', ['individual' => $individual, 'count_names' => $count_names, 'count_sex' => $count_sex]) ?>
@@ -38,7 +38,7 @@
             <!-- Individual images -->
             <div class="col-sm-3">
                 <?php if (empty($individual_media)) : ?>
-                    <i class="wt-individual-silhouette wt-individual-silhouette-<?= strtolower($individual->getSex()) ?>"></i>
+                    <i class="wt-individual-silhouette wt-individual-silhouette-<?= strtolower($individual->sex()) ?>"></i>
                 <?php elseif (count($individual_media) === 1) : ?>
                     <?= $individual_media[0]->displayImage(200, 260, 'crop', ['class' => 'img-thumbnail img-fluid w-100']) ?>
                 <?php else : ?>
@@ -63,7 +63,7 @@
                 <?php endif ?>
 
                 <?php if (Auth::isEditor($individual->tree())) : ?>
-                    <?php if (count($individual->facts(['OBJE'])) > 1) : ?>
+                    <?php if ($individual->facts(['OBJE'])->count() > 1) : ?>
                         <div>
                             <a href="<?= e(route('reorder-media', ['ged' => $individual->tree()->name(), 'xref' => $individual->xref()])) ?>">
                                 <?= view('icons/reorder') ?>
diff --git a/resources/views/lists/families-table.phtml b/resources/views/lists/families-table.phtml
index e1724a0230..b115fd79f4 100644
--- a/resources/views/lists/families-table.phtml
+++ b/resources/views/lists/families-table.phtml
@@ -225,12 +225,12 @@ for ($year = 1550; $year < 2030; $year += 10) {
         <tbody>
 
         <?php foreach ($families as $family) : ?>
-            <?php $husb = $family->getHusband() ?? new Individual('H', '0 @H@ INDI', null, $family->tree()) ?>
-            <?php $wife = $family->getWife() ?? new Individual('W', '0 @W@ INDI', null, $family->tree()) ?>
+            <?php $husb = $family->husband() ?? new Individual('H', '0 @H@ INDI', null, $family->tree()) ?>
+            <?php $wife = $family->wife() ?? new Individual('W', '0 @W@ INDI', null, $family->tree()) ?>
 
             <tr class="<?= $family->isPendingDeletion() ? 'old' : ($family->isPendingAddition() ? 'new' : '') ?>">
                 <!-- Husband name -->
-                <td colspan="2" data-sort="<?= e(str_replace([',', '@P.N.', '@N.N.'], 'AAAA', implode(',', array_reverse(explode(',', $husb->getSortName()))))) ?>">
+                <td colspan="2" data-sort="<?= e(str_replace([',', '@P.N.', '@N.N.'], 'AAAA', implode(',', array_reverse(explode(',', $husb->sortName()))))) ?>">
                     <?php foreach ($husb->getAllNames() as $num => $name) : ?>
                         <?php if ($name['type'] != '_MARNM' || $num == $husb->getPrimaryName()) : ?>
                         <a title="<?= $name['type'] === 'NAME' ? '' : GedcomTag::getLabel($name['type'], $husb) ?>" href="<?= e($family->url()) ?>" class="<?= $num === $husb->getPrimaryName() ? 'name2' : '' ?>">
@@ -245,7 +245,7 @@ for ($year = 1550; $year < 2030; $year += 10) {
                     <?= $husb->getPrimaryParentsNames('parents details1', 'none') ?>
                 </td>
 
-                <td hidden data-sort="<?= e(str_replace([',', '@P.N.', '@N.N.'], 'AAAA', $husb->getSortName())) ?>"></td>
+                <td hidden data-sort="<?= e(str_replace([',', '@P.N.', '@N.N.'], 'AAAA', $husb->sortName())) ?>"></td>
 
                 <!-- Husband age -->
                 <?php
@@ -253,11 +253,11 @@ for ($year = 1550; $year < 2030; $year += 10) {
                 $hdate = $husb->getBirthDate();
                 if ($hdate->isOK() && $mdate->isOK()) {
                     if ($hdate->gregorianYear() >= 1550 && $hdate->gregorianYear() < 2030) {
-                        $birt_by_decade[(int) ($hdate->gregorianYear() / 10) * 10] .= $husb->getSex();
+                        $birt_by_decade[(int) ($hdate->gregorianYear() / 10) * 10] .= $husb->sex();
                     }
                     $hage = Date::getAgeYears($hdate, $mdate);
                     if ($hage >= 0 && $hage <= $max_age) {
-                        $marr_by_age[$hage] .= $husb->getSex();
+                        $marr_by_age[$hage] .= $husb->sex();
                     }
                 }
                 ?>
@@ -266,7 +266,7 @@ for ($year = 1550; $year < 2030; $year += 10) {
                 </td>
 
                 <!-- Wife name -->
-                <td colspan="2" data-sort="<?= e(str_replace([',', '@P.N.', '@N.N.'], 'AAAA', implode(',', array_reverse(explode(',', $wife->getSortName()))))) ?>">
+                <td colspan="2" data-sort="<?= e(str_replace([',', '@P.N.', '@N.N.'], 'AAAA', implode(',', array_reverse(explode(',', $wife->sortName()))))) ?>">
                     <?php foreach ($wife->getAllNames() as $num => $name) : ?>
                         <?php if ($name['type'] != '_MARNM' || $num == $wife->getPrimaryName()) : ?>
                             <a title="<?= $name['type'] === 'NAME' ? '' : GedcomTag::getLabel($name['type'], $wife) ?>" href="<?= e($family->url()) ?>" class="<?= $num === $wife->getPrimaryName() ? 'name2' : '' ?>">
@@ -281,18 +281,18 @@ for ($year = 1550; $year < 2030; $year += 10) {
                     <?= $wife->getPrimaryParentsNames('parents details1', 'none') ?>
                 </td>
 
-                <td hidden data-sort="<?= e(str_replace([',', '@P.N.', '@N.N.'], 'AAAA', $wife->getSortName())) ?>"></td>
+                <td hidden data-sort="<?= e(str_replace([',', '@P.N.', '@N.N.'], 'AAAA', $wife->sortName())) ?>"></td>
 
                 <!-- Wife age -->
                 <?php
                 $wdate = $wife->getBirthDate();
                 if ($wdate->isOK() && $mdate->isOK()) {
                     if ($wdate->gregorianYear() >= 1550 && $wdate->gregorianYear() < 2030) {
-                        $birt_by_decade[(int) ($wdate->gregorianYear() / 10) * 10] .= $wife->getSex();
+                        $birt_by_decade[(int) ($wdate->gregorianYear() / 10) * 10] .= $wife->sex();
                     }
                     $wage = Date::getAgeYears($wdate, $mdate);
                     if ($wage >= 0 && $wage <= $max_age) {
-                        $marr_by_age[$wage] .= $wife->getSex();
+                        $marr_by_age[$wage] .= $wife->sex();
                     }
                 }
                 ?>
@@ -308,11 +308,11 @@ for ($year = 1550; $year < 2030; $year += 10) {
                             <div><?= $marriage_date->display(true) ?></div>
                         <?php endforeach ?>
                         <?php if ($marriage_dates[0]->gregorianYear() >= 1550 && $marriage_dates[0]->gregorianYear() < 2030) : ?>
-                            <?php $marr_by_decade[(int) ($marriage_dates[0]->gregorianYear() / 10) * 10] .= $husb->getSex() . $wife->getSex() ?>
+                            <?php $marr_by_decade[(int) ($marriage_dates[0]->gregorianYear() / 10) * 10] .= $husb->sex() . $wife->sex() ?>
                         <?php endif ?>
-                    <?php elseif ($family->facts(['_NMR'])) : ?>
+                    <?php elseif ($family->facts(['_NMR'])->isNotEmpty()) : ?>
                         <?= I18N::translate('no') ?>
-                    <?php elseif ($family->facts(['MARR'])) : ?>
+                    <?php elseif ($family->facts(['MARR'])->isNotEmpty()) : ?>
                             <?= I18N::translate('yes') ?>
                     <?php endif ?>
                 </td>
@@ -331,8 +331,8 @@ for ($year = 1550; $year < 2030; $year += 10) {
                 </td>
 
                 <!-- Number of children -->
-                <td class="text-center" data-sort="<?= $family->getNumberOfChildren() ?>">
-                    <?= I18N::number($family->getNumberOfChildren()) ?>
+                <td class="text-center" data-sort="<?= $family->numberOfChildren() ?>">
+                    <?= I18N::number($family->numberOfChildren()) ?>
                 </td>
 
                 <!-- Last change -->
@@ -349,10 +349,10 @@ for ($year = 1550; $year < 2030; $year += 10) {
                     <?php else : ?>
                         YES
                     <?php endif ?>
-                    <?php if ($family->facts(Gedcom::DIVORCE_EVENTS)) : ?>
+                    <?php if ($family->facts(Gedcom::DIVORCE_EVENTS)->isNotEmpty()) : ?>
                         D
                     <?php endif ?>
-                    <?php if (count($husb->getSpouseFamilies()) > 1 || count($wife->getSpouseFamilies()) > 1) : ?>
+                    <?php if (count($husb->spouseFamilies()) > 1 || count($wife->spouseFamilies()) > 1) : ?>
                         M
                     <?php endif ?>
                 </td>
@@ -363,18 +363,18 @@ for ($year = 1550; $year < 2030; $year += 10) {
                         Y
                     <?php endif ?>
                     <?php if ($husb->isDead() && !$wife->isDead()) : ?>
-                        <?php if ($wife->getSex() == 'F') : ?>
+                        <?php if ($wife->sex() == 'F') : ?>
                             H
                         <?php endif ?>
-                        <?php if ($wife->getSex() == 'M') : ?>
+                        <?php if ($wife->sex() == 'M') : ?>
                             W
                         <?php endif ?>
                     <?php endif ?>
                     <?php if (!$husb->isDead() && $wife->isDead()) : ?>
-                        <?php if ($husb->getSex() == 'M') : ?>
+                        <?php if ($husb->sex() == 'M') : ?>
                             W
                         <?php endif ?>
-                        <?php if ($husb->getSex() == 'F') : ?>
+                        <?php if ($husb->sex() == 'F') : ?>
                             H
                         <?php endif ?>
                     <?php endif ?>
@@ -385,9 +385,9 @@ for ($year = 1550; $year < 2030; $year += 10) {
 
                 <!-- Filter by roots/leaves -->
                 <td hidden>
-                    <?php if (!$husb->getChildFamilies() && !$wife->getChildFamilies()) : ?>
+                    <?php if (!$husb->childFamilies() && !$wife->childFamilies()) : ?>
                         R
-                    <?php elseif (!$husb->isDead() && !$wife->isDead() && $family->getNumberOfChildren() === 0) : ?>
+                    <?php elseif (!$husb->isDead() && !$wife->isDead() && $family->numberOfChildren() === 0) : ?>
                         L
                     <?php endif ?>
                 </td>
diff --git a/resources/views/lists/individuals-table.phtml b/resources/views/lists/individuals-table.phtml
index ea0205aa4a..2ae2c0fd0e 100644
--- a/resources/views/lists/individuals-table.phtml
+++ b/resources/views/lists/individuals-table.phtml
@@ -251,7 +251,7 @@ for ($year = 1550; $year < 2030; $year += 10) {
         <tbody>
             <?php foreach ($individuals as $key => $individual) : ?>
             <tr class="<?= $individual->isPendingDeletion() ? 'old' : ($individual->isPendingAddition() ? 'new' : '') ?>">
-                <td colspan="2" data-sort="<?= e(str_replace([',', '@P.N.', '@N.N.'], 'AAAA', implode(',', array_reverse(explode(',', $individual->getSortName()))))) ?>">
+                <td colspan="2" data-sort="<?= e(str_replace([',', '@P.N.', '@N.N.'], 'AAAA', implode(',', array_reverse(explode(',', $individual->sortName()))))) ?>">
                     <?php foreach ($individual->getAllNames() as $num => $name) : ?>
                         <a title="<?= $name['type'] === 'NAME' ? '' : GedcomTag::getLabel($name['type'], $individual) ?>" href="<?= e($individual->url()) ?>" class="<?= $num === $individual->getPrimaryName() ? 'name2' : '' ?>">
                             <?= $name['full'] ?>
@@ -264,7 +264,7 @@ for ($year = 1550; $year < 2030; $year += 10) {
                     <?= $individual->getPrimaryParentsNames('parents details1', 'none') ?>
                 </td>
 
-                <td hidden data-sort="<?= e(str_replace([',', '@P.N.', '@N.N.'], 'AAAA', $individual->getSortName())) ?>"></td>
+                <td hidden data-sort="<?= e(str_replace([',', '@P.N.', '@N.N.'], 'AAAA', $individual->sortName())) ?>"></td>
 
                 <td class="text-center" data-sort="<?= $key ?>">
                     <?php if ($sosa) : ?>
@@ -291,7 +291,7 @@ for ($year = 1550; $year < 2030; $year += 10) {
                 <!-- Birth anniversary -->
                 <td class="text-center" data-sort="<?= -$individual->getEstimatedBirthDate()->julianDay() ?>">
                     <?php if (isset($birth_dates[0]) && $birth_dates[0]->gregorianYear() >= 1550 && $birth_dates[0]->gregorianYear() < 2030 && !isset($unique_indis[$individual->xref()])) : ?>
-                        <?php $birt_by_decade[(int) ($birth_dates[0]->gregorianYear() / 10) * 10] .= $individual->getSex() ?>
+                        <?php $birt_by_decade[(int) ($birth_dates[0]->gregorianYear() / 10) * 10] .= $individual->sex() ?>
                         <?= Date::getAge($birth_dates[0], null) ?>
                     <?php endif ?>
                 </td>
@@ -305,8 +305,8 @@ for ($year = 1550; $year < 2030; $year += 10) {
                 </td>
 
                 <!-- Number of children -->
-                <td class="text-center" data-sort="<?= $individual->getNumberOfChildren() ?>">
-                    <?= I18N::number($individual->getNumberOfChildren()) ?>
+                <td class="text-center" data-sort="<?= $individual->numberOfChildren() ?>">
+                    <?= I18N::number($individual->numberOfChildren()) ?>
                 </td>
 
                 <!--    Death date -->
@@ -321,7 +321,7 @@ for ($year = 1550; $year < 2030; $year += 10) {
                 <!-- Death anniversary -->
                 <td class="text-center" data-sort="<?= -$individual->getEstimatedDeathDate()->julianDay() ?>">
                     <?php if (isset($death_dates[0]) && $death_dates[0]->gregorianYear() >= 1550 && $death_dates[0]->gregorianYear() < 2030 && !isset($unique_indis[$individual->xref()])) : ?>
-                        <?php $deat_by_decade[(int) ($death_dates[0]->gregorianYear() / 10) * 10] .= $individual->getSex() ?>
+                        <?php $deat_by_decade[(int) ($death_dates[0]->gregorianYear() / 10) * 10] .= $individual->sex() ?>
                         <?= Date::getAge($death_dates[0], null) ?>
                     <?php endif ?>
                 </td>
@@ -331,7 +331,7 @@ for ($year = 1550; $year < 2030; $year += 10) {
                     <?php $age_at_death = I18N::number((int) Date::getAgeYears($birth_dates[0], $death_dates[0])); ?>
                     <?php $age_at_death_sort = Date::getAge($birth_dates[0], $death_dates[0]); ?>
                     <?php if (!isset($unique_indis[$individual->xref()]) && $age_at_death >= 0 && $age_at_death <= $max_age) : ?>
-                        <?php $deat_by_age[$age_at_death] .= $individual->getSex(); ?>
+                        <?php $deat_by_age[$age_at_death] .= $individual->sex(); ?>
                     <?php endif ?>
                 <?php else : ?>
                     <?php $age_at_death = ''; ?>
@@ -356,7 +356,7 @@ for ($year = 1550; $year < 2030; $year += 10) {
 
                 <!-- Filter by sex -->
                 <td hidden>
-                    <?= $individual->getSex() ?>
+                    <?= $individual->sex() ?>
                 </td>
 
                 <!-- Filter by birth date -->
@@ -381,9 +381,9 @@ for ($year = 1550; $year < 2030; $year += 10) {
 
                 <!-- Filter by roots/leaves -->
                 <td hidden>
-                    <?php if (!$individual->getChildFamilies()) : ?>
+                    <?php if (!$individual->childFamilies()) : ?>
                         R
-                    <?php elseif (!$individual->isDead() && $individual->getNumberOfChildren() < 1) : ?>
+                    <?php elseif (!$individual->isDead() && $individual->numberOfChildren() < 1) : ?>
                         L
                     <?php endif ?>
                 </td>
diff --git a/resources/views/lists/media-table.phtml b/resources/views/lists/media-table.phtml
index 91b83a9edf..91a806c5ce 100644
--- a/resources/views/lists/media-table.phtml
+++ b/resources/views/lists/media-table.phtml
@@ -74,16 +74,16 @@ $count_sources = DB::table('sources')
         <?php foreach ($media_objects as $media_object) : ?>
             <tr class="<?= $media_object->isPendingDeletion() ? 'old' : ($media_object->isPendingAddition() ? 'new' : '') ?>">
                 <!-- Thumbnails-->
-                <td data-sort="<?= e($media_object->getSortName()) ?>">
+                <td data-sort="<?= e($media_object->sortName()) ?>">
                     <?php foreach ($media_object->mediaFiles() as $media_file) : ?>
                         <?= $media_file->displayImage(100, 100, 'contain', []) ?>
                     <?php endforeach ?>
                 </td>
 
                 <!-- Title -->
-                <td data-sort="<?= e($media_object->getSortName()) ?>">
+                <td data-sort="<?= e($media_object->sortName()) ?>">
                     <a href="<?= e($media_object->url()) ?>">
-                        <?= $media_object->getFullName() ?>
+                        <?= $media_object->fullName() ?>
                     </a>
                 </td>
 
diff --git a/resources/views/lists/notes-table.phtml b/resources/views/lists/notes-table.phtml
index d2e039a182..fde0283831 100644
--- a/resources/views/lists/notes-table.phtml
+++ b/resources/views/lists/notes-table.phtml
@@ -86,9 +86,9 @@ $count_sources = DB::table('sources')
         <?php foreach ($notes as $note) : ?>
             <tr class="<?= $note->isPendingDeletion() ? 'old' : ($note->isPendingAddition() ? 'new' : '') ?>">
                 <!-- Title -->
-                <td data-sort="<?= e($note->getSortName()) ?>">
+                <td data-sort="<?= e($note->sortName()) ?>">
                     <a href="<?= e($note->url()) ?>">
-                        <?= $note->getFullName() ?>
+                        <?= $note->fullName() ?>
                     </a>
                 </td>
 
diff --git a/resources/views/lists/repositories-table.phtml b/resources/views/lists/repositories-table.phtml
index 5e2269cd2b..01dba2890d 100644
--- a/resources/views/lists/repositories-table.phtml
+++ b/resources/views/lists/repositories-table.phtml
@@ -44,9 +44,9 @@ $count_sources = DB::table('sources')
         <?php foreach ($repositories as $repository) : ?>
             <tr class="<?= $repository->isPendingDeletion() ? 'old' : ($repository->isPendingAddition() ? 'new' : '') ?>">
                 <!-- Repository name -->
-                <td data-sort="<?= e($repository->getSortName()) ?>">
+                <td data-sort="<?= e($repository->sortName()) ?>">
                     <a href="<?= e($repository->url()) ?>">
-                        <?= $repository->getFullName() ?>
+                        <?= $repository->fullName() ?>
                     </a>
                 </td>
 
diff --git a/resources/views/lists/sources-table.phtml b/resources/views/lists/sources-table.phtml
index fe596bf945..9563c24468 100644
--- a/resources/views/lists/sources-table.phtml
+++ b/resources/views/lists/sources-table.phtml
@@ -89,15 +89,15 @@ $count_notes = DB::table('other')
         <?php foreach ($sources as $source) : ?>
             <tr class="<?= $source->isPendingDeletion() ? 'old' : ($source->isPendingAddition() ? 'new' : '') ?>">
                 <!-- Title -->
-                <td data-sort="<?= e($source->getSortName()) ?>">
+                <td data-sort="<?= e($source->sortName()) ?>">
                     <a href="<?= e($source->url()) ?>">
-                        <?= $source->getFullName() ?>
+                        <?= $source->fullName() ?>
                     </a>
                 </td>
 
                 <!-- Author -->
                 <td>
-                    <?= e($source->getFirstFact('AUTH') ? $source->getFirstFact('AUTH')->value() : '') ?>
+                    <?= e($source->firstFact('AUTH') ? $source->firstFact('AUTH')->value() : '') ?>
                 </td>
 
                 <!-- Count of linked individuals -->
diff --git a/resources/views/media-list-page.phtml b/resources/views/media-list-page.phtml
index 9c40c164c1..9a216e78ff 100644
--- a/resources/views/media-list-page.phtml
+++ b/resources/views/media-list-page.phtml
@@ -112,7 +112,7 @@
                     <div class="card mb-4">
                         <div class="card-header">
                             <h4 class="card-title">
-                                <a href="<?= e($media_object->url()) ?>"><?= $media_object->getFullName() ?></a>
+                                <a href="<?= e($media_object->url()) ?>"><?= $media_object->fullName() ?></a>
                             </h4>
                         </div>
                         <div class="card-body">
@@ -157,19 +157,19 @@
                         <div class="card-footer">
                             <?php foreach ($media_object->linkedIndividuals('OBJE') as $record) : ?>
                                 <?= view('icons/individual') ?>
-                                <a href="<?= e($record->url()) ?>"><?= $record->getFullName() ?></a>
+                                <a href="<?= e($record->url()) ?>"><?= $record->fullName() ?></a>
                                 <br>
                             <?php endforeach ?>
 
                             <?php foreach ($media_object->linkedFamilies('OBJE') as $record) : ?>
                                 <?= view('icons/family') ?>
-                                <a href="<?= e($record->url()) ?>"><?= $record->getFullName() ?></a>
+                                <a href="<?= e($record->url()) ?>"><?= $record->fullName() ?></a>
                                 <br>
                             <?php endforeach ?>
 
                             <?php foreach ($media_object->linkedSources('OBJE') as $record) : ?>
                                 <?= view('icons/source') ?>
-                                <a href="<?= e($record->url()) ?>"><?= $record->getFullName() ?></a>
+                                <a href="<?= e($record->url()) ?>"><?= $record->fullName() ?></a>
                                 <br>
                             <?php endforeach ?>
                         </div>
diff --git a/resources/views/media-page-menu.phtml b/resources/views/media-page-menu.phtml
index ffbb618669..44c91a0121 100644
--- a/resources/views/media-page-menu.phtml
+++ b/resources/views/media-page-menu.phtml
@@ -28,7 +28,7 @@
             </a>
         <?php endif ?>
 
-        <a class="dropdown-item menu-obje-del" href="#" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', strip_tags($record->getFullName())) ?>" onclick="return confirm(this.dataset.confirm) && delete_record('<?= e($record->xref()) ?>', '<?= e($record->tree()->name()) ?>');">
+        <a class="dropdown-item menu-obje-del" href="#" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', strip_tags($record->fullName())) ?>" onclick="return confirm(this.dataset.confirm) && delete_record('<?= e($record->xref()) ?>', '<?= e($record->tree()->name()) ?>');">
             <?= I18N::translate('Delete') ?>
         </a>
 
diff --git a/resources/views/media-page.phtml b/resources/views/media-page.phtml
index a3466cfd9e..89bccc448c 100644
--- a/resources/views/media-page.phtml
+++ b/resources/views/media-page.phtml
@@ -21,7 +21,7 @@
 
 <div class="d-flex mb-4">
     <h2 class="wt-page-title mx-auto">
-        <?= $media->getFullName() ?>
+        <?= $media->fullName() ?>
     </h2>
     <?php if ($media->canEdit() && !$media->isPendingDeletion()) : ?>
         <?= view('media-page-menu', ['record' => $media]) ?>
diff --git a/resources/views/modules/batch_update/admin.phtml b/resources/views/modules/batch_update/admin.phtml
index f4964f7bdf..ca7f16ebca 100644
--- a/resources/views/modules/batch_update/admin.phtml
+++ b/resources/views/modules/batch_update/admin.phtml
@@ -87,7 +87,7 @@
                 </div>
                 <div class="col-sm-9">
                     <a class="lead" href="<?= e($record->url()) ?>">
-                        <?= $record->getFullName() ?>
+                        <?= $record->fullName() ?>
                     </a>
                     <?= $plugin->getActionPreview($record) ?>
                 </div>
diff --git a/resources/views/modules/census-assistant.phtml b/resources/views/modules/census-assistant.phtml
index 69a7611d50..0146b986c2 100644
--- a/resources/views/modules/census-assistant.phtml
+++ b/resources/views/modules/census-assistant.phtml
@@ -103,7 +103,7 @@
 
     censusAssistant.setAttribute('hidden', '');
     document.querySelector('#census-assistant-class').value = census;
-    document.querySelector('#census-assistant-title').value = censusYear + ' ' + censusPlace + ' - <?= I18N::translate('Census transcript') ?> - <?= strip_tags($individual->getFullName()) ?> - <?= I18N::translate('Household') ?>';
+    document.querySelector('#census-assistant-title').value = censusYear + ' ' + censusPlace + ' - <?= I18N::translate('Census transcript') ?> - <?= strip_tags($individual->fullName()) ?> - <?= I18N::translate('Household') ?>';
 
     fetch('<?= route('module', ['module' => 'GEDFact_assistant', 'action' => 'CensusHeader', 'ged' => $individual->tree()->name()]) ?>&census=' + census)
       .then(function (response) {
diff --git a/resources/views/modules/clippings/show.phtml b/resources/views/modules/clippings/show.phtml
index f9404a50d6..f08095ba6f 100644
--- a/resources/views/modules/clippings/show.phtml
+++ b/resources/views/modules/clippings/show.phtml
@@ -39,7 +39,7 @@
                         <?php endif ?>
 
                         <a href="<?= e($record->url()) ?>">
-                            <?= $record->getFullName() ?>
+                            <?= $record->fullName() ?>
                         </a>
                     </td>
                     <td>
diff --git a/resources/views/modules/compact-chart/individual.phtml b/resources/views/modules/compact-chart/individual.phtml
index 660ecf8cf5..5430e857a7 100644
--- a/resources/views/modules/compact-chart/individual.phtml
+++ b/resources/views/modules/compact-chart/individual.phtml
@@ -3,9 +3,9 @@
 <?php else : ?>
     <?= view('chart-box', ['individual' => $individual]) ?>
 <!--
-    <div class="h-100 person_box<?= ['M' => '', 'F' => 'F', 'U' => 'NN'][$individual->getSex()]?> person_box_template">
+    <div class="h-100 person_box<?= ['M' => '', 'F' => 'F', 'U' => 'NN'][$individual->sex()]?> person_box_template">
         <a href="<?= e($individual->url()) ?>">
-            <?= $individual->getFullName() ?>
+            <?= $individual->fullName() ?>
         </a>
         <div class="small">
             <?= $individual->getLifeSpan() ?>
diff --git a/resources/views/modules/family_nav/sidebar-family.phtml b/resources/views/modules/family_nav/sidebar-family.phtml
index 116fc52ebf..dc2fb38f1b 100644
--- a/resources/views/modules/family_nav/sidebar-family.phtml
+++ b/resources/views/modules/family_nav/sidebar-family.phtml
@@ -8,13 +8,13 @@
         </a>
     </caption>
     <tbody>
-        <?php foreach ($family->getSpouses() as $spouse) : ?>
-            <tr class="text-center wt-family-navigator-parent wt-gender-<?= $spouse->getSex() ?>">
+        <?php foreach ($family->spouses() as $spouse) : ?>
+            <tr class="text-center wt-family-navigator-parent wt-gender-<?= $spouse->sex() ?>">
                 <th class="text-nowrap align-middle wt-family-navigator-label" scope="row">
                     <?php if ($spouse === $individual) : ?>
                         <?= Functions::getCloseRelationshipName($individual, $spouse) ?>
                         <i class="icon-selected"></i>
-                    <?php elseif ($spouse->getPrimaryChildFamily() !== null) : ?>
+                    <?php elseif ($spouse->primaryChildFamily() !== null) : ?>
                     <div class="dropdown">
                         <a class="dropdown-toggle" href="#" role="button" id="dropdown-<?= e($spouse->xref()) ?>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                             <?= Functions::getCloseRelationshipName($individual, $spouse) ?>
@@ -24,9 +24,9 @@
                             <div class="dropdown-header wt-family-navigator-dropdown-heading">
                                 <?= I18N::translate('Parents') ?>
                             </div>
-                            <?php foreach ($spouse->getPrimaryChildFamily()->getSpouses() as $parent) : ?>
+                            <?php foreach ($spouse->primaryChildFamily()->spouses() as $parent) : ?>
                                 <a class="dropdown-item" href="<?= e($parent->url()) ?>">
-                                    <?= $parent->getFullName() ?>
+                                    <?= $parent->fullName() ?>
                                 </a>
                             <?php endforeach ?>
                         </div>
@@ -39,32 +39,32 @@
                 <td class="wt-family-navigator-name">
                     <?php if ($spouse->canShow()) : ?>
                         <a href="<?= e($spouse->url()) ?>">
-                            <?= $spouse->getFullName() ?>
+                            <?= $spouse->fullName() ?>
                         </a>
                         <div class="small">
                             <?= $spouse->getLifeSpan() ?>
                         </div>
                     <?php else : ?>
-                        <?= $spouse->getFullName() ?>
+                        <?= $spouse->fullName() ?>
                     <?php endif ?>
                 </td>
             </tr>
         <?php endforeach ?>
 
-        <?php foreach ($family->getChildren() as $child) : ?>
-            <tr class="text-center wt-family-navigator-child wt-gender-<?= $child->getSex() ?>">
+        <?php foreach ($family->children() as $child) : ?>
+            <tr class="text-center wt-family-navigator-child wt-gender-<?= $child->sex() ?>">
                 <th class="text-nowrap align-middle" scope="row">
                     <?php if ($child === $individual) : ?>
                         <?= Functions::getCloseRelationshipName($individual, $child) ?>
                         <i class="icon-selected"></i>
-                    <?php elseif ($child->getSpouseFamilies() !== []) : ?>
+                    <?php elseif ($child->spouseFamilies() !== []) : ?>
                         <div class="dropdown">
                             <a class="dropdown-toggle" href="#" role="button" id="dropdown-<?= e($child->xref()) ?>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                                 <?= Functions::getCloseRelationshipName($individual, $child) ?>
                             </a>
 
                             <div class="dropdown-menu">
-                                <?php foreach ($child->getSpouseFamilies() as $n => $in_laws) : ?>
+                                <?php foreach ($child->spouseFamilies() as $n => $in_laws) : ?>
                                     <?php if ($n > 0) : ?>
                                         <div class="dropdown-divider"></div>
                                     <?php endif ?>
@@ -72,19 +72,19 @@
                                         <?= I18N::translate('Family') ?>
                                     </div>
 
-                                    <?php foreach ($in_laws->getSpouses() as $sibling_in_law) : ?>
+                                    <?php foreach ($in_laws->spouses() as $sibling_in_law) : ?>
                                         <?php if ($sibling_in_law !== $child) : ?>
                                             <a class="dropdown-item" href="<?= e($sibling_in_law->url()) ?>">
-                                                <?= $sibling_in_law->getFullName() ?>
+                                                <?= $sibling_in_law->fullName() ?>
                                             </a>
                                         <?php endif ?>
                                     <?php endforeach ?>
 
                                 <ul>
-                                    <?php foreach ($in_laws->getChildren() as $child_in_law) : ?>
+                                    <?php foreach ($in_laws->children() as $child_in_law) : ?>
                                     <li>
                                         <a class="dropdown-item" href="<?= e($child_in_law->url()) ?>">
-                                            <?= $child_in_law->getFullName() ?>
+                                            <?= $child_in_law->fullName() ?>
                                         </a>
                                     </li>
                                     <?php endforeach ?>
@@ -100,13 +100,13 @@
                 <td>
                     <?php if ($child->canShow()) : ?>
                         <a  href="<?= e($child->url()) ?>">
-                            <?= $child->getFullName() ?>
+                            <?= $child->fullName() ?>
                         </a>
                         <div class="small">
                             <?= $child->getLifeSpan() ?>
                         </div>
                     <?php else : ?>
-                        <?= $child->getFullName() ?>
+                        <?= $child->fullName() ?>
                     <?php endif ?>
                 </td>
             </tr>
diff --git a/resources/views/modules/family_nav/sidebar.phtml b/resources/views/modules/family_nav/sidebar.phtml
index 40032542c1..a32947970a 100644
--- a/resources/views/modules/family_nav/sidebar.phtml
+++ b/resources/views/modules/family_nav/sidebar.phtml
@@ -1,21 +1,21 @@
 <div class="wt-sidebar-content wt-sidebar-family-navigator">
     <!-- parent families -->
-    <?php foreach ($individual->getChildFamilies() as $family) : ?>
+    <?php foreach ($individual->childFamilies() as $family) : ?>
         <?= view('modules/family_nav/sidebar-family', ['individual' => $individual, 'family' => $family, 'title' => $individual->getChildFamilyLabel($family)]) ?>
     <?php endforeach ?>
 
     <!-- step parents -->
-    <?php foreach ($individual->getChildStepFamilies() as $family) : ?>
+    <?php foreach ($individual->childStepFamilies() as $family) : ?>
         <?= view('modules/family_nav/sidebar-family', ['individual' => $individual, 'family' => $family, 'title' => $individual->getStepFamilyLabel($family)]) ?>
     <?php endforeach ?>
 
     <!-- spouse and children -->
-    <?php foreach ($individual->getSpouseFamilies() as $family) : ?>
-        <?= view('modules/family_nav/sidebar-family', ['individual' => $individual, 'family' => $family, 'title' => $individual->getSpouseFamilyLabel($family)]) ?>
+    <?php foreach ($individual->spouseFamilies() as $family) : ?>
+        <?= view('modules/family_nav/sidebar-family', ['individual' => $individual, 'family' => $family, 'title' => $individual->spouse(FamilyLabel($family)]) ?>
     <?php endforeach ?>
 
     <!-- step children -->
-    <?php foreach ($individual->getSpouseStepFamilies() as $family) : ?>
-        <?= view('modules/family_nav/sidebar-family', ['individual' => $individual, 'family' => $family, 'title' => $family->getFullName()]) ?>
+    <?php foreach ($individual->spouse(StepFamilies() as $family) : ?>
+        <?= view('modules/family_nav/sidebar-family', ['individual' => $individual, 'family' => $family, 'title' => $family->fullName()]) ?>
     <?php endforeach ?>
 </div>
diff --git a/resources/views/modules/faq/list.phtml b/resources/views/modules/faq/list.phtml
index fd394ba5fd..e159aa9626 100644
--- a/resources/views/modules/faq/list.phtml
+++ b/resources/views/modules/faq/list.phtml
@@ -18,7 +18,7 @@
                 </td>
                 <td>
                     <a href="<?= e($story->individual->url()) ?>#tab-stories">
-                        <?= $story->individual->getFullName() ?>
+                        <?= $story->individual->fullName() ?>
                     </a>
                 </td>
             </tr>
diff --git a/resources/views/modules/gedcom_favorites/favorites.phtml b/resources/views/modules/gedcom_favorites/favorites.phtml
index af636479cd..e2456c1bdd 100644
--- a/resources/views/modules/gedcom_favorites/favorites.phtml
+++ b/resources/views/modules/gedcom_favorites/favorites.phtml
@@ -3,7 +3,7 @@
 <?php use Fisharebest\Webtrees\Module\ModuleThemeInterface; ?>
 
 <?php foreach ($favorites as $favorite) : ?>
-    <div class="person_box action_header<?= $favorite->record instanceof Individual ? $favorite->record->getSex() : '' ?>">
+    <div class="person_box action_header<?= $favorite->record instanceof Individual ? $favorite->record->sex() : '' ?>">
         <?php if ($favorite->favorite_type === 'URL') : ?>
             <a href="<?= e($favorite->url) ?>"><b><?= e($favorite->title) ?></b></a>
         <?php elseif ($favorite->record instanceof Individual) : ?>
diff --git a/resources/views/modules/lifespans-chart/chart.phtml b/resources/views/modules/lifespans-chart/chart.phtml
index 974f223c93..27d0a89d1c 100644
--- a/resources/views/modules/lifespans-chart/chart.phtml
+++ b/resources/views/modules/lifespans-chart/chart.phtml
@@ -14,14 +14,14 @@
     <?php foreach ($lifespans as $lifespan) : ?>
     <a href="<?= e($lifespan->id) ?>" data-toggle="collapse" data-target="#<?= e($lifespan->id) ?>" aria-expanded="false" aria-controls="<?= e($lifespan->id) ?>">
         <div class="wt-lifespans-individual position-absolute text-nowrap text-truncate" dir="auto" style="background: <?= $lifespan->background ?>; <?= $dir === 'ltr' ? 'left' : 'right' ?>:<?= ($lifespan->birth_year - $start_year) * 7 ?>px; top:<?= $lifespan->row * 1.5 ?>rem; width:<?= ($lifespan->death_year - $lifespan->birth_year) * 7 + 5 ?>px;">
-            <?= $lifespan->individual->getFullName() ?>
+            <?= $lifespan->individual->fullName() ?>
             <?= strip_tags($lifespan->individual->getLifespan()) ?>
         </div>
     </a>
 
     <div class="wt-lifespans-summary collapse position-absolute" id="<?= e($lifespan->id) ?>" style="<?= $dir === 'ltr' ? 'left' : 'right' ?>:<?= (min($lifespan->birth_year, $end_year - 50) - $start_year) * 7 ?>px; top:<?= ($lifespan->row + 1) * 1.5 ?>rem; width:350px;">
         <a class="wt-lifespans-summary-link" href="<?= e($lifespan->individual->url()) ?>">
-            <?= $lifespan->individual->getFullName() ?>
+            <?= $lifespan->individual->fullName() ?>
         </a>
 
         <?php foreach ($lifespan->individual->facts(array_merge(Gedcom::BIRTH_EVENTS, Gedcom::DEATH_EVENTS), true) as $fact) : ?>
diff --git a/resources/views/modules/lightbox/tab.phtml b/resources/views/modules/lightbox/tab.phtml
index db243f652e..ebc6df3930 100644
--- a/resources/views/modules/lightbox/tab.phtml
+++ b/resources/views/modules/lightbox/tab.phtml
@@ -6,7 +6,7 @@
             <?php endforeach ?>
             <figcaption class="figure-caption wt-album-tab-caption">
                 <a href="<?= e($media->url()) ?>">
-                    <?= $media->getFullName() ?>
+                    <?= $media->fullName() ?>
                 </a>
             </figcaption>
         </figure>
diff --git a/resources/views/modules/personal_facts/tab.phtml b/resources/views/modules/personal_facts/tab.phtml
index 9dc91df836..0cd79a265d 100644
--- a/resources/views/modules/personal_facts/tab.phtml
+++ b/resources/views/modules/personal_facts/tab.phtml
@@ -25,7 +25,7 @@
                 <?php FunctionsPrintFacts::printFact($fact, $individual) ?>
             <?php endforeach ?>
 
-            <?php if (empty($facts)) : ?>
+            <?php if ($facts->isEmpty()) : ?>
                 <tr>
                     <td colspan="2">
                         <?= I18N::translate('There are no facts for this individual.') ?>
diff --git a/resources/views/modules/random_media/slide-show.phtml b/resources/views/modules/random_media/slide-show.phtml
index 7f36fd3815..ce074213c9 100644
--- a/resources/views/modules/random_media/slide-show.phtml
+++ b/resources/views/modules/random_media/slide-show.phtml
@@ -23,7 +23,7 @@
         <?= $media_file->displayImage(200, 200, '', ['class' => 'slide-show-image']) ?>
         <figcaption class="slide-show-figcaption">
             <a href="<?= e($media->url()) ?>">
-                <b><?= $media->getFullName() ?></b>
+                <b><?= $media->fullName() ?></b>
             </a>
         </figcaption>
     </figure>
@@ -36,7 +36,7 @@
         <?php foreach ($media->linkedIndividuals('OBJE') as $individual) : ?>
             <?= I18N::translate('Individual') ?> —
             <a href="<?= e($individual->url()) ?>" class="slide-show-link">
-                <?= $individual->getFullName() ?>
+                <?= $individual->fullName() ?>
             </a>
             <br>
         <?php endforeach ?>
@@ -44,7 +44,7 @@
         <?php foreach ($media->linkedFamilies('OBJE') as $family) : ?>
             <?= I18N::translate('View this family') ?> —
             <a href="<?= e($family->url()) ?>" class="slide-show-link">
-                <?= $family->getFullName() ?>
+                <?= $family->fullName() ?>
             </a>
             <br>
         <?php endforeach ?>
@@ -52,7 +52,7 @@
         <?php foreach ($media->linkedSources('OBJE') as $source) : ?>
             <?= I18N::translate('View this source') ?> —
             <a href="<?= e($source->url()) ?>" class="slide-show-link">
-                <?= $source->getFullName() ?>
+                <?= $source->fullName() ?>
             </a>
             <br>
         <?php endforeach ?>
diff --git a/resources/views/modules/recent_changes/changes-list.phtml b/resources/views/modules/recent_changes/changes-list.phtml
index 4c67b10788..dc521eeb43 100644
--- a/resources/views/modules/recent_changes/changes-list.phtml
+++ b/resources/views/modules/recent_changes/changes-list.phtml
@@ -2,7 +2,7 @@
 
 <?php foreach ($records as $record) : ?>
     <a href="<?= e($record->url()) ?>" class="list_item name2">
-        <?= $record->getFullName() ?>
+        <?= $record->fullName() ?>
     </a>
     <div class="indent mb-1">
         <?php if ($record->lastChangeTimestamp() !== '') : ?>
diff --git a/resources/views/modules/recent_changes/changes-table.phtml b/resources/views/modules/recent_changes/changes-table.phtml
index cb3b65dd4c..4cd3ff361d 100644
--- a/resources/views/modules/recent_changes/changes-table.phtml
+++ b/resources/views/modules/recent_changes/changes-table.phtml
@@ -50,8 +50,8 @@
                     <?php endif ?>
                 </td>
 
-                <td data-sort="<?= e($record->getSortName()) ?>">
-                    <a href="<?= e($record->url()) ?>"><?= $record->getFullName() ?></a>
+                <td data-sort="<?= e($record->sortName()) ?>">
+                    <a href="<?= e($record->url()) ?>"><?= $record->fullName() ?></a>
                 </td>
 
                 <td data-sort="<?= $record->lastChangeTimestamp(true) ?>">
diff --git a/resources/views/modules/relatives/family.phtml b/resources/views/modules/relatives/family.phtml
index 39f249f43a..6821633379 100644
--- a/resources/views/modules/relatives/family.phtml
+++ b/resources/views/modules/relatives/family.phtml
@@ -19,7 +19,7 @@
             $found |= !$fact->isPendingDeletion();
             $person = $fact->target();
             if ($person instanceof Individual) {
-                $row_class = 'wt-gender-' . $person->getSex();
+                $row_class = 'wt-gender-' . $person->sex();
                 if ($fact->isPendingAddition()) {
                     $row_class .= ' new';
                 } elseif ($fact->isPendingDeletion()) {
@@ -56,7 +56,7 @@
             $person = $fact->target();
             if ($person instanceof Individual) {
                 $found |= !$fact->isPendingDeletion();
-                $row_class = 'wt-gender-' . $person->getSex();
+                $row_class = 'wt-gender-' . $person->sex();
                 if ($fact->isPendingAddition()) {
                     $row_class .= ' new';
                 } elseif ($fact->isPendingDeletion()) {
@@ -136,7 +136,7 @@
         foreach ($family->facts(['CHIL'], false, $fam_access_level) as $fact) {
             $person = $fact->target();
             if ($person instanceof Individual) {
-                $row_class = 'wt-gender-' . $person->getSex();
+                $row_class = 'wt-gender-' . $person->sex();
                 if ($fact->isPendingAddition()) {
                     $child_number++;
                     $row_class .= ' new';
@@ -190,7 +190,7 @@
         <?php if ($family->canEdit()) : ?>
             <tr>
                 <th scope="row">
-                    <?php if (count($family->getChildren()) > 1) : ?>
+                    <?php if (count($family->children()) > 1) : ?>
                         <a href="<?= e(route('reorder-children', ['ged' => $family->tree()->name(), 'xref' => $family->xref()])) ?>">
                             <?= view('icons/reorder') ?>
                             <?= I18N::translate('Re-order children') ?>
diff --git a/resources/views/modules/relatives/tab.phtml b/resources/views/modules/relatives/tab.phtml
index 4366776d16..56a618ec66 100644
--- a/resources/views/modules/relatives/tab.phtml
+++ b/resources/views/modules/relatives/tab.phtml
@@ -75,7 +75,7 @@
         'individual'       => $individual,
         'family'           => $family,
         'type'             => 'FAMS',
-        'label'            => $family->getFullName(),
+        'label'            => $family->fullName(),
         'fam_access_level' => $fam_access_level,
     ]) ?>
 <?php endforeach ?>
@@ -105,7 +105,7 @@
             <tr>
                 <td>
                     <a href="<?= e(route('add-spouse-to-individual', ['ged' => $individual->tree()->name(), 'xref' => $individual->xref()])) ?>">
-                        <?php if ($individual->getSex() !== 'F') : ?>
+                        <?php if ($individual->sex() !== 'F') : ?>
                             <?= I18N::translate('Add a wife') ?>
                         <?php else : ?>
                             <?= I18N::translate('Add a husband') ?>
@@ -117,7 +117,7 @@
             <tr>
                 <td>
                     <a href="<?= e(route('link-spouse-to-individual', ['ged' => $individual->tree()->name(), 'xref' => $individual->xref()])) ?>">
-                        <?php if ($individual->getSex() !== 'F') : ?>
+                        <?php if ($individual->sex() !== 'F') : ?>
                             <?= I18N::translate('Add a wife using an existing individual') ?>
                         <?php else : ?>
                             <?= I18N::translate('Add a husband using an existing individual') ?>
diff --git a/resources/views/modules/sitemap/sitemap-file.xml.phtml b/resources/views/modules/sitemap/sitemap-file.xml.phtml
index cffa7f9ff3..68720591bd 100644
--- a/resources/views/modules/sitemap/sitemap-file.xml.phtml
+++ b/resources/views/modules/sitemap/sitemap-file.xml.phtml
@@ -3,8 +3,8 @@
     <?php foreach ($records as $record) : ?>
         <url>
             <loc><?= e($record->url()) ?></loc>
-            <?php if ($record->getFirstFact('CHAN') !== null) : ?>
-                <lastmod><?= $record->getFirstFact('CHAN')->date()->minimumDate()->Format('%Y-%m-%d') ?></lastmod>
+            <?php if ($record->firstFact('CHAN') !== null) : ?>
+                <lastmod><?= $record->firstFact('CHAN')->date()->minimumDate()->Format('%Y-%m-%d') ?></lastmod>
             <?php endif ?>
         </url>
     <?php endforeach ?>
diff --git a/resources/views/modules/stories/config.phtml b/resources/views/modules/stories/config.phtml
index 476c64c6b7..37b155d8c9 100644
--- a/resources/views/modules/stories/config.phtml
+++ b/resources/views/modules/stories/config.phtml
@@ -42,7 +42,7 @@
                 <td>
                     <?php if ($story->individual !== null) : ?>
                         <a href="<?= e($story->individual->url()) ?>#tab-stories">
-                            <?= $story->individual->getFullName() ?>
+                            <?= $story->individual->fullName() ?>
                         </a>
                     <?php else : ?>
                         <?= $story->xref ?>
diff --git a/resources/views/modules/stories/list.phtml b/resources/views/modules/stories/list.phtml
index fd394ba5fd..e159aa9626 100644
--- a/resources/views/modules/stories/list.phtml
+++ b/resources/views/modules/stories/list.phtml
@@ -18,7 +18,7 @@
                 </td>
                 <td>
                     <a href="<?= e($story->individual->url()) ?>#tab-stories">
-                        <?= $story->individual->getFullName() ?>
+                        <?= $story->individual->fullName() ?>
                     </a>
                 </td>
             </tr>
diff --git a/resources/views/modules/timeline-chart/chart.phtml b/resources/views/modules/timeline-chart/chart.phtml
index 03e31eb95a..f7d7dc332b 100644
--- a/resources/views/modules/timeline-chart/chart.phtml
+++ b/resources/views/modules/timeline-chart/chart.phtml
@@ -317,17 +317,17 @@
         $col = array_search($event->record(), $individuals);
         if ($col === false) {
             // Marriage event - use the color of the husband
-            $col = array_search($event->record()->getHusband(), $individuals);
+            $col = array_search($event->record()->husband(), $individuals);
         }
         if ($col === false) {
             // Marriage event - use the color of the wife
-            $col = array_search($event->record()->getWife(), $individuals);
+            $col = array_search($event->record()->wife(), $individuals);
         }
         $col = $col % 6;
         echo '</td><td class="person' . $col . '">';
         if (count($individuals) > 6) {
             // We only have six colours, so show naes if more than this number
-            echo $event->record()->getFullName() . ' — ';
+            echo $event->record()->fullName() . ' — ';
         }
         $record = $event->record();
         echo $event->label();
@@ -336,13 +336,13 @@
             echo FunctionsPrint::formatFactDate($event, $record, false, false);
         } elseif ($record instanceof Family) {
             echo $gdate->display();
-            if ($record->getHusband() && $record->getHusband()->getBirthDate()->isOK()) {
-                $ageh = FunctionsDate::getAgeAtEvent(Date::getAgeGedcom($record->getHusband()->getBirthDate(), $gdate));
+            if ($record->husband() && $record->husband()->getBirthDate()->isOK()) {
+                $ageh = FunctionsDate::getAgeAtEvent(Date::getAgeGedcom($record->husband()->getBirthDate(), $gdate));
             } else {
                 $ageh = null;
             }
-            if ($record->getWife() && $record->getWife()->getBirthDate()->isOK()) {
-                $agew = FunctionsDate::getAgeAtEvent(Date::getAgeGedcom($record->getWife()->getBirthDate(), $gdate));
+            if ($record->wife() && $record->wife()->getBirthDate()->isOK()) {
+                $agew = FunctionsDate::getAgeAtEvent(Date::getAgeGedcom($record->wife()->getBirthDate(), $gdate));
             } else {
                 $agew = null;
             }
@@ -360,7 +360,7 @@
         }
         // Print spouses names for family events
         if ($event->record() instanceof Family) {
-            echo ' — <a href="', e($event->record()->url()), '">', $event->record()->getFullName(), '</a>';
+            echo ' — <a href="', e($event->record()->url()), '">', $event->record()->fullName(), '</a>';
         }
         echo '</td></tr></table>';
         echo '</div>';
diff --git a/resources/views/modules/timeline-chart/page.phtml b/resources/views/modules/timeline-chart/page.phtml
index a3fdb63c50..1779e991ff 100644
--- a/resources/views/modules/timeline-chart/page.phtml
+++ b/resources/views/modules/timeline-chart/page.phtml
@@ -57,10 +57,10 @@
     <div class="col-md-6 col-lg-4 col-xl-3 person<?= $n % 6 ?>">
         <?= $individual->getSexImage('large'); ?>
         <a href="<?= e($individual->url()) ?>">
-            <?= $individual->getFullName() ?>
-            <?php if ($individual->getAddName() !== '') : ?>
+            <?= $individual->fullName() ?>
+            <?php if ($individual->alternateName() !== '') : ?>
                 <br>
-                <?= $individual->getAddName() ?>
+                <?= $individual->alternateName() ?>
             <?php endif ?>
         </a>
         <a href="<?= e($remove_urls[$individual->xref()]) ?>">
diff --git a/resources/views/modules/todays_events/list.phtml b/resources/views/modules/todays_events/list.phtml
index 75017d06f9..b04e2489c0 100644
--- a/resources/views/modules/todays_events/list.phtml
+++ b/resources/views/modules/todays_events/list.phtml
@@ -4,7 +4,7 @@
 <?php foreach ($facts as $fact) : ?>
     <?php $record = $fact->record(); ?>
     <a href="<?= e($record->url()) ?>" class="list_item name2">
-        <?= $record->getFullName() ?>
+        <?= $record->fullName() ?>
     </a>
     <?php if ($record instanceof Individual) : ?>
         <?= $record->getSexImage() ?>
diff --git a/resources/views/modules/todays_events/table.phtml b/resources/views/modules/todays_events/table.phtml
index 0b3ff09f49..d7a9c41f5d 100644
--- a/resources/views/modules/todays_events/table.phtml
+++ b/resources/views/modules/todays_events/table.phtml
@@ -24,9 +24,9 @@
         <?php foreach ($facts as $fact) : ?>
             <?php $record = $fact->record(); ?>
             <tr>
-                <td data-sort="<?= e($record->getSortName()) ?>">
+                <td data-sort="<?= e($record->sortName()) ?>">
                     <a href="<?= e($record->url()) ?>">
-                        <?= $record->getFullName() ?>
+                        <?= $record->fullName() ?>
                     </a>
                     <?php if ($record instanceof Individual) : ?>
                         <?= $record->getSexImage() ?>
diff --git a/resources/views/modules/todo/research-tasks.phtml b/resources/views/modules/todo/research-tasks.phtml
index ddd01fc401..94674ad596 100644
--- a/resources/views/modules/todo/research-tasks.phtml
+++ b/resources/views/modules/todo/research-tasks.phtml
@@ -24,9 +24,9 @@
                 <td data-sort="<?= $task->date()->julianDay() ?>" class="d-none d-md-table-cell wt-side-block-optional">
                     <?= $task->date()->display() ?>
                 </td>
-                <td data-sort="<?= e($task->record()->getSortName()) ?>">
+                <td data-sort="<?= e($task->record()->sortName()) ?>">
                     <a href="<?= e($task->record()->url()) ?>">
-                        <?= $task->record()->getFullName() ?>
+                        <?= $task->record()->fullName() ?>
                     </a>
                 </td>
                 <td class="d-none d-md-table-cell wt-side-block-optional">
diff --git a/resources/views/modules/upcoming_events/list.phtml b/resources/views/modules/upcoming_events/list.phtml
index c708ad8bab..070fac114d 100644
--- a/resources/views/modules/upcoming_events/list.phtml
+++ b/resources/views/modules/upcoming_events/list.phtml
@@ -4,7 +4,7 @@
 <?php foreach ($facts as $fact) : ?>
     <?php $record = $fact->record(); ?>
     <a href="<?= e($record->url()) ?>" class="list_item name2">
-        <?= $record->getFullName() ?>
+        <?= $record->fullName() ?>
     </a>
     <?php if ($record instanceof Individual) : ?>
         <?= $record->getSexImage() ?>
diff --git a/resources/views/modules/upcoming_events/table.phtml b/resources/views/modules/upcoming_events/table.phtml
index 0b3ff09f49..d7a9c41f5d 100644
--- a/resources/views/modules/upcoming_events/table.phtml
+++ b/resources/views/modules/upcoming_events/table.phtml
@@ -24,9 +24,9 @@
         <?php foreach ($facts as $fact) : ?>
             <?php $record = $fact->record(); ?>
             <tr>
-                <td data-sort="<?= e($record->getSortName()) ?>">
+                <td data-sort="<?= e($record->sortName()) ?>">
                     <a href="<?= e($record->url()) ?>">
-                        <?= $record->getFullName() ?>
+                        <?= $record->fullName() ?>
                     </a>
                     <?php if ($record instanceof Individual) : ?>
                         <?= $record->getSexImage() ?>
diff --git a/resources/views/modules/user_favorites/favorites.phtml b/resources/views/modules/user_favorites/favorites.phtml
index c1a97c320a..1429780524 100644
--- a/resources/views/modules/user_favorites/favorites.phtml
+++ b/resources/views/modules/user_favorites/favorites.phtml
@@ -3,7 +3,7 @@
 <?php use Fisharebest\Webtrees\Module\ModuleThemeInterface; ?>
 
 <?php foreach ($favorites as $favorite) : ?>
-    <div class="person_box action_header<?= $favorite->record instanceof Individual ? $favorite->record->getSex() : '' ?>">
+    <div class="person_box action_header<?= $favorite->record instanceof Individual ? $favorite->record->sex() : '' ?>">
         <?php if ($favorite->favorite_type === 'URL') : ?>
             <a href="<?= e($favorite->url) ?>"><b><?= e($favorite->title) ?></b></a>
         <?php elseif ($favorite->record instanceof Individual) : ?>
diff --git a/resources/views/modules/yahrzeit/list.phtml b/resources/views/modules/yahrzeit/list.phtml
index 8642f1510b..4b10506110 100644
--- a/resources/views/modules/yahrzeit/list.phtml
+++ b/resources/views/modules/yahrzeit/list.phtml
@@ -2,7 +2,7 @@
 
 <?php foreach ($yahrzeits as $yahrzeit) : ?>
     <a href="<?= e($yahrzeit->individual->url()) ?>" class="list_item name2">
-        <?= $yahrzeit->individual->getFullName() ?>
+        <?= $yahrzeit->individual->fullName() ?>
     </a>
     <?= $yahrzeit->individual->getSexImage() ?>
     <div class="indent">
diff --git a/resources/views/modules/yahrzeit/table.phtml b/resources/views/modules/yahrzeit/table.phtml
index dcef2d8205..96f678aeca 100644
--- a/resources/views/modules/yahrzeit/table.phtml
+++ b/resources/views/modules/yahrzeit/table.phtml
@@ -18,12 +18,12 @@
 
         <?php foreach ($yahrzeits as $yahrzeit) : ?>
             <tr>
-                <td data-sort="<?= e($yahrzeit->individual->getSortName()) ?>">
+                <td data-sort="<?= e($yahrzeit->individual->sortName()) ?>">
                     <a href="<?= e($yahrzeit->individual->url()) ?>">
-                        <?= $yahrzeit->individual->getFullname() ?>
-                        <?php if ($yahrzeit->individual->getAddName()) : ?>
+                        <?= $yahrzeit->individual->fullName() ?>
+                        <?php if ($yahrzeit->individual->alternateName()) : ?>
                         <br>
-                            <?= $yahrzeit->individual->getAddName() ?>
+                            <?= $yahrzeit->individual->alternateName() ?>
                         <?php endif ?>
                     </a>
                 </td>
diff --git a/resources/views/note-page-menu.phtml b/resources/views/note-page-menu.phtml
index 976fd4e61d..afdc6649fe 100644
--- a/resources/views/note-page-menu.phtml
+++ b/resources/views/note-page-menu.phtml
@@ -7,7 +7,7 @@
         <?= I18N::translate('edit') ?>
     </button>
     <div class="dropdown-menu dropdown-menu-right wt-page-menu-items" aria-labelledby="page-menu">
-        <a class="dropdown-item menu-note-del" href="#" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', strip_tags($record->getFullName())) ?>" onclick="return confirm(this.dataset.confirm) && delete_record('<?= e($record->xref()) ?>', '<?= e($record->tree()->name()) ?>');">
+        <a class="dropdown-item menu-note-del" href="#" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', strip_tags($record->fullName())) ?>" onclick="return confirm(this.dataset.confirm) && delete_record('<?= e($record->xref()) ?>', '<?= e($record->tree()->name()) ?>');">
             <?= I18N::translate('Delete') ?>
         </a>
 
diff --git a/resources/views/note-page.phtml b/resources/views/note-page.phtml
index 14ef4238ee..718d0a025d 100644
--- a/resources/views/note-page.phtml
+++ b/resources/views/note-page.phtml
@@ -1,5 +1,4 @@
 <?php use Fisharebest\Webtrees\Auth; ?>
-<?php use Fisharebest\Webtrees\Bootstrap4; ?>
 <?php use Fisharebest\Webtrees\Functions\FunctionsPrint; ?>
 <?php use Fisharebest\Webtrees\Functions\FunctionsPrintFacts; ?>
 <?php use Fisharebest\Webtrees\I18N; ?>
@@ -20,7 +19,7 @@
 
 <div class="d-flex mb-4">
     <h2 class="wt-page-title mx-auto">
-        <?= $note->getFullName() ?>
+        <?= $note->fullName() ?>
     </h2>
     <?php if ($note->canEdit() && !$note->isPendingDeletion()) : ?>
         <?= view('note-page-menu', ['record' => $note]) ?>
diff --git a/resources/views/pending-changes-page.phtml b/resources/views/pending-changes-page.phtml
index 3122ebf37a..1188b6ed27 100644
--- a/resources/views/pending-changes-page.phtml
+++ b/resources/views/pending-changes-page.phtml
@@ -35,7 +35,7 @@
         <div class="tab-pane fade <?= $tree_id === $active_tree_id ? 'show active' : '' ?>" id="tree-<?= e($tree_id) ?>" role="tabpanel" aria-labelledby="tree-<?= e($tree_id) ?>-tab">
             <?php foreach ($gedcom_changes as $xref => $record_changes) : ?>
                 <h3 class="pt-2">
-                    <a href="<?= e($record_changes[0]->record->url()) ?>"><?= $record_changes[0]->record->getFullName() ?></a>
+                    <a href="<?= e($record_changes[0]->record->url()) ?>"><?= $record_changes[0]->record->fullName() ?></a>
                 </h3>
 
                 <table class="table table-bordered table-sm">
@@ -73,7 +73,7 @@
                                     <?php endforeach ?>
                                 </td>
                                 <td>
-                                    <a href="<?= e(route('message', ['to' => $record_change->user_name, 'subject' => I18N::translate('Pending changes') . ' - ' . strip_tags($record_change->record->getFullName()), 'body' => WT_BASE_URL . $record_change->record->url(), 'ged' => $record_change->gedcom_name])) ?>" title="<?= I18N::translate('Send a message') ?>">
+                                    <a href="<?= e(route('message', ['to' => $record_change->user_name, 'subject' => I18N::translate('Pending changes') . ' - ' . strip_tags($record_change->record->fullName()), 'body' => WT_BASE_URL . $record_change->record->url(), 'ged' => $record_change->gedcom_name])) ?>" title="<?= I18N::translate('Send a message') ?>">
                                         <?= e($record_change->real_name) ?> - <?= e($record_change->user_name) ?>
                                     </a>
                                 </td>
diff --git a/resources/views/repository-page-menu.phtml b/resources/views/repository-page-menu.phtml
index d06ec7ac21..6f159fd323 100644
--- a/resources/views/repository-page-menu.phtml
+++ b/resources/views/repository-page-menu.phtml
@@ -7,7 +7,7 @@
         <?= I18N::translate('edit') ?>
     </button>
     <div class="dropdown-menu dropdown-menu-right wt-page-menu-items" aria-labelledby="page-menu">
-        <a class="dropdown-item menu-repo-del" href="#" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', strip_tags($record->getFullName())) ?>" onclick="return confirm(this.dataset.confirm) && delete_record('<?= e($record->xref()) ?>', '<?= e($record->tree()->name()) ?>');">
+        <a class="dropdown-item menu-repo-del" href="#" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', strip_tags($record->fullName())) ?>" onclick="return confirm(this.dataset.confirm) && delete_record('<?= e($record->xref()) ?>', '<?= e($record->tree()->name()) ?>');">
             <?= I18N::translate('Delete') ?>
         </a>
 
diff --git a/resources/views/repository-page.phtml b/resources/views/repository-page.phtml
index 6ab8433598..803cab9ea4 100644
--- a/resources/views/repository-page.phtml
+++ b/resources/views/repository-page.phtml
@@ -1,5 +1,4 @@
 <?php use Fisharebest\Webtrees\Auth; ?>
-<?php use Fisharebest\Webtrees\Bootstrap4; ?>
 <?php use Fisharebest\Webtrees\Functions\FunctionsPrint; ?>
 <?php use Fisharebest\Webtrees\Functions\FunctionsPrintFacts; ?>
 <?php use Fisharebest\Webtrees\I18N; ?>
@@ -20,7 +19,7 @@
 
 <div class="d-flex mb-4">
     <h2 class="wt-page-title mx-auto">
-        <?= $repository->getFullName() ?>
+        <?= $repository->fullName() ?>
     </h2>
     <?php if ($repository->canEdit() && !$repository->isPendingDeletion()) : ?>
         <?= view('repository-page-menu', ['record' => $repository]) ?>
diff --git a/resources/views/selects/family.phtml b/resources/views/selects/family.phtml
index 368d7c3884..38e4c51504 100644
--- a/resources/views/selects/family.phtml
+++ b/resources/views/selects/family.phtml
@@ -1 +1 @@
-<?= $family->getFullName() ?>
+<?= $family->fullName() ?>
diff --git a/resources/views/selects/individual.phtml b/resources/views/selects/individual.phtml
index b851ed95eb..a50a6b0af4 100644
--- a/resources/views/selects/individual.phtml
+++ b/resources/views/selects/individual.phtml
@@ -3,4 +3,4 @@
 <?php if ($individual->findHighlightedMediaFile() instanceof MediaFile) : ?>
     <?= $individual->findHighlightedMediaFile()->displayImage(30, 40, 'crop', []) ?>
 <?php endif; ?>
-<?= $individual->getFullName() ?>, <?= $individual->getLifeSpan() ?>
+<?= $individual->fullName() ?>, <?= $individual->getLifeSpan() ?>
diff --git a/resources/views/selects/media.phtml b/resources/views/selects/media.phtml
index 3f74baff3a..e011a97f90 100644
--- a/resources/views/selects/media.phtml
+++ b/resources/views/selects/media.phtml
@@ -1,4 +1,4 @@
 <?php foreach ($media->mediaFiles() as $media_file) : ?>
     <?= $media_file->displayImage(30, 40, 'crop', []) ?>
 <?php endforeach ?>
-<?= $media->getFullName();
+<?= $media->fullName();
diff --git a/resources/views/selects/note.phtml b/resources/views/selects/note.phtml
index 16f6cde196..e27434a074 100644
--- a/resources/views/selects/note.phtml
+++ b/resources/views/selects/note.phtml
@@ -1 +1 @@
-<?= $note->getFullName() ?>
+<?= $note->fullName() ?>
diff --git a/resources/views/selects/repository.phtml b/resources/views/selects/repository.phtml
index 1cd2bf64ef..72143f4b79 100644
--- a/resources/views/selects/repository.phtml
+++ b/resources/views/selects/repository.phtml
@@ -1 +1 @@
-<?= $repository->getFullName() ?>
+<?= $repository->fullName() ?>
diff --git a/resources/views/selects/source.phtml b/resources/views/selects/source.phtml
index 63aaa73e88..f5fe21604c 100644
--- a/resources/views/selects/source.phtml
+++ b/resources/views/selects/source.phtml
@@ -1 +1 @@
-<?= $source->getFullName() ?>
+<?= $source->fullName() ?>
diff --git a/resources/views/selects/submitter.phtml b/resources/views/selects/submitter.phtml
index 06e708537e..b00adddcc1 100644
--- a/resources/views/selects/submitter.phtml
+++ b/resources/views/selects/submitter.phtml
@@ -1 +1 @@
-<?= $submitter->getFullName() ?>
+<?= $submitter->fullName() ?>
diff --git a/resources/views/source-page-menu.phtml b/resources/views/source-page-menu.phtml
index adc60d78bf..558cf29e99 100644
--- a/resources/views/source-page-menu.phtml
+++ b/resources/views/source-page-menu.phtml
@@ -7,7 +7,7 @@
         <?= I18N::translate('edit') ?>
     </button>
     <div class="dropdown-menu dropdown-menu-right wt-page-menu-items" aria-labelledby="page-menu">
-        <a class="dropdown-item menu-sour-del" href="#" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', strip_tags($record->getFullName())) ?>" onclick="return confirm(this.dataset.confirm) && delete_record('<?= e($record->xref()) ?>', '<?= e($record->tree()->name()) ?>');">
+        <a class="dropdown-item menu-sour-del" href="#" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', strip_tags($record->fullName())) ?>" onclick="return confirm(this.dataset.confirm) && delete_record('<?= e($record->xref()) ?>', '<?= e($record->tree()->name()) ?>');">
             <?= I18N::translate('Delete') ?>
         </a>
 
diff --git a/resources/views/source-page.phtml b/resources/views/source-page.phtml
index 102463f2f5..e4c17ab897 100644
--- a/resources/views/source-page.phtml
+++ b/resources/views/source-page.phtml
@@ -1,5 +1,4 @@
 <?php use Fisharebest\Webtrees\Auth; ?>
-<?php use Fisharebest\Webtrees\Bootstrap4; ?>
 <?php use Fisharebest\Webtrees\Functions\FunctionsPrint; ?>
 <?php use Fisharebest\Webtrees\Functions\FunctionsPrintFacts; ?>
 <?php use Fisharebest\Webtrees\I18N; ?>
@@ -20,7 +19,7 @@
 
 <div class="d-flex mb-4">
     <h2 class="wt-page-title mx-auto">
-        <?= $source->getFullName() ?>
+        <?= $source->fullName() ?>
     </h2>
     <?php if ($source->canEdit() && !$source->isPendingDeletion()) : ?>
         <?= view('source-page-menu', ['record' => $source]) ?>
diff --git a/resources/views/statistics/families/top10-list-age.phtml b/resources/views/statistics/families/top10-list-age.phtml
index 4c49bdda54..cc6e6533c7 100644
--- a/resources/views/statistics/families/top10-list-age.phtml
+++ b/resources/views/statistics/families/top10-list-age.phtml
@@ -19,7 +19,7 @@ use Fisharebest\Webtrees\Individual;
             <?php $family = $record['family']; ?>
             <li class="list-group-item d-flex justify-content-between align-items-center">
                 <span>
-                    <a href="<?= e($child2->url()) ?>"><?= $child2->getFullName() ?></a> <?= I18N::translate('and') ?> <a href="<?= e($child1->url()) ?>"><?= $child1->getFullName() ?></a>
+                    <a href="<?= e($child2->url()) ?>"><?= $child2->fullName() ?></a> <?= I18N::translate('and') ?> <a href="<?= e($child1->url()) ?>"><?= $child1->fullName() ?></a>
                     <br>
                     <a href="<?= e($family->url()) ?>">[<?= I18N::translate('View this family') ?>]</a>
                 </span>
diff --git a/resources/views/statistics/families/top10-list-grand.phtml b/resources/views/statistics/families/top10-list-grand.phtml
index 2fc4ca9d7c..df2e68a9b3 100644
--- a/resources/views/statistics/families/top10-list-grand.phtml
+++ b/resources/views/statistics/families/top10-list-grand.phtml
@@ -13,7 +13,7 @@ use Fisharebest\Webtrees\I18N;
         <?php foreach ($records as $record): ?>
             <?php $family = $record['family']; ?>
             <li class="list-group-item d-flex justify-content-between align-items-center">
-                <a href="<?= e($family->url()) ?>"><?= $family->getFullName() ?></a>
+                <a href="<?= e($family->url()) ?>"><?= $family->fullName() ?></a>
                 <span class="badge badge-secondary badge-pill ml-3">
                     <?= I18N::plural('%s grandchild', '%s grandchildren', $record['count'], I18N::number($record['count'])) ?>
                 </span>
diff --git a/resources/views/statistics/families/top10-list-spouses.phtml b/resources/views/statistics/families/top10-list-spouses.phtml
index 95d323b06a..e9ddb71b85 100644
--- a/resources/views/statistics/families/top10-list-spouses.phtml
+++ b/resources/views/statistics/families/top10-list-spouses.phtml
@@ -13,7 +13,7 @@ use Fisharebest\Webtrees\I18N;
         <?php foreach ($records as $record): ?>
             <?php $family = $record['family']; ?>
             <li class="list-group-item d-flex justify-content-between align-items-center">
-                <a href="<?= e($family->url()) ?>"><?= $family->getFullName() ?></a>
+                <a href="<?= e($family->url()) ?>"><?= $family->fullName() ?></a>
                 <span class="badge badge-secondary badge-pill ml-3"><?= $record['age'] ?></span>
             </li>
         <?php endforeach; ?>
diff --git a/resources/views/statistics/families/top10-list.phtml b/resources/views/statistics/families/top10-list.phtml
index 2f164214f7..a0bec1d01b 100644
--- a/resources/views/statistics/families/top10-list.phtml
+++ b/resources/views/statistics/families/top10-list.phtml
@@ -13,7 +13,7 @@ use Fisharebest\Webtrees\I18N;
         <?php foreach ($records as $record): ?>
             <?php $family = $record['family']; ?>
             <li class="list-group-item d-flex justify-content-between align-items-center">
-                <a href="<?= e($family->url()) ?>"><?= $family->getFullName() ?></a>
+                <a href="<?= e($family->url()) ?>"><?= $family->fullName() ?></a>
                 <span class="badge badge-secondary badge-pill ml-3">
                     <?= I18N::plural('%s child', '%s children', $record['count'], I18N::number($record['count'])) ?>
                 </span>
diff --git a/resources/views/statistics/families/top10-nolist-grand.phtml b/resources/views/statistics/families/top10-nolist-grand.phtml
index 6c58c6b868..56f85316ef 100644
--- a/resources/views/statistics/families/top10-nolist-grand.phtml
+++ b/resources/views/statistics/families/top10-nolist-grand.phtml
@@ -10,6 +10,6 @@ use Fisharebest\Webtrees\I18N;
 
 <?php foreach ($records as $record): ?>
     <?php $family = $record['family']; ?>
-    <a href="<?= e($family->url()) ?>"><?= $family->getFullName() ?></a>
+    <a href="<?= e($family->url()) ?>"><?= $family->fullName() ?></a>
     - <?= I18N::plural('%s grandchild', '%s grandchildren', $record['count'], I18N::number($record['count'])) ?>
 <?php endforeach; ?>
diff --git a/resources/views/statistics/families/top10-nolist-spouses.phtml b/resources/views/statistics/families/top10-nolist-spouses.phtml
index 50a09aac07..32f4a883ee 100644
--- a/resources/views/statistics/families/top10-nolist-spouses.phtml
+++ b/resources/views/statistics/families/top10-nolist-spouses.phtml
@@ -9,5 +9,5 @@ use Fisharebest\Webtrees\Family;
 
 <?php foreach ($records as $record): ?>
     <?php $family = $record['family']; ?>
-    <a href="<?= e($family->url()) ?>"><?= $family->getFullName() ?></a> (<?= $record['age'] ?>)
+    <a href="<?= e($family->url()) ?>"><?= $family->fullName() ?></a> (<?= $record['age'] ?>)
 <?php endforeach; ?>
diff --git a/resources/views/statistics/families/top10-nolist.phtml b/resources/views/statistics/families/top10-nolist.phtml
index a60d371fec..35637113ea 100644
--- a/resources/views/statistics/families/top10-nolist.phtml
+++ b/resources/views/statistics/families/top10-nolist.phtml
@@ -10,6 +10,6 @@ use Fisharebest\Webtrees\I18N;
 
 <?php foreach ($records as $record): ?>
     <?php $family = $record['family']; ?>
-    <a href="<?= e($family->url()) ?>"><?= $family->getFullName() ?></a>
+    <a href="<?= e($family->url()) ?>"><?= $family->fullName() ?></a>
     - <?= I18N::plural('%s child', '%s children', $record['count'], I18N::number($record['count'])) ?>
 <?php endforeach; ?>
diff --git a/resources/views/statistics/individuals/top10-list.phtml b/resources/views/statistics/individuals/top10-list.phtml
index ee9f840466..2f3be52bca 100644
--- a/resources/views/statistics/individuals/top10-list.phtml
+++ b/resources/views/statistics/individuals/top10-list.phtml
@@ -13,7 +13,7 @@ use Fisharebest\Webtrees\Individual;
         <?php foreach ($records as $record): ?>
             <?php $person = $record['person']; ?>
             <li class="list-group-item d-flex justify-content-between align-items-center">
-                <a href="<?= e($person->url()) ?>"><?= $person->getFullName() ?></a>
+                <a href="<?= e($person->url()) ?>"><?= $person->fullName() ?></a>
                 <span class="badge badge-secondary badge-pill ml-3"><?= $record['age'] ?></span>
             </li>
         <?php endforeach; ?>
diff --git a/resources/views/statistics/individuals/top10-nolist.phtml b/resources/views/statistics/individuals/top10-nolist.phtml
index e3e52d9a91..7823982959 100644
--- a/resources/views/statistics/individuals/top10-nolist.phtml
+++ b/resources/views/statistics/individuals/top10-nolist.phtml
@@ -9,5 +9,5 @@ use Fisharebest\Webtrees\Individual;
 
 <?php foreach ($records as $record): ?>
     <?php $person = $record['person']; ?>
-    <a href="<?= e($person->url()) ?>"><?= $person->getFullName() ?></a> (<?= $record['age'] ?>)
+    <a href="<?= e($person->url()) ?>"><?= $person->fullName() ?></a> (<?= $record['age'] ?>)
 <?php endforeach; ?>