From 73143af96c76fdeb89c3fd74883815c919eca948 Mon Sep 17 00:00:00 2001
From: Caen De Silva <caen@desilva.se>
Date: Fri, 10 Feb 2023 20:17:19 +0100
Subject: [PATCH] Replace `config('site')` calls with `config('hyde')`

Replace `config('site')` calls with `config('hyde')`

Replace `config(['site'])` calls with `config(['hyde'])`

Replace `Config::get('site')` calls with `Config::get('hyde')`
---
 _pages/404.blade.php                          |  2 +-
 config/docs.php                               |  2 +-
 config/hyde.php                               |  2 +-
 docs/digging-deeper/customization.md          |  2 +-
 packages/framework/config/docs.php            |  2 +-
 packages/framework/config/hyde.php            |  2 +-
 .../navigation/navigation-brand.blade.php     |  2 +-
 .../resources/views/layouts/app.blade.php     |  2 +-
 .../resources/views/layouts/docs.blade.php    |  2 +-
 .../resources/views/pages/404.blade.php       |  2 +-
 .../src/Console/Commands/BuildSiteCommand.php |  2 +-
 packages/framework/src/Facades/Features.php   |  2 +-
 packages/framework/src/Facades/Site.php       |  6 ++---
 .../framework/src/Foundation/Hyperlinks.php   |  6 ++---
 .../XmlGenerators/RssFeedGenerator.php        |  2 +-
 .../src/Framework/HydeServiceProvider.php     |  4 +--
 .../Services/DocumentationSearchService.php   |  2 +-
 .../Services/YamlConfigurationService.php     |  4 +--
 .../framework/src/Pages/Concerns/HydePage.php |  2 +-
 .../Commands/BuildRssFeedCommandTest.php      |  4 +--
 .../Commands/BuildSitemapCommandTest.php      |  4 +--
 .../Feature/ConfigurableFeaturesTest.php      |  8 +++---
 .../Feature/Foundation/HyperlinksTest.php     |  2 +-
 .../tests/Feature/GlobalMetadataBagTest.php   | 22 ++++++++--------
 .../tests/Feature/HydeKernelTest.php          | 16 ++++++------
 .../framework/tests/Feature/HydePageTest.php  | 20 +++++++-------
 .../tests/Feature/HydeServiceProviderTest.php |  8 +++---
 .../tests/Feature/MetadataHelperTest.php      |  2 +-
 .../framework/tests/Feature/MetadataTest.php  | 16 ++++++------
 .../tests/Feature/MetadataViewTest.php        |  2 +-
 .../framework/tests/Feature/RouteTest.php     |  2 +-
 .../Feature/Services/BuildTaskServiceTest.php |  2 +-
 .../DocumentationSearchServiceTest.php        |  4 +--
 .../Feature/Services/RssFeedServiceTest.php   | 18 ++++++-------
 .../Feature/Services/SitemapServiceTest.php   | 10 +++----
 .../Services/ValidationServiceTest.php        |  4 +--
 packages/framework/tests/Feature/SiteTest.php | 12 ++++-----
 .../tests/Feature/StaticSiteServiceTest.php   | 12 ++++-----
 .../Feature/YamlConfigurationServiceTest.php  | 12 ++++-----
 .../BuildOutputDirectoryCanBeChangedTest.php  |  2 +-
 .../HyperlinkFileHelperRelativeLinkTest.php   | 14 +++++-----
 .../HyperlinkFormatHtmlPathTest.php           | 26 +++++++++----------
 .../HyperlinksUrlPathHelpersTest.php          | 22 ++++++++--------
 .../Unit/Pages/MarkdownPostHelpersTest.php    |  4 +--
 ...cSiteCommandFlagToEnablePrettyUrlsTest.php |  6 ++---
 .../Unit/Views/NavigationBrandViewTest.php    |  2 +-
 .../src/Http/DashboardController.php          |  2 +-
 .../ui-kit/docs/components-demo.blade.php     |  2 +-
 psalm-baseline.xml                            | 20 +++++++-------
 49 files changed, 165 insertions(+), 165 deletions(-)

diff --git a/_pages/404.blade.php b/_pages/404.blade.php
index 0c302f01a0c..15a7b7aa6ea 100644
--- a/_pages/404.blade.php
+++ b/_pages/404.blade.php
@@ -31,7 +31,7 @@
                     Sorry, the page you are looking for could not be found.
                 </p>
 
-                <a href="{{ config('site.url') ?? '/' }}">
+                <a href="{{ config('hyde.url') ?? '/' }}">
                     <button
                         class="bg-transparent text-grey-darkest font-bold uppercase tracking-wide py-3 px-6 border-2 border-grey-light hover:border-grey rounded-lg">
                         Go Home
diff --git a/config/docs.php b/config/docs.php
index 0f871803003..9082eb0abcc 100644
--- a/config/docs.php
+++ b/config/docs.php
@@ -21,7 +21,7 @@
     |
     */
 
-    'header_title' => config('site.name', 'HydePHP').' Docs',
+    'header_title' => config('hyde.name', 'HydePHP').' Docs',
 
     /*
     |--------------------------------------------------------------------------
diff --git a/config/hyde.php b/config/hyde.php
index d89e82ea9a3..36a3c6e98fe 100644
--- a/config/hyde.php
+++ b/config/hyde.php
@@ -203,7 +203,7 @@
         // Meta::name('description', 'My Hyde Blog'),
         // Meta::name('keywords', 'Static Sites, Blogs, Documentation'),
         Meta::name('generator', 'HydePHP '.Hyde\Hyde::version()),
-        Meta::property('site_name', config('site.name', 'HydePHP')),
+        Meta::property('site_name', config('hyde.name', 'HydePHP')),
     ],
 
     /*
diff --git a/docs/digging-deeper/customization.md b/docs/digging-deeper/customization.md
index 62f26232bf1..24c3211571e 100644
--- a/docs/digging-deeper/customization.md
+++ b/docs/digging-deeper/customization.md
@@ -11,7 +11,7 @@ navigation:
 Hyde favours <a href="https://en.wikipedia.org/wiki/Convention_over_configuration">"Convention over Configuration"</a>
 and comes preconfigured with sensible defaults. However, Hyde also strives to be modular and endlessly customizable if you need it. This page guides you through the many options available!
 
-When referencing configuration options, we often use "dot notation" to specify the configuration file. For example, <code>config('site.name')</code> means that we are looking for the <code>name</code> option in the <code>config/site.php</code> file.
+When referencing configuration options, we often use "dot notation" to specify the configuration file. For example, <code>config('hyde.name')</code> means that we are looking for the <code>name</code> option in the <code>config/site.php</code> file.
 
 If you want to reference these configuration options in your Blade views, or other integrations, please take a look at the [Laravel Documentation](https://laravel.com/docs/9.x/configuration).
 
diff --git a/packages/framework/config/docs.php b/packages/framework/config/docs.php
index 0f871803003..9082eb0abcc 100644
--- a/packages/framework/config/docs.php
+++ b/packages/framework/config/docs.php
@@ -21,7 +21,7 @@
     |
     */
 
-    'header_title' => config('site.name', 'HydePHP').' Docs',
+    'header_title' => config('hyde.name', 'HydePHP').' Docs',
 
     /*
     |--------------------------------------------------------------------------
diff --git a/packages/framework/config/hyde.php b/packages/framework/config/hyde.php
index d89e82ea9a3..36a3c6e98fe 100644
--- a/packages/framework/config/hyde.php
+++ b/packages/framework/config/hyde.php
@@ -203,7 +203,7 @@
         // Meta::name('description', 'My Hyde Blog'),
         // Meta::name('keywords', 'Static Sites, Blogs, Documentation'),
         Meta::name('generator', 'HydePHP '.Hyde\Hyde::version()),
-        Meta::property('site_name', config('site.name', 'HydePHP')),
+        Meta::property('site_name', config('hyde.name', 'HydePHP')),
     ],
 
     /*
diff --git a/packages/framework/resources/views/components/navigation/navigation-brand.blade.php b/packages/framework/resources/views/components/navigation/navigation-brand.blade.php
index 2c38f07f9e8..75cce50adae 100644
--- a/packages/framework/resources/views/components/navigation/navigation-brand.blade.php
+++ b/packages/framework/resources/views/components/navigation/navigation-brand.blade.php
@@ -1,3 +1,3 @@
 <a href="{{ Route::get('index') }}" class="font-bold px-4" aria-label="Home page">
-    {{ config('site.name', 'HydePHP') }}
+    {{ config('hyde.name', 'HydePHP') }}
 </a>
\ No newline at end of file
diff --git a/packages/framework/resources/views/layouts/app.blade.php b/packages/framework/resources/views/layouts/app.blade.php
index 577d87cc3a4..b04801a96c3 100644
--- a/packages/framework/resources/views/layouts/app.blade.php
+++ b/packages/framework/resources/views/layouts/app.blade.php
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{ config('site.language', 'en') }}">
+<html lang="{{ config('hyde.language', 'en') }}">
 <head>
     @include('hyde::layouts.head')
 </head>
diff --git a/packages/framework/resources/views/layouts/docs.blade.php b/packages/framework/resources/views/layouts/docs.blade.php
index 3a1caad36e3..d9c36cf4766 100644
--- a/packages/framework/resources/views/layouts/docs.blade.php
+++ b/packages/framework/resources/views/layouts/docs.blade.php
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{ config('site.language', 'en') }}">
+<html lang="{{ config('hyde.language', 'en') }}">
 <head>
     @include('hyde::layouts.head')
 </head>
diff --git a/packages/framework/resources/views/pages/404.blade.php b/packages/framework/resources/views/pages/404.blade.php
index 0c302f01a0c..15a7b7aa6ea 100644
--- a/packages/framework/resources/views/pages/404.blade.php
+++ b/packages/framework/resources/views/pages/404.blade.php
@@ -31,7 +31,7 @@
                     Sorry, the page you are looking for could not be found.
                 </p>
 
-                <a href="{{ config('site.url') ?? '/' }}">
+                <a href="{{ config('hyde.url') ?? '/' }}">
                     <button
                         class="bg-transparent text-grey-darkest font-bold uppercase tracking-wide py-3 px-6 border-2 border-grey-light hover:border-grey rounded-lg">
                         Go Home
diff --git a/packages/framework/src/Console/Commands/BuildSiteCommand.php b/packages/framework/src/Console/Commands/BuildSiteCommand.php
index 19ea705521b..5c5aa1c0293 100644
--- a/packages/framework/src/Console/Commands/BuildSiteCommand.php
+++ b/packages/framework/src/Console/Commands/BuildSiteCommand.php
@@ -70,7 +70,7 @@ protected function runPreBuildActions(): void
         if ($this->option('pretty-urls')) {
             $this->info('Generating site with pretty URLs');
             $this->newLine();
-            Config::set(['site.pretty_urls' => true]);
+            Config::set(['hyde.pretty_urls' => true]);
         }
     }
 
diff --git a/packages/framework/src/Facades/Features.php b/packages/framework/src/Facades/Features.php
index beb2ad56eff..fc74bc982df 100644
--- a/packages/framework/src/Facades/Features.php
+++ b/packages/framework/src/Facades/Features.php
@@ -156,7 +156,7 @@ public static function torchlight(): string
     public static function sitemap(): bool
     {
         return static::resolveMockedInstance('sitemap') ?? Hyde::hasSiteUrl()
-            && config('site.generate_sitemap', true)
+            && config('hyde.generate_sitemap', true)
             && extension_loaded('simplexml');
     }
 
diff --git a/packages/framework/src/Facades/Site.php b/packages/framework/src/Facades/Site.php
index 08149aa190f..1885675fb18 100644
--- a/packages/framework/src/Facades/Site.php
+++ b/packages/framework/src/Facades/Site.php
@@ -16,17 +16,17 @@ final class Site
 {
     public static function url(): ?string
     {
-        return config('site.url');
+        return config('hyde.url');
     }
 
     public static function name(): ?string
     {
-        return config('site.name');
+        return config('hyde.name');
     }
 
     public static function language(): ?string
     {
-        return config('site.language');
+        return config('hyde.language');
     }
 
     public static function metadata(): GlobalMetadataBag
diff --git a/packages/framework/src/Foundation/Hyperlinks.php b/packages/framework/src/Foundation/Hyperlinks.php
index 013dba21c7b..3c4a3222140 100644
--- a/packages/framework/src/Foundation/Hyperlinks.php
+++ b/packages/framework/src/Foundation/Hyperlinks.php
@@ -31,7 +31,7 @@ public function __construct(HydeKernel $kernel)
      */
     public function formatLink(string $destination): string
     {
-        if (config('site.pretty_urls', false) === true) {
+        if (config('hyde.pretty_urls', false) === true) {
             if (str_ends_with($destination, '.html')) {
                 if ($destination === 'index.html') {
                     return '/';
@@ -108,7 +108,7 @@ public function image(string $name, bool $preferQualifiedUrl = false): string
      */
     public function hasSiteUrl(): bool
     {
-        return ! blank(config('site.url'));
+        return ! blank(config('hyde.url'));
     }
 
     /**
@@ -123,7 +123,7 @@ public function url(string $path = ''): string
         $path = $this->formatLink(trim($path, '/'));
 
         if ($this->hasSiteUrl()) {
-            return rtrim(rtrim((string) config('site.url'), '/')."/$path", '/');
+            return rtrim(rtrim((string) config('hyde.url'), '/')."/$path", '/');
         }
 
         throw new BaseUrlNotSetException();
diff --git a/packages/framework/src/Framework/Features/XmlGenerators/RssFeedGenerator.php b/packages/framework/src/Framework/Features/XmlGenerators/RssFeedGenerator.php
index 518024e047c..4fabe6d206c 100644
--- a/packages/framework/src/Framework/Features/XmlGenerators/RssFeedGenerator.php
+++ b/packages/framework/src/Framework/Features/XmlGenerators/RssFeedGenerator.php
@@ -82,7 +82,7 @@ protected function addBaseChannelItems(): void
         $this->addChild($channel, 'title', Site::name());
         $this->addChild($channel, 'link', Site::url());
         $this->addChild($channel, 'description', $this->getDescription());
-        $this->addChild($channel, 'language', config('site.language', 'en'));
+        $this->addChild($channel, 'language', config('hyde.language', 'en'));
         $this->addChild($channel, 'generator', 'HydePHP '.Hyde::version());
         $this->addChild($channel, 'lastBuildDate', date(DATE_RSS));
     }
diff --git a/packages/framework/src/Framework/HydeServiceProvider.php b/packages/framework/src/Framework/HydeServiceProvider.php
index 8a49965b86a..169d081253e 100644
--- a/packages/framework/src/Framework/HydeServiceProvider.php
+++ b/packages/framework/src/Framework/HydeServiceProvider.php
@@ -58,9 +58,9 @@ public function register(): void
             DocumentationPage::class => config('docs.output_directory', 'docs'),
         ]);
 
-        $this->storeCompiledSiteIn(config('site.output_directory', '_site'));
+        $this->storeCompiledSiteIn(config('hyde.output_directory', '_site'));
 
-        $this->useMediaDirectory(config('site.media_directory', '_media'));
+        $this->useMediaDirectory(config('hyde.media_directory', '_media'));
 
         $this->discoverBladeViewsIn(BladePage::sourceDirectory());
 
diff --git a/packages/framework/src/Framework/Services/DocumentationSearchService.php b/packages/framework/src/Framework/Services/DocumentationSearchService.php
index 75ec7349ebd..6559f1a138d 100644
--- a/packages/framework/src/Framework/Services/DocumentationSearchService.php
+++ b/packages/framework/src/Framework/Services/DocumentationSearchService.php
@@ -81,7 +81,7 @@ protected function getSearchContentForDocument(DocumentationPage $page): string
 
     protected function formatDestination(string $slug): string
     {
-        if (config('site.pretty_urls', false) === true) {
+        if (config('hyde.pretty_urls', false) === true) {
             return $slug === 'index' ? '' : $slug;
         }
 
diff --git a/packages/framework/src/Framework/Services/YamlConfigurationService.php b/packages/framework/src/Framework/Services/YamlConfigurationService.php
index 81d99d36399..6762aa16ce0 100644
--- a/packages/framework/src/Framework/Services/YamlConfigurationService.php
+++ b/packages/framework/src/Framework/Services/YamlConfigurationService.php
@@ -16,8 +16,8 @@ class YamlConfigurationService
     public static function boot(): void
     {
         if (static::hasFile()) {
-            Config::set('site', array_merge(
-                Config::get('site', []),
+            Config::set('hyde', array_merge(
+                Config::get('hyde', []),
                 static::getYaml()
             ));
         }
diff --git a/packages/framework/src/Pages/Concerns/HydePage.php b/packages/framework/src/Pages/Concerns/HydePage.php
index 792220eee35..1bd98ca3de3 100644
--- a/packages/framework/src/Pages/Concerns/HydePage.php
+++ b/packages/framework/src/Pages/Concerns/HydePage.php
@@ -267,7 +267,7 @@ public function getBladeView(): string
      */
     public function htmlTitle(): string
     {
-        return config('site.name', 'HydePHP').' - '.$this->title;
+        return config('hyde.name', 'HydePHP').' - '.$this->title;
     }
 
     public function metadata(): PageMetadataBag
diff --git a/packages/framework/tests/Feature/Commands/BuildRssFeedCommandTest.php b/packages/framework/tests/Feature/Commands/BuildRssFeedCommandTest.php
index 0ff4d5296e4..57e672f8b3d 100644
--- a/packages/framework/tests/Feature/Commands/BuildRssFeedCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/BuildRssFeedCommandTest.php
@@ -15,7 +15,7 @@ class BuildRssFeedCommandTest extends TestCase
 {
     public function test_rss_feed_is_generated_when_conditions_are_met()
     {
-        config(['site.url' => 'https://example.com']);
+        config(['hyde.url' => 'https://example.com']);
         config(['hyde.generate_rss_feed' => true]);
         $this->file('_posts/foo.md');
 
@@ -28,7 +28,7 @@ public function test_rss_feed_is_generated_when_conditions_are_met()
 
     public function test_rss_filename_can_be_changed()
     {
-        config(['site.url' => 'https://example.com']);
+        config(['hyde.url' => 'https://example.com']);
         config(['hyde.generate_rss_feed' => true]);
         config(['hyde.rss_filename' => 'blog.xml']);
         $this->file('_posts/foo.md');
diff --git a/packages/framework/tests/Feature/Commands/BuildSitemapCommandTest.php b/packages/framework/tests/Feature/Commands/BuildSitemapCommandTest.php
index ba75ddf77ba..c0b05fcc7d1 100644
--- a/packages/framework/tests/Feature/Commands/BuildSitemapCommandTest.php
+++ b/packages/framework/tests/Feature/Commands/BuildSitemapCommandTest.php
@@ -15,8 +15,8 @@ class BuildSitemapCommandTest extends TestCase
 {
     public function test_sitemap_is_generated_when_conditions_are_met()
     {
-        config(['site.url' => 'https://example.com']);
-        config(['site.generate_sitemap' => true]);
+        config(['hyde.url' => 'https://example.com']);
+        config(['hyde.generate_sitemap' => true]);
 
         $this->assertFileDoesNotExist(Hyde::path('_site/sitemap.xml'));
 
diff --git a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
index 50d318b73e8..6c1cf367151 100644
--- a/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
+++ b/packages/framework/tests/Feature/ConfigurableFeaturesTest.php
@@ -43,20 +43,20 @@ public function test_has_feature_returns_true_when_feature_is_enabled()
 
     public function test_can_generate_sitemap_helper_returns_true_if_hyde_has_base_url()
     {
-        config(['site.url' => 'foo']);
+        config(['hyde.url' => 'foo']);
         $this->assertTrue(Features::sitemap());
     }
 
     public function test_can_generate_sitemap_helper_returns_false_if_hyde_does_not_have_base_url()
     {
-        config(['site.url' => '']);
+        config(['hyde.url' => '']);
         $this->assertFalse(Features::sitemap());
     }
 
     public function test_can_generate_sitemap_helper_returns_false_if_sitemaps_are_disabled_in_config()
     {
-        config(['site.url' => 'foo']);
-        config(['site.generate_sitemap' => false]);
+        config(['hyde.url' => 'foo']);
+        config(['hyde.generate_sitemap' => false]);
         $this->assertFalse(Features::sitemap());
     }
 
diff --git a/packages/framework/tests/Feature/Foundation/HyperlinksTest.php b/packages/framework/tests/Feature/Foundation/HyperlinksTest.php
index 5145fe25407..f4f1e4028e8 100644
--- a/packages/framework/tests/Feature/Foundation/HyperlinksTest.php
+++ b/packages/framework/tests/Feature/Foundation/HyperlinksTest.php
@@ -59,7 +59,7 @@ public function test_image_helper_returns_qualified_absolute_uri_when_requested_
 
     public function test_image_helper_returns_default_relative_path_when_qualified_absolute_uri_is_requested_but_site_has_no_base_url()
     {
-        config(['site.url' => null]);
+        config(['hyde.url' => null]);
         $this->assertEquals('media/test.jpg', $this->class->image('test.jpg', true));
     }
 
diff --git a/packages/framework/tests/Feature/GlobalMetadataBagTest.php b/packages/framework/tests/Feature/GlobalMetadataBagTest.php
index 7d0c2b33bdf..6ba053a3311 100644
--- a/packages/framework/tests/Feature/GlobalMetadataBagTest.php
+++ b/packages/framework/tests/Feature/GlobalMetadataBagTest.php
@@ -39,8 +39,8 @@ public function test_site_metadata_automatically_adds_sitemap_when_enabled()
     {
         $this->emptyConfig();
 
-        config(['site.url' => 'foo']);
-        config(['site.generate_sitemap' => true]);
+        config(['hyde.url' => 'foo']);
+        config(['hyde.generate_sitemap' => true]);
 
         $this->assertEquals('<link rel="sitemap" href="foo/sitemap.xml" type="application/xml" title="Sitemap">', GlobalMetadataBag::make()->render());
     }
@@ -49,8 +49,8 @@ public function test_site_metadata_sitemap_uses_configured_site_url()
     {
         $this->emptyConfig();
 
-        config(['site.url' => 'bar']);
-        config(['site.generate_sitemap' => true]);
+        config(['hyde.url' => 'bar']);
+        config(['hyde.generate_sitemap' => true]);
 
         $this->assertEquals('<link rel="sitemap" href="bar/sitemap.xml" type="application/xml" title="Sitemap">', GlobalMetadataBag::make()->render());
     }
@@ -59,7 +59,7 @@ public function test_site_metadata_automatically_adds_rss_feed_when_enabled()
     {
         $this->emptyConfig();
 
-        config(['site.url' => 'foo']);
+        config(['hyde.url' => 'foo']);
         config(['hyde.generate_rss_feed' => true]);
         $this->file('_posts/foo.md');
 
@@ -70,7 +70,7 @@ public function test_site_metadata_rss_feed_uses_configured_site_url()
     {
         $this->emptyConfig();
 
-        config(['site.url' => 'bar']);
+        config(['hyde.url' => 'bar']);
         config(['hyde.generate_rss_feed' => true]);
         $this->file('_posts/foo.md');
 
@@ -81,8 +81,8 @@ public function test_site_metadata_rss_feed_uses_configured_site_name()
     {
         $this->emptyConfig();
 
-        config(['site.url' => 'foo']);
-        config(['site.name' => 'Site']);
+        config(['hyde.url' => 'foo']);
+        config(['hyde.name' => 'Site']);
         config(['hyde.generate_rss_feed' => true]);
         $this->file('_posts/foo.md');
 
@@ -93,7 +93,7 @@ public function test_site_metadata_rss_feed_uses_configured_rss_file_name()
     {
         $this->emptyConfig();
 
-        config(['site.url' => 'foo']);
+        config(['hyde.url' => 'foo']);
         config(['hyde.rss_filename' => 'posts.rss']);
         config(['hyde.generate_rss_feed' => true]);
         $this->file('_posts/foo.md');
@@ -142,9 +142,9 @@ public function test_metadata_existing_in_the_current_page_is_not_added_regardle
 
     protected function emptyConfig(): void
     {
-        config(['site.url' => null]);
+        config(['hyde.url' => null]);
         config(['hyde.meta' => []]);
         config(['hyde.generate_rss_feed' => false]);
-        config(['site.generate_sitemap' => false]);
+        config(['hyde.generate_sitemap' => false]);
     }
 }
diff --git a/packages/framework/tests/Feature/HydeKernelTest.php b/packages/framework/tests/Feature/HydeKernelTest.php
index b910aac3dcb..9dca19fd7c5 100644
--- a/packages/framework/tests/Feature/HydeKernelTest.php
+++ b/packages/framework/tests/Feature/HydeKernelTest.php
@@ -137,11 +137,11 @@ public function test_markdown_helper_converts_indented_markdown_to_html()
 
     public function test_format_html_path_helper_formats_path_according_to_config_rules()
     {
-        Config::set('site.pretty_urls', false);
+        Config::set('hyde.pretty_urls', false);
         $this->assertSame('foo.html', Hyde::formatLink('foo.html'));
         $this->assertSame('index.html', Hyde::formatLink('index.html'));
 
-        Config::set('site.pretty_urls', true);
+        Config::set('hyde.pretty_urls', true);
         $this->assertSame('foo', Hyde::formatLink('foo.html'));
         $this->assertSame('/', Hyde::formatLink('index.html'));
     }
@@ -188,24 +188,24 @@ public function test_image_helper_supports_custom_media_directories()
 
     public function test_has_site_url_helper_returns_boolean_value_for_when_config_setting_is_set()
     {
-        Config::set('site.url', 'https://example.com');
+        Config::set('hyde.url', 'https://example.com');
         $this->assertTrue(Hyde::hasSiteUrl());
 
-        Config::set('site.url', null);
+        Config::set('hyde.url', null);
         $this->assertFalse(Hyde::hasSiteUrl());
     }
 
     public function test_url_returns_qualified_url_paths()
     {
-        Config::set('site.url', 'https://example.com');
+        Config::set('hyde.url', 'https://example.com');
         $this->assertSame('https://example.com', Hyde::url());
         $this->assertSame('https://example.com/foo', Hyde::url('foo'));
 
-        Config::set('site.pretty_urls', false);
+        Config::set('hyde.pretty_urls', false);
         $this->assertSame('https://example.com/foo.html', Hyde::url('foo.html'));
         $this->assertSame('https://example.com/index.html', Hyde::url('index.html'));
 
-        Config::set('site.pretty_urls', true);
+        Config::set('hyde.pretty_urls', true);
         $this->assertSame('https://example.com/foo', Hyde::url('foo.html'));
         $this->assertSame('https://example.com', Hyde::url('index.html'));
     }
@@ -414,7 +414,7 @@ public function test_media_output_directory_can_be_changed_in_configuration()
     {
         $this->assertEquals('_media', Hyde::getMediaDirectory());
 
-        config(['site.media_directory' => '_assets']);
+        config(['hyde.media_directory' => '_assets']);
         (new HydeServiceProvider($this->app))->register();
 
         $this->assertEquals('_assets', Hyde::getMediaDirectory());
diff --git a/packages/framework/tests/Feature/HydePageTest.php b/packages/framework/tests/Feature/HydePageTest.php
index 7790d6d0076..0e154d500af 100644
--- a/packages/framework/tests/Feature/HydePageTest.php
+++ b/packages/framework/tests/Feature/HydePageTest.php
@@ -522,7 +522,7 @@ public function test_html_title_returns_site_name_plus_page_title()
 
     public function test_html_title_uses_configured_site_name()
     {
-        config(['site.name' => 'Foo Bar']);
+        config(['hyde.name' => 'Foo Bar']);
         $this->assertEquals('Foo Bar - Foo', (new MarkdownPage('Foo'))->htmlTitle());
     }
 
@@ -717,7 +717,7 @@ public function test_documentation_page_can_be_hidden_from_navigation_using_conf
 
     public function test_get_canonical_url_returns_url_for_top_level_page()
     {
-        config(['site.url' => 'https://example.com']);
+        config(['hyde.url' => 'https://example.com']);
         $page = new MarkdownPage('foo');
 
         $this->assertEquals('https://example.com/foo.html', $page->canonicalUrl);
@@ -725,8 +725,8 @@ public function test_get_canonical_url_returns_url_for_top_level_page()
 
     public function test_get_canonical_url_returns_pretty_url_for_top_level_page()
     {
-        config(['site.url' => 'https://example.com']);
-        config(['site.pretty_urls' => true]);
+        config(['hyde.url' => 'https://example.com']);
+        config(['hyde.pretty_urls' => true]);
         $page = new MarkdownPage('foo');
 
         $this->assertEquals('https://example.com/foo', $page->canonicalUrl);
@@ -734,7 +734,7 @@ public function test_get_canonical_url_returns_pretty_url_for_top_level_page()
 
     public function test_get_canonical_url_returns_url_for_nested_page()
     {
-        config(['site.url' => 'https://example.com']);
+        config(['hyde.url' => 'https://example.com']);
         $page = new MarkdownPage('foo/bar');
 
         $this->assertEquals('https://example.com/foo/bar.html', $page->canonicalUrl);
@@ -742,7 +742,7 @@ public function test_get_canonical_url_returns_url_for_nested_page()
 
     public function test_get_canonical_url_returns_url_for_deeply_nested_page()
     {
-        config(['site.url' => 'https://example.com']);
+        config(['hyde.url' => 'https://example.com']);
         $page = new MarkdownPage('foo/bar/baz');
 
         $this->assertEquals('https://example.com/foo/bar/baz.html', $page->canonicalUrl);
@@ -750,7 +750,7 @@ public function test_get_canonical_url_returns_url_for_deeply_nested_page()
 
     public function test_canonical_url_is_not_set_when_identifier_is_null()
     {
-        config(['site.url' => 'https://example.com']);
+        config(['hyde.url' => 'https://example.com']);
         $page = new MarkdownPage();
         $this->assertNull($page->canonicalUrl);
         $this->assertStringNotContainsString(
@@ -761,7 +761,7 @@ public function test_canonical_url_is_not_set_when_identifier_is_null()
 
     public function test_canonical_url_is_not_set_when_site_url_is_null()
     {
-        config(['site.url' => null]);
+        config(['hyde.url' => null]);
         $page = new MarkdownPage('foo');
         $this->assertNull($page->canonicalUrl);
         $this->assertStringNotContainsString(
@@ -772,7 +772,7 @@ public function test_canonical_url_is_not_set_when_site_url_is_null()
 
     public function test_custom_canonical_link_can_be_set_in_front_matter()
     {
-        config(['site.url' => 'https://example.com']);
+        config(['hyde.url' => 'https://example.com']);
         $page = MarkdownPage::make(matter: ['canonicalUrl' => 'foo/bar']);
         $this->assertEquals('foo/bar', $page->canonicalUrl);
         $this->assertStringContainsString(
@@ -942,7 +942,7 @@ public function test_get_method_can_access_nested_data_from_page_with_dot_notati
 
     public function testGetLinkWithPrettyUrls()
     {
-        config(['site.pretty_urls' => true]);
+        config(['hyde.pretty_urls' => true]);
         $this->assertEquals('output/hello-world',
             (new TestPage('hello-world'))->getLink()
         );
diff --git a/packages/framework/tests/Feature/HydeServiceProviderTest.php b/packages/framework/tests/Feature/HydeServiceProviderTest.php
index d7ef00cf8e8..b612db1b16a 100644
--- a/packages/framework/tests/Feature/HydeServiceProviderTest.php
+++ b/packages/framework/tests/Feature/HydeServiceProviderTest.php
@@ -64,10 +64,10 @@ public function test_provider_has_boot_method()
 
     public function test_provider_applies_yaml_configuration_when_present()
     {
-        $this->assertEquals('HydePHP', config('site.name'));
+        $this->assertEquals('HydePHP', config('hyde.name'));
         $this->file('hyde.yml', 'name: Foo');
         $this->provider->register();
-        $this->assertEquals('Foo', config('site.name'));
+        $this->assertEquals('Foo', config('hyde.name'));
     }
 
     public function test_provider_registers_asset_service_contract()
@@ -159,7 +159,7 @@ public function test_provider_registers_site_output_directory()
     {
         $this->assertEquals('_site', Site::getOutputDirectory());
 
-        config(['site.output_directory' => 'foo']);
+        config(['hyde.output_directory' => 'foo']);
 
         $this->provider->register();
 
@@ -170,7 +170,7 @@ public function test_provider_registers_media_directory()
     {
         $this->assertEquals('_media', Hyde::getMediaDirectory());
 
-        config(['site.media_directory' => 'foo']);
+        config(['hyde.media_directory' => 'foo']);
 
         $this->provider->register();
 
diff --git a/packages/framework/tests/Feature/MetadataHelperTest.php b/packages/framework/tests/Feature/MetadataHelperTest.php
index e25d20817ca..462bfad38c0 100644
--- a/packages/framework/tests/Feature/MetadataHelperTest.php
+++ b/packages/framework/tests/Feature/MetadataHelperTest.php
@@ -18,7 +18,7 @@ protected function setUp(): void
         parent::setUp();
 
         config(['hyde.meta' => []]);
-        config(['site.url' => null]);
+        config(['hyde.url' => null]);
     }
 
     public function test_name_method_returns_a_valid_html_meta_string()
diff --git a/packages/framework/tests/Feature/MetadataTest.php b/packages/framework/tests/Feature/MetadataTest.php
index a067458e59a..201feb5bcd8 100644
--- a/packages/framework/tests/Feature/MetadataTest.php
+++ b/packages/framework/tests/Feature/MetadataTest.php
@@ -28,10 +28,10 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        config(['site.url' => null]);
+        config(['hyde.url' => null]);
         config(['hyde.meta' => []]);
         config(['hyde.generate_rss_feed' => false]);
-        config(['site.generate_sitemap' => false]);
+        config(['hyde.generate_sitemap' => false]);
     }
 
     protected function assertPageHasMetadata(HydePage $page, string $metadata)
@@ -197,7 +197,7 @@ public function test_dynamic_metadata_overrides_config_defined_metadata()
 
     public function test_does_not_add_canonical_link_when_base_url_is_not_set()
     {
-        config(['site.url' => null]);
+        config(['hyde.url' => null]);
         $page = MarkdownPage::make('bar');
 
         $this->assertStringNotContainsString('<link rel="canonical"', $page->metadata->render());
@@ -205,7 +205,7 @@ public function test_does_not_add_canonical_link_when_base_url_is_not_set()
 
     public function test_does_not_add_canonical_link_when_identifier_is_not_set()
     {
-        config(['site.url' => 'foo']);
+        config(['hyde.url' => 'foo']);
         $page = MarkdownPage::make();
 
         $this->assertStringNotContainsString('<link rel="canonical"', $page->metadata->render());
@@ -213,7 +213,7 @@ public function test_does_not_add_canonical_link_when_identifier_is_not_set()
 
     public function test_adds_canonical_link_when_base_url_and_identifier_is_set()
     {
-        config(['site.url' => 'foo']);
+        config(['hyde.url' => 'foo']);
         $page = MarkdownPage::make('bar');
 
         $this->assertStringContainsString('<link rel="canonical" href="foo/bar.html">', $page->metadata->render());
@@ -221,8 +221,8 @@ public function test_adds_canonical_link_when_base_url_and_identifier_is_set()
 
     public function test_canonical_link_uses_clean_url_setting()
     {
-        config(['site.url' => 'foo']);
-        config(['site.pretty_urls' => true]);
+        config(['hyde.url' => 'foo']);
+        config(['hyde.pretty_urls' => true]);
         $page = MarkdownPage::make('bar');
 
         $this->assertStringContainsString('<link rel="canonical" href="foo/bar">', $page->metadata->render());
@@ -230,7 +230,7 @@ public function test_canonical_link_uses_clean_url_setting()
 
     public function test_can_override_canonical_link_with_front_matter()
     {
-        config(['site.url' => 'foo']);
+        config(['hyde.url' => 'foo']);
         $page = MarkdownPage::make('bar', [
             'canonicalUrl' => 'canonical',
         ]);
diff --git a/packages/framework/tests/Feature/MetadataViewTest.php b/packages/framework/tests/Feature/MetadataViewTest.php
index a20a09827dd..6a1f28ecb65 100644
--- a/packages/framework/tests/Feature/MetadataViewTest.php
+++ b/packages/framework/tests/Feature/MetadataViewTest.php
@@ -25,7 +25,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        config(['site.url' => 'http://localhost']);
+        config(['hyde.url' => 'http://localhost']);
         config(['hyde.cache_busting' => false]);
     }
 
diff --git a/packages/framework/tests/Feature/RouteTest.php b/packages/framework/tests/Feature/RouteTest.php
index 57881397ad9..75454eb2602 100644
--- a/packages/framework/tests/Feature/RouteTest.php
+++ b/packages/framework/tests/Feature/RouteTest.php
@@ -124,7 +124,7 @@ public function test_get_link_returns_correct_path_for_nested_current_page()
 
     public function test_get_link_returns_pretty_url_if_enabled()
     {
-        config(['site.pretty_urls' => true]);
+        config(['hyde.pretty_urls' => true]);
         $route = new Route(new MarkdownPage('foo'));
         $this->assertEquals(Hyde::relativeLink($route->getOutputPath()), $route->getLink());
         $this->assertEquals('foo', $route->getLink());
diff --git a/packages/framework/tests/Feature/Services/BuildTaskServiceTest.php b/packages/framework/tests/Feature/Services/BuildTaskServiceTest.php
index 0c92e5cd707..13361479f05 100644
--- a/packages/framework/tests/Feature/Services/BuildTaskServiceTest.php
+++ b/packages/framework/tests/Feature/Services/BuildTaskServiceTest.php
@@ -27,7 +27,7 @@ class BuildTaskServiceTest extends TestCase
      */
     public function test_build_command_can_run_post_build_tasks()
     {
-        config(['site.url' => 'foo']);
+        config(['hyde.url' => 'foo']);
 
         $this->artisan('build')
             ->expectsOutputToContain('Generating sitemap')
diff --git a/packages/framework/tests/Feature/Services/DocumentationSearchServiceTest.php b/packages/framework/tests/Feature/Services/DocumentationSearchServiceTest.php
index 957b2889cbf..7d95a0f1adf 100644
--- a/packages/framework/tests/Feature/Services/DocumentationSearchServiceTest.php
+++ b/packages/framework/tests/Feature/Services/DocumentationSearchServiceTest.php
@@ -92,7 +92,7 @@ public function test_it_strips_markdown()
 
     public function test_get_destination_for_slug_returns_empty_string_for_index_when_pretty_url_is_enabled()
     {
-        config(['site.pretty_urls' => true]);
+        config(['hyde.pretty_urls' => true]);
         $this->file('_docs/index.md');
 
         $this->assertSame('',
@@ -102,7 +102,7 @@ public function test_get_destination_for_slug_returns_empty_string_for_index_whe
 
     public function test_get_destination_for_slug_returns_pretty_url_when_enabled()
     {
-        config(['site.pretty_urls' => true]);
+        config(['hyde.pretty_urls' => true]);
         $this->file('_docs/foo.md');
 
         $this->assertSame('foo',
diff --git a/packages/framework/tests/Feature/Services/RssFeedServiceTest.php b/packages/framework/tests/Feature/Services/RssFeedServiceTest.php
index d73a11f59f4..e2470d54cec 100644
--- a/packages/framework/tests/Feature/Services/RssFeedServiceTest.php
+++ b/packages/framework/tests/Feature/Services/RssFeedServiceTest.php
@@ -36,8 +36,8 @@ public function test_xml_element_has_channel_element()
 
     public function test_xml_channel_element_has_required_elements()
     {
-        config(['site.name' => 'Test Blog']);
-        config(['site.url' => 'https://example.com']);
+        config(['hyde.name' => 'Test Blog']);
+        config(['hyde.url' => 'https://example.com']);
 
         $service = new RssFeedGenerator();
         $this->assertObjectHasAttribute('title', $service->getXmlElement()->channel);
@@ -51,7 +51,7 @@ public function test_xml_channel_element_has_required_elements()
 
     public function test_xml_channel_element_has_additional_elements()
     {
-        config(['site.url' => 'https://example.com']);
+        config(['hyde.url' => 'https://example.com']);
 
         $service = new RssFeedGenerator();
         $this->assertObjectHasAttribute('link', $service->getXmlElement()->channel);
@@ -66,8 +66,8 @@ public function test_xml_channel_element_has_additional_elements()
 
     public function test_xml_channel_data_can_be_customized()
     {
-        config(['site.name' => 'Foo']);
-        config(['site.url' => 'https://blog.foo.com/bar']);
+        config(['hyde.name' => 'Foo']);
+        config(['hyde.url' => 'https://blog.foo.com/bar']);
         config(['hyde.rss_description' => 'Foo is a web log about stuff']);
 
         $service = new RssFeedGenerator();
@@ -94,7 +94,7 @@ public function test_markdown_blog_posts_are_added_to_rss_feed_through_autodisco
             MD
         );
 
-        config(['site.url' => 'https://example.com']);
+        config(['hyde.url' => 'https://example.com']);
 
         file_put_contents(Hyde::path('_media/rss-test.jpg'), 'statData'); // 8 bytes to test stat gets file length
 
@@ -132,21 +132,21 @@ public function test_generate_feed_helper_returns_xml_string()
 
     public function test_can_generate_feed_helper_returns_true_if_hyde_has_base_url()
     {
-        config(['site.url' => 'foo']);
+        config(['hyde.url' => 'foo']);
         $this->file('_posts/foo.md');
         $this->assertTrue(Features::rss());
     }
 
     public function test_can_generate_feed_helper_returns_false_if_hyde_does_not_have_base_url()
     {
-        config(['site.url' => '']);
+        config(['hyde.url' => '']);
         $this->file('_posts/foo.md');
         $this->assertFalse(Features::rss());
     }
 
     public function test_can_generate_feed_helper_returns_false_if_feeds_are_disabled_in_config()
     {
-        config(['site.url' => 'foo']);
+        config(['hyde.url' => 'foo']);
         config(['hyde.generate_rss_feed' => false]);
         $this->assertFalse(Features::rss());
     }
diff --git a/packages/framework/tests/Feature/Services/SitemapServiceTest.php b/packages/framework/tests/Feature/Services/SitemapServiceTest.php
index 5f4c4a0d5e2..3592f459199 100644
--- a/packages/framework/tests/Feature/Services/SitemapServiceTest.php
+++ b/packages/framework/tests/Feature/Services/SitemapServiceTest.php
@@ -96,8 +96,8 @@ public function test_generate_sitemap_shorthand_method_returns_xml_string()
 
     public function test_url_item_is_generated_correctly()
     {
-        config(['site.pretty_urls' => false]);
-        config(['site.url' => 'https://example.com']);
+        config(['hyde.pretty_urls' => false]);
+        config(['hyde.url' => 'https://example.com']);
         Hyde::touch('_pages/0-test.blade.php');
 
         $service = new SitemapGenerator();
@@ -113,8 +113,8 @@ public function test_url_item_is_generated_correctly()
 
     public function test_url_item_is_generated_with_pretty_urls_if_enabled()
     {
-        config(['site.pretty_urls' => true]);
-        config(['site.url' => 'https://example.com']);
+        config(['hyde.pretty_urls' => true]);
+        config(['hyde.url' => 'https://example.com']);
         Hyde::touch('_pages/0-test.blade.php');
 
         $service = new SitemapGenerator();
@@ -128,7 +128,7 @@ public function test_url_item_is_generated_with_pretty_urls_if_enabled()
 
     public function test_all_route_types_are_discovered()
     {
-        config(['site.url' => 'foo']);
+        config(['hyde.url' => 'foo']);
         Hyde::unlink(['_pages/index.blade.php', '_pages/404.blade.php']);
 
         $files = [
diff --git a/packages/framework/tests/Feature/Services/ValidationServiceTest.php b/packages/framework/tests/Feature/Services/ValidationServiceTest.php
index 5d65ea4872c..5b3b65f1510 100644
--- a/packages/framework/tests/Feature/Services/ValidationServiceTest.php
+++ b/packages/framework/tests/Feature/Services/ValidationServiceTest.php
@@ -119,13 +119,13 @@ public function test_check_site_has_an_app_css_stylesheet_can_fail()
 
     public function test_check_site_has_a_base_url_set_can_pass()
     {
-        config(['site.url' => 'https://example.com']);
+        config(['hyde.url' => 'https://example.com']);
         $this->test('check_site_has_a_base_url_set', 0);
     }
 
     public function test_check_site_has_a_base_url_set_can_fail()
     {
-        config(['site.url' => null]);
+        config(['hyde.url' => null]);
         $this->test('check_site_has_a_base_url_set', 2);
     }
 
diff --git a/packages/framework/tests/Feature/SiteTest.php b/packages/framework/tests/Feature/SiteTest.php
index 53e2ef4ba54..3d04d39a352 100644
--- a/packages/framework/tests/Feature/SiteTest.php
+++ b/packages/framework/tests/Feature/SiteTest.php
@@ -18,10 +18,10 @@ public function testUrl()
     {
         $this->assertSame('http://localhost', Site::url());
 
-        config(['site.url' => null]);
+        config(['hyde.url' => null]);
         $this->assertNull(Site::url());
 
-        config(['site.url' => 'https://example.com']);
+        config(['hyde.url' => 'https://example.com']);
         $this->assertSame('https://example.com', Site::url());
     }
 
@@ -29,10 +29,10 @@ public function testName()
     {
         $this->assertSame('HydePHP', Site::name());
 
-        config(['site.name' => null]);
+        config(['hyde.name' => null]);
         $this->assertNull(Site::name());
 
-        config(['site.name' => 'foo']);
+        config(['hyde.name' => 'foo']);
         $this->assertSame('foo', Site::name());
     }
 
@@ -40,10 +40,10 @@ public function testLanguage()
     {
         $this->assertSame('en', Site::language());
 
-        config(['site.language' => null]);
+        config(['hyde.language' => null]);
         $this->assertNull(Site::language());
 
-        config(['site.language' => 'foo']);
+        config(['hyde.language' => 'foo']);
         $this->assertSame('foo', Site::language());
     }
 
diff --git a/packages/framework/tests/Feature/StaticSiteServiceTest.php b/packages/framework/tests/Feature/StaticSiteServiceTest.php
index 815508bb6ad..bed8047793c 100644
--- a/packages/framework/tests/Feature/StaticSiteServiceTest.php
+++ b/packages/framework/tests/Feature/StaticSiteServiceTest.php
@@ -142,8 +142,8 @@ public function test_pretty_urls_option_output()
 
     public function test_sitemap_is_not_generated_when_conditions_are_not_met()
     {
-        config(['site.url' => '']);
-        config(['site.generate_sitemap' => false]);
+        config(['hyde.url' => '']);
+        config(['hyde.generate_sitemap' => false]);
 
         $this->artisan('build')
             ->doesntExpectOutput('Generating sitemap...')
@@ -152,8 +152,8 @@ public function test_sitemap_is_not_generated_when_conditions_are_not_met()
 
     public function test_sitemap_is_generated_when_conditions_are_met()
     {
-        config(['site.url' => 'https://example.com']);
-        config(['site.generate_sitemap' => true]);
+        config(['hyde.url' => 'https://example.com']);
+        config(['hyde.generate_sitemap' => true]);
 
         $this->artisan('build')
             // ->expectsOutput('Generating sitemap...')
@@ -163,7 +163,7 @@ public function test_sitemap_is_generated_when_conditions_are_met()
 
     public function test_rss_feed_is_not_generated_when_conditions_are_not_met()
     {
-        config(['site.url' => '']);
+        config(['hyde.url' => '']);
         config(['hyde.generate_rss_feed' => false]);
 
         $this->artisan('build')
@@ -173,7 +173,7 @@ public function test_rss_feed_is_not_generated_when_conditions_are_not_met()
 
     public function test_rss_feed_is_generated_when_conditions_are_met()
     {
-        config(['site.url' => 'https://example.com']);
+        config(['hyde.url' => 'https://example.com']);
         config(['hyde.generate_rss_feed' => true]);
 
         Hyde::touch('_posts/foo.md');
diff --git a/packages/framework/tests/Feature/YamlConfigurationServiceTest.php b/packages/framework/tests/Feature/YamlConfigurationServiceTest.php
index 4b47ee67f0c..a8e01edb8b5 100644
--- a/packages/framework/tests/Feature/YamlConfigurationServiceTest.php
+++ b/packages/framework/tests/Feature/YamlConfigurationServiceTest.php
@@ -17,30 +17,30 @@ class YamlConfigurationServiceTest extends TestCase
 {
     public function test_changes_in_yaml_file_override_changes_in_site_config()
     {
-        $this->assertEquals('HydePHP', Config::get('site.name'));
+        $this->assertEquals('HydePHP', Config::get('hyde.name'));
         $this->file('hyde.yml', 'name: Foo');
         YamlConfigurationService::boot();
-        $this->assertEquals('Foo', Config::get('site.name'));
+        $this->assertEquals('Foo', Config::get('hyde.name'));
     }
 
     public function test_changes_in_yaml_file_override_changes_in_site_config_when_using_yaml_extension()
     {
-        $this->assertEquals('HydePHP', Config::get('site.name'));
+        $this->assertEquals('HydePHP', Config::get('hyde.name'));
         $this->file('hyde.yaml', 'name: Foo');
         YamlConfigurationService::boot();
-        $this->assertEquals('Foo', Config::get('site.name'));
+        $this->assertEquals('Foo', Config::get('hyde.name'));
     }
 
     public function test_service_gracefully_handles_missing_file()
     {
         YamlConfigurationService::boot();
-        $this->assertEquals('HydePHP', Config::get('site.name'));
+        $this->assertEquals('HydePHP', Config::get('hyde.name'));
     }
 
     public function test_service_gracefully_handles_empty_file()
     {
         $this->file('hyde.yml', '');
         YamlConfigurationService::boot();
-        $this->assertEquals('HydePHP', Config::get('site.name'));
+        $this->assertEquals('HydePHP', Config::get('hyde.name'));
     }
 }
diff --git a/packages/framework/tests/Unit/BuildOutputDirectoryCanBeChangedTest.php b/packages/framework/tests/Unit/BuildOutputDirectoryCanBeChangedTest.php
index 0722d6b570e..6424d2c7751 100644
--- a/packages/framework/tests/Unit/BuildOutputDirectoryCanBeChangedTest.php
+++ b/packages/framework/tests/Unit/BuildOutputDirectoryCanBeChangedTest.php
@@ -59,7 +59,7 @@ public function test_site_output_directory_can_be_changed_in_configuration()
     {
         $this->assertEquals('_site', Site::getOutputDirectory());
 
-        config(['site.output_directory' => '_site/build']);
+        config(['hyde.output_directory' => '_site/build']);
         (new HydeServiceProvider($this->app))->register();
 
         $this->assertEquals('_site/build', Site::getOutputDirectory());
diff --git a/packages/framework/tests/Unit/Foundation/HyperlinkFileHelperRelativeLinkTest.php b/packages/framework/tests/Unit/Foundation/HyperlinkFileHelperRelativeLinkTest.php
index 05cf2ea7271..9b1da8084ee 100644
--- a/packages/framework/tests/Unit/Foundation/HyperlinkFileHelperRelativeLinkTest.php
+++ b/packages/framework/tests/Unit/Foundation/HyperlinkFileHelperRelativeLinkTest.php
@@ -65,28 +65,28 @@ public function test_helper_handles_different_file_extensions()
 
     public function test_helper_returns_pretty_url_if_enabled_and_destination_is_a_html_file()
     {
-        config(['site.pretty_urls' => true]);
+        config(['hyde.pretty_urls' => true]);
         $this->mockCurrentPage('foo/bar.html');
         $this->assertEquals('../foo', Hyde::relativeLink('foo.html'));
     }
 
     public function test_helper_method_does_not_require_current_path_to_be_html_to_use_pretty_urls()
     {
-        config(['site.pretty_urls' => true]);
+        config(['hyde.pretty_urls' => true]);
         $this->mockCurrentPage('foo/bar');
         $this->assertEquals('../foo', Hyde::relativeLink('foo.html'));
     }
 
     public function test_helper_returns_does_not_return_pretty_url_if_when_enabled_but_and_destination_is_not_a_html_file()
     {
-        config(['site.pretty_urls' => true]);
+        config(['hyde.pretty_urls' => true]);
         $this->mockCurrentPage('foo/bar.html');
         $this->assertEquals('../foo.png', Hyde::relativeLink('foo.png'));
     }
 
     public function test_helper_rewrites_index_when_using_pretty_urls()
     {
-        config(['site.pretty_urls' => true]);
+        config(['hyde.pretty_urls' => true]);
         $this->mockCurrentPage('foo.html');
         $this->assertEquals('/', Hyde::relativeLink('index.html'));
         $this->mockCurrentPage('foo/bar.html');
@@ -97,7 +97,7 @@ public function test_helper_rewrites_index_when_using_pretty_urls()
 
     public function test_helper_does_not_rewrite_index_when_not_using_pretty_urls()
     {
-        config(['site.pretty_urls' => false]);
+        config(['hyde.pretty_urls' => false]);
         $this->mockCurrentPage('foo.html');
         $this->assertEquals('index.html', Hyde::relativeLink('index.html'));
         $this->mockCurrentPage('foo/bar.html');
@@ -108,7 +108,7 @@ public function test_helper_does_not_rewrite_index_when_not_using_pretty_urls()
 
     public function test_helper_rewrites_documentation_page_index_when_using_pretty_urls()
     {
-        config(['site.pretty_urls' => true]);
+        config(['hyde.pretty_urls' => true]);
         $this->mockCurrentPage('foo.html');
         $this->assertEquals('docs/', Hyde::relativeLink('docs/index.html'));
         $this->mockCurrentPage('docs.html');
@@ -121,7 +121,7 @@ public function test_helper_rewrites_documentation_page_index_when_using_pretty_
 
     public function test_helper_does_not_rewrite_documentation_page_index_when_not_using_pretty_urls()
     {
-        config(['site.pretty_urls' => false]);
+        config(['hyde.pretty_urls' => false]);
         $this->mockCurrentPage('foo.html');
         $this->assertEquals('docs/index.html', Hyde::relativeLink('docs/index.html'));
         $this->mockCurrentPage('docs.html');
diff --git a/packages/framework/tests/Unit/Foundation/HyperlinkFormatHtmlPathTest.php b/packages/framework/tests/Unit/Foundation/HyperlinkFormatHtmlPathTest.php
index 603213f288a..ddb8e99e3d1 100644
--- a/packages/framework/tests/Unit/Foundation/HyperlinkFormatHtmlPathTest.php
+++ b/packages/framework/tests/Unit/Foundation/HyperlinkFormatHtmlPathTest.php
@@ -14,82 +14,82 @@ class HyperlinkFormatHtmlPathTest extends TestCase
 {
     public function test_helper_returns_string_as_is_if_pretty_urls_is_not_true()
     {
-        config(['site.pretty_urls' => false]);
+        config(['hyde.pretty_urls' => false]);
 
         $this->assertEquals('foo/bar.html', Hyde::formatLink('foo/bar.html'));
     }
 
     public function test_helper_returns_pretty_url_if_pretty_urls_is_true()
     {
-        config(['site.pretty_urls' => true]);
+        config(['hyde.pretty_urls' => true]);
 
         $this->assertEquals('foo/bar', Hyde::formatLink('foo/bar.html'));
     }
 
     public function test_non_pretty_urls_is_default_value_when_config_is_not_set()
     {
-        config(['site.pretty_urls' => null]);
+        config(['hyde.pretty_urls' => null]);
 
         $this->assertEquals('foo/bar.html', Hyde::formatLink('foo/bar.html'));
     }
 
     public function test_helper_respects_absolute_urls()
     {
-        config(['site.pretty_urls' => false]);
+        config(['hyde.pretty_urls' => false]);
         $this->assertEquals('/foo/bar.html', Hyde::formatLink('/foo/bar.html'));
     }
 
     public function test_helper_respects_pretty_absolute_urls()
     {
-        config(['site.pretty_urls' => true]);
+        config(['hyde.pretty_urls' => true]);
         $this->assertEquals('/foo/bar', Hyde::formatLink('/foo/bar.html'));
     }
 
     public function test_helper_respects_relative_urls()
     {
-        config(['site.pretty_urls' => false]);
+        config(['hyde.pretty_urls' => false]);
         $this->assertEquals('../foo/bar.html', Hyde::formatLink('../foo/bar.html'));
     }
 
     public function test_helper_respects_pretty_relative_urls()
     {
-        config(['site.pretty_urls' => true]);
+        config(['hyde.pretty_urls' => true]);
         $this->assertEquals('../foo/bar', Hyde::formatLink('../foo/bar.html'));
     }
 
     public function test_non_html_links_are_not_modified()
     {
-        config(['site.pretty_urls' => true]);
+        config(['hyde.pretty_urls' => true]);
         $this->assertEquals('/foo/bar.jpg', Hyde::formatLink('/foo/bar.jpg'));
     }
 
     public function test_helper_respects_absolute_urls_with_pretty_urls_enabled()
     {
-        config(['site.pretty_urls' => true]);
+        config(['hyde.pretty_urls' => true]);
         $this->assertEquals('/foo/bar.jpg', Hyde::formatLink('/foo/bar.jpg'));
     }
 
     public function test_helper_rewrites_index_when_using_pretty_urls()
     {
-        config(['site.pretty_urls' => true]);
+        config(['hyde.pretty_urls' => true]);
         $this->assertEquals('/', Hyde::formatLink('index.html'));
     }
 
     public function test_helper_does_not_rewrite_index_when_not_using_pretty_urls()
     {
-        config(['site.pretty_urls' => false]);
+        config(['hyde.pretty_urls' => false]);
         $this->assertEquals('index.html', Hyde::formatLink('index.html'));
     }
 
     public function test_helper_rewrites_documentation_page_index_when_using_pretty_urls()
     {
-        config(['site.pretty_urls' => true]);
+        config(['hyde.pretty_urls' => true]);
         $this->assertEquals('docs/', Hyde::formatLink('docs/index.html'));
     }
 
     public function test_helper_does_not_rewrite_documentation_page_index_when_not_using_pretty_urls()
     {
-        config(['site.pretty_urls' => false]);
+        config(['hyde.pretty_urls' => false]);
         $this->assertEquals('docs/index.html', Hyde::formatLink('docs/index.html'));
     }
 }
diff --git a/packages/framework/tests/Unit/Foundation/HyperlinksUrlPathHelpersTest.php b/packages/framework/tests/Unit/Foundation/HyperlinksUrlPathHelpersTest.php
index 45930b82837..e54742a6024 100644
--- a/packages/framework/tests/Unit/Foundation/HyperlinksUrlPathHelpersTest.php
+++ b/packages/framework/tests/Unit/Foundation/HyperlinksUrlPathHelpersTest.php
@@ -27,43 +27,43 @@ protected function setUp(): void
 
     public function test_has_site_url_returns_false_when_no_site_url_is_set()
     {
-        config(['site.url' => null]);
+        config(['hyde.url' => null]);
         $this->assertFalse($this->class->hasSiteUrl());
     }
 
     public function test_has_site_url_returns_true_when_site_url_is_set()
     {
-        config(['site.url' => 'https://example.com']);
+        config(['hyde.url' => 'https://example.com']);
         $this->assertTrue($this->class->hasSiteUrl());
     }
 
     public function test_qualified_url_returns_site_url_when_no_path_is_given()
     {
-        config(['site.url' => 'https://example.com']);
+        config(['hyde.url' => 'https://example.com']);
         $this->assertEquals('https://example.com', $this->class->url());
     }
 
     public function test_qualified_url_returns_site_url_plus_given_path()
     {
-        config(['site.url' => 'https://example.com']);
+        config(['hyde.url' => 'https://example.com']);
         $this->assertEquals('https://example.com/path', $this->class->url('path'));
     }
 
     public function test_qualified_url_returns_site_url_plus_given_path_with_extension()
     {
-        config(['site.url' => 'https://example.com']);
+        config(['hyde.url' => 'https://example.com']);
         $this->assertEquals('https://example.com/path.html', $this->class->url('path.html'));
     }
 
     public function test_qualified_url_returns_site_url_plus_given_path_with_extension_and_query_string()
     {
-        config(['site.url' => 'https://example.com']);
+        config(['hyde.url' => 'https://example.com']);
         $this->assertEquals('https://example.com/path.html?query=string', $this->class->url('path.html?query=string'));
     }
 
     public function test_qualified_url_trims_trailing_slashes()
     {
-        config(['site.url' => 'https://example.com/']);
+        config(['hyde.url' => 'https://example.com/']);
         $this->assertEquals('https://example.com', $this->class->url());
         $this->assertEquals('https://example.com', $this->class->url('/'));
         $this->assertEquals('https://example.com/foo', $this->class->url('/foo/'));
@@ -71,13 +71,13 @@ public function test_qualified_url_trims_trailing_slashes()
 
     public function test_qualified_url_accepts_multiple_schemes()
     {
-        config(['site.url' => 'http://example.com']);
+        config(['hyde.url' => 'http://example.com']);
         $this->assertEquals('http://example.com', $this->class->url());
     }
 
     public function test_qualified_url_throws_exception_when_no_site_url_is_set()
     {
-        config(['site.url' => null]);
+        config(['hyde.url' => null]);
         $this->expectException(BaseUrlNotSetException::class);
         $this->expectExceptionMessage('No site URL has been set in config (or .env).');
         $this->class->url();
@@ -85,13 +85,13 @@ public function test_qualified_url_throws_exception_when_no_site_url_is_set()
 
     public function test_helper_returns_expected_string_when_site_url_is_set()
     {
-        config(['site.url' => 'https://example.com']);
+        config(['hyde.url' => 'https://example.com']);
         $this->assertEquals('https://example.com/foo/bar.html', $this->class->url('foo/bar.html'));
     }
 
     public function test_helper_returns_expected_string_when_pretty_urls_are_enabled()
     {
-        config(['site.url' => 'https://example.com', 'site.pretty_urls' => true]);
+        config(['hyde.url' => 'https://example.com', 'hyde.pretty_urls' => true]);
         $this->assertEquals('https://example.com', $this->class->url('index.html'));
         $this->assertEquals('https://example.com/foo', $this->class->url('foo.html'));
         $this->assertEquals('https://example.com/docs', $this->class->url('docs/index.html'));
diff --git a/packages/framework/tests/Unit/Pages/MarkdownPostHelpersTest.php b/packages/framework/tests/Unit/Pages/MarkdownPostHelpersTest.php
index 0794b9aabda..fa4101f429f 100644
--- a/packages/framework/tests/Unit/Pages/MarkdownPostHelpersTest.php
+++ b/packages/framework/tests/Unit/Pages/MarkdownPostHelpersTest.php
@@ -20,14 +20,14 @@ public function test_get_current_page_path_returns_local_uri_path_for_post_slug(
 
     public function test_get_canonical_link_returns_canonical_uri_path_for_post_slug()
     {
-        config(['site.url' => 'https://example.com']);
+        config(['hyde.url' => 'https://example.com']);
         $post = new MarkdownPost('foo-bar');
         $this->assertEquals('https://example.com/posts/foo-bar.html', $post->canonicalUrl);
     }
 
     public function test_get_canonical_link_returns_pretty_url_when_enabled()
     {
-        config(['site.url' => 'https://example.com', 'site.pretty_urls' => true]);
+        config(['hyde.url' => 'https://example.com', 'hyde.pretty_urls' => true]);
         $post = new MarkdownPost('foo-bar');
         $this->assertEquals('https://example.com/posts/foo-bar', $post->canonicalUrl);
     }
diff --git a/packages/framework/tests/Unit/TestBuildStaticSiteCommandFlagToEnablePrettyUrlsTest.php b/packages/framework/tests/Unit/TestBuildStaticSiteCommandFlagToEnablePrettyUrlsTest.php
index d4e1e4984e4..ea6231665cc 100644
--- a/packages/framework/tests/Unit/TestBuildStaticSiteCommandFlagToEnablePrettyUrlsTest.php
+++ b/packages/framework/tests/Unit/TestBuildStaticSiteCommandFlagToEnablePrettyUrlsTest.php
@@ -15,19 +15,19 @@ class TestBuildStaticSiteCommandFlagToEnablePrettyUrlsTest extends TestCase
 {
     public function test_pretty_urls_can_be_enabled_with_flag()
     {
-        config(['site.pretty_urls' => false]);
+        config(['hyde.pretty_urls' => false]);
 
         $this->artisan('build --pretty-urls')
             ->expectsOutput('Generating site with pretty URLs')
             ->assertExitCode(0);
 
-        $this->assertTrue(config('site.pretty_urls', false));
+        $this->assertTrue(config('hyde.pretty_urls', false));
 
         File::cleanDirectory(Hyde::path('_site'));
     }
 
     public function test_config_change_is_not_persisted()
     {
-        $this->assertFalse(config('site.pretty_urls', false));
+        $this->assertFalse(config('hyde.pretty_urls', false));
     }
 }
diff --git a/packages/framework/tests/Unit/Views/NavigationBrandViewTest.php b/packages/framework/tests/Unit/Views/NavigationBrandViewTest.php
index 8a88f5417c9..98a52e424b2 100644
--- a/packages/framework/tests/Unit/Views/NavigationBrandViewTest.php
+++ b/packages/framework/tests/Unit/Views/NavigationBrandViewTest.php
@@ -34,7 +34,7 @@ public function test_component_links_to_home_route()
     public function test_component_uses_site_name()
     {
         $this->assertStringContainsString('HydePHP', $this->render());
-        config(['site.name' => 'foo']);
+        config(['hyde.name' => 'foo']);
         $this->assertStringContainsString('foo', $this->render());
     }
 }
diff --git a/packages/realtime-compiler/src/Http/DashboardController.php b/packages/realtime-compiler/src/Http/DashboardController.php
index 13ac6bd93c0..b2b3533d608 100644
--- a/packages/realtime-compiler/src/Http/DashboardController.php
+++ b/packages/realtime-compiler/src/Http/DashboardController.php
@@ -28,7 +28,7 @@ class DashboardController
 
     public function __construct()
     {
-        $this->title = config('site.name').' - Dashboard';
+        $this->title = config('hyde.name').' - Dashboard';
     }
 
     public function show(): string
diff --git a/packages/ui-kit/docs/components-demo.blade.php b/packages/ui-kit/docs/components-demo.blade.php
index 793e452c91d..b37d1fb2c22 100644
--- a/packages/ui-kit/docs/components-demo.blade.php
+++ b/packages/ui-kit/docs/components-demo.blade.php
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="{{ config('site.language', 'en') }}">
+<html lang="{{ config('hyde.language', 'en') }}">
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 3696acc01c3..919e4842a7c 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -363,9 +363,9 @@
       <code>?string</code>
     </MixedInferredReturnType>
     <MixedReturnStatement occurrences="3">
-      <code>config('site.language')</code>
-      <code>config('site.name')</code>
-      <code>config('site.url')</code>
+      <code>config('hyde.language')</code>
+      <code>config('hyde.name')</code>
+      <code>config('hyde.url')</code>
     </MixedReturnStatement>
   </file>
   <file src="packages/framework/src/Foundation/Application.php">
@@ -449,7 +449,7 @@
   </file>
   <file src="packages/framework/src/Foundation/Hyperlinks.php">
     <PossiblyInvalidCast occurrences="1">
-      <code>config('site.url')</code>
+      <code>config('hyde.url')</code>
     </PossiblyInvalidCast>
   </file>
   <file src="packages/framework/src/Foundation/PageCollection.php">
@@ -972,7 +972,7 @@
     <MixedArgument occurrences="3">
       <code>$channel</code>
       <code>$item</code>
-      <code>config('site.language', 'en')</code>
+      <code>config('hyde.language', 'en')</code>
     </MixedArgument>
     <MixedArgumentTypeCoercion occurrences="1">
       <code>each</code>
@@ -998,7 +998,7 @@
       <code>config('hyde.rss_filename', 'feed.xml')</code>
     </MixedReturnStatement>
     <PossiblyInvalidCast occurrences="1">
-      <code>config('site.language', 'en')</code>
+      <code>config('hyde.language', 'en')</code>
     </PossiblyInvalidCast>
     <PossiblyNullArgument occurrences="3">
       <code>$post-&gt;description</code>
@@ -1029,11 +1029,11 @@
     </DeprecatedMethod>
     <MixedArgument occurrences="2">
       <code>config('hyde.source_root', '')</code>
-      <code>config('site.output_directory', '_site')</code>
+      <code>config('hyde.output_directory', '_site')</code>
     </MixedArgument>
     <PossiblyInvalidCast occurrences="2">
       <code>config('hyde.source_root', '')</code>
-      <code>config('site.output_directory', '_site')</code>
+      <code>config('hyde.output_directory', '_site')</code>
     </PossiblyInvalidCast>
   </file>
   <file src="packages/framework/src/Framework/Services/BuildService.php">
@@ -1162,7 +1162,7 @@
   </file>
   <file src="packages/framework/src/Framework/Services/YamlConfigurationService.php">
     <MixedArgument occurrences="1">
-      <code>Config::get('site', [])</code>
+      <code>Config::get('hyde', [])</code>
     </MixedArgument>
     <MixedAssignment occurrences="1">
       <code>$yaml</code>
@@ -1312,7 +1312,7 @@
       <code>string</code>
     </MixedInferredReturnType>
     <MixedOperand occurrences="1">
-      <code>config('site.name', 'HydePHP')</code>
+      <code>config('hyde.name', 'HydePHP')</code>
     </MixedOperand>
     <MixedReturnStatement occurrences="3">
       <code>$this-&gt;navigation['group']</code>