diff --git a/crates/rmcp-macros/src/prompt_handler.rs b/crates/rmcp-macros/src/prompt_handler.rs
index 4f2541ac..19ba4388 100644
--- a/crates/rmcp-macros/src/prompt_handler.rs
+++ b/crates/rmcp-macros/src/prompt_handler.rs
@@ -33,9 +33,9 @@ pub fn prompt_handler(attr: TokenStream, input: TokenStream) -> syn::Result<Toke
     let get_prompt_impl: ImplItem = parse_quote! {
         async fn get_prompt(
             &self,
-            request: GetPromptRequestParams,
-            context: RequestContext<RoleServer>,
-        ) -> Result<GetPromptResult, rmcp::ErrorData> {
+            request: rmcp::model::GetPromptRequestParams,
+            context: rmcp::service::RequestContext<rmcp::RoleServer>,
+        ) -> Result<rmcp::model::GetPromptResult, rmcp::ErrorData> {
             let prompt_context = rmcp::handler::server::prompt::PromptContext::new(
                 self,
                 request.name,
@@ -56,11 +56,11 @@ pub fn prompt_handler(attr: TokenStream, input: TokenStream) -> syn::Result<Toke
     let list_prompts_impl: ImplItem = parse_quote! {
         async fn list_prompts(
             &self,
-            _request: Option<PaginatedRequestParams>,
-            _context: RequestContext<RoleServer>,
-        ) -> Result<ListPromptsResult, rmcp::ErrorData> {
+            _request: Option<rmcp::model::PaginatedRequestParams>,
+            _context: rmcp::service::RequestContext<rmcp::RoleServer>,
+        ) -> Result<rmcp::model::ListPromptsResult, rmcp::ErrorData> {
             let prompts = #router_expr.list_all();
-            Ok(ListPromptsResult {
+            Ok(rmcp::model::ListPromptsResult {
                 prompts,
                 meta: #meta,
                 next_cursor: None,
diff --git a/crates/rmcp/tests/test_prompt_handler.rs b/crates/rmcp/tests/test_prompt_handler.rs
index 6288cddc..97018a55 100644
--- a/crates/rmcp/tests/test_prompt_handler.rs
+++ b/crates/rmcp/tests/test_prompt_handler.rs
@@ -3,13 +3,7 @@
 // the ServerHandler trait implementation methods.
 #![allow(dead_code)]
 
-use rmcp::{
-    RoleServer, ServerHandler,
-    handler::server::router::prompt::PromptRouter,
-    model::{GetPromptRequestParams, GetPromptResult, ListPromptsResult, PaginatedRequestParams},
-    prompt_handler,
-    service::RequestContext,
-};
+use rmcp::{ServerHandler, handler::server::router::prompt::PromptRouter, prompt_handler};
 
 #[derive(Debug, Clone)]
 pub struct TestPromptServer {