diff --git a/app/core/Maintenance.php b/app/core/Maintenance.php
index badeaab..ea7ef5a 100644
--- a/app/core/Maintenance.php
+++ b/app/core/Maintenance.php
@@ -11,7 +11,7 @@ class Maintenance
 
     public static function isEnabled(): bool
     {
-        if (getenv('JILO_MAINTENANCE') === '1') {
+        if (getenv('APP_MAINTENANCE') === '1') {
             return true;
         }
         // Prefer DB settings if available in the current request
@@ -75,7 +75,7 @@ class Maintenance
         if (!self::isEnabled()) {
             return '';
         }
-        $envMsg = getenv('JILO_MAINTENANCE_MESSAGE');
+        $envMsg = getenv('APP_MAINTENANCE_MESSAGE');
         if ($envMsg) {
             return trim($envMsg);
         }
diff --git a/app/templates/page-menu.php b/app/templates/page-menu.php
index 3a358d8..0984e45 100644
--- a/app/templates/page-menu.php
+++ b/app/templates/page-menu.php
@@ -36,7 +36,7 @@ if (is_array($navSettingsDotsPayload)) {
                 <div class="logo-section">
                     <a href="<?= htmlspecialchars($app_root) ?>?platform=<?= htmlspecialchars($platform_id) ?>" class="modern-logo-link">
                         <div class="modern-logo">
-                            <img src="<?= htmlspecialchars($app_root) ?>static/jilo-logo.png" alt="<?= htmlspecialchars($config['site_name']); ?>"/>
+                            <img src="<?= htmlspecialchars($app_root) ?>static/logo.png" alt="<?= htmlspecialchars($config['site_name']); ?>"/>
                         </div>
                         <div class="brand-info">
                             <h1 class="brand-name"><?= htmlspecialchars($config['site_name']); ?></h1>
diff --git a/doc/database/README.md b/doc/database/README.md
index c341c40..4a37600 100644
--- a/doc/database/README.md
+++ b/doc/database/README.md
@@ -53,8 +53,8 @@ Notes:
 
 - The maintenance flag is stored at `app/.maintenance.flag`.
 - You can also control maintenance via environment variables (useful when the filesystem is read-only):
-  - `JILO_MAINTENANCE=1` enables maintenance mode
-  - `JILO_MAINTENANCE_MESSAGE="Your message"` sets the banner message
+  - `APP_MAINTENANCE=1` enables maintenance mode
+  - `APP_MAINTENANCE_MESSAGE="Your message"` sets the banner message
 
 ## Authoring new migrations
 
diff --git a/public_html/index.php b/public_html/index.php
index add611a..d87dc59 100644
--- a/public_html/index.php
+++ b/public_html/index.php
@@ -40,13 +40,6 @@ $config = ConfigLoader::loadConfig([
     '/opt/jilo-web/jilo-web.conf.php',
 ]);
 
-// Ensure we have value for site name
-$siteName = trim((string)($config['site_name'] ?? ''));
-if ($siteName === '') {
-    $siteName = 'Website';
-}
-$config['site_name'] = $siteName;
-
 // Make config available globally
 $GLOBALS['config'] = $config; // FIXME we use old globals and includes before migrating fully to App\App
 App::set('config', $config);
diff --git a/public_html/static/jilo-logo.png b/public_html/static/logo.png
similarity index 100%
rename from public_html/static/jilo-logo.png
rename to public_html/static/logo.png