From 96bce3aba5ada0482655cec0888f1d200dc2d4d7 Mon Sep 17 00:00:00 2001
From: Jon M <jon@mailosaur.com>
Date: Tue, 26 May 2026 21:47:39 +0100
Subject: [PATCH 1/2] Improvements for JSDoc

---
 src/mailosaur.ts           | 20 +++++++++++++-------
 src/operations/analysis.ts |  5 ++++-
 src/operations/devices.ts  |  9 +++++++++
 src/operations/files.ts    |  7 ++++++-
 src/operations/messages.ts | 21 +++++++++++++++++++--
 src/operations/previews.ts |  5 +++++
 src/operations/servers.ts  | 12 ++++++++++++
 src/operations/usage.ts    |  6 ++++++
 8 files changed, 74 insertions(+), 11 deletions(-)

diff --git a/src/mailosaur.ts b/src/mailosaur.ts
index 6844f54..a840b65 100644
--- a/src/mailosaur.ts
+++ b/src/mailosaur.ts
@@ -10,34 +10,40 @@ import Request from './request.js';
 import type { HttpResponse } from './request.js';
 import MailosaurError from './models/mailosaurError.js';
 
+/**
+ * The Mailosaur client — the main entry point to the Mailosaur API. Construct an instance with
+ * your API key (or set the `MAILOSAUR_API_KEY` environment variable), then use the operations
+ * namespaces (`messages`, `servers`, `files`, `devices`, `analysis`, `previews`, `usage`) to
+ * automate email and SMS testing.
+ */
 class MailosaurClient {
   request: Request;
   /**
-   * Message analysis operations
+   * Operations for analyzing email content and deliverability, including spam scoring.
    */
   analysis: Analysis;
   /**
-   * File operations
+   * Operations for downloading attachments, EML source, and email preview screenshots.
    */
   files: Files;
   /**
-   * Message operations
+   * Operations for finding, retrieving, creating, and managing email and SMS messages.
    */
   messages: Messages;
   /**
-   * Server management operations
+   * Operations for creating and managing your Mailosaur servers (virtual inboxes).
    */
   servers: Servers;
   /**
-   * Account usage operations
+   * Operations for inspecting account usage limits and recent transactional usage.
    */
   usage: Usage;
   /**
-   * Device management operations
+   * Operations for managing virtual security devices and retrieving their one-time passwords.
    */
   devices: Devices;
   /**
-   * Email Previews operations
+   * Operations for discovering the email clients available for generating email previews.
    */
   previews: Previews;
   models: typeof models;
diff --git a/src/operations/analysis.ts b/src/operations/analysis.ts
index cc491fe..5bb9a9c 100644
--- a/src/operations/analysis.ts
+++ b/src/operations/analysis.ts
@@ -4,7 +4,8 @@ import type { HttpResponse } from '../request.js';
 import type MailosaurClient from '../mailosaur.js';
 
 /**
- * Message analysis operations.
+ * Operations for analyzing the content and deliverability of an email, including SpamAssassin
+ * scoring and per-provider deliverability reports. Accessed via `client.analysis`.
  */
 class Analysis {
   client: MailosaurClient;
@@ -16,6 +17,7 @@ class Analysis {
   /**
    * Perform a spam analysis of an email.
    * @param messageId The identifier of the message to be analyzed.
+   * @returns A promise resolving to a {@link SpamAnalysisResult} containing the spam score and filter results.
    */
   async spam(messageId: string): Promise<SpamAnalysisResult> {
     const url = `api/analysis/spam/${messageId}`;
@@ -44,6 +46,7 @@ class Analysis {
   /**
    * Perform a deliverability report of an email.
    * @param messageId The identifier of the message to be analyzed.
+   * @returns A promise resolving to a {@link DeliverabilityReport} for the email.
    */
   async deliverability(messageId: string): Promise<DeliverabilityReport> {
     const url = `api/analysis/deliverability/${messageId}`;
diff --git a/src/operations/devices.ts b/src/operations/devices.ts
index 1b31bae..a1e12a3 100644
--- a/src/operations/devices.ts
+++ b/src/operations/devices.ts
@@ -5,6 +5,11 @@ import type DeviceCreateOptions from '../models/deviceCreateOptions.js';
 import type { HttpResponse } from '../request.js';
 import type MailosaurClient from '../mailosaur.js';
 
+/**
+ * Operations for managing virtual security devices and retrieving their current one-time
+ * passwords (OTPs), used to automate testing of app-based multi-factor authentication.
+ * Accessed via `client.devices`.
+ */
 class Devices {
   client: MailosaurClient;
 
@@ -14,6 +19,7 @@ class Devices {
 
   /**
    * Returns a list of your virtual security devices.
+   * @returns A promise resolving to a {@link DeviceListResult} containing your devices.
    */
   async list(): Promise<DeviceListResult> {
     const url = `api/devices`;
@@ -42,6 +48,7 @@ class Devices {
   /**
    * Creates a new virtual security device.
    * @param options Options used to create a new Mailosaur virtual security device.
+   * @returns A promise resolving to the newly-created {@link Device}.
    */
   async create(options: DeviceCreateOptions): Promise<Device> {
     const url = `api/devices`;
@@ -70,6 +77,7 @@ class Devices {
   /**
    * Retrieves the current one-time password for a saved device, or given base32-encoded shared secret.
    * @param query Either the unique identifier of the device, or a base32-encoded shared secret.
+   * @returns A promise resolving to an {@link OtpResult} containing the current one-time password.
    */
   async otp(query: string): Promise<OtpResult> {
     if (!query || query.indexOf('-') > -1) {
@@ -121,6 +129,7 @@ class Devices {
   /**
    * Permanently delete a virtual security device. This operation cannot be undone.
    * @param deviceId The unique identifier of the device.
+   * @returns A promise resolving once the device has been deleted.
    */
   async del(deviceId: string): Promise<void> {
     const url = `api/devices/${deviceId}`;
diff --git a/src/operations/files.ts b/src/operations/files.ts
index 4b565df..23233b7 100644
--- a/src/operations/files.ts
+++ b/src/operations/files.ts
@@ -9,7 +9,8 @@ interface IMailosaurClient {
 }
 
 /**
- * File operations.
+ * Operations for downloading the raw content associated with a message — file attachments,
+ * the full EML source of an email, and rendered email previews. Accessed via `client.files`.
  */
 class Files {
   client: IMailosaurClient;
@@ -21,6 +22,7 @@ class Files {
   /**
    * Downloads a single attachment.
    * @param attachmentId The identifier for the required attachment.
+   * @returns A promise resolving to a Buffer containing the attachment's binary content.
    */
   async getAttachment(attachmentId: string): Promise<Buffer> {
     const url = `api/files/attachments/${attachmentId}`;
@@ -38,6 +40,7 @@ class Files {
   /**
    * Downloads an EML file representing the specified email.
    * @param messageId The identifier for the required message.
+   * @returns A promise resolving to a Buffer containing the raw EML content of the email.
    */
   async getEmail(messageId: string): Promise<Buffer> {
     const url = `api/files/email/${messageId}`;
@@ -56,6 +59,8 @@ class Files {
    * Downloads a screenshot of your email rendered in a real email client. Simply supply
    * the unique identifier for the required preview.
    * @param previewId The identifier of the email preview to be downloaded.
+   * @returns A promise resolving to a Buffer containing the preview screenshot image.
+   * @throws {MailosaurError} With error type `preview_timeout` if the preview is not generated within the time limit.
    */
   async getPreview(previewId: string): Promise<Buffer> {
     const timeout = 120000;
diff --git a/src/operations/messages.ts b/src/operations/messages.ts
index 0adcdd3..d8c7a5b 100644
--- a/src/operations/messages.ts
+++ b/src/operations/messages.ts
@@ -12,6 +12,10 @@ import type PreviewRequestOptions from '../models/previewRequestOptions.js';
 import type { HttpResponse } from '../request.js';
 import type MailosaurClient from '../mailosaur.js';
 
+/**
+ * Operations for finding, retrieving, creating, forwarding, replying to, and deleting the
+ * email and SMS messages received by your Mailosaur servers. Accessed via `client.messages`.
+ */
 class Messages {
   client: MailosaurClient;
 
@@ -25,6 +29,8 @@ class Messages {
    * @param serverId The unique identifier of the containing server.
    * @param criteria The criteria with which to find messages during a search.
    * @param options Search options
+   * @returns A promise resolving to the first {@link Message} matching the criteria.
+   * @throws {MailosaurError} With error type `no_messages_found` if no matching message exists, or `search_timeout` if no matching message arrives before the timeout elapses.
    */
   async get(
     serverId: string,
@@ -69,6 +75,7 @@ class Messages {
    * Retrieves the detail for a single message. Must be used in conjunction with either list or
    * search in order to get the unique identifier for the required message.
    * @param messageId The unique identifier of the message to be retrieved.
+   * @returns A promise resolving to the full {@link Message}.
    */
   async getById(messageId: string): Promise<Message> {
     const url = `api/messages/${messageId}`;
@@ -97,6 +104,7 @@ class Messages {
   /**
    * Permanently deletes a message. Also deletes any attachments related to the message. This operation cannot be undone.
    * @param messageId The identifier for the message.
+   * @returns A promise resolving once the message has been deleted.
    */
   async del(messageId: string): Promise<void> {
     const url = `api/messages/${messageId}`;
@@ -126,6 +134,7 @@ class Messages {
    * Returns a list of your messages in summary form. The summaries are returned sorted by received date, with the most recently-received messages appearing first.
    * @param serverId The unique identifier of the required server.
    * @param options Message listing options
+   * @returns A promise resolving to a {@link MessageListResult} containing the message summaries.
    */
   async list(
     serverId: string,
@@ -163,8 +172,9 @@ class Messages {
   }
 
   /**
-   * Permenantly delete all messages within a server.
+   * Permanently delete all messages within a server. This operation cannot be undone.
    * @param serverId The unique identifier of the server.
+   * @returns A promise resolving once all messages within the server have been deleted.
    */
   async deleteAll(serverId: string): Promise<void> {
     const url = `api/messages`;
@@ -200,6 +210,8 @@ class Messages {
    * @param serverId The unique identifier of the server to search.
    * @param criteria The criteria with which to find messages during a search.
    * @param options Search options
+   * @returns A promise resolving to a {@link MessageListResult} containing the matching message summaries.
+   * @throws {MailosaurError} With error type `search_timeout` if no matching message is found before the timeout elapses, unless `options.errorOnTimeout` is set to false.
    */
   async search(
     serverId: string,
@@ -296,6 +308,7 @@ class Messages {
    * in scenarios where you want an email to trigger a workflow in your product.
    * @param serverId The unique identifier of the required server.
    * @param options Options to use when creating a new message.
+   * @returns A promise resolving to the newly-created {@link Message}.
    */
   async create(
     serverId: string,
@@ -329,8 +342,10 @@ class Messages {
   }
 
   /**
+   * Forwards the specified message to a verified email address. This is useful for simulating a user forwarding one of your email messages.
    * @param messageId The unique identifier of the message to be forwarded.
    * @param options Options to use when forwarding a message.
+   * @returns A promise resolving to the forwarded {@link Message}.
    */
   async forward(
     messageId: string,
@@ -361,8 +376,9 @@ class Messages {
 
   /**
    * Sends a reply to the specified message. This is useful for when simulating a user replying to one of your email or SMS messages.
-   * @param messageId The unique identifier of the message to be forwarded.
+   * @param messageId The unique identifier of the message to be replied to.
    * @param options Options to use when replying to a message.
+   * @returns A promise resolving to the reply {@link Message}.
    */
   async reply(
     messageId: string,
@@ -395,6 +411,7 @@ class Messages {
    * Generates screenshots of an email rendered in the specified email clients.
    * @param messageId The identifier of the email to preview.
    * @param options The options with which to generate previews.
+   * @returns A promise resolving to a {@link PreviewListResult} containing the generated previews.
    */
   async generatePreviews(
     messageId: string,
diff --git a/src/operations/previews.ts b/src/operations/previews.ts
index 3394649..745c0a9 100644
--- a/src/operations/previews.ts
+++ b/src/operations/previews.ts
@@ -2,6 +2,10 @@ import EmailClientListResult from '../models/emailClientListResult.js';
 import type { HttpResponse } from '../request.js';
 import type MailosaurClient from '../mailosaur.js';
 
+/**
+ * Operations for discovering the email clients available for generating email previews
+ * (screenshots of an email rendered in real clients). Accessed via `client.previews`.
+ */
 class Previews {
   client: MailosaurClient;
 
@@ -11,6 +15,7 @@ class Previews {
 
   /**
    * List all email clients that can be used to generate email previews.
+   * @returns A promise resolving to an {@link EmailClientListResult} of available email clients.
    */
   async listEmailClients(): Promise<EmailClientListResult> {
     const url = `api/screenshots/clients`;
diff --git a/src/operations/servers.ts b/src/operations/servers.ts
index c8e316c..87fd2c6 100644
--- a/src/operations/servers.ts
+++ b/src/operations/servers.ts
@@ -4,6 +4,11 @@ import type ServerCreateOptions from '../models/serverCreateOptions.js';
 import type { HttpResponse } from '../request.js';
 import type MailosaurClient from '../mailosaur.js';
 
+/**
+ * Operations for creating and managing your Mailosaur servers — the virtual inboxes that
+ * group your tests together, each with its own domain and SMTP/POP3/IMAP credentials.
+ * Accessed via `client.servers`.
+ */
 class Servers {
   client: MailosaurClient;
 
@@ -13,6 +18,7 @@ class Servers {
 
   /**
    * Returns a list of your virtual servers. Servers are returned sorted in alphabetical order.
+   * @returns A promise resolving to a {@link ServerListResult} containing your servers.
    */
   async list(): Promise<ServerListResult> {
     const url = `api/servers`;
@@ -41,6 +47,7 @@ class Servers {
   /**
    * Creates a new virtual server.
    * @param options Options used to create a new Mailosaur server.
+   * @returns A promise resolving to the newly-created {@link Server}.
    */
   async create(options: ServerCreateOptions): Promise<Server> {
     const url = `api/servers`;
@@ -69,6 +76,7 @@ class Servers {
   /**
    * Retrieves the detail for a single server.
    * @param serverId The unique identifier of the server.
+   * @returns A promise resolving to the {@link Server}.
    */
   async get(serverId: string): Promise<Server> {
     const url = `api/servers/${serverId}`;
@@ -97,6 +105,7 @@ class Servers {
   /**
    * Retrieves the password for a server. This password can be used for SMTP, POP3, and IMAP connectivity.
    * @param serverId The unique identifier of the server.
+   * @returns A promise resolving to the server's password.
    */
   async getPassword(serverId: string): Promise<string> {
     const url = `api/servers/${serverId}/password`;
@@ -126,6 +135,7 @@ class Servers {
    * Updates the attributes of a server.
    * @param serverId The unique identifier of the server.
    * @param server The updated server.
+   * @returns A promise resolving to the updated {@link Server}.
    */
   async update(serverId: string, server: Server): Promise<Server> {
     const url = `api/servers/${serverId}`;
@@ -154,6 +164,7 @@ class Servers {
   /**
    * Permanently delete a server. This will also delete all messages, associated attachments, etc. within the server. This operation cannot be undone.
    * @param serverId The unique identifier of the server.
+   * @returns A promise resolving once the server has been deleted.
    */
   async del(serverId: string): Promise<void> {
     const url = `api/servers/${serverId}`;
@@ -183,6 +194,7 @@ class Servers {
    * Generates a random email address by appending a random string in front of the server's
    * domain name.
    * @param serverId The identifier of the server.
+   * @returns A random email address ending in the server's domain.
    */
   generateEmailAddress(serverId: string): string {
     const host = process.env.MAILOSAUR_SMTP_HOST || 'mailosaur.net';
diff --git a/src/operations/usage.ts b/src/operations/usage.ts
index 3a86dba..06c93c3 100644
--- a/src/operations/usage.ts
+++ b/src/operations/usage.ts
@@ -3,6 +3,10 @@ import UsageTransactionListResult from '../models/usageTransactionListResult.js'
 import type { HttpResponse } from '../request.js';
 import type MailosaurClient from '../mailosaur.js';
 
+/**
+ * Operations for inspecting your account's usage limits and recent transactional usage.
+ * These endpoints require authentication with an account-level API key. Accessed via `client.usage`.
+ */
 class Usage {
   client: MailosaurClient;
 
@@ -13,6 +17,7 @@ class Usage {
   /**
    * Retrieve account usage limits. Details the current limits and usage for your account.
    * This endpoint requires authentication with an account-level API key.
+   * @returns A promise resolving to the {@link UsageAccountLimits} for your account.
    */
   async limits(): Promise<UsageAccountLimits> {
     const url = `api/usage/limits`;
@@ -41,6 +46,7 @@ class Usage {
   /**
    * Retrieves the last 31 days of transactional usage.
    * This endpoint requires authentication with an account-level API key.
+   * @returns A promise resolving to a {@link UsageTransactionListResult} for the last 31 days.
    */
   async transactions(): Promise<UsageTransactionListResult> {
     const url = `api/usage/transactions`;

From 5a03b582ccb12d8bd45427e236db4b72da67e35a Mon Sep 17 00:00:00 2001
From: Jon M <jon@mailosaur.com>
Date: Wed, 27 May 2026 09:11:37 +0100
Subject: [PATCH 2/2] Use inbox (server) terminology in doc comments

Normalise Intellisense prose to lead with the UI term "inbox", glossing
"(server)" on entity mentions across the operations and model doc comments.
Code identifiers, @param names, and {@link Server} references are unchanged.
---
 src/mailosaur.ts                  |  2 +-
 src/models/message.ts             |  2 +-
 src/models/messageSummary.ts      |  2 +-
 src/models/server.ts              | 10 ++++----
 src/models/serverCreateOptions.ts |  4 ++--
 src/models/serverListResult.ts    |  6 ++---
 src/models/usageAccountLimits.ts  |  2 +-
 src/operations/messages.ts        | 16 ++++++-------
 src/operations/servers.ts         | 40 +++++++++++++++----------------
 9 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/src/mailosaur.ts b/src/mailosaur.ts
index a840b65..1a724cb 100644
--- a/src/mailosaur.ts
+++ b/src/mailosaur.ts
@@ -31,7 +31,7 @@ class MailosaurClient {
    */
   messages: Messages;
   /**
-   * Operations for creating and managing your Mailosaur servers (virtual inboxes).
+   * Operations for creating and managing your Mailosaur inboxes (servers).
    */
   servers: Servers;
   /**
diff --git a/src/models/message.ts b/src/models/message.ts
index 39b474b..3b2b9f9 100644
--- a/src/models/message.ts
+++ b/src/models/message.ts
@@ -56,7 +56,7 @@ class Message {
    */
   metadata?: Metadata;
   /**
-   * Identifier for the server in which the message is located.
+   * Identifier for the inbox (server) in which the message is located.
    */
   server?: string;
 
diff --git a/src/models/messageSummary.ts b/src/models/messageSummary.ts
index 96d16e8..cbbcb45 100644
--- a/src/models/messageSummary.ts
+++ b/src/models/messageSummary.ts
@@ -15,7 +15,7 @@ class MessageSummary {
    */
   type: 'Email' | 'SMS';
   /**
-   * Identifier for the server in which the message is located.
+   * Identifier for the inbox (server) in which the message is located.
    */
   server?: string;
   /**
diff --git a/src/models/server.ts b/src/models/server.ts
index d413fb5..8d9d3a0 100644
--- a/src/models/server.ts
+++ b/src/models/server.ts
@@ -1,21 +1,21 @@
 /**
- * Mailosaur virtual SMTP/SMS server.
+ * A Mailosaur inbox (server) — a virtual SMTP/SMS endpoint.
  */
 class Server {
   /**
-   * Unique identifier for the server.
+   * Unique identifier for the inbox (server).
    */
   id?: string;
   /**
-   * The name of the server.
+   * The name of the inbox (server).
    */
   name?: string;
   /**
-   * Users (excluding administrators) who have access to the server (if it is restricted).
+   * Users (excluding administrators) who have access to the inbox (server) when access is restricted.
    */
   users?: string[];
   /**
-   * The number of messages currently in the server.
+   * The number of messages currently in the inbox (server).
    */
   messages?: number;
 
diff --git a/src/models/serverCreateOptions.ts b/src/models/serverCreateOptions.ts
index 500da06..9e483db 100644
--- a/src/models/serverCreateOptions.ts
+++ b/src/models/serverCreateOptions.ts
@@ -1,9 +1,9 @@
 /**
- * Options used to create a new Mailosaur server.
+ * Options used to create a new Mailosaur inbox (server).
  */
 class ServerCreateOptions {
   /**
-   * A name used to identify the server.
+   * A name used to identify the inbox (server).
    */
   name?: string;
 
diff --git a/src/models/serverListResult.ts b/src/models/serverListResult.ts
index 964adab..3899da7 100644
--- a/src/models/serverListResult.ts
+++ b/src/models/serverListResult.ts
@@ -1,12 +1,12 @@
 import Server from './server.js';
 
 /**
- * The result of the server listing operation.
+ * The result of the inbox (server) listing operation.
  */
 class ServerListResult {
   /**
-   * The individual servers forming the result. Servers
-   * are returned sorted by creation date, with the most recently-created server
+   * The individual inboxes (servers) forming the result. Inboxes (servers)
+   * are returned sorted by creation date, with the most recently-created inbox (server)
    * appearing first.
    */
   items?: Server[];
diff --git a/src/models/usageAccountLimits.ts b/src/models/usageAccountLimits.ts
index 5592afe..7bb5ed0 100644
--- a/src/models/usageAccountLimits.ts
+++ b/src/models/usageAccountLimits.ts
@@ -5,7 +5,7 @@ import UsageAccountLimit from './usageAccountLimit.js';
  */
 class UsageAccountLimits {
   /**
-   * Server limits.
+   * Inbox (server) limits.
    */
   servers?: UsageAccountLimit;
   /**
diff --git a/src/operations/messages.ts b/src/operations/messages.ts
index d8c7a5b..8bff244 100644
--- a/src/operations/messages.ts
+++ b/src/operations/messages.ts
@@ -14,7 +14,7 @@ import type MailosaurClient from '../mailosaur.js';
 
 /**
  * Operations for finding, retrieving, creating, forwarding, replying to, and deleting the
- * email and SMS messages received by your Mailosaur servers. Accessed via `client.messages`.
+ * email and SMS messages received by your Mailosaur inboxes (servers). Accessed via `client.messages`.
  */
 class Messages {
   client: MailosaurClient;
@@ -26,7 +26,7 @@ class Messages {
   /**
    * Waits for a message to be found. Returns as soon as a message matching the specified search criteria is found.
    * **Recommended:** This is the most efficient method of looking up a message, therefore we recommend using it wherever possible.
-   * @param serverId The unique identifier of the containing server.
+   * @param serverId The unique identifier of the containing inbox (server).
    * @param criteria The criteria with which to find messages during a search.
    * @param options Search options
    * @returns A promise resolving to the first {@link Message} matching the criteria.
@@ -132,7 +132,7 @@ class Messages {
 
   /**
    * Returns a list of your messages in summary form. The summaries are returned sorted by received date, with the most recently-received messages appearing first.
-   * @param serverId The unique identifier of the required server.
+   * @param serverId The unique identifier of the required inbox (server).
    * @param options Message listing options
    * @returns A promise resolving to a {@link MessageListResult} containing the message summaries.
    */
@@ -172,9 +172,9 @@ class Messages {
   }
 
   /**
-   * Permanently delete all messages within a server. This operation cannot be undone.
-   * @param serverId The unique identifier of the server.
-   * @returns A promise resolving once all messages within the server have been deleted.
+   * Permanently delete all messages within an inbox (server). This operation cannot be undone.
+   * @param serverId The unique identifier of the inbox (server).
+   * @returns A promise resolving once all messages within the inbox (server) have been deleted.
    */
   async deleteAll(serverId: string): Promise<void> {
     const url = `api/messages`;
@@ -207,7 +207,7 @@ class Messages {
   /**
    * Returns a list of messages matching the specified search criteria, in summary form.
    * The messages are returned sorted by received date, with the most recently-received messages appearing first.
-   * @param serverId The unique identifier of the server to search.
+   * @param serverId The unique identifier of the inbox (server) to search.
    * @param criteria The criteria with which to find messages during a search.
    * @param options Search options
    * @returns A promise resolving to a {@link MessageListResult} containing the matching message summaries.
@@ -306,7 +306,7 @@ class Messages {
   /**
    * Creates a new message that can be sent to a verified email address. This is useful
    * in scenarios where you want an email to trigger a workflow in your product.
-   * @param serverId The unique identifier of the required server.
+   * @param serverId The unique identifier of the required inbox (server).
    * @param options Options to use when creating a new message.
    * @returns A promise resolving to the newly-created {@link Message}.
    */
diff --git a/src/operations/servers.ts b/src/operations/servers.ts
index 87fd2c6..c564f24 100644
--- a/src/operations/servers.ts
+++ b/src/operations/servers.ts
@@ -5,7 +5,7 @@ import type { HttpResponse } from '../request.js';
 import type MailosaurClient from '../mailosaur.js';
 
 /**
- * Operations for creating and managing your Mailosaur servers — the virtual inboxes that
+ * Operations for creating and managing your Mailosaur inboxes (servers) — they
  * group your tests together, each with its own domain and SMTP/POP3/IMAP credentials.
  * Accessed via `client.servers`.
  */
@@ -17,8 +17,8 @@ class Servers {
   }
 
   /**
-   * Returns a list of your virtual servers. Servers are returned sorted in alphabetical order.
-   * @returns A promise resolving to a {@link ServerListResult} containing your servers.
+   * Returns a list of your inboxes (servers). Inboxes (servers) are returned sorted in alphabetical order.
+   * @returns A promise resolving to a {@link ServerListResult} containing your inboxes (servers).
    */
   async list(): Promise<ServerListResult> {
     const url = `api/servers`;
@@ -45,8 +45,8 @@ class Servers {
   }
 
   /**
-   * Creates a new virtual server.
-   * @param options Options used to create a new Mailosaur server.
+   * Creates a new inbox (server).
+   * @param options Options used to create a new Mailosaur inbox (server).
    * @returns A promise resolving to the newly-created {@link Server}.
    */
   async create(options: ServerCreateOptions): Promise<Server> {
@@ -74,8 +74,8 @@ class Servers {
   }
 
   /**
-   * Retrieves the detail for a single server.
-   * @param serverId The unique identifier of the server.
+   * Retrieves the detail for a single inbox (server).
+   * @param serverId The unique identifier of the inbox (server).
    * @returns A promise resolving to the {@link Server}.
    */
   async get(serverId: string): Promise<Server> {
@@ -103,9 +103,9 @@ class Servers {
   }
 
   /**
-   * Retrieves the password for a server. This password can be used for SMTP, POP3, and IMAP connectivity.
-   * @param serverId The unique identifier of the server.
-   * @returns A promise resolving to the server's password.
+   * Retrieves the password for an inbox (server). This password can be used for SMTP, POP3, and IMAP connectivity.
+   * @param serverId The unique identifier of the inbox (server).
+   * @returns A promise resolving to the password for the inbox (server).
    */
   async getPassword(serverId: string): Promise<string> {
     const url = `api/servers/${serverId}/password`;
@@ -132,9 +132,9 @@ class Servers {
   }
 
   /**
-   * Updates the attributes of a server.
-   * @param serverId The unique identifier of the server.
-   * @param server The updated server.
+   * Updates the attributes of an inbox (server).
+   * @param serverId The unique identifier of the inbox (server).
+   * @param server The updated inbox (server).
    * @returns A promise resolving to the updated {@link Server}.
    */
   async update(serverId: string, server: Server): Promise<Server> {
@@ -162,9 +162,9 @@ class Servers {
   }
 
   /**
-   * Permanently delete a server. This will also delete all messages, associated attachments, etc. within the server. This operation cannot be undone.
-   * @param serverId The unique identifier of the server.
-   * @returns A promise resolving once the server has been deleted.
+   * Permanently delete an inbox (server). This will also delete all messages, associated attachments, etc. within the inbox (server). This operation cannot be undone.
+   * @param serverId The unique identifier of the inbox (server).
+   * @returns A promise resolving once the inbox (server) has been deleted.
    */
   async del(serverId: string): Promise<void> {
     const url = `api/servers/${serverId}`;
@@ -191,10 +191,10 @@ class Servers {
   }
 
   /**
-   * Generates a random email address by appending a random string in front of the server's
-   * domain name.
-   * @param serverId The identifier of the server.
-   * @returns A random email address ending in the server's domain.
+   * Generates a random email address by appending a random string in front of the
+   * domain name of the inbox (server).
+   * @param serverId The identifier of the inbox (server).
+   * @returns A random email address ending in the domain of the inbox (server).
    */
   generateEmailAddress(serverId: string): string {
     const host = process.env.MAILOSAUR_SMTP_HOST || 'mailosaur.net';