Rename Tree::getTreeName() to name()

90 files changed, 270 insertions, 270 deletions

diff --git a/app/Date/AbstractCalendarDate.php b/app/Date/AbstractCalendarDate.php
index 3fd5237cb3..8443f9628f 100644
--- a/app/Date/AbstractCalendarDate.php
+++ b/app/Date/AbstractCalendarDate.php
@@ -985,7 +985,7 @@ abstract class AbstractCalendarDate
             'month' => $this->formatGedcomMonth(),
             'day'   => $this->formatGedcomDay(),
             'view'  => $view,
-            'ged'   => $tree->getName(),
+            'ged'   => $tree->name(),
         ]);
     }
 }
diff --git a/app/Functions/FunctionsCharts.php b/app/Functions/FunctionsCharts.php
index fc174aafe2..ea153cd5a1 100644
--- a/app/Functions/FunctionsCharts.php
+++ b/app/Functions/FunctionsCharts.php
@@ -329,17 +329,17 @@ class FunctionsCharts
             echo '<br>';
             echo '<a href="' . e(route('add-child-to-family', [
                     'gender' => 'U',
-                    'ged'    => $family->getTree()->getName(),
+                    'ged'    => $family->getTree()->name(),
                     'xref'   => $family->getXref(),
                 ])) . '">' . I18N::translate('Add a child to this family') . '</a>';
             echo ' <a class="icon-sex_m_15x15" href="' . e(route('add-child-to-family', [
                     'gender' => 'M',
-                    'ged'    => $family->getTree()->getName(),
+                    'ged'    => $family->getTree()->name(),
                     'xref'   => $family->getXref(),
                 ])) . '" title="', I18N::translate('son'), '"></a>';
             echo ' <a class="icon-sex_f_15x15" href="' . e(route('add-child-to-family', [
                     'gender' => 'F',
-                    'ged'    => $family->getTree()->getName(),
+                    'ged'    => $family->getTree()->name(),
                     'xref'   => $family->getXref(),
                 ])) . '" title="', I18N::translate('daughter'), '"></a>';
             echo '<br><br>';
diff --git a/app/Functions/FunctionsEdit.php b/app/Functions/FunctionsEdit.php
index 9be5eec64a..73e1aa37db 100644
--- a/app/Functions/FunctionsEdit.php
+++ b/app/Functions/FunctionsEdit.php
@@ -687,7 +687,7 @@ class FunctionsEdit
             $html .=
                 '<div class="input-group">' .
                 '<span class="input-group-btn">' .
-                '<button class="btn btn-secondary" type="button" data-toggle="modal" data-target="#wt-ajax-modal" data-href="' . e(route('create-note-object', ['ged' => $tree->getName()])) . '" data-select-id="' . $id . '" title="' . I18N::translate('Create a shared note') . '">' .
+                '<button class="btn btn-secondary" type="button" data-toggle="modal" data-target="#wt-ajax-modal" data-href="' . e(route('create-note-object', ['ged' => $tree->name()])) . '" data-select-id="' . $id . '" title="' . I18N::translate('Create a shared note') . '">' .
                 '' . view('icons/add') . '<' .
                 '/button>' .
                 '</span>' .
@@ -699,7 +699,7 @@ class FunctionsEdit
         } elseif ($fact === 'OBJE') {
             $html .=
                 '<div class="input-group">' .
-                '<span class="input-group-btn"><button class="btn btn-secondary" type="button" data-toggle="modal" data-href="' . e(route('create-media-object', ['ged' => $tree->getName()])) . '" data-target="#wt-ajax-modal" data-select-id="' . $id . '" title="' . I18N::translate('Create a media object') . '">' . view('icons/add') . '</button></span>' .
+                '<span class="input-group-btn"><button class="btn btn-secondary" type="button" data-toggle="modal" data-href="' . e(route('create-media-object', ['ged' => $tree->name()])) . '" data-target="#wt-ajax-modal" data-select-id="' . $id . '" title="' . I18N::translate('Create a media object') . '">' . view('icons/add') . '</button></span>' .
                 self::formControlMediaObject($tree, Media::getInstance($value, $tree), [
                     'id'   => $id,
                     'name' => $name,
@@ -722,7 +722,7 @@ class FunctionsEdit
                     'value'                 => $value,
                     'type'                  => 'text',
                     'data-autocomplete-url' => route('autocomplete-place', [
-                        'ged'   => $tree->getName(),
+                        'ged'   => $tree->name(),
                         'query' => 'QUERY',
                     ]),
                 ]) . '>';
@@ -744,7 +744,7 @@ class FunctionsEdit
         } elseif ($fact === 'REPO') {
             $html .=
                 '<div class="input-group">' .
-                '<span class="input-group-btn"><button class="btn btn-secondary" type="button" data-toggle="modal" data-href="' . e(route('create-repository', ['ged' => $tree->getName()])) . '" data-target="#wt-ajax-modal" data-select-id="' . $id . '" title="' . I18N::translate('Create a repository') . '">' . view('icons/add') . '</button></span>' .
+                '<span class="input-group-btn"><button class="btn btn-secondary" type="button" data-toggle="modal" data-href="' . e(route('create-repository', ['ged' => $tree->name()])) . '" data-target="#wt-ajax-modal" data-select-id="' . $id . '" title="' . I18N::translate('Create a repository') . '">' . view('icons/add') . '</button></span>' .
                 self::formControlRepository($tree, Repository::getInstance($value, $tree), [
                     'id'   => $id,
                     'name' => $name,
@@ -771,7 +771,7 @@ class FunctionsEdit
         } elseif ($fact === 'SOUR') {
             $html .=
                 '<div class="input-group">' .
-                '<span class="input-group-btn"><button class="btn btn-secondary" type="button" data-toggle="modal" data-href="' . e(route('create-source', ['ged' => $tree->getName()])) . '" data-target="#wt-ajax-modal" data-select-id="' . $id . '" title="' . I18N::translate('Create a source') . '">' . view('icons/add') . '</button></span>' .
+                '<span class="input-group-btn"><button class="btn btn-secondary" type="button" data-toggle="modal" data-href="' . e(route('create-source', ['ged' => $tree->name()])) . '" data-target="#wt-ajax-modal" data-select-id="' . $id . '" title="' . I18N::translate('Create a source') . '">' . view('icons/add') . '</button></span>' .
                 self::formControlSource($tree, Source::getInstance($value, $tree), [
                     'id'   => $id,
                     'name' => $name,
@@ -782,7 +782,7 @@ class FunctionsEdit
         } elseif ($fact === 'SUBM') {
             $html .=
                 '<div class="input-group">' .
-                '<span class="input-group-btn"><button class="btn btn-secondary" type="button" data-toggle="modal" data-href="' . e(route('create-submitter', ['ged' => $tree->getName()])) . '" data-target="#wt-ajax-modal" data-select-id="' . $id . '" title="' . I18N::translate('Create a submitter') . '">' . view('icons/add') . '</button></span>' .
+                '<span class="input-group-btn"><button class="btn btn-secondary" type="button" data-toggle="modal" data-href="' . e(route('create-submitter', ['ged' => $tree->name()])) . '" data-target="#wt-ajax-modal" data-select-id="' . $id . '" title="' . I18N::translate('Create a submitter') . '">' . view('icons/add') . '</button></span>' .
                 self::formControlSubmitter($tree, GedcomRecord::getInstance($value, $tree), [
                     'id'   => $id,
                     'name' => $name,
diff --git a/app/Functions/FunctionsExport.php b/app/Functions/FunctionsExport.php
index c2dafe67f9..2237f139da 100644
--- a/app/Functions/FunctionsExport.php
+++ b/app/Functions/FunctionsExport.php
@@ -92,7 +92,7 @@ class FunctionsExport
         $DATE = "\n1 DATE " . strtoupper(date('d M Y')) . "\n2 TIME " . date('H:i:s');
         $GEDC = "\n1 GEDC\n2 VERS 5.5.1\n2 FORM Lineage-Linked";
         $CHAR = "\n1 CHAR " . $char;
-        $FILE = "\n1 FILE " . $tree->getName();
+        $FILE = "\n1 FILE " . $tree->name();
         $LANG = '';
         $COPR = '';
         $SUBN = '';
diff --git a/app/Functions/FunctionsPrint.php b/app/Functions/FunctionsPrint.php
index 5ac4c951b4..0d585a439a 100644
--- a/app/Functions/FunctionsPrint.php
+++ b/app/Functions/FunctionsPrint.php
@@ -509,7 +509,7 @@ class FunctionsPrint
             if (!$newRow) {
                 echo '</select>';
                 /* I18N: A button label. */
-                echo '&nbsp;&nbsp;<input type="button" value="', I18N::translate('add'), '" onclick="return paste_fact(\'' . e($tree->getName()) . '\',\'' . e($record->getXref()) . '\', \'#newClipboardFact\');"> ';
+                echo '&nbsp;&nbsp;<input type="button" value="', I18N::translate('add'), '" onclick="return paste_fact(\'' . e($tree->name()) . '\',\'' . e($record->getXref()) . '\', \'#newClipboardFact\');"> ';
                 echo '</form></td></tr>', "\n";
             }
         }
@@ -565,7 +565,7 @@ class FunctionsPrint
         echo '<form onsubmit="if ($(&quot;#add-fact&quot;).val() === null) {event.preventDefault();}">';
         echo '<input type="hidden" name="route" value="add-fact">';
         echo '<input type="hidden" name="xref" value="' . e($record->getXref()) . '">';
-        echo '<input type="hidden" name="ged" value="' . e($tree->getName()) . '">';
+        echo '<input type="hidden" name="ged" value="' . e($tree->name()) . '">';
         echo '<select id="add-fact" name="fact">';
         echo '<option value="" disabled selected>' . I18N::translate('&lt;select&gt;') . '</option>';
         foreach ($translated_addfacts as $fact => $fact_name) {
@@ -584,7 +584,7 @@ class FunctionsPrint
             echo '<a href="' . e(route('add-fact', [
                     'fact' => $fact,
                     'xref' => $record->getXref(),
-                    'ged'  => $tree->getName(),
+                    'ged'  => $tree->name(),
                 ])) . '">', GedcomTag::getLabel($fact), '</a>';
         }
         echo '</span>';
diff --git a/app/Functions/FunctionsPrintFacts.php b/app/Functions/FunctionsPrintFacts.php
index 6fb324d88a..088462b117 100644
--- a/app/Functions/FunctionsPrintFacts.php
+++ b/app/Functions/FunctionsPrintFacts.php
@@ -202,19 +202,19 @@ class FunctionsPrintFacts
                     'href'  => route('edit-fact', [
                         'xref'    => $parent->getXref(),
                         'fact_id' => $fact->id(),
-                        'ged'     => $tree->getName(),
+                        'ged'     => $tree->name(),
                     ]),
                 ]) ?>
                 <?= FontAwesome::linkIcon('copy', I18N::translate('Copy'), [
                     'class'   => 'btn btn-link',
                     'href'    => '#',
-                    'onclick' => 'return copy_fact("' . e($tree->getName()) . '", "' . e($parent->getXref()) . '", "' . $fact->id() . '");',
+                    'onclick' => 'return copy_fact("' . e($tree->name()) . '", "' . e($parent->getXref()) . '", "' . $fact->id() . '");',
                 ]) ?>
                 <?= FontAwesome::linkIcon('delete', I18N::translate('Delete'), [
                     'class'        => 'btn btn-link',
                     'data-confirm' =>  I18N::translate('Are you sure you want to delete this fact?'),
                     'href'         => '#',
-                    'onclick'      => 'return delete_fact(this.dataset.confirm, "' . e($tree->getName()) . '", "' . e($parent->getXref()) . '", "' . $fact->id() . '");',
+                    'onclick'      => 'return delete_fact(this.dataset.confirm, "' . e($tree->name()) . '", "' . e($parent->getXref()) . '", "' . $fact->id() . '");',
                 ]) ?>
             </div>
             <?php
@@ -541,7 +541,7 @@ class FunctionsPrintFacts
                     $values[] = '<a href="' . e(route('relationships', [
                             'xref1' => $associate->getXref(),
                             'xref2' => $person->getXref(),
-                            'ged'   => $person->getTree()->getName(),
+                            'ged'   => $person->getTree()->name(),
                         ])) . '" rel="nofollow">' . $relationship_name . '</a>';
                 }
                 $value = implode(' — ', $values);
@@ -780,7 +780,7 @@ class FunctionsPrintFacts
                     echo '<a href="' . e(route('edit-fact', [
                             'xref'    => $parent->getXref(),
                             'fact_id' => $fact->id(),
-                            'ged'     => $tree->getName(),
+                            'ged'     => $tree->name(),
                         ])) . '" title="', I18N::translate('Edit'), '">';
                     if ($tree->getPreference('SHOW_FACT_ICONS')) {
                         if ($level == 1) {
@@ -798,20 +798,20 @@ class FunctionsPrintFacts
                             'href'  => route('edit-fact', [
                                 'xref'    => $parent->getXref(),
                                 'fact_id' => $fact->id(),
-                                'ged'     => $tree->getName(),
+                                'ged'     => $tree->name(),
                             ]),
                         ]);
                         echo FontAwesome::linkIcon('copy', I18N::translate('Copy'), [
                             'class'   => 'btn btn-link',
                             'href'    => '#',
-                            'onclick' => 'return copy_fact("' . e($tree->getName()) . '", "' . e($parent->getXref()) . '", "' . $fact->id() . '");',
+                            'onclick' => 'return copy_fact("' . e($tree->name()) . '", "' . e($parent->getXref()) . '", "' . $fact->id() . '");',
                         ]);
                     }
                     echo FontAwesome::linkIcon('delete', I18N::translate('Delete'), [
                         'class'        => 'btn btn-link',
                         'data-confirm' =>  I18N::translate('Are you sure you want to delete this fact?'),
                         'href'         => '#',
-                        'onclick'      => 'return delete_fact(this.dataset.confirm, "' . e($tree->getName()) . '", "' . e($parent->getXref()) . '", "' . $fact->id() . '");',
+                        'onclick'      => 'return delete_fact(this.dataset.confirm, "' . e($tree->name()) . '", "' . e($parent->getXref()) . '", "' . $fact->id() . '");',
                     ]);
                 } else {
                     echo GedcomTag::getLabel($factname, $parent);
@@ -1023,19 +1023,19 @@ class FunctionsPrintFacts
                         'href'  => route('edit-fact', [
                             'xref'    => $parent->getXref(),
                             'fact_id' => $fact->id(),
-                            'ged'     => $tree->getName(),
+                            'ged'     => $tree->name(),
                         ]),
                     ]);
                     echo FontAwesome::linkIcon('copy', I18N::translate('Copy'), [
                         'class'   => 'btn btn-link',
                         'href'    => '#',
-                        'onclick' => 'return copy_fact("' . e($tree->getName()) . '", "' . e($parent->getXref()) . '", "' . $fact->id() . '");',
+                        'onclick' => 'return copy_fact("' . e($tree->name()) . '", "' . e($parent->getXref()) . '", "' . $fact->id() . '");',
                     ]);
                     echo FontAwesome::linkIcon('delete', I18N::translate('Delete'), [
                         'class'        => 'btn btn-link',
                         'data-confirm' =>  I18N::translate('Are you sure you want to delete this fact?'),
                         'href'         => '#',
-                        'onclick'      => 'return delete_fact(this.dataset.confirm, "' . e($tree->getName()) . '", "' . e($parent->getXref()) . '", "' . $fact->id() . '");',
+                        'onclick'      => 'return delete_fact(this.dataset.confirm, "' . e($tree->name()) . '", "' . e($parent->getXref()) . '", "' . $fact->id() . '");',
                     ]);
                     echo '</div>';
                 }
@@ -1173,13 +1173,13 @@ class FunctionsPrintFacts
                     echo FontAwesome::linkIcon('copy', I18N::translate('Copy'), [
                         'class'   => 'btn btn-link',
                         'href'    => '#',
-                        'onclick' => 'return copy_fact("' . e($tree->getName()) . '", "' . e($parent->getXref()) . '", "' . $fact->id() . '");',
+                        'onclick' => 'return copy_fact("' . e($tree->name()) . '", "' . e($parent->getXref()) . '", "' . $fact->id() . '");',
                     ]);
                     echo FontAwesome::linkIcon('delete', I18N::translate('Delete'), [
                         'class'        => 'btn btn-link',
                         'data-confirm' =>  I18N::translate('Are you sure you want to delete this fact?'),
                         'href'         => '#',
-                        'onclick'      => 'return delete_fact(this.dataset.confirm", "' . e($tree->getName()) . '", "' . e($parent->getXref()) . '", "' . $fact->id() . '");',
+                        'onclick'      => 'return delete_fact(this.dataset.confirm", "' . e($tree->name()) . '", "' . e($parent->getXref()) . '", "' . $fact->id() . '");',
                     ]);
                     echo '</div>';
                 } else {
diff --git a/app/Functions/FunctionsPrintLists.php b/app/Functions/FunctionsPrintLists.php
index 2af96ea0d2..468bb67444 100644
--- a/app/Functions/FunctionsPrintLists.php
+++ b/app/Functions/FunctionsPrintLists.php
@@ -57,7 +57,7 @@ class FunctionsPrintLists
                 }
                 $url = route($route, [
                     'surname' => $surn,
-                    'ged'     => $tree->getName(),
+                    'ged'     => $tree->name(),
                 ]);
                 $html .= '<a style="font-size:' . $size . '%" href="' . e($url) . '">';
                 if ($totals) {
@@ -91,12 +91,12 @@ class FunctionsPrintLists
             if ($surn) {
                 $url = route($route, [
                     'surname' => $surn,
-                    'ged'     => $tree->getName(),
+                    'ged'     => $tree->name(),
                 ]);
             } else {
                 $url = route($route, [
                     'alpha' => ',',
-                    'ged'   => $tree->getName(),
+                    'ged'   => $tree->name(),
                 ]);
             }
             // If all the surnames are just case variants, then merge them into one
diff --git a/app/GedcomRecord.php b/app/GedcomRecord.php
index 4aa975fbf2..a95a87d0eb 100644
--- a/app/GedcomRecord.php
+++ b/app/GedcomRecord.php
@@ -362,7 +362,7 @@ class GedcomRecord
     {
         return route(static::ROUTE_NAME, [
             'xref' => $this->getXref(),
-            'ged'  => $this->tree->getName(),
+            'ged'  => $this->tree->name(),
         ]);
     }
 
diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index 9c7acc32f1..35994b7d10 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -132,7 +132,7 @@ class AccountController extends AbstractBaseController
         // Switch to the new language now
         Session::put('locale', $language);
 
-        return new RedirectResponse(route('my-account', ['ged' => $tree->getName()]));
+        return new RedirectResponse(route('my-account', ['ged' => $tree->name()]));
     }
 
     /**
diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php
index 111d7f4cc9..711cfd52f7 100644
--- a/app/Http/Controllers/AdminController.php
+++ b/app/Http/Controllers/AdminController.php
@@ -155,7 +155,7 @@ class AdminController extends AbstractBaseController
         $tree_list = [];
         foreach (Tree::getAll() as $tree) {
             if (Auth::isManager($tree)) {
-                $tree_list[$tree->getName()] = $tree->getTitle();
+                $tree_list[$tree->name()] = $tree->getTitle();
             }
         }
 
@@ -521,7 +521,7 @@ class AdminController extends AbstractBaseController
             }, $facts);
 
             return [
-                $tree->getName(),
+                $tree->name(),
                 $media->displayImage(100, 100, 'fit', ['class' => 'img-thumbnail']),
                 '<a href="' . e($media->url()) . '">' . $media->getFullName() . '</a>',
                 '<a href="' . e($individual->url()) . '">' . $individual->getFullName() . '</a>',
@@ -929,7 +929,7 @@ class AdminController extends AbstractBaseController
             $record2_name
         ), 'success');
 
-        return new RedirectResponse(route('merge-records', ['ged' => $tree->getName()]));
+        return new RedirectResponse(route('merge-records', ['ged' => $tree->name()]));
     }
 
     /**
@@ -997,7 +997,7 @@ class AdminController extends AbstractBaseController
      */
     public function treePrivacyEdit(Tree $tree): Response
     {
-        $title                = e($tree->getName()) . ' — ' . I18N::translate('Privacy');
+        $title                = e($tree->name()) . ' — ' . I18N::translate('Privacy');
         $all_tags             = $this->tagsForPrivacy($tree);
         $privacy_constants    = $this->privacyConstants();
         $privacy_restrictions = $this->privacyRestrictions($tree);
@@ -1087,7 +1087,7 @@ class AdminController extends AbstractBaseController
         }
 
 
-        return new RedirectResponse(route('admin-trees', ['ged' => $tree->getName()]));
+        return new RedirectResponse(route('admin-trees', ['ged' => $tree->name()]));
     }
 
     /**
diff --git a/app/Http/Controllers/AdminTreesController.php b/app/Http/Controllers/AdminTreesController.php
index ee220396a2..dd3d4007de 100644
--- a/app/Http/Controllers/AdminTreesController.php
+++ b/app/Http/Controllers/AdminTreesController.php
@@ -300,7 +300,7 @@ class AdminTreesController extends AbstractBaseController
     {
         return '<b><a href="' . e(route('record', [
                 'xref' => $xref,
-                'ged'  => $tree->getName(),
+                'ged'  => $tree->name(),
             ])) . '">' . $xref . '</a></b>';
     }
 
@@ -333,10 +333,10 @@ class AdminTreesController extends AbstractBaseController
             FlashMessages::addMessage(I18N::translate('The family tree “%s” already exists.', e($tree_name)), 'danger');
         } else {
             $tree = Tree::create($tree_name, $tree_title);
-            FlashMessages::addMessage(I18N::translate('The family tree “%s” has been created.', e($tree->getName())), 'success');
+            FlashMessages::addMessage(I18N::translate('The family tree “%s” has been created.', e($tree->name())), 'success');
         }
 
-        $url = route('admin-trees', ['ged' => $tree->getName()]);
+        $url = route('admin-trees', ['ged' => $tree->name()]);
 
         return new RedirectResponse($url);
     }
@@ -417,7 +417,7 @@ class AdminTreesController extends AbstractBaseController
         $encoding     =  $convert ? 'ANSI' : 'UTF-8';
 
         // What to call the downloaded file
-        $download_filename = $tree->getName();
+        $download_filename = $tree->name();
         if (strtolower(substr($download_filename, -4, 4)) != '.ged') {
             $download_filename .= '.ged';
         }
@@ -494,7 +494,7 @@ class AdminTreesController extends AbstractBaseController
      */
     public function exportServer(Tree $tree): RedirectResponse
     {
-        $filename = WT_DATA_DIR . $tree->getName();
+        $filename = WT_DATA_DIR . $tree->name();
 
         // Force a ".ged" suffix
         if (strtolower(substr($filename, -4)) != '.ged') {
@@ -520,7 +520,7 @@ class AdminTreesController extends AbstractBaseController
         }
 
         $url = route('admin-trees', [
-            'ged' => $tree->getName(),
+            'ged' => $tree->name(),
         ]);
 
         return new RedirectResponse($url);
@@ -567,7 +567,7 @@ class AdminTreesController extends AbstractBaseController
             }
         }
 
-        $url = route('admin-trees', ['ged' => $tree->getName()]);
+        $url = route('admin-trees', ['ged' => $tree->name()]);
 
         return new RedirectResponse($url);
     }
@@ -609,7 +609,7 @@ class AdminTreesController extends AbstractBaseController
         // Just show the current tree, the default tree, and unimported trees
         if (count($all_trees) >= $multiple_tree_threshold) {
             $all_trees = array_filter($all_trees, function (Tree $x) use ($tree): bool {
-                return $x->getPreference('imported') === '0' || $tree->id() === $x->id() || $x->getName() === Site::getPreference('DEFAULT_GEDCOM');
+                return $x->getPreference('imported') === '0' || $tree->id() === $x->id() || $x->name() === Site::getPreference('DEFAULT_GEDCOM');
             });
         }
 
@@ -786,12 +786,12 @@ class AdminTreesController extends AbstractBaseController
             FlashMessages::addMessage(I18N::translate('The family trees have been merged successfully.'), 'success');
 
             $url = route('admin-trees', [
-                'ged' => $tree2->getName(),
+                'ged' => $tree2->name(),
             ]);
         } else {
             $url = route('admin-trees-merge', [
-                'tree1_name' => $tree1->getName(),
-                'tree2_name' => $tree2->getName(),
+                'tree1_name' => $tree1->name(),
+                'tree2_name' => $tree2->name(),
             ]);
         }
 
@@ -848,7 +848,7 @@ class AdminTreesController extends AbstractBaseController
         FlashMessages::addMessage($feedback, 'success');
 
         $url = route('admin-trees-places', [
-            'ged'     => $tree->getName(),
+            'ged'     => $tree->name(),
             'replace' => $replace,
             'search'  => $search,
         ]);
@@ -1097,7 +1097,7 @@ class AdminTreesController extends AbstractBaseController
         }
 
         $gedcom = $request->get('gedcom');
-        if ($gedcom && $gedcom !== $tree->getName()) {
+        if ($gedcom && $gedcom !== $tree->name()) {
             try {
                 Database::prepare("UPDATE `##gedcom` SET gedcom_name = ? WHERE gedcom_id = ?")->execute([
                     $gedcom,
@@ -1105,7 +1105,7 @@ class AdminTreesController extends AbstractBaseController
                 ]);
                 Database::prepare("UPDATE `##site_setting` SET setting_value = ? WHERE setting_name='DEFAULT_GEDCOM' AND setting_value = ?")->execute([
                     $gedcom,
-                    $tree->getName(),
+                    $tree->name(),
                 ]);
             } catch (\Exception $ex) {
                 DebugBar::addThrowable($ex);
@@ -1116,7 +1116,7 @@ class AdminTreesController extends AbstractBaseController
 
         FlashMessages::addMessage(I18N::translate('The preferences for the family tree “%s” have been updated.', e($tree->getTitle())), 'success');
 
-        $url = route('admin-trees', ['ged' => $tree->getName()]);
+        $url = route('admin-trees', ['ged' => $tree->name()]);
 
         return new RedirectResponse($url);
     }
@@ -1547,7 +1547,7 @@ class AdminTreesController extends AbstractBaseController
             }
         }
 
-        $url = route('admin-trees-renumber', ['ged' => $tree->getName()]);
+        $url = route('admin-trees-renumber', ['ged' => $tree->name()]);
 
         return new RedirectResponse($url);
     }
@@ -1559,7 +1559,7 @@ class AdminTreesController extends AbstractBaseController
      */
     public function setDefault(Tree $tree): RedirectResponse
     {
-        Site::setPreference('DEFAULT_GEDCOM', $tree->getName());
+        Site::setPreference('DEFAULT_GEDCOM', $tree->name());
 
         /* I18N: %s is the name of a family tree */
         FlashMessages::addMessage(I18N::translate('The family tree “%s” will be shown to visitors when they first arrive at this website.', e($tree->getTitle())), 'success');
@@ -1576,7 +1576,7 @@ class AdminTreesController extends AbstractBaseController
      */
     public function synchronize(Tree $tree): RedirectResponse
     {
-        $url = route('admin-trees', ['ged' => $tree->getName()]);
+        $url = route('admin-trees', ['ged' => $tree->name()]);
 
         $gedcom_files = $this->gedcomFiles(WT_DATA_DIR);
 
@@ -1595,7 +1595,7 @@ class AdminTreesController extends AbstractBaseController
         }
 
         foreach (Tree::getAll() as $tree) {
-            if (!in_array($tree->getName(), $gedcom_files)) {
+            if (!in_array($tree->name(), $gedcom_files)) {
                 FlashMessages::addMessage(I18N::translate('The family tree “%s” has been deleted.', e($tree->getTitle())), 'success');
                 $tree->delete();
             }
diff --git a/app/Http/Controllers/AdminUpgradeController.php b/app/Http/Controllers/AdminUpgradeController.php
index ddc38f4dc5..80dcd1db23 100644
--- a/app/Http/Controllers/AdminUpgradeController.php
+++ b/app/Http/Controllers/AdminUpgradeController.php
@@ -144,7 +144,7 @@ class AdminUpgradeController extends AbstractBaseController
         foreach (Tree::getAll() as $tree) {
             $route = route('upgrade', [
                 'step' => 'Export',
-                'ged'  => $tree->getName(),
+                'ged'  => $tree->name(),
             ]);
 
             $export_steps[$route] = I18N::translate('Export all the family trees to GEDCOM files…') . ' ' . e($tree->getTitle());
@@ -204,7 +204,7 @@ class AdminUpgradeController extends AbstractBaseController
      */
     private function wizardStepExport(Tree $tree): Response
     {
-        $filename = WT_DATA_DIR . $tree->getName() . date('-Y-m-d') . '.ged';
+        $filename = WT_DATA_DIR . $tree->name() . date('-Y-m-d') . '.ged';
 
         try {
             $stream = fopen($filename, 'w');
diff --git a/app/Http/Controllers/AncestorsChartController.php b/app/Http/Controllers/AncestorsChartController.php
index 4cd1295089..50f2acc222 100644
--- a/app/Http/Controllers/AncestorsChartController.php
+++ b/app/Http/Controllers/AncestorsChartController.php
@@ -179,7 +179,7 @@ class AncestorsChartController extends AbstractChartController
         echo '</td><td>';
         if ($sosa > 1) {
             echo FontAwesome::linkIcon('arrow-down', I18N::translate('Ancestors of %s', $individual->getFullName()), ['href' => route('ancestors', ['xref'        => $individual->getXref(),
-                                                                                                                                                    'ged'         => $individual->getTree()->getName(),
+                                                                                                                                                    'ged'         => $individual->getTree()->name(),
                                                                                                                                                     'generations' => $generations,
                                                                                                                                                     'chart_style' => self::CHART_STYLE_LIST,
             ]),
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index a446a323b2..715e1d94ed 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -51,7 +51,7 @@ class LoginController extends AbstractBaseController
     {
         // Already logged in?
         if (Auth::check()) {
-            $ged = $tree !== null ? $tree->getName() : '';
+            $ged = $tree !== null ? $tree->name() : '';
 
             return new RedirectResponse(route('user-page', ['ged' => $ged]));
         }
@@ -207,6 +207,6 @@ class LoginController extends AbstractBaseController
             return new RedirectResponse(route('tree-page'));
         }
 
-        return new RedirectResponse(route('tree-page', ['ged' => $tree->getName()]));
+        return new RedirectResponse(route('tree-page', ['ged' => $tree->name()]));
     }
 }
diff --git a/app/Http/Controllers/BranchesController.php b/app/Http/Controllers/BranchesController.php
index 00c71be415..cd75864c3a 100644
--- a/app/Http/Controllers/BranchesController.php
+++ b/app/Http/Controllers/BranchesController.php
@@ -261,7 +261,7 @@ class BranchesController extends AbstractBaseController
             $sosa_html  = ' <a class="details1 ' . $individual->getBoxStyle() . '" title="' . I18N::translate('Sosa') . '" href="' . e(route('relationships', [
                     'xref1' => $individual->getXref(),
                     'xref2' => $ancestors[1]->getXref(),
-                    'ged'   => $individual->getTree()->getName(),
+                    'ged'   => $individual->getTree()->name(),
                 ])) . '" rel="nofollow">' . $sosa . '</a>' . self::sosaGeneration($sosa);
         } else {
             $sosa_class = '';
@@ -300,7 +300,7 @@ class BranchesController extends AbstractBaseController
                         $sosa_class = 'search_hit';
                         $sosa_html  = ' <a class="details1 ' . $spouse->getBoxStyle() . '" title="' . I18N::translate('Sosa') . '" href="' . e(route('relationships', [
                                 'xref2' => $ancestors[1]->getXref(),
-                                'ged'   => $individual->getTree()->getName(),
+                                'ged'   => $individual->getTree()->name(),
                             ])) . '" rel="nofollow"> ' . $sosa . ' </a>' . self::sosaGeneration($sosa);
                     } else {
                         $sosa_class = '';
diff --git a/app/Http/Controllers/DescendantsChartController.php b/app/Http/Controllers/DescendantsChartController.php
index e8afc9797c..0745c0ba60 100644
--- a/app/Http/Controllers/DescendantsChartController.php
+++ b/app/Http/Controllers/DescendantsChartController.php
@@ -188,7 +188,7 @@ class DescendantsChartController extends AbstractChartController
         echo '<td>';
         foreach ($person->getChildFamilies() as $cfamily) {
             foreach ($cfamily->getSpouses() as $parent) {
-                echo FontAwesome::linkIcon('arrow-up', I18N::translate('Start at parents'), ['href' => route('descendants', ['ged'         => $parent->getTree()->getName(),
+                echo FontAwesome::linkIcon('arrow-up', I18N::translate('Start at parents'), ['href' => route('descendants', ['ged'         => $parent->getTree()->name(),
                                                                                                                              'xref'        => $parent->getXref(),
                                                                                                                              'generations' => $generations,
                 ]),
@@ -271,7 +271,7 @@ class DescendantsChartController extends AbstractChartController
         if ($spouse) {
             foreach ($spouse->getChildFamilies() as $cfamily) {
                 foreach ($cfamily->getSpouses() as $parent) {
-                    echo FontAwesome::linkIcon('arrow-up', I18N::translate('Start at parents'), ['href' => route('descendants', ['ged'         => $parent->getTree()->getName(),
+                    echo FontAwesome::linkIcon('arrow-up', I18N::translate('Start at parents'), ['href' => route('descendants', ['ged'         => $parent->getTree()->name(),
                                                                                                                                  'xref'        => $parent->getXref(),
                                                                                                                                  'generations' => $generations,
                     ]),
diff --git a/app/Http/Controllers/EditIndividualController.php b/app/Http/Controllers/EditIndividualController.php
index a5b5fc9147..36b6b9575d 100644
--- a/app/Http/Controllers/EditIndividualController.php
+++ b/app/Http/Controllers/EditIndividualController.php
@@ -565,7 +565,7 @@ class EditIndividualController extends AbstractEditController
             return new RedirectResponse($new_indi->url());
         }
 
-        return new RedirectResponse(route('admin-trees', ['ged' => $tree->getName()]));
+        return new RedirectResponse(route('admin-trees', ['ged' => $tree->name()]));
     }
 
     /**
diff --git a/app/Http/Controllers/EditMediaController.php b/app/Http/Controllers/EditMediaController.php
index 355119d35d..32c502e39e 100644
--- a/app/Http/Controllers/EditMediaController.php
+++ b/app/Http/Controllers/EditMediaController.php
@@ -102,7 +102,7 @@ class EditMediaController extends AbstractEditController
         $title = trim(preg_replace('/\s+/', ' ', $title));
 
         if ($media === null || $media->isPendingDeletion() || !$media->canEdit()) {
-            return new RedirectResponse(route('tree-page', ['ged' => $tree->getName()]));
+            return new RedirectResponse(route('tree-page', ['ged' => $tree->name()]));
         }
 
         $file = $this->uploadFile($request, $tree);
@@ -192,7 +192,7 @@ class EditMediaController extends AbstractEditController
 
         // Media object oes not exist?  Media object is read-only?
         if ($media === null || $media->isPendingDeletion() || !$media->canEdit()) {
-            return new RedirectResponse(route('tree-page', ['ged' => $tree->getName()]));
+            return new RedirectResponse(route('tree-page', ['ged' => $tree->name()]));
         }
 
         // Find the fact we are editing.
@@ -205,7 +205,7 @@ class EditMediaController extends AbstractEditController
 
         // Media file does not exist?
         if ($media_file === null) {
-            return new RedirectResponse(route('tree-page', ['ged' => $tree->getName()]));
+            return new RedirectResponse(route('tree-page', ['ged' => $tree->name()]));
         }
 
         // We can edit the file as either a URL or a folder/file
diff --git a/app/Http/Controllers/ErrorController.php b/app/Http/Controllers/ErrorController.php
index b48de5aab9..10e2cfb6e9 100644
--- a/app/Http/Controllers/ErrorController.php
+++ b/app/Http/Controllers/ErrorController.php
@@ -45,7 +45,7 @@ class ErrorController extends AbstractBaseController
     {
         // The tree exists, we have access to it, and it is fully imported.
         if ($tree instanceof Tree && $tree->getPreference('imported') === '1') {
-            return new RedirectResponse(route('tree-page', ['ged' => $tree->getName()]));
+            return new RedirectResponse(route('tree-page', ['ged' => $tree->name()]));
         }
 
         // Not logged in?
diff --git a/app/Http/Controllers/HomePageController.php b/app/Http/Controllers/HomePageController.php
index 5976d1ec46..aa4deda588 100644
--- a/app/Http/Controllers/HomePageController.php
+++ b/app/Http/Controllers/HomePageController.php
@@ -54,7 +54,7 @@ class HomePageController extends AbstractBaseController
         return $this->viewResponse('modules/edit-block-config', [
             'block'      => $block,
             'block_id'   => $block_id,
-            'cancel_url' => route('tree-page', ['ged' => $tree->getName()]),
+            'cancel_url' => route('tree-page', ['ged' => $tree->name()]),
             'title'      => $title,
             'tree'       => $tree,
         ]);
@@ -76,7 +76,7 @@ class HomePageController extends AbstractBaseController
 
         $block->saveBlockConfiguration($request, $block_id);
 
-        return new RedirectResponse(route('tree-page', ['ged' => $tree->getName()]));
+        return new RedirectResponse(route('tree-page', ['ged' => $tree->name()]));
     }
 
     /**
@@ -132,7 +132,7 @@ class HomePageController extends AbstractBaseController
         return $this->viewResponse('modules/edit-block-config', [
             'block'      => $block,
             'block_id'   => $block_id,
-            'cancel_url' => route('user-page', ['ged' => $tree->getName()]),
+            'cancel_url' => route('user-page', ['ged' => $tree->name()]),
             'title'      => $title,
             'tree'       => $tree,
         ]);
@@ -154,7 +154,7 @@ class HomePageController extends AbstractBaseController
 
         $block->saveBlockConfiguration($request, $block_id);
 
-        return new RedirectResponse(route('user-page', ['ged' => $tree->getName()]));
+        return new RedirectResponse(route('user-page', ['ged' => $tree->name()]));
     }
 
     /**
@@ -316,8 +316,8 @@ class HomePageController extends AbstractBaseController
         $side_blocks = $this->getBlocksForTreePage($tree->id(), Auth::accessLevel($tree), 'side');
         $all_blocks  = $this->getAvailableTreeBlocks();
         $title       = I18N::translate('Change the “Home page” blocks');
-        $url_cancel  = route('tree-page', ['ged' => $tree->getName()]);
-        $url_save    = route('tree-page-update', ['ged' => $tree->getName()]);
+        $url_cancel  = route('tree-page', ['ged' => $tree->name()]);
+        $url_save    = route('tree-page-update', ['ged' => $tree->name()]);
 
         return $this->viewResponse('edit-blocks-page', [
             'all_blocks'  => $all_blocks,
@@ -352,7 +352,7 @@ class HomePageController extends AbstractBaseController
 
         $this->updateTreeBlocks($tree->id(), $main_blocks, $side_blocks);
 
-        return new RedirectResponse(route('tree-page', ['ged' => $tree->getName()]));
+        return new RedirectResponse(route('tree-page', ['ged' => $tree->name()]));
     }
 
     /**
@@ -479,8 +479,8 @@ class HomePageController extends AbstractBaseController
         $side_blocks = $this->getBlocksForUserPage($tree->id(), $user->getUserId(), Auth::accessLevel($tree, $user), 'side');
         $all_blocks  = $this->getAvailableUserBlocks();
         $title       = I18N::translate('Change the “My page” blocks');
-        $url_cancel  = route('user-page', ['ged' => $tree->getName()]);
-        $url_save    = route('user-page-update', ['ged' => $tree->getName()]);
+        $url_cancel  = route('user-page', ['ged' => $tree->name()]);
+        $url_save    = route('user-page-update', ['ged' => $tree->name()]);
 
         return $this->viewResponse('edit-blocks-page', [
             'all_blocks'  => $all_blocks,
@@ -516,7 +516,7 @@ class HomePageController extends AbstractBaseController
 
         $this->updateUserBlocks($user->getUserId(), $main_blocks, $side_blocks);
 
-        return new RedirectResponse(route('user-page', ['ged' => $tree->getName()]));
+        return new RedirectResponse(route('user-page', ['ged' => $tree->name()]));
     }
 
     /**
diff --git a/app/Http/Controllers/HourglassChartController.php b/app/Http/Controllers/HourglassChartController.php
index 3b93a6675e..f2ef8efc08 100644
--- a/app/Http/Controllers/HourglassChartController.php
+++ b/app/Http/Controllers/HourglassChartController.php
@@ -261,7 +261,7 @@ class HourglassChartController extends AbstractChartController
                     'data-route'   => 'hourglass-add-desc',
                     'data-xref'    => $pid,
                     'data-spouses' => $show_spouse,
-                    'data-tree'    => $individual->getTree()->getName(),
+                    'data-tree'    => $individual->getTree()->name(),
                 ]);
 
                 //-- move the arrow up to line up with the correct box
@@ -308,7 +308,7 @@ class HourglassChartController extends AbstractChartController
                             'xref'        => $spouse->getXref(),
                             'generations' => $generations,
                             'show_spouse' => (int) $show_spouse,
-                            'ged'         => $spouse->getTree()->getName(),
+                            'ged'         => $spouse->getTree()->name(),
                         ])) . '" class="name1">' . $spouse->getFullName() . '</a>';
                 }
                 foreach ($family->getChildren() as $child) {
@@ -316,7 +316,7 @@ class HourglassChartController extends AbstractChartController
                             'xref'        => $child->getXref(),
                             'generations' => $generations,
                             'show_spouse' => (int) $show_spouse,
-                            'ged'         => $child->getTree()->getName(),
+                            'ged'         => $child->getTree()->name(),
                         ])) . '" class="name1">' . $child->getFullName() . '</a>';
                 }
             }
@@ -331,7 +331,7 @@ class HourglassChartController extends AbstractChartController
                                 'xref'        => $husb->getXref(),
                                 'generations' => $generations,
                                 'show_spouse' => (int) $show_spouse,
-                                'ged'         => $husb->getTree()->getName(),
+                                'ged'         => $husb->getTree()->name(),
                             ])) . '" class="name1">' . $husb->getFullName() . '</a>';
                     }
                     $wife = $family->getWife();
@@ -340,7 +340,7 @@ class HourglassChartController extends AbstractChartController
                                 'xref'        => $wife->getXref(),
                                 'generations' => $generations,
                                 'show_spouse' => (int) $show_spouse,
-                                'ged'         => $wife->getTree()->getName(),
+                                'ged'         => $wife->getTree()->name(),
                             ])) . '" class="name1">' . $wife->getFullName() . '</a>';
                     }
                 }
@@ -359,7 +359,7 @@ class HourglassChartController extends AbstractChartController
                                 'xref'        => $child->getXref(),
                                 'generations' => $generations,
                                 'show_spouse' => (int) $show_spouse,
-                                'ged'         => $child->getTree()->getName(),
+                                'ged'         => $child->getTree()->name(),
                             ])) . '" class="name1">' . $child->getFullName() . '</a>';
                     }
                 }
@@ -424,7 +424,7 @@ class HourglassChartController extends AbstractChartController
                         'data-route'   => 'hourglass-add-asc',
                         'data-xref'    => $ARID,
                         'data-spouses' => (int) $show_spouse,
-                        'data-tree'    => $family->getHusband()->getTree()->getName(),
+                        'data-tree'    => $family->getHusband()->getTree()->name(),
                     ]);
                 }
 
@@ -461,7 +461,7 @@ class HourglassChartController extends AbstractChartController
                         'data-route'   => 'hourglass-add-asc',
                         'data-xref'    => $ARID,
                         'data-spouses' => (int) $show_spouse,
-                        'data-tree'    => $family->getWife()->getTree()->getName(),
+                        'data-tree'    => $family->getWife()->getTree()->name(),
                     ]);
                 }
 
diff --git a/app/Http/Controllers/IndividualController.php b/app/Http/Controllers/IndividualController.php
index 1253ef4fda..9de1070681 100644
--- a/app/Http/Controllers/IndividualController.php
+++ b/app/Http/Controllers/IndividualController.php
@@ -322,11 +322,11 @@ class IndividualController extends AbstractBaseController
                     'class'        => 'btn btn-link',
                     'data-confirm' =>  I18N::translate('Are you sure you want to delete this fact?'),
                     'href'         => '#',
-                    'onclick'      => 'return delete_fact(this.dataset.confirm", "' . e($individual->getTree()->getName()) . '", "' . e($individual->getXref()) . '", "' . $fact->id() . '");',
+                    'onclick'      => 'return delete_fact(this.dataset.confirm", "' . e($individual->getTree()->name()) . '", "' . e($individual->getXref()) . '", "' . $fact->id() . '");',
                 ]) .
                 FontAwesome::linkIcon('edit', I18N::translate('Edit the name'), [
                     'class' => 'btn btn-link',
-                    'href'  => route('edit-name', ['xref' => $individual->getXref(), 'fact_id' => $fact->id(), 'ged' => $individual->getTree()->getName()]),
+                    'href'  => route('edit-name', ['xref' => $individual->getXref(), 'fact_id' => $fact->id(), 'ged' => $individual->getTree()->name()]),
                 ]);
         } else {
             $edit_links = '';
@@ -379,7 +379,7 @@ class IndividualController extends AbstractBaseController
                 'class' => 'btn btn-link',
                 'href'  => route('edit-fact', ['xref'    => $individual->getXref(),
                                                'fact_id' => $fact->id(),
-                                               'ged'     => $individual->getTree()->getName(),
+                                               'ged'     => $individual->getTree()->name(),
                 ]),
             ]);
         } else {
diff --git a/app/Http/Controllers/ListController.php b/app/Http/Controllers/ListController.php
index 62709fc233..84c63969cb 100644
--- a/app/Http/Controllers/ListController.php
+++ b/app/Http/Controllers/ListController.php
@@ -121,7 +121,7 @@ class ListController extends AbstractBaseController
                 $surname = '';
                 $legend  = I18N::translate('All');
                 $params  = [
-                    'ged'      => $tree->getName(),
+                    'ged'      => $tree->name(),
                     'show_all' => 'yes',
                 ];
                 $show    = 'indi';
@@ -130,7 +130,7 @@ class ListController extends AbstractBaseController
                 $surname = '';
                 $legend  = I18N::translate('All') . ', ' . e($falpha) . '…';
                 $params  = [
-                    'ged'      => $tree->getName(),
+                    'ged'      => $tree->name(),
                     'show_all' => 'yes',
                 ];
                 $show    = 'indi';
@@ -139,7 +139,7 @@ class ListController extends AbstractBaseController
                 $surname = '';
                 $legend  = I18N::translate('All');
                 $params  = [
-                    'ged'      => $tree->getName(),
+                    'ged'      => $tree->name(),
                     'show_all' => 'yes',
                 ];
                 $show = $request->get('show', 'surn');
@@ -155,7 +155,7 @@ class ListController extends AbstractBaseController
                 $legend = implode('/', array_keys($this->surnames($tree, $surname, $alpha, $show_marnm === 'yes', $families)));
             }
             $params = [
-                'ged'     => $tree->getName(),
+                'ged'     => $tree->name(),
                 'surname' => $surname,
                 'falpha'  => $falpha,
             ];
@@ -175,7 +175,7 @@ class ListController extends AbstractBaseController
             $legend   = I18N::translateContext('Unknown surname', '…');
             $params   = [
                 'alpha' => $alpha,
-                'ged'   => $tree->getName(),
+                'ged'   => $tree->name(),
             ];
             $show     = 'indi'; // SURN list makes no sense here
         } elseif ($alpha === ',') {
@@ -183,7 +183,7 @@ class ListController extends AbstractBaseController
             $legend   = I18N::translate('None');
             $params   = [
                 'alpha' => $alpha,
-                'ged'   => $tree->getName(),
+                'ged'   => $tree->name(),
             ];
             $show     = 'indi'; // SURN list makes no sense here
         } elseif ($alpha) {
@@ -191,14 +191,14 @@ class ListController extends AbstractBaseController
             $legend   = e($alpha) . '…';
             $params   = [
                 'alpha' => $alpha,
-                'ged'   => $tree->getName(),
+                'ged'   => $tree->name(),
             ];
             $show     = $request->get('show', 'surn');
         } else {
             $show_all = 'no';
             $legend   = '…';
             $params   = [
-                'ged' => $tree->getName(),
+                'ged' => $tree->name(),
             ];
             $show     = 'none'; // Don't show lists until something is chosen
         }
@@ -215,7 +215,7 @@ class ListController extends AbstractBaseController
                 <?php foreach ($this->surnameAlpha($tree, $show_marnm === 'yes', $families) as $letter => $count): ?>
                     <li class="wt-initials-list-item d-flex">
                         <?php if ($count > 0): ?>
-                            <a href="<?= e(route($route, ['alpha' => $letter, 'ged' => $tree->getName()])) ?>" class="wt-initial<?= $letter === $alpha ? ' active' : ''?> '" title="<?= I18N::number($count) ?>"><?= $this->surnameInitial((string) $letter) ?></a>
+                            <a href="<?= e(route($route, ['alpha' => $letter, 'ged' => $tree->name()])) ?>" class="wt-initial<?= $letter === $alpha ? ' active' : ''?> '" title="<?= I18N::number($count) ?>"><?= $this->surnameInitial((string) $letter) ?></a>
                         <?php else: ?>
                             <span class="wt-initial text-muted"><?= $this->surnameInitial((string) $letter) ?></span>
 
diff --git a/app/Http/Controllers/MessageController.php b/app/Http/Controllers/MessageController.php
index 280d008c16..c39b9d6e3a 100644
--- a/app/Http/Controllers/MessageController.php
+++ b/app/Http/Controllers/MessageController.php
@@ -211,7 +211,7 @@ class MessageController extends AbstractBaseController
         if ($this->deliverMessage($tree, $from_email, $from_name, $to_user, $subject, $body, $url, $ip)) {
             FlashMessages::addMessage(I18N::translate('The message was successfully sent to %s.', e($to_user->getRealName())), 'success');
 
-            $url = $url ?: route('tree-page', ['ged' => $tree->getName()]);
+            $url = $url ?: route('tree-page', ['ged' => $tree->name()]);
 
             return new RedirectResponse($url);
         }
@@ -301,7 +301,7 @@ class MessageController extends AbstractBaseController
         if ($this->deliverMessage($tree, $user->getEmail(), $user->getRealName(), $to_user, $subject, $body, $url, $ip)) {
             FlashMessages::addMessage(I18N::translate('The message was successfully sent to %s.', e($to_user->getRealName())), 'success');
 
-            $url = $url ?: route('tree-page', ['ged' => $tree->getName()]);
+            $url = $url ?: route('tree-page', ['ged' => $tree->name()]);
 
             return new RedirectResponse($url);
         }
diff --git a/app/Http/Controllers/PedigreeChartController.php b/app/Http/Controllers/PedigreeChartController.php
index 9fbb88bebe..bebbdea547 100644
--- a/app/Http/Controllers/PedigreeChartController.php
+++ b/app/Http/Controllers/PedigreeChartController.php
@@ -367,7 +367,7 @@ class PedigreeChartController extends AbstractChartController
                 if ($spouse) {
                     $html .= '<a class="name1" href="' . e(route('pedigree', [
                             'xref'        => $spouse->getXref(),
-                            'ged'         => $spouse->getTree()->getName(),
+                            'ged'         => $spouse->getTree()->name(),
                             'generations' => $this->generations,
                             'orientation' => $this->orientation,
                         ])) . '">' . $spouse->getFullName() . '</a>';
@@ -376,7 +376,7 @@ class PedigreeChartController extends AbstractChartController
                 foreach ($children as $sibling) {
                     $html .= '<a class="name1" href="' . e(route('pedigree', [
                             'xref'        => $sibling->getXref(),
-                            'ged'         => $sibling->getTree()->getName(),
+                            'ged'         => $sibling->getTree()->name(),
                             'generations' => $this->generations,
                             'orientation' => $this->orientation,
                         ])) . '">' . $sibling->getFullName() . '</a>';
@@ -394,7 +394,7 @@ class PedigreeChartController extends AbstractChartController
                     foreach ($siblings as $sibling) {
                         $html .= '<a class="name1" href="' . e(route('pedigree', [
                                 'xref'        => $sibling->getXref(),
-                                'ged'         => $sibling->getTree()->getName(),
+                                'ged'         => $sibling->getTree()->name(),
                                 'generations' => $this->generations,
                                 'orientation' => $this->orientation,
                             ])) . '">' . $sibling->getFullName() . '</a>';
@@ -430,7 +430,7 @@ class PedigreeChartController extends AbstractChartController
                 }
                 $html .= '<a class="' . $this->arrows->prevGen . '" href="' . e(route('pedigree', [
                         'xref'        => $this->nodes[$rootParentId]['indi']->getXref(),
-                        'ged'         => $this->nodes[$rootParentId]['indi']->getTree()->getName(),
+                        'ged'         => $this->nodes[$rootParentId]['indi']->getTree()->name(),
                         'generations' => $this->generations,
                         'orientation' => $this->orientation,
                     ])) . '"></a>';
diff --git a/app/Http/Controllers/PendingChangesController.php b/app/Http/Controllers/PendingChangesController.php
index 6b3a32ddfd..6bd4683efd 100644
--- a/app/Http/Controllers/PendingChangesController.php
+++ b/app/Http/Controllers/PendingChangesController.php
@@ -77,11 +77,11 @@ class PendingChangesController extends AbstractBaseController
                 'change_id' => $change->change_id,
             ]);
 
-            Log::addEditLog('Accepted change ' . $change->change_id . ' for ' . $change->xref . ' / ' . $tree->getName(), $tree);
+            Log::addEditLog('Accepted change ' . $change->change_id . ' for ' . $change->xref . ' / ' . $tree->name(), $tree);
         }
 
         return new RedirectResponse(route('show-pending', [
-            'ged' => $tree->getName(),
+            'ged' => $tree->name(),
             'url' => $url,
         ]));
     }
@@ -129,11 +129,11 @@ class PendingChangesController extends AbstractBaseController
                 'change_id' => $change->change_id,
             ]);
 
-            Log::addEditLog('Accepted change ' . $change->change_id . ' for ' . $change->xref . ' / ' . $tree->getName(), $tree);
+            Log::addEditLog('Accepted change ' . $change->change_id . ' for ' . $change->xref . ' / ' . $tree->name(), $tree);
         }
 
         return new RedirectResponse(route('show-pending', [
-            'ged' => $tree->getName(),
+            'ged' => $tree->name(),
             'url' => $url,
         ]));
     }
@@ -187,7 +187,7 @@ class PendingChangesController extends AbstractBaseController
         ]);
 
         return new RedirectResponse(route('show-pending', [
-            'ged' => $tree->getName(),
+            'ged' => $tree->name(),
             'url' => $url,
         ]));
     }
@@ -221,7 +221,7 @@ class PendingChangesController extends AbstractBaseController
         ]);
 
         return new RedirectResponse(route('show-pending', [
-            'ged' => $tree->getName(),
+            'ged' => $tree->name(),
             'url' => $url,
         ]));
     }
@@ -261,7 +261,7 @@ class PendingChangesController extends AbstractBaseController
      */
     public function showChanges(Request $request, Tree $tree): Response
     {
-        $url = $request->get('url', route('tree-page', ['ged' => $tree->getName()]));
+        $url = $request->get('url', route('tree-page', ['ged' => $tree->name()]));
 
         $rows = Database::prepare(
             "SELECT c.*, UNIX_TIMESTAMP(c.change_time) + :offset AS change_timestamp, u.user_name, u.real_name, g.gedcom_name, new_gedcom, old_gedcom" .
diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php
index 3c04e71407..5c2712b1b3 100644
--- a/app/Http/Controllers/SearchController.php
+++ b/app/Http/Controllers/SearchController.php
@@ -187,7 +187,7 @@ class SearchController extends AbstractBaseController
         $search_tree_names = (array) $request->get('search_trees', []);
 
         $search_trees = array_filter($all_trees, function (Tree $tree) use ($search_tree_names): bool {
-            return in_array($tree->getName(), $search_tree_names);
+            return in_array($tree->name(), $search_tree_names);
         });
 
         if (empty($search_trees)) {
@@ -293,7 +293,7 @@ class SearchController extends AbstractBaseController
         $search_tree_names = (array) $request->get('search_trees', []);
 
         $search_trees = array_filter($all_trees, function (Tree $tree) use ($search_tree_names): bool {
-            return in_array($tree->getName(), $search_tree_names);
+            return in_array($tree->name(), $search_tree_names);
         });
 
         if (empty($search_trees)) {
@@ -420,7 +420,7 @@ class SearchController extends AbstractBaseController
             'search'  => $search,
             'replace' => $replace,
             'context' => $context,
-            'ged'     => $tree->getName(),
+            'ged'     => $tree->name(),
         ]);
 
         return new RedirectResponse($url);
diff --git a/app/Http/Controllers/TimelineChartController.php b/app/Http/Controllers/TimelineChartController.php
index 46c7b334fd..12ceef6440 100644
--- a/app/Http/Controllers/TimelineChartController.php
+++ b/app/Http/Controllers/TimelineChartController.php
@@ -80,7 +80,7 @@ class TimelineChartController extends AbstractChartController
             });
 
             $remove_urls[$xref] = route('timeline', [
-                'ged'   => $tree->getName(),
+                'ged'   => $tree->name(),
                 'scale' => $scale,
                 'xrefs' => $tmp,
             ]);
@@ -93,20 +93,20 @@ class TimelineChartController extends AbstractChartController
         $title = I18N::translate('Timeline');
 
         $chart_url = route('timeline-chart', [
-            'ged'   => $tree->getName(),
+            'ged'   => $tree->name(),
             'scale' => $scale,
             'xrefs' => $xrefs,
         ]);
 
         $zoom_in_url = route('timeline', [
-            'ged'   => $tree->getName(),
+            'ged'   => $tree->name(),
             'scale' => min(self::SCALE_MAX, $scale + (int) ($scale * 0.2 + 1)),
             'xrefs' => $xrefs,
         ]);
 
         $zoom_out_url = route('timeline', [
             'route' => 'timeline',
-            'ged'   => $tree->getName(),
+            'ged'   => $tree->name(),
             'scale' => max(self::SCALE_MIN, $scale - (int) ($scale * 0.2 + 1)),
             'xrefs' => $xrefs,
         ]);
diff --git a/app/MediaFile.php b/app/MediaFile.php
index 9c342816b3..44d6680330 100644
--- a/app/MediaFile.php
+++ b/app/MediaFile.php
@@ -378,7 +378,7 @@ class MediaFile
     {
         return route('media-download', [
             'xref'    => $this->media->getXref(),
-            'ged'     => $this->media->getTree()->getName(),
+            'ged'     => $this->media->getTree()->name(),
             'fact_id' => $this->fact_id,
         ]);
     }
@@ -412,7 +412,7 @@ class MediaFile
         $url = $url_builder->getUrl('index.php', [
             'route'     => 'media-thumbnail',
             'xref'      => $this->media->getXref(),
-            'ged'       => $this->media->getTree()->getName(),
+            'ged'       => $this->media->getTree()->name(),
             'fact_id'   => $this->fact_id,
             'w'         => $width,
             'h'         => $height,
diff --git a/app/Module/AhnentafelReportModule.php b/app/Module/AhnentafelReportModule.php
index 605968cb11..09a4b11e40 100644
--- a/app/Module/AhnentafelReportModule.php
+++ b/app/Module/AhnentafelReportModule.php
@@ -74,7 +74,7 @@ class AhnentafelReportModule extends AbstractModule implements ModuleReportInter
     {
         return new Menu(
             $this->getTitle(),
-            route('report-setup', ['ged'    => $tree->getName(),
+            route('report-setup', ['ged'    => $tree->name(),
                                    'report' => $this->getName(),
             ]),
             'menu-report-' . $this->getName(),
diff --git a/app/Module/AncestorsChartModule.php b/app/Module/AncestorsChartModule.php
index f39ae268c3..d4722f86e9 100644
--- a/app/Module/AncestorsChartModule.php
+++ b/app/Module/AncestorsChartModule.php
@@ -72,7 +72,7 @@ class AncestorsChartModule extends AbstractModule implements ModuleChartInterfac
     {
         return new Menu(
             $this->getTitle(),
-            route('ancestors', ['ged'  => $individual->getTree()->getName(),
+            route('ancestors', ['ged'  => $individual->getTree()->name(),
                                 'xref' => $individual->getXref(),
             ]),
             'menu-chart-ancestry',
diff --git a/app/Module/BatchUpdate/BatchUpdateBasePlugin.php b/app/Module/BatchUpdate/BatchUpdateBasePlugin.php
index 86b346cd91..25b66b1a86 100644
--- a/app/Module/BatchUpdate/BatchUpdateBasePlugin.php
+++ b/app/Module/BatchUpdate/BatchUpdateBasePlugin.php
@@ -153,7 +153,7 @@ abstract class BatchUpdateBasePlugin
         return preg_replace(
             "/@([^#@\n]+)@/m",
             '<a href="' . e(route('edit-raw-record', [
-                'ged'  => $record->getTree()->getName(),
+                'ged'  => $record->getTree()->name(),
                 'xref' => $record->getXref(),
             ])) . '">@\\1@</a>',
             $gedrec
diff --git a/app/Module/BirthDeathMarriageReportModule.php b/app/Module/BirthDeathMarriageReportModule.php
index 931c88da59..92fe4ae825 100644
--- a/app/Module/BirthDeathMarriageReportModule.php
+++ b/app/Module/BirthDeathMarriageReportModule.php
@@ -74,7 +74,7 @@ class BirthDeathMarriageReportModule extends AbstractModule implements ModuleRep
     {
         return new Menu(
             $this->getTitle(),
-            route('report-setup', ['ged'    => $tree->getName(),
+            route('report-setup', ['ged'    => $tree->name(),
                                    'report' => $this->getName(),
             ]),
             'menu-report-' . $this->getName(),
diff --git a/app/Module/BirthReportModule.php b/app/Module/BirthReportModule.php
index 8ce79ab6c7..79bd993b00 100644
--- a/app/Module/BirthReportModule.php
+++ b/app/Module/BirthReportModule.php
@@ -66,7 +66,7 @@ class BirthReportModule extends AbstractModule implements ModuleReportInterface
     {
         return new Menu(
             $this->getTitle(),
-            route('report-setup', ['ged'    => $tree->getName(),
+            route('report-setup', ['ged'    => $tree->name(),
                                    'report' => $this->getName(),
             ]),
             'menu-report-' . $this->getName(),
diff --git a/app/Module/CemeteryReportModule.php b/app/Module/CemeteryReportModule.php
index 769c5d602e..8896e7c89e 100644
--- a/app/Module/CemeteryReportModule.php
+++ b/app/Module/CemeteryReportModule.php
@@ -66,7 +66,7 @@ class CemeteryReportModule extends AbstractModule implements ModuleReportInterfa
     {
         return new Menu(
             $this->getTitle(),
-            route('report-setup', ['ged'    => $tree->getName(),
+            route('report-setup', ['ged'    => $tree->name(),
                                    'report' => $this->getName(),
             ]),
             'menu-report-' . $this->getName(),
diff --git a/app/Module/ChangeReportModule.php b/app/Module/ChangeReportModule.php
index 3257b29e38..ed5de3fd48 100644
--- a/app/Module/ChangeReportModule.php
+++ b/app/Module/ChangeReportModule.php
@@ -66,7 +66,7 @@ class ChangeReportModule extends AbstractModule implements ModuleReportInterface
     {
         return new Menu(
             $this->getTitle(),
-            route('report-setup', ['ged'    => $tree->getName(),
+            route('report-setup', ['ged'    => $tree->name(),
                                    'report' => $this->getName(),
             ]),
             'menu-report-' . $this->getName(),
diff --git a/app/Module/ChartsBlockModule.php b/app/Module/ChartsBlockModule.php
index 9cf5bf02c2..341bb42f60 100644
--- a/app/Module/ChartsBlockModule.php
+++ b/app/Module/ChartsBlockModule.php
@@ -82,7 +82,7 @@ class ChartsBlockModule extends AbstractModule implements ModuleBlockInterface
                     $title     = I18N::translate('Pedigree of %s', $person->getFullName());
                     $chart_url = route('pedigree-chart', [
                         'xref'        => $person->getXref(),
-                        'ged'         => $person->getTree()->getName(),
+                        'ged'         => $person->getTree()->name(),
                         'generations' => 3,
                         'layout'      => PedigreeChartController::PORTRAIT,
                     ]);
@@ -95,7 +95,7 @@ class ChartsBlockModule extends AbstractModule implements ModuleBlockInterface
                     $title     = I18N::translate('Descendants of %s', $person->getFullName());
                     $chart_url = route('descendants-chart', [
                         'xref'        => $person->getXref(),
-                        'ged'         => $person->getTree()->getName(),
+                        'ged'         => $person->getTree()->name(),
                         'generations' => 2,
                         'chart_style' => 0,
                     ]);
@@ -108,7 +108,7 @@ class ChartsBlockModule extends AbstractModule implements ModuleBlockInterface
                     $title     = I18N::translate('Hourglass chart of %s', $person->getFullName());
                     $chart_url = route('hourglass-chart', [
                         'xref'        => $person->getXref(),
-                        'ged'         => $person->getTree()->getName(),
+                        'ged'         => $person->getTree()->name(),
                         'generations' => 2,
                         'layout'      => PedigreeChartController::PORTRAIT,
                     ]);
@@ -135,12 +135,12 @@ class ChartsBlockModule extends AbstractModule implements ModuleBlockInterface
             if ($ctype === 'gedcom' && Auth::isManager($tree)) {
                 $config_url = route('tree-page-block-edit', [
                     'block_id' => $block_id,
-                    'ged'      => $tree->getName(),
+                    'ged'      => $tree->name(),
                 ]);
             } elseif ($ctype === 'user' && Auth::check()) {
                 $config_url = route('user-page-block-edit', [
                     'block_id' => $block_id,
-                    'ged'      => $tree->getName(),
+                    'ged'      => $tree->name(),
                 ]);
             } else {
                 $config_url = '';
diff --git a/app/Module/ClippingsCartModule.php b/app/Module/ClippingsCartModule.php
index ad06299bd5..c5f9d7303f 100644
--- a/app/Module/ClippingsCartModule.php
+++ b/app/Module/ClippingsCartModule.php
@@ -118,7 +118,7 @@ class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface
             new Menu($this->getTitle(), route('module', [
                 'module' => 'clippings',
                 'action' => 'Show',
-                'ged'    => $tree->getName(),
+                'ged'    => $tree->name(),
             ]), 'menu-clippings-cart', ['rel' => 'nofollow']),
         ];
 
@@ -129,7 +129,7 @@ class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface
                 'module' => 'clippings',
                 'action' => $action,
                 'xref'   => $xref,
-                'ged'    => $tree->getName(),
+                'ged'    => $tree->name(),
             ]);
 
             $submenus[] = new Menu(I18N::translate('Add to the clippings cart'), $add_route, 'menu-clippings-add', ['rel' => 'nofollow']);
@@ -139,12 +139,12 @@ class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface
             $submenus[] = new Menu(I18N::translate('Empty the clippings cart'), route('module', [
                 'module' => 'clippings',
                 'action' => 'Empty',
-                'ged'    => $tree->getName(),
+                'ged'    => $tree->name(),
             ]), 'menu-clippings-empty', ['rel' => 'nofollow']);
             $submenus[] = new Menu(I18N::translate('Download'), route('module', [
                 'module' => 'clippings',
                 'action' => 'DownloadForm',
-                'ged'    => $tree->getName(),
+                'ged'    => $tree->name(),
             ]), 'menu-clippings-download', ['rel' => 'nofollow']);
         }
 
@@ -166,7 +166,7 @@ class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface
 
         $cart = Session::get('cart', []);
 
-        $xrefs = array_keys($cart[$tree->getName()] ?? []);
+        $xrefs = array_keys($cart[$tree->name()] ?? []);
 
         // Create a new/empty .ZIP file
         $temp_zip_file  = tempnam(sys_get_temp_dir(), 'webtrees-zip-');
@@ -183,7 +183,7 @@ class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface
             Database::prepare("SELECT o_gedcom FROM `##other` WHERE o_type=? AND o_file=?")
                 ->execute([
                     'SUBN',
-                    $tree->getName(),
+                    $tree->name(),
                 ])
                 ->fetchOne();
         if ($subn) {
@@ -193,7 +193,7 @@ class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface
             Database::prepare("SELECT o_gedcom FROM `##other` WHERE o_type=? AND o_file=?")
                 ->execute([
                     'SUBM',
-                    $tree->getName(),
+                    $tree->name(),
                 ])
                 ->fetchOne();
         if ($subm) {
@@ -321,14 +321,14 @@ class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface
      */
     public function getEmptyAction(Tree $tree): RedirectResponse
     {
-        $cart                   = Session::get('cart', []);
-        $cart[$tree->getName()] = [];
+        $cart                = Session::get('cart', []);
+        $cart[$tree->name()] = [];
         Session::put('cart', $cart);
 
         $url = route('module', [
             'module' => 'clippings',
             'action' => 'Show',
-            'ged'    => $tree->getName(),
+            'ged'    => $tree->name(),
         ]);
 
         return new RedirectResponse($url);
@@ -345,13 +345,13 @@ class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface
         $xref = $request->get('xref', '');
 
         $cart = Session::get('cart', []);
-        unset($cart[$tree->getName()][$xref]);
+        unset($cart[$tree->name()][$xref]);
         Session::put('cart', $cart);
 
         $url = route('module', [
             'module' => 'clippings',
             'action' => 'Show',
-            'ged'    => $tree->getName(),
+            'ged'    => $tree->name(),
         ]);
 
         return new RedirectResponse($url);
@@ -923,7 +923,7 @@ class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface
     {
         $cart = Session::get('cart', []);
 
-        $xrefs = array_keys($cart[$tree->getName()] ?? []);
+        $xrefs = array_keys($cart[$tree->name()] ?? []);
 
         // Fetch all the records in the cart.
         $records = array_map(function (string $xref) use ($tree): GedcomRecord {
@@ -952,7 +952,7 @@ class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface
     {
         $cart = Session::get('cart', []);
 
-        $tree_name = $record->getTree()->getName();
+        $tree_name = $record->getTree()->name();
 
         // Add this record
         $cart[$tree_name][$record->getXref()] = true;
@@ -976,7 +976,7 @@ class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface
     {
         $cart = Session::get('cart', []);
 
-        return empty($cart[$tree->getName()]);
+        return empty($cart[$tree->name()]);
     }
 
     /**
diff --git a/app/Module/CompactTreeChartModule.php b/app/Module/CompactTreeChartModule.php
index b77de61c01..544fbc54fb 100644
--- a/app/Module/CompactTreeChartModule.php
+++ b/app/Module/CompactTreeChartModule.php
@@ -74,7 +74,7 @@ class CompactTreeChartModule extends AbstractModule implements ModuleChartInterf
             $this->getTitle(),
             route('compact-tree', [
                 'xref' => $individual->getXref(),
-                'ged'  => $individual->getTree()->getName(),
+                'ged'  => $individual->getTree()->name(),
             ]),
             'menu-chart-compact',
             ['rel' => 'nofollow']
diff --git a/app/Module/DeathReportModule.php b/app/Module/DeathReportModule.php
index 941431103a..0085c8b884 100644
--- a/app/Module/DeathReportModule.php
+++ b/app/Module/DeathReportModule.php
@@ -66,7 +66,7 @@ class DeathReportModule extends AbstractModule implements ModuleReportInterface
     {
         return new Menu(
             $this->getTitle(),
-            route('report-setup', ['ged'    => $tree->getName(),
+            route('report-setup', ['ged'    => $tree->name(),
                                    'report' => $this->getName(),
             ]),
             'menu-report-' . $this->getName(),
diff --git a/app/Module/DescendancyChartModule.php b/app/Module/DescendancyChartModule.php
index 597768dbe9..69e544056d 100644
--- a/app/Module/DescendancyChartModule.php
+++ b/app/Module/DescendancyChartModule.php
@@ -72,7 +72,7 @@ class DescendancyChartModule extends AbstractModule implements ModuleChartInterf
     {
         return new Menu(
             $this->getTitle(),
-            route('descendants', ['ged'  => $individual->getTree()->getName(),
+            route('descendants', ['ged'  => $individual->getTree()->name(),
                                   'xref' => $individual->getXref(),
             ]),
             'menu-chart-descendants',
diff --git a/app/Module/DescendancyModule.php b/app/Module/DescendancyModule.php
index 32f6e72f36..ee1f3cb417 100644
--- a/app/Module/DescendancyModule.php
+++ b/app/Module/DescendancyModule.php
@@ -150,7 +150,7 @@ class DescendancyModule extends AbstractModule implements ModuleSidebarInterface
             '<a class="sb_desc_indi" href="' . e(route('module', [
                 'module' => 'descendancy',
                 'action' => 'Descendants',
-                'ged'    => $person->getTree()->getName(),
+                'ged'    => $person->getTree()->name(),
                 'xref'   => $person->getXref(),
             ])) . '">' .
             '<i class="plusminus ' . $icon . '"></i>' .
diff --git a/app/Module/DescendancyReportModule.php b/app/Module/DescendancyReportModule.php
index 73fae46e51..6358bb1774 100644
--- a/app/Module/DescendancyReportModule.php
+++ b/app/Module/DescendancyReportModule.php
@@ -66,7 +66,7 @@ class DescendancyReportModule extends AbstractModule implements ModuleReportInte
     {
         return new Menu(
             $this->getTitle(),
-            route('report-setup', ['ged'    => $tree->getName(),
+            route('report-setup', ['ged'    => $tree->name(),
                                    'report' => $this->getName(),
             ]),
             'menu-report-' . $this->getName(),
diff --git a/app/Module/FactSourcesReportModule.php b/app/Module/FactSourcesReportModule.php
index 4556e4bb3c..d0fff28c94 100644
--- a/app/Module/FactSourcesReportModule.php
+++ b/app/Module/FactSourcesReportModule.php
@@ -66,7 +66,7 @@ class FactSourcesReportModule extends AbstractModule implements ModuleReportInte
     {
         return new Menu(
             $this->getTitle(),
-            route('report-setup', ['ged'    => $tree->getName(),
+            route('report-setup', ['ged'    => $tree->name(),
                                    'report' => $this->getName(),
             ]),
             'menu-report-' . $this->getName(),
diff --git a/app/Module/FamilyBookChartModule.php b/app/Module/FamilyBookChartModule.php
index 3f1a8d5ec8..75b38f302a 100644
--- a/app/Module/FamilyBookChartModule.php
+++ b/app/Module/FamilyBookChartModule.php
@@ -72,7 +72,7 @@ class FamilyBookChartModule extends AbstractModule implements ModuleChartInterfa
     {
         return new Menu(
             $this->getTitle(),
-            route('family-book', ['ged'  => $individual->getTree()->getName(),
+            route('family-book', ['ged'  => $individual->getTree()->name(),
                                   'xref' => $individual->getXref(),
             ]),
             'menu-chart-familybook',
diff --git a/app/Module/FamilyGroupReportModule.php b/app/Module/FamilyGroupReportModule.php
index 1c1922450f..01e3f41bbe 100644
--- a/app/Module/FamilyGroupReportModule.php
+++ b/app/Module/FamilyGroupReportModule.php
@@ -66,7 +66,7 @@ class FamilyGroupReportModule extends AbstractModule implements ModuleReportInte
     {
         return new Menu(
             $this->getTitle(),
-            route('report-setup', ['ged'    => $tree->getName(),
+            route('report-setup', ['ged'    => $tree->name(),
                                    'report' => $this->getName(),
             ]),
             'menu-report-' . $this->getName(),
diff --git a/app/Module/FamilyTreeFavoritesModule.php b/app/Module/FamilyTreeFavoritesModule.php
index 5f540ed4fe..990745d49d 100644
--- a/app/Module/FamilyTreeFavoritesModule.php
+++ b/app/Module/FamilyTreeFavoritesModule.php
@@ -188,7 +188,7 @@ class FamilyTreeFavoritesModule extends AbstractModule implements ModuleBlockInt
             }
         }
 
-        $url = route('tree-page', ['ged' => $tree->getName()]);
+        $url = route('tree-page', ['ged' => $tree->name()]);
 
         return new RedirectResponse($url);
     }
@@ -213,7 +213,7 @@ class FamilyTreeFavoritesModule extends AbstractModule implements ModuleBlockInt
             ]);
         }
 
-        $url = route('tree-page', ['ged' => $tree->getName()]);
+        $url = route('tree-page', ['ged' => $tree->name()]);
 
         return new RedirectResponse($url);
     }
diff --git a/app/Module/FamilyTreeNewsModule.php b/app/Module/FamilyTreeNewsModule.php
index 5a39e9fc5a..e3f549c8ba 100644
--- a/app/Module/FamilyTreeNewsModule.php
+++ b/app/Module/FamilyTreeNewsModule.php
@@ -226,7 +226,7 @@ class FamilyTreeNewsModule extends AbstractModule implements ModuleBlockInterfac
         }
 
         $url = route('tree-page', [
-            'ged' => $tree->getName(),
+            'ged' => $tree->name(),
         ]);
 
         return new RedirectResponse($url);
@@ -254,7 +254,7 @@ class FamilyTreeNewsModule extends AbstractModule implements ModuleBlockInterfac
         ]);
 
         $url = route('tree-page', [
-            'ged' => $tree->getName(),
+            'ged' => $tree->name(),
         ]);
 
         return new RedirectResponse($url);
diff --git a/app/Module/FamilyTreeStatisticsModule.php b/app/Module/FamilyTreeStatisticsModule.php
index 8f07105484..c1b131ba02 100644
--- a/app/Module/FamilyTreeStatisticsModule.php
+++ b/app/Module/FamilyTreeStatisticsModule.php
@@ -144,12 +144,12 @@ class FamilyTreeStatisticsModule extends AbstractModule implements ModuleBlockIn
             if ($ctype === 'gedcom' && Auth::isManager($tree)) {
                 $config_url = route('tree-page-block-edit', [
                     'block_id' => $block_id,
-                    'ged'      => $tree->getName(),
+                    'ged'      => $tree->name(),
                 ]);
             } elseif ($ctype === 'user' && Auth::check()) {
                 $config_url = route('user-page-block-edit', [
                     'block_id' => $block_id,
-                    'ged'      => $tree->getName(),
+                    'ged'      => $tree->name(),
                 ]);
             } else {
                 $config_url = '';
diff --git a/app/Module/FanChartModule.php b/app/Module/FanChartModule.php
index 2d16ea5860..c3f7652f38 100644
--- a/app/Module/FanChartModule.php
+++ b/app/Module/FanChartModule.php
@@ -77,7 +77,7 @@ class FanChartModule extends AbstractModule implements ModuleChartInterface
                 $this->getTitle(),
                 route('fan', [
                     'xref' => $individual->getXref(),
-                    'ged'  => $individual->getTree()->getName(),
+                    'ged'  => $individual->getTree()->name(),
                 ]),
                 'menu-chart-fanchart',
                 ['rel' => 'nofollow']
diff --git a/app/Module/FrequentlyAskedQuestionsModule.php b/app/Module/FrequentlyAskedQuestionsModule.php
index 8a9f64aaf6..f97e7d0740 100644
--- a/app/Module/FrequentlyAskedQuestionsModule.php
+++ b/app/Module/FrequentlyAskedQuestionsModule.php
@@ -93,7 +93,7 @@ class FrequentlyAskedQuestionsModule extends AbstractModule implements ModuleMen
             return new Menu($this->getTitle(), route('module', [
                 'module' => 'faq',
                 'action' => 'Show',
-                'ged'    => $tree->getName(),
+                'ged'    => $tree->name(),
             ]), 'menu-help');
         }
 
@@ -171,7 +171,7 @@ class FrequentlyAskedQuestionsModule extends AbstractModule implements ModuleMen
         $url = route('module', [
             'module' => 'faq',
             'action' => 'Admin',
-            'ged'    => $tree->getName(),
+            'ged'    => $tree->name(),
         ]);
 
         return new RedirectResponse($url);
@@ -224,7 +224,7 @@ class FrequentlyAskedQuestionsModule extends AbstractModule implements ModuleMen
         $url = route('module', [
             'module' => 'faq',
             'action' => 'Admin',
-            'ged'    => $tree->getName(),
+            'ged'    => $tree->name(),
         ]);
 
         return new RedirectResponse($url);
@@ -277,7 +277,7 @@ class FrequentlyAskedQuestionsModule extends AbstractModule implements ModuleMen
         $url = route('module', [
             'module' => 'faq',
             'action' => 'Admin',
-            'ged'    => $tree->getName(),
+            'ged'    => $tree->name(),
         ]);
 
         return new RedirectResponse($url);
@@ -373,7 +373,7 @@ class FrequentlyAskedQuestionsModule extends AbstractModule implements ModuleMen
         $url = route('module', [
             'module' => 'faq',
             'action' => 'Admin',
-            'ged'    => $tree->getName(),
+            'ged'    => $tree->name(),
         ]);
 
         return new RedirectResponse($url);
diff --git a/app/Module/HourglassChartModule.php b/app/Module/HourglassChartModule.php
index 9cedd0d5e9..d28d3b66aa 100644
--- a/app/Module/HourglassChartModule.php
+++ b/app/Module/HourglassChartModule.php
@@ -74,7 +74,7 @@ class HourglassChartModule extends AbstractModule implements ModuleChartInterfac
             $this->getTitle(),
             route('hourglass', [
                 'xref' => $individual->getXref(),
-                'ged'  => $individual->getTree()->getName(),
+                'ged'  => $individual->getTree()->name(),
             ]),
             'menu-chart-hourglass',
             ['rel' => 'nofollow']
diff --git a/app/Module/HtmlBlockModule.php b/app/Module/HtmlBlockModule.php
index 0e7f520e55..7a496bf074 100644
--- a/app/Module/HtmlBlockModule.php
+++ b/app/Module/HtmlBlockModule.php
@@ -83,12 +83,12 @@ class HtmlBlockModule extends AbstractModule implements ModuleBlockInterface
             if ($ctype === 'gedcom' && Auth::isManager($tree)) {
                 $config_url = route('tree-page-block-edit', [
                     'block_id' => $block_id,
-                    'ged'      => $tree->getName(),
+                    'ged'      => $tree->name(),
                 ]);
             } elseif ($ctype === 'user' && Auth::check()) {
                 $config_url = route('user-page-block-edit', [
                     'block_id' => $block_id,
-                    'ged'      => $tree->getName(),
+                    'ged'      => $tree->name(),
                 ]);
             } else {
                 $config_url = '';
diff --git a/app/Module/IndividualFamiliesReportModule.php b/app/Module/IndividualFamiliesReportModule.php
index 86eb149101..c13f662999 100644
--- a/app/Module/IndividualFamiliesReportModule.php
+++ b/app/Module/IndividualFamiliesReportModule.php
@@ -66,7 +66,7 @@ class IndividualFamiliesReportModule extends AbstractModule implements ModuleRep
     {
         return new Menu(
             $this->getTitle(),
-            route('report-setup', ['ged'    => $tree->getName(),
+            route('report-setup', ['ged'    => $tree->name(),
                                    'report' => $this->getName(),
             ]),
             'menu-report-' . $this->getName(),
diff --git a/app/Module/IndividualReportModule.php b/app/Module/IndividualReportModule.php
index bc6cd61f59..f19bf37065 100644
--- a/app/Module/IndividualReportModule.php
+++ b/app/Module/IndividualReportModule.php
@@ -66,7 +66,7 @@ class IndividualReportModule extends AbstractModule implements ModuleReportInter
     {
         return new Menu(
             $this->getTitle(),
-            route('report-setup', ['ged'    => $tree->getName(),
+            route('report-setup', ['ged'    => $tree->name(),
                                    'report' => $this->getName(),
             ]),
             'menu-report-' . $this->getName(),
diff --git a/app/Module/InteractiveTree/TreeView.php b/app/Module/InteractiveTree/TreeView.php
index 6eac8aab10..9513381c73 100644
--- a/app/Module/InteractiveTree/TreeView.php
+++ b/app/Module/InteractiveTree/TreeView.php
@@ -58,7 +58,7 @@ class TreeView
 
         return [
             $html,
-            'var ' . $this->name . 'Handler = new TreeViewHandler("' . $this->name . '", "' . e($individual->getTree()->getName()) . '");',
+            'var ' . $this->name . 'Handler = new TreeViewHandler("' . $this->name . '", "' . e($individual->getTree()->name()) . '");',
         ];
     }
 
@@ -147,7 +147,7 @@ class TreeView
             'module' => 'tree',
             'action' => 'Treeview',
             'xref'   => $individual->getXref(),
-            'ged'    => $individual->getTree()->getName(),
+            'ged'    => $individual->getTree()->name(),
         ]);
 
         $hmtl = $this->getThumbnail($individual);
diff --git a/app/Module/InteractiveTreeModule.php b/app/Module/InteractiveTreeModule.php
index 261fda0aa0..c93261bb05 100644
--- a/app/Module/InteractiveTreeModule.php
+++ b/app/Module/InteractiveTreeModule.php
@@ -116,7 +116,7 @@ class InteractiveTreeModule extends AbstractModule implements ModuleTabInterface
                 'module' => $this->getName(),
                 'action' => 'Treeview',
                 'xref'   => $individual->getXref(),
-                'ged'    => $individual->getTree()->getName(),
+                'ged'    => $individual->getTree()->name(),
             ]),
             'menu-chart-tree',
             ['rel' => 'nofollow']
diff --git a/app/Module/LifespansChartModule.php b/app/Module/LifespansChartModule.php
index f03e384d8a..b324d685aa 100644
--- a/app/Module/LifespansChartModule.php
+++ b/app/Module/LifespansChartModule.php
@@ -74,7 +74,7 @@ class LifespansChartModule extends AbstractModule implements ModuleChartInterfac
             $this->getTitle(),
             route('lifespans', [
                 'xrefs[]' => $individual->getXref(),
-                'ged'     => $individual->getTree()->getName(),
+                'ged'     => $individual->getTree()->name(),
             ]),
             'menu-chart-lifespan',
             ['rel' => 'nofollow']
diff --git a/app/Module/LoggedInUsersModule.php b/app/Module/LoggedInUsersModule.php
index 0f2e0af5ee..c285567d09 100644
--- a/app/Module/LoggedInUsersModule.php
+++ b/app/Module/LoggedInUsersModule.php
@@ -90,7 +90,7 @@ class LoggedInUsersModule extends AbstractModule implements ModuleBlockInterface
                 }
                 $content .= ' - ' . e($user->getUserName());
                 if (Auth::id() !== $user->getUserId() && $user->getPreference('contactmethod') !== 'none') {
-                    $content .= '<a href="' . e(route('message', ['to'  => $user->getUserName(), 'ged' => $tree->getName()])) . '" class="btn btn-link" title="' . I18N::translate('Send a message') . '">' . view('icons/email') . '</a>';
+                    $content .= '<a href="' . e(route('message', ['to'  => $user->getUserName(), 'ged' => $tree->name()])) . '" class="btn btn-link" title="' . I18N::translate('Send a message') . '">' . view('icons/email') . '</a>';
                 }
                 $content .= '</div>';
             }
diff --git a/app/Module/MarriageReportModule.php b/app/Module/MarriageReportModule.php
index ddedb3985a..b30ded4c5f 100644
--- a/app/Module/MarriageReportModule.php
+++ b/app/Module/MarriageReportModule.php
@@ -66,7 +66,7 @@ class MarriageReportModule extends AbstractModule implements ModuleReportInterfa
     {
         return new Menu(
             $this->getTitle(),
-            route('report-setup', ['ged'    => $tree->getName(),
+            route('report-setup', ['ged'    => $tree->name(),
                                    'report' => $this->getName(),
             ]),
             'menu-report-' . $this->getName(),
diff --git a/app/Module/MissingFactsReportModule.php b/app/Module/MissingFactsReportModule.php
index 7debcb138f..539894c7c8 100644
--- a/app/Module/MissingFactsReportModule.php
+++ b/app/Module/MissingFactsReportModule.php
@@ -66,7 +66,7 @@ class MissingFactsReportModule extends AbstractModule implements ModuleReportInt
     {
         return new Menu(
             $this->getTitle(),
-            route('report-setup', ['ged'    => $tree->getName(),
+            route('report-setup', ['ged'    => $tree->name(),
                                    'report' => $this->getName(),
             ]),
             'menu-report-' . $this->getName(),
diff --git a/app/Module/OccupationReportModule.php b/app/Module/OccupationReportModule.php
index 8cc041f567..98f058e18f 100644
--- a/app/Module/OccupationReportModule.php
+++ b/app/Module/OccupationReportModule.php
@@ -66,7 +66,7 @@ class OccupationReportModule extends AbstractModule implements ModuleReportInter
     {
         return new Menu(
             $this->getTitle(),
-            route('report-setup', ['ged'    => $tree->getName(),
+            route('report-setup', ['ged'    => $tree->name(),
                                    'report' => $this->getName(),
             ]),
             'menu-report-' . $this->getName(),
diff --git a/app/Module/OnThisDayModule.php b/app/Module/OnThisDayModule.php
index c2543de0d2..13f1480d08 100644
--- a/app/Module/OnThisDayModule.php
+++ b/app/Module/OnThisDayModule.php
@@ -147,12 +147,12 @@ class OnThisDayModule extends AbstractModule implements ModuleBlockInterface
             if ($ctype === 'gedcom' && Auth::isManager($tree)) {
                 $config_url = route('tree-page-block-edit', [
                     'block_id' => $block_id,
-                    'ged'      => $tree->getName(),
+                    'ged'      => $tree->name(),
                 ]);
             } elseif ($ctype === 'user' && Auth::check()) {
                 $config_url = route('user-page-block-edit', [
                     'block_id' => $block_id,
-                    'ged'      => $tree->getName(),
+                    'ged'      => $tree->name(),
                 ]);
             } else {
                 $config_url = '';
diff --git a/app/Module/PedigreeChartModule.php b/app/Module/PedigreeChartModule.php
index e5618ddc57..56473cd349 100644
--- a/app/Module/PedigreeChartModule.php
+++ b/app/Module/PedigreeChartModule.php
@@ -74,7 +74,7 @@ class PedigreeChartModule extends AbstractModule implements ModuleChartInterface
             $this->getTitle(),
             route('pedigree', [
                 'xref' => $individual->getXref(),
-                'ged'  => $individual->getTree()->getName(),
+                'ged'  => $individual->getTree()->name(),
             ]),
             'menu-chart-pedigree',
             ['rel' => 'nofollow']
diff --git a/app/Module/PedigreeMapModule.php b/app/Module/PedigreeMapModule.php
index 69837a6816..583b28ef0f 100644
--- a/app/Module/PedigreeMapModule.php
+++ b/app/Module/PedigreeMapModule.php
@@ -93,7 +93,7 @@ class PedigreeMapModule extends AbstractModule implements ModuleChartInterface
                 'module' => $this->getName(),
                 'action' => 'PedigreeMap',
                 'xref'   => $individual->getXref(),
-                'ged'    => $individual->getTree()->getName(),
+                'ged'    => $individual->getTree()->name(),
             ]),
             'menu-chart-pedigreemap',
             ['rel' => 'nofollow']
diff --git a/app/Module/PedigreeReportModule.php b/app/Module/PedigreeReportModule.php
index 32bf947733..b0dad20ac9 100644
--- a/app/Module/PedigreeReportModule.php
+++ b/app/Module/PedigreeReportModule.php
@@ -66,7 +66,7 @@ class PedigreeReportModule extends AbstractModule implements ModuleReportInterfa
     {
         return new Menu(
             $this->getTitle(),
-            route('report-setup', ['ged'    => $tree->getName(),
+            route('report-setup', ['ged'    => $tree->name(),
                                    'report' => $this->getName(),
             ]),
             'menu-report-' . $this->getName(),
diff --git a/app/Module/RecentChangesModule.php b/app/Module/RecentChangesModule.php
index 58d306c62c..f9f15b42ec 100644
--- a/app/Module/RecentChangesModule.php
+++ b/app/Module/RecentChangesModule.php
@@ -102,12 +102,12 @@ class RecentChangesModule extends AbstractModule implements ModuleBlockInterface
             if ($ctype === 'gedcom' && Auth::isManager($tree)) {
                 $config_url = route('tree-page-block-edit', [
                     'block_id' => $block_id,
-                    'ged'      => $tree->getName(),
+                    'ged'      => $tree->name(),
                 ]);
             } elseif ($ctype === 'user' && Auth::check()) {
                 $config_url = route('user-page-block-edit', [
                     'block_id' => $block_id,
-                    'ged'      => $tree->getName(),
+                    'ged'      => $tree->name(),
                 ]);
             } else {
                 $config_url = '';
diff --git a/app/Module/RelatedIndividualsReportModule.php b/app/Module/RelatedIndividualsReportModule.php
index 4f17d1a1b6..4d5ab0b47a 100644
--- a/app/Module/RelatedIndividualsReportModule.php
+++ b/app/Module/RelatedIndividualsReportModule.php
@@ -66,7 +66,7 @@ class RelatedIndividualsReportModule extends AbstractModule implements ModuleRep
     {
         return new Menu(
             $this->getTitle(),
-            route('report-setup', ['ged'    => $tree->getName(),
+            route('report-setup', ['ged'    => $tree->name(),
                                    'report' => $this->getName(),
             ]),
             'menu-report-' . $this->getName(),
diff --git a/app/Module/RelationshipsChartModule.php b/app/Module/RelationshipsChartModule.php
index 2eb5e63adf..02d8646c3e 100644
--- a/app/Module/RelationshipsChartModule.php
+++ b/app/Module/RelationshipsChartModule.php
@@ -93,7 +93,7 @@ class RelationshipsChartModule extends AbstractModule implements ModuleConfigInt
                 route('relationships', [
                     'xref1' => $gedcomid,
                     'xref2' => $individual->getXref(),
-                    'ged'   => $individual->getTree()->getName(),
+                    'ged'   => $individual->getTree()->name(),
                 ]),
                 'menu-chart-relationship',
                 ['rel' => 'nofollow']
@@ -104,7 +104,7 @@ class RelationshipsChartModule extends AbstractModule implements ModuleConfigInt
             I18N::translate('Relationships'),
             route('relationships', [
                 'xref1' => $individual->getXref(),
-                'ged'   => $individual->getTree()->getName(),
+                'ged'   => $individual->getTree()->name(),
             ]),
             'menu-chart-relationship',
             ['rel' => 'nofollow']
diff --git a/app/Module/ResearchTaskModule.php b/app/Module/ResearchTaskModule.php
index 753e890286..042e0b0e4f 100644
--- a/app/Module/ResearchTaskModule.php
+++ b/app/Module/ResearchTaskModule.php
@@ -104,12 +104,12 @@ class ResearchTaskModule extends AbstractModule implements ModuleBlockInterface
             if ($ctype === 'gedcom' && Auth::isManager($tree)) {
                 $config_url = route('tree-page-block-edit', [
                     'block_id' => $block_id,
-                    'ged'      => $tree->getName(),
+                    'ged'      => $tree->name(),
                 ]);
             } elseif ($ctype === 'user' && Auth::check()) {
                 $config_url = route('user-page-block-edit', [
                     'block_id' => $block_id,
-                    'ged'      => $tree->getName(),
+                    'ged'      => $tree->name(),
                 ]);
             } else {
                 $config_url = '';
diff --git a/app/Module/ReviewChangesModule.php b/app/Module/ReviewChangesModule.php
index cb326da96a..4792132d53 100644
--- a/app/Module/ReviewChangesModule.php
+++ b/app/Module/ReviewChangesModule.php
@@ -117,7 +117,7 @@ class ReviewChangesModule extends AbstractModule implements ModuleBlockInterface
         if (Auth::isEditor($tree) && $tree->hasPendingEdit()) {
             $content = '';
             if (Auth::isModerator($tree)) {
-                $content .= '<a href="' . e(route('show-pending', ['ged' => $tree->getName()])) . '">' . I18N::translate('There are pending changes for you to moderate.') . '</a><br>';
+                $content .= '<a href="' . e(route('show-pending', ['ged' => $tree->name()])) . '">' . I18N::translate('There are pending changes for you to moderate.') . '</a><br>';
             }
             if ($sendmail === '1') {
                 $last_email_timestamp = (int) Site::getPreference('LAST_CHANGE_EMAIL');
@@ -144,12 +144,12 @@ class ReviewChangesModule extends AbstractModule implements ModuleBlockInterface
                 if ($ctype === 'gedcom' && Auth::isManager($tree)) {
                     $config_url = route('tree-page-block-edit', [
                         'block_id' => $block_id,
-                        'ged'      => $tree->getName(),
+                        'ged'      => $tree->name(),
                     ]);
                 } elseif ($ctype === 'user' && Auth::check()) {
                     $config_url = route('user-page-block-edit', [
                         'block_id' => $block_id,
-                        'ged'      => $tree->getName(),
+                        'ged'      => $tree->name(),
                     ]);
                 } else {
                     $config_url = '';
diff --git a/app/Module/SlideShowModule.php b/app/Module/SlideShowModule.php
index 684285b312..caaad22ef7 100644
--- a/app/Module/SlideShowModule.php
+++ b/app/Module/SlideShowModule.php
@@ -133,12 +133,12 @@ class SlideShowModule extends AbstractModule implements ModuleBlockInterface
             if ($ctype === 'gedcom' && Auth::isManager($tree)) {
                 $config_url = route('tree-page-block-edit', [
                     'block_id' => $block_id,
-                    'ged'      => $tree->getName(),
+                    'ged'      => $tree->name(),
                 ]);
             } elseif ($ctype === 'user' && Auth::check()) {
                 $config_url = route('user-page-block-edit', [
                     'block_id' => $block_id,
-                    'ged'      => $tree->getName(),
+                    'ged'      => $tree->name(),
                 ]);
             } else {
                 $config_url = '';
diff --git a/app/Module/StatisticsChartModule.php b/app/Module/StatisticsChartModule.php
index 627263448e..1520750c4d 100644
--- a/app/Module/StatisticsChartModule.php
+++ b/app/Module/StatisticsChartModule.php
@@ -72,7 +72,7 @@ class StatisticsChartModule extends AbstractModule implements ModuleChartInterfa
     {
         return new Menu(
             $this->getTitle(),
-            route('statistics', ['ged' => $individual->getTree()->getName()]),
+            route('statistics', ['ged' => $individual->getTree()->name()]),
             'menu-chart-statistics',
             ['rel' => 'nofollow']
         );
diff --git a/app/Module/StoriesModule.php b/app/Module/StoriesModule.php
index edf1897bba..be465ab788 100644
--- a/app/Module/StoriesModule.php
+++ b/app/Module/StoriesModule.php
@@ -166,7 +166,7 @@ class StoriesModule extends AbstractModule implements ModuleTabInterface, Module
         $menu = new Menu($this->getTitle(), route('module', [
             'module' => $this->getName(),
             'action' => 'ShowList',
-            'ged'    => $tree->getName(),
+            'ged'    => $tree->name(),
         ]), 'menu-story');
 
         return $menu;
@@ -295,7 +295,7 @@ class StoriesModule extends AbstractModule implements ModuleTabInterface, Module
         $url = route('module', [
             'module' => 'stories',
             'action' => 'Admin',
-            'ged'    => $tree->getName(),
+            'ged'    => $tree->name(),
         ]);
 
         return new RedirectResponse($url);
@@ -326,7 +326,7 @@ class StoriesModule extends AbstractModule implements ModuleTabInterface, Module
         $url = route('module', [
             'module' => 'stories',
             'action' => 'Admin',
-            'ged'    => $tree->getName(),
+            'ged'    => $tree->name(),
         ]);
 
         return new RedirectResponse($url);
diff --git a/app/Module/TimelineChartModule.php b/app/Module/TimelineChartModule.php
index 0798a96ee2..1e8400d442 100644
--- a/app/Module/TimelineChartModule.php
+++ b/app/Module/TimelineChartModule.php
@@ -74,7 +74,7 @@ class TimelineChartModule extends AbstractModule implements ModuleChartInterface
             $this->getTitle(),
             route('timeline', [
                 'xrefs[]' => $individual->getXref(),
-                'ged'     => $individual->getTree()->getName(),
+                'ged'     => $individual->getTree()->name(),
             ]),
             'menu-chart-timeline',
             ['rel' => 'nofollow']
diff --git a/app/Module/TopGivenNamesModule.php b/app/Module/TopGivenNamesModule.php
index bd363b9a2c..2d801923f0 100644
--- a/app/Module/TopGivenNamesModule.php
+++ b/app/Module/TopGivenNamesModule.php
@@ -99,12 +99,12 @@ class TopGivenNamesModule extends AbstractModule implements ModuleBlockInterface
             if ($ctype === 'gedcom' && Auth::isManager($tree)) {
                 $config_url = route('tree-page-block-edit', [
                     'block_id' => $block_id,
-                    'ged'      => $tree->getName(),
+                    'ged'      => $tree->name(),
                 ]);
             } elseif ($ctype === 'user' && Auth::check()) {
                 $config_url = route('user-page-block-edit', [
                     'block_id' => $block_id,
-                    'ged'      => $tree->getName(),
+                    'ged'      => $tree->name(),
                 ]);
             } else {
                 $config_url = '';
diff --git a/app/Module/TopPageViewsModule.php b/app/Module/TopPageViewsModule.php
index ffeba18880..62f6fb7a32 100644
--- a/app/Module/TopPageViewsModule.php
+++ b/app/Module/TopPageViewsModule.php
@@ -102,12 +102,12 @@ class TopPageViewsModule extends AbstractModule implements ModuleBlockInterface
             if ($ctype === 'gedcom' && Auth::isManager($tree)) {
                 $config_url = route('tree-page-block-edit', [
                     'block_id' => $block_id,
-                    'ged'      => $tree->getName(),
+                    'ged'      => $tree->name(),
                 ]);
             } elseif ($ctype === 'user' && Auth::check()) {
                 $config_url = route('user-page-block-edit', [
                     'block_id' => $block_id,
-                    'ged'      => $tree->getName(),
+                    'ged'      => $tree->name(),
                 ]);
             } else {
                 $config_url = '';
diff --git a/app/Module/TopSurnamesModule.php b/app/Module/TopSurnamesModule.php
index 01cd62b4c5..3e8695e923 100644
--- a/app/Module/TopSurnamesModule.php
+++ b/app/Module/TopSurnamesModule.php
@@ -139,12 +139,12 @@ class TopSurnamesModule extends AbstractModule implements ModuleBlockInterface
             if ($ctype === 'gedcom' && Auth::isManager($tree)) {
                 $config_url = route('tree-page-block-edit', [
                     'block_id' => $block_id,
-                    'ged'      => $tree->getName(),
+                    'ged'      => $tree->name(),
                 ]);
             } elseif ($ctype === 'user' && Auth::check()) {
                 $config_url = route('user-page-block-edit', [
                     'block_id' => $block_id,
-                    'ged'      => $tree->getName(),
+                    'ged'      => $tree->name(),
                 ]);
             } else {
                 $config_url = '';
diff --git a/app/Module/UpcomingAnniversariesModule.php b/app/Module/UpcomingAnniversariesModule.php
index 1b0e459c26..8631e94c04 100644
--- a/app/Module/UpcomingAnniversariesModule.php
+++ b/app/Module/UpcomingAnniversariesModule.php
@@ -166,12 +166,12 @@ class UpcomingAnniversariesModule extends AbstractModule implements ModuleBlockI
             if ($ctype === 'gedcom' && Auth::isManager($tree)) {
                 $config_url = route('tree-page-block-edit', [
                     'block_id' => $block_id,
-                    'ged'      => $tree->getName(),
+                    'ged'      => $tree->name(),
                 ]);
             } elseif ($ctype === 'user' && Auth::check()) {
                 $config_url = route('user-page-block-edit', [
                     'block_id' => $block_id,
-                    'ged'      => $tree->getName(),
+                    'ged'      => $tree->name(),
                 ]);
             } else {
                 $config_url = '';
diff --git a/app/Module/UserFavoritesModule.php b/app/Module/UserFavoritesModule.php
index 8b0046f821..2d29400944 100644
--- a/app/Module/UserFavoritesModule.php
+++ b/app/Module/UserFavoritesModule.php
@@ -189,7 +189,7 @@ class UserFavoritesModule extends AbstractModule implements ModuleBlockInterface
             }
         }
 
-        $url = route('user-page', ['ged' => $tree->getName()]);
+        $url = route('user-page', ['ged' => $tree->name()]);
 
         return new RedirectResponse($url);
     }
@@ -214,7 +214,7 @@ class UserFavoritesModule extends AbstractModule implements ModuleBlockInterface
             ]);
         }
 
-        $url = route('user-page', ['ged' => $tree->getName()]);
+        $url = route('user-page', ['ged' => $tree->name()]);
 
         return new RedirectResponse($url);
     }
diff --git a/app/Module/UserJournalModule.php b/app/Module/UserJournalModule.php
index b2f15d6d16..6771997d2c 100644
--- a/app/Module/UserJournalModule.php
+++ b/app/Module/UserJournalModule.php
@@ -220,7 +220,7 @@ class UserJournalModule extends AbstractModule implements ModuleBlockInterface
         }
 
         $url = route('user-page', [
-            'ged' => $tree->getName(),
+            'ged' => $tree->name(),
         ]);
 
         return new RedirectResponse($url);
@@ -248,7 +248,7 @@ class UserJournalModule extends AbstractModule implements ModuleBlockInterface
         ]);
 
         $url = route('user-page', [
-            'ged' => $tree->getName(),
+            'ged' => $tree->name(),
         ]);
 
         return new RedirectResponse($url);
diff --git a/app/Module/UserMessagesModule.php b/app/Module/UserMessagesModule.php
index 1797050b59..5592a8b836 100644
--- a/app/Module/UserMessagesModule.php
+++ b/app/Module/UserMessagesModule.php
@@ -69,9 +69,9 @@ class UserMessagesModule extends AbstractModule implements ModuleBlockInterface
         }
 
         if ($request->get('ctype') === 'user') {
-            $url = route('user-page', ['ged' => $tree->getName()]);
+            $url = route('user-page', ['ged' => $tree->name()]);
         } else {
-            $url = route('tree-page', ['ged' => $tree->getName()]);
+            $url = route('tree-page', ['ged' => $tree->name()]);
         }
 
         return new RedirectResponse($url);
@@ -102,10 +102,10 @@ class UserMessagesModule extends AbstractModule implements ModuleBlockInterface
 
         $content = '';
         if (!empty($users)) {
-            $url = route('user-page', ['ged' => $tree->getName()]);
+            $url = route('user-page', ['ged' => $tree->name()]);
             $content .= '<form onsubmit="return $(&quot;#to&quot;).val() !== &quot;&quot;">';
             $content .= '<input type="hidden" name="route" value="message">';
-            $content .= '<input type="hidden" name="ged" value="' . e($tree->getName()) . '">';
+            $content .= '<input type="hidden" name="ged" value="' . e($tree->name()) . '">';
             $content .= '<input type="hidden" name="url" value="' . e($url) . '">';
             $content .= '<label for="to">' . I18N::translate('Send a message') . '</label>';
             $content .= '<select id="to" name="to">';
@@ -121,7 +121,7 @@ class UserMessagesModule extends AbstractModule implements ModuleBlockInterface
                 'action' => 'DeleteMessage',
                 'module' => $this->getName(),
                 'ctype'  => $ctype,
-                'ged'    => $tree->getName(),
+                'ged'    => $tree->name(),
             ])) . '" data-confirm="' . I18N::translate('Are you sure you want to delete this message? It cannot be retrieved later.') . '" onsubmit="return confirm(this.dataset.confirm);">';
         $content .= csrf_field();
 
@@ -158,7 +158,7 @@ class UserMessagesModule extends AbstractModule implements ModuleBlockInterface
                     $reply_url = route('message', [
                         'to'      => $user->getUserName(),
                         'subject' => $message->subject,
-                        'ged'     => $tree->getName(),
+                        'ged'     => $tree->name(),
                     ]);
                     $content .= '<a class="btn btn-primary" href="' . e($reply_url) . '" title="' . I18N::translate('Reply') . '">' . I18N::translate('Reply') . '</a> ';
                 }
diff --git a/app/Module/UserWelcomeModule.php b/app/Module/UserWelcomeModule.php
index 36f65adc29..15ca1fbfb7 100644
--- a/app/Module/UserWelcomeModule.php
+++ b/app/Module/UserWelcomeModule.php
@@ -64,7 +64,7 @@ class UserWelcomeModule extends AbstractModule implements ModuleBlockInterface
                 $links[] = [
                     'url'   => route('pedigree', [
                         'xref' => $individual->getXref(),
-                        'ged'  => $individual->getTree()->getName(),
+                        'ged'  => $individual->getTree()->name(),
                     ]),
                     'title' => I18N::translate('Default chart'),
                     'icon'  => 'icon-pedigree',
diff --git a/app/Module/WelcomeBlockModule.php b/app/Module/WelcomeBlockModule.php
index a5ff0e2193..633246f6a3 100644
--- a/app/Module/WelcomeBlockModule.php
+++ b/app/Module/WelcomeBlockModule.php
@@ -63,7 +63,7 @@ class WelcomeBlockModule extends AbstractModule implements ModuleBlockInterface
             $links[] = [
                 'url'   => route('pedigree', [
                     'xref' => $individual->getXref(),
-                    'ged'  => $individual->getTree()->getName(),
+                    'ged'  => $individual->getTree()->name(),
                 ]),
                 'title' => I18N::translate('Default chart'),
                 'icon'  => 'icon-pedigree',
diff --git a/app/Module/YahrzeitModule.php b/app/Module/YahrzeitModule.php
index a5eb5ae9c5..018f8b4609 100644
--- a/app/Module/YahrzeitModule.php
+++ b/app/Module/YahrzeitModule.php
@@ -154,12 +154,12 @@ class YahrzeitModule extends AbstractModule implements ModuleBlockInterface
             if ($ctype === 'gedcom' && Auth::isManager($tree)) {
                 $config_url = route('tree-page-block-edit', [
                     'block_id' => $block_id,
-                    'ged'      => $tree->getName(),
+                    'ged'      => $tree->name(),
                 ]);
             } elseif ($ctype === 'user' && Auth::check()) {
                 $config_url = route('user-page-block-edit', [
                     'block_id' => $block_id,
-                    'ged'      => $tree->getName(),
+                    'ged'      => $tree->name(),
                 ]);
             } else {
                 $config_url = '';
diff --git a/app/Place.php b/app/Place.php
index 8fd6489be2..c8b1aff0dc 100644
--- a/app/Place.php
+++ b/app/Place.php
@@ -127,7 +127,7 @@ class Place
     {
         return e(route('place-hierarchy', [
             'parent' => array_reverse($this->gedcom_place),
-            'ged'    => $this->tree->getName(),
+            'ged'    => $this->tree->name(),
         ]));
     }
 
diff --git a/app/Select2.php b/app/Select2.php
index 4d2e953c51..783af64fd7 100644
--- a/app/Select2.php
+++ b/app/Select2.php
@@ -79,7 +79,7 @@ class Select2 extends Html
      */
     public static function familyConfig(Tree $tree): array
     {
-        $url = route('select2-family', ['ged' => $tree->getName()]);
+        $url = route('select2-family', ['ged' => $tree->name()]);
 
         return self::commonConfig() + ['data-ajax--url' => $url];
     }
@@ -225,7 +225,7 @@ class Select2 extends Html
      */
     public static function individualConfig(Tree $tree): array
     {
-        $url = route('select2-individual', ['ged' => $tree->getName()]);
+        $url = route('select2-individual', ['ged' => $tree->name()]);
 
         return self::commonConfig() + ['data-ajax--url' => $url];
     }
@@ -292,7 +292,7 @@ class Select2 extends Html
      */
     public static function mediaObjectConfig(Tree $tree): array
     {
-        $url = route('select2-media', ['ged' => $tree->getName()]);
+        $url = route('select2-media', ['ged' => $tree->name()]);
 
         return self::commonConfig() + ['data-ajax--url' => $url];
     }
@@ -358,7 +358,7 @@ class Select2 extends Html
      */
     public static function noteConfig(Tree $tree): array
     {
-        $url = route('select2-note', ['ged' => $tree->getName()]);
+        $url = route('select2-note', ['ged' => $tree->name()]);
 
         return self::commonConfig() + ['data-ajax--url' => $url];
     }
@@ -424,7 +424,7 @@ class Select2 extends Html
      */
     public static function placeConfig(Tree $tree): array
     {
-        $url = route('select2-place', ['ged' => $tree->getName()]);
+        $url = route('select2-place', ['ged' => $tree->name()]);
 
         return self::commonConfig() + ['data-ajax--url' => $url];
     }
@@ -525,7 +525,7 @@ class Select2 extends Html
      */
     public static function repositoryConfig(Tree $tree): array
     {
-        $url = route('select2-repository', ['ged' => $tree->getName()]);
+        $url = route('select2-repository', ['ged' => $tree->name()]);
 
         return self::commonConfig() + ['data-ajax--url' => $url];
     }
@@ -591,7 +591,7 @@ class Select2 extends Html
      */
     public static function sourceConfig(Tree $tree): array
     {
-        $url = route('select2-source', ['ged' => $tree->getName()]);
+        $url = route('select2-source', ['ged' => $tree->name()]);
 
         return self::commonConfig() + ['data-ajax--url' => $url];
     }
@@ -657,7 +657,7 @@ class Select2 extends Html
      */
     public static function submitterConfig(Tree $tree): array
     {
-        $url = route('select2-submitter', ['ged' => $tree->getName()]);
+        $url = route('select2-submitter', ['ged' => $tree->name()]);
 
         return self::commonConfig() + ['data-ajax--url' => $url];
     }
diff --git a/app/Stats.php b/app/Stats.php
index 42c3232660..2e03a02bea 100644
--- a/app/Stats.php
+++ b/app/Stats.php
@@ -183,7 +183,7 @@ class Stats
      */
     public function gedcomFilename(): string
     {
-        return $this->tree->getName();
+        return $this->tree->name();
     }
 
     /**
@@ -6110,7 +6110,7 @@ class Stats
                     if ($type == 'list') {
                         $content .= '<br>';
                     }
-                    $content .= '<a href="' . e(route('message', ['to'  => $user->getUserName(), 'ged' => $this->tree->getName()])) . '" class="btn btn-link" title="' . I18N::translate('Send a message') . '">' . view('icons/email') . '</a>';
+                    $content .= '<a href="' . e(route('message', ['to'  => $user->getUserName(), 'ged' => $this->tree->name()])) . '" class="btn btn-link" title="' . I18N::translate('Send a message') . '">' . view('icons/email') . '</a>';
                 }
                 if ($type == 'list') {
                     $content .= '</li>';
diff --git a/app/Theme/AbstractTheme.php b/app/Theme/AbstractTheme.php
index 8cda158a18..d09bd61afa 100644
--- a/app/Theme/AbstractTheme.php
+++ b/app/Theme/AbstractTheme.php
@@ -204,7 +204,7 @@ abstract class AbstractTheme
         if ($analytics_id) {
             // Add extra dimensions (i.e. filtering categories)
             $dimensions = (object) [
-                'dimension1' => $this->tree ? $this->tree->getName() : '-',
+                'dimension1' => $this->tree ? $this->tree->name() : '-',
                 'dimension2' => $this->tree ? Auth::accessLevel($this->tree) : '-',
             ];
 
@@ -304,7 +304,7 @@ abstract class AbstractTheme
                 return '<a href="mailto:' . e($user->getEmail()) . '">' . e($user->getRealName()) . '</a>';
             default:
                 $url = route(Auth::check() ? 'message' : 'contact', [
-                    'ged' => $this->tree->getName(),
+                    'ged' => $this->tree->name(),
                     'to'  => $user->getUserName(),
                     'url' => $this->request->getRequestUri(),
                 ]);
@@ -506,7 +506,7 @@ abstract class AbstractTheme
                 '<div class="col wt-header-search">' .
                 '<form class="wt-header-search-form" role="search">' .
                 '<input type="hidden" name="route" value="search-quick">' .
-                '<input type="hidden" name="ged" value="' . e($this->tree->getName()) . '">' .
+                '<input type="hidden" name="ged" value="' . e($this->tree->name()) . '">' .
                 $this->formQuickSearchFields() .
                 '</form>' .
                 '</div>';
@@ -735,7 +735,7 @@ abstract class AbstractTheme
         }
 
         return
-            '<div data-xref="' . e($individual->getXref()) . '" data-tree="' . e($individual->getTree()->getName()) . '" class="person_box_template ' . $person_box_class . ' box-style1" style="width: ' . $this->parameter('chart-box-x') . 'px; height: ' . $this->parameter('chart-box-y') . 'px">' .
+            '<div data-xref="' . e($individual->getXref()) . '" data-tree="' . e($individual->getTree()->name()) . '" class="person_box_template ' . $person_box_class . ' box-style1" style="width: ' . $this->parameter('chart-box-x') . 'px; height: ' . $this->parameter('chart-box-y') . 'px">' .
             $icons .
             '<div class="chart_textbox" style="max-height:' . $this->parameter('chart-box-y') . 'px;">' .
             $thumbnail .
@@ -790,7 +790,7 @@ abstract class AbstractTheme
         }
 
         return
-            '<div data-xref="' . e($individual->getXref()) . '" data-tree="' . e($individual->getTree()->getName()) . '" class="person_box_template ' . $person_box_class . ' box-style2">' .
+            '<div data-xref="' . e($individual->getXref()) . '" data-tree="' . e($individual->getTree()->name()) . '" class="person_box_template ' . $person_box_class . ' box-style2">' .
             $icons .
             '<div class="chart_textbox" style="max-height:' . $this->parameter('chart-box-y') . 'px;">' .
             $thumbnail .
@@ -1038,17 +1038,17 @@ abstract class AbstractTheme
             // Day view
             new Menu(I18N::translate('Day'), route('calendar', [
                 'view' => 'day',
-                'ged'  => $this->tree->getName(),
+                'ged'  => $this->tree->name(),
             ]), 'menu-calendar-day', ['rel' => 'nofollow']),
             // Month view
             new Menu(I18N::translate('Month'), route('calendar', [
                 'view' => 'month',
-                'ged'  => $this->tree->getName(),
+                'ged'  => $this->tree->name(),
             ]), 'menu-calendar-month', ['rel' => 'nofollow']),
             //Year view
             new Menu(I18N::translate('Year'), route('calendar', [
                 'view' => 'year',
-                'ged'  => $this->tree->getName(),
+                'ged'  => $this->tree->name(),
             ]), 'menu-calendar-year', ['rel' => 'nofollow']),
         ]);
     }
@@ -1061,11 +1061,11 @@ abstract class AbstractTheme
     public function menuChangeBlocks()
     {
         if (Auth::check() && $this->request->get('route') === 'user-page') {
-            return new Menu(I18N::translate('Customize this page'), route('user-page-edit', ['ged' => $this->tree->getName()]), 'menu-change-blocks');
+            return new Menu(I18N::translate('Customize this page'), route('user-page-edit', ['ged' => $this->tree->name()]), 'menu-change-blocks');
         }
 
         if (Auth::isManager($this->tree) && $this->request->get('route') === 'tree-page') {
-            return new Menu(I18N::translate('Customize this page'), route('tree-page-edit', ['ged' => $this->tree->getName()]), 'menu-change-blocks');
+            return new Menu(I18N::translate('Customize this page'), route('tree-page-edit', ['ged' => $this->tree->name()]), 'menu-change-blocks');
         }
 
         return null;
@@ -1163,7 +1163,7 @@ abstract class AbstractTheme
             $url = route('module', [
                 'module' => 'user_favorites',
                 'action' => 'AddFavorite',
-                'ged'    => $this->tree->getName(),
+                'ged'    => $this->tree->name(),
                 'xref'   => $controller->record->getXref(),
             ]);
 
@@ -1188,7 +1188,7 @@ abstract class AbstractTheme
     public function menuHomePage()
     {
         if (count(Tree::getAll()) === 1 || Site::getPreference('ALLOW_CHANGE_GEDCOM') !== '1') {
-            return new Menu(I18N::translate('Family tree'), route('tree-page', ['ged' => $this->tree->getName()]), 'menu-tree');
+            return new Menu(I18N::translate('Family tree'), route('tree-page', ['ged' => $this->tree->name()]), 'menu-tree');
         }
 
         $submenus = [];
@@ -1198,7 +1198,7 @@ abstract class AbstractTheme
             } else {
                 $active = '';
             }
-            $submenus[] = new Menu(e($tree->getTitle()), route('tree-page', ['ged' => $tree->getName()]), $active . 'menu-tree-' . $tree->id());
+            $submenus[] = new Menu(e($tree->getTitle()), route('tree-page', ['ged' => $tree->name()]), $active . 'menu-tree-' . $tree->id());
         }
 
         return new Menu(I18N::translate('Family trees'), '#', 'menu-tree', [], $submenus);
@@ -1288,7 +1288,7 @@ abstract class AbstractTheme
     public function menuListsBranches($surname): Menu
     {
         return new Menu(I18N::translate('Branches'), route('branches', [
-            'ged'     => $this->tree->getName(),
+            'ged'     => $this->tree->name(),
             'surname' => $surname,
         ]), 'menu-branches', ['rel' => 'nofollow']);
     }
@@ -1303,7 +1303,7 @@ abstract class AbstractTheme
     public function menuListsFamilies($surname): Menu
     {
         return new Menu(I18N::translate('Families'), route('family-list', [
-            'ged'     => $this->tree->getName(),
+            'ged'     => $this->tree->name(),
             'surname' => $surname,
         ]), 'menu-list-indi');
     }
@@ -1318,7 +1318,7 @@ abstract class AbstractTheme
     public function menuListsIndividuals($surname): Menu
     {
         return new Menu(I18N::translate('Individuals'), route('individual-list', [
-            'ged'     => $this->tree->getName(),
+            'ged'     => $this->tree->name(),
             'surname' => $surname,
         ]), 'menu-list-indi');
     }
@@ -1330,7 +1330,7 @@ abstract class AbstractTheme
      */
     public function menuListsMedia(): Menu
     {
-        return new Menu(I18N::translate('Media objects'), route('media-list', ['ged' => $this->tree->getName()]), 'menu-list-obje', ['rel' => 'nofollow']);
+        return new Menu(I18N::translate('Media objects'), route('media-list', ['ged' => $this->tree->name()]), 'menu-list-obje', ['rel' => 'nofollow']);
     }
 
     /**
@@ -1340,7 +1340,7 @@ abstract class AbstractTheme
      */
     public function menuListsNotes(): Menu
     {
-        return new Menu(I18N::translate('Shared notes'), route('note-list', ['ged' => $this->tree->getName()]), 'menu-list-note', ['rel' => 'nofollow']);
+        return new Menu(I18N::translate('Shared notes'), route('note-list', ['ged' => $this->tree->name()]), 'menu-list-note', ['rel' => 'nofollow']);
     }
 
     /**
@@ -1350,7 +1350,7 @@ abstract class AbstractTheme
      */
     protected function menuListsPlaces(): Menu
     {
-        return new Menu(I18N::translate('Place hierarchy'), route('place-hierarchy', ['ged' => $this->tree->getName()]), 'menu-list-plac', ['rel' => 'nofollow']);
+        return new Menu(I18N::translate('Place hierarchy'), route('place-hierarchy', ['ged' => $this->tree->name()]), 'menu-list-plac', ['rel' => 'nofollow']);
     }
 
     /**
@@ -1360,7 +1360,7 @@ abstract class AbstractTheme
      */
     public function menuListsRepositories(): Menu
     {
-        return new Menu(I18N::translate('Repositories'), route('repository-list', ['ged' => $this->tree->getName()]), 'menu-list-repo', ['rel' => 'nofollow']);
+        return new Menu(I18N::translate('Repositories'), route('repository-list', ['ged' => $this->tree->name()]), 'menu-list-repo', ['rel' => 'nofollow']);
     }
 
     /**
@@ -1370,7 +1370,7 @@ abstract class AbstractTheme
      */
     public function menuListsSources(): Menu
     {
-        return new Menu(I18N::translate('Sources'), route('source-list', ['ged' => $this->tree->getName()]), 'menu-list-sour', ['rel' => 'nofollow']);
+        return new Menu(I18N::translate('Sources'), route('source-list', ['ged' => $this->tree->name()]), 'menu-list-sour', ['rel' => 'nofollow']);
     }
 
     /**
@@ -1459,7 +1459,7 @@ abstract class AbstractTheme
      */
     public function menuMyPage(): Menu
     {
-        return new Menu(I18N::translate('My page'), route('user-page', ['ged' => $this->tree->getName()]), 'menu-mypage');
+        return new Menu(I18N::translate('My page'), route('user-page', ['ged' => $this->tree->name()]), 'menu-mypage');
     }
 
     /**
@@ -1497,7 +1497,7 @@ abstract class AbstractTheme
                 I18N::translate('My pedigree'),
                 route('pedigree', [
                     'xref' => $gedcomid,
-                    'ged'  => $this->tree->getName(),
+                    'ged'  => $this->tree->name(),
                 ]),
                 'menu-mypedigree'
             );
@@ -1515,7 +1515,7 @@ abstract class AbstractTheme
     {
         if ($this->pendingChangesExist()) {
             $url = route('show-pending', [
-                'ged' => $this->tree ? $this->tree->getName() : '',
+                'ged' => $this->tree ? $this->tree->name() : '',
                 'url' => $this->request->getRequestUri(),
             ]);
 
@@ -1566,7 +1566,7 @@ abstract class AbstractTheme
      */
     public function menuSearchGeneral(): Menu
     {
-        return new Menu(I18N::translate('General search'), route('search-general', ['ged' => $this->tree->getName()]), 'menu-search-general', ['rel' => 'nofollow']);
+        return new Menu(I18N::translate('General search'), route('search-general', ['ged' => $this->tree->name()]), 'menu-search-general', ['rel' => 'nofollow']);
     }
 
     /**
@@ -1577,7 +1577,7 @@ abstract class AbstractTheme
     public function menuSearchPhonetic(): Menu
     {
         /* I18N: search using “sounds like”, rather than exact spelling */
-        return new Menu(I18N::translate('Phonetic search'), route('search-phonetic', ['ged' => $this->tree->getName(), 'action' => 'soundex',]), 'menu-search-soundex', ['rel' => 'nofollow']);
+        return new Menu(I18N::translate('Phonetic search'), route('search-phonetic', ['ged' => $this->tree->name(), 'action' => 'soundex',]), 'menu-search-soundex', ['rel' => 'nofollow']);
     }
 
     /**
@@ -1587,7 +1587,7 @@ abstract class AbstractTheme
      */
     public function menuSearchAdvanced(): Menu
     {
-        return new Menu(I18N::translate('Advanced search'), route('search-advanced', ['ged' => $this->tree->getName()]), 'menu-search-advanced', ['rel' => 'nofollow']);
+        return new Menu(I18N::translate('Advanced search'), route('search-advanced', ['ged' => $this->tree->name()]), 'menu-search-advanced', ['rel' => 'nofollow']);
     }
 
     /**
@@ -1599,7 +1599,7 @@ abstract class AbstractTheme
     {
         if (Auth::isEditor($this->tree)) {
             return new Menu(I18N::translate('Search and replace'), route('search-replace', [
-                'ged'    => $this->tree->getName(),
+                'ged'    => $this->tree->name(),
                 'action' => 'replace',
             ]), 'menu-search-replace');
         }
@@ -1780,7 +1780,7 @@ abstract class AbstractTheme
      */
     public function pendingChangesLink(): string
     {
-        return '<a href="' . e(route('show-pending', ['ged' => $this->tree->getName()])) . '">' . $this->pendingChangesLinkText() . '</a>';
+        return '<a href="' . e(route('show-pending', ['ged' => $this->tree->name()])) . '">' . $this->pendingChangesLinkText() . '</a>';
     }
 
     /**
diff --git a/app/Tree.php b/app/Tree.php
index f39f9e502e..d948ee8bee 100644
--- a/app/Tree.php
+++ b/app/Tree.php
@@ -61,13 +61,13 @@ class Tree
      * be called from Tree::getAll() to ensure proper initialisation.
      *
      * @param int    $id
-     * @param string $tree_name
+     * @param string $name
      * @param string $tree_title
      */
-    private function __construct($id, $tree_name, $tree_title)
+    private function __construct($id, $name, $tree_title)
     {
         $this->id                      = $id;
-        $this->name                    = $tree_name;
+        $this->name                    = $name;
         $this->title                   = $tree_title;
         $this->fact_privacy            = [];
         $this->individual_privacy      = [];
@@ -113,7 +113,7 @@ class Tree
      *
      * @return string
      */
-    public function getName(): string
+    public function name(): string
     {
         return $this->name;
     }