diff --git a/src/index.ts b/src/index.ts
index ed92e8d1..61f7d19d 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -249,69 +249,69 @@ export import toFile = Uploads.toFile;
 export import fileFromPath = Uploads.fileFromPath;
 
 export namespace Anthropic {
-  export import RequestOptions = Core.RequestOptions;
+  export type RequestOptions = Core.RequestOptions;
 
   export import Page = Pagination.Page;
-  export import PageParams = Pagination.PageParams;
-  export import PageResponse = Pagination.PageResponse;
+  export type PageParams = Pagination.PageParams;
+  export type PageResponse<T> = Pagination.PageResponse<T>;
 
   export import Completions = API.Completions;
-  export import Completion = API.Completion;
-  export import CompletionCreateParams = API.CompletionCreateParams;
-  export import CompletionCreateParamsNonStreaming = API.CompletionCreateParamsNonStreaming;
-  export import CompletionCreateParamsStreaming = API.CompletionCreateParamsStreaming;
+  export type Completion = API.Completion;
+  export type CompletionCreateParams = API.CompletionCreateParams;
+  export type CompletionCreateParamsNonStreaming = API.CompletionCreateParamsNonStreaming;
+  export type CompletionCreateParamsStreaming = API.CompletionCreateParamsStreaming;
 
   export import Messages = API.Messages;
-  export import ContentBlock = API.ContentBlock;
-  export import ContentBlockDeltaEvent = API.ContentBlockDeltaEvent;
-  export import ContentBlockStartEvent = API.ContentBlockStartEvent;
-  export import ContentBlockStopEvent = API.ContentBlockStopEvent;
-  export import ImageBlockParam = API.ImageBlockParam;
-  export import InputJSONDelta = API.InputJSONDelta;
-  export import Message = API.Message;
-  export import MessageDeltaEvent = API.MessageDeltaEvent;
-  export import MessageDeltaUsage = API.MessageDeltaUsage;
-  export import MessageParam = API.MessageParam;
-  export import MessageStartEvent = API.MessageStartEvent;
-  export import MessageStopEvent = API.MessageStopEvent;
-  export import MessageStreamEvent = API.MessageStreamEvent;
-  export import Metadata = API.Metadata;
-  export import Model = API.Model;
-  export import RawContentBlockDeltaEvent = API.RawContentBlockDeltaEvent;
-  export import RawContentBlockStartEvent = API.RawContentBlockStartEvent;
-  export import RawContentBlockStopEvent = API.RawContentBlockStopEvent;
-  export import RawMessageDeltaEvent = API.RawMessageDeltaEvent;
-  export import RawMessageStartEvent = API.RawMessageStartEvent;
-  export import RawMessageStopEvent = API.RawMessageStopEvent;
-  export import RawMessageStreamEvent = API.RawMessageStreamEvent;
-  export import TextBlock = API.TextBlock;
-  export import TextBlockParam = API.TextBlockParam;
-  export import TextDelta = API.TextDelta;
-  export import Tool = API.Tool;
-  export import ToolChoice = API.ToolChoice;
-  export import ToolChoiceAny = API.ToolChoiceAny;
-  export import ToolChoiceAuto = API.ToolChoiceAuto;
-  export import ToolChoiceTool = API.ToolChoiceTool;
-  export import ToolResultBlockParam = API.ToolResultBlockParam;
-  export import ToolUseBlock = API.ToolUseBlock;
-  export import ToolUseBlockParam = API.ToolUseBlockParam;
-  export import Usage = API.Usage;
-  export import MessageCreateParams = API.MessageCreateParams;
-  export import MessageCreateParamsNonStreaming = API.MessageCreateParamsNonStreaming;
-  export import MessageCreateParamsStreaming = API.MessageCreateParamsStreaming;
-  export import MessageStreamParams = API.MessageStreamParams;
+  export type ContentBlock = API.ContentBlock;
+  export type ContentBlockDeltaEvent = API.ContentBlockDeltaEvent;
+  export type ContentBlockStartEvent = API.ContentBlockStartEvent;
+  export type ContentBlockStopEvent = API.ContentBlockStopEvent;
+  export type ImageBlockParam = API.ImageBlockParam;
+  export type InputJSONDelta = API.InputJSONDelta;
+  export type Message = API.Message;
+  export type MessageDeltaEvent = API.MessageDeltaEvent;
+  export type MessageDeltaUsage = API.MessageDeltaUsage;
+  export type MessageParam = API.MessageParam;
+  export type MessageStartEvent = API.MessageStartEvent;
+  export type MessageStopEvent = API.MessageStopEvent;
+  export type MessageStreamEvent = API.MessageStreamEvent;
+  export type Metadata = API.Metadata;
+  export type Model = API.Model;
+  export type RawContentBlockDeltaEvent = API.RawContentBlockDeltaEvent;
+  export type RawContentBlockStartEvent = API.RawContentBlockStartEvent;
+  export type RawContentBlockStopEvent = API.RawContentBlockStopEvent;
+  export type RawMessageDeltaEvent = API.RawMessageDeltaEvent;
+  export type RawMessageStartEvent = API.RawMessageStartEvent;
+  export type RawMessageStopEvent = API.RawMessageStopEvent;
+  export type RawMessageStreamEvent = API.RawMessageStreamEvent;
+  export type TextBlock = API.TextBlock;
+  export type TextBlockParam = API.TextBlockParam;
+  export type TextDelta = API.TextDelta;
+  export type Tool = API.Tool;
+  export type ToolChoice = API.ToolChoice;
+  export type ToolChoiceAny = API.ToolChoiceAny;
+  export type ToolChoiceAuto = API.ToolChoiceAuto;
+  export type ToolChoiceTool = API.ToolChoiceTool;
+  export type ToolResultBlockParam = API.ToolResultBlockParam;
+  export type ToolUseBlock = API.ToolUseBlock;
+  export type ToolUseBlockParam = API.ToolUseBlockParam;
+  export type Usage = API.Usage;
+  export type MessageCreateParams = API.MessageCreateParams;
+  export type MessageCreateParamsNonStreaming = API.MessageCreateParamsNonStreaming;
+  export type MessageCreateParamsStreaming = API.MessageCreateParamsStreaming;
+  export type MessageStreamParams = API.MessageStreamParams;
 
   export import Beta = API.Beta;
-  export import AnthropicBeta = API.AnthropicBeta;
-  export import BetaAPIError = API.BetaAPIError;
-  export import BetaAuthenticationError = API.BetaAuthenticationError;
-  export import BetaError = API.BetaError;
-  export import BetaErrorResponse = API.BetaErrorResponse;
-  export import BetaInvalidRequestError = API.BetaInvalidRequestError;
-  export import BetaNotFoundError = API.BetaNotFoundError;
-  export import BetaOverloadedError = API.BetaOverloadedError;
-  export import BetaPermissionError = API.BetaPermissionError;
-  export import BetaRateLimitError = API.BetaRateLimitError;
+  export type AnthropicBeta = API.AnthropicBeta;
+  export type BetaAPIError = API.BetaAPIError;
+  export type BetaAuthenticationError = API.BetaAuthenticationError;
+  export type BetaError = API.BetaError;
+  export type BetaErrorResponse = API.BetaErrorResponse;
+  export type BetaInvalidRequestError = API.BetaInvalidRequestError;
+  export type BetaNotFoundError = API.BetaNotFoundError;
+  export type BetaOverloadedError = API.BetaOverloadedError;
+  export type BetaPermissionError = API.BetaPermissionError;
+  export type BetaRateLimitError = API.BetaRateLimitError;
 }
 
 export default Anthropic;
diff --git a/src/resources/beta/beta.ts b/src/resources/beta/beta.ts
index 7979da01..03938d64 100644
--- a/src/resources/beta/beta.ts
+++ b/src/resources/beta/beta.ts
@@ -74,51 +74,51 @@ export interface BetaRateLimitError {
 }
 
 export namespace Beta {
-  export import AnthropicBeta = BetaAPI.AnthropicBeta;
-  export import BetaAPIError = BetaAPI.BetaAPIError;
-  export import BetaAuthenticationError = BetaAPI.BetaAuthenticationError;
-  export import BetaError = BetaAPI.BetaError;
-  export import BetaErrorResponse = BetaAPI.BetaErrorResponse;
-  export import BetaInvalidRequestError = BetaAPI.BetaInvalidRequestError;
-  export import BetaNotFoundError = BetaAPI.BetaNotFoundError;
-  export import BetaOverloadedError = BetaAPI.BetaOverloadedError;
-  export import BetaPermissionError = BetaAPI.BetaPermissionError;
-  export import BetaRateLimitError = BetaAPI.BetaRateLimitError;
+  export type AnthropicBeta = BetaAPI.AnthropicBeta;
+  export type BetaAPIError = BetaAPI.BetaAPIError;
+  export type BetaAuthenticationError = BetaAPI.BetaAuthenticationError;
+  export type BetaError = BetaAPI.BetaError;
+  export type BetaErrorResponse = BetaAPI.BetaErrorResponse;
+  export type BetaInvalidRequestError = BetaAPI.BetaInvalidRequestError;
+  export type BetaNotFoundError = BetaAPI.BetaNotFoundError;
+  export type BetaOverloadedError = BetaAPI.BetaOverloadedError;
+  export type BetaPermissionError = BetaAPI.BetaPermissionError;
+  export type BetaRateLimitError = BetaAPI.BetaRateLimitError;
   export import Messages = MessagesAPI.Messages;
-  export import BetaCacheControlEphemeral = MessagesAPI.BetaCacheControlEphemeral;
-  export import BetaContentBlock = MessagesAPI.BetaContentBlock;
-  export import BetaContentBlockParam = MessagesAPI.BetaContentBlockParam;
-  export import BetaImageBlockParam = MessagesAPI.BetaImageBlockParam;
-  export import BetaInputJSONDelta = MessagesAPI.BetaInputJSONDelta;
-  export import BetaMessage = MessagesAPI.BetaMessage;
-  export import BetaMessageDeltaUsage = MessagesAPI.BetaMessageDeltaUsage;
-  export import BetaMessageParam = MessagesAPI.BetaMessageParam;
-  export import BetaMetadata = MessagesAPI.BetaMetadata;
-  export import BetaRawContentBlockDeltaEvent = MessagesAPI.BetaRawContentBlockDeltaEvent;
-  export import BetaRawContentBlockStartEvent = MessagesAPI.BetaRawContentBlockStartEvent;
-  export import BetaRawContentBlockStopEvent = MessagesAPI.BetaRawContentBlockStopEvent;
-  export import BetaRawMessageDeltaEvent = MessagesAPI.BetaRawMessageDeltaEvent;
-  export import BetaRawMessageStartEvent = MessagesAPI.BetaRawMessageStartEvent;
-  export import BetaRawMessageStopEvent = MessagesAPI.BetaRawMessageStopEvent;
-  export import BetaRawMessageStreamEvent = MessagesAPI.BetaRawMessageStreamEvent;
-  export import BetaTextBlock = MessagesAPI.BetaTextBlock;
-  export import BetaTextBlockParam = MessagesAPI.BetaTextBlockParam;
-  export import BetaTextDelta = MessagesAPI.BetaTextDelta;
-  export import BetaTool = MessagesAPI.BetaTool;
-  export import BetaToolBash20241022 = MessagesAPI.BetaToolBash20241022;
-  export import BetaToolChoice = MessagesAPI.BetaToolChoice;
-  export import BetaToolChoiceAny = MessagesAPI.BetaToolChoiceAny;
-  export import BetaToolChoiceAuto = MessagesAPI.BetaToolChoiceAuto;
-  export import BetaToolChoiceTool = MessagesAPI.BetaToolChoiceTool;
-  export import BetaToolComputerUse20241022 = MessagesAPI.BetaToolComputerUse20241022;
-  export import BetaToolResultBlockParam = MessagesAPI.BetaToolResultBlockParam;
-  export import BetaToolTextEditor20241022 = MessagesAPI.BetaToolTextEditor20241022;
-  export import BetaToolUnion = MessagesAPI.BetaToolUnion;
-  export import BetaToolUseBlock = MessagesAPI.BetaToolUseBlock;
-  export import BetaToolUseBlockParam = MessagesAPI.BetaToolUseBlockParam;
-  export import BetaUsage = MessagesAPI.BetaUsage;
-  export import MessageCreateParams = MessagesAPI.MessageCreateParams;
-  export import MessageCreateParamsNonStreaming = MessagesAPI.MessageCreateParamsNonStreaming;
-  export import MessageCreateParamsStreaming = MessagesAPI.MessageCreateParamsStreaming;
+  export type BetaCacheControlEphemeral = MessagesAPI.BetaCacheControlEphemeral;
+  export type BetaContentBlock = MessagesAPI.BetaContentBlock;
+  export type BetaContentBlockParam = MessagesAPI.BetaContentBlockParam;
+  export type BetaImageBlockParam = MessagesAPI.BetaImageBlockParam;
+  export type BetaInputJSONDelta = MessagesAPI.BetaInputJSONDelta;
+  export type BetaMessage = MessagesAPI.BetaMessage;
+  export type BetaMessageDeltaUsage = MessagesAPI.BetaMessageDeltaUsage;
+  export type BetaMessageParam = MessagesAPI.BetaMessageParam;
+  export type BetaMetadata = MessagesAPI.BetaMetadata;
+  export type BetaRawContentBlockDeltaEvent = MessagesAPI.BetaRawContentBlockDeltaEvent;
+  export type BetaRawContentBlockStartEvent = MessagesAPI.BetaRawContentBlockStartEvent;
+  export type BetaRawContentBlockStopEvent = MessagesAPI.BetaRawContentBlockStopEvent;
+  export type BetaRawMessageDeltaEvent = MessagesAPI.BetaRawMessageDeltaEvent;
+  export type BetaRawMessageStartEvent = MessagesAPI.BetaRawMessageStartEvent;
+  export type BetaRawMessageStopEvent = MessagesAPI.BetaRawMessageStopEvent;
+  export type BetaRawMessageStreamEvent = MessagesAPI.BetaRawMessageStreamEvent;
+  export type BetaTextBlock = MessagesAPI.BetaTextBlock;
+  export type BetaTextBlockParam = MessagesAPI.BetaTextBlockParam;
+  export type BetaTextDelta = MessagesAPI.BetaTextDelta;
+  export type BetaTool = MessagesAPI.BetaTool;
+  export type BetaToolBash20241022 = MessagesAPI.BetaToolBash20241022;
+  export type BetaToolChoice = MessagesAPI.BetaToolChoice;
+  export type BetaToolChoiceAny = MessagesAPI.BetaToolChoiceAny;
+  export type BetaToolChoiceAuto = MessagesAPI.BetaToolChoiceAuto;
+  export type BetaToolChoiceTool = MessagesAPI.BetaToolChoiceTool;
+  export type BetaToolComputerUse20241022 = MessagesAPI.BetaToolComputerUse20241022;
+  export type BetaToolResultBlockParam = MessagesAPI.BetaToolResultBlockParam;
+  export type BetaToolTextEditor20241022 = MessagesAPI.BetaToolTextEditor20241022;
+  export type BetaToolUnion = MessagesAPI.BetaToolUnion;
+  export type BetaToolUseBlock = MessagesAPI.BetaToolUseBlock;
+  export type BetaToolUseBlockParam = MessagesAPI.BetaToolUseBlockParam;
+  export type BetaUsage = MessagesAPI.BetaUsage;
+  export type MessageCreateParams = MessagesAPI.MessageCreateParams;
+  export type MessageCreateParamsNonStreaming = MessagesAPI.MessageCreateParamsNonStreaming;
+  export type MessageCreateParamsStreaming = MessagesAPI.MessageCreateParamsStreaming;
   export import PromptCaching = PromptCachingAPI.PromptCaching;
 }
diff --git a/src/resources/beta/index.ts b/src/resources/beta/index.ts
index 3fb9b9e3..a89803bd 100644
--- a/src/resources/beta/index.ts
+++ b/src/resources/beta/index.ts
@@ -1,54 +1,54 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  AnthropicBeta,
-  BetaAPIError,
-  BetaAuthenticationError,
-  BetaError,
-  BetaErrorResponse,
-  BetaInvalidRequestError,
-  BetaNotFoundError,
-  BetaOverloadedError,
-  BetaPermissionError,
-  BetaRateLimitError,
   Beta,
+  type AnthropicBeta,
+  type BetaAPIError,
+  type BetaAuthenticationError,
+  type BetaError,
+  type BetaErrorResponse,
+  type BetaInvalidRequestError,
+  type BetaNotFoundError,
+  type BetaOverloadedError,
+  type BetaPermissionError,
+  type BetaRateLimitError,
 } from './beta';
 export {
-  BetaCacheControlEphemeral,
-  BetaContentBlock,
-  BetaContentBlockParam,
-  BetaImageBlockParam,
-  BetaInputJSONDelta,
-  BetaMessage,
-  BetaMessageDeltaUsage,
-  BetaMessageParam,
-  BetaMetadata,
-  BetaRawContentBlockDeltaEvent,
-  BetaRawContentBlockStartEvent,
-  BetaRawContentBlockStopEvent,
-  BetaRawMessageDeltaEvent,
-  BetaRawMessageStartEvent,
-  BetaRawMessageStopEvent,
-  BetaRawMessageStreamEvent,
-  BetaTextBlock,
-  BetaTextBlockParam,
-  BetaTextDelta,
-  BetaTool,
-  BetaToolBash20241022,
-  BetaToolChoice,
-  BetaToolChoiceAny,
-  BetaToolChoiceAuto,
-  BetaToolChoiceTool,
-  BetaToolComputerUse20241022,
-  BetaToolResultBlockParam,
-  BetaToolTextEditor20241022,
-  BetaToolUnion,
-  BetaToolUseBlock,
-  BetaToolUseBlockParam,
-  BetaUsage,
-  MessageCreateParams,
-  MessageCreateParamsNonStreaming,
-  MessageCreateParamsStreaming,
   Messages,
+  type BetaCacheControlEphemeral,
+  type BetaContentBlock,
+  type BetaContentBlockParam,
+  type BetaImageBlockParam,
+  type BetaInputJSONDelta,
+  type BetaMessage,
+  type BetaMessageDeltaUsage,
+  type BetaMessageParam,
+  type BetaMetadata,
+  type BetaRawContentBlockDeltaEvent,
+  type BetaRawContentBlockStartEvent,
+  type BetaRawContentBlockStopEvent,
+  type BetaRawMessageDeltaEvent,
+  type BetaRawMessageStartEvent,
+  type BetaRawMessageStopEvent,
+  type BetaRawMessageStreamEvent,
+  type BetaTextBlock,
+  type BetaTextBlockParam,
+  type BetaTextDelta,
+  type BetaTool,
+  type BetaToolBash20241022,
+  type BetaToolChoice,
+  type BetaToolChoiceAny,
+  type BetaToolChoiceAuto,
+  type BetaToolChoiceTool,
+  type BetaToolComputerUse20241022,
+  type BetaToolResultBlockParam,
+  type BetaToolTextEditor20241022,
+  type BetaToolUnion,
+  type BetaToolUseBlock,
+  type BetaToolUseBlockParam,
+  type BetaUsage,
+  type MessageCreateParams,
+  type MessageCreateParamsNonStreaming,
+  type MessageCreateParamsStreaming,
 } from './messages/index';
 export { PromptCaching } from './prompt-caching/index';
diff --git a/src/resources/beta/messages/batches.ts b/src/resources/beta/messages/batches.ts
index 84c1fc60..5a2fd9ea 100644
--- a/src/resources/beta/messages/batches.ts
+++ b/src/resources/beta/messages/batches.ts
@@ -390,18 +390,18 @@ export interface BatchResultsParams {
 }
 
 export namespace Batches {
-  export import BetaMessageBatch = BatchesAPI.BetaMessageBatch;
-  export import BetaMessageBatchCanceledResult = BatchesAPI.BetaMessageBatchCanceledResult;
-  export import BetaMessageBatchErroredResult = BatchesAPI.BetaMessageBatchErroredResult;
-  export import BetaMessageBatchExpiredResult = BatchesAPI.BetaMessageBatchExpiredResult;
-  export import BetaMessageBatchIndividualResponse = BatchesAPI.BetaMessageBatchIndividualResponse;
-  export import BetaMessageBatchRequestCounts = BatchesAPI.BetaMessageBatchRequestCounts;
-  export import BetaMessageBatchResult = BatchesAPI.BetaMessageBatchResult;
-  export import BetaMessageBatchSucceededResult = BatchesAPI.BetaMessageBatchSucceededResult;
+  export type BetaMessageBatch = BatchesAPI.BetaMessageBatch;
+  export type BetaMessageBatchCanceledResult = BatchesAPI.BetaMessageBatchCanceledResult;
+  export type BetaMessageBatchErroredResult = BatchesAPI.BetaMessageBatchErroredResult;
+  export type BetaMessageBatchExpiredResult = BatchesAPI.BetaMessageBatchExpiredResult;
+  export type BetaMessageBatchIndividualResponse = BatchesAPI.BetaMessageBatchIndividualResponse;
+  export type BetaMessageBatchRequestCounts = BatchesAPI.BetaMessageBatchRequestCounts;
+  export type BetaMessageBatchResult = BatchesAPI.BetaMessageBatchResult;
+  export type BetaMessageBatchSucceededResult = BatchesAPI.BetaMessageBatchSucceededResult;
   export import BetaMessageBatchesPage = BatchesAPI.BetaMessageBatchesPage;
-  export import BatchCreateParams = BatchesAPI.BatchCreateParams;
-  export import BatchRetrieveParams = BatchesAPI.BatchRetrieveParams;
-  export import BatchListParams = BatchesAPI.BatchListParams;
-  export import BatchCancelParams = BatchesAPI.BatchCancelParams;
-  export import BatchResultsParams = BatchesAPI.BatchResultsParams;
+  export type BatchCreateParams = BatchesAPI.BatchCreateParams;
+  export type BatchRetrieveParams = BatchesAPI.BatchRetrieveParams;
+  export type BatchListParams = BatchesAPI.BatchListParams;
+  export type BatchCancelParams = BatchesAPI.BatchCancelParams;
+  export type BatchResultsParams = BatchesAPI.BatchResultsParams;
 }
diff --git a/src/resources/beta/messages/index.ts b/src/resources/beta/messages/index.ts
index 9011e21b..45f71739 100644
--- a/src/resources/beta/messages/index.ts
+++ b/src/resources/beta/messages/index.ts
@@ -1,57 +1,57 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  BetaCacheControlEphemeral,
-  BetaContentBlock,
-  BetaContentBlockParam,
-  BetaImageBlockParam,
-  BetaInputJSONDelta,
-  BetaMessage,
-  BetaMessageDeltaUsage,
-  BetaMessageParam,
-  BetaMetadata,
-  BetaRawContentBlockDeltaEvent,
-  BetaRawContentBlockStartEvent,
-  BetaRawContentBlockStopEvent,
-  BetaRawMessageDeltaEvent,
-  BetaRawMessageStartEvent,
-  BetaRawMessageStopEvent,
-  BetaRawMessageStreamEvent,
-  BetaTextBlock,
-  BetaTextBlockParam,
-  BetaTextDelta,
-  BetaTool,
-  BetaToolBash20241022,
-  BetaToolChoice,
-  BetaToolChoiceAny,
-  BetaToolChoiceAuto,
-  BetaToolChoiceTool,
-  BetaToolComputerUse20241022,
-  BetaToolResultBlockParam,
-  BetaToolTextEditor20241022,
-  BetaToolUnion,
-  BetaToolUseBlock,
-  BetaToolUseBlockParam,
-  BetaUsage,
-  MessageCreateParams,
-  MessageCreateParamsNonStreaming,
-  MessageCreateParamsStreaming,
-  Messages,
-} from './messages';
-export {
-  BetaMessageBatch,
-  BetaMessageBatchCanceledResult,
-  BetaMessageBatchErroredResult,
-  BetaMessageBatchExpiredResult,
-  BetaMessageBatchIndividualResponse,
-  BetaMessageBatchRequestCounts,
-  BetaMessageBatchResult,
-  BetaMessageBatchSucceededResult,
-  BatchCreateParams,
-  BatchRetrieveParams,
-  BatchListParams,
-  BatchCancelParams,
-  BatchResultsParams,
   BetaMessageBatchesPage,
   Batches,
+  type BetaMessageBatch,
+  type BetaMessageBatchCanceledResult,
+  type BetaMessageBatchErroredResult,
+  type BetaMessageBatchExpiredResult,
+  type BetaMessageBatchIndividualResponse,
+  type BetaMessageBatchRequestCounts,
+  type BetaMessageBatchResult,
+  type BetaMessageBatchSucceededResult,
+  type BatchCreateParams,
+  type BatchRetrieveParams,
+  type BatchListParams,
+  type BatchCancelParams,
+  type BatchResultsParams,
 } from './batches';
+export {
+  Messages,
+  type BetaCacheControlEphemeral,
+  type BetaContentBlock,
+  type BetaContentBlockParam,
+  type BetaImageBlockParam,
+  type BetaInputJSONDelta,
+  type BetaMessage,
+  type BetaMessageDeltaUsage,
+  type BetaMessageParam,
+  type BetaMetadata,
+  type BetaRawContentBlockDeltaEvent,
+  type BetaRawContentBlockStartEvent,
+  type BetaRawContentBlockStopEvent,
+  type BetaRawMessageDeltaEvent,
+  type BetaRawMessageStartEvent,
+  type BetaRawMessageStopEvent,
+  type BetaRawMessageStreamEvent,
+  type BetaTextBlock,
+  type BetaTextBlockParam,
+  type BetaTextDelta,
+  type BetaTool,
+  type BetaToolBash20241022,
+  type BetaToolChoice,
+  type BetaToolChoiceAny,
+  type BetaToolChoiceAuto,
+  type BetaToolChoiceTool,
+  type BetaToolComputerUse20241022,
+  type BetaToolResultBlockParam,
+  type BetaToolTextEditor20241022,
+  type BetaToolUnion,
+  type BetaToolUseBlock,
+  type BetaToolUseBlockParam,
+  type BetaUsage,
+  type MessageCreateParams,
+  type MessageCreateParamsNonStreaming,
+  type MessageCreateParamsStreaming,
+} from './messages';
diff --git a/src/resources/beta/messages/messages.ts b/src/resources/beta/messages/messages.ts
index cb1f1659..1e6db979 100644
--- a/src/resources/beta/messages/messages.ts
+++ b/src/resources/beta/messages/messages.ts
@@ -785,54 +785,54 @@ export interface MessageCreateParamsStreaming extends MessageCreateParamsBase {
 }
 
 export namespace Messages {
-  export import BetaCacheControlEphemeral = MessagesMessagesAPI.BetaCacheControlEphemeral;
-  export import BetaContentBlock = MessagesMessagesAPI.BetaContentBlock;
-  export import BetaContentBlockParam = MessagesMessagesAPI.BetaContentBlockParam;
-  export import BetaImageBlockParam = MessagesMessagesAPI.BetaImageBlockParam;
-  export import BetaInputJSONDelta = MessagesMessagesAPI.BetaInputJSONDelta;
-  export import BetaMessage = MessagesMessagesAPI.BetaMessage;
-  export import BetaMessageDeltaUsage = MessagesMessagesAPI.BetaMessageDeltaUsage;
-  export import BetaMessageParam = MessagesMessagesAPI.BetaMessageParam;
-  export import BetaMetadata = MessagesMessagesAPI.BetaMetadata;
-  export import BetaRawContentBlockDeltaEvent = MessagesMessagesAPI.BetaRawContentBlockDeltaEvent;
-  export import BetaRawContentBlockStartEvent = MessagesMessagesAPI.BetaRawContentBlockStartEvent;
-  export import BetaRawContentBlockStopEvent = MessagesMessagesAPI.BetaRawContentBlockStopEvent;
-  export import BetaRawMessageDeltaEvent = MessagesMessagesAPI.BetaRawMessageDeltaEvent;
-  export import BetaRawMessageStartEvent = MessagesMessagesAPI.BetaRawMessageStartEvent;
-  export import BetaRawMessageStopEvent = MessagesMessagesAPI.BetaRawMessageStopEvent;
-  export import BetaRawMessageStreamEvent = MessagesMessagesAPI.BetaRawMessageStreamEvent;
-  export import BetaTextBlock = MessagesMessagesAPI.BetaTextBlock;
-  export import BetaTextBlockParam = MessagesMessagesAPI.BetaTextBlockParam;
-  export import BetaTextDelta = MessagesMessagesAPI.BetaTextDelta;
-  export import BetaTool = MessagesMessagesAPI.BetaTool;
-  export import BetaToolBash20241022 = MessagesMessagesAPI.BetaToolBash20241022;
-  export import BetaToolChoice = MessagesMessagesAPI.BetaToolChoice;
-  export import BetaToolChoiceAny = MessagesMessagesAPI.BetaToolChoiceAny;
-  export import BetaToolChoiceAuto = MessagesMessagesAPI.BetaToolChoiceAuto;
-  export import BetaToolChoiceTool = MessagesMessagesAPI.BetaToolChoiceTool;
-  export import BetaToolComputerUse20241022 = MessagesMessagesAPI.BetaToolComputerUse20241022;
-  export import BetaToolResultBlockParam = MessagesMessagesAPI.BetaToolResultBlockParam;
-  export import BetaToolTextEditor20241022 = MessagesMessagesAPI.BetaToolTextEditor20241022;
-  export import BetaToolUnion = MessagesMessagesAPI.BetaToolUnion;
-  export import BetaToolUseBlock = MessagesMessagesAPI.BetaToolUseBlock;
-  export import BetaToolUseBlockParam = MessagesMessagesAPI.BetaToolUseBlockParam;
-  export import BetaUsage = MessagesMessagesAPI.BetaUsage;
-  export import MessageCreateParams = MessagesMessagesAPI.MessageCreateParams;
-  export import MessageCreateParamsNonStreaming = MessagesMessagesAPI.MessageCreateParamsNonStreaming;
-  export import MessageCreateParamsStreaming = MessagesMessagesAPI.MessageCreateParamsStreaming;
+  export type BetaCacheControlEphemeral = MessagesMessagesAPI.BetaCacheControlEphemeral;
+  export type BetaContentBlock = MessagesMessagesAPI.BetaContentBlock;
+  export type BetaContentBlockParam = MessagesMessagesAPI.BetaContentBlockParam;
+  export type BetaImageBlockParam = MessagesMessagesAPI.BetaImageBlockParam;
+  export type BetaInputJSONDelta = MessagesMessagesAPI.BetaInputJSONDelta;
+  export type BetaMessage = MessagesMessagesAPI.BetaMessage;
+  export type BetaMessageDeltaUsage = MessagesMessagesAPI.BetaMessageDeltaUsage;
+  export type BetaMessageParam = MessagesMessagesAPI.BetaMessageParam;
+  export type BetaMetadata = MessagesMessagesAPI.BetaMetadata;
+  export type BetaRawContentBlockDeltaEvent = MessagesMessagesAPI.BetaRawContentBlockDeltaEvent;
+  export type BetaRawContentBlockStartEvent = MessagesMessagesAPI.BetaRawContentBlockStartEvent;
+  export type BetaRawContentBlockStopEvent = MessagesMessagesAPI.BetaRawContentBlockStopEvent;
+  export type BetaRawMessageDeltaEvent = MessagesMessagesAPI.BetaRawMessageDeltaEvent;
+  export type BetaRawMessageStartEvent = MessagesMessagesAPI.BetaRawMessageStartEvent;
+  export type BetaRawMessageStopEvent = MessagesMessagesAPI.BetaRawMessageStopEvent;
+  export type BetaRawMessageStreamEvent = MessagesMessagesAPI.BetaRawMessageStreamEvent;
+  export type BetaTextBlock = MessagesMessagesAPI.BetaTextBlock;
+  export type BetaTextBlockParam = MessagesMessagesAPI.BetaTextBlockParam;
+  export type BetaTextDelta = MessagesMessagesAPI.BetaTextDelta;
+  export type BetaTool = MessagesMessagesAPI.BetaTool;
+  export type BetaToolBash20241022 = MessagesMessagesAPI.BetaToolBash20241022;
+  export type BetaToolChoice = MessagesMessagesAPI.BetaToolChoice;
+  export type BetaToolChoiceAny = MessagesMessagesAPI.BetaToolChoiceAny;
+  export type BetaToolChoiceAuto = MessagesMessagesAPI.BetaToolChoiceAuto;
+  export type BetaToolChoiceTool = MessagesMessagesAPI.BetaToolChoiceTool;
+  export type BetaToolComputerUse20241022 = MessagesMessagesAPI.BetaToolComputerUse20241022;
+  export type BetaToolResultBlockParam = MessagesMessagesAPI.BetaToolResultBlockParam;
+  export type BetaToolTextEditor20241022 = MessagesMessagesAPI.BetaToolTextEditor20241022;
+  export type BetaToolUnion = MessagesMessagesAPI.BetaToolUnion;
+  export type BetaToolUseBlock = MessagesMessagesAPI.BetaToolUseBlock;
+  export type BetaToolUseBlockParam = MessagesMessagesAPI.BetaToolUseBlockParam;
+  export type BetaUsage = MessagesMessagesAPI.BetaUsage;
+  export type MessageCreateParams = MessagesMessagesAPI.MessageCreateParams;
+  export type MessageCreateParamsNonStreaming = MessagesMessagesAPI.MessageCreateParamsNonStreaming;
+  export type MessageCreateParamsStreaming = MessagesMessagesAPI.MessageCreateParamsStreaming;
   export import Batches = BatchesAPI.Batches;
-  export import BetaMessageBatch = BatchesAPI.BetaMessageBatch;
-  export import BetaMessageBatchCanceledResult = BatchesAPI.BetaMessageBatchCanceledResult;
-  export import BetaMessageBatchErroredResult = BatchesAPI.BetaMessageBatchErroredResult;
-  export import BetaMessageBatchExpiredResult = BatchesAPI.BetaMessageBatchExpiredResult;
-  export import BetaMessageBatchIndividualResponse = BatchesAPI.BetaMessageBatchIndividualResponse;
-  export import BetaMessageBatchRequestCounts = BatchesAPI.BetaMessageBatchRequestCounts;
-  export import BetaMessageBatchResult = BatchesAPI.BetaMessageBatchResult;
-  export import BetaMessageBatchSucceededResult = BatchesAPI.BetaMessageBatchSucceededResult;
+  export type BetaMessageBatch = BatchesAPI.BetaMessageBatch;
+  export type BetaMessageBatchCanceledResult = BatchesAPI.BetaMessageBatchCanceledResult;
+  export type BetaMessageBatchErroredResult = BatchesAPI.BetaMessageBatchErroredResult;
+  export type BetaMessageBatchExpiredResult = BatchesAPI.BetaMessageBatchExpiredResult;
+  export type BetaMessageBatchIndividualResponse = BatchesAPI.BetaMessageBatchIndividualResponse;
+  export type BetaMessageBatchRequestCounts = BatchesAPI.BetaMessageBatchRequestCounts;
+  export type BetaMessageBatchResult = BatchesAPI.BetaMessageBatchResult;
+  export type BetaMessageBatchSucceededResult = BatchesAPI.BetaMessageBatchSucceededResult;
   export import BetaMessageBatchesPage = BatchesAPI.BetaMessageBatchesPage;
-  export import BatchCreateParams = BatchesAPI.BatchCreateParams;
-  export import BatchRetrieveParams = BatchesAPI.BatchRetrieveParams;
-  export import BatchListParams = BatchesAPI.BatchListParams;
-  export import BatchCancelParams = BatchesAPI.BatchCancelParams;
-  export import BatchResultsParams = BatchesAPI.BatchResultsParams;
+  export type BatchCreateParams = BatchesAPI.BatchCreateParams;
+  export type BatchRetrieveParams = BatchesAPI.BatchRetrieveParams;
+  export type BatchListParams = BatchesAPI.BatchListParams;
+  export type BatchCancelParams = BatchesAPI.BatchCancelParams;
+  export type BatchResultsParams = BatchesAPI.BatchResultsParams;
 }
diff --git a/src/resources/beta/prompt-caching/index.ts b/src/resources/beta/prompt-caching/index.ts
index 3c8a52b6..78b4e747 100644
--- a/src/resources/beta/prompt-caching/index.ts
+++ b/src/resources/beta/prompt-caching/index.ts
@@ -1,20 +1,20 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { PromptCaching } from './prompt-caching';
 export {
-  PromptCachingBetaCacheControlEphemeral,
-  PromptCachingBetaImageBlockParam,
-  PromptCachingBetaMessage,
-  PromptCachingBetaMessageParam,
-  PromptCachingBetaTextBlockParam,
-  PromptCachingBetaTool,
-  PromptCachingBetaToolResultBlockParam,
-  PromptCachingBetaToolUseBlockParam,
-  PromptCachingBetaUsage,
-  RawPromptCachingBetaMessageStartEvent,
-  RawPromptCachingBetaMessageStreamEvent,
-  MessageCreateParams,
-  MessageCreateParamsNonStreaming,
-  MessageCreateParamsStreaming,
   Messages,
+  type PromptCachingBetaCacheControlEphemeral,
+  type PromptCachingBetaImageBlockParam,
+  type PromptCachingBetaMessage,
+  type PromptCachingBetaMessageParam,
+  type PromptCachingBetaTextBlockParam,
+  type PromptCachingBetaTool,
+  type PromptCachingBetaToolResultBlockParam,
+  type PromptCachingBetaToolUseBlockParam,
+  type PromptCachingBetaUsage,
+  type RawPromptCachingBetaMessageStartEvent,
+  type RawPromptCachingBetaMessageStreamEvent,
+  type MessageCreateParams,
+  type MessageCreateParamsNonStreaming,
+  type MessageCreateParamsStreaming,
 } from './messages';
+export { PromptCaching } from './prompt-caching';
diff --git a/src/resources/beta/prompt-caching/messages.ts b/src/resources/beta/prompt-caching/messages.ts
index f946a8f9..0965fdae 100644
--- a/src/resources/beta/prompt-caching/messages.ts
+++ b/src/resources/beta/prompt-caching/messages.ts
@@ -618,18 +618,23 @@ export interface MessageCreateParamsStreaming extends MessageCreateParamsBase {
 }
 
 export namespace Messages {
-  export import PromptCachingBetaCacheControlEphemeral = PromptCachingMessagesAPI.PromptCachingBetaCacheControlEphemeral;
-  export import PromptCachingBetaImageBlockParam = PromptCachingMessagesAPI.PromptCachingBetaImageBlockParam;
-  export import PromptCachingBetaMessage = PromptCachingMessagesAPI.PromptCachingBetaMessage;
-  export import PromptCachingBetaMessageParam = PromptCachingMessagesAPI.PromptCachingBetaMessageParam;
-  export import PromptCachingBetaTextBlockParam = PromptCachingMessagesAPI.PromptCachingBetaTextBlockParam;
-  export import PromptCachingBetaTool = PromptCachingMessagesAPI.PromptCachingBetaTool;
-  export import PromptCachingBetaToolResultBlockParam = PromptCachingMessagesAPI.PromptCachingBetaToolResultBlockParam;
-  export import PromptCachingBetaToolUseBlockParam = PromptCachingMessagesAPI.PromptCachingBetaToolUseBlockParam;
-  export import PromptCachingBetaUsage = PromptCachingMessagesAPI.PromptCachingBetaUsage;
-  export import RawPromptCachingBetaMessageStartEvent = PromptCachingMessagesAPI.RawPromptCachingBetaMessageStartEvent;
-  export import RawPromptCachingBetaMessageStreamEvent = PromptCachingMessagesAPI.RawPromptCachingBetaMessageStreamEvent;
-  export import MessageCreateParams = PromptCachingMessagesAPI.MessageCreateParams;
-  export import MessageCreateParamsNonStreaming = PromptCachingMessagesAPI.MessageCreateParamsNonStreaming;
-  export import MessageCreateParamsStreaming = PromptCachingMessagesAPI.MessageCreateParamsStreaming;
+  export type PromptCachingBetaCacheControlEphemeral =
+    PromptCachingMessagesAPI.PromptCachingBetaCacheControlEphemeral;
+  export type PromptCachingBetaImageBlockParam = PromptCachingMessagesAPI.PromptCachingBetaImageBlockParam;
+  export type PromptCachingBetaMessage = PromptCachingMessagesAPI.PromptCachingBetaMessage;
+  export type PromptCachingBetaMessageParam = PromptCachingMessagesAPI.PromptCachingBetaMessageParam;
+  export type PromptCachingBetaTextBlockParam = PromptCachingMessagesAPI.PromptCachingBetaTextBlockParam;
+  export type PromptCachingBetaTool = PromptCachingMessagesAPI.PromptCachingBetaTool;
+  export type PromptCachingBetaToolResultBlockParam =
+    PromptCachingMessagesAPI.PromptCachingBetaToolResultBlockParam;
+  export type PromptCachingBetaToolUseBlockParam =
+    PromptCachingMessagesAPI.PromptCachingBetaToolUseBlockParam;
+  export type PromptCachingBetaUsage = PromptCachingMessagesAPI.PromptCachingBetaUsage;
+  export type RawPromptCachingBetaMessageStartEvent =
+    PromptCachingMessagesAPI.RawPromptCachingBetaMessageStartEvent;
+  export type RawPromptCachingBetaMessageStreamEvent =
+    PromptCachingMessagesAPI.RawPromptCachingBetaMessageStreamEvent;
+  export type MessageCreateParams = PromptCachingMessagesAPI.MessageCreateParams;
+  export type MessageCreateParamsNonStreaming = PromptCachingMessagesAPI.MessageCreateParamsNonStreaming;
+  export type MessageCreateParamsStreaming = PromptCachingMessagesAPI.MessageCreateParamsStreaming;
 }
diff --git a/src/resources/beta/prompt-caching/prompt-caching.ts b/src/resources/beta/prompt-caching/prompt-caching.ts
index 0bacd3ac..177da3e3 100644
--- a/src/resources/beta/prompt-caching/prompt-caching.ts
+++ b/src/resources/beta/prompt-caching/prompt-caching.ts
@@ -9,18 +9,18 @@ export class PromptCaching extends APIResource {
 
 export namespace PromptCaching {
   export import Messages = MessagesAPI.Messages;
-  export import PromptCachingBetaCacheControlEphemeral = MessagesAPI.PromptCachingBetaCacheControlEphemeral;
-  export import PromptCachingBetaImageBlockParam = MessagesAPI.PromptCachingBetaImageBlockParam;
-  export import PromptCachingBetaMessage = MessagesAPI.PromptCachingBetaMessage;
-  export import PromptCachingBetaMessageParam = MessagesAPI.PromptCachingBetaMessageParam;
-  export import PromptCachingBetaTextBlockParam = MessagesAPI.PromptCachingBetaTextBlockParam;
-  export import PromptCachingBetaTool = MessagesAPI.PromptCachingBetaTool;
-  export import PromptCachingBetaToolResultBlockParam = MessagesAPI.PromptCachingBetaToolResultBlockParam;
-  export import PromptCachingBetaToolUseBlockParam = MessagesAPI.PromptCachingBetaToolUseBlockParam;
-  export import PromptCachingBetaUsage = MessagesAPI.PromptCachingBetaUsage;
-  export import RawPromptCachingBetaMessageStartEvent = MessagesAPI.RawPromptCachingBetaMessageStartEvent;
-  export import RawPromptCachingBetaMessageStreamEvent = MessagesAPI.RawPromptCachingBetaMessageStreamEvent;
-  export import MessageCreateParams = MessagesAPI.MessageCreateParams;
-  export import MessageCreateParamsNonStreaming = MessagesAPI.MessageCreateParamsNonStreaming;
-  export import MessageCreateParamsStreaming = MessagesAPI.MessageCreateParamsStreaming;
+  export type PromptCachingBetaCacheControlEphemeral = MessagesAPI.PromptCachingBetaCacheControlEphemeral;
+  export type PromptCachingBetaImageBlockParam = MessagesAPI.PromptCachingBetaImageBlockParam;
+  export type PromptCachingBetaMessage = MessagesAPI.PromptCachingBetaMessage;
+  export type PromptCachingBetaMessageParam = MessagesAPI.PromptCachingBetaMessageParam;
+  export type PromptCachingBetaTextBlockParam = MessagesAPI.PromptCachingBetaTextBlockParam;
+  export type PromptCachingBetaTool = MessagesAPI.PromptCachingBetaTool;
+  export type PromptCachingBetaToolResultBlockParam = MessagesAPI.PromptCachingBetaToolResultBlockParam;
+  export type PromptCachingBetaToolUseBlockParam = MessagesAPI.PromptCachingBetaToolUseBlockParam;
+  export type PromptCachingBetaUsage = MessagesAPI.PromptCachingBetaUsage;
+  export type RawPromptCachingBetaMessageStartEvent = MessagesAPI.RawPromptCachingBetaMessageStartEvent;
+  export type RawPromptCachingBetaMessageStreamEvent = MessagesAPI.RawPromptCachingBetaMessageStreamEvent;
+  export type MessageCreateParams = MessagesAPI.MessageCreateParams;
+  export type MessageCreateParamsNonStreaming = MessagesAPI.MessageCreateParamsNonStreaming;
+  export type MessageCreateParamsStreaming = MessagesAPI.MessageCreateParamsStreaming;
 }
diff --git a/src/resources/completions.ts b/src/resources/completions.ts
index dedb23e4..7c223540 100644
--- a/src/resources/completions.ts
+++ b/src/resources/completions.ts
@@ -201,8 +201,8 @@ export interface CompletionCreateParamsStreaming extends CompletionCreateParamsB
 }
 
 export namespace Completions {
-  export import Completion = CompletionsAPI.Completion;
-  export import CompletionCreateParams = CompletionsAPI.CompletionCreateParams;
-  export import CompletionCreateParamsNonStreaming = CompletionsAPI.CompletionCreateParamsNonStreaming;
-  export import CompletionCreateParamsStreaming = CompletionsAPI.CompletionCreateParamsStreaming;
+  export type Completion = CompletionsAPI.Completion;
+  export type CompletionCreateParams = CompletionsAPI.CompletionCreateParams;
+  export type CompletionCreateParamsNonStreaming = CompletionsAPI.CompletionCreateParamsNonStreaming;
+  export type CompletionCreateParamsStreaming = CompletionsAPI.CompletionCreateParamsStreaming;
 }
diff --git a/src/resources/index.ts b/src/resources/index.ts
index 492921df..0ecae98e 100644
--- a/src/resources/index.ts
+++ b/src/resources/index.ts
@@ -1,64 +1,64 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  AnthropicBeta,
-  BetaAPIError,
-  BetaAuthenticationError,
-  BetaError,
-  BetaErrorResponse,
-  BetaInvalidRequestError,
-  BetaNotFoundError,
-  BetaOverloadedError,
-  BetaPermissionError,
-  BetaRateLimitError,
   Beta,
+  type AnthropicBeta,
+  type BetaAPIError,
+  type BetaAuthenticationError,
+  type BetaError,
+  type BetaErrorResponse,
+  type BetaInvalidRequestError,
+  type BetaNotFoundError,
+  type BetaOverloadedError,
+  type BetaPermissionError,
+  type BetaRateLimitError,
 } from './beta/beta';
 export {
-  Completion,
-  CompletionCreateParams,
-  CompletionCreateParamsNonStreaming,
-  CompletionCreateParamsStreaming,
   Completions,
+  type Completion,
+  type CompletionCreateParams,
+  type CompletionCreateParamsNonStreaming,
+  type CompletionCreateParamsStreaming,
 } from './completions';
 export {
-  ContentBlock,
-  ContentBlockDeltaEvent,
-  ContentBlockStartEvent,
-  ContentBlockStopEvent,
-  ImageBlockParam,
-  InputJsonDelta,
-  InputJSONDelta,
-  Message,
-  MessageDeltaEvent,
-  MessageDeltaUsage,
-  MessageParam,
-  MessageStartEvent,
-  MessageStopEvent,
-  MessageStreamEvent,
-  Metadata,
-  Model,
-  RawContentBlockDeltaEvent,
-  RawContentBlockStartEvent,
-  RawContentBlockStopEvent,
-  RawMessageDeltaEvent,
-  RawMessageStartEvent,
-  RawMessageStopEvent,
-  RawMessageStreamEvent,
-  TextBlock,
-  TextBlockParam,
-  TextDelta,
-  Tool,
-  ToolChoice,
-  ToolChoiceAny,
-  ToolChoiceAuto,
-  ToolChoiceTool,
-  ToolResultBlockParam,
-  ToolUseBlock,
-  ToolUseBlockParam,
-  Usage,
-  MessageCreateParams,
-  MessageCreateParamsNonStreaming,
-  MessageCreateParamsStreaming,
-  MessageStreamParams,
   Messages,
+  type ContentBlock,
+  type ContentBlockDeltaEvent,
+  type ContentBlockStartEvent,
+  type ContentBlockStopEvent,
+  type ImageBlockParam,
+  type InputJsonDelta,
+  type InputJSONDelta,
+  type Message,
+  type MessageDeltaEvent,
+  type MessageDeltaUsage,
+  type MessageParam,
+  type MessageStartEvent,
+  type MessageStopEvent,
+  type MessageStreamEvent,
+  type Metadata,
+  type Model,
+  type RawContentBlockDeltaEvent,
+  type RawContentBlockStartEvent,
+  type RawContentBlockStopEvent,
+  type RawMessageDeltaEvent,
+  type RawMessageStartEvent,
+  type RawMessageStopEvent,
+  type RawMessageStreamEvent,
+  type TextBlock,
+  type TextBlockParam,
+  type TextDelta,
+  type Tool,
+  type ToolChoice,
+  type ToolChoiceAny,
+  type ToolChoiceAuto,
+  type ToolChoiceTool,
+  type ToolResultBlockParam,
+  type ToolUseBlock,
+  type ToolUseBlockParam,
+  type Usage,
+  type MessageCreateParams,
+  type MessageCreateParamsNonStreaming,
+  type MessageCreateParamsStreaming,
+  type MessageStreamParams,
 } from './messages';
diff --git a/src/resources/messages.ts b/src/resources/messages.ts
index b687d393..38aa0148 100644
--- a/src/resources/messages.ts
+++ b/src/resources/messages.ts
@@ -784,43 +784,42 @@ export interface MessageCreateParamsStreaming extends MessageCreateParamsBase {
 export type MessageStreamParams = MessageCreateParamsBase;
 
 export namespace Messages {
-  export import ContentBlock = MessagesAPI.ContentBlock;
-  export import ContentBlockDeltaEvent = MessagesAPI.ContentBlockDeltaEvent;
-  export import ContentBlockStartEvent = MessagesAPI.ContentBlockStartEvent;
-  export import ContentBlockStopEvent = MessagesAPI.ContentBlockStopEvent;
-  export import ImageBlockParam = MessagesAPI.ImageBlockParam;
-  export import InputJJsonDelta = MessagesAPI.InputJsonDelta;
-  export import InputJSONDelta = MessagesAPI.InputJSONDelta;
-  export import Message = MessagesAPI.Message;
-  export import MessageDeltaEvent = MessagesAPI.MessageDeltaEvent;
-  export import MessageDeltaUsage = MessagesAPI.MessageDeltaUsage;
-  export import MessageParam = MessagesAPI.MessageParam;
-  export import MessageStartEvent = MessagesAPI.MessageStartEvent;
-  export import MessageStopEvent = MessagesAPI.MessageStopEvent;
-  export import MessageStreamEvent = MessagesAPI.MessageStreamEvent;
-  export import Metadata = MessagesAPI.Metadata;
-  export import Model = MessagesAPI.Model;
-  export import RawContentBlockDeltaEvent = MessagesAPI.RawContentBlockDeltaEvent;
-  export import RawContentBlockStartEvent = MessagesAPI.RawContentBlockStartEvent;
-  export import RawContentBlockStopEvent = MessagesAPI.RawContentBlockStopEvent;
-  export import RawMessageDeltaEvent = MessagesAPI.RawMessageDeltaEvent;
-  export import RawMessageStartEvent = MessagesAPI.RawMessageStartEvent;
-  export import RawMessageStopEvent = MessagesAPI.RawMessageStopEvent;
-  export import RawMessageStreamEvent = MessagesAPI.RawMessageStreamEvent;
-  export import TextBlock = MessagesAPI.TextBlock;
-  export import TextBlockParam = MessagesAPI.TextBlockParam;
-  export import TextDelta = MessagesAPI.TextDelta;
-  export import Tool = MessagesAPI.Tool;
-  export import ToolChoice = MessagesAPI.ToolChoice;
-  export import ToolChoiceAny = MessagesAPI.ToolChoiceAny;
-  export import ToolChoiceAuto = MessagesAPI.ToolChoiceAuto;
-  export import ToolChoiceTool = MessagesAPI.ToolChoiceTool;
-  export import ToolResultBlockParam = MessagesAPI.ToolResultBlockParam;
-  export import ToolUseBlock = MessagesAPI.ToolUseBlock;
-  export import ToolUseBlockParam = MessagesAPI.ToolUseBlockParam;
-  export import Usage = MessagesAPI.Usage;
-  export import MessageCreateParams = MessagesAPI.MessageCreateParams;
-  export import MessageCreateParamsNonStreaming = MessagesAPI.MessageCreateParamsNonStreaming;
-  export import MessageCreateParamsStreaming = MessagesAPI.MessageCreateParamsStreaming;
-  export import MessageStreamParams = MessagesAPI.MessageStreamParams;
+  export type ContentBlock = MessagesAPI.ContentBlock;
+  export type ContentBlockDeltaEvent = MessagesAPI.ContentBlockDeltaEvent;
+  export type ContentBlockStartEvent = MessagesAPI.ContentBlockStartEvent;
+  export type ContentBlockStopEvent = MessagesAPI.ContentBlockStopEvent;
+  export type ImageBlockParam = MessagesAPI.ImageBlockParam;
+  export type InputJsonDelta = MessagesAPI.InputJsonDelta;
+  export type InputJSONDelta = MessagesAPI.InputJSONDelta;
+  export type Message = MessagesAPI.Message;
+  export type MessageDeltaEvent = MessagesAPI.MessageDeltaEvent;
+  export type MessageDeltaUsage = MessagesAPI.MessageDeltaUsage;
+  export type MessageParam = MessagesAPI.MessageParam;
+  export type MessageStartEvent = MessagesAPI.MessageStartEvent;
+  export type MessageStopEvent = MessagesAPI.MessageStopEvent;
+  export type MessageStreamEvent = MessagesAPI.MessageStreamEvent;
+  export type Metadata = MessagesAPI.Metadata;
+  export type Model = MessagesAPI.Model;
+  export type RawContentBlockDeltaEvent = MessagesAPI.RawContentBlockDeltaEvent;
+  export type RawContentBlockStartEvent = MessagesAPI.RawContentBlockStartEvent;
+  export type RawContentBlockStopEvent = MessagesAPI.RawContentBlockStopEvent;
+  export type RawMessageDeltaEvent = MessagesAPI.RawMessageDeltaEvent;
+  export type RawMessageStartEvent = MessagesAPI.RawMessageStartEvent;
+  export type RawMessageStopEvent = MessagesAPI.RawMessageStopEvent;
+  export type RawMessageStreamEvent = MessagesAPI.RawMessageStreamEvent;
+  export type TextBlock = MessagesAPI.TextBlock;
+  export type TextBlockParam = MessagesAPI.TextBlockParam;
+  export type TextDelta = MessagesAPI.TextDelta;
+  export type Tool = MessagesAPI.Tool;
+  export type ToolChoice = MessagesAPI.ToolChoice;
+  export type ToolChoiceAny = MessagesAPI.ToolChoiceAny;
+  export type ToolChoiceAuto = MessagesAPI.ToolChoiceAuto;
+  export type ToolChoiceTool = MessagesAPI.ToolChoiceTool;
+  export type ToolResultBlockParam = MessagesAPI.ToolResultBlockParam;
+  export type ToolUseBlock = MessagesAPI.ToolUseBlock;
+  export type ToolUseBlockParam = MessagesAPI.ToolUseBlockParam;
+  export type Usage = MessagesAPI.Usage;
+  export type MessageCreateParams = MessagesAPI.MessageCreateParams;
+  export type MessageCreateParamsNonStreaming = MessagesAPI.MessageCreateParamsNonStreaming;
+  export type MessageCreateParamsStreaming = MessagesAPI.MessageCreateParamsStreaming;
 }
diff --git a/tsconfig.json b/tsconfig.json
index 65e1bc04..6203c5ff 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -11,7 +11,7 @@
     "paths": {
       "@anthropic-ai/sdk/_shims/auto/*": ["src/_shims/auto/*-node"],
       "@anthropic-ai/sdk/*": ["src/*"],
-      "@anthropic-ai/sdk": ["src/index.ts"],
+      "@anthropic-ai/sdk": ["src/index.ts"]
     },
     "noEmit": true,
 
@@ -32,6 +32,7 @@
     "noUncheckedIndexedAccess": true,
     "noImplicitOverride": true,
     "noPropertyAccessFromIndexSignature": true,
+    "isolatedModules": true,
 
     "skipLibCheck": true
   }