diff --git a/core/Console/Support/CliAppBootstrap.php b/core/Console/Support/CliAppBootstrap.php
index f347545..8048f1f 100644
--- a/core/Console/Support/CliAppBootstrap.php
+++ b/core/Console/Support/CliAppBootstrap.php
@@ -30,10 +30,10 @@ final class CliAppBootstrap
 
             require_once $projectRoot . '/vendor/autoload.php';
             require_once $projectRoot . '/config/config.php';
-            require_once $projectRoot . '/lib/Support/helpers.php';
+            require_once $projectRoot . '/core/Support/helpers.php';
 
             /** @var AppContainer $container */
-            $container = require $projectRoot . '/lib/App/registerContainer.php';
+            $container = require $projectRoot . '/core/App/registerContainer.php';
             setAppContainer($container);
 
             self::$container = $container;
diff --git a/core/Console/Support/ModuleCliRuntime.php b/core/Console/Support/ModuleCliRuntime.php
index ed10fa7..a01a0aa 100644
--- a/core/Console/Support/ModuleCliRuntime.php
+++ b/core/Console/Support/ModuleCliRuntime.php
@@ -30,9 +30,9 @@ final class ModuleCliRuntime
 
         require_once $projectRoot . '/vendor/autoload.php';
         require_once $projectRoot . '/config/config.php';
-        require_once $projectRoot . '/lib/Support/helpers.php';
+        require_once $projectRoot . '/core/Support/helpers.php';
 
-        $container = require $projectRoot . '/lib/App/registerContainer.php';
+        $container = require $projectRoot . '/core/App/registerContainer.php';
         setAppContainer($container);
 
         self::$booted = true;
diff --git a/docs/explanation-architektur.md b/docs/explanation-architektur.md
index 6301bd5..8ede343 100644
--- a/docs/explanation-architektur.md
+++ b/docs/explanation-architektur.md
@@ -131,7 +131,7 @@ Struktur-Gates zusätzlich:
 ```bash
 (rg 'new\s+[^\s(]+Factory\(' core/Service || true) | wc -l
 (rg --glob '!**/*Factory.php' 'new\s+[^\s(]+(Service|Gateway|Repository)\(' core/Service || true) | wc -l
-(rg "\b(accessServicesFactory|directoryServicesFactory|userServicesFactory|authServicesFactory|tenantServicesFactory|settingServicesFactory|userRepositoryFactory|authRepositoryFactory|authGatewayFactory)\(" pages lib templates web || true) | wc -l
+(rg "\b(accessServicesFactory|directoryServicesFactory|userServicesFactory|authServicesFactory|tenantServicesFactory|settingServicesFactory|userRepositoryFactory|authRepositoryFactory|authGatewayFactory)\(" pages core templates web || true) | wc -l
 (rg -n 'new\s+[^\s(]+(Service|Gateway|Repository)\(' pages -g '*.php' || true) | wc -l
 (rg -n '\bDB::' pages -g '*.php' || true) | wc -l
 (rg -n 'app\([^\n]*Factory::class\)->create' pages/admin -g '*.php' || true) | wc -l
diff --git a/tests/Architecture/AddressBookModuleIsolationContractTest.php b/tests/Architecture/AddressBookModuleIsolationContractTest.php
index ba0ff32..93682ef 100644
--- a/tests/Architecture/AddressBookModuleIsolationContractTest.php
+++ b/tests/Architecture/AddressBookModuleIsolationContractTest.php
@@ -70,7 +70,7 @@ final class AddressBookModuleIsolationContractTest extends TestCase
         $coreServiceDir = dirname(__DIR__, 2) . '/core/Service/AddressBook';
         self::assertDirectoryDoesNotExist(
             $coreServiceDir,
-            'Addressbook service classes should live in modules/addressbook/lib, not in Core lib/Service'
+            'Addressbook service classes should live in modules/addressbook/lib, not in core/Service'
         );
     }
 }
diff --git a/tests/Architecture/AuditModuleIsolationContractTest.php b/tests/Architecture/AuditModuleIsolationContractTest.php
index adb7dfe..db5cc41 100644
--- a/tests/Architecture/AuditModuleIsolationContractTest.php
+++ b/tests/Architecture/AuditModuleIsolationContractTest.php
@@ -46,7 +46,7 @@ final class AuditModuleIsolationContractTest extends TestCase
         $root = dirname(__DIR__, 2);
         self::assertDirectoryDoesNotExist(
             $root . '/core/Repository/Audit',
-            'Audit repository classes should live in modules/audit/lib, not in Core core/Repository/Audit'
+            'Audit repository classes should live in modules/audit/lib, not in core/Repository/Audit'
         );
     }
 
@@ -63,7 +63,7 @@ final class AuditModuleIsolationContractTest extends TestCase
         self::assertSame(
             [],
             array_values($auditFiles),
-            'Core lib/Domain/Taxonomy/ still contains audit enum files: ' . implode(', ', $auditFiles)
+            'core/Domain/Taxonomy/ still contains audit enum files: ' . implode(', ', $auditFiles)
         );
     }
 
@@ -91,7 +91,7 @@ final class AuditModuleIsolationContractTest extends TestCase
         $root = dirname(__DIR__, 2);
         self::assertFileDoesNotExist(
             $root . '/core/Http/ApiSystemAuditReporter.php',
-            'ApiSystemAuditReporter should live in modules/audit/lib, not in Core lib/Http'
+            'ApiSystemAuditReporter should live in modules/audit/lib, not in core/Http'
         );
     }
 
diff --git a/tests/Architecture/BookmarksModuleIsolationContractTest.php b/tests/Architecture/BookmarksModuleIsolationContractTest.php
index 09b45b6..a91fc20 100644
--- a/tests/Architecture/BookmarksModuleIsolationContractTest.php
+++ b/tests/Architecture/BookmarksModuleIsolationContractTest.php
@@ -43,7 +43,7 @@ final class BookmarksModuleIsolationContractTest extends TestCase
         $root = dirname(__DIR__, 2);
         self::assertDirectoryDoesNotExist(
             $root . '/core/Service/Bookmark',
-            'Bookmark service classes should live in modules/bookmarks/lib, not in Core lib/Service'
+            'Bookmark service classes should live in modules/bookmarks/lib, not in core/Service'
         );
     }
 
@@ -70,7 +70,7 @@ final class BookmarksModuleIsolationContractTest extends TestCase
         $root = dirname(__DIR__, 2);
         self::assertFileDoesNotExist(
             $root . '/core/Support/BookmarkUrlNormalizer.php',
-            'BookmarkUrlNormalizer should live in modules/bookmarks/lib, not in Core lib/Support'
+            'BookmarkUrlNormalizer should live in modules/bookmarks/lib, not in core/Support'
         );
     }
 
diff --git a/tests/Architecture/CoreStarterkitContractTest.php b/tests/Architecture/CoreStarterkitContractTest.php
index baf1e12..09f3ce4 100644
--- a/tests/Architecture/CoreStarterkitContractTest.php
+++ b/tests/Architecture/CoreStarterkitContractTest.php
@@ -64,7 +64,7 @@ class CoreStarterkitContractTest extends TestCase
 
         foreach ($patterns as $pattern => $label) {
             $violations = $this->findPatternMatchesInPhpFiles('core/Service', $pattern);
-            $this->assertSame([], $violations, "Superglobal {$label} usage found in lib/Service/:\n" . implode("\n", $violations));
+            $this->assertSame([], $violations, "Superglobal {$label} usage found in core/Service/:\n" . implode("\n", $violations));
         }
     }
 
diff --git a/tests/Architecture/SecurityCryptoContractTest.php b/tests/Architecture/SecurityCryptoContractTest.php
index ea673c7..e69e6c5 100644
--- a/tests/Architecture/SecurityCryptoContractTest.php
+++ b/tests/Architecture/SecurityCryptoContractTest.php
@@ -5,7 +5,7 @@ namespace MintyPHP\Tests\Architecture;
 use PHPUnit\Framework\TestCase;
 
 /**
- * GR-SEC-005: All encryption/decryption MUST use lib/Support/Crypto.php.
+ * GR-SEC-005: All encryption/decryption MUST use core/Support/Crypto.php.
  * No raw openssl_encrypt/decrypt calls outside that single file.
  */
 class SecurityCryptoContractTest extends TestCase
diff --git a/tests/Http/ErrorHandlerTest.php b/tests/Http/ErrorHandlerTest.php
index e9871c9..5f37294 100644
--- a/tests/Http/ErrorHandlerTest.php
+++ b/tests/Http/ErrorHandlerTest.php
@@ -124,6 +124,6 @@ class ErrorHandlerTest extends TestCase
         putenv('APP_VENDOR_PHP_ISSUES_MODE=suppress_deprecations_warnings');
 
         $this->expectException(\ErrorException::class);
-        ErrorHandler::handleError(E_WARNING, 'warning', '/var/www/lib/Http/ErrorHandler.php', 69);
+        ErrorHandler::handleError(E_WARNING, 'warning', '/var/www/core/Http/ErrorHandler.php', 69);
     }
 }