diff --git a/README.md b/README.md
index 3369243f..94001f1c 100644
--- a/README.md
+++ b/README.md
@@ -84,7 +84,7 @@ require_once __DIR__ . '/vendor/autoload.php';
 use Mcp\Server;
 use Mcp\Server\Transport\StdioTransport;
 
-Server::make()
+Server::builder()
     ->setServerInfo('Stdio Calculator', '1.1.0', 'Basic Calculator over STDIO transport.')
     ->setDiscovery(__DIR__, ['.'])
     ->build()
diff --git a/docs/discovery-caching.md b/docs/discovery-caching.md
index 423fdc09..9f100822 100644
--- a/docs/discovery-caching.md
+++ b/docs/discovery-caching.md
@@ -19,7 +19,7 @@ use Mcp\Server;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
 use Symfony\Component\Cache\Psr16Cache;
 
-$server = Server::make()
+$server = Server::builder()
     ->setServerInfo('My Server', '1.0.0')
     ->setDiscovery(__DIR__, ['.'], [], new Psr16Cache(new ArrayAdapter())) // Enable caching
     ->build();
@@ -67,7 +67,7 @@ $cache = DoctrineProvider::wrap(new ArrayCache());
 // Use in-memory cache for fast development cycles
 $cache = new Psr16Cache(new ArrayAdapter());
 
-$server = Server::make()
+$server = Server::builder()
     ->setDiscovery(__DIR__, ['.'], [], $cache)
     ->build();
 ```
@@ -78,7 +78,7 @@ $server = Server::make()
 // Use persistent cache
 $cache = new Psr16Cache(new FilesystemAdapter('mcp-discovery', 0, '/var/cache'));
 
-$server = Server::make()
+$server = Server::builder()
     ->setDiscovery(__DIR__, ['.'], [], $cache)
     ->build();
 ```
diff --git a/examples/01-discovery-stdio-calculator/server.php b/examples/01-discovery-stdio-calculator/server.php
index 4bff8b8b..1c5be71d 100644
--- a/examples/01-discovery-stdio-calculator/server.php
+++ b/examples/01-discovery-stdio-calculator/server.php
@@ -18,7 +18,7 @@
 
 logger()->info('Starting MCP Stdio Calculator Server...');
 
-$server = Server::make()
+$server = Server::builder()
     ->setServerInfo('Stdio Calculator', '1.1.0', 'Basic Calculator over STDIO transport.')
     ->setContainer(container())
     ->setLogger(logger())
diff --git a/examples/02-discovery-http-userprofile/server.php b/examples/02-discovery-http-userprofile/server.php
index ce3ac347..b1cba000 100644
--- a/examples/02-discovery-http-userprofile/server.php
+++ b/examples/02-discovery-http-userprofile/server.php
@@ -25,7 +25,7 @@
 
 $request = $creator->fromGlobals();
 
-$server = Server::make()
+$server = Server::builder()
     ->setServerInfo('HTTP User Profiles', '1.0.0')
     ->setLogger(logger())
     ->setContainer(container())
diff --git a/examples/03-manual-registration-stdio/server.php b/examples/03-manual-registration-stdio/server.php
index 9b83d82e..8b717658 100644
--- a/examples/03-manual-registration-stdio/server.php
+++ b/examples/03-manual-registration-stdio/server.php
@@ -19,7 +19,7 @@
 
 logger()->info('Starting MCP Manual Registration (Stdio) Server...');
 
-$server = Server::make()
+$server = Server::builder()
     ->setServerInfo('Manual Reg Server', '1.0.0')
     ->setLogger(logger())
     ->setContainer(container())
diff --git a/examples/04-combined-registration-http/server.php b/examples/04-combined-registration-http/server.php
index 69225020..b78c680c 100644
--- a/examples/04-combined-registration-http/server.php
+++ b/examples/04-combined-registration-http/server.php
@@ -26,7 +26,7 @@
 
 $request = $creator->fromGlobals();
 
-$server = Server::make()
+$server = Server::builder()
     ->setServerInfo('Combined HTTP Server', '1.0.0')
     ->setLogger(logger())
     ->setContainer(container())
diff --git a/examples/05-stdio-env-variables/server.php b/examples/05-stdio-env-variables/server.php
index af159f40..08848bba 100644
--- a/examples/05-stdio-env-variables/server.php
+++ b/examples/05-stdio-env-variables/server.php
@@ -49,7 +49,7 @@
 
 logger()->info('Starting MCP Stdio Environment Variable Example Server...');
 
-$server = Server::make()
+$server = Server::builder()
     ->setServerInfo('Env Var Server', '1.0.0')
     ->setLogger(logger())
     ->setDiscovery(__DIR__, ['.'])
diff --git a/examples/06-custom-dependencies-stdio/server.php b/examples/06-custom-dependencies-stdio/server.php
index ac85d0ac..42d5b053 100644
--- a/examples/06-custom-dependencies-stdio/server.php
+++ b/examples/06-custom-dependencies-stdio/server.php
@@ -30,7 +30,7 @@
 $statsService = new SystemStatsService($taskRepo);
 $container->set(StatsServiceInterface::class, $statsService);
 
-$server = Server::make()
+$server = Server::builder()
     ->setServerInfo('Task Manager Server', '1.0.0')
     ->setLogger(logger())
     ->setContainer($container)
diff --git a/examples/07-complex-tool-schema-http/server.php b/examples/07-complex-tool-schema-http/server.php
index 25e3039b..fbbe45a8 100644
--- a/examples/07-complex-tool-schema-http/server.php
+++ b/examples/07-complex-tool-schema-http/server.php
@@ -25,7 +25,7 @@
 
 $request = $creator->fromGlobals();
 
-$server = Server::make()
+$server = Server::builder()
     ->setServerInfo('Event Scheduler Server', '1.0.0')
     ->setLogger(logger())
     ->setContainer(container())
diff --git a/examples/08-schema-showcase-streamable/server.php b/examples/08-schema-showcase-streamable/server.php
index 777b5dda..8b35b6a2 100644
--- a/examples/08-schema-showcase-streamable/server.php
+++ b/examples/08-schema-showcase-streamable/server.php
@@ -25,7 +25,7 @@
 
 $request = $creator->fromGlobals();
 
-$server = Server::make()
+$server = Server::builder()
     ->setServerInfo('Schema Showcase', '1.0.0')
     ->setContainer(container())
     ->setLogger(logger())
diff --git a/examples/09-cached-discovery-stdio/server.php b/examples/09-cached-discovery-stdio/server.php
index c2cbd24e..dcd849ba 100644
--- a/examples/09-cached-discovery-stdio/server.php
+++ b/examples/09-cached-discovery-stdio/server.php
@@ -22,7 +22,7 @@
 
 logger()->info('Starting MCP Cached Discovery Calculator Server...');
 
-$server = Server::make()
+$server = Server::builder()
     ->setServerInfo('Cached Discovery Calculator', '1.0.0', 'Calculator with cached discovery for better performance.')
     ->setContainer(container())
     ->setLogger(logger())
diff --git a/src/Server.php b/src/Server.php
index 239a3132..7f1468ab 100644
--- a/src/Server.php
+++ b/src/Server.php
@@ -30,7 +30,7 @@ public function __construct(
     ) {
     }
 
-    public static function make(): ServerBuilder
+    public static function builder(): ServerBuilder
     {
         return new ServerBuilder();
     }