diff --git a/internal/validators/registries/nuget.go b/internal/validators/registries/nuget.go
index 0c6d4c51..f8f97d7a 100644
--- a/internal/validators/registries/nuget.go
+++ b/internal/validators/registries/nuget.go
@@ -237,10 +237,10 @@ func validateReadme(ctx context.Context, serverName, lowerID, lowerVersion strin
 
 		readmeContent := string(readmeBytes)
 
-		// Check for mcp-name: format (more specific)
-		mcpNamePattern := "mcp-name: " + serverName
-		if strings.Contains(readmeContent, mcpNamePattern) {
-			return ValidReadme, nil // Found as mcp-name: format
+		// Check for the mcp-name: <server-name> ownership token (boundary-anchored
+		// to avoid prefix confusion — see containsMCPNameToken).
+		if containsMCPNameToken(readmeContent, serverName) {
+			return ValidReadme, nil
 		}
 
 		return InvalidReadme, nil
diff --git a/internal/validators/registries/pypi.go b/internal/validators/registries/pypi.go
index 2bac843b..04068a3e 100644
--- a/internal/validators/registries/pypi.go
+++ b/internal/validators/registries/pypi.go
@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"net/http"
 	"net/url"
-	"strings"
 	"time"
 
 	"github.com/modelcontextprotocol/registry/pkg/model"
@@ -85,10 +84,10 @@ func ValidatePyPI(ctx context.Context, pkg model.Package, serverName string) err
 	// Check description (README) content
 	description := pypiResp.Info.Description
 
-	// Check for mcp-name: format (more specific)
-	mcpNamePattern := "mcp-name: " + serverName
-	if strings.Contains(description, mcpNamePattern) {
-		return nil // Found as mcp-name: format
+	// Check for the mcp-name: <server-name> ownership token (boundary-anchored to
+	// avoid prefix confusion — see containsMCPNameToken).
+	if containsMCPNameToken(description, serverName) {
+		return nil
 	}
 
 	return fmt.Errorf("PyPI package '%s' ownership validation failed. The server name '%s' must appear as 'mcp-name: %s' in the package README", pkg.Identifier, serverName, serverName)