diff --git a/mcp-annotations/src/main/java/org/springaicommunity/mcp/annotation/McpElicitation.java b/mcp-annotations/src/main/java/org/springaicommunity/mcp/annotation/McpElicitation.java
index 66992d0..9b0ad36 100644
--- a/mcp-annotations/src/main/java/org/springaicommunity/mcp/annotation/McpElicitation.java
+++ b/mcp-annotations/src/main/java/org/springaicommunity/mcp/annotation/McpElicitation.java
@@ -24,7 +24,7 @@
  *
  * <p>
  * Example usage: <pre>{@code
- * &#64;McpElicitation(clients = "my-client-id")
+ * @McpElicitation(clients = "my-client-id")
  * public ElicitResult handleElicitationRequest(ElicitRequest request) {
  *     return ElicitResult.builder()
  *         .message("Generated response")
@@ -33,7 +33,7 @@
  *         .build();
  * }
  *
- * &#64;McpElicitation(clients = "my-client-id")
+ * @McpElicitation(clients = "my-client-id")
  * public Mono<ElicitResult> handleAsyncElicitationRequest(ElicitRequest request) {
  *     return Mono.just(ElicitResult.builder()
  *         .message("Generated response")
diff --git a/mcp-annotations/src/main/java/org/springaicommunity/mcp/annotation/McpLogging.java b/mcp-annotations/src/main/java/org/springaicommunity/mcp/annotation/McpLogging.java
index d7ec815..9b775f6 100644
--- a/mcp-annotations/src/main/java/org/springaicommunity/mcp/annotation/McpLogging.java
+++ b/mcp-annotations/src/main/java/org/springaicommunity/mcp/annotation/McpLogging.java
@@ -29,14 +29,12 @@
  *
  * <p>
  * Example usage: <pre>{@code
- * &#64;McpLogging
+ * @McpLogging
  * public void handleLoggingMessage(LoggingMessageNotification notification) {
  *     // Handle the notification
  * }
  *
- *
-
-&#64;McpLogging
+ * @McpLogging
  * public void handleLoggingMessageWithParams(LoggingLevel level, String logger, String data) {
  *     // Handle the logging message
  * }
diff --git a/mcp-annotations/src/main/java/org/springaicommunity/mcp/annotation/McpProgress.java b/mcp-annotations/src/main/java/org/springaicommunity/mcp/annotation/McpProgress.java
index 977b881..c117712 100644
--- a/mcp-annotations/src/main/java/org/springaicommunity/mcp/annotation/McpProgress.java
+++ b/mcp-annotations/src/main/java/org/springaicommunity/mcp/annotation/McpProgress.java
@@ -21,7 +21,7 @@
  *
  * <p>
  * Example usage: <pre>{@code
- * &#64;McpProgress(clientId = "my-client-id")
+ * @McpProgress(clientId = "my-client-id")
  * public void handleProgressMessage(ProgressNotification notification) {
  *     // Handle the progress notification
  * }</pre>
diff --git a/mcp-annotations/src/main/java/org/springaicommunity/mcp/annotation/McpPromptListChanged.java b/mcp-annotations/src/main/java/org/springaicommunity/mcp/annotation/McpPromptListChanged.java
index adbe308..c2bd591 100644
--- a/mcp-annotations/src/main/java/org/springaicommunity/mcp/annotation/McpPromptListChanged.java
+++ b/mcp-annotations/src/main/java/org/springaicommunity/mcp/annotation/McpPromptListChanged.java
@@ -28,14 +28,14 @@
  *
  * <p>
  * Example usage: <pre>{@code
- * &#64;McpPromptListChanged(clients = "test-client")
+ * @McpPromptListChanged(clients = "test-client")
  * public void onPromptListChanged(List<McpSchema.Prompt> updatedPrompts) {
  *     // Handle prompt list change notification with the updated prompts
  *     logger.info("Prompt list updated, now contains {} prompts", updatedPrompts.size());
  *     // Process the updated prompt list
  * }
  *
- * &#64;McpPromptListChanged(clients = "test-client")
+ * @McpPromptListChanged(clients = "test-client")
  * public Mono<Void> onPromptListChangedAsync(List<McpSchema.Prompt> updatedPrompts) {
  *     // Handle prompt list change notification asynchronously
  *     return processUpdatedPrompts(updatedPrompts);
diff --git a/mcp-annotations/src/main/java/org/springaicommunity/mcp/annotation/McpResourceListChanged.java b/mcp-annotations/src/main/java/org/springaicommunity/mcp/annotation/McpResourceListChanged.java
index d55a3e4..59f84aa 100644
--- a/mcp-annotations/src/main/java/org/springaicommunity/mcp/annotation/McpResourceListChanged.java
+++ b/mcp-annotations/src/main/java/org/springaicommunity/mcp/annotation/McpResourceListChanged.java
@@ -28,14 +28,14 @@
  *
  * <p>
  * Example usage: <pre>{@code
- * &#64;McpResourceListChanged(clients = "test-client")
+ * @McpResourceListChanged(clients = "test-client")
  * public void onResourceListChanged(List<McpSchema.Resource> updatedResources) {
  *     // Handle resource list change notification with the updated resources
  *     logger.info("Resource list updated, now contains {} resources", updatedResources.size());
  *     // Process the updated resource list
  * }
  *
- * &#64;McpResourceListChanged(clients = "test-client")
+ * @McpResourceListChanged(clients = "test-client")
  * public Mono<Void> onResourceListChangedAsync(List<McpSchema.Resource> updatedResources) {
  *     // Handle resource list change notification asynchronously
  *     return processUpdatedResources(updatedResources);
diff --git a/mcp-annotations/src/main/java/org/springaicommunity/mcp/annotation/McpSampling.java b/mcp-annotations/src/main/java/org/springaicommunity/mcp/annotation/McpSampling.java
index b6ae39f..898a60a 100644
--- a/mcp-annotations/src/main/java/org/springaicommunity/mcp/annotation/McpSampling.java
+++ b/mcp-annotations/src/main/java/org/springaicommunity/mcp/annotation/McpSampling.java
@@ -28,7 +28,7 @@
  *
  * <p>
  * Example usage: <pre>{@code
- * &#64;McpSampling(clients = "test-client")
+ * @McpSampling(clients = "test-client")
  * public CreateMessageResult handleSamplingRequest(CreateMessageRequest request) {
  *     // Process the request and return a result
  *     return CreateMessageResult.builder()
@@ -36,7 +36,7 @@
  *         .build();
  * }
  *
- * &#64;McpSampling(clients = "test-client")
+ * @McpSampling(clients = "test-client")
  * public Mono<CreateMessageResult> handleAsyncSamplingRequest(CreateMessageRequest request) {
  *     // Process the request asynchronously and return a result
  *     return Mono.just(CreateMessageResult.builder()
diff --git a/mcp-annotations/src/main/java/org/springaicommunity/mcp/annotation/McpToolListChanged.java b/mcp-annotations/src/main/java/org/springaicommunity/mcp/annotation/McpToolListChanged.java
index 7091db3..9cecc73 100644
--- a/mcp-annotations/src/main/java/org/springaicommunity/mcp/annotation/McpToolListChanged.java
+++ b/mcp-annotations/src/main/java/org/springaicommunity/mcp/annotation/McpToolListChanged.java
@@ -28,14 +28,14 @@
  *
  * <p>
  * Example usage: <pre>{@code
- * &#64;McpToolListChanged(clients = "test-client")
+ * @McpToolListChanged(clients = "test-client")
  * public void onToolListChanged(List<McpSchema.Tool> updatedTools) {
  *     // Handle tool list change notification with the updated tools
  *     logger.info("Tool list updated, now contains {} tools", updatedTools.size());
  *     // Process the updated tool list
  * }
  *
- * &#64;McpToolListChanged(clients = "test-client")
+ * @McpToolListChanged(clients = "test-client")
  * public Mono<Void> onToolListChangedAsync(List<McpSchema.Tool> updatedTools) {
  *     // Handle tool list change notification asynchronously
  *     return processUpdatedTools(updatedTools);