diff --git a/mcp/src/main/java/io/modelcontextprotocol/server/McpAsyncServer.java b/mcp/src/main/java/io/modelcontextprotocol/server/McpAsyncServer.java
index 1efa13de..fa4b28e6 100644
--- a/mcp/src/main/java/io/modelcontextprotocol/server/McpAsyncServer.java
+++ b/mcp/src/main/java/io/modelcontextprotocol/server/McpAsyncServer.java
@@ -28,7 +28,6 @@
 import io.modelcontextprotocol.spec.McpSchema.Tool;
 import io.modelcontextprotocol.spec.McpServerSession;
 import io.modelcontextprotocol.spec.McpServerTransportProvider;
-import io.modelcontextprotocol.util.DeafaultMcpUriTemplateManagerFactory;
 import io.modelcontextprotocol.util.McpUriTemplateManagerFactory;
 import io.modelcontextprotocol.util.Utils;
 import org.slf4j.Logger;
@@ -108,7 +107,7 @@ public class McpAsyncServer {
 
 	private List<String> protocolVersions = List.of(McpSchema.LATEST_PROTOCOL_VERSION);
 
-	private McpUriTemplateManagerFactory uriTemplateManagerFactory = new DeafaultMcpUriTemplateManagerFactory();
+	private final McpUriTemplateManagerFactory uriTemplateManagerFactory;
 
 	/**
 	 * Create a new McpAsyncServer with the given transport provider and capabilities.
@@ -117,9 +116,13 @@ public class McpAsyncServer {
 	 * @param features The MCP server supported features.
 	 * @param objectMapper The ObjectMapper to use for JSON serialization/deserialization
 	 */
-	McpAsyncServer(McpServerTransportProvider mcpTransportProvider, ObjectMapper objectMapper,
-			McpServerFeatures.Async features, Duration requestTimeout,
-			McpUriTemplateManagerFactory uriTemplateManagerFactory) {
+	McpAsyncServer(
+		McpServerTransportProvider mcpTransportProvider,
+		ObjectMapper objectMapper,
+		McpServerFeatures.Async features,
+		Duration requestTimeout,
+		McpUriTemplateManagerFactory uriTemplateManagerFactory
+	) {
 		this.mcpTransportProvider = mcpTransportProvider;
 		this.objectMapper = objectMapper;
 		this.serverInfo = features.serverInfo();
diff --git a/mcp/src/main/java/io/modelcontextprotocol/server/McpServer.java b/mcp/src/main/java/io/modelcontextprotocol/server/McpServer.java
index d6ec2cc3..9fbe39ab 100644
--- a/mcp/src/main/java/io/modelcontextprotocol/server/McpServer.java
+++ b/mcp/src/main/java/io/modelcontextprotocol/server/McpServer.java
@@ -19,7 +19,7 @@
 import io.modelcontextprotocol.spec.McpSchema.ResourceTemplate;
 import io.modelcontextprotocol.spec.McpServerTransportProvider;
 import io.modelcontextprotocol.util.Assert;
-import io.modelcontextprotocol.util.DeafaultMcpUriTemplateManagerFactory;
+import io.modelcontextprotocol.util.DefaultMcpUriTemplateManagerFactory;
 import io.modelcontextprotocol.util.McpUriTemplateManagerFactory;
 import reactor.core.publisher.Mono;
 
@@ -158,7 +158,7 @@ class AsyncSpecification {
 
 		private final McpServerTransportProvider transportProvider;
 
-		private McpUriTemplateManagerFactory uriTemplateManagerFactory = new DeafaultMcpUriTemplateManagerFactory();
+		private McpUriTemplateManagerFactory uriTemplateManagerFactory = new DefaultMcpUriTemplateManagerFactory();
 
 		private ObjectMapper objectMapper;
 
@@ -648,7 +648,7 @@ class SyncSpecification {
 		private static final McpSchema.Implementation DEFAULT_SERVER_INFO = new McpSchema.Implementation("mcp-server",
 				"1.0.0");
 
-		private McpUriTemplateManagerFactory uriTemplateManagerFactory = new DeafaultMcpUriTemplateManagerFactory();
+		private McpUriTemplateManagerFactory uriTemplateManagerFactory = new DefaultMcpUriTemplateManagerFactory();
 
 		private final McpServerTransportProvider transportProvider;
 
diff --git a/mcp/src/main/java/io/modelcontextprotocol/util/DeafaultMcpUriTemplateManagerFactory.java b/mcp/src/main/java/io/modelcontextprotocol/util/DeafaultMcpUriTemplateManagerFactory.java
index 3870b76f..654ab13c 100644
--- a/mcp/src/main/java/io/modelcontextprotocol/util/DeafaultMcpUriTemplateManagerFactory.java
+++ b/mcp/src/main/java/io/modelcontextprotocol/util/DeafaultMcpUriTemplateManagerFactory.java
@@ -4,20 +4,23 @@
 package io.modelcontextprotocol.util;
 
 /**
+ * @deprecated Use {@link DefaultMcpUriTemplateManagerFactory} instead. This
+ * class will be removed in future versions.
  * @author Christian Tzolov
  */
+@Deprecated
 public class DeafaultMcpUriTemplateManagerFactory implements McpUriTemplateManagerFactory {
 
-	/**
-	 * Creates a new instance of {@link McpUriTemplateManager} with the specified URI
-	 * template.
-	 * @param uriTemplate The URI template to be used for variable extraction
-	 * @return A new instance of {@link McpUriTemplateManager}
-	 * @throws IllegalArgumentException if the URI template is null or empty
-	 */
-	@Override
-	public McpUriTemplateManager create(String uriTemplate) {
-		return new DefaultMcpUriTemplateManager(uriTemplate);
-	}
-
+    /**
+     * Creates a new instance of {@link McpUriTemplateManager} with the specified URI
+     * template.
+     *
+     * @param uriTemplate The URI template to be used for variable extraction
+     * @return A new instance of {@link McpUriTemplateManager}
+     * @throws IllegalArgumentException if the URI template is null or empty
+     */
+    @Override
+    public McpUriTemplateManager create(String uriTemplate) {
+        return new DefaultMcpUriTemplateManager(uriTemplate);
+    }
 }
diff --git a/mcp/src/main/java/io/modelcontextprotocol/util/DefaultMcpUriTemplateManagerFactory.java b/mcp/src/main/java/io/modelcontextprotocol/util/DefaultMcpUriTemplateManagerFactory.java
new file mode 100644
index 00000000..e7029d71
--- /dev/null
+++ b/mcp/src/main/java/io/modelcontextprotocol/util/DefaultMcpUriTemplateManagerFactory.java
@@ -0,0 +1,23 @@
+/*
+* Copyright 2025 - 2025 the original author or authors.
+*/
+package io.modelcontextprotocol.util;
+
+/**
+ * @author Christian Tzolov
+ */
+public class DefaultMcpUriTemplateManagerFactory implements McpUriTemplateManagerFactory {
+
+	/**
+	 * Creates a new instance of {@link McpUriTemplateManager} with the specified URI
+	 * template.
+	 * @param uriTemplate The URI template to be used for variable extraction
+	 * @return A new instance of {@link McpUriTemplateManager}
+	 * @throws IllegalArgumentException if the URI template is null or empty
+	 */
+	@Override
+	public McpUriTemplateManager create(String uriTemplate) {
+		return new DefaultMcpUriTemplateManager(uriTemplate);
+	}
+
+}
diff --git a/mcp/src/test/java/io/modelcontextprotocol/McpUriTemplateManagerTests.java b/mcp/src/test/java/io/modelcontextprotocol/McpUriTemplateManagerTests.java
index 6f041daa..aa401c9e 100644
--- a/mcp/src/test/java/io/modelcontextprotocol/McpUriTemplateManagerTests.java
+++ b/mcp/src/test/java/io/modelcontextprotocol/McpUriTemplateManagerTests.java
@@ -12,7 +12,7 @@
 import java.util.List;
 import java.util.Map;
 
-import io.modelcontextprotocol.util.DeafaultMcpUriTemplateManagerFactory;
+import io.modelcontextprotocol.util.DefaultMcpUriTemplateManagerFactory;
 import io.modelcontextprotocol.util.McpUriTemplateManager;
 import io.modelcontextprotocol.util.McpUriTemplateManagerFactory;
 import org.junit.jupiter.api.BeforeEach;
@@ -29,7 +29,7 @@ public class McpUriTemplateManagerTests {
 
 	@BeforeEach
 	void setUp() {
-		this.uriTemplateFactory = new DeafaultMcpUriTemplateManagerFactory();
+		this.uriTemplateFactory = new DefaultMcpUriTemplateManagerFactory();
 	}
 
 	@Test