diff --git a/scripts/openapi_generator/app.py b/scripts/openapi_generator/app.py
index e98aafb35..28d49f0b7 100644
--- a/scripts/openapi_generator/app.py
+++ b/scripts/openapi_generator/app.py
@@ -77,7 +77,7 @@ def create_llama_stack_app() -> FastAPI:
     )
 
     # Include routers for APIs that have them (automatic discovery)
-    from llama_stack.core.server.router_registry import build_router, has_router
+    from llama_stack.core.server.fastapi_router_registry import build_router, has_router
 
     def dummy_impl_getter(api: Api) -> Any:
         """Dummy implementation getter for OpenAPI generation."""
diff --git a/src/llama_stack/core/inspect.py b/src/llama_stack/core/inspect.py
index ac7958968..dfaf1fd5c 100644
--- a/src/llama_stack/core/inspect.py
+++ b/src/llama_stack/core/inspect.py
@@ -10,7 +10,7 @@ from pydantic import BaseModel
 
 from llama_stack.core.datatypes import StackRunConfig
 from llama_stack.core.external import load_external_apis
-from llama_stack.core.server.router_registry import build_router, has_router
+from llama_stack.core.server.fastapi_router_registry import build_router, has_router
 from llama_stack.core.server.routes import get_all_api_routes
 from llama_stack_api import (
     Api,
diff --git a/src/llama_stack/core/server/router_registry.py b/src/llama_stack/core/server/fastapi_router_registry.py
similarity index 100%
rename from src/llama_stack/core/server/router_registry.py
rename to src/llama_stack/core/server/fastapi_router_registry.py
diff --git a/src/llama_stack/core/server/routes.py b/src/llama_stack/core/server/routes.py
index cd24e9af2..b6508a7a4 100644
--- a/src/llama_stack/core/server/routes.py
+++ b/src/llama_stack/core/server/routes.py
@@ -30,7 +30,7 @@ def get_all_api_routes(
 
     This function only returns routes from APIs that use the legacy @webmethod
     decorator system. For APIs that have been migrated to FastAPI routers,
-    use the router registry (router_registry.has_router() and router_registry.build_router()).
+    use the router registry (fastapi_router_registry.has_router() and fastapi_router_registry.build_router()).
 
     Args:
         external_apis: Optional dictionary of external API specifications
diff --git a/src/llama_stack/core/server/server.py b/src/llama_stack/core/server/server.py
index f34cef4a9..15c377413 100644
--- a/src/llama_stack/core/server/server.py
+++ b/src/llama_stack/core/server/server.py
@@ -44,7 +44,7 @@ from llama_stack.core.request_headers import (
     request_provider_data_context,
     user_from_scope,
 )
-from llama_stack.core.server.router_registry import build_router
+from llama_stack.core.server.fastapi_router_registry import build_router
 from llama_stack.core.server.routes import get_all_api_routes
 from llama_stack.core.stack import (
     Stack,
diff --git a/src/llama_stack/core/server/tracing.py b/src/llama_stack/core/server/tracing.py
index 352badcaa..7a6aec436 100644
--- a/src/llama_stack/core/server/tracing.py
+++ b/src/llama_stack/core/server/tracing.py
@@ -6,7 +6,7 @@
 from aiohttp import hdrs
 
 from llama_stack.core.external import ExternalApiSpec
-from llama_stack.core.server.router_registry import has_router
+from llama_stack.core.server.fastapi_router_registry import has_router
 from llama_stack.core.server.routes import find_matching_route, initialize_route_impls
 from llama_stack.core.telemetry.tracing import end_trace, start_trace
 from llama_stack.log import get_logger