diff --git a/dev-packages/node-integration-tests/suites/tracing/vercelai/test.ts b/dev-packages/node-integration-tests/suites/tracing/vercelai/test.ts
index a10d602ee93a..3566d40322de 100644
--- a/dev-packages/node-integration-tests/suites/tracing/vercelai/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/vercelai/test.ts
@@ -182,10 +182,9 @@ describe('Vercel AI integration', () => {
       expect.objectContaining({
         data: {
           'ai.operationId': 'ai.toolCall',
-          'ai.toolCall.id': 'call-1',
-          'ai.toolCall.name': 'getWeather',
           'gen_ai.tool.call.id': 'call-1',
           'gen_ai.tool.name': 'getWeather',
+          'gen_ai.tool.type': 'function',
           'operation.name': 'ai.toolCall',
           'sentry.op': 'gen_ai.execute_tool',
           'sentry.origin': 'auto.vercelai.otel',
@@ -389,12 +388,11 @@ describe('Vercel AI integration', () => {
       expect.objectContaining({
         data: {
           'ai.operationId': 'ai.toolCall',
-          'ai.toolCall.args': expect.any(String),
-          'ai.toolCall.id': 'call-1',
-          'ai.toolCall.name': 'getWeather',
-          'ai.toolCall.result': expect.any(String),
           'gen_ai.tool.call.id': 'call-1',
           'gen_ai.tool.name': 'getWeather',
+          'gen_ai.tool.input': expect.any(String),
+          'gen_ai.tool.output': expect.any(String),
+          'gen_ai.tool.type': 'function',
           'operation.name': 'ai.toolCall',
           'sentry.op': 'gen_ai.execute_tool',
           'sentry.origin': 'auto.vercelai.otel',
diff --git a/packages/core/src/utils/vercel-ai.ts b/packages/core/src/utils/vercel-ai.ts
index 2a653addd805..401c295c97c9 100644
--- a/packages/core/src/utils/vercel-ai.ts
+++ b/packages/core/src/utils/vercel-ai.ts
@@ -12,8 +12,10 @@ import {
   AI_RESPONSE_TEXT_ATTRIBUTE,
   AI_RESPONSE_TOOL_CALLS_ATTRIBUTE,
   AI_TELEMETRY_FUNCTION_ID_ATTRIBUTE,
+  AI_TOOL_CALL_ARGS_ATTRIBUTE,
   AI_TOOL_CALL_ID_ATTRIBUTE,
   AI_TOOL_CALL_NAME_ATTRIBUTE,
+  AI_TOOL_CALL_RESULT_ATTRIBUTE,
   AI_USAGE_COMPLETION_TOKENS_ATTRIBUTE,
   AI_USAGE_PROMPT_TOKENS_ATTRIBUTE,
   GEN_AI_RESPONSE_MODEL_ATTRIBUTE,
@@ -94,6 +96,9 @@ function processEndedVercelAiSpan(span: SpanJSON): void {
   renameAttributeKey(attributes, AI_RESPONSE_TEXT_ATTRIBUTE, 'gen_ai.response.text');
   renameAttributeKey(attributes, AI_RESPONSE_TOOL_CALLS_ATTRIBUTE, 'gen_ai.response.tool_calls');
   renameAttributeKey(attributes, AI_PROMPT_TOOLS_ATTRIBUTE, 'gen_ai.request.available_tools');
+
+  renameAttributeKey(attributes, AI_TOOL_CALL_ARGS_ATTRIBUTE, 'gen_ai.tool.input');
+  renameAttributeKey(attributes, AI_TOOL_CALL_RESULT_ATTRIBUTE, 'gen_ai.tool.output');
 }
 
 /**
@@ -111,9 +116,16 @@ function renameAttributeKey(attributes: Record<string, unknown>, oldKey: string,
 function processToolCallSpan(span: Span, attributes: SpanAttributes): void {
   addOriginToSpan(span, 'auto.vercelai.otel');
   span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_OP, 'gen_ai.execute_tool');
-  span.setAttribute('gen_ai.tool.call.id', attributes[AI_TOOL_CALL_ID_ATTRIBUTE]);
-  span.setAttribute('gen_ai.tool.name', attributes[AI_TOOL_CALL_NAME_ATTRIBUTE]);
-  span.updateName(`execute_tool ${attributes[AI_TOOL_CALL_NAME_ATTRIBUTE]}`);
+  renameAttributeKey(attributes, AI_TOOL_CALL_NAME_ATTRIBUTE, 'gen_ai.tool.name');
+  renameAttributeKey(attributes, AI_TOOL_CALL_ID_ATTRIBUTE, 'gen_ai.tool.call.id');
+  // https://opentelemetry.io/docs/specs/semconv/registry/attributes/gen-ai/#gen-ai-tool-type
+  if (!attributes['gen_ai.tool.type']) {
+    span.setAttribute('gen_ai.tool.type', 'function');
+  }
+  const toolName = attributes['gen_ai.tool.name'];
+  if (toolName) {
+    span.updateName(`execute_tool ${toolName}`);
+  }
 }
 
 function processGenerateSpan(span: Span, name: string, attributes: SpanAttributes): void {
@@ -127,7 +139,7 @@ function processGenerateSpan(span: Span, name: string, attributes: SpanAttribute
   const functionId = attributes[AI_TELEMETRY_FUNCTION_ID_ATTRIBUTE];
   if (functionId && typeof functionId === 'string' && name.split('.').length - 1 === 1) {
     span.updateName(`${nameWthoutAi} ${functionId}`);
-    span.setAttribute('ai.pipeline.name', functionId);
+    span.setAttribute('gen_ai.function_id', functionId);
   }
 
   if (attributes[AI_PROMPT_ATTRIBUTE]) {