Rename Tree::getTreeName() to name()

56 files changed, 104 insertions, 104 deletions

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 = '';